Compare commits
2 Commits
main
...
e11ac03a9e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e11ac03a9e | ||
|
|
1be41381e5 |
@@ -1,75 +0,0 @@
|
|||||||
name: Build and Deploy Java Gradle Application
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-and-deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: 📄 Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: 📄 Checkout configuration
|
|
||||||
env:
|
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.PROD_PROPERTIES_SSH_KEY }}
|
|
||||||
run: |
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
|
||||||
chmod 600 ~/.ssh/id_rsa
|
|
||||||
git clone -b hexagonal-reforged ssh://gitea@gitea.takiguchi.ovh:12960/Codiki/codiki-properties.git --config core.sshCommand='ssh -o StrictHostKeyChecking=no'
|
|
||||||
|
|
||||||
- name: 📄 Edit configuration
|
|
||||||
run: |
|
|
||||||
sed -i "s/<POSTGRES_PASSWORD>/$(cat ./codiki-properties/passwords/postgresql/codiki_user)/g" ./codiki-properties/application-prod.yml
|
|
||||||
cp ./codiki-properties/application-prod.yml ./backend/codiki-launcher/src/main/resources/application.yml
|
|
||||||
sed -i "s/<POSTGRES_ADMIN_PASSWORD>/$(cat ./codiki-properties/passwords/postgresql/codiki_admin)/g" ./docker-compose.yml
|
|
||||||
|
|
||||||
- name: 🔨 Build backend docker image
|
|
||||||
run: |
|
|
||||||
sudo /usr/bin/docker build -t codiki-backend -f ./Dockerfile-backend . --no-cache
|
|
||||||
|
|
||||||
- name: 📦 Extract backend docker image into archive
|
|
||||||
run: |
|
|
||||||
sudo /usr/bin/docker save codiki-backend:latest -o ./codiki-backend.tar
|
|
||||||
|
|
||||||
- name: 🔨 Build frontend docker image
|
|
||||||
run: |
|
|
||||||
sudo /usr/bin/docker build -t codiki-frontend -f ./Dockerfile-frontend . --no-cache
|
|
||||||
|
|
||||||
- name: 📦 Extract frontend docker image into archive
|
|
||||||
run: |
|
|
||||||
sudo /usr/bin/docker save codiki-frontend:latest -o ./codiki-frontend.tar
|
|
||||||
|
|
||||||
- name: 📤 Transfer artifacts to remote server
|
|
||||||
env:
|
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
|
|
||||||
REMOTE_USER: ${{ secrets.PROD_REMOTE_USER }}
|
|
||||||
REMOTE_HOST: ${{ secrets.PROD_REMOTE_HOST }}
|
|
||||||
REMOTE_PORT: ${{ secrets.PROD_REMOTE_PORT }}
|
|
||||||
REMOTE_PATH: ${{ secrets.PROD_REMOTE_PATH }}
|
|
||||||
run: |
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
|
||||||
chmod 600 ~/.ssh/id_rsa
|
|
||||||
scp -o StrictHostKeyChecking=no -P $REMOTE_PORT ./codiki-backend.tar $REMOTE_USER@$REMOTE_HOST:$REMOTE_PATH
|
|
||||||
scp -o StrictHostKeyChecking=no -P $REMOTE_PORT ./codiki-frontend.tar $REMOTE_USER@$REMOTE_HOST:$REMOTE_PATH
|
|
||||||
scp -o StrictHostKeyChecking=no -P $REMOTE_PORT ./docker-compose.yml $REMOTE_USER@$REMOTE_HOST:$REMOTE_PATH
|
|
||||||
|
|
||||||
- name: 🚀 Launch application onto remote server
|
|
||||||
env:
|
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
|
|
||||||
REMOTE_USER: ${{ secrets.PROD_REMOTE_USER }}
|
|
||||||
REMOTE_HOST: ${{ secrets.PROD_REMOTE_HOST }}
|
|
||||||
REMOTE_PORT: ${{ secrets.PROD_REMOTE_PORT }}
|
|
||||||
REMOTE_PATH: ${{ secrets.PROD_REMOTE_PATH }}
|
|
||||||
run: |
|
|
||||||
ssh -o StrictHostKeyChecking=no $REMOTE_HOST -l $REMOTE_USER -p $REMOTE_PORT << EOC
|
|
||||||
cd $REMOTE_PATH
|
|
||||||
sudo /usr/bin/docker load < $REMOTE_PATH/codiki-backend.tar
|
|
||||||
sudo /usr/bin/docker load < $REMOTE_PATH/codiki-frontend.tar
|
|
||||||
sudo /usr/bin/docker compose down
|
|
||||||
sudo /usr/bin/docker compose up --detach
|
|
||||||
EOC
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM maven:3.9.11-eclipse-temurin-21 AS builder
|
FROM maven:3.9.9-eclipse-temurin-21 AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY backend/pom.xml /app/
|
COPY backend/pom.xml /app/
|
||||||
COPY backend/codiki-application /app/codiki-application
|
COPY backend/codiki-application /app/codiki-application
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
FROM node:25-alpine AS builder
|
FROM node:22-alpine AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY frontend /app
|
COPY frontend /app
|
||||||
RUN npm install
|
RUN npm install
|
||||||
RUN npm run build-prod-en
|
RUN npm run build-prod-en
|
||||||
RUN npm run build-prod-fr
|
RUN npm run build-prod-fr
|
||||||
|
|
||||||
FROM nginx:1.29-alpine AS final
|
FROM nginx:1.27-alpine AS final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=builder /app/dist/codiki/en/browser /usr/share/nginx/html/en/
|
COPY --from=builder /app/dist/codiki/en/browser /usr/share/nginx/html/en/
|
||||||
COPY --from=builder /app/dist/codiki/fr/browser/fr /usr/share/nginx/html/fr/
|
COPY --from=builder /app/dist/codiki/fr/browser/fr /usr/share/nginx/html/fr/
|
||||||
|
|||||||
@@ -33,5 +33,28 @@
|
|||||||
<groupId>org.apache.tika</groupId>
|
<groupId>org.apache.tika</groupId>
|
||||||
<artifactId>tika-core</artifactId>
|
<artifactId>tika-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-data-jpa</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-security</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.postgresql</groupId>-->
|
||||||
|
<!-- <artifactId>postgresql</artifactId>-->
|
||||||
|
<!-- <scope>runtime</scope>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-test</artifactId>-->
|
||||||
|
<!-- <scope>test</scope>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.security</groupId>-->
|
||||||
|
<!-- <artifactId>spring-security-test</artifactId>-->
|
||||||
|
<!-- <scope>test</scope>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ public class SecurityConfiguration {
|
|||||||
public SecurityFilterChain securityFilterChain(
|
public SecurityFilterChain securityFilterChain(
|
||||||
HttpSecurity httpSecurity,
|
HttpSecurity httpSecurity,
|
||||||
JwtAuthenticationFilter jwtAuthenticationFilter
|
JwtAuthenticationFilter jwtAuthenticationFilter
|
||||||
) {
|
) throws Exception {
|
||||||
httpSecurity
|
httpSecurity
|
||||||
.csrf(AbstractHttpConfigurer::disable)
|
.csrf(AbstractHttpConfigurer::disable)
|
||||||
.httpBasic(Customizer.withDefaults())
|
.httpBasic(Customizer.withDefaults())
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package org.codiki.infrastructure.configuration;
|
package org.codiki.infrastructure.configuration;
|
||||||
|
|
||||||
import org.springframework.boot.persistence.autoconfigure.EntityScan;
|
import org.springframework.boot.autoconfigure.domain.EntityScan;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
|
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
|
||||||
|
|
||||||
|
|||||||
@@ -15,11 +15,11 @@
|
|||||||
<java.version>21</java.version>
|
<java.version>21</java.version>
|
||||||
<maven.compiler.source>21</maven.compiler.source>
|
<maven.compiler.source>21</maven.compiler.source>
|
||||||
<maven.compiler.target>21</maven.compiler.target>
|
<maven.compiler.target>21</maven.compiler.target>
|
||||||
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
|
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
|
||||||
<java-jwt.version>4.5.0</java-jwt.version>
|
<java-jwt.version>4.4.0</java-jwt.version>
|
||||||
<postgresql.version>42.7.8</postgresql.version>
|
<postgresql.version>42.7.0</postgresql.version>
|
||||||
<tika-core.version>3.2.3</tika-core.version>
|
<tika-core.version>2.9.0</tika-core.version>
|
||||||
<commons-lang3.version>3.20.0</commons-lang3.version>
|
<commons-lang3.version>3.14.0</commons-lang3.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-dependencies</artifactId>
|
<artifactId>spring-boot-dependencies</artifactId>
|
||||||
<version>4.0.1</version>
|
<version>3.2.0</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
@@ -84,6 +84,8 @@
|
|||||||
<artifactId>commons-lang3</artifactId>
|
<artifactId>commons-lang3</artifactId>
|
||||||
<version>${commons-lang3.version}</version>
|
<version>${commons-lang3.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
|
|||||||
@@ -24,13 +24,13 @@
|
|||||||
},
|
},
|
||||||
"architect": {
|
"architect": {
|
||||||
"build": {
|
"build": {
|
||||||
"builder": "@angular/build:application",
|
"builder": "@angular-devkit/build-angular:application",
|
||||||
"options": {
|
"options": {
|
||||||
"outputPath": "dist/codiki",
|
"outputPath": "dist/codiki",
|
||||||
"index": "src/index.html",
|
"index": "src/index.html",
|
||||||
"browser": "src/main.ts",
|
"browser": "src/main.ts",
|
||||||
"polyfills": [
|
"polyfills": [
|
||||||
"@angular/localize/init"
|
"zone.js"
|
||||||
],
|
],
|
||||||
"tsConfig": "tsconfig.app.json",
|
"tsConfig": "tsconfig.app.json",
|
||||||
"inlineStyleLanguage": "scss",
|
"inlineStyleLanguage": "scss",
|
||||||
@@ -102,7 +102,7 @@
|
|||||||
"defaultConfiguration": ""
|
"defaultConfiguration": ""
|
||||||
},
|
},
|
||||||
"serve": {
|
"serve": {
|
||||||
"builder": "@angular/build:dev-server",
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production-en": {
|
"production-en": {
|
||||||
"buildTarget": "codiki:build:production-en"
|
"buildTarget": "codiki:build:production-en"
|
||||||
@@ -123,15 +123,17 @@
|
|||||||
"defaultConfiguration": "development"
|
"defaultConfiguration": "development"
|
||||||
},
|
},
|
||||||
"extract-i18n": {
|
"extract-i18n": {
|
||||||
"builder": "@angular/build:extract-i18n",
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
"options": {
|
"options": {
|
||||||
"buildTarget": "codiki:build"
|
"buildTarget": "codiki:build"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"test": {
|
"test": {
|
||||||
"builder": "@angular/build:karma",
|
"builder": "@angular-devkit/build-angular:karma",
|
||||||
"options": {
|
"options": {
|
||||||
"polyfills": [
|
"polyfills": [
|
||||||
|
"zone.js",
|
||||||
|
"zone.js/testing"
|
||||||
],
|
],
|
||||||
"tsConfig": "tsconfig.spec.json",
|
"tsConfig": "tsconfig.spec.json",
|
||||||
"inlineStyleLanguage": "scss",
|
"inlineStyleLanguage": "scss",
|
||||||
@@ -151,31 +153,5 @@
|
|||||||
},
|
},
|
||||||
"cli": {
|
"cli": {
|
||||||
"analytics": false
|
"analytics": false
|
||||||
},
|
|
||||||
"schematics": {
|
|
||||||
"@schematics/angular:component": {
|
|
||||||
"type": "component"
|
|
||||||
},
|
|
||||||
"@schematics/angular:directive": {
|
|
||||||
"type": "directive"
|
|
||||||
},
|
|
||||||
"@schematics/angular:service": {
|
|
||||||
"type": "service"
|
|
||||||
},
|
|
||||||
"@schematics/angular:guard": {
|
|
||||||
"typeSeparator": "."
|
|
||||||
},
|
|
||||||
"@schematics/angular:interceptor": {
|
|
||||||
"typeSeparator": "."
|
|
||||||
},
|
|
||||||
"@schematics/angular:module": {
|
|
||||||
"typeSeparator": "."
|
|
||||||
},
|
|
||||||
"@schematics/angular:pipe": {
|
|
||||||
"typeSeparator": "."
|
|
||||||
},
|
|
||||||
"@schematics/angular:resolver": {
|
|
||||||
"typeSeparator": "."
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ http {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location ~ ^/api {
|
location ~ ^/api {
|
||||||
proxy_pass http://192.168.1.153:50011;
|
proxy_pass http://192.168.0.153:50011;
|
||||||
proxy_set_header Host $host:$server_port;
|
proxy_set_header Host $host:$server_port;
|
||||||
proxy_set_header X-Forwarded-Host $server_name;
|
proxy_set_header X-Forwarded-Host $server_name;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
|||||||
13015
frontend/package-lock.json
generated
13015
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -17,26 +17,32 @@
|
|||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^21.1.2",
|
"@angular/animations": "^18.2.5",
|
||||||
"@angular/cdk": "^21.1.2",
|
"@angular/cdk": "^18.2.5",
|
||||||
"@angular/common": "^21.1.2",
|
"@angular/common": "^18.2.5",
|
||||||
"@angular/compiler": "^21.1.2",
|
"@angular/compiler": "^18.2.5",
|
||||||
"@angular/core": "^21.1.2",
|
"@angular/core": "^18.2.5",
|
||||||
"@angular/forms": "^21.1.2",
|
"@angular/forms": "^18.2.5",
|
||||||
"@angular/material": "^21.1.2",
|
"@angular/material": "^18.2.5",
|
||||||
"@angular/platform-browser": "^21.1.2",
|
"@angular/platform-browser": "^18.2.5",
|
||||||
"@angular/platform-browser-dynamic": "^21.1.2",
|
"@angular/platform-browser-dynamic": "^18.2.5",
|
||||||
"@angular/router": "^21.1.2",
|
"@angular/router": "^18.2.5",
|
||||||
"rxjs": "~7.8.2",
|
"rxjs": "~7.8.0",
|
||||||
"tslib": "^2.8.1"
|
"tslib": "^2.3.0",
|
||||||
|
"zone.js": "~0.14.10"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular/build": "^21.1.2",
|
"@angular-devkit/build-angular": "^18.2.5",
|
||||||
"@angular/cli": "^21.1.2",
|
"@angular/cli": "^18.2.5",
|
||||||
"@angular/compiler-cli": "^21.1.2",
|
"@angular/compiler-cli": "^18.2.5",
|
||||||
"@angular/localize": "^21.1.2",
|
"@angular/localize": "^18.2.5",
|
||||||
"@types/jasmine": "~5.1.15",
|
"@types/jasmine": "~5.1.0",
|
||||||
"jasmine-core": "~5.13.0",
|
"jasmine-core": "~5.1.0",
|
||||||
"typescript": "~5.9.3"
|
"karma": "~6.4.0",
|
||||||
|
"karma-chrome-launcher": "~3.2.0",
|
||||||
|
"karma-coverage": "~2.2.0",
|
||||||
|
"karma-jasmine": "~5.1.0",
|
||||||
|
"karma-jasmine-html-reporter": "~2.1.0",
|
||||||
|
"typescript": "~5.5.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { CommonModule } from '@angular/common';
|
||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import { RouterOutlet } from '@angular/router';
|
import { RouterOutlet } from '@angular/router';
|
||||||
import { HeaderComponent } from './components/header/header.component';
|
import { HeaderComponent } from './components/header/header.component';
|
||||||
@@ -5,7 +6,9 @@ import {FooterComponent} from './components/footer/footer.component';
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
|
standalone: true,
|
||||||
imports: [
|
imports: [
|
||||||
|
CommonModule,
|
||||||
RouterOutlet,
|
RouterOutlet,
|
||||||
HeaderComponent,
|
HeaderComponent,
|
||||||
FooterComponent
|
FooterComponent
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
import {ApplicationConfig, inject, provideAppInitializer} from '@angular/core';
|
import { ApplicationConfig } from '@angular/core';
|
||||||
import { provideRouter, withRouterConfig } from '@angular/router';
|
import { provideRouter, withRouterConfig } from '@angular/router';
|
||||||
|
|
||||||
import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
|
import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
|
||||||
import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
|
import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
|
||||||
import { routes } from './app.routes';
|
import { routes } from './app.routes';
|
||||||
import { JwtInterceptor } from './core/interceptor/jwt.interceptor';
|
import { JwtInterceptor } from './core/interceptor/jwt.interceptor';
|
||||||
import {AuthenticationService} from './core/service/authentication.service';
|
|
||||||
|
|
||||||
export const appConfig: ApplicationConfig = {
|
export const appConfig: ApplicationConfig = {
|
||||||
providers: [
|
providers: [
|
||||||
@@ -19,9 +18,5 @@ export const appConfig: ApplicationConfig = {
|
|||||||
provideAnimationsAsync(),
|
provideAnimationsAsync(),
|
||||||
provideHttpClient(withInterceptorsFromDi()),
|
provideHttpClient(withInterceptorsFromDi()),
|
||||||
{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
|
{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
|
||||||
provideAppInitializer(() => {
|
|
||||||
const initializerFn = ((authenticationService: AuthenticationService) => () => authenticationService.startAuthenticationCheckingProcess())(inject(AuthenticationService));
|
|
||||||
return initializerFn();
|
|
||||||
})
|
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,16 +1,13 @@
|
|||||||
import { Routes } from '@angular/router';
|
import { Routes } from '@angular/router';
|
||||||
import {alreadyAuthenticatedGuard} from './core/guard/already-authenticated.guard';
|
|
||||||
|
|
||||||
export const routes: Routes = [
|
export const routes: Routes = [
|
||||||
{
|
{
|
||||||
path: 'login',
|
path: 'login',
|
||||||
loadComponent: () => import('./pages/login/login.component').then(module => module.LoginComponent),
|
loadComponent: () => import('./pages/login/login.component').then(module => module.LoginComponent)
|
||||||
canActivate: [alreadyAuthenticatedGuard]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'signin',
|
path: 'signin',
|
||||||
loadComponent: () => import('./pages/signin/signin.component').then(module => module.SigninComponent),
|
loadComponent: () => import('./pages/signin/signin.component').then(module => module.SigninComponent)
|
||||||
canActivate: [alreadyAuthenticatedGuard]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'disconnect',
|
path: 'disconnect',
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<h1>{{title}}</h1>
|
<h1>{{title}}</h1>
|
||||||
<h2>{{description}}</h2>
|
<h2>{{description}}</h2>
|
||||||
<footer>
|
<footer>
|
||||||
<button type="button" class="cod-button secondary" (click)="closeDialog()" matRipple i18n>
|
<button type="button" class="secondary" (click)="closeDialog()" i18n>
|
||||||
No
|
No
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="cod-button" (click)="closeAndValidate()" matRipple i18n>
|
<button type="button" (click)="closeAndValidate()" i18n>
|
||||||
Yes
|
Yes
|
||||||
</button>
|
</button>
|
||||||
</footer>
|
</footer>
|
||||||
@@ -8,5 +8,32 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
|
button {
|
||||||
|
padding: .8em 1.2em;
|
||||||
|
border-radius: 10em;
|
||||||
|
border: none;
|
||||||
|
background-color: #3f51b5;
|
||||||
|
color: white;
|
||||||
|
transition: background-color .2s ease-in-out;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #5b6ed8;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.secondary {
|
||||||
|
color: #3f51b5;
|
||||||
|
background-color: white;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #f2f4ff;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
import {Component, inject} from "@angular/core";
|
import { Component, inject, Input } from "@angular/core";
|
||||||
import {MatRippleModule} from "@angular/material/core";
|
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog";
|
import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog";
|
||||||
|
|
||||||
export interface ConfirmationDialogData {
|
export interface ConfirmationDialogData {
|
||||||
@@ -9,9 +8,10 @@ export interface ConfirmationDialogData {
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-confirmation-dialog',
|
selector: 'app-confirmation-dialog',
|
||||||
|
standalone: true,
|
||||||
templateUrl: './confirmation-dialog.component.html',
|
templateUrl: './confirmation-dialog.component.html',
|
||||||
styleUrl: './confirmation-dialog.component.scss',
|
styleUrl: './confirmation-dialog.component.scss',
|
||||||
imports: [MatRippleModule]
|
imports: []
|
||||||
})
|
})
|
||||||
export class ConfirmationDialog {
|
export class ConfirmationDialog {
|
||||||
private readonly dialogRef = inject(MatDialogRef<ConfirmationDialog>);
|
private readonly dialogRef = inject(MatDialogRef<ConfirmationDialog>);
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<div i18n>
|
<div i18n>
|
||||||
<span class="copy-left">©</span>
|
<span class="copy-left">©</span>
|
||||||
2016 - 2026 All rights reserved
|
2016 - 2024 All rights reserved
|
||||||
-
|
-
|
||||||
2.2
|
2.0-alpha
|
||||||
<a [routerLink]="['./']" matTooltip="Health checking will be available in future..." i18n-matTooltip>
|
<a [routerLink]="['./']" matTooltip="Health checking will be available in future..." i18n-matTooltip>
|
||||||
<mat-icon>favorite</mat-icon>
|
<mat-icon>favorite</mat-icon>
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -12,12 +12,10 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: .2em;
|
|
||||||
|
|
||||||
.copy-left {
|
.copy-left {
|
||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: rgba(255,255,255,.6);
|
color: rgba(255,255,255,.6);
|
||||||
|
|||||||
@@ -5,9 +5,11 @@ import {RouterModule} from '@angular/router';
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-footer',
|
selector: 'app-footer',
|
||||||
|
standalone: true,
|
||||||
imports: [MatIconModule, MatTooltipModule, RouterModule],
|
imports: [MatIconModule, MatTooltipModule, RouterModule],
|
||||||
templateUrl: './footer.component.html',
|
templateUrl: './footer.component.html',
|
||||||
styleUrl: './footer.component.scss'
|
styleUrl: './footer.component.scss'
|
||||||
})
|
})
|
||||||
export class FooterComponent {
|
export class FooterComponent {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,5 @@
|
|||||||
<div class="left">
|
<div class="left">
|
||||||
<button type="button"
|
<button type="button" (click)="sideMenu.open()" matTooltip="Click to show side menu" i18n-matTooltip>
|
||||||
(click)="sideMenu.open()"
|
|
||||||
class="cod-button icon"
|
|
||||||
matTooltip="Click to show side menu"
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
<mat-icon>menu</mat-icon>
|
<mat-icon>menu</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<a [routerLink]="['/home']">
|
<a [routerLink]="['/home']">
|
||||||
@@ -19,10 +14,7 @@
|
|||||||
|
|
||||||
<div class="right">
|
<div class="right">
|
||||||
@if (isAuthenticated) {
|
@if (isAuthenticated) {
|
||||||
<button type="button"
|
<button mat-button class="button" [matMenuTriggerFor]="authenticatedUserMenu">
|
||||||
class="cod-button icon"
|
|
||||||
[matMenuTriggerFor]="authenticatedUserMenu"
|
|
||||||
matRipple>
|
|
||||||
<mat-icon>more_vert</mat-icon>
|
<mat-icon>more_vert</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<mat-menu #authenticatedUserMenu="matMenu">
|
<mat-menu #authenticatedUserMenu="matMenu">
|
||||||
@@ -38,7 +30,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</mat-menu>
|
</mat-menu>
|
||||||
} @else {
|
} @else {
|
||||||
<a [routerLink]="['/login']" class="cod-button" matRipple i18n>Login</a>
|
<a [routerLink]="['/login']" class="button" matRipple i18n>Login</a>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
<app-side-menu #sideMenu></app-side-menu>
|
<app-side-menu #sideMenu></app-side-menu>
|
||||||
@@ -26,6 +26,25 @@ $headerHeight: 3.5em;
|
|||||||
padding: 0 1em;
|
padding: 0 1em;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
|
|
||||||
|
button {
|
||||||
|
background-color: #3f51b5;
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
border-radius: 10em;
|
||||||
|
transition: background-color .2s ease-in-out;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
$buttonSize: 2.5em;
|
||||||
|
width: $buttonSize;
|
||||||
|
height: $buttonSize;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
background-color: #5c6bc0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
@@ -101,10 +120,45 @@ $headerHeight: 3.5em;
|
|||||||
top: 0;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
margin-right: .5em;
|
|
||||||
|
|
||||||
a, button {
|
a {
|
||||||
margin: .5em;
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
min-width: 5em;
|
||||||
|
color: white;
|
||||||
|
margin: 0.5em 0.5em;
|
||||||
|
border-radius: 10em;
|
||||||
|
text-decoration: none;
|
||||||
|
padding: 0 .8em;
|
||||||
|
background-color: #3f51b5;
|
||||||
|
transition: background-color .2s ease-in-out;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #5c6bc0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
min-width: 2.5em;
|
||||||
|
color: white;
|
||||||
|
margin: 0.5em 0.5em;
|
||||||
|
border-radius: 10em;
|
||||||
|
text-decoration: none;
|
||||||
|
padding: 0;
|
||||||
|
background-color: #3f51b5;
|
||||||
|
transition: background-color .2s ease-in-out;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #5c6bc0;
|
||||||
|
}
|
||||||
|
|
||||||
|
mat-icon {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { CommonModule } from '@angular/common';
|
||||||
import { Component, inject } from '@angular/core';
|
import { Component, inject } from '@angular/core';
|
||||||
import { FormControl, ReactiveFormsModule } from '@angular/forms';
|
import { FormControl, ReactiveFormsModule } from '@angular/forms';
|
||||||
import { MatButtonModule } from '@angular/material/button';
|
import { MatButtonModule } from '@angular/material/button';
|
||||||
@@ -12,7 +13,9 @@ import {SideMenuComponent} from '../side-menu/side-menu.component';
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-header',
|
selector: 'app-header',
|
||||||
|
standalone: true,
|
||||||
imports: [
|
imports: [
|
||||||
|
CommonModule,
|
||||||
MatButtonModule,
|
MatButtonModule,
|
||||||
MatIconModule,
|
MatIconModule,
|
||||||
MatMenuModule,
|
MatMenuModule,
|
||||||
@@ -21,10 +24,10 @@ import {SideMenuComponent} from '../side-menu/side-menu.component';
|
|||||||
PublicationsSearchBarComponent,
|
PublicationsSearchBarComponent,
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
RouterModule,
|
RouterModule,
|
||||||
SideMenuComponent
|
SideMenuComponent,
|
||||||
],
|
],
|
||||||
templateUrl: './header.component.html',
|
templateUrl: './header.component.html',
|
||||||
styleUrl: './header.component.scss'
|
styleUrl: './header.component.scss',
|
||||||
})
|
})
|
||||||
export class HeaderComponent {
|
export class HeaderComponent {
|
||||||
private authenticationService = inject(AuthenticationService);
|
private authenticationService = inject(AuthenticationService);
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
<button type="button"
|
<button type="button" class="close" (click)="closeDialog()">
|
||||||
(click)="closeDialog()"
|
|
||||||
class="cod-button icon secondary close"
|
|
||||||
matTooltip="Close"
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
<mat-icon>close</mat-icon>
|
<mat-icon>close</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<header>
|
<header>
|
||||||
<h1 i18n>Add a code block</h1>
|
<h1 i18n>Add a code block</h1>
|
||||||
</header>
|
</header>
|
||||||
<form [formGroup]="formGroup" (submit)="closeAndValidate()" class="cod-form" ngNativeValidate>
|
<form [formGroup]="formGroup" (submit)="closeAndValidate()" ngNativeValidate>
|
||||||
<div class="form-content">
|
<div class="form-content">
|
||||||
<mat-form-field>
|
<mat-form-field>
|
||||||
<mat-label i18n>Programming language</mat-label>
|
<mat-label i18n>Programming language</mat-label>
|
||||||
@@ -26,11 +21,11 @@
|
|||||||
<textarea matInput formControlName="codeBlock"></textarea>
|
<textarea matInput formControlName="codeBlock"></textarea>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
<div class="actions reversed">
|
<div class="actions">
|
||||||
<button type="submit" class="cod-button" matRipple i18n>
|
<button type="submit" i18n>
|
||||||
Validate
|
Validate
|
||||||
</button>
|
</button>
|
||||||
<button type="button" (click)="closeDialog()" class="cod-button secondary" matRipple i18n>
|
<button type="button" (click)="closeDialog()" class="secondary" i18n>
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,6 +6,20 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
max-height: 90vh;
|
max-height: 90vh;
|
||||||
|
|
||||||
|
.close {
|
||||||
|
position: absolute;
|
||||||
|
top: 1em;
|
||||||
|
right: 1em;
|
||||||
|
width: 2.5em;
|
||||||
|
height: 2.5em;
|
||||||
|
border-radius: 10em;
|
||||||
|
border: none;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
header {
|
header {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -25,6 +39,40 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.actions {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row-reverse;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
button {
|
||||||
|
padding: .8em 1.2em;
|
||||||
|
border-radius: 10em;
|
||||||
|
border: none;
|
||||||
|
background-color: #3f51b5;
|
||||||
|
color: white;
|
||||||
|
transition: background-color .2s ease-in-out;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #5b6ed8;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.secondary {
|
||||||
|
color: #3f51b5;
|
||||||
|
background-color: white;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #f2f4ff;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,10 @@
|
|||||||
import { Component, inject } from "@angular/core";
|
import { Component, inject } from "@angular/core";
|
||||||
import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angular/forms";
|
import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angular/forms";
|
||||||
import {MatRippleModule} from "@angular/material/core";
|
|
||||||
import { MatDialogRef } from "@angular/material/dialog";
|
import { MatDialogRef } from "@angular/material/dialog";
|
||||||
import { MatFormFieldModule } from "@angular/material/form-field";
|
import { MatFormFieldModule } from "@angular/material/form-field";
|
||||||
import { MatIcon } from "@angular/material/icon";
|
import { MatIcon } from "@angular/material/icon";
|
||||||
import { MatInputModule } from "@angular/material/input";
|
import { MatInputModule } from "@angular/material/input";
|
||||||
import { MatSelectModule } from '@angular/material/select';
|
import { MatSelectModule } from '@angular/material/select';
|
||||||
import {MatTooltip} from "@angular/material/tooltip";
|
|
||||||
|
|
||||||
export interface ProgramingLanguage {
|
export interface ProgramingLanguage {
|
||||||
code: string;
|
code: string;
|
||||||
@@ -86,15 +84,14 @@ export const PROGRAMMING_LANGUAGES: ProgramingLanguage[] = [
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-code-block-dialog',
|
selector: 'app-code-block-dialog',
|
||||||
|
standalone: true,
|
||||||
templateUrl: './code-block-dialog.component.html',
|
templateUrl: './code-block-dialog.component.html',
|
||||||
styleUrl: './code-block-dialog.component.scss',
|
styleUrl: './code-block-dialog.component.scss',
|
||||||
imports: [
|
imports: [
|
||||||
MatFormFieldModule,
|
MatFormFieldModule,
|
||||||
MatIcon,
|
MatIcon,
|
||||||
MatInputModule,
|
MatInputModule,
|
||||||
MatRippleModule,
|
|
||||||
MatSelectModule,
|
MatSelectModule,
|
||||||
MatTooltip,
|
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,23 +1,17 @@
|
|||||||
<button type="button"
|
<button type="button" class="close" (click)="closeDialog()">
|
||||||
(click)="closeDialog()"
|
|
||||||
class="cod-button icon secondary close"
|
|
||||||
matTooltip="Close"
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
<mat-icon>close</mat-icon>
|
<mat-icon>close</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<header>
|
<header>
|
||||||
<h1 i18n>Select an illustration</h1>
|
<h1 i18n>Select an illustration</h1>
|
||||||
</header>
|
</header>
|
||||||
<div class="picture-container">
|
<div class="picture-container">
|
||||||
@if (isLoading()) {
|
@if (isLoading) {
|
||||||
<h2 i18n>Pictures loading...</h2>
|
<h2 i18n>Pictures loading...</h2>
|
||||||
<mat-spinner></mat-spinner>
|
<mat-spinner></mat-spinner>
|
||||||
} @else {
|
} @else {
|
||||||
@if (pictures.length) {
|
@if (pictures.length) {
|
||||||
@for(picture of pictures; track picture) {
|
@for(picture of pictures; track picture) {
|
||||||
<img src="/api/pictures/{{picture.id}}" (click)="selectPicture(picture)" matTooltip="Choose this illustration"
|
<img src="/api/pictures/{{picture.id}}" (click)="selectPicture(picture)" matTooltip="Choose this illustration" i18n-matTooltip/>
|
||||||
i18n-matTooltip/>
|
|
||||||
}
|
}
|
||||||
} @else {
|
} @else {
|
||||||
<h2 i18n>There is no any picture.</h2>
|
<h2 i18n>There is no any picture.</h2>
|
||||||
@@ -25,18 +19,10 @@
|
|||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
<footer>
|
<footer>
|
||||||
<button type="button"
|
<button type="button" class="secondary" matRipple (click)="closeDialog()" i18n>
|
||||||
(click)="closeDialog()"
|
|
||||||
class="cod-button secondary"
|
|
||||||
matRipple
|
|
||||||
i18n>
|
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button type="button"
|
<button type="button" (click)="fileUpload.click()" matRipple i18n>
|
||||||
(click)="fileUpload.click()"
|
|
||||||
class="cod-button"
|
|
||||||
matRipple
|
|
||||||
i18n>
|
|
||||||
<mat-icon>upload_file</mat-icon>
|
<mat-icon>upload_file</mat-icon>
|
||||||
Add new picture
|
Add new picture
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -6,6 +6,20 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
max-height: 90vh;
|
max-height: 90vh;
|
||||||
|
|
||||||
|
.close {
|
||||||
|
position: absolute;
|
||||||
|
top: 1em;
|
||||||
|
right: 1em;
|
||||||
|
width: 2.5em;
|
||||||
|
height: 2.5em;
|
||||||
|
border-radius: 10em;
|
||||||
|
border: none;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
header {
|
header {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import {Component, inject, OnInit, signal} from "@angular/core";
|
import { Component, inject, OnInit } from "@angular/core";
|
||||||
import { Picture } from "../../../core/rest-services/picture/model/picture";
|
import { Picture } from "../../../core/rest-services/picture/model/picture";
|
||||||
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
|
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
|
||||||
import { MatSnackBar } from "@angular/material/snack-bar";
|
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||||
@@ -10,26 +10,22 @@ import {MatTooltip} from "@angular/material/tooltip";
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-picture-selection',
|
selector: 'app-picture-selection',
|
||||||
|
standalone: true,
|
||||||
|
imports: [MatProgressSpinnerModule, MatIcon, MatRippleModule, MatTooltip],
|
||||||
templateUrl: './picture-selection-dialog.component.html',
|
templateUrl: './picture-selection-dialog.component.html',
|
||||||
styleUrl: './picture-selection-dialog.component.scss',
|
styleUrl: './picture-selection-dialog.component.scss',
|
||||||
imports: [
|
|
||||||
MatIcon,
|
|
||||||
MatRippleModule,
|
|
||||||
MatProgressSpinnerModule,
|
|
||||||
MatTooltip
|
|
||||||
]
|
|
||||||
})
|
})
|
||||||
export class PictureSelectionDialog implements OnInit {
|
export class PictureSelectionDialog implements OnInit {
|
||||||
private readonly pictureRestService = inject(PictureRestService);
|
private readonly pictureRestService = inject(PictureRestService);
|
||||||
private readonly snackBar = inject(MatSnackBar);
|
private readonly snackBar = inject(MatSnackBar);
|
||||||
private readonly dialogRef = inject(MatDialogRef<PictureSelectionDialog>);
|
private readonly dialogRef = inject(MatDialogRef<PictureSelectionDialog>);
|
||||||
|
|
||||||
isLoading = signal(false);
|
isLoading: boolean = false;
|
||||||
isLoaded = signal(false);
|
isLoaded: boolean = false;
|
||||||
pictures: Picture[] = [];
|
pictures: Picture[] = [];
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.isLoading.set(true);
|
this.isLoading = true;
|
||||||
this.pictureRestService.getAllOfCurrentUser()
|
this.pictureRestService.getAllOfCurrentUser()
|
||||||
.then(pictures => {
|
.then(pictures => {
|
||||||
this.pictures = pictures;
|
this.pictures = pictures;
|
||||||
@@ -38,14 +34,14 @@ export class PictureSelectionDialog implements OnInit {
|
|||||||
if (error.status === 401) {
|
if (error.status === 401) {
|
||||||
this.dialogRef.close();
|
this.dialogRef.close();
|
||||||
} else {
|
} else {
|
||||||
const errorMessage = $localize`An error occurred while loading pictures.`;
|
const errorMessage = $localize`An error occured while loading pictures.`;
|
||||||
console.error(errorMessage, error);
|
console.error(errorMessage, error);
|
||||||
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
this.isLoading.set(false);
|
this.isLoading = false;
|
||||||
this.isLoaded.set(true);
|
this.isLoaded = true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,7 +61,7 @@ export class PictureSelectionDialog implements OnInit {
|
|||||||
this.dialogRef.close(pictureId);
|
this.dialogRef.close(pictureId);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
const errorMessage = $localize`A technical error occurred while uploading your picture.`;
|
const errorMessage = $localize`A technical error occured while uploading your picture.`;
|
||||||
console.error(errorMessage, error);
|
console.error(errorMessage, error);
|
||||||
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<form [formGroup]="publicationEditionForm" (submit)="save()" ngNativeValidate>
|
<form [formGroup]="publicationEditionForm" (submit)="save()" ngNativeValidate>
|
||||||
<header>
|
<header>
|
||||||
<h1>{{ title() }}</h1>
|
<h1>{{title}}</h1>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<mat-tab-group dynamicHeight (selectedIndexChange)="onTabChange($event)">
|
<mat-tab-group dynamicHeight (selectedIndexChange)="onTabChange($event)">
|
||||||
@@ -29,8 +29,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="picture-container">
|
<div class="picture-container">
|
||||||
<img
|
<img [src]="publication.illustrationId.length ? '/api/pictures/' + publication.illustrationId : '/assets/images/default-picture.png'"
|
||||||
[src]="publication().illustrationId.length ? '/api/pictures/' + publication().illustrationId : '/assets/images/default-picture.png'"
|
|
||||||
(click)="displayPictureSectionDialog()"
|
(click)="displayPictureSectionDialog()"
|
||||||
matTooltip="Click to change illustration"
|
matTooltip="Click to change illustration"
|
||||||
i18n-matTooltip/>
|
i18n-matTooltip/>
|
||||||
@@ -38,53 +37,25 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="actions">
|
<div class="actions">
|
||||||
<button type="button"
|
<button type="button" matTooltip="Click to insert a title 1 section" (click)="insertTitle(1)" i18n-matTooltip>
|
||||||
(click)="insertTitle(1)"
|
|
||||||
matTooltip="Click to insert a title 1 section"
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
H1
|
H1
|
||||||
</button>
|
</button>
|
||||||
<button type="button"
|
<button type="button" matTooltip="Click to insert a title 2 section" (click)="insertTitle(2)" i18n-matTooltip>
|
||||||
(click)="insertTitle(2)"
|
|
||||||
matTooltip="Click to insert a title 2 section"
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
H2
|
H2
|
||||||
</button>
|
</button>
|
||||||
<button type="button"
|
<button type="button" matTooltip="Click to insert a title 3 section" (click)="insertTitle(3)" i18n-matTooltip>
|
||||||
(click)="insertTitle(3)"
|
|
||||||
matTooltip="Click to insert a title 3 section"
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
H3
|
H3
|
||||||
</button>
|
</button>
|
||||||
<button type="button"
|
<button type="button" matTooltip="Click to insert a picture" (click)="selectAPicture()" i18n-matTooltip>
|
||||||
(click)="insertLink()"
|
|
||||||
matTooltip="Click to insert a link"
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
<mat-icon>link</mat-icon>
|
|
||||||
</button>
|
|
||||||
<button type="button"
|
|
||||||
(click)="selectAPicture()"
|
|
||||||
matTooltip="Click to insert a picture"
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
<mat-icon>image</mat-icon>
|
<mat-icon>image</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<button type="button"
|
<button type="button" matTooltip="Click to insert a link" (click)="insertLink()" i18n-matTooltip>
|
||||||
(click)="displayCodeBlockDialog()"
|
<mat-icon>link</mat-icon>
|
||||||
matTooltip="Click to insert a code block"
|
</button>
|
||||||
matRipple
|
<button type="button" matTooltip="Click to insert a code block" (click)="displayCodeBlockDialog()" i18n-matTooltip>
|
||||||
i18n-matTooltip>
|
|
||||||
<mat-icon>code</mat-icon>
|
<mat-icon>code</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<button type="button"
|
<button type="button" disabled matTooltip="Click to display editor help" i18n-matTooltip>
|
||||||
matTooltip="Click to display editor help"
|
|
||||||
disabled
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
<mat-icon>help</mat-icon>
|
<mat-icon>help</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -104,29 +75,25 @@
|
|||||||
|
|
||||||
<mat-tab label="Previewing" i18n-label>
|
<mat-tab label="Previewing" i18n-label>
|
||||||
<div class="preview">
|
<div class="preview">
|
||||||
@if (isPreviewing()) {
|
@if ((isPreviewing$ | async) === true) {
|
||||||
<div class="preview-loading">
|
<div class="preview-loading">
|
||||||
<h2 i18n>Preview is loading...</h2>
|
<h2 i18n>Preview is loading...</h2>
|
||||||
<mat-spinner></mat-spinner>
|
<mat-spinner></mat-spinner>
|
||||||
</div>
|
</div>
|
||||||
} @else {
|
} @else {
|
||||||
<img class="illustration" src="/api/pictures/{{ publication().illustrationId }}"/>
|
<img class="illustration" src="/api/pictures/{{ publication.illustrationId }}" />
|
||||||
<header>
|
<header>
|
||||||
<h1>{{ publication().title }}</h1>
|
<h1>{{ publication.title }}</h1>
|
||||||
<h2>{{ publication().description }}</h2>
|
<h2>{{ publication.description }}</h2>
|
||||||
</header>
|
</header>
|
||||||
<main [innerHTML]="publicationInEdition().parsedText"></main>
|
<main [innerHTML]="publicationInEdition.parsedText"></main>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
</mat-tab-group>
|
</mat-tab-group>
|
||||||
<footer>
|
<footer>
|
||||||
<app-submit-button [requestPending]="isSaving()" i18n>Save</app-submit-button>
|
<app-submit-button label="Save" [requestPending]="!!(isSaving$ | async)" i18n-label></app-submit-button>
|
||||||
<button type="button"
|
<button type="button" class="secondary" (click)="goPreviousLocation()" i18n>
|
||||||
class="cod-button secondary"
|
|
||||||
(click)="goPreviousLocation()"
|
|
||||||
matRipple
|
|
||||||
i18n>
|
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
</footer>
|
</footer>
|
||||||
|
|||||||
@@ -102,11 +102,6 @@
|
|||||||
|
|
||||||
button {
|
button {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
border-radius: 10em;
|
|
||||||
border: none;
|
|
||||||
background-color: #3f51b5;
|
|
||||||
color: white;
|
|
||||||
transition: background-color .2s ease-in-out;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -114,6 +109,17 @@
|
|||||||
height: 3em;
|
height: 3em;
|
||||||
box-shadow: 0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12);
|
box-shadow: 0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12);
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
button, a.button {
|
||||||
|
padding: .8em 1.2em;
|
||||||
|
border-radius: 10em;
|
||||||
|
border: none;
|
||||||
|
background-color: #3f51b5;
|
||||||
|
color: white;
|
||||||
|
transition: background-color .2s ease-in-out;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: #5b6ed8;
|
background-color: #5b6ed8;
|
||||||
@@ -124,6 +130,14 @@
|
|||||||
background-color: #5f6aa6;
|
background-color: #5f6aa6;
|
||||||
cursor: not-allowed;
|
cursor: not-allowed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.secondary {
|
||||||
|
color: #3f51b5;
|
||||||
|
background-color: white;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #f2f4ff;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { CommonModule, Location } from "@angular/common";
|
import { CommonModule, Location } from "@angular/common";
|
||||||
import {Component, effect, inject, input, output, signal} from "@angular/core";
|
import { Component, EventEmitter, inject, Input, OnChanges, OnDestroy, Output } from "@angular/core";
|
||||||
import {FormGroup, ReactiveFormsModule} from "@angular/forms";
|
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";
|
||||||
import { MatDialogModule } from "@angular/material/dialog";
|
import { MatDialogModule } from "@angular/material/dialog";
|
||||||
import { MatIconModule } from "@angular/material/icon";
|
import { MatIconModule } from "@angular/material/icon";
|
||||||
import { MatInputModule } from "@angular/material/input";
|
import { MatInputModule } from "@angular/material/input";
|
||||||
@@ -8,16 +8,17 @@ import {MatProgressSpinnerModule} from "@angular/material/progress-spinner";
|
|||||||
import { MatSelectModule } from "@angular/material/select";
|
import { MatSelectModule } from "@angular/material/select";
|
||||||
import { MatTabsModule } from "@angular/material/tabs";
|
import { MatTabsModule } from "@angular/material/tabs";
|
||||||
import { MatTooltipModule } from "@angular/material/tooltip";
|
import { MatTooltipModule } from "@angular/material/tooltip";
|
||||||
import {map, Observable} from "rxjs";
|
import { map, Observable, of, Subscription } from "rxjs";
|
||||||
import { Category } from "../../core/rest-services/category/model/category";
|
import { Category } from "../../core/rest-services/category/model/category";
|
||||||
import {DEFAULT_PUBLICATION, Publication} from "../../core/rest-services/publications/model/publication";
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
import { CategoryService } from "../../core/service/category.service";
|
import { CategoryService } from "../../core/service/category.service";
|
||||||
import { SubmitButtonComponent } from "../submit-button/submit-button.component";
|
import { SubmitButtonComponent } from "../submit-button/submit-button.component";
|
||||||
|
import { PictureSelectionDialog } from "./picture-selection-dialog/picture-selection-dialog.component";
|
||||||
import { PublicationEditionService } from "./publication-edition.service";
|
import { PublicationEditionService } from "./publication-edition.service";
|
||||||
import {MatRippleModule} from "@angular/material/core";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-publication-edition',
|
selector: 'app-publication-edition',
|
||||||
|
standalone: true,
|
||||||
templateUrl: './publication-edition.component.html',
|
templateUrl: './publication-edition.component.html',
|
||||||
styleUrl: './publication-edition.component.scss',
|
styleUrl: './publication-edition.component.scss',
|
||||||
imports: [
|
imports: [
|
||||||
@@ -25,47 +26,51 @@ import {MatRippleModule} from "@angular/material/core";
|
|||||||
MatDialogModule,
|
MatDialogModule,
|
||||||
MatIconModule,
|
MatIconModule,
|
||||||
MatInputModule,
|
MatInputModule,
|
||||||
MatRippleModule,
|
|
||||||
MatProgressSpinnerModule,
|
MatProgressSpinnerModule,
|
||||||
MatSelectModule,
|
MatSelectModule,
|
||||||
MatTabsModule,
|
MatTabsModule,
|
||||||
MatTooltipModule,
|
MatTooltipModule,
|
||||||
|
PictureSelectionDialog,
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
SubmitButtonComponent
|
SubmitButtonComponent
|
||||||
],
|
],
|
||||||
providers: [PublicationEditionService]
|
providers: [PublicationEditionService]
|
||||||
})
|
})
|
||||||
export class PublicationEditionComponent {
|
export class PublicationEditionComponent implements OnChanges, OnDestroy {
|
||||||
readonly #categoryService = inject(CategoryService);
|
@Input()
|
||||||
readonly #location = inject(Location);
|
publication!: Publication;
|
||||||
readonly #publicationEditionService = inject(PublicationEditionService);
|
@Input()
|
||||||
|
title!: string;
|
||||||
|
@Input()
|
||||||
|
isSaving$: Observable<boolean> = of(false);
|
||||||
|
@Output()
|
||||||
|
publicationSave = new EventEmitter<Publication>();
|
||||||
|
|
||||||
publication = input.required<Publication>();
|
publicationInEdition!: Publication;
|
||||||
title = input.required<string>();
|
private readonly categoryService = inject(CategoryService);
|
||||||
isSaving = input.required<boolean>();
|
private readonly formBuilder = inject(FormBuilder);
|
||||||
publicationSave = output<Publication>();
|
private readonly location = inject(Location);
|
||||||
|
private readonly publicationEditionService = inject(PublicationEditionService);
|
||||||
|
private subscriptions: Subscription[] = [];
|
||||||
|
|
||||||
isLoading = this.#publicationEditionService.isLoading;
|
publicationEditionForm: FormGroup = this.formBuilder.group({
|
||||||
isPreviewing = this.#publicationEditionService.isPreviewing;
|
title: new FormControl<string | undefined>('', [Validators.required]),
|
||||||
publicationInEdition = signal<Publication>(DEFAULT_PUBLICATION);
|
description: new FormControl<string | undefined>('', [Validators.required]),
|
||||||
|
text: new FormControl<string | undefined>('', [Validators.required]),
|
||||||
constructor() {
|
illustrationId: new FormControl<string | undefined>('', [Validators.required]),
|
||||||
effect(() => {
|
categoryId: new FormControl<string | undefined>('', [Validators.required])
|
||||||
let publication = this.publication();
|
|
||||||
const publicationInEdition = this.publicationInEdition();
|
|
||||||
if (!publicationInEdition || publicationInEdition !== publication) {
|
|
||||||
this.publicationInEdition.set(publication);
|
|
||||||
this.#publicationEditionService.init(publication);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
get isLoading$(): Observable<boolean> {
|
||||||
|
return this.publicationEditionService.isLoading$;
|
||||||
}
|
}
|
||||||
|
|
||||||
get publicationEditionForm(): FormGroup {
|
get isPreviewing$(): Observable<boolean> {
|
||||||
return this.#publicationEditionService.publicationEditionForm;
|
return this.publicationEditionService.isPreviewing$;
|
||||||
}
|
}
|
||||||
|
|
||||||
get categories$(): Observable<Category[]> {
|
get categories$(): Observable<Category[]> {
|
||||||
return this.#categoryService.categories$
|
return this.categoryService.categories$
|
||||||
.pipe(
|
.pipe(
|
||||||
map(categories =>
|
map(categories =>
|
||||||
categories.filter(category => category.subCategories.length == 0)
|
categories.filter(category => category.subCategories.length == 0)
|
||||||
@@ -88,28 +93,83 @@ export class PublicationEditionComponent {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnChanges(): void {
|
||||||
|
this.ngOnDestroy();
|
||||||
|
|
||||||
|
this.publicationInEdition = this.publication;
|
||||||
|
this.publicationEditionService.init(this.publicationInEdition);
|
||||||
|
|
||||||
|
['title', 'description', 'text'].forEach(fieldName => {
|
||||||
|
const fieldSubscription = this.publicationEditionForm.controls[fieldName].valueChanges
|
||||||
|
.pipe(
|
||||||
|
map(value => value?.length ? value as string : '')
|
||||||
|
)
|
||||||
|
.subscribe(fieldValue => {
|
||||||
|
switch (fieldName) {
|
||||||
|
case 'title':
|
||||||
|
this.publicationEditionService.editTitle(fieldValue);
|
||||||
|
break;
|
||||||
|
case 'description':
|
||||||
|
this.publicationEditionService.editDescription(fieldValue);
|
||||||
|
break;
|
||||||
|
case 'text':
|
||||||
|
this.publicationEditionService.editText(fieldValue);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this.subscriptions.push(fieldSubscription);
|
||||||
|
});
|
||||||
|
|
||||||
|
const categoryIdChangeSubscription = this.publicationEditionForm.controls['categoryId'].valueChanges
|
||||||
|
.subscribe(newCategoryId => {
|
||||||
|
this.publicationEditionService.editCategoryId(newCategoryId);
|
||||||
|
});
|
||||||
|
this.subscriptions.push(categoryIdChangeSubscription);
|
||||||
|
|
||||||
|
const publicationSubscription = this.publicationEditionService.state$.subscribe(state => {
|
||||||
|
console.log(state.publication.parsedText.substring(0, 15));
|
||||||
|
this.publicationInEdition = state.publication;
|
||||||
|
this.publicationEditionForm.controls['title'].setValue(this.publicationInEdition.title, { emitEvent: false });
|
||||||
|
this.publicationEditionForm.controls['description'].setValue(this.publicationInEdition.description, { emitEvent: false });
|
||||||
|
this.publicationEditionForm.controls['text'].setValue(this.publicationInEdition.text, { emitEvent: false });
|
||||||
|
this.publicationEditionForm.controls['illustrationId'].setValue(this.publicationInEdition.illustrationId, { emitEvent: false });
|
||||||
|
this.publicationEditionForm.controls['categoryId'].setValue(this.publicationInEdition.categoryId, { emitEvent: false });
|
||||||
|
});
|
||||||
|
this.subscriptions.push(publicationSubscription);
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.subscriptions.forEach(subscription => subscription?.unsubscribe());
|
||||||
|
}
|
||||||
|
|
||||||
goPreviousLocation(): void {
|
goPreviousLocation(): void {
|
||||||
this.#location.back();
|
this.location.back();
|
||||||
}
|
}
|
||||||
|
|
||||||
insertTitle(titleNumber: number): void {
|
insertTitle(titleNumber: number): void {
|
||||||
this.#publicationEditionService.insertTitle(titleNumber);
|
this.publicationEditionService.insertTitle(titleNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
selectAPicture(): void {
|
selectAPicture(): void {
|
||||||
this.#publicationEditionService.selectAPicture();
|
this.publicationEditionService.selectAPicture();
|
||||||
}
|
}
|
||||||
|
|
||||||
insertLink(): void {
|
insertLink(): void {
|
||||||
this.#publicationEditionService.insertLink();
|
this.publicationEditionService.insertLink();
|
||||||
}
|
}
|
||||||
|
|
||||||
displayCodeBlockDialog(): void {
|
displayCodeBlockDialog(): void {
|
||||||
this.#publicationEditionService.displayCodeBlockDialog();
|
this.publicationEditionService.displayCodeBlockDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
save(): void {
|
||||||
|
this.publicationSave.emit(this.publicationInEdition);
|
||||||
}
|
}
|
||||||
|
|
||||||
displayPictureSectionDialog(): void {
|
displayPictureSectionDialog(): void {
|
||||||
this.#publicationEditionService.displayPictureSectionDialog();
|
this.publicationEditionService.displayPictureSectionDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
updateCursorPosition(event: KeyboardEvent | MouseEvent): void {
|
updateCursorPosition(event: KeyboardEvent | MouseEvent): void {
|
||||||
@@ -119,17 +179,13 @@ export class PublicationEditionComponent {
|
|||||||
const positionStart = textarea.selectionStart;
|
const positionStart = textarea.selectionStart;
|
||||||
const positionEnd = textarea.selectionEnd;
|
const positionEnd = textarea.selectionEnd;
|
||||||
|
|
||||||
this.#publicationEditionService.editCursorPosition(positionStart, positionEnd);
|
this.publicationEditionService.editCursorPosition(positionStart, positionEnd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
save(): void {
|
|
||||||
this.publicationSave.emit(this.#publicationEditionService.editedPublication);
|
|
||||||
}
|
|
||||||
|
|
||||||
onTabChange(tabSelectedIndex: number): void {
|
onTabChange(tabSelectedIndex: number): void {
|
||||||
if (tabSelectedIndex === 1) {
|
if (tabSelectedIndex === 1) {
|
||||||
this.#publicationEditionService.loadPreview();
|
this.publicationEditionService.loadPreview();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,16 +1,15 @@
|
|||||||
import { Location } from "@angular/common";
|
import { Location } from "@angular/common";
|
||||||
import {inject, Injectable, OnDestroy, Signal, signal} from "@angular/core";
|
import { inject, Injectable, OnDestroy } from "@angular/core";
|
||||||
import { MatDialog } from "@angular/material/dialog";
|
import { MatDialog } from "@angular/material/dialog";
|
||||||
import { MatSnackBar } from "@angular/material/snack-bar";
|
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||||
import { ActivatedRoute } from "@angular/router";
|
import { ActivatedRoute } from "@angular/router";
|
||||||
import {debounceTime, distinctUntilChanged, Subscription} from "rxjs";
|
import { BehaviorSubject, Observable, Subscription } from "rxjs";
|
||||||
import {DEFAULT_PUBLICATION, Publication} from "../../core/rest-services/publications/model/publication";
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
||||||
import { copy } from "../../core/utils/ObjectUtils";
|
import { copy } from "../../core/utils/ObjectUtils";
|
||||||
import { CodeBlockDialog } from "./code-block-dialog/code-block-dialog.component";
|
import { CodeBlockDialog } from "./code-block-dialog/code-block-dialog.component";
|
||||||
import { PictureSelectionDialog } from "./picture-selection-dialog/picture-selection-dialog.component";
|
import { PictureSelectionDialog } from "./picture-selection-dialog/picture-selection-dialog.component";
|
||||||
import { PreviewContentRequest } from "../../core/rest-services/publications/model/preview";
|
import { PreviewContentRequest } from "../../core/rest-services/publications/model/preview";
|
||||||
import {FormBuilder, FormControl, FormGroup, Validators} from "@angular/forms";
|
|
||||||
|
|
||||||
declare let Prism: any;
|
declare let Prism: any;
|
||||||
|
|
||||||
@@ -31,6 +30,23 @@ export interface PublicationEditionState {
|
|||||||
cursorPosition: CursorPosition;
|
cursorPosition: CursorPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const DEFAULT_PUBLICATION: Publication = {
|
||||||
|
id: '',
|
||||||
|
key: '',
|
||||||
|
title: '',
|
||||||
|
text: '',
|
||||||
|
parsedText: '',
|
||||||
|
description: '',
|
||||||
|
creationDate: new Date(),
|
||||||
|
illustrationId: '',
|
||||||
|
categoryId: '',
|
||||||
|
author: {
|
||||||
|
id: '',
|
||||||
|
name: '',
|
||||||
|
image: ''
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const DEFAULT_CURSOR_POSITION = new CursorPosition(0, 0);
|
const DEFAULT_CURSOR_POSITION = new CursorPosition(0, 0);
|
||||||
|
|
||||||
const DEFAULT_STATE: PublicationEditionState = {
|
const DEFAULT_STATE: PublicationEditionState = {
|
||||||
@@ -40,120 +56,109 @@ const DEFAULT_STATE: PublicationEditionState = {
|
|||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class PublicationEditionService implements OnDestroy {
|
export class PublicationEditionService implements OnDestroy {
|
||||||
readonly #activatedRoute = inject(ActivatedRoute);
|
private readonly activatedRoute = inject(ActivatedRoute);
|
||||||
readonly #dialog = inject(MatDialog);
|
private readonly publicationRestService = inject(PublicationRestService);
|
||||||
readonly #formBuilder = inject(FormBuilder);
|
private readonly location = inject(Location);
|
||||||
readonly #location = inject(Location);
|
private readonly snackBar = inject(MatSnackBar);
|
||||||
readonly #publicationRestService = inject(PublicationRestService);
|
private readonly dialog = inject(MatDialog);
|
||||||
readonly #snackBar = inject(MatSnackBar);
|
|
||||||
|
|
||||||
#isLoading = signal(false);
|
private isLoadingSubject = new BehaviorSubject<boolean>(false);
|
||||||
#state = signal<PublicationEditionState>(copy(DEFAULT_STATE));
|
private stateSubject = new BehaviorSubject<PublicationEditionState>(copy(DEFAULT_STATE));
|
||||||
#isSaving = signal<boolean>(false);
|
private subscriptions: Subscription[] = [];
|
||||||
#isPreviewing = signal<boolean>(false);
|
private isSavingSubject = new BehaviorSubject<boolean>(false);
|
||||||
#subscriptions: Subscription[] = [];
|
private isPreviewingSubject = new BehaviorSubject<boolean>(false);
|
||||||
|
|
||||||
publicationEditionForm: FormGroup = this.#formBuilder.group({
|
|
||||||
title: new FormControl<string | undefined>('', [Validators.required]),
|
|
||||||
description: new FormControl<string | undefined>('', [Validators.required]),
|
|
||||||
text: new FormControl<string | undefined>('', [Validators.required]),
|
|
||||||
illustrationId: new FormControl<string | undefined>('', [Validators.required]),
|
|
||||||
categoryId: new FormControl<string | undefined>('', [Validators.required])
|
|
||||||
});
|
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
ngOnDestroy(): void {
|
||||||
this.#subscriptions.forEach(subscription => subscription.unsubscribe());
|
this.subscriptions.forEach(subscription => subscription.unsubscribe());
|
||||||
}
|
}
|
||||||
|
|
||||||
#updateForm(): void {
|
private get _state(): PublicationEditionState {
|
||||||
const state = this.#state();
|
return this.stateSubject.value;
|
||||||
const publication = state.publication;
|
|
||||||
|
|
||||||
this.publicationEditionForm.controls['title'].setValue(publication.title);
|
|
||||||
this.publicationEditionForm.controls['description'].setValue(publication.description);
|
|
||||||
this.publicationEditionForm.controls['text'].setValue(publication.text);
|
|
||||||
this.publicationEditionForm.controls['illustrationId'].setValue(publication.illustrationId);
|
|
||||||
this.publicationEditionForm.controls['categoryId'].setValue(publication.categoryId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
get isLoading(): Signal<boolean> {
|
private _save(state: PublicationEditionState): void {
|
||||||
return this.#isLoading.asReadonly();
|
this.stateSubject.next(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
get isSaving(): Signal<boolean> {
|
get isLoading$(): Observable<boolean> {
|
||||||
return this.#isSaving.asReadonly();
|
return this.isLoadingSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
get isPreviewing(): Signal<boolean> {
|
get isSaving$(): Observable<boolean> {
|
||||||
return this.#isPreviewing.asReadonly();
|
return this.isSavingSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
get state(): Signal<PublicationEditionState> {
|
get isPreviewing$(): Observable<boolean> {
|
||||||
return this.#state.asReadonly();
|
return this.isPreviewingSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
get editedPublication(): Publication {
|
get state$(): Observable<PublicationEditionState> {
|
||||||
return this.#state().publication;
|
return this.stateSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
loadPublication(): void {
|
loadPublication(): void {
|
||||||
this.#isLoading.set(true);
|
this.isLoadingSubject.next(true);
|
||||||
|
|
||||||
this.#activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
const publicationId = params.get('publicationId');
|
const publicationId = params.get('publicationId');
|
||||||
if (publicationId == undefined) {
|
if (publicationId == undefined) {
|
||||||
this.#snackBar.open($localize`A technical error occurred while loading publication data.`, $localize`Close`, {duration: 5000});
|
this.snackBar.open($localize`A technical error occurred while loading publication data.`, $localize`Close`, { duration: 5000 });
|
||||||
this.#location.back();
|
this.location.back();
|
||||||
} else {
|
} else {
|
||||||
this.#publicationRestService.getById(publicationId)
|
this.publicationRestService.getById(publicationId)
|
||||||
.then(publication => {
|
.then(publication => {
|
||||||
const state = this.#state();
|
const state = this._state;
|
||||||
state.publication = publication;
|
state.publication = publication;
|
||||||
this.#state.set(state);
|
this.stateSubject.next(state);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
const errorMessage = $localize`A technical error occurred while loading publication data.`;
|
const errorMessage = $localize`A technical error occurred while loading publication data.`;
|
||||||
this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
this.snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
||||||
console.error(errorMessage, error)
|
console.error(errorMessage, error)
|
||||||
})
|
})
|
||||||
.finally(() => this.#isLoading.set(false));
|
.finally(() => this.isLoadingSubject.next(false));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
init(publication: Publication): void {
|
init(publication: Publication): void {
|
||||||
const state = this.#state();
|
const state = this._state;
|
||||||
state.publication = publication;
|
state.publication = publication;
|
||||||
this.#state.set(state);
|
this.stateSubject.next(state);
|
||||||
this.#updateForm();
|
|
||||||
|
|
||||||
const formValueChangesSubscription = this.publicationEditionForm.valueChanges
|
|
||||||
.pipe(
|
|
||||||
debounceTime(200),
|
|
||||||
distinctUntilChanged()
|
|
||||||
)
|
|
||||||
.subscribe(formValue => {
|
|
||||||
const state = this.#state();
|
|
||||||
const publication = state.publication;
|
|
||||||
|
|
||||||
publication.title = formValue.title;
|
|
||||||
publication.description = formValue.description;
|
|
||||||
publication.categoryId = formValue.categoryId;
|
|
||||||
publication.text = formValue.text;
|
|
||||||
|
|
||||||
this.#state.set(state);
|
|
||||||
});
|
|
||||||
this.#subscriptions.push(formValueChangesSubscription);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private editIllustrationId(pictureId: string): void {
|
editTitle(title: string): void {
|
||||||
const state = this.#state();
|
const state = this._state;
|
||||||
|
state.publication.title = title;
|
||||||
|
this._save(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
editDescription(description: string): void {
|
||||||
|
const state = this._state;
|
||||||
|
state.publication.description = description;
|
||||||
|
this._save(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
editCategoryId(categoryId: string): void {
|
||||||
|
const state = this._state;
|
||||||
|
state.publication.categoryId = categoryId;
|
||||||
|
this._save(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
editText(text: string): void {
|
||||||
|
const state = this._state;
|
||||||
|
state.publication.text = text;
|
||||||
|
this._save(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
editIllustrationId(pictureId: string): void {
|
||||||
|
const state = this._state;
|
||||||
state.publication.illustrationId = pictureId
|
state.publication.illustrationId = pictureId
|
||||||
this.#state.set(state);
|
this._save(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
displayPictureSectionDialog(): void {
|
displayPictureSectionDialog(): void {
|
||||||
const dialogRef = this.#dialog.open(PictureSelectionDialog);
|
const dialogRef = this.dialog.open(PictureSelectionDialog);
|
||||||
|
|
||||||
const afterDialogCloseSubscription = dialogRef.afterClosed()
|
const afterDialogCloseSubscription = dialogRef.afterClosed()
|
||||||
.subscribe(newPictureId => {
|
.subscribe(newPictureId => {
|
||||||
@@ -161,11 +166,11 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
this.editIllustrationId(newPictureId);
|
this.editIllustrationId(newPictureId);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.#subscriptions.push(afterDialogCloseSubscription);
|
this.subscriptions.push(afterDialogCloseSubscription);
|
||||||
}
|
}
|
||||||
|
|
||||||
displayCodeBlockDialog(): void {
|
displayCodeBlockDialog(): void {
|
||||||
const dialogRef = this.#dialog.open(CodeBlockDialog, {width: '60em'});
|
const dialogRef = this.dialog.open(CodeBlockDialog, { width: '60em' });
|
||||||
|
|
||||||
const afterDialogCloseSubscription = dialogRef.afterClosed()
|
const afterDialogCloseSubscription = dialogRef.afterClosed()
|
||||||
.subscribe(codeBlockWithLanguage => {
|
.subscribe(codeBlockWithLanguage => {
|
||||||
@@ -173,21 +178,21 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
this.insertCodeBlock(codeBlockWithLanguage.programmingLanguage, codeBlockWithLanguage.codeBlock);
|
this.insertCodeBlock(codeBlockWithLanguage.programmingLanguage, codeBlockWithLanguage.codeBlock);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.#subscriptions.push(afterDialogCloseSubscription);
|
this.subscriptions.push(afterDialogCloseSubscription);
|
||||||
}
|
}
|
||||||
|
|
||||||
editCursorPosition(positionStart: number, positionEnd: number): void {
|
editCursorPosition(positionStart: number, positionEnd: number): void {
|
||||||
const state = this.#state();
|
const state = this._state;
|
||||||
|
|
||||||
state.cursorPosition.start = positionStart;
|
state.cursorPosition.start = positionStart;
|
||||||
state.cursorPosition.end = positionEnd;
|
state.cursorPosition.end = positionEnd;
|
||||||
|
|
||||||
this.#state.set(state);
|
this._save(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
insertTitle(titleNumber: number): void {
|
insertTitle(titleNumber: number): void {
|
||||||
if (titleNumber >= 1 && titleNumber <= 3) {
|
if (titleNumber >= 1 && titleNumber <= 3) {
|
||||||
const state = this.#state();
|
const state = this._state;
|
||||||
|
|
||||||
const publication = state.publication;
|
const publication = state.publication;
|
||||||
|
|
||||||
@@ -198,15 +203,14 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
|
|
||||||
publication.text = textWithTags;
|
publication.text = textWithTags;
|
||||||
|
|
||||||
this.#state.set(state);
|
this._save(state);
|
||||||
this.#updateForm();
|
|
||||||
} else {
|
} else {
|
||||||
console.error(`Bad value for parameter of function 'insertTitle': '${titleNumber}'.`);
|
console.error(`Bad value for parameter of function 'insertTitle': '${titleNumber}'.`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
selectAPicture(): void {
|
selectAPicture(): void {
|
||||||
const dialogRef = this.#dialog.open(PictureSelectionDialog);
|
const dialogRef = this.dialog.open(PictureSelectionDialog);
|
||||||
|
|
||||||
const afterDialogCloseSubscription = dialogRef.afterClosed()
|
const afterDialogCloseSubscription = dialogRef.afterClosed()
|
||||||
.subscribe(newPictureId => {
|
.subscribe(newPictureId => {
|
||||||
@@ -214,11 +218,11 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
this.insertPicture(newPictureId);
|
this.insertPicture(newPictureId);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.#subscriptions.push(afterDialogCloseSubscription);
|
this.subscriptions.push(afterDialogCloseSubscription);
|
||||||
}
|
}
|
||||||
|
|
||||||
insertPicture(pictureId: string): void {
|
insertPicture(pictureId: string): void {
|
||||||
const state = this.#state();
|
const state = this._state;
|
||||||
|
|
||||||
const publication = state.publication;
|
const publication = state.publication;
|
||||||
|
|
||||||
@@ -228,12 +232,11 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
|
|
||||||
publication.text = textWithTags;
|
publication.text = textWithTags;
|
||||||
|
|
||||||
this.#state.set(state);
|
this._save(state);
|
||||||
this.#updateForm();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
insertLink(): void {
|
insertLink(): void {
|
||||||
const state = this.#state();
|
const state = this._state;
|
||||||
|
|
||||||
const publication = state.publication;
|
const publication = state.publication;
|
||||||
|
|
||||||
@@ -244,12 +247,11 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
|
|
||||||
publication.text = textWithTags;
|
publication.text = textWithTags;
|
||||||
|
|
||||||
this.#state.set(state);
|
this._save(state);
|
||||||
this.#updateForm();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private insertCodeBlock(programmingLanguage: string, codeBlock: string): void {
|
insertCodeBlock(programmingLanguage: string, codeBlock: string): void {
|
||||||
const state = this.#state();
|
const state = this._state;
|
||||||
|
|
||||||
const publication = state.publication;
|
const publication = state.publication;
|
||||||
|
|
||||||
@@ -260,28 +262,27 @@ export class PublicationEditionService implements OnDestroy {
|
|||||||
|
|
||||||
publication.text = textWithTags;
|
publication.text = textWithTags;
|
||||||
|
|
||||||
this.#state.set(state);
|
this._save(state);
|
||||||
this.#updateForm();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
loadPreview(): void {
|
loadPreview(): void {
|
||||||
const state = this.#state();
|
const state = this._state;
|
||||||
|
|
||||||
this.#isPreviewing.set(true);
|
this.isPreviewingSubject.next(true);
|
||||||
const request: PreviewContentRequest = {
|
const request: PreviewContentRequest = {
|
||||||
text: state.publication.text
|
text: state.publication.text
|
||||||
};
|
};
|
||||||
this.#publicationRestService.preview(request)
|
this.publicationRestService.preview(request)
|
||||||
.then(response => {
|
.then(response => {
|
||||||
state.publication.parsedText = response.text;
|
state.publication.parsedText = response.text;
|
||||||
this.#state.set(state);
|
this._save(state);
|
||||||
setTimeout(() => Prism.highlightAll(), 1000);
|
setTimeout(() => Prism.highlightAll(), 1000);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
this.#isPreviewing.set(false);
|
this.isPreviewingSubject.next(false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
@for (publication of publications(); track publication.id) {
|
@for(publication of publications$ | async; track publication) {
|
||||||
<a [routerLink]="['/publications/' + publication.id]" class="publication">
|
<a [routerLink]="['/publications/' + publication.id]" class="publication">
|
||||||
<img src="/api/pictures/{{ publication.illustrationId }}"/>
|
<img src="/api/pictures/{{ publication.illustrationId }}"/>
|
||||||
<div class="body">
|
<div class="body">
|
||||||
|
|||||||
@@ -1,15 +1,18 @@
|
|||||||
import {Component, input} from "@angular/core";
|
import { Component, Input } from "@angular/core";
|
||||||
import { Publication } from "../../core/rest-services/publications/model/publication";
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
|
import { Observable } from "rxjs";
|
||||||
import { CommonModule } from "@angular/common";
|
import { CommonModule } from "@angular/common";
|
||||||
import { RouterModule } from "@angular/router";
|
import { RouterModule } from "@angular/router";
|
||||||
import { MatTooltipModule } from "@angular/material/tooltip";
|
import { MatTooltipModule } from "@angular/material/tooltip";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-publication-list',
|
selector: 'app-publication-list',
|
||||||
|
standalone: true,
|
||||||
templateUrl: './publication-list.component.html',
|
templateUrl: './publication-list.component.html',
|
||||||
styleUrl: './publication-list.component.scss',
|
styleUrl: './publication-list.component.scss',
|
||||||
imports: [CommonModule, RouterModule, MatTooltipModule]
|
imports: [CommonModule, RouterModule, MatTooltipModule]
|
||||||
})
|
})
|
||||||
export class PublicationListComponent {
|
export class PublicationListComponent {
|
||||||
publications = input.required<Publication[]>();
|
@Input()
|
||||||
|
publications$!: Observable<Publication[]>;
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<form [formGroup]="formGroup">
|
<form [formGroup]="formGroup">
|
||||||
<input name="search-query" placeholder="Search something..." formControlName="criteria" i18n-placeholder/>
|
<input name="search-query" placeholder="Search something..." formControlName="criteria" i18n-placeholder/>
|
||||||
<button type="submit" (click)="searchPublications()" matRipple>
|
<button type="submit" (click)="searchPublications()">
|
||||||
<mat-icon>search</mat-icon>
|
<mat-icon>search</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
@@ -24,10 +24,9 @@
|
|||||||
border-radius: $borderRadiusValue;
|
border-radius: $borderRadiusValue;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
border: none;
|
border: none;
|
||||||
top: 0;
|
top: .4em;
|
||||||
right: 0;
|
right: 0;
|
||||||
color: #aaaaaa;
|
color: #aaaaaa;
|
||||||
padding: .3em;
|
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: #eee;
|
background-color: #eee;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
import { HttpParams } from "@angular/common/http";
|
||||||
import { Component, inject } from "@angular/core";
|
import { Component, inject } from "@angular/core";
|
||||||
import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angular/forms";
|
import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angular/forms";
|
||||||
import {MatRippleModule} from "@angular/material/core";
|
|
||||||
import { MatIconModule } from "@angular/material/icon";
|
import { MatIconModule } from "@angular/material/icon";
|
||||||
import { Router } from "@angular/router";
|
import { Router } from "@angular/router";
|
||||||
|
|
||||||
@@ -9,10 +9,10 @@ import {Router} from "@angular/router";
|
|||||||
selector: 'app-publications-search-bar',
|
selector: 'app-publications-search-bar',
|
||||||
templateUrl: './publications-search-bar.component.html',
|
templateUrl: './publications-search-bar.component.html',
|
||||||
styleUrl: './publications-search-bar.component.scss',
|
styleUrl: './publications-search-bar.component.scss',
|
||||||
|
standalone: true,
|
||||||
imports: [
|
imports: [
|
||||||
MatIconModule,
|
ReactiveFormsModule,
|
||||||
MatRippleModule,
|
MatIconModule
|
||||||
ReactiveFormsModule
|
|
||||||
],
|
],
|
||||||
providers: []
|
providers: []
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,15 +1,12 @@
|
|||||||
@for (category of categories(); track category.id) {
|
@for(category of categories$ | async; track category) {
|
||||||
<div class="category {{category.isOpenned ? 'openned' : ''}}">
|
<div class="category {{category.isOpenned ? 'openned' : ''}}">
|
||||||
<div id="category-{{category.id}}" class="category-header" (click)="setOpened(category)">
|
<div id="category-{{category.id}}" class="category-header" (click)="setOpenned(category)">
|
||||||
{{category.name}}
|
{{category.name}}
|
||||||
<mat-icon>chevron_right</mat-icon>
|
<mat-icon>chevron_right</mat-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="sub-category-container {{category.isOpenned ? 'displayed' : ''}}">
|
<div class="sub-category-container {{category.isOpenned ? 'displayed' : ''}}">
|
||||||
@for(subCategory of category.subCategories; track subCategory) {
|
@for(subCategory of category.subCategories; track subCategory) {
|
||||||
<a [routerLink]="['/publications']"
|
<a [routerLink]="['/publications']" [queryParams]="{'category-id': subCategory.id}" (click)="categoryClicked.emit()" class="sub-category">
|
||||||
[queryParams]="{'category-id': subCategory.id}"
|
|
||||||
(click)="categoryClicked.emit()"
|
|
||||||
class="sub-category">
|
|
||||||
{{subCategory.name}}
|
{{subCategory.name}}
|
||||||
</a>
|
</a>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,58 +1,57 @@
|
|||||||
import { CommonModule } from "@angular/common";
|
import { CommonModule } from "@angular/common";
|
||||||
import {Component, inject, OnInit, output, Signal} from "@angular/core";
|
import { Component, EventEmitter, inject, OnInit, Output } from "@angular/core";
|
||||||
import { MatIconModule } from "@angular/material/icon";
|
import { MatIconModule } from "@angular/material/icon";
|
||||||
import { DisplayableCategory, SideMenuService } from "../side-menu.service";
|
import { DisplayableCategory, SideMenuService } from "../side-menu.service";
|
||||||
|
import { Observable } from "rxjs";
|
||||||
import { RouterModule } from "@angular/router";
|
import { RouterModule } from "@angular/router";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-categories-menu',
|
selector: 'app-categories-menu',
|
||||||
|
standalone: true,
|
||||||
|
imports: [CommonModule, RouterModule, MatIconModule],
|
||||||
templateUrl: './categories-menu.component.html',
|
templateUrl: './categories-menu.component.html',
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
RouterModule,
|
|
||||||
MatIconModule
|
|
||||||
],
|
|
||||||
styleUrl: './categories-menu.component.scss'
|
styleUrl: './categories-menu.component.scss'
|
||||||
})
|
})
|
||||||
export class CategoriesMenuComponent implements OnInit {
|
export class CategoriesMenuComponent implements OnInit {
|
||||||
readonly #sideMenuService = inject(SideMenuService);
|
private sideMenuService = inject(SideMenuService);
|
||||||
categoryClicked = output<void>();
|
@Output()
|
||||||
|
categoryClicked = new EventEmitter<void>();
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.#sideMenuService.loadCategories();
|
this.sideMenuService.loadCategories();
|
||||||
}
|
}
|
||||||
|
|
||||||
get categories(): Signal<DisplayableCategory[]> {
|
get categories$(): Observable<DisplayableCategory[]> {
|
||||||
return this.#sideMenuService.categories;
|
return this.sideMenuService.categories$;
|
||||||
}
|
}
|
||||||
|
|
||||||
setOpened(category: DisplayableCategory): void {
|
setOpenned(category: DisplayableCategory): void {
|
||||||
if (category.isOpenned) {
|
if (category.isOpenned) {
|
||||||
const categoryDiv = document.getElementById(`category-${category.id}`);
|
const categoryDiv = document.getElementById(`category-${category.id}`);
|
||||||
if (categoryDiv) {
|
if (categoryDiv) {
|
||||||
this.#closeAccordion(categoryDiv);
|
this.closeAccordion(categoryDiv);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const categoriesDivs = document.getElementsByClassName('category-header');
|
const categoriesDivs = document.getElementsByClassName('category-header');
|
||||||
Array.from(categoriesDivs)
|
Array.from(categoriesDivs)
|
||||||
.map(category => category as HTMLElement)
|
.map(category => category as HTMLElement)
|
||||||
.forEach(categoryDiv => this.#closeAccordion(categoryDiv));
|
.forEach(categoryDiv => this.closeAccordion(categoryDiv));
|
||||||
|
|
||||||
const categoryDiv = document.getElementById(`category-${category.id}`);
|
const categoryDiv = document.getElementById(`category-${category.id}`);
|
||||||
if (categoryDiv) {
|
if (categoryDiv) {
|
||||||
this.#openAccordion(categoryDiv);
|
this.openAccordion(categoryDiv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.#sideMenuService.setOpened(category);
|
this.sideMenuService.setOpenned(category);
|
||||||
}
|
}
|
||||||
|
|
||||||
#closeAccordion(categoryDiv: HTMLElement): void {
|
private closeAccordion(categoryDiv: HTMLElement): void {
|
||||||
const divContent = categoryDiv?.nextElementSibling as HTMLElement;
|
const divContent = categoryDiv?.nextElementSibling as HTMLElement;
|
||||||
divContent.style.maxHeight = '0';
|
divContent.style.maxHeight = '0';
|
||||||
}
|
}
|
||||||
|
|
||||||
#openAccordion(categoryDiv: HTMLElement): void {
|
private openAccordion(categoryDiv: HTMLElement): void {
|
||||||
const divContent = categoryDiv?.nextElementSibling as HTMLElement;
|
const divContent = categoryDiv?.nextElementSibling as HTMLElement;
|
||||||
divContent.style.maxHeight = `${divContent.scrollHeight}px`;
|
divContent.style.maxHeight = `${divContent.scrollHeight}px`;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,14 @@
|
|||||||
<div class="menu {{ isOpened() ? 'displayed' : '' }}">
|
<div class="menu {{ isOpenned ? 'displayed' : '' }}">
|
||||||
<h1>
|
<h1>
|
||||||
<a [routerLink]="['/home']">
|
<a [routerLink]="['/home']">
|
||||||
<img src="assets/images/codiki.png" alt="logo"/>
|
<img src="assets/images/codiki.png" alt="logo"/>
|
||||||
Codiki
|
Codiki
|
||||||
</a>
|
</a>
|
||||||
<button type="button"
|
<button type="button" (click)="close()" matTooltip="Close the menu" i18n-matTooltip>
|
||||||
(click)="close()"
|
|
||||||
class="cod-button icon"
|
|
||||||
matTooltip="Close the menu"
|
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
|
||||||
<mat-icon>close</mat-icon>
|
<mat-icon>close</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</h1>
|
</h1>
|
||||||
<h2 i18n>Categories</h2>
|
<h2 i18n>Categories</h2>
|
||||||
<app-categories-menu (categoryClicked)="close()"/>
|
<app-categories-menu (categoryClicked)="close()"></app-categories-menu>
|
||||||
</div>
|
</div>
|
||||||
<div class="overlay {{ isOpened() ? 'displayed' : ''}}" (click)="close()"></div>
|
<div class="overlay {{ isOpenned ? 'displayed' : ''}}" (click)="close()"></div>
|
||||||
|
|||||||
@@ -41,6 +41,24 @@
|
|||||||
height: $imageSize;
|
height: $imageSize;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
border-radius: 10em;
|
||||||
|
border: none;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
width: 2.5em;
|
||||||
|
height: 2.5em;
|
||||||
|
color: white;
|
||||||
|
background-color: #3f51b5;
|
||||||
|
transition: background-color .2s ease-in-out;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
background-color: #5c6bc0;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
h2 {
|
h2 {
|
||||||
|
|||||||
@@ -1,30 +1,24 @@
|
|||||||
import {Component, signal} from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import { MatIconModule } from '@angular/material/icon';
|
import { MatIconModule } from '@angular/material/icon';
|
||||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
import { MatTooltipModule } from '@angular/material/tooltip';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { CategoriesMenuComponent } from './categories-menu/categories-menu.component';
|
import { CategoriesMenuComponent } from './categories-menu/categories-menu.component';
|
||||||
import {MatRippleModule} from '@angular/material/core';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-side-menu',
|
selector: 'app-side-menu',
|
||||||
|
standalone: true,
|
||||||
|
imports: [CategoriesMenuComponent, MatIconModule, MatTooltipModule, RouterModule],
|
||||||
templateUrl: './side-menu.component.html',
|
templateUrl: './side-menu.component.html',
|
||||||
styleUrl: './side-menu.component.scss',
|
styleUrl: './side-menu.component.scss'
|
||||||
imports: [
|
|
||||||
CategoriesMenuComponent,
|
|
||||||
MatIconModule,
|
|
||||||
MatRippleModule,
|
|
||||||
MatTooltipModule,
|
|
||||||
RouterModule
|
|
||||||
]
|
|
||||||
})
|
})
|
||||||
export class SideMenuComponent {
|
export class SideMenuComponent {
|
||||||
isOpened = signal(false);
|
isOpenned: boolean = false;
|
||||||
|
|
||||||
open(): void {
|
open(): void {
|
||||||
this.isOpened.set(true);
|
this.isOpenned = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
close(): void {
|
close(): void {
|
||||||
this.isOpened.set(false);
|
this.isOpenned = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import {inject, Injectable, Signal, signal} from '@angular/core';
|
import { Injectable, inject } from '@angular/core';
|
||||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||||
|
import { BehaviorSubject, Observable } from 'rxjs';
|
||||||
import { CategoryRestService } from '../../core/rest-services/category/category.rest-service';
|
import { CategoryRestService } from '../../core/rest-services/category/category.rest-service';
|
||||||
import { Category } from '../../core/rest-services/category/model/category';
|
import { Category } from '../../core/rest-services/category/model/category';
|
||||||
|
|
||||||
@@ -19,60 +20,68 @@ export interface DisplayableSubCategory {
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class SideMenuService {
|
export class SideMenuService {
|
||||||
readonly #categoryRestService = inject(CategoryRestService);
|
private categoryRestService = inject(CategoryRestService);
|
||||||
readonly #snackBar = inject(MatSnackBar);
|
private snackBar = inject(MatSnackBar);
|
||||||
#categories = signal<DisplayableCategory[]>([]);
|
private categoriesSubject = new BehaviorSubject<DisplayableCategory[]>([]);
|
||||||
#isLoading = signal(false);
|
private isLoadingSubject = new BehaviorSubject<boolean>(false);
|
||||||
isLoaded = signal(false);
|
private isLoadedSubject = new BehaviorSubject<boolean>(false);
|
||||||
|
|
||||||
#mapToDisplayableCategory(category: Category): DisplayableCategory {
|
private mapToDisplayableCategory(category: Category): DisplayableCategory {
|
||||||
return {
|
return {
|
||||||
id: category.id,
|
id: category.id,
|
||||||
name: category.name,
|
name: category.name,
|
||||||
subCategories: category.subCategories.map(subCategory => this.#mapToDisplayableSubCategory(subCategory)),
|
subCategories: category.subCategories.map(subCategory => this.mapToDisplayableSubCategory(subCategory)),
|
||||||
isOpenned: false
|
isOpenned: false
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#mapToDisplayableSubCategory(subCategory: Category): DisplayableSubCategory {
|
private mapToDisplayableSubCategory(subCategory: Category): DisplayableSubCategory {
|
||||||
return {
|
return {
|
||||||
id: subCategory.id,
|
id: subCategory.id,
|
||||||
name: subCategory.name
|
name: subCategory.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
get categories(): Signal<DisplayableCategory[]> {
|
private get categories(): DisplayableCategory[] {
|
||||||
return this.#categories.asReadonly();
|
return this.categoriesSubject.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
get isLoading(): Signal<boolean> {
|
private save(categories: DisplayableCategory[]): void {
|
||||||
return this.#isLoading.asReadonly();
|
this.categoriesSubject.next(categories);
|
||||||
|
}
|
||||||
|
|
||||||
|
get categories$(): Observable<DisplayableCategory[]> {
|
||||||
|
return this.categoriesSubject.asObservable();
|
||||||
|
}
|
||||||
|
|
||||||
|
get isLoading$(): Observable<boolean> {
|
||||||
|
return this.isLoadingSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
loadCategories(): void {
|
loadCategories(): void {
|
||||||
this.#isLoading.set(true);
|
this.isLoadingSubject.next(true);
|
||||||
this.isLoaded.set(false);
|
this.isLoadedSubject.next(false);
|
||||||
|
|
||||||
this.#categoryRestService.getCategories()
|
this.categoryRestService.getCategories()
|
||||||
.then(categories => {
|
.then(categories => {
|
||||||
const displayableCategories = categories
|
const displayableCategories = categories
|
||||||
.filter(category => category.subCategories?.length)
|
.filter(category => category.subCategories?.length)
|
||||||
.map(category => this.#mapToDisplayableCategory(category));
|
.map(category => this.mapToDisplayableCategory(category));
|
||||||
this.#categories.set(displayableCategories);
|
this.categoriesSubject.next(displayableCategories);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
const errorMessage = $localize`An error occured while loading categories.`;
|
const errorMessage = $localize`An error occured while loading categories.`;
|
||||||
console.error(errorMessage, error);
|
console.error(errorMessage, error);
|
||||||
this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
this.#isLoading.set(false);
|
this.isLoadingSubject.next(false);
|
||||||
this.isLoaded.set(true);
|
this.isLoadedSubject.next(true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
setOpened(category: DisplayableCategory): void {
|
setOpenned(category: DisplayableCategory): void {
|
||||||
const categories = this.#categories();
|
const categories = this.categories;
|
||||||
const matchingCategory = categories.find(categoryTemp => categoryTemp.id === category.id);
|
const matchingCategory = categories.find(categoryTemp => categoryTemp.id === category.id);
|
||||||
if (matchingCategory) {
|
if (matchingCategory) {
|
||||||
const actualOpennedCategory = categories.find(category => category.isOpenned);
|
const actualOpennedCategory = categories.find(category => category.isOpenned);
|
||||||
@@ -82,7 +91,7 @@ export class SideMenuService {
|
|||||||
categories.forEach(categoryTemp => categoryTemp.isOpenned = false);
|
categories.forEach(categoryTemp => categoryTemp.isOpenned = false);
|
||||||
matchingCategory.isOpenned = true;
|
matchingCategory.isOpenned = true;
|
||||||
}
|
}
|
||||||
this.#categories.set(categories);
|
this.save(categories);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
<button type="submit"
|
<button type="submit" [class]="color" [disabled]="disabled || requestPending" (click)="click.emit()">
|
||||||
class="cod-button {{color()}}"
|
@if (requestPending) {
|
||||||
[disabled]="disabled() || requestPending()"
|
<mat-spinner class="spinner {{color}}" [diameter]="25"></mat-spinner>
|
||||||
(click)="click.emit()"
|
|
||||||
matRipple>
|
|
||||||
@if (requestPending()) {
|
|
||||||
<mat-spinner class="spinner {{color()}}" [diameter]="25"></mat-spinner>
|
|
||||||
}
|
}
|
||||||
<span>
|
<span>
|
||||||
<ng-content/>
|
{{ label }}
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
@@ -1,20 +1,20 @@
|
|||||||
import {Component, input, output} from "@angular/core";
|
import { CommonModule } from "@angular/common";
|
||||||
import {MatRippleModule} from "@angular/material/core";
|
import { Component, EventEmitter, Input, Output } from "@angular/core";
|
||||||
import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
|
import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-submit-button',
|
selector: 'app-submit-button',
|
||||||
|
standalone: true,
|
||||||
|
imports: [MatProgressSpinnerModule, CommonModule],
|
||||||
templateUrl: 'submit-button.component.html',
|
templateUrl: 'submit-button.component.html',
|
||||||
styleUrl: 'submit-button.component.scss',
|
styleUrl: 'submit-button.component.scss'
|
||||||
imports: [
|
|
||||||
MatRippleModule,
|
|
||||||
MatProgressSpinnerModule
|
|
||||||
]
|
|
||||||
})
|
})
|
||||||
export class SubmitButtonComponent {
|
export class SubmitButtonComponent {
|
||||||
requestPending = input.required<boolean>();
|
@Input() requestPending: boolean = false;
|
||||||
label = input<string>();
|
@Input() label: string = '';
|
||||||
disabled = input<boolean>(false);
|
@Input() disabled: boolean = false;
|
||||||
color = input<'secondary' | undefined>('secondary');
|
@Input() color?: 'secondary';
|
||||||
click = output<void>();
|
@Output() click = new EventEmitter<void>();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
import {inject} from "@angular/core";
|
|
||||||
import {CanActivateFn, Router} from "@angular/router";
|
|
||||||
import {AuthenticationService} from "../service/authentication.service";
|
|
||||||
import {MatSnackBar} from "@angular/material/snack-bar";
|
|
||||||
|
|
||||||
export const alreadyAuthenticatedGuard: CanActivateFn = () => {
|
|
||||||
const authenticationService = inject(AuthenticationService);
|
|
||||||
const router = inject(Router);
|
|
||||||
const snackBar = inject(MatSnackBar);
|
|
||||||
|
|
||||||
if (authenticationService.isAuthenticated()) {
|
|
||||||
router.navigate(['/home']);
|
|
||||||
snackBar.open($localize`You can't access to this page because you are already authenticated.`, $localize`Close`, {duration: 5000});
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,13 +3,11 @@ import {CanActivateFn, Router} from "@angular/router";
|
|||||||
import { AuthenticationService } from "../service/authentication.service";
|
import { AuthenticationService } from "../service/authentication.service";
|
||||||
import { MatSnackBar } from "@angular/material/snack-bar";
|
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||||
|
|
||||||
export const authenticationGuard: CanActivateFn = async () => {
|
export const authenticationGuard: CanActivateFn = () => {
|
||||||
const authenticationService = inject(AuthenticationService);
|
const authenticationService = inject(AuthenticationService);
|
||||||
const router = inject(Router);
|
const router = inject(Router);
|
||||||
const snackBar = inject(MatSnackBar);
|
const snackBar = inject(MatSnackBar);
|
||||||
|
|
||||||
await authenticationService.checkIsAuthenticated();
|
|
||||||
|
|
||||||
if (authenticationService.isAuthenticated()) {
|
if (authenticationService.isAuthenticated()) {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
|
import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
|
||||||
import { inject, Injectable } from '@angular/core';
|
import { inject, Injectable } from '@angular/core';
|
||||||
import { catchError, filter, Observable, Subject, switchMap, take, throwError } from 'rxjs';
|
import { catchError, filter, Observable, Subject, switchMap, take, throwError } from 'rxjs';
|
||||||
|
import { RefreshTokenRequest } from '../rest-services/user/model/refresh-token.model';
|
||||||
import { UserRestService } from '../rest-services/user/user.rest-service';
|
import { UserRestService } from '../rest-services/user/user.rest-service';
|
||||||
import { AuthenticationService } from '../service/authentication.service';
|
import { AuthenticationService } from '../service/authentication.service';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
@@ -40,12 +41,23 @@ export class JwtInterceptor implements HttpInterceptor {
|
|||||||
this.isRefreshingToken = true;
|
this.isRefreshingToken = true;
|
||||||
this.refreshTokenSubject.next(undefined);
|
this.refreshTokenSubject.next(undefined);
|
||||||
|
|
||||||
this.authenticationService.refreshToken()
|
const refreshToken = this.authenticationService.getRefreshToken();
|
||||||
|
if (refreshToken) {
|
||||||
|
const refreshTokenRequest: RefreshTokenRequest = {
|
||||||
|
refreshTokenValue: refreshToken
|
||||||
|
};
|
||||||
|
this.userRestService.refreshToken(refreshTokenRequest)
|
||||||
.then(refreshTokenResponse => {
|
.then(refreshTokenResponse => {
|
||||||
|
this.authenticationService.authenticate(refreshTokenResponse.accessToken, refreshTokenResponse.refreshToken);
|
||||||
this.refreshTokenSubject.next(refreshTokenResponse.accessToken);
|
this.refreshTokenSubject.next(refreshTokenResponse.accessToken);
|
||||||
})
|
})
|
||||||
.catch(() => this.handleNoRefreshToken(initialError))
|
.catch(() => {
|
||||||
|
return this.handleNoRefreshToken(initialError);
|
||||||
|
})
|
||||||
.finally(() => this.isRefreshingToken = false);
|
.finally(() => this.isRefreshingToken = false);
|
||||||
|
} else {
|
||||||
|
return this.handleNoRefreshToken(initialError);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.refreshTokenSubject.pipe(
|
return this.refreshTokenSubject.pipe(
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient } from '@angular/common/http';
|
||||||
import {inject, Injectable} from '@angular/core';
|
import { Injectable, inject } from '@angular/core';
|
||||||
import { lastValueFrom } from 'rxjs';
|
import { lastValueFrom } from 'rxjs';
|
||||||
import { Category } from './model/category';
|
import { Category } from './model/category';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import {HttpClient} from "@angular/common/http";
|
import { HttpClient, HttpParams } from "@angular/common/http";
|
||||||
import { inject, Injectable } from "@angular/core";
|
import { inject, Injectable } from "@angular/core";
|
||||||
import { Picture } from "./model/picture";
|
import { Picture } from "./model/picture";
|
||||||
import { lastValueFrom } from "rxjs";
|
import { lastValueFrom } from "rxjs";
|
||||||
|
|||||||
@@ -12,20 +12,3 @@ export interface Publication {
|
|||||||
categoryId: string;
|
categoryId: string;
|
||||||
author: Author;
|
author: Author;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DEFAULT_PUBLICATION: Publication = {
|
|
||||||
id: '',
|
|
||||||
key: '',
|
|
||||||
title: '',
|
|
||||||
text: '',
|
|
||||||
parsedText: '',
|
|
||||||
description: '',
|
|
||||||
creationDate: new Date(),
|
|
||||||
illustrationId: '',
|
|
||||||
categoryId: '',
|
|
||||||
author: {
|
|
||||||
id: '',
|
|
||||||
name: '',
|
|
||||||
image: ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { HttpClient, HttpParams } from '@angular/common/http';
|
import { HttpClient, HttpParams } from '@angular/common/http';
|
||||||
import {inject, Injectable} from '@angular/core';
|
import { Injectable, inject } from '@angular/core';
|
||||||
import {lastValueFrom} from 'rxjs';
|
import { last, lastValueFrom } from 'rxjs';
|
||||||
import { Publication } from './model/publication';
|
import { Publication } from './model/publication';
|
||||||
import { PreviewContentRequest, PreviewContentResponse } from './model/preview';
|
import { PreviewContentRequest, PreviewContentResponse } from './model/preview';
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { HttpClient } from "@angular/common/http";
|
import { HttpClient } from "@angular/common/http";
|
||||||
import {inject, Injectable} from "@angular/core";
|
import { Injectable, inject } from "@angular/core";
|
||||||
import { LoginRequest, LoginResponse } from "./model/login.model";
|
import { LoginRequest, LoginResponse } from "./model/login.model";
|
||||||
import { lastValueFrom } from "rxjs";
|
import { lastValueFrom } from "rxjs";
|
||||||
import { SigninRequest } from "./model/signin.model";
|
import { SigninRequest } from "./model/signin.model";
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import { inject, Injectable } from "@angular/core";
|
import { inject, Injectable } from "@angular/core";
|
||||||
import {BehaviorSubject, interval} from "rxjs";
|
|
||||||
import { User } from "../model/User";
|
import { User } from "../model/User";
|
||||||
import { UserRestService } from "../rest-services/user/user.rest-service";
|
import { UserRestService } from "../rest-services/user/user.rest-service";
|
||||||
import { RefreshTokenRequest } from "../rest-services/user/model/refresh-token.model";
|
import { RefreshTokenRequest } from "../rest-services/user/model/refresh-token.model";
|
||||||
import {LoginResponse} from "../rest-services/user/model/login.model";
|
|
||||||
|
|
||||||
const JWT_PARAM = 'jwt';
|
const JWT_PARAM = 'jwt';
|
||||||
const REFRESH_TOKEN_PARAM = 'refresh-token';
|
const REFRESH_TOKEN_PARAM = 'refresh-token';
|
||||||
@@ -20,30 +18,18 @@ interface UserDetails {
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class AuthenticationService {
|
export class AuthenticationService {
|
||||||
private readonly AUTHENTICATION_CHECKING_PERIOD = 5 * 60 * 1000;
|
|
||||||
private isAuthenticatedSubject = new BehaviorSubject<boolean>(false);
|
|
||||||
private readonly userRestService = inject(UserRestService);
|
|
||||||
|
|
||||||
startAuthenticationCheckingProcess(): void {
|
|
||||||
this.checkIsAuthenticated();
|
|
||||||
interval(this.AUTHENTICATION_CHECKING_PERIOD)
|
|
||||||
.subscribe(() => this.checkIsAuthenticated());
|
|
||||||
}
|
|
||||||
|
|
||||||
authenticate(token: string, refreshToken: string): void {
|
authenticate(token: string, refreshToken: string): void {
|
||||||
localStorage.setItem(JWT_PARAM, token);
|
localStorage.setItem(JWT_PARAM, token);
|
||||||
localStorage.setItem(REFRESH_TOKEN_PARAM, refreshToken);
|
localStorage.setItem(REFRESH_TOKEN_PARAM, refreshToken);
|
||||||
this.isAuthenticatedSubject.next(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unauthenticate(): void {
|
unauthenticate(): void {
|
||||||
localStorage.removeItem(JWT_PARAM);
|
localStorage.removeItem(JWT_PARAM);
|
||||||
localStorage.removeItem(REFRESH_TOKEN_PARAM);
|
|
||||||
this.isAuthenticatedSubject.next(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
isAuthenticated(): boolean {
|
isAuthenticated(): boolean {
|
||||||
return this.isAuthenticatedSubject.value;
|
return !!localStorage.getItem(JWT_PARAM);
|
||||||
}
|
}
|
||||||
|
|
||||||
getAuthenticatedUser(): User | undefined {
|
getAuthenticatedUser(): User | undefined {
|
||||||
@@ -59,7 +45,7 @@ export class AuthenticationService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
isTokenExpired(): boolean {
|
isTokenExpired(): boolean {
|
||||||
let result = true;
|
let result = false;
|
||||||
|
|
||||||
const userDetails = this.extractUserDetails();
|
const userDetails = this.extractUserDetails();
|
||||||
|
|
||||||
@@ -73,43 +59,8 @@ export class AuthenticationService {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
refreshToken(): Promise<LoginResponse> {
|
|
||||||
const refreshToken = this.getRefreshToken();
|
|
||||||
if (refreshToken) {
|
|
||||||
const refreshTokenRequest: RefreshTokenRequest = {
|
|
||||||
refreshTokenValue: refreshToken
|
|
||||||
};
|
|
||||||
return this.userRestService.refreshToken(refreshTokenRequest)
|
|
||||||
.then(refreshTokenResponse => {
|
|
||||||
this.authenticate(refreshTokenResponse.accessToken, refreshTokenResponse.refreshToken);
|
|
||||||
return refreshTokenResponse;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return Promise.reject('No any refresh token found.');
|
|
||||||
}
|
|
||||||
|
|
||||||
checkIsAuthenticated(): Promise<void> {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
const isTokenExpired = this.isTokenExpired();
|
|
||||||
if (isTokenExpired) {
|
|
||||||
if (this.getRefreshToken()) {
|
|
||||||
this.refreshToken()
|
|
||||||
.then(() => resolve())
|
|
||||||
.catch(() => reject());
|
|
||||||
} else {
|
|
||||||
this.isAuthenticatedSubject.next(false);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.isAuthenticatedSubject.next(true);
|
|
||||||
}
|
|
||||||
resolve();
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private extractUserFromLocalStorage(): User | undefined {
|
private extractUserFromLocalStorage(): User | undefined {
|
||||||
let result: User | undefined;
|
let result: User | undefined = undefined;
|
||||||
|
|
||||||
const userDetails = this.extractUserDetails();
|
const userDetails = this.extractUserDetails();
|
||||||
if (userDetails) {
|
if (userDetails) {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import {inject, Injectable} from '@angular/core';
|
import { Injectable, inject } from '@angular/core';
|
||||||
import { CategoryRestService } from '../rest-services/category/category.rest-service';
|
import { CategoryRestService } from '../rest-services/category/category.rest-service';
|
||||||
import { BehaviorSubject, Observable } from 'rxjs';
|
import { BehaviorSubject, Observable } from 'rxjs';
|
||||||
import { Category } from '../rest-services/category/model/category';
|
import { Category } from '../rest-services/category/model/category';
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
import {Component, inject, OnInit} from '@angular/core';
|
import { Component, OnInit, inject } from '@angular/core';
|
||||||
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
|
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
|
||||||
import { AuthenticationService } from '../../core/service/authentication.service';
|
import { AuthenticationService } from '../../core/service/authentication.service';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-disconnection',
|
selector: 'app-disconnection',
|
||||||
|
standalone: true,
|
||||||
imports: [MatProgressSpinnerModule],
|
imports: [MatProgressSpinnerModule],
|
||||||
templateUrl: './disconnection.component.html',
|
templateUrl: './disconnection.component.html',
|
||||||
styleUrl: './disconnection.component.scss'
|
styleUrl: './disconnection.component.scss'
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<h1 i18n>Last publications</h1>
|
<h1 i18n>Last publications</h1>
|
||||||
@if ((isLoading())) {
|
@if ((isLoading$ | async) === true) {
|
||||||
<h2 i18n>Publications loading...</h2>
|
<h2 i18n>Publications loading...</h2>
|
||||||
<mat-spinner/>
|
<mat-spinner></mat-spinner>
|
||||||
} @else {
|
} @else {
|
||||||
@if (publications(); as publications) {
|
@if ((publications$ | async) != []) {
|
||||||
<app-publication-list [publications]="publications"/>
|
<app-publication-list [publications$]="publications$"></app-publication-list>
|
||||||
} @else {
|
} @else {
|
||||||
<h2 i18n>No any publication.</h2>
|
<h2 i18n>No any publication.</h2>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
import {Component, inject, OnInit} from '@angular/core';
|
import { Component, OnInit, inject } from '@angular/core';
|
||||||
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
import { PublicationListComponent } from '../../components/publication-list/publication-list.component';
|
import { PublicationListComponent } from '../../components/publication-list/publication-list.component';
|
||||||
|
import { Publication } from '../../core/rest-services/publications/model/publication';
|
||||||
import { HomeService } from './home.service';
|
import { HomeService } from './home.service';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-home',
|
selector: 'app-home',
|
||||||
|
standalone: true,
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
MatProgressSpinnerModule,
|
MatProgressSpinnerModule,
|
||||||
@@ -16,11 +19,17 @@ import {CommonModule} from '@angular/common';
|
|||||||
providers: [HomeService]
|
providers: [HomeService]
|
||||||
})
|
})
|
||||||
export class HomeComponent implements OnInit {
|
export class HomeComponent implements OnInit {
|
||||||
readonly #homeService = inject(HomeService);
|
private homeService = inject(HomeService);
|
||||||
isLoading = this.#homeService.isLoading;
|
|
||||||
publications = this.#homeService.publications;
|
get isLoading$(): Observable<boolean> {
|
||||||
|
return this.homeService.isLoading$;
|
||||||
|
}
|
||||||
|
|
||||||
|
get publications$(): Observable<Publication[]> {
|
||||||
|
return this.homeService.publications$;
|
||||||
|
}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.#homeService.startLatestPublicationsRetrieving();
|
this.homeService.startLatestPublicationsRetrieving();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import {inject, Injectable, Signal, signal} from "@angular/core";
|
import { Injectable, inject } from "@angular/core";
|
||||||
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
||||||
|
import { BehaviorSubject, Observable } from "rxjs";
|
||||||
import { MatSnackBar } from "@angular/material/snack-bar"
|
import { MatSnackBar } from "@angular/material/snack-bar"
|
||||||
import { Publication } from "../../core/rest-services/publications/model/publication";
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
|
|
||||||
@@ -8,27 +9,27 @@ export class HomeService {
|
|||||||
private publicationRestService = inject(PublicationRestService);
|
private publicationRestService = inject(PublicationRestService);
|
||||||
private snackBar = inject(MatSnackBar);
|
private snackBar = inject(MatSnackBar);
|
||||||
|
|
||||||
#publications = signal<Publication[]>([]);
|
private publicationsSubject = new BehaviorSubject<Publication[]>([]);
|
||||||
#isLoadingSubject = signal<boolean>(false);
|
private isLoadingSubject = new BehaviorSubject<boolean>(false);
|
||||||
|
|
||||||
get isLoading(): Signal<boolean> {
|
get isLoading$(): Observable<boolean> {
|
||||||
return this.#isLoadingSubject.asReadonly();
|
return this.isLoadingSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
get publications(): Signal<Publication[]> {
|
get publications$(): Observable<Publication[]> {
|
||||||
return this.#publications.asReadonly();
|
return this.publicationsSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
startLatestPublicationsRetrieving(): void {
|
startLatestPublicationsRetrieving(): void {
|
||||||
this.#isLoadingSubject.set(true);
|
this.isLoadingSubject.next(true);
|
||||||
|
|
||||||
this.publicationRestService.getLatest()
|
this.publicationRestService.getLatest()
|
||||||
.then(publications => this.#publications.set(publications))
|
.then(publications => this.publicationsSubject.next(publications))
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
const errorMessage = $localize`An error occurred while retrieving latest publications...`;
|
const errorMessage = $localize`An error occurred while retrieving latest publications...`;
|
||||||
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
||||||
console.error(errorMessage, error);
|
console.error(errorMessage, error);
|
||||||
})
|
})
|
||||||
.finally(() => this.#isLoadingSubject.set(false));
|
.finally(() => this.isLoadingSubject.next(false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<form [formGroup]="loginForm" (submit)="performLogin()" class="cod-form card" ngNativeValidate>
|
<form [formGroup]="loginForm" (submit)="performLogin()" ngNativeValidate>
|
||||||
<h1 i18n>Login</h1>
|
<h1 i18n>Login</h1>
|
||||||
<div class="form-field">
|
<div>
|
||||||
<mat-icon>mail</mat-icon>
|
<mat-icon>mail</mat-icon>
|
||||||
<label for="email" i18n>
|
<label for="email" i18n>
|
||||||
Email address
|
Email address
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
</label>
|
</label>
|
||||||
<input type="email" id="email" formControlName="email" autocomplete="email" required />
|
<input type="email" id="email" formControlName="email" autocomplete="email" required />
|
||||||
</div>
|
</div>
|
||||||
<div class="form-field">
|
<div>
|
||||||
<mat-icon>lock</mat-icon>
|
<mat-icon>lock</mat-icon>
|
||||||
<label for="password" i18n>
|
<label for="password" i18n>
|
||||||
Password
|
Password
|
||||||
@@ -16,8 +16,8 @@
|
|||||||
</label>
|
</label>
|
||||||
<input type="password" id="password" formControlName="password" required />
|
<input type="password" id="password" formControlName="password" required />
|
||||||
</div>
|
</div>
|
||||||
<div class="actions reversed">
|
<div class="actions">
|
||||||
<app-submit-button [requestPending]="false" [disabled]="false" i18n>Send</app-submit-button>
|
<button type="submit" i18n>Send</button>
|
||||||
<a [routerLink]="['/signin']" class="cod-button secondary" matRipple i18n>Create an account</a>
|
<a [routerLink]="['/signin']" i18n>Create an account</a>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@@ -4,4 +4,79 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
|
|
||||||
|
form {
|
||||||
|
width: 80%;
|
||||||
|
max-width: 20em;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 1em;
|
||||||
|
box-shadow: 0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12);
|
||||||
|
border-radius: .5em;
|
||||||
|
padding: 1em 1.5em;
|
||||||
|
background-color: #ffffff;
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
div {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
position: relative;
|
||||||
|
gap: .1em;
|
||||||
|
|
||||||
|
mat-icon {
|
||||||
|
position: absolute;
|
||||||
|
top: 1.3em;
|
||||||
|
left: .5em;
|
||||||
|
color: #777;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.actions {
|
||||||
|
flex-direction: row-reverse;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: #3f51b5;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
button, a.button {
|
||||||
|
padding: .8em 1.2em;
|
||||||
|
border-radius: 10em;
|
||||||
|
border: none;
|
||||||
|
background-color: #3f51b5;
|
||||||
|
color: white;
|
||||||
|
transition: background-color .2s ease-in-out;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #5b6ed8;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
flex: 1;
|
||||||
|
font-style: italic;
|
||||||
|
padding-left: 1em;
|
||||||
|
color: #777;
|
||||||
|
|
||||||
|
.required {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
flex: 1;
|
||||||
|
background-color: #eeeeee;
|
||||||
|
border: none;
|
||||||
|
border-radius: 10em;
|
||||||
|
padding: 1em 1em 1em 3em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,24 +1,17 @@
|
|||||||
import {Component, inject, OnDestroy, OnInit} from '@angular/core';
|
import { Component, OnDestroy, OnInit, inject } from '@angular/core';
|
||||||
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
|
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||||
import { MatSnackBarModule } from '@angular/material/snack-bar';
|
import { MatSnackBarModule } from '@angular/material/snack-bar';
|
||||||
import {debounceTime, map, Subscription} from 'rxjs';
|
import { Subscription, debounceTime, map } from 'rxjs';
|
||||||
import { LoginService } from './login.service';
|
import { LoginService } from './login.service';
|
||||||
import { MatIconModule } from '@angular/material/icon';
|
import { MatIconModule } from '@angular/material/icon';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import {SubmitButtonComponent} from "../../components/submit-button/submit-button.component";
|
|
||||||
import {MatRippleModule} from '@angular/material/core';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-login',
|
selector: 'app-login',
|
||||||
|
standalone: true,
|
||||||
templateUrl: './login.component.html',
|
templateUrl: './login.component.html',
|
||||||
styleUrl: './login.component.scss',
|
styleUrl: './login.component.scss',
|
||||||
imports: [
|
imports: [ReactiveFormsModule, MatIconModule, RouterModule],
|
||||||
MatIconModule,
|
|
||||||
MatRippleModule,
|
|
||||||
ReactiveFormsModule,
|
|
||||||
RouterModule,
|
|
||||||
SubmitButtonComponent
|
|
||||||
],
|
|
||||||
providers: [LoginService, MatSnackBarModule]
|
providers: [LoginService, MatSnackBarModule]
|
||||||
})
|
})
|
||||||
export class LoginComponent implements OnInit, OnDestroy {
|
export class LoginComponent implements OnInit, OnDestroy {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import {inject, Injectable} from '@angular/core';
|
import { Injectable, inject } from '@angular/core';
|
||||||
import { BehaviorSubject, Observable } from 'rxjs';
|
import { BehaviorSubject, Observable } from 'rxjs';
|
||||||
import { copy } from '../../core/utils/ObjectUtils';
|
import { copy } from '../../core/utils/ObjectUtils';
|
||||||
import { FormError } from '../../core/model/FormError';
|
import { FormError } from '../../core/model/FormError';
|
||||||
@@ -60,7 +60,8 @@ export class LoginService {
|
|||||||
performLogin(): void {
|
performLogin(): void {
|
||||||
const state = this.state;
|
const state = this.state;
|
||||||
|
|
||||||
if (this.isStateValid(state)) {
|
// Check state is valid
|
||||||
|
|
||||||
this.userRestService
|
this.userRestService
|
||||||
.login(state.request)
|
.login(state.request)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
@@ -72,12 +73,5 @@ export class LoginService {
|
|||||||
console.error(error);
|
console.error(error);
|
||||||
this.snackBar.open($localize`Authentication failed.`, $localize`Close`, { duration: 5000 });
|
this.snackBar.open($localize`Authentication failed.`, $localize`Close`, { duration: 5000 });
|
||||||
});
|
});
|
||||||
} else {
|
|
||||||
this.snackBar.open($localize`Please, fill the inputs before send.`, $localize`Close`, {duration: 5000});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
isStateValid(state: LoginState): boolean {
|
|
||||||
return !!state.request.email?.trim().length && !!state.request.password?.length;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,17 +4,16 @@
|
|||||||
class="new-publication"
|
class="new-publication"
|
||||||
matTooltip="Add a new publication"
|
matTooltip="Add a new publication"
|
||||||
matTooltipPosition="left"
|
matTooltipPosition="left"
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
i18n-matTooltip>
|
||||||
+
|
+
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
@if (isLoading()) {
|
@if ((isLoading$ | async) === true) {
|
||||||
<h2 i18n>Publication loading...</h2>
|
<h2 i18n>Publication loading...</h2>
|
||||||
<mat-spinner></mat-spinner>
|
<mat-spinner></mat-spinner>
|
||||||
} @else {
|
} @else {
|
||||||
@if (isLoaded()) {
|
@if ((isLoaded$ | async) === true) {
|
||||||
<app-publication-list [publications]="publications()"></app-publication-list>
|
<app-publication-list [publications$]="publications$"></app-publication-list>
|
||||||
} @else {
|
} @else {
|
||||||
<h2 i18n>There is no any publication...</h2>
|
<h2 i18n>There is no any publication...</h2>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +1,24 @@
|
|||||||
import { Component, inject, OnInit } from "@angular/core";
|
import { Component, inject, OnInit } from "@angular/core";
|
||||||
import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
|
import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
|
||||||
import { MyPublicationsService } from "./my-publications.service";
|
import { MyPublicationsService } from "./my-publications.service";
|
||||||
|
import { Observable } from "rxjs";
|
||||||
import { PublicationListComponent } from "../../components/publication-list/publication-list.component";
|
import { PublicationListComponent } from "../../components/publication-list/publication-list.component";
|
||||||
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
import { CommonModule } from "@angular/common";
|
import { CommonModule } from "@angular/common";
|
||||||
import { RouterModule } from "@angular/router";
|
import { RouterModule } from "@angular/router";
|
||||||
import { MatTooltipModule } from "@angular/material/tooltip";
|
import { MatTooltipModule } from "@angular/material/tooltip";
|
||||||
import {MatRippleModule} from "@angular/material/core";
|
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-my-component',
|
selector: 'app-my-component',
|
||||||
|
standalone: true,
|
||||||
templateUrl: './my-publications.component.html',
|
templateUrl: './my-publications.component.html',
|
||||||
styleUrl: './my-publications.component.scss',
|
styleUrl: './my-publications.component.scss',
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
MatProgressSpinnerModule,
|
MatProgressSpinnerModule,
|
||||||
MatRippleModule,
|
|
||||||
MatTooltipModule,
|
|
||||||
PublicationListComponent,
|
PublicationListComponent,
|
||||||
|
MatTooltipModule,
|
||||||
RouterModule
|
RouterModule
|
||||||
],
|
],
|
||||||
providers: [MyPublicationsService]
|
providers: [MyPublicationsService]
|
||||||
@@ -25,9 +26,17 @@ import {MatRippleModule} from "@angular/material/core";
|
|||||||
export class MyPublicationsComponent implements OnInit {
|
export class MyPublicationsComponent implements OnInit {
|
||||||
private readonly myPublicationsService = inject(MyPublicationsService);
|
private readonly myPublicationsService = inject(MyPublicationsService);
|
||||||
|
|
||||||
publications = this.myPublicationsService.publications;
|
get publications$(): Observable<Publication[]> {
|
||||||
isLoading = this.myPublicationsService.isLoading;
|
return this.myPublicationsService.publications$;
|
||||||
isLoaded = this.myPublicationsService.isLoaded;
|
}
|
||||||
|
|
||||||
|
get isLoading$(): Observable<boolean> {
|
||||||
|
return this.myPublicationsService.isLoading$;
|
||||||
|
}
|
||||||
|
|
||||||
|
get isLoaded$(): Observable<boolean> {
|
||||||
|
return this.myPublicationsService.isLoaded$;
|
||||||
|
}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.myPublicationsService.loadAuthenticatedUserPublications();
|
this.myPublicationsService.loadAuthenticatedUserPublications();
|
||||||
|
|||||||
@@ -1,56 +1,57 @@
|
|||||||
import {inject, Injectable, Signal, signal} from "@angular/core";
|
import { inject, Injectable } from "@angular/core";
|
||||||
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
||||||
import { AuthenticationService } from "../../core/service/authentication.service";
|
import { AuthenticationService } from "../../core/service/authentication.service";
|
||||||
|
import { BehaviorSubject, Observable } from "rxjs";
|
||||||
import { Publication } from "../../core/rest-services/publications/model/publication";
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
import { Router } from "@angular/router";
|
import { Router } from "@angular/router";
|
||||||
import { MatSnackBar } from "@angular/material/snack-bar";
|
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class MyPublicationsService {
|
export class MyPublicationsService {
|
||||||
readonly #authenticationService = inject(AuthenticationService);
|
private readonly authenticationService = inject(AuthenticationService);
|
||||||
readonly #publicationRestService = inject(PublicationRestService);
|
private readonly publicationRestService = inject(PublicationRestService);
|
||||||
readonly #snackBar = inject(MatSnackBar);
|
private readonly snackBar = inject(MatSnackBar);
|
||||||
readonly #router = inject(Router);
|
private readonly router = inject(Router);
|
||||||
#publications = signal<Publication[]>([]);
|
private publicationsSubject = new BehaviorSubject<Publication[]>([]);
|
||||||
#isLoading = signal(false);
|
private isLoadingSubject = new BehaviorSubject<boolean>(false);
|
||||||
#isLoaded = signal(false);
|
private isLoadedSubject = new BehaviorSubject<boolean>(false);
|
||||||
|
|
||||||
get publications(): Signal<Publication[]> {
|
get publications$(): Observable<Publication[]> {
|
||||||
return this.#publications.asReadonly();
|
return this.publicationsSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
get isLoading(): Signal<boolean> {
|
get isLoading$(): Observable<boolean> {
|
||||||
return this.#isLoading.asReadonly();
|
return this.isLoadingSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
get isLoaded(): Signal<boolean> {
|
get isLoaded$(): Observable<boolean> {
|
||||||
return this.#isLoaded.asReadonly();
|
return this.isLoadedSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
loadAuthenticatedUserPublications(): void {
|
loadAuthenticatedUserPublications(): void {
|
||||||
const authenticatedUser = this.#authenticationService.getAuthenticatedUser();
|
const authenticatedUser = this.authenticationService.getAuthenticatedUser();
|
||||||
if (authenticatedUser) {
|
if (authenticatedUser) {
|
||||||
this.#isLoading.set(true);
|
this.isLoadingSubject.next(true);
|
||||||
this.#isLoaded.set(false);
|
this.isLoadedSubject.next(false);
|
||||||
|
|
||||||
const query = `author_id=${authenticatedUser.id}`;
|
const query = `author_id=${authenticatedUser.id}`;
|
||||||
this.#publicationRestService.search(query)
|
this.publicationRestService.search(query)
|
||||||
.then(publications => {
|
.then(publications => {
|
||||||
this.#publications.set(publications);
|
this.publicationsSubject.next(publications);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
const errorMessage = $localize`An error occurred while retrieving your publications...`;
|
const errorMessage = $localize`An error occurred while retrieving your publications...`;
|
||||||
this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
||||||
console.error(errorMessage, error);
|
console.error(errorMessage, error);
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
this.#isLoading.set(false);
|
this.isLoadingSubject.next(false);
|
||||||
this.#isLoaded.set(true);
|
this.isLoadedSubject.next(true);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.#authenticationService.unauthenticate();
|
this.authenticationService.unauthenticate();
|
||||||
this.#snackBar.open($localize`You are unauthenticated. Please, log-in first.`, $localize`Close`, {duration: 5000});
|
this.snackBar.open($localize`You are unauthenticated. Please, log-in first.`, $localize`Close`, { duration: 5000 });
|
||||||
this.#router.navigate(['/login']);
|
this.router.navigate(['/login']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<app-publication-edition
|
<app-publication-edition
|
||||||
title="Creation of a new publication"
|
title="Creation of a new publication"
|
||||||
[publication]="publication()"
|
[publication]="publication"
|
||||||
[isSaving]="isSaving()"
|
[isSaving$]="isSaving$"
|
||||||
(publicationSave)="onPublicationSave($event)"
|
(publicationSave)="onPublicationSave($event)"
|
||||||
i18n-title
|
i18n-title>
|
||||||
/>
|
</app-publication-edition>
|
||||||
@@ -1,53 +1,76 @@
|
|||||||
import {Component, inject, OnInit, signal} from "@angular/core";
|
import { Component, inject, OnInit } from "@angular/core";
|
||||||
import { PublicationEditionComponent } from "../../components/publication-edition/publication-edition.component";
|
import { PublicationEditionComponent } from "../../components/publication-edition/publication-edition.component";
|
||||||
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
||||||
import {Router} from "@angular/router";
|
import { ActivatedRoute, Router } from "@angular/router";
|
||||||
import { MatSnackBar } from "@angular/material/snack-bar";
|
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||||
import {DEFAULT_PUBLICATION, Publication} from "../../core/rest-services/publications/model/publication";
|
import { BehaviorSubject, Observable, Subscription } from "rxjs";
|
||||||
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
import { AuthenticationService } from "../../core/service/authentication.service";
|
import { AuthenticationService } from "../../core/service/authentication.service";
|
||||||
import { Author } from "../../core/rest-services/publications/model/author";
|
import { Author } from "../../core/rest-services/publications/model/author";
|
||||||
|
import { CommonModule } from "@angular/common";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-publication-creation',
|
selector: 'app-publication-creation',
|
||||||
|
standalone: true,
|
||||||
templateUrl: './publication-creation.component.html',
|
templateUrl: './publication-creation.component.html',
|
||||||
styleUrl: './publication-creation.component.scss',
|
styleUrl: './publication-creation.component.scss',
|
||||||
imports: [
|
imports: [
|
||||||
|
CommonModule,
|
||||||
PublicationEditionComponent
|
PublicationEditionComponent
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class PublicationCreationComponent implements OnInit {
|
export class PublicationCreationComponent implements OnInit {
|
||||||
readonly #authenticationService = inject(AuthenticationService);
|
private readonly authenticationService = inject(AuthenticationService);
|
||||||
readonly #publicationRestService = inject(PublicationRestService);
|
private readonly publicationRestService = inject(PublicationRestService);
|
||||||
readonly #router = inject(Router);
|
private readonly router = inject(Router);
|
||||||
readonly #snackBar = inject(MatSnackBar);
|
private readonly snackBar = inject(MatSnackBar);
|
||||||
isSaving = signal(false);
|
private isSavingSubject = new BehaviorSubject<boolean>(false);
|
||||||
publication = signal<Publication>(DEFAULT_PUBLICATION);
|
private subscriptions: Subscription[] = [];
|
||||||
|
publication!: Publication;
|
||||||
|
|
||||||
|
get isSaving$(): Observable<boolean> {
|
||||||
|
return this.isSavingSubject.asObservable();
|
||||||
|
}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
const authenticatedUser = this.#authenticationService.getAuthenticatedUser();
|
const authenticatedUser = this.authenticationService.getAuthenticatedUser();
|
||||||
if (authenticatedUser) {
|
if (authenticatedUser) {
|
||||||
const author: Author = {
|
const author: Author = {
|
||||||
id: authenticatedUser.id,
|
id: authenticatedUser.id,
|
||||||
name: authenticatedUser.pseudo,
|
name: authenticatedUser.pseudo,
|
||||||
image: authenticatedUser.photoId ?? ''
|
image: authenticatedUser.photoId ?? ''
|
||||||
};
|
};
|
||||||
const newPublication: Publication = {...DEFAULT_PUBLICATION, author};
|
this.publication = {
|
||||||
this.publication.set(newPublication);
|
id: '',
|
||||||
|
key: '',
|
||||||
|
title: '',
|
||||||
|
text: '',
|
||||||
|
parsedText: '',
|
||||||
|
description: '',
|
||||||
|
creationDate: new Date(),
|
||||||
|
illustrationId: '',
|
||||||
|
categoryId: '',
|
||||||
|
author
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.subscriptions.forEach(subscription => subscription?.unsubscribe());
|
||||||
|
}
|
||||||
|
|
||||||
onPublicationSave(publication: Publication): void {
|
onPublicationSave(publication: Publication): void {
|
||||||
this.isSaving.set(true);
|
this.isSavingSubject.next(true);
|
||||||
this.#publicationRestService.create(publication)
|
this.publicationRestService.create(publication)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
this.#snackBar.open($localize`Publication created succesfully!`, $localize`Close`, {duration: 5000});
|
this.snackBar.open($localize`Publication created succesfully!`, $localize`Close`, { duration: 5000 });
|
||||||
this.#router.navigate(['/my-publications']);
|
this.router.navigate(['/my-publications']);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
const errorMessage = $localize`An error occured while saving new publication.`;
|
const errorMessage = $localize`An error occured while saving new publication.`;
|
||||||
console.error(errorMessage, error);
|
console.error(errorMessage, error);
|
||||||
this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
||||||
})
|
})
|
||||||
.finally(() => this.isSaving.set(false));
|
.finally(() => this.isSavingSubject.next(false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,16 +1,18 @@
|
|||||||
@if (isLoading()) {
|
@if ((isLoading$ | async) == true) {
|
||||||
<h2 i18n>Loading publication to edit...</h2>
|
<h2 i18n>Loading publication to edit...</h2>
|
||||||
<mat-spinner/>
|
<mat-spinner></mat-spinner>
|
||||||
} @else {
|
}
|
||||||
@if (publication(); as publication) {
|
@else {
|
||||||
|
@if (publication) {
|
||||||
<app-publication-edition
|
<app-publication-edition
|
||||||
title="Update publication {{ publication.title }}"
|
title="Update publication {{ publication.title }}"
|
||||||
[publication]="publication"
|
[publication]="publication"
|
||||||
[isSaving]="isSaving()"
|
[isSaving$]="isSaving$"
|
||||||
(publicationSave)="onPublicationSave($event)"
|
(publicationSave)="onPublicationSave($event)"
|
||||||
i18n-title
|
i18n-title>
|
||||||
/>
|
</app-publication-edition>
|
||||||
} @else {
|
}
|
||||||
|
@else {
|
||||||
<div class="loading-failed">
|
<div class="loading-failed">
|
||||||
<h1 i18n>Publication failed to load...</h1>
|
<h1 i18n>Publication failed to load...</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { CommonModule, Location } from '@angular/common';
|
import { CommonModule, Location } from '@angular/common';
|
||||||
import {Component, effect, inject, Signal, signal} from '@angular/core';
|
import { Component, inject, OnDestroy, OnInit } from '@angular/core';
|
||||||
import { ReactiveFormsModule } from '@angular/forms';
|
import { ReactiveFormsModule } from '@angular/forms';
|
||||||
import { MatDialogModule } from '@angular/material/dialog';
|
import { MatDialogModule } from '@angular/material/dialog';
|
||||||
import { MatIconModule } from '@angular/material/icon';
|
import { MatIconModule } from '@angular/material/icon';
|
||||||
@@ -9,14 +9,16 @@ import {MatSnackBar} from '@angular/material/snack-bar';
|
|||||||
import { MatTabsModule } from '@angular/material/tabs';
|
import { MatTabsModule } from '@angular/material/tabs';
|
||||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
import { MatTooltipModule } from '@angular/material/tooltip';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
import { BehaviorSubject, Observable, Subscription } from 'rxjs';
|
||||||
import { PublicationEditionComponent } from '../../components/publication-edition/publication-edition.component';
|
import { PublicationEditionComponent } from '../../components/publication-edition/publication-edition.component';
|
||||||
|
import { SubmitButtonComponent } from '../../components/submit-button/submit-button.component';
|
||||||
import { Publication } from '../../core/rest-services/publications/model/publication';
|
import { Publication } from '../../core/rest-services/publications/model/publication';
|
||||||
import { PublicationRestService } from '../../core/rest-services/publications/publication.rest-service';
|
import { PublicationRestService } from '../../core/rest-services/publications/publication.rest-service';
|
||||||
import {toSignal} from "@angular/core/rxjs-interop";
|
import { PictureSelectionDialog } from '../../components/publication-edition/picture-selection-dialog/picture-selection-dialog.component';
|
||||||
import {map} from "rxjs";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-publication-update',
|
selector: 'app-publication-update',
|
||||||
|
standalone: true,
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
MatDialogModule,
|
MatDialogModule,
|
||||||
@@ -25,69 +27,71 @@ import {map} from "rxjs";
|
|||||||
MatProgressSpinnerModule,
|
MatProgressSpinnerModule,
|
||||||
MatTabsModule,
|
MatTabsModule,
|
||||||
MatTooltipModule,
|
MatTooltipModule,
|
||||||
|
PictureSelectionDialog,
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
|
SubmitButtonComponent,
|
||||||
PublicationEditionComponent
|
PublicationEditionComponent
|
||||||
],
|
],
|
||||||
templateUrl: './publication-update.component.html',
|
templateUrl: './publication-update.component.html',
|
||||||
styleUrl: './publication-update.component.scss'
|
styleUrl: './publication-update.component.scss',
|
||||||
})
|
})
|
||||||
export class PublicationUpdateComponent {
|
export class PublicationUpdateComponent implements OnInit, OnDestroy {
|
||||||
readonly #activatedRoute = inject(ActivatedRoute);
|
private readonly publicationRestService = inject(PublicationRestService);
|
||||||
readonly #location = inject(Location);
|
private readonly activatedRoute = inject(ActivatedRoute);
|
||||||
readonly #publicationRestService = inject(PublicationRestService);
|
private readonly location = inject(Location);
|
||||||
readonly #router = inject(Router);
|
private readonly router = inject(Router);
|
||||||
readonly #snackBar = inject(MatSnackBar);
|
private readonly snackBar = inject(MatSnackBar);
|
||||||
#isLoading = signal(false);
|
private isLoadingSubject = new BehaviorSubject<boolean>(false);
|
||||||
#isSavingSubject = signal(false);
|
private isSavingSubject = new BehaviorSubject<boolean>(false);
|
||||||
publication = signal<Publication | undefined>(undefined);
|
private subscriptions: Subscription[] = [];
|
||||||
|
publication: Publication | undefined;
|
||||||
|
|
||||||
#publicationId$ = this.#activatedRoute.params
|
get isLoading$(): Observable<boolean> {
|
||||||
.pipe(map(queryParams => queryParams['publicationId']));
|
return this.isLoadingSubject.asObservable();
|
||||||
#publicationId = toSignal(this.#publicationId$, {initialValue: undefined});
|
|
||||||
|
|
||||||
get isLoading(): Signal<boolean> {
|
|
||||||
return this.#isLoading.asReadonly();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
get isSaving(): Signal<boolean> {
|
get isSaving$(): Observable<boolean> {
|
||||||
return this.#isSavingSubject.asReadonly();
|
return this.isSavingSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor() {
|
ngOnInit(): void {
|
||||||
effect(() => {
|
this.isLoadingSubject.next(true);
|
||||||
this.#isLoading.set(true);
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
|
const publicationId = params.get('publicationId');
|
||||||
const publicationId = this.#publicationId();
|
if (publicationId == undefined) {
|
||||||
if (publicationId) {
|
this.snackBar.open($localize`A technical error occurred while loading publication data.`, $localize`Close`, { duration: 5000 });
|
||||||
this.#publicationRestService.getById(publicationId)
|
this.location.back();
|
||||||
|
} else {
|
||||||
|
this.publicationRestService.getById(publicationId)
|
||||||
.then(publication => {
|
.then(publication => {
|
||||||
this.publication.set(publication);
|
this.publication = publication;
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
const errorMessage = $localize`A technical error occurred while loading publication data.`;
|
const errorMessage = $localize`A technical error occurred while loading publication data.`;
|
||||||
this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
||||||
console.error(errorMessage, error)
|
console.error(errorMessage, error)
|
||||||
})
|
})
|
||||||
.finally(() => this.#isLoading.set(false));
|
.finally(() => this.isLoadingSubject.next(false));
|
||||||
} else {
|
|
||||||
this.#snackBar.open($localize`A technical error occurred while loading publication data.`, $localize`Close`, {duration: 5000});
|
|
||||||
this.#location.back();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.subscriptions.forEach(subscription => subscription?.unsubscribe());
|
||||||
|
}
|
||||||
|
|
||||||
onPublicationSave(publication: Publication): void {
|
onPublicationSave(publication: Publication): void {
|
||||||
this.#isSavingSubject.set(true);
|
this.isSavingSubject.next(true);
|
||||||
this.#publicationRestService.update(publication)
|
this.publicationRestService.update(publication)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
this.#snackBar.open($localize`Publication updated succesfully!`, $localize`Close`, {duration: 5000});
|
this.snackBar.open($localize`Publication updated succesfully!`, $localize`Close`, { duration: 5000 });
|
||||||
this.#router.navigate(['/home']);
|
this.router.navigate(['/home']);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
const errorMessage = $localize`An error occured while saving publication modifications.`;
|
const errorMessage = $localize`An error occured while saving publication modifications.`;
|
||||||
console.error(errorMessage, error);
|
console.error(errorMessage, error);
|
||||||
this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
||||||
})
|
})
|
||||||
.finally(() => this.#isSavingSubject.set(false));
|
.finally(() => this.isSavingSubject.next(false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,18 +1,17 @@
|
|||||||
@if (isLoading()) {
|
@if (isLoading) {
|
||||||
<h2 i18n>Publication content loading...</h2>
|
<h2 i18n>Publication content loading...</h2>
|
||||||
<mat-spinner></mat-spinner>
|
<mat-spinner></mat-spinner>
|
||||||
} @else {
|
} @else {
|
||||||
@if (publication(); as publication) {
|
@if (publication) {
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<img src="/api/pictures/{{ publication.illustrationId }}" />
|
<img src="/api/pictures/{{ publication.illustrationId }}" />
|
||||||
<header>
|
<header>
|
||||||
<h1>{{ publication.title }}</h1>
|
<h1>{{ publication.title }}</h1>
|
||||||
<h2>{{ publication.description }}</h2>
|
<h2>{{ publication.description }}</h2>
|
||||||
@if (isAuthorAndUserEquals()) {
|
@if (isAuthorAndUserEquals) {
|
||||||
<a [routerLink]="['edit']"
|
<a [routerLink]="['edit']"
|
||||||
class="button action"
|
class="button action"
|
||||||
matTooltip="Click to edit the publication"
|
matTooltip="Click to edit the publication"
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
i18n-matTooltip>
|
||||||
<mat-icon>edit</mat-icon>
|
<mat-icon>edit</mat-icon>
|
||||||
</a>
|
</a>
|
||||||
@@ -29,12 +28,11 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@if (isAuthorAndUserEquals()) {
|
@if (isAuthorAndUserEquals) {
|
||||||
<button type="button"
|
<button type="button"
|
||||||
(click)="deletePublication()"
|
(click)="deletePublication()"
|
||||||
matTooltip="Click to delete the publication"
|
matTooltip="Click to delete the publication"
|
||||||
matTooltipPosition="left"
|
matTooltipPosition="left"
|
||||||
matRipple
|
|
||||||
i18n-matTooltip>
|
i18n-matTooltip>
|
||||||
<mat-icon>delete</mat-icon>
|
<mat-icon>delete</mat-icon>
|
||||||
Delete
|
Delete
|
||||||
|
|||||||
@@ -1,32 +1,25 @@
|
|||||||
import {CommonModule, Location} from '@angular/common';
|
import { Component, OnDestroy, OnInit, inject } from '@angular/core';
|
||||||
import {Component, inject, OnDestroy, OnInit, signal} from '@angular/core';
|
|
||||||
import {MatRippleModule} from '@angular/material/core';
|
|
||||||
import {MatDialog} from '@angular/material/dialog';
|
|
||||||
import {MatIcon} from '@angular/material/icon';
|
|
||||||
import {MatProgressSpinner} from '@angular/material/progress-spinner';
|
|
||||||
import {MatSnackBar} from '@angular/material/snack-bar';
|
|
||||||
import {MatTooltipModule} from '@angular/material/tooltip';
|
|
||||||
import {ActivatedRoute, RouterModule} from '@angular/router';
|
|
||||||
import {Subscription} from 'rxjs';
|
|
||||||
import {ConfirmationDialog} from '../../components/confirmation-dialog/confirmation-dialog.component';
|
|
||||||
import {Publication} from '../../core/rest-services/publications/model/publication';
|
|
||||||
import { PublicationRestService } from '../../core/rest-services/publications/publication.rest-service';
|
import { PublicationRestService } from '../../core/rest-services/publications/publication.rest-service';
|
||||||
|
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
|
||||||
|
import { Subscription } from 'rxjs';
|
||||||
|
import { Publication } from '../../core/rest-services/publications/model/publication';
|
||||||
|
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||||
|
import { CommonModule, Location } from '@angular/common';
|
||||||
|
import { MatProgressSpinner } from '@angular/material/progress-spinner';
|
||||||
|
import { MatTooltip, MatTooltipModule } from '@angular/material/tooltip';
|
||||||
|
import { MatIcon } from '@angular/material/icon';
|
||||||
import { AuthenticationService } from '../../core/service/authentication.service';
|
import { AuthenticationService } from '../../core/service/authentication.service';
|
||||||
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
|
import { ConfirmationDialog } from '../../components/confirmation-dialog/confirmation-dialog.component';
|
||||||
|
|
||||||
declare let Prism: any;
|
declare let Prism: any;
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-publication',
|
selector: 'app-publication',
|
||||||
|
standalone: true,
|
||||||
|
imports: [CommonModule, MatProgressSpinner, MatTooltip, RouterModule, MatIcon, MatTooltipModule],
|
||||||
templateUrl: './publication.component.html',
|
templateUrl: './publication.component.html',
|
||||||
styleUrl: './publication.component.scss',
|
styleUrl: './publication.component.scss'
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
MatIcon,
|
|
||||||
MatRippleModule,
|
|
||||||
MatProgressSpinner,
|
|
||||||
MatTooltipModule,
|
|
||||||
RouterModule
|
|
||||||
]
|
|
||||||
})
|
})
|
||||||
export class PublicationComponent implements OnInit, OnDestroy {
|
export class PublicationComponent implements OnInit, OnDestroy {
|
||||||
private readonly activatedRoute = inject(ActivatedRoute);
|
private readonly activatedRoute = inject(ActivatedRoute);
|
||||||
@@ -37,9 +30,9 @@ export class PublicationComponent implements OnInit, OnDestroy {
|
|||||||
private readonly snackBar = inject(MatSnackBar);
|
private readonly snackBar = inject(MatSnackBar);
|
||||||
private paramMapSubscription?: Subscription;
|
private paramMapSubscription?: Subscription;
|
||||||
private afterDialogCloseSubscription?: Subscription;
|
private afterDialogCloseSubscription?: Subscription;
|
||||||
isLoading = signal(false);
|
isLoading: boolean = false;
|
||||||
isAuthorAndUserEquals = signal(false);
|
isAuthorAndUserEquals: boolean = false;
|
||||||
publication = signal<Publication | null>(null);
|
publication?: Publication;
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.paramMapSubscription = this.activatedRoute
|
this.paramMapSubscription = this.activatedRoute
|
||||||
@@ -48,12 +41,12 @@ export class PublicationComponent implements OnInit, OnDestroy {
|
|||||||
const publicationId = params.get('publicationId');
|
const publicationId = params.get('publicationId');
|
||||||
|
|
||||||
if (publicationId) {
|
if (publicationId) {
|
||||||
this.isLoading.set(true);
|
this.isLoading = true;
|
||||||
|
|
||||||
this.publicationRestService.getById(publicationId)
|
this.publicationRestService.getById(publicationId)
|
||||||
.then(publication => {
|
.then(publication => {
|
||||||
this.publication.set(publication);
|
this.publication = publication;
|
||||||
this.isAuthorAndUserEquals.set(this.authenticationService.getAuthenticatedUser()?.id === this.publication()?.author.id);
|
this.isAuthorAndUserEquals = this.authenticationService.getAuthenticatedUser()?.id === this.publication.author.id;
|
||||||
setTimeout(() => Prism.highlightAll(), 100);
|
setTimeout(() => Prism.highlightAll(), 100);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
@@ -62,7 +55,7 @@ export class PublicationComponent implements OnInit, OnDestroy {
|
|||||||
console.error(errorMessage, error);
|
console.error(errorMessage, error);
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
this.isLoading.set(false);
|
this.isLoading = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -86,9 +79,8 @@ export class PublicationComponent implements OnInit, OnDestroy {
|
|||||||
|
|
||||||
this.afterDialogCloseSubscription = dialogRef.afterClosed()
|
this.afterDialogCloseSubscription = dialogRef.afterClosed()
|
||||||
.subscribe(response => {
|
.subscribe(response => {
|
||||||
const publication = this.publication();
|
if (response && this.publication?.id) {
|
||||||
if (response && publication?.id) {
|
this.publicationRestService.delete(this.publication.id);
|
||||||
this.publicationRestService.delete(publication.id);
|
|
||||||
this.snackBar.open($localize`Publication deleted`, $localize`Close`, { duration: 5000 });
|
this.snackBar.open($localize`Publication deleted`, $localize`Close`, { duration: 5000 });
|
||||||
this.location.back();
|
this.location.back();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<h1 i18n>Search results</h1>
|
<h1 i18n>Search results</h1>
|
||||||
@if (isLoading()) {
|
@if((isLoading$ | async) === true) {
|
||||||
<h2 i18n>Search in progress...</h2>
|
<h2 i18n>Search in progress...</h2>
|
||||||
<mat-spinner/>
|
<mat-spinner></mat-spinner>
|
||||||
} @else if (isLoaded()) {
|
} @else if((isLoaded$ | async) === true) {
|
||||||
@if (publications().length) {
|
@if((publications$ | async)?.length) {
|
||||||
<app-publication-list [publications]="publications()"/>
|
<app-publication-list [publications$]="publications$"></app-publication-list>
|
||||||
} @else {
|
} @else {
|
||||||
<span i18n>No any result.</span>
|
<span i18n>No any result.</span>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,30 +1,28 @@
|
|||||||
import { CommonModule } from "@angular/common";
|
import { CommonModule } from "@angular/common";
|
||||||
import {Component, effect, inject} from "@angular/core";
|
import { Component, inject, OnDestroy, OnInit } from "@angular/core";
|
||||||
import { MatProgressSpinner } from "@angular/material/progress-spinner";
|
import { MatProgressSpinner } from "@angular/material/progress-spinner";
|
||||||
import { ActivatedRoute } from "@angular/router";
|
import { ActivatedRoute } from "@angular/router";
|
||||||
|
import { Observable, Subscription } from "rxjs";
|
||||||
import { PublicationListComponent } from "../../components/publication-list/publication-list.component";
|
import { PublicationListComponent } from "../../components/publication-list/publication-list.component";
|
||||||
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
import { SearchPublicationsService } from "./search-publications.service";
|
import { SearchPublicationsService } from "./search-publications.service";
|
||||||
import {toSignal} from "@angular/core/rxjs-interop";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-search-publications',
|
selector: 'app-search-publications',
|
||||||
templateUrl: './search-publications.component.html',
|
templateUrl: './search-publications.component.html',
|
||||||
styleUrl: './search-publications.component.scss',
|
styleUrl: './search-publications.component.scss',
|
||||||
|
standalone: true,
|
||||||
imports: [CommonModule, MatProgressSpinner, PublicationListComponent],
|
imports: [CommonModule, MatProgressSpinner, PublicationListComponent],
|
||||||
providers: [SearchPublicationsService]
|
providers: [SearchPublicationsService]
|
||||||
})
|
})
|
||||||
export class SearchPublicationsComponent {
|
export class SearchPublicationsComponent implements OnInit, OnDestroy {
|
||||||
private searchPublicationsService = inject(SearchPublicationsService);
|
private searchPublicationsService = inject(SearchPublicationsService);
|
||||||
private activatedRoute = inject(ActivatedRoute);
|
private activatedRoute = inject(ActivatedRoute);
|
||||||
publications = this.searchPublicationsService.publications;
|
private queryParamsSubscription?: Subscription;
|
||||||
isLoading = this.searchPublicationsService.isLoading;
|
|
||||||
isLoaded = this.searchPublicationsService.isLoaded;
|
|
||||||
|
|
||||||
constructor() {
|
ngOnInit(): void {
|
||||||
const queryParams = toSignal(this.activatedRoute.queryParamMap);
|
this.queryParamsSubscription = this.activatedRoute.queryParamMap
|
||||||
effect(() => {
|
.subscribe(params => {
|
||||||
let params = queryParams();
|
|
||||||
if (params) {
|
|
||||||
const categoryId = params.get('category-id');
|
const categoryId = params.get('category-id');
|
||||||
if (categoryId) {
|
if (categoryId) {
|
||||||
this.searchPublicationsService.loadPublications(`category_id=${categoryId}`);
|
this.searchPublicationsService.loadPublications(`category_id=${categoryId}`);
|
||||||
@@ -33,7 +31,22 @@ export class SearchPublicationsComponent {
|
|||||||
if (query) {
|
if (query) {
|
||||||
this.searchPublicationsService.loadPublications(query);
|
this.searchPublicationsService.loadPublications(query);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.queryParamsSubscription?.unsubscribe();
|
||||||
|
}
|
||||||
|
|
||||||
|
get publications$(): Observable<Publication[]> {
|
||||||
|
return this.searchPublicationsService.publications$;
|
||||||
|
}
|
||||||
|
|
||||||
|
get isLoading$(): Observable<boolean> {
|
||||||
|
return this.searchPublicationsService.isLoading$;
|
||||||
|
}
|
||||||
|
|
||||||
|
get isLoaded$(): Observable<boolean> {
|
||||||
|
return this.searchPublicationsService.isLoaded$;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,47 +1,49 @@
|
|||||||
import {inject, Injectable, Signal, signal} from "@angular/core";
|
import { inject, Injectable } from "@angular/core";
|
||||||
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
import { PublicationRestService } from "../../core/rest-services/publications/publication.rest-service";
|
||||||
|
import { BehaviorSubject, Observable } from "rxjs";
|
||||||
import { Publication } from "../../core/rest-services/publications/model/publication";
|
import { Publication } from "../../core/rest-services/publications/model/publication";
|
||||||
import { MatSnackBar } from "@angular/material/snack-bar";
|
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||||
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class SearchPublicationsService {
|
export class SearchPublicationsService {
|
||||||
#snackBar = inject(MatSnackBar);
|
private publicationRestService = inject(PublicationRestService);
|
||||||
#publicationRestService = inject(PublicationRestService);
|
private publicationsSubject = new BehaviorSubject<Publication[]>([]);
|
||||||
#publications = signal<Publication[]>([]);
|
private isLoadingSubject = new BehaviorSubject<boolean>(false);
|
||||||
#isLoading = signal(false);
|
private isLoadedSubject = new BehaviorSubject<boolean>(false);
|
||||||
#isLoaded = signal(false);
|
private snackBar = inject(MatSnackBar);
|
||||||
|
|
||||||
get publications(): Signal<Publication[]> {
|
get publications$(): Observable<Publication[]> {
|
||||||
return this.#publications.asReadonly();
|
return this.publicationsSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
get isLoading(): Signal<boolean> {
|
get isLoading$(): Observable<boolean> {
|
||||||
return this.#isLoading.asReadonly();
|
return this.isLoadingSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
get isLoaded(): Signal<boolean> {
|
get isLoaded$(): Observable<boolean> {
|
||||||
return this.#isLoaded.asReadonly();
|
return this.isLoadedSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
loadPublications(searchCriteria: string): void {
|
loadPublications(searchCriteria: string): void {
|
||||||
this.#isLoading.set(true);
|
this.isLoadingSubject.next(true);
|
||||||
this.#isLoaded.set(false);
|
this.isLoadedSubject.next(false);
|
||||||
this.#publications.set([]);
|
this.publicationsSubject.next([]);
|
||||||
|
|
||||||
this.#publicationRestService.search(searchCriteria)
|
this.publicationRestService.search(searchCriteria)
|
||||||
.then(publications => {
|
.then(publications => {
|
||||||
this.#publications.set(publications);
|
this.publicationsSubject.next(publications);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
if (error.status !== 404) {
|
if (error.status !== 404) {
|
||||||
const errorMessage = $localize`An error occured while retrieving publications.`;
|
const errorMessage = $localize`An error occured while retrieving publications.`;
|
||||||
console.error(errorMessage, error);
|
console.error(errorMessage, error);
|
||||||
this.#snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
|
this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
this.#isLoading.set(false);
|
this.isLoadingSubject.next(false);
|
||||||
this.#isLoaded.set(true);
|
this.isLoadedSubject.next(true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<form [formGroup]="signinForm" (submit)="performSignin()" class="cod-form card" ngNativeValidate>
|
<form [formGroup]="signinForm" (submit)="performSignin()" ngNativeValidate>
|
||||||
<h1 i18n>Signin</h1>
|
<h1 i18n>Signin</h1>
|
||||||
<div class="form-field">
|
<div>
|
||||||
<mat-icon>person</mat-icon>
|
<mat-icon>person</mat-icon>
|
||||||
<label for="pseudo" i18n>
|
<label for="pseudo" i18n>
|
||||||
Pseudo
|
Pseudo
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
</label>
|
</label>
|
||||||
<input type="text" id="pseudo" formControlName="pseudo" autocomplete="pseudo" required />
|
<input type="text" id="pseudo" formControlName="pseudo" autocomplete="pseudo" required />
|
||||||
</div>
|
</div>
|
||||||
<div class="form-field">
|
<div>
|
||||||
<mat-icon>mail</mat-icon>
|
<mat-icon>mail</mat-icon>
|
||||||
<label for="email" i18n>
|
<label for="email" i18n>
|
||||||
Email address
|
Email address
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
</label>
|
</label>
|
||||||
<input type="email" id="email" formControlName="email" autocomplete="email" required />
|
<input type="email" id="email" formControlName="email" autocomplete="email" required />
|
||||||
</div>
|
</div>
|
||||||
<div class="form-field">
|
<div>
|
||||||
<mat-icon>lock</mat-icon>
|
<mat-icon>lock</mat-icon>
|
||||||
<label for="password" i18n>
|
<label for="password" i18n>
|
||||||
Password
|
Password
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
</label>
|
</label>
|
||||||
<input type="password" id="password" formControlName="password" required />
|
<input type="password" id="password" formControlName="password" required />
|
||||||
</div>
|
</div>
|
||||||
<div class="form-field">
|
<div>
|
||||||
<mat-icon>lock</mat-icon>
|
<mat-icon>lock</mat-icon>
|
||||||
<label for="confirm-password" i18n>
|
<label for="confirm-password" i18n>
|
||||||
Confirm password
|
Confirm password
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
</label>
|
</label>
|
||||||
<input type="password" id="confirm-password" formControlName="confirmPassword" required />
|
<input type="password" id="confirm-password" formControlName="confirmPassword" required />
|
||||||
</div>
|
</div>
|
||||||
<div class="actions reversed">
|
<div class="actions">
|
||||||
<app-submit-button [requestPending]="false" [disabled]="false" i18n>Send</app-submit-button>
|
<button type="submit" i18n>Send</button>
|
||||||
<a [routerLink]="['/login']" class="cod-button secondary" matRipple i18n>I already have an account</a>
|
<a [routerLink]="['/login']" i18n>I already have an account</a>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@@ -4,4 +4,79 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
|
|
||||||
|
form {
|
||||||
|
width: 80%;
|
||||||
|
max-width: 20em;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 1em;
|
||||||
|
box-shadow: 0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12);
|
||||||
|
border-radius: .5em;
|
||||||
|
padding: 1em 1.5em;
|
||||||
|
background-color: #ffffff;
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
div {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
position: relative;
|
||||||
|
gap: .1em;
|
||||||
|
|
||||||
|
mat-icon {
|
||||||
|
position: absolute;
|
||||||
|
top: 1.3em;
|
||||||
|
left: .5em;
|
||||||
|
color: #777;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.actions {
|
||||||
|
flex-direction: row-reverse;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
button {
|
||||||
|
padding: .8em 1.2em;
|
||||||
|
border-radius: 10em;
|
||||||
|
border: none;
|
||||||
|
background-color: #3f51b5;
|
||||||
|
color: white;
|
||||||
|
transition: background-color .2s ease-in-out;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #5b6ed8;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: #3f51b5;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
flex: 1;
|
||||||
|
font-style: italic;
|
||||||
|
padding-left: 1em;
|
||||||
|
color: #777;
|
||||||
|
|
||||||
|
.required {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
flex: 1;
|
||||||
|
background-color: #eeeeee;
|
||||||
|
border: none;
|
||||||
|
border-radius: 10em;
|
||||||
|
padding: 1em 1em 1em 3em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,25 +1,18 @@
|
|||||||
import {Component, inject, OnDestroy, OnInit} from '@angular/core';
|
import { Component, OnDestroy, OnInit, inject } from '@angular/core';
|
||||||
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
|
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||||
import { MatIconModule } from '@angular/material/icon';
|
import { MatIconModule } from '@angular/material/icon';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import {debounceTime, distinctUntilChanged, map, Subscription} from 'rxjs';
|
import { Subscription, debounceTime, distinctUntilChanged, map } from 'rxjs';
|
||||||
import { SigninService } from './signin.service';
|
import { SigninService } from './signin.service';
|
||||||
import { LoginService } from '../login/login.service';
|
import { LoginService } from '../login/login.service';
|
||||||
import { FormError } from '../../core/model/FormError';
|
import { FormError } from '../../core/model/FormError';
|
||||||
import {SubmitButtonComponent} from "../../components/submit-button/submit-button.component";
|
|
||||||
import {MatRippleModule} from '@angular/material/core';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-signin',
|
selector: 'app-signin',
|
||||||
|
standalone: true,
|
||||||
|
imports: [ReactiveFormsModule, MatIconModule, RouterModule],
|
||||||
templateUrl: './signin.component.html',
|
templateUrl: './signin.component.html',
|
||||||
styleUrl: './signin.component.scss',
|
styleUrl: './signin.component.scss',
|
||||||
imports: [
|
|
||||||
MatIconModule,
|
|
||||||
MatRippleModule,
|
|
||||||
ReactiveFormsModule,
|
|
||||||
RouterModule,
|
|
||||||
SubmitButtonComponent
|
|
||||||
],
|
|
||||||
providers: [SigninService, LoginService]
|
providers: [SigninService, LoginService]
|
||||||
})
|
})
|
||||||
export class SigninComponent implements OnInit, OnDestroy {
|
export class SigninComponent implements OnInit, OnDestroy {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import {inject, Injectable} from '@angular/core';
|
import { Injectable, inject } from '@angular/core';
|
||||||
import { SigninRequest } from '../../core/rest-services/user/model/signin.model';
|
import { SigninRequest } from '../../core/rest-services/user/model/signin.model';
|
||||||
import { FormError } from '../../core/model/FormError';
|
import { FormError } from '../../core/model/FormError';
|
||||||
import { BehaviorSubject, Observable } from 'rxjs';
|
import { BehaviorSubject, Observable } from 'rxjs';
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
@@ -1,43 +0,0 @@
|
|||||||
button.cod-button, a.cod-button {
|
|
||||||
padding: .8em 1.2em;
|
|
||||||
border-radius: 10em;
|
|
||||||
border: none;
|
|
||||||
background-color: #3f51b5;
|
|
||||||
color: white;
|
|
||||||
transition: background-color .2s ease-in-out;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background-color: #5b6ed8;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.secondary {
|
|
||||||
color: #3f51b5;
|
|
||||||
background-color: white;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background-color: #f2f4ff;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.icon {
|
|
||||||
$buttonSize: 2.5em;
|
|
||||||
width: $buttonSize;
|
|
||||||
height: $buttonSize;
|
|
||||||
padding: 0;
|
|
||||||
|
|
||||||
&.close {
|
|
||||||
position: absolute;
|
|
||||||
top: 1em;
|
|
||||||
right: 1em;
|
|
||||||
color: black;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
a.cod-button {
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
form.cod-form {
|
|
||||||
&.card {
|
|
||||||
width: 80%;
|
|
||||||
max-width: 20em;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: center;
|
|
||||||
gap: 1em;
|
|
||||||
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12);
|
|
||||||
border-radius: .5em;
|
|
||||||
padding: 1em 1.5em;
|
|
||||||
background-color: #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
div {
|
|
||||||
&.actions {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
&.reversed {
|
|
||||||
flex-direction: row-reverse;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.form-field {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
position: relative;
|
|
||||||
gap: .1em;
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
position: absolute;
|
|
||||||
top: 1.3em;
|
|
||||||
left: .5em;
|
|
||||||
color: #777;
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
flex: 1;
|
|
||||||
font-style: italic;
|
|
||||||
padding-left: 1em;
|
|
||||||
color: #777;
|
|
||||||
|
|
||||||
.required {
|
|
||||||
color: red;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
input {
|
|
||||||
flex: 1;
|
|
||||||
background-color: #eeeeee;
|
|
||||||
border: none;
|
|
||||||
border-radius: 10em;
|
|
||||||
padding: 1em 1em 1em 3em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
@use './button.scss';
|
|
||||||
@use './form.scss';
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
@@ -3,7 +3,7 @@
|
|||||||
"translations": {
|
"translations": {
|
||||||
"3603720768157919481": "Non",
|
"3603720768157919481": "Non",
|
||||||
"4861926948802653243": "Oui",
|
"4861926948802653243": "Oui",
|
||||||
"9101236728284262962": "{$START_TAG_SPAN}©{$CLOSE_TAG_SPAN} 2016 - 2026 Tous droits réservés - 2.2 {$START_LINK}{$START_TAG_MAT_ICON}favorite{$CLOSE_TAG_MAT_ICON}{$CLOSE_LINK}",
|
"5277292207846698726": "{$START_TAG_SPAN}©{$CLOSE_TAG_SPAN} 2016 - 2024 Tous droits réservés - 2.0-alpha {$START_LINK}{$START_TAG_MAT_ICON}favorite{$CLOSE_TAG_MAT_ICON}{$CLOSE_LINK}",
|
||||||
"9214089025589249203": "Les indicateurs de vie du site seront disponibles ultérieurement...",
|
"9214089025589249203": "Les indicateurs de vie du site seront disponibles ultérieurement...",
|
||||||
"1711651175531679766": "La documentation sera disponible ultérieurement...",
|
"1711651175531679766": "La documentation sera disponible ultérieurement...",
|
||||||
"6299155290121808295": "Développements realisés par",
|
"6299155290121808295": "Développements realisés par",
|
||||||
@@ -11,7 +11,6 @@
|
|||||||
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} Mes publications",
|
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} Mes publications",
|
||||||
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Déconnexion",
|
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Déconnexion",
|
||||||
"2454050363478003966": "Connexion",
|
"2454050363478003966": "Connexion",
|
||||||
"7819314041543176992": "Fermer",
|
|
||||||
"6379828571327118783": "Ajouter un bloc de code",
|
"6379828571327118783": "Ajouter un bloc de code",
|
||||||
"933522671092765466": "Langage de programmation",
|
"933522671092765466": "Langage de programmation",
|
||||||
"5953425146193292178": "Bloc de code",
|
"5953425146193292178": "Bloc de code",
|
||||||
@@ -22,8 +21,9 @@
|
|||||||
"4111988153902305972": "Choisir cette illustation",
|
"4111988153902305972": "Choisir cette illustation",
|
||||||
"4491342806775118195": "Il n'y a aucune image.",
|
"4491342806775118195": "Il n'y a aucune image.",
|
||||||
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Ajouter une nouvelle image",
|
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Ajouter une nouvelle image",
|
||||||
"2175978098886350409": "Une erreur est survenue lors du chargements de vos images.",
|
"6852365376059142995": "Une erreur est survenue lors du chargements de vos images.",
|
||||||
"2334964899406832924": "Une erreur technique est survenue lors de l'ajout de votre image.",
|
"7819314041543176992": "Fermer",
|
||||||
|
"6198966268398913224": "Une erreur technique est survenue lors de l'ajout de votre image.",
|
||||||
"3603937053948195893": "Édition",
|
"3603937053948195893": "Édition",
|
||||||
"5701618810648052610": "Titre",
|
"5701618810648052610": "Titre",
|
||||||
"4902817035128594900": "Description",
|
"4902817035128594900": "Description",
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
"382530603854484923": "Cliquez pour ajouter une section titre de niveau 1",
|
"382530603854484923": "Cliquez pour ajouter une section titre de niveau 1",
|
||||||
"7918008528690631661": "Cliquez pour ajouter une section titre de niveau 2",
|
"7918008528690631661": "Cliquez pour ajouter une section titre de niveau 2",
|
||||||
"200884310255063303": "Cliquez pour ajouter une section titre de niveau 3",
|
"200884310255063303": "Cliquez pour ajouter une section titre de niveau 3",
|
||||||
"2615926469669796978": "Cliquez pour ajouter un lien",
|
|
||||||
"327371240590280003": "Cliquez pour ajouter une image",
|
"327371240590280003": "Cliquez pour ajouter une image",
|
||||||
|
"2615926469669796978": "Cliquez pour ajouter un lien",
|
||||||
"4689637499823680515": "Cliquez pour ajouter un bloc de code",
|
"4689637499823680515": "Cliquez pour ajouter un bloc de code",
|
||||||
"1065684538660053227": "Cliquez pour afficher l'aide",
|
"1065684538660053227": "Cliquez pour afficher l'aide",
|
||||||
"6205355627445317276": "Contenu",
|
"6205355627445317276": "Contenu",
|
||||||
@@ -46,7 +46,6 @@
|
|||||||
"9122763438636464100": "Fermer le menu",
|
"9122763438636464100": "Fermer le menu",
|
||||||
"1902100407096396858": "Catégories",
|
"1902100407096396858": "Catégories",
|
||||||
"6940115735259407353": "Une erreur est survenue lors du chargement des catégories.",
|
"6940115735259407353": "Une erreur est survenue lors du chargement des catégories.",
|
||||||
"3516191632292372377": "Vous ne pouvez pas accéder à cette page car vous êtes déjà connecté.",
|
|
||||||
"3450287383703155559": "Vous n'êtes pas connecté. Veuillez vous connecter avant de réessayer.",
|
"3450287383703155559": "Vous n'êtes pas connecté. Veuillez vous connecter avant de réessayer.",
|
||||||
"5455465794443528807": "You n'êtes pas connecté. Veuillez vous connecter avant de réessayer votre opération.",
|
"5455465794443528807": "You n'êtes pas connecté. Veuillez vous connecter avant de réessayer votre opération.",
|
||||||
"4011987306265136481": "Déconnexion...",
|
"4011987306265136481": "Déconnexion...",
|
||||||
@@ -60,7 +59,6 @@
|
|||||||
"2308975396733519902": "Créer un compte",
|
"2308975396733519902": "Créer un compte",
|
||||||
"1037765878727976611": "Connexion réussie",
|
"1037765878727976611": "Connexion réussie",
|
||||||
"6034686865111167926": "Une erreur est survenue lors de la connexion.",
|
"6034686865111167926": "Une erreur est survenue lors de la connexion.",
|
||||||
"5304730975301536612": "Veuillez renseigner tous les champs avant de valider.",
|
|
||||||
"1041423751558601074": "Vos publications",
|
"1041423751558601074": "Vos publications",
|
||||||
"5463894166935799864": "Rédiger une nouvelle publication",
|
"5463894166935799864": "Rédiger une nouvelle publication",
|
||||||
"1519054954638405159": "Chargement de la liste de vos publications...",
|
"1519054954638405159": "Chargement de la liste de vos publications...",
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"locale": "en",
|
"locale": "en-UK",
|
||||||
"translations": {
|
"translations": {
|
||||||
"3603720768157919481": " No ",
|
"3603720768157919481": " No ",
|
||||||
"4861926948802653243": " Yes ",
|
"4861926948802653243": " Yes ",
|
||||||
"9101236728284262962": "{$START_TAG_SPAN}©{$CLOSE_TAG_SPAN} 2016 - 2026 All rights reserved - 2.2 {$START_LINK}{$START_TAG_MAT_ICON}favorite{$CLOSE_TAG_MAT_ICON}{$CLOSE_LINK}",
|
"5277292207846698726": "{$START_TAG_SPAN}©{$CLOSE_TAG_SPAN} 2016 - 2024 All rights reserved - 2.0-alpha {$START_LINK}{$START_TAG_MAT_ICON}favorite{$CLOSE_TAG_MAT_ICON}{$CLOSE_LINK}",
|
||||||
"9214089025589249203": "Health checking will be available in future...",
|
"9214089025589249203": "Health checking will be available in future...",
|
||||||
"1711651175531679766": "Documentation will be available in future...",
|
"1711651175531679766": "Documentation will be available in future...",
|
||||||
"6299155290121808295": "Development realised by",
|
"6299155290121808295": "Development realised by",
|
||||||
@@ -11,7 +11,6 @@
|
|||||||
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} My publications ",
|
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} My publications ",
|
||||||
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Disconnect ",
|
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Disconnect ",
|
||||||
"2454050363478003966": "Login",
|
"2454050363478003966": "Login",
|
||||||
"7819314041543176992": "Close",
|
|
||||||
"6379828571327118783": "Add a code block",
|
"6379828571327118783": "Add a code block",
|
||||||
"933522671092765466": "Programming language",
|
"933522671092765466": "Programming language",
|
||||||
"5953425146193292178": "Code block",
|
"5953425146193292178": "Code block",
|
||||||
@@ -22,8 +21,9 @@
|
|||||||
"4111988153902305972": "Choose this illustration",
|
"4111988153902305972": "Choose this illustration",
|
||||||
"4491342806775118195": "There is no any picture.",
|
"4491342806775118195": "There is no any picture.",
|
||||||
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Add new picture ",
|
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Add new picture ",
|
||||||
"2175978098886350409": "An error occurred while loading pictures.",
|
"6852365376059142995": "An error occured while loading pictures.",
|
||||||
"2334964899406832924": "A technical error occurred while uploading your picture.",
|
"7819314041543176992": "Close",
|
||||||
|
"6198966268398913224": "A technical error occured while uploading your picture.",
|
||||||
"3603937053948195893": "Edition",
|
"3603937053948195893": "Edition",
|
||||||
"5701618810648052610": "Title",
|
"5701618810648052610": "Title",
|
||||||
"4902817035128594900": "Description",
|
"4902817035128594900": "Description",
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
"382530603854484923": "Click to insert a title 1 section",
|
"382530603854484923": "Click to insert a title 1 section",
|
||||||
"7918008528690631661": "Click to insert a title 2 section",
|
"7918008528690631661": "Click to insert a title 2 section",
|
||||||
"200884310255063303": "Click to insert a title 3 section",
|
"200884310255063303": "Click to insert a title 3 section",
|
||||||
"2615926469669796978": "Click to insert a link",
|
|
||||||
"327371240590280003": "Click to insert a picture",
|
"327371240590280003": "Click to insert a picture",
|
||||||
|
"2615926469669796978": "Click to insert a link",
|
||||||
"4689637499823680515": "Click to insert a code block",
|
"4689637499823680515": "Click to insert a code block",
|
||||||
"1065684538660053227": "Click to display editor help",
|
"1065684538660053227": "Click to display editor help",
|
||||||
"6205355627445317276": "Content",
|
"6205355627445317276": "Content",
|
||||||
@@ -46,7 +46,6 @@
|
|||||||
"9122763438636464100": "Close the menu",
|
"9122763438636464100": "Close the menu",
|
||||||
"1902100407096396858": "Categories",
|
"1902100407096396858": "Categories",
|
||||||
"6940115735259407353": "An error occured while loading categories.",
|
"6940115735259407353": "An error occured while loading categories.",
|
||||||
"3516191632292372377": "You can't access to this page because you are already authenticated.",
|
|
||||||
"3450287383703155559": "You are unauthenticated. Please, log-in first.",
|
"3450287383703155559": "You are unauthenticated. Please, log-in first.",
|
||||||
"5455465794443528807": "You are unauthenticated. Please, re-authenticate before retrying your action.",
|
"5455465794443528807": "You are unauthenticated. Please, re-authenticate before retrying your action.",
|
||||||
"4011987306265136481": "Disconnection...",
|
"4011987306265136481": "Disconnection...",
|
||||||
@@ -60,7 +59,6 @@
|
|||||||
"2308975396733519902": "Create an account",
|
"2308975396733519902": "Create an account",
|
||||||
"1037765878727976611": "Authentication succeeded!",
|
"1037765878727976611": "Authentication succeeded!",
|
||||||
"6034686865111167926": "Authentication failed.",
|
"6034686865111167926": "Authentication failed.",
|
||||||
"5304730975301536612": "Please, fill the inputs before send.",
|
|
||||||
"1041423751558601074": "Your publications",
|
"1041423751558601074": "Your publications",
|
||||||
"5463894166935799864": "Add a new publication",
|
"5463894166935799864": "Add a new publication",
|
||||||
"1519054954638405159": "Publication loading...",
|
"1519054954638405159": "Publication loading...",
|
||||||
|
|||||||
@@ -1,10 +1,6 @@
|
|||||||
/* You can add global styles to this file, and also import other style files */
|
/* You can add global styles to this file, and also import other style files */
|
||||||
@use './design_system/index.scss';
|
|
||||||
|
|
||||||
html, body {
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
html, body { height: 100%; }
|
||||||
body {
|
body {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-family: Roboto, "Helvetica Neue", sans-serif;
|
font-family: Roboto, "Helvetica Neue", sans-serif;
|
||||||
|
|||||||
@@ -13,11 +13,15 @@
|
|||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
"declaration": false,
|
"declaration": false,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"moduleResolution": "bundler",
|
"moduleResolution": "node",
|
||||||
"importHelpers": true,
|
"importHelpers": true,
|
||||||
"target": "ES2022",
|
"target": "ES2022",
|
||||||
"module": "ES2022",
|
"module": "ES2022",
|
||||||
"useDefineForClassFields": false
|
"useDefineForClassFields": false,
|
||||||
|
"lib": [
|
||||||
|
"ES2022",
|
||||||
|
"dom"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"angularCompilerOptions": {
|
"angularCompilerOptions": {
|
||||||
"enableI18nLegacyMessageIdFormat": false,
|
"enableI18nLegacyMessageIdFormat": false,
|
||||||
|
|||||||
Reference in New Issue
Block a user