31 Commits

Author SHA1 Message Date
Florian THIERRY
c4f887bf33 Use signals ont publication creation and update pages. 2024-09-25 09:27:24 +02:00
Florian THIERRY
61ec781bbb Use signals in side menu. 2024-09-25 09:19:07 +02:00
Florian THIERRY
3ee41cf571 Use signals on MyPublications page. 2024-09-25 09:11:22 +02:00
Florian THIERRY
7f2e762a44 Use signals in publication page. 2024-09-25 09:07:13 +02:00
Florian THIERRY
cfa3015a7b Use signals on home page. 2024-09-25 08:59:32 +02:00
Florian THIERRY
778a92fd5e Enable zoneless configuration. 2024-09-25 08:36:06 +02:00
ff52a198dc Upgrade to angular 18. 2024-09-24 22:47:15 +02:00
Florian THIERRY
f3d59a0ef3 conf cleaning. 2024-09-22 13:18:08 +02:00
Florian THIERRY
d84485e52b test 2024-09-22 13:03:39 +02:00
Florian THIERRY
f789d89995 test 2024-09-22 12:53:55 +02:00
Florian THIERRY
7e0174bcc2 test 2024-09-22 12:46:41 +02:00
Florian THIERRY
fe1d59a3bb test 2024-09-22 12:37:01 +02:00
Florian THIERRY
69a99c9312 test 2024-09-22 12:34:02 +02:00
Florian THIERRY
a6414ae64d test 2024-09-22 12:30:18 +02:00
Florian THIERRY
9cf47f0e2a test 2024-09-22 12:27:59 +02:00
Florian THIERRY
6c89562dc3 test 2024-09-22 12:14:04 +02:00
Florian THIERRY
e85eabbed5 test 2024-09-22 12:01:05 +02:00
Florian THIERRY
1ec4ba8212 test conf prod. 2024-09-22 11:10:01 +02:00
Florian THIERRY
a1ff181443 test conf prod. 2024-09-22 11:09:14 +02:00
Florian THIERRY
ee8f48bc43 Fix prod fr configuration. 2024-09-22 10:55:49 +02:00
Florian THIERRY
7ec1aee884 test 2024-09-21 23:39:46 +02:00
Florian THIERRY
a3adfa8ee0 Fix bug of preview content. 2024-09-21 22:20:00 +02:00
Florian THIERRY
d893afa1f3 i18n 2024-09-21 21:43:09 +02:00
Florian THIERRY
d984128176 i18n 2024-09-21 21:40:49 +02:00
Florian THIERRY
f8d73c9ed0 i18n 2024-09-21 21:34:16 +02:00
Florian THIERRY
208b935ffa i18n for some components. 2024-09-21 21:17:31 +02:00
Florian THIERRY
f12dfc7029 i18n for files in core package. 2024-09-21 21:09:36 +02:00
Florian THIERRY
98a890e915 i18n for signin page. 2024-09-21 21:06:47 +02:00
Florian THIERRY
0c1b52d734 i18n for publication search page. 2024-09-21 21:03:34 +02:00
Florian THIERRY
3f6764dd7d i18n for publication update page. 2024-09-21 21:00:59 +02:00
Florian THIERRY
67c3d0b3e6 i18n of publication creation page. 2024-09-21 20:57:05 +02:00
51 changed files with 2977 additions and 2843 deletions

View File

@@ -7,6 +7,6 @@ RUN npm run build-prod-fr
FROM nginx:1.27-alpine AS final FROM nginx:1.27-alpine AS final
WORKDIR /app WORKDIR /app
COPY --from=builder /app/dist/codiki-ng/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-ng/fr/browser /usr/share/nginx/html/fr/ COPY --from=builder /app/dist/codiki/fr/browser/fr /usr/share/nginx/html/fr/
COPY frontend/conf/nginx.conf /etc/nginx/nginx.conf COPY frontend/conf/nginx.conf /etc/nginx/nginx.conf

View File

@@ -1,29 +1,22 @@
package org.codiki.exposition.publication; package org.codiki.exposition.publication;
import org.codiki.application.publication.PublicationUseCases;
import org.codiki.domain.publication.exception.NoPublicationSearchResultException;
import org.codiki.domain.publication.exception.PublicationNotFoundException;
import org.codiki.domain.publication.model.Publication;
import org.codiki.domain.publication.model.PublicationEditionRequest;
import org.codiki.exposition.publication.model.PreviewContentRequest;
import org.codiki.exposition.publication.model.PreviewContentResponse;
import org.codiki.exposition.publication.model.PublicationDto;
import org.codiki.exposition.publication.model.PublicationEditionRequestDto;
import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import static org.springframework.http.HttpStatus.CREATED; import static org.springframework.http.HttpStatus.CREATED;
import static org.springframework.http.HttpStatus.NO_CONTENT; import static org.springframework.http.HttpStatus.NO_CONTENT;
import static org.springframework.util.ObjectUtils.isEmpty; import static org.springframework.util.ObjectUtils.isEmpty;
import org.codiki.application.publication.PublicationUseCases;
import org.codiki.domain.publication.exception.NoPublicationSearchResultException;
import org.codiki.domain.publication.exception.PublicationNotFoundException;
import org.codiki.domain.publication.model.Publication;
import org.codiki.domain.publication.model.PublicationEditionRequest;
import org.codiki.exposition.publication.model.PreviewContentRequest;
import org.codiki.exposition.publication.model.PublicationDto;
import org.codiki.exposition.publication.model.PublicationEditionRequestDto;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/api/publications") @RequestMapping("/api/publications")
@@ -93,8 +86,9 @@ public class PublicationController {
return publications; return publications;
} }
@PostMapping("/preview") @PostMapping(value = "/preview")
public String previewPublicationContent(@RequestBody PreviewContentRequest request) { public PreviewContentResponse previewPublicationContent(@RequestBody PreviewContentRequest request) {
return publicationUseCases.previewContent(request.text()); String previewContent = publicationUseCases.previewContent(request.text());
return new PreviewContentResponse(previewContent);
} }
} }

View File

@@ -0,0 +1,5 @@
package org.codiki.exposition.publication.model;
public record PreviewContentResponse(
String text
) {}

View File

@@ -0,0 +1,21 @@
meta {
name: Preview content
type: http
seq: 7
}
post {
url: {{url}}/api/publications/preview
body: json
auth: bearer
}
auth:bearer {
token: {{bearerToken}}
}
body:json {
{
"text" : "[h1]Test[/h1]"
}
}

View File

@@ -1,7 +1,7 @@
vars { vars {
url: http://localhost:8987 url: http://localhost:8987
publicationId: ec76602f-5501-4091-868e-b471611e63de publicationId: ec76602f-5501-4091-868e-b471611e63de
bearerToken: eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI1YWQ0NjJiOC04ZjllLTRhMjYtYmI4Ni1jNzRmZWY1ZDExYjYiLCJleHAiOjE3MTA4Mzc2ODQsInBzZXVkbyI6IlN0YW5kYXJkIHVzZXIiLCJlbWFpbCI6InN0YW5kYXJkLnVzZXJAY29kaWtpLm9yZyIsInJvbGVzIjoiU1RBTkRBUkQifQ.2HggC3T_4I14IpW02DZJiYfgYwc074kU8Y4AmuGf1mZzv0U8OUxpAw_xEhnKtn8NcaCozz_2vFv4o_CaBqS8Ag bearerToken: eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkMWQ1NTdhNi04OGIxLTQyNzQtOTk0ZS1mOWE5YTYwOTc5OTciLCJleHAiOjE3MjY5NTExNTgsInBob3RvSWQiOiI2MjhkYTFhNy0wNzAyLTRlNDktOGIwNi00ZDg2MGE2YTNkZTUiLCJwc2V1ZG8iOiJUYWtpZ3VjaGkiLCJlbWFpbCI6ImZsb3JpYW4udGhpZXJyeTcyQGdtYWlsLmNvbSIsInJvbGVzIjoiU1RBTkRBUkQifQ.4OQglB0cT2hTMO7_Bfxj7nQPYi42e0Gh06jmHj2q-SQTM6Md70Ii_BiKR__GxY14bahPAjLcIWfAYS2A0Tc1Vw
categoryId: 172fa901-3f4b-4540-92f3-1c15820e8ec9 categoryId: 172fa901-3f4b-4540-92f3-1c15820e8ec9
pictureId: 65b660b7-66bb-4e4a-a62c-fd0ca101f972 pictureId: 65b660b7-66bb-4e4a-a62c-fd0ca101f972
} }

View File

@@ -3,7 +3,7 @@
"version": 1, "version": 1,
"newProjectRoot": "projects", "newProjectRoot": "projects",
"projects": { "projects": {
"codiki-ng": { "codiki": {
"projectType": "application", "projectType": "application",
"schematics": { "schematics": {
"@schematics/angular:component": { "@schematics/angular:component": {
@@ -14,16 +14,19 @@
"sourceRoot": "src", "sourceRoot": "src",
"prefix": "app", "prefix": "app",
"i18n": { "i18n": {
"sourceLocale": "en-UK", "sourceLocale": "en",
"locales": { "locales": {
"fr": "src/locale/messages-fr.json" "fr": {
"translation": "src/locale/messages-fr.json"
}
} }
}, },
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-devkit/build-angular:application", "builder": "@angular-devkit/build-angular:application",
"options": { "options": {
"outputPath": "dist/codiki-ng", "outputPath": "dist/codiki",
"index": "src/index.html", "index": "src/index.html",
"browser": "src/main.ts", "browser": "src/main.ts",
"polyfills": [ "polyfills": [
@@ -56,7 +59,7 @@
} }
], ],
"outputHashing": "all", "outputHashing": "all",
"outputPath": "dist/codiki-ng/en/" "outputPath": "dist/codiki/en/"
}, },
"production-fr": { "production-fr": {
"budgets": [ "budgets": [
@@ -71,8 +74,10 @@
"maximumError": "4kb" "maximumError": "4kb"
} }
], ],
"localize": ["fr"],
"i18nMissingTranslation": "error",
"outputHashing": "all", "outputHashing": "all",
"outputPath": "dist/codiki-ng/fr/" "outputPath": "dist/codiki/fr/"
}, },
"development": { "development": {
"optimization": false, "optimization": false,
@@ -80,13 +85,13 @@
"sourceMap": true "sourceMap": true
}, },
"en": { "en": {
"outputPath": "dist/codiki-ng/en/", "outputPath": "dist/codiki/en/",
"optimization": false, "optimization": false,
"extractLicenses": false, "extractLicenses": false,
"sourceMap": true "sourceMap": true
}, },
"fr": { "fr": {
"outputPath": "dist/codiki-ng/fr/", "outputPath": "dist/codiki/fr/",
"optimization": false, "optimization": false,
"extractLicenses": false, "extractLicenses": false,
"sourceMap": true, "sourceMap": true,
@@ -100,19 +105,19 @@
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular-devkit/build-angular:dev-server",
"configurations": { "configurations": {
"production-en": { "production-en": {
"buildTarget": "codiki-ng:build:production-en" "buildTarget": "codiki:build:production-en"
}, },
"production-fr": { "production-fr": {
"buildTarget": "codiki-ng:build:production-fr" "buildTarget": "codiki:build:production-fr"
}, },
"development": { "development": {
"buildTarget": "codiki-ng:build:development" "buildTarget": "codiki:build:development"
}, },
"en": { "en": {
"buildTarget": "codiki-ng:build:en" "buildTarget": "codiki:build:en"
}, },
"fr": { "fr": {
"buildTarget": "codiki-ng:build:fr" "buildTarget": "codiki:build:fr"
} }
}, },
"defaultConfiguration": "development" "defaultConfiguration": "development"
@@ -120,7 +125,7 @@
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular-devkit/build-angular:extract-i18n",
"options": { "options": {
"buildTarget": "codiki-ng:build" "buildTarget": "codiki:build"
} }
}, },
"test": { "test": {

File diff suppressed because it is too large Load Diff

View File

@@ -8,7 +8,7 @@
"start-fr": "ng serve --port 4201 --configuration=fr --proxy-config proxy.conf.json", "start-fr": "ng serve --port 4201 --configuration=fr --proxy-config proxy.conf.json",
"build": "ng build", "build": "ng build",
"build-prod-en": "ng build --configuration=production-en --base-href /en/", "build-prod-en": "ng build --configuration=production-en --base-href /en/",
"build-prod-fr": "ng build --configuration=production-fr --base-href /fr/", "build-prod-fr": "ng build --configuration=production-fr --base-href",
"watch": "ng build --watch --configuration development", "watch": "ng build --watch --configuration development",
"test": "ng test", "test": "ng test",
"i18n": "npm run i18n-ng-extraction && npm run i18n-fr-file-completion", "i18n": "npm run i18n-ng-extraction && npm run i18n-fr-file-completion",
@@ -17,25 +17,25 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^17.0.0", "@angular/animations": "^18.2.5",
"@angular/cdk": "^17.3.1", "@angular/cdk": "^18.2.5",
"@angular/common": "^17.0.0", "@angular/common": "^18.2.5",
"@angular/compiler": "^17.0.0", "@angular/compiler": "^18.2.5",
"@angular/core": "^17.0.0", "@angular/core": "^18.2.5",
"@angular/forms": "^17.0.0", "@angular/forms": "^18.2.5",
"@angular/material": "^17.3.1", "@angular/material": "^18.2.5",
"@angular/platform-browser": "^17.0.0", "@angular/platform-browser": "^18.2.5",
"@angular/platform-browser-dynamic": "^17.0.0", "@angular/platform-browser-dynamic": "^18.2.5",
"@angular/router": "^17.0.0", "@angular/router": "^18.2.5",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"zone.js": "~0.14.2" "zone.js": "~0.14.10"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^17.0.5", "@angular-devkit/build-angular": "^18.2.5",
"@angular/cli": "^17.0.5", "@angular/cli": "^18.2.5",
"@angular/compiler-cli": "^17.0.0", "@angular/compiler-cli": "^18.2.5",
"@angular/localize": "^17.3.12", "@angular/localize": "^18.2.5",
"@types/jasmine": "~5.1.0", "@types/jasmine": "~5.1.0",
"jasmine-core": "~5.1.0", "jasmine-core": "~5.1.0",
"karma": "~6.4.0", "karma": "~6.4.0",
@@ -43,6 +43,6 @@
"karma-coverage": "~2.2.0", "karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0", "karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0", "karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.2.2" "typescript": "~5.5.4"
} }
} }

View File

@@ -1,4 +1,4 @@
import { ApplicationConfig } from '@angular/core'; import { ApplicationConfig, provideExperimentalZonelessChangeDetection } 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';
@@ -16,7 +16,9 @@ export const appConfig: ApplicationConfig = {
}) })
), ),
provideAnimationsAsync(), provideAnimationsAsync(),
provideExperimentalZonelessChangeDetection(),
provideHttpClient(withInterceptorsFromDi()), provideHttpClient(withInterceptorsFromDi()),
{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true }, { provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
] ]
}; };

View File

@@ -1,10 +1,10 @@
<h1>{{title}}</h1> <h1>{{title}}</h1>
<h2>{{description}}</h2> <h2>{{description}}</h2>
<footer> <footer>
<button type="button" class="secondary" (click)="closeDialog()"> <button type="button" class="secondary" (click)="closeDialog()" i18n>
No No
</button> </button>
<button type="button" (click)="closeAndValidate()"> <button type="button" (click)="closeAndValidate()" i18n>
Yes Yes
</button> </button>
</footer> </footer>

View File

@@ -1,14 +1,14 @@
<div> <div i18n>
<span class="copy-left">&copy;</span> <span class="copy-left">&copy;</span>
2016 - 2024 Tous droits réservés 2016 - 2024 All rights reserved
- -
2.0-alpha 2.0-alpha
<a [routerLink]="['./']" matTooltip="Health checking will be available in future..."> <a [routerLink]="['./']" matTooltip="Health checking will be available in future..." i18n-matTooltip>
<mat-icon>favorite</mat-icon> <mat-icon>favorite</mat-icon>
</a> </a>
</div> </div>
<div> <div>
<mat-icon matTooltip="Documentation will be available in future...">menu_book</mat-icon> <mat-icon matTooltip="Documentation will be available in future..." i18n-matTooltip>menu_book</mat-icon>
- -
veloppements réalisés par Florian THIERRY <span i18n>Development realised by</span> Florian THIERRY
</div> </div>

View File

@@ -1,23 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FooterComponent } from './footer.component';
describe('FooterComponent', () => {
let component: FooterComponent;
let fixture: ComponentFixture<FooterComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [FooterComponent]
})
.compileComponents();
fixture = TestBed.createComponent(FooterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -1,5 +1,5 @@
<div class="left"> <div class="left">
<button type="button" (click)="sideMenu.open()" matTooltip="Click to show side menu"> <button type="button" (click)="sideMenu.open()" matTooltip="Click to show side menu" i18n-matTooltip>
<mat-icon>menu</mat-icon> <mat-icon>menu</mat-icon>
</button> </button>
<a [routerLink]="['/home']"> <a [routerLink]="['/home']">
@@ -19,18 +19,18 @@
</button> </button>
<mat-menu #authenticatedUserMenu="matMenu"> <mat-menu #authenticatedUserMenu="matMenu">
<div class="authenticated-user-menu"> <div class="authenticated-user-menu">
<a [routerLink]="['/my-publications']" matRipple> <a [routerLink]="['/my-publications']" matRipple i18n>
<mat-icon>description</mat-icon> <mat-icon>description</mat-icon>
My publications My publications
</a> </a>
<a [routerLink]="['/disconnect']" matRipple class="disconnection"> <a [routerLink]="['/disconnect']" matRipple class="disconnection" i18n>
<mat-icon>logout</mat-icon> <mat-icon>logout</mat-icon>
Disconnect Disconnect
</a> </a>
</div> </div>
</mat-menu> </mat-menu>
} @else { } @else {
<a [routerLink]="['/login']" class="button" matRipple>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>

View File

@@ -1,16 +1,15 @@
import { CommonModule } from '@angular/common';
import { Component, inject } from '@angular/core'; import { Component, inject } from '@angular/core';
import { MatIconModule } from '@angular/material/icon'; import { FormControl, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import { MatRippleModule } from '@angular/material/core';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { MatTooltipModule } from '@angular/material/tooltip';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { AuthenticationService } from '../../core/service/authentication.service'; import { AuthenticationService } from '../../core/service/authentication.service';
import { CommonModule } from '@angular/common';
import { SideMenuComponent } from '../side-menu/side-menu.component';
import { MatRippleModule } from '@angular/material/core';
import { FormControl, ReactiveFormsModule } from '@angular/forms';
import { PublicationsSearchBarComponent } from '../publications-search-bar/publications-search-bar.component'; import { PublicationsSearchBarComponent } from '../publications-search-bar/publications-search-bar.component';
import { MatTooltipModule } from '@angular/material/tooltip'; import { SideMenuComponent } from '../side-menu/side-menu.component';
import { MatMenuModule } from '@angular/material/menu';
import { User } from '../../core/model/User';
@Component({ @Component({
selector: 'app-header', selector: 'app-header',

View File

@@ -2,12 +2,12 @@
<mat-icon>close</mat-icon> <mat-icon>close</mat-icon>
</button> </button>
<header> <header>
<h1>Add a code block</h1> <h1 i18n>Add a code block</h1>
</header> </header>
<form [formGroup]="formGroup" (submit)="closeAndValidate()" ngNativeValidate> <form [formGroup]="formGroup" (submit)="closeAndValidate()" ngNativeValidate>
<div class="form-content"> <div class="form-content">
<mat-form-field> <mat-form-field>
<mat-label>Programming language</mat-label> <mat-label i18n>Programming language</mat-label>
<mat-select #programmingLanguageSelect formControlName="programmingLanguage"> <mat-select #programmingLanguageSelect formControlName="programmingLanguage">
@for(programmingLanguage of programmingLanguages; track programmingLanguage) { @for(programmingLanguage of programmingLanguages; track programmingLanguage) {
<mat-option [value]="programmingLanguage.code"> <mat-option [value]="programmingLanguage.code">
@@ -17,15 +17,15 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-label>Code block</mat-label> <mat-label i18n>Code block</mat-label>
<textarea matInput formControlName="codeBlock"></textarea> <textarea matInput formControlName="codeBlock"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="actions"> <div class="actions">
<button type="submit"> <button type="submit" i18n>
Validate Validate
</button> </button>
<button type="button" (click)="closeDialog()" class="secondary"> <button type="button" (click)="closeDialog()" class="secondary" i18n>
Cancel Cancel
</button> </button>
</div> </div>

View File

@@ -2,27 +2,27 @@
<mat-icon>close</mat-icon> <mat-icon>close</mat-icon>
</button> </button>
<header> <header>
<h1>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>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/>
} }
} @else { } @else {
<h2>There is no any picture.</h2> <h2 i18n>There is no any picture.</h2>
} }
} }
</div> </div>
<footer> <footer>
<button type="button" class="secondary" matRipple (click)="closeDialog()"> <button type="button" class="secondary" matRipple (click)="closeDialog()" i18n>
Cancel Cancel
</button> </button>
<button type="button" (click)="fileUpload.click()" matRipple> <button type="button" (click)="fileUpload.click()" matRipple i18n>
<mat-icon>upload_file</mat-icon> <mat-icon>upload_file</mat-icon>
Add new picture Add new picture
</button> </button>

View File

@@ -34,9 +34,9 @@ export class PictureSelectionDialog implements OnInit {
if (error.status === 401) { if (error.status === 401) {
this.dialogRef.close(); this.dialogRef.close();
} else { } else {
const errorMessage = 'An error occured while loading pictures.'; const errorMessage = $localize`An error occured while loading pictures.`;
console.error(errorMessage, error); console.error(errorMessage, error);
this.snackBar.open(errorMessage, 'Close', { duration: 5000 }); this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
} }
}) })
.finally(() => { .finally(() => {
@@ -61,9 +61,9 @@ export class PictureSelectionDialog implements OnInit {
this.dialogRef.close(pictureId); this.dialogRef.close(pictureId);
}) })
.catch(error => { .catch(error => {
const errorMessage = 'A technical error occured 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, 'Close', { duration: 5000 }); this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
}); });
} }
} }

View File

@@ -16,9 +16,9 @@ export class PictureSelectionDialogService {
this.dialogRef.close(pictureId); this.dialogRef.close(pictureId);
}) })
.catch(error => { .catch(error => {
const errorMessage = 'An error occured while uploading a picture...'; const errorMessage = $localize`An error occured while uploading a picture...`;
console.error(errorMessage, error); console.error(errorMessage, error);
this.snackBar.open(errorMessage, 'Close', { duration: 5000 }); this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
}); });
} }
} }

View File

@@ -4,20 +4,20 @@
</header> </header>
<mat-tab-group dynamicHeight (selectedIndexChange)="onTabChange($event)"> <mat-tab-group dynamicHeight (selectedIndexChange)="onTabChange($event)">
<mat-tab label="Edition"> <mat-tab label="Edition" i18n-label>
<div class="form-content"> <div class="form-content">
<div class="first-part"> <div class="first-part">
<div> <div>
<mat-form-field> <mat-form-field>
<mat-label>Title</mat-label> <mat-label i18n>Title</mat-label>
<input matInput type="text" formControlName="title" /> <input matInput type="text" formControlName="title" />
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-label>Description</mat-label> <mat-label i18n>Description</mat-label>
<input matInput type="text" formControlName="description" /> <input matInput type="text" formControlName="description" />
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-label>Category</mat-label> <mat-label i18n>Category</mat-label>
<mat-select formControlName="categoryId"> <mat-select formControlName="categoryId">
@for (category of categories$ | async; track category) { @for (category of categories$ | async; track category) {
<mat-option [value]="category.id"> <mat-option [value]="category.id">
@@ -31,35 +31,36 @@
<div class="picture-container"> <div class="picture-container">
<img [src]="publication.illustrationId.length ? '/api/pictures/' + publication.illustrationId : '/assets/images/default-picture.png'" <img [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/>
</div> </div>
</div> </div>
<div class="actions"> <div class="actions">
<button type="button" matTooltip="Click to insert a title 1 section" (click)="insertTitle(1)"> <button type="button" matTooltip="Click to insert a title 1 section" (click)="insertTitle(1)" i18n-matTooltip>
H1 H1
</button> </button>
<button type="button" matTooltip="Click to insert a title 2 section" (click)="insertTitle(2)"> <button type="button" matTooltip="Click to insert a title 2 section" (click)="insertTitle(2)" i18n-matTooltip>
H2 H2
</button> </button>
<button type="button" matTooltip="Click to insert a title 1 section" (click)="insertTitle(3)"> <button type="button" matTooltip="Click to insert a title 3 section" (click)="insertTitle(3)" i18n-matTooltip>
H3 H3
</button> </button>
<button type="button" matTooltip="Click to insert a picture" (click)="selectAPicture()"> <button type="button" matTooltip="Click to insert a picture" (click)="selectAPicture()" i18n-matTooltip>
<mat-icon>image</mat-icon> <mat-icon>image</mat-icon>
</button> </button>
<button type="button" matTooltip="Click to insert a link" (click)="insertLink()"> <button type="button" matTooltip="Click to insert a link" (click)="insertLink()" i18n-matTooltip>
<mat-icon>link</mat-icon> <mat-icon>link</mat-icon>
</button> </button>
<button type="button" matTooltip="Click to insert a code block" (click)="displayCodeBlockDialog()"> <button type="button" matTooltip="Click to insert a code block" (click)="displayCodeBlockDialog()" i18n-matTooltip>
<mat-icon>code</mat-icon> <mat-icon>code</mat-icon>
</button> </button>
<button type="button" disabled matTooltip="Click to display editor help"> <button type="button" disabled matTooltip="Click to display editor help" i18n-matTooltip>
<mat-icon>help</mat-icon> <mat-icon>help</mat-icon>
</button> </button>
</div> </div>
<mat-form-field class="example-form-field"> <mat-form-field>
<mat-label>Content</mat-label> <mat-label i18n>Content</mat-label>
<textarea <textarea
#textArea #textArea
matInput matInput
@@ -72,11 +73,11 @@
</div> </div>
</mat-tab> </mat-tab>
<mat-tab label="Previewing"> <mat-tab label="Previewing" i18n-label>
<div class="preview"> <div class="preview">
@if ((isPreviewing$ | async) === true) { @if ((isPreviewing$ | async) === true) {
<div class="preview-loading"> <div class="preview-loading">
<h2>Preview is loading...</h2> <h2 i18n>Preview is loading...</h2>
<mat-spinner></mat-spinner> <mat-spinner></mat-spinner>
</div> </div>
} @else { } @else {
@@ -85,14 +86,14 @@
<h1>{{ publication.title }}</h1> <h1>{{ publication.title }}</h1>
<h2>{{ publication.description }}</h2> <h2>{{ publication.description }}</h2>
</header> </header>
<main [innerHTML]="publication.parsedText"></main> <main [innerHTML]="publicationInEdition.parsedText"></main>
} }
</div> </div>
</mat-tab> </mat-tab>
</mat-tab-group> </mat-tab-group>
<footer> <footer>
<app-submit-button label="Save" [requestPending]="!!(isSaving$ | async)"></app-submit-button> <app-submit-button label="Save" [requestPending]="!!(isSaving$ | async)" i18n-label></app-submit-button>
<button type="button" class="secondary" (click)="goPreviousLocation()"> <button type="button" class="secondary" (click)="goPreviousLocation()" i18n>
Cancel Cancel
</button> </button>
</footer> </footer>

View File

@@ -1,20 +1,20 @@
import { CommonModule, Location } from "@angular/common"; import { CommonModule, Location } from "@angular/common";
import { Component, EventEmitter, inject, Input, OnChanges, OnDestroy, OnInit, Output } from "@angular/core"; import { Component, EventEmitter, inject, Input, OnChanges, OnDestroy, Output } from "@angular/core";
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } 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";
import { MatProgressSpinnerModule } from "@angular/material/progress-spinner"; import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
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 { filter, map, Observable, of, Subscription } from "rxjs"; import { map, Observable, of, Subscription } from "rxjs";
import { Publication } from "../../core/rest-services/publications/model/publication";
import { PictureSelectionDialog } from "./picture-selection-dialog/picture-selection-dialog.component";
import { SubmitButtonComponent } from "../submit-button/submit-button.component";
import { PublicationEditionService } from "./publication-edition.service";
import { MatSelectModule } from "@angular/material/select";
import { CategoryService } from "../../core/service/category.service";
import { Category } from "../../core/rest-services/category/model/category"; import { Category } from "../../core/rest-services/category/model/category";
import { Publication } from "../../core/rest-services/publications/model/publication";
import { CategoryService } from "../../core/service/category.service";
import { SubmitButtonComponent } from "../submit-button/submit-button.component";
import { PictureSelectionDialog } from "./picture-selection-dialog/picture-selection-dialog.component";
import { PublicationEditionService } from "./publication-edition.service";
@Component({ @Component({
selector: 'app-publication-edition', selector: 'app-publication-edition',
@@ -46,11 +46,11 @@ export class PublicationEditionComponent implements OnChanges, OnDestroy {
@Output() @Output()
publicationSave = new EventEmitter<Publication>(); publicationSave = new EventEmitter<Publication>();
publicationInEdition!: Publication;
private readonly categoryService = inject(CategoryService); private readonly categoryService = inject(CategoryService);
private readonly formBuilder = inject(FormBuilder); private readonly formBuilder = inject(FormBuilder);
private readonly location = inject(Location); private readonly location = inject(Location);
private readonly publicationEditionService = inject(PublicationEditionService); private readonly publicationEditionService = inject(PublicationEditionService);
private publicationInEdition!: Publication;
private subscriptions: Subscription[] = []; private subscriptions: Subscription[] = [];
publicationEditionForm: FormGroup = this.formBuilder.group({ publicationEditionForm: FormGroup = this.formBuilder.group({
@@ -92,7 +92,7 @@ export class PublicationEditionComponent implements OnChanges, OnDestroy {
} }
return 0; return 0;
} }
ngOnChanges(): void { ngOnChanges(): void {
this.ngOnDestroy(); this.ngOnDestroy();
@@ -129,12 +129,13 @@ export class PublicationEditionComponent implements OnChanges, OnDestroy {
this.subscriptions.push(categoryIdChangeSubscription); this.subscriptions.push(categoryIdChangeSubscription);
const publicationSubscription = this.publicationEditionService.state$.subscribe(state => { const publicationSubscription = this.publicationEditionService.state$.subscribe(state => {
console.log(state.publication.parsedText.substring(0, 15));
this.publicationInEdition = state.publication; this.publicationInEdition = state.publication;
this.publicationEditionForm.controls['title'].setValue(this.publication.title, { emitEvent: false }); this.publicationEditionForm.controls['title'].setValue(this.publicationInEdition.title, { emitEvent: false });
this.publicationEditionForm.controls['description'].setValue(this.publication.description, { emitEvent: false }); this.publicationEditionForm.controls['description'].setValue(this.publicationInEdition.description, { emitEvent: false });
this.publicationEditionForm.controls['text'].setValue(this.publication.text, { emitEvent: false }); this.publicationEditionForm.controls['text'].setValue(this.publicationInEdition.text, { emitEvent: false });
this.publicationEditionForm.controls['illustrationId'].setValue(this.publication.illustrationId, { emitEvent: false }); this.publicationEditionForm.controls['illustrationId'].setValue(this.publicationInEdition.illustrationId, { emitEvent: false });
this.publicationEditionForm.controls['categoryId'].setValue(this.publication.categoryId, { emitEvent: false }); this.publicationEditionForm.controls['categoryId'].setValue(this.publicationInEdition.categoryId, { emitEvent: false });
}); });
this.subscriptions.push(publicationSubscription); this.subscriptions.push(publicationSubscription);
} }
@@ -178,8 +179,6 @@ export class PublicationEditionComponent implements OnChanges, OnDestroy {
const positionStart = textarea.selectionStart; const positionStart = textarea.selectionStart;
const positionEnd = textarea.selectionEnd; const positionEnd = textarea.selectionEnd;
const selectedCharacterCount = positionEnd - positionStart;
console.log(`cursor position updated: [${positionStart}, ${positionEnd}] (${selectedCharacterCount})`);
this.publicationEditionService.editCursorPosition(positionStart, positionEnd); this.publicationEditionService.editCursorPosition(positionStart, positionEnd);
} }
} }

View File

@@ -9,6 +9,7 @@ import { PublicationRestService } from "../../core/rest-services/publications/pu
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";
declare let Prism: any; declare let Prism: any;
@@ -76,7 +77,7 @@ export class PublicationEditionService implements OnDestroy {
} }
private _save(state: PublicationEditionState): void { private _save(state: PublicationEditionState): void {
this.stateSubject.next(state); this.stateSubject.next(state);
} }
get isLoading$(): Observable<boolean> { get isLoading$(): Observable<boolean> {
@@ -101,7 +102,7 @@ export class PublicationEditionService implements OnDestroy {
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('A technical error occurred while loading publication data.', '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)
@@ -111,8 +112,8 @@ export class PublicationEditionService implements OnDestroy {
this.stateSubject.next(state); this.stateSubject.next(state);
}) })
.catch(error => { .catch(error => {
const errorMessage = 'A technical error occurred while loading publication data.'; const errorMessage = $localize`A technical error occurred while loading publication data.`;
this.snackBar.open(errorMessage, 'Close', {duration: 5000}); this.snackBar.open(errorMessage, $localize`Close`, {duration: 5000});
console.error(errorMessage, error) console.error(errorMessage, error)
}) })
.finally(() => this.isLoadingSubject.next(false)); .finally(() => this.isLoadingSubject.next(false));
@@ -268,9 +269,12 @@ export class PublicationEditionService implements OnDestroy {
const state = this._state; const state = this._state;
this.isPreviewingSubject.next(true); this.isPreviewingSubject.next(true);
this.publicationRestService.preview(state.publication.text) const request: PreviewContentRequest = {
.then(parsedText => { text: state.publication.text
state.publication.parsedText = parsedText; };
this.publicationRestService.preview(request)
.then(response => {
state.publication.parsedText = response.text;
this._save(state); this._save(state);
setTimeout(() => Prism.highlightAll(), 1000); setTimeout(() => Prism.highlightAll(), 1000);
}) })

View File

@@ -1,5 +1,5 @@
<form [formGroup]="formGroup"> <form [formGroup]="formGroup">
<input name="search-query" placeholder="Search something..." formControlName="criteria"/> <input name="search-query" placeholder="Search something..." formControlName="criteria" i18n-placeholder/>
<button type="submit" (click)="searchPublications()"> <button type="submit" (click)="searchPublications()">
<mat-icon>search</mat-icon> <mat-icon>search</mat-icon>
</button> </button>

View File

@@ -1,18 +0,0 @@
import { HttpParams } from "@angular/common/http";
import { inject, Injectable } from "@angular/core";
import { Router } from "@angular/router";
import { BehaviorSubject } from "rxjs";
@Injectable()
export class PublicationsSearchBarService {
private router = inject(Router);
private criteriaSubject = new BehaviorSubject<string>('');
private cri
searchPublications(): void {
let queryParams = new HttpParams();
queryParams = queryParams.set('query', this.criteriaSubject.value);
this.router.navigate(['/publications'], {queryParams});
}
}

View File

@@ -1,5 +1,5 @@
@for(category of categories$ | async; track category) { @for(category of categories(); track category) {
<div class="category {{category.isOpenned ? 'openned' : ''}}"> <div class="category {{category.isOpenned ? 'openned' : ''}}">
<div id="category-{{category.id}}" class="category-header" (click)="setOpenned(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>

View File

@@ -1,9 +1,10 @@
import { CommonModule } from "@angular/common"; import { CommonModule } from "@angular/common";
import { Component, EventEmitter, inject, OnInit, Output } from "@angular/core"; import { Component, EventEmitter, inject, OnDestroy, OnInit, Output, signal } 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 { Observable, Subscription } from "rxjs";
import { RouterModule } from "@angular/router"; import { RouterModule } from "@angular/router";
import { Category } from "../../../core/rest-services/category/model/category";
@Component({ @Component({
selector: 'app-categories-menu', selector: 'app-categories-menu',
@@ -12,17 +13,21 @@ import { RouterModule } from "@angular/router";
templateUrl: './categories-menu.component.html', templateUrl: './categories-menu.component.html',
styleUrl: './categories-menu.component.scss' styleUrl: './categories-menu.component.scss'
}) })
export class CategoriesMenuComponent implements OnInit { export class CategoriesMenuComponent implements OnInit, OnDestroy {
private sideMenuService = inject(SideMenuService);
@Output() @Output()
categoryClicked = new EventEmitter<void>(); categoryClicked = new EventEmitter<void>();
private sideMenuService = inject(SideMenuService);
private categoriesSubscription?: Subscription;
categories = signal<DisplayableCategory[]>([]);
ngOnInit(): void { ngOnInit(): void {
this.categoriesSubscription = this.sideMenuService.categories$
.subscribe(categories => this.categories.set(categories));
this.sideMenuService.loadCategories(); this.sideMenuService.loadCategories();
} }
get categories$(): Observable<DisplayableCategory[]> { ngOnDestroy(): void {
return this.sideMenuService.categories$; this.categoriesSubscription?.unsubscribe();
} }
setOpenned(category: DisplayableCategory): void { setOpenned(category: DisplayableCategory): void {

View File

@@ -1,14 +1,14 @@
<div class="menu {{ isOpenned ? '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" (click)="close()" matTooltip="Close the menu"> <button type="button" (click)="close()" matTooltip="Close the menu" i18n-matTooltip>
<mat-icon>close</mat-icon> <mat-icon>close</mat-icon>
</button> </button>
</h1> </h1>
<h2>Catégories</h2> <h2 i18n>Categories</h2>
<app-categories-menu (categoryClicked)="close()"></app-categories-menu> <app-categories-menu (categoryClicked)="close()"></app-categories-menu>
</div> </div>
<div class="overlay {{ isOpenned ? 'displayed' : ''}}" (click)="close()"></div> <div class="overlay {{ isOpenned() ? 'displayed' : ''}}" (click)="close()"></div>

View File

@@ -1,4 +1,4 @@
import { Component } from '@angular/core'; import { Component, signal } 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';
@@ -12,13 +12,13 @@ import { CategoriesMenuComponent } from './categories-menu/categories-menu.compo
styleUrl: './side-menu.component.scss' styleUrl: './side-menu.component.scss'
}) })
export class SideMenuComponent { export class SideMenuComponent {
isOpenned: boolean = false; isOpenned = signal(false);
open(): void { open(): void {
this.isOpenned = true; this.isOpenned.set(true);
} }
close(): void { close(): void {
this.isOpenned = false; this.isOpenned.set(false);
} }
} }

View File

@@ -1,9 +1,8 @@
import { Injectable, OnDestroy, inject } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { CategoryService } from '../../core/service/category.service';
import { BehaviorSubject, Observable, Subscription, map } from 'rxjs';
import { Category } from '../../core/rest-services/category/model/category';
import { CategoryRestService } from '../../core/rest-services/category/category.rest-service';
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 { Category } from '../../core/rest-services/category/model/category';
export interface DisplayableCategory { export interface DisplayableCategory {
id: string; id: string;
@@ -20,31 +19,13 @@ export interface DisplayableSubCategory {
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class SideMenuService implements OnDestroy { export class SideMenuService {
private categoryRestService = inject(CategoryRestService); private categoryRestService = inject(CategoryRestService);
private snackBar = inject(MatSnackBar); private snackBar = inject(MatSnackBar);
private categoriesSubject = new BehaviorSubject<DisplayableCategory[]>([]); private categoriesSubject = new BehaviorSubject<DisplayableCategory[]>([]);
private isLoadingSubject = new BehaviorSubject<boolean>(false); private isLoadingSubject = new BehaviorSubject<boolean>(false);
private isLoadedSubject = new BehaviorSubject<boolean>(false); private isLoadedSubject = new BehaviorSubject<boolean>(false);
constructor() {
// this.categoriesSubscription = this.categoryService.categories$
// .pipe(
// map(categories =>
// categories
// .filter(category => category.subCategories?.length)
// .map(category =>
// this.mapToDisplayableCategory(category)
// )
// )
// )
// .subscribe(categories => this.categoriesSubject.next(categories));
}
ngOnDestroy(): void {
// this.categoriesSubscription?.unsubscribe();
}
private mapToDisplayableCategory(category: Category): DisplayableCategory { private mapToDisplayableCategory(category: Category): DisplayableCategory {
return { return {
id: category.id, id: category.id,
@@ -89,9 +70,9 @@ export class SideMenuService implements OnDestroy {
this.categoriesSubject.next(displayableCategories); this.categoriesSubject.next(displayableCategories);
}) })
.catch(error => { .catch(error => {
const errorMessage = "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, 'Close', { duration: 5000 }); this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
}) })
.finally(() => { .finally(() => {
this.isLoadingSubject.next(false); this.isLoadingSubject.next(false);

View File

@@ -12,7 +12,7 @@ export const authenticationGuard: CanActivateFn = () => {
return true; return true;
} else { } else {
router.navigate(['/login']); router.navigate(['/login']);
snackBar.open('You are unauthenticated. Please, log-in first.', 'Close', { duration: 5000 }); snackBar.open($localize`You are unauthenticated. Please, log-in first.`, $localize`Close`, { duration: 5000 });
return false; return false;
} }
} }

View File

@@ -83,7 +83,7 @@ export class JwtInterceptor implements HttpInterceptor {
this.router.navigate(['/login']); this.router.navigate(['/login']);
this.refreshTokenSubject.next(undefined); this.refreshTokenSubject.next(undefined);
this.authenticationService.unauthenticate(); this.authenticationService.unauthenticate();
this.snackBar.open('You are unauthenticated. Please, re-authenticate before retrying your action.', 'Close', { duration: 5000 }); this.snackBar.open($localize`You are unauthenticated. Please, re-authenticate before retrying your action.`, $localize`Close`, { duration: 5000 });
return throwError(() => initialError); return throwError(() => initialError);
} }
} }

View File

@@ -0,0 +1,7 @@
export interface PreviewContentRequest {
text: string;
}
export interface PreviewContentResponse {
text: string;
}

View File

@@ -2,6 +2,7 @@ import { HttpClient, HttpParams } from '@angular/common/http';
import { Injectable, inject } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { last, lastValueFrom } from 'rxjs'; import { last, lastValueFrom } from 'rxjs';
import { Publication } from './model/publication'; import { Publication } from './model/publication';
import { PreviewContentRequest, PreviewContentResponse } from './model/preview';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -31,9 +32,8 @@ export class PublicationRestService {
return lastValueFrom(this.httpClient.get<Publication[]>('/api/publications', { params })); return lastValueFrom(this.httpClient.get<Publication[]>('/api/publications', { params }));
} }
preview(publicationText: string): Promise<string> { preview(request: PreviewContentRequest): Promise<PreviewContentResponse> {
const request = { text: publicationText }; return lastValueFrom(this.httpClient.post<PreviewContentResponse>('/api/publications/preview', request));
return lastValueFrom(this.httpClient.post<string>('/api/publications/preview', request));
} }
delete(publicationId: string): Promise<void> { delete(publicationId: string): Promise<void> {

View File

@@ -18,7 +18,7 @@ export class CategoryService {
if (!this.categories?.length) { if (!this.categories?.length) {
this.categoryRestService.getCategories() this.categoryRestService.getCategories()
.then(categories => this.categoriesSubject.next(categories)) .then(categories => this.categoriesSubject.next(categories))
.catch(error => console.error('An error occured while loading categories.', error)); .catch(error => console.error($localize`An error occured while loading categories.`, error));
} }
return this.categoriesSubject.asObservable(); return this.categoriesSubject.asObservable();
} }

View File

@@ -1,5 +1,5 @@
<h1 i18n>Last publications</h1> <h1 i18n>Last publications</h1>
@if ((isLoading$ | async) === true) { @if (isLoading()) {
<h2 i18n>Publications loading...</h2> <h2 i18n>Publications loading...</h2>
<mat-spinner></mat-spinner> <mat-spinner></mat-spinner>
} @else { } @else {

View File

@@ -1,6 +1,6 @@
import { Component, OnInit, inject } from '@angular/core'; import { Component, OnDestroy, OnInit, inject, signal } from '@angular/core';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { Observable } from 'rxjs'; 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 { Publication } from '../../core/rest-services/publications/model/publication';
import { HomeService } from './home.service'; import { HomeService } from './home.service';
@@ -18,18 +18,27 @@ import { CommonModule } from '@angular/common';
styleUrl: './home.component.scss', styleUrl: './home.component.scss',
providers: [HomeService] providers: [HomeService]
}) })
export class HomeComponent implements OnInit { export class HomeComponent implements OnInit, OnDestroy {
private homeService = inject(HomeService); private homeService = inject(HomeService);
private isLoadingSubscription?: Subscription;
get isLoading$(): Observable<boolean> { private publicationsSubscription?: Subscription;
return this.homeService.isLoading$; isLoading = signal(false);
} publicationsIsEmpty = signal(true);
get publications$(): Observable<Publication[]> { get publications$(): Observable<Publication[]> {
return this.homeService.publications$; return this.homeService.publications$;
} }
ngOnInit(): void { ngOnInit(): void {
this.isLoadingSubscription = this.homeService.isLoading$
.subscribe(isLoading => this.isLoading.set(isLoading));
this.publicationsSubscription = this.homeService.publications$
.subscribe(publications => this.publicationsIsEmpty.set(publications.length > 0));
this.homeService.startLatestPublicationsRetrieving(); this.homeService.startLatestPublicationsRetrieving();
} }
ngOnDestroy(): void {
this.isLoadingSubscription?.unsubscribe();
this.publicationsSubscription?.unsubscribe();
}
} }

View File

@@ -8,11 +8,11 @@
+ +
</a> </a>
@if ((isLoading$ | async) === true) { @if (isLoading()) {
<h2 i18n>Publication loading...</h2> <h2 i18n>Publication loading...</h2>
<mat-spinner></mat-spinner> <mat-spinner></mat-spinner>
} @else { } @else {
@if ((isLoaded$ | async) === true) { @if (isLoaded()) {
<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>

View File

@@ -1,14 +1,13 @@
import { Component, inject, OnInit } from "@angular/core"; import { Component, inject, OnDestroy, OnInit, signal } 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 { 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 { 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";
@Component({ @Component({
selector: 'app-my-component', selector: 'app-my-component',
standalone: true, standalone: true,
@@ -23,22 +22,28 @@ import { MatTooltipModule } from "@angular/material/tooltip";
], ],
providers: [MyPublicationsService] providers: [MyPublicationsService]
}) })
export class MyPublicationsComponent implements OnInit { export class MyPublicationsComponent implements OnInit, OnDestroy {
private readonly myPublicationsService = inject(MyPublicationsService); private readonly myPublicationsService = inject(MyPublicationsService);
private isLoadingSubscription?: Subscription;
private isLoadedSubscription?: Subscription;
isLoading = signal(false);
isLoaded = signal(false);
get publications$(): Observable<Publication[]> { get publications$(): Observable<Publication[]> {
return this.myPublicationsService.publications$; return this.myPublicationsService.publications$;
} }
get isLoading$(): Observable<boolean> {
return this.myPublicationsService.isLoading$;
}
get isLoaded$(): Observable<boolean> {
return this.myPublicationsService.isLoaded$;
}
ngOnInit(): void { ngOnInit(): void {
this.isLoadingSubscription = this.myPublicationsService.isLoading$
.subscribe(isLoading => this.isLoading.set(isLoading));
this.isLoadedSubscription = this.myPublicationsService.isLoaded$
.subscribe(isLoaded => this.isLoaded.set(isLoaded));
this.myPublicationsService.loadAuthenticatedUserPublications(); this.myPublicationsService.loadAuthenticatedUserPublications();
} }
ngOnDestroy(): void {
this.isLoadingSubscription?.unsubscribe();
this.isLoadedSubscription?.unsubscribe();
}
} }

View File

@@ -1 +1,9 @@
<app-publication-edition title="Creation of a new publication" [publication]="publication" [isSaving$]="isSaving$" (publicationSave)="onPublicationSave($event)"></app-publication-edition> @if (publicationIsNotNull()) {
<app-publication-edition
title="Creation of a new publication"
[publication]="publication()!!"
[isSaving$]="isSaving$"
(publicationSave)="onPublicationSave($event)"
i18n-title>
</app-publication-edition>
}

View File

@@ -1,4 +1,4 @@
import { Component, inject, OnInit } from "@angular/core"; import { Component, computed, inject, OnInit, signal } 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 { ActivatedRoute, Router } from "@angular/router"; import { ActivatedRoute, Router } from "@angular/router";
@@ -26,7 +26,8 @@ export class PublicationCreationComponent implements OnInit {
private readonly snackBar = inject(MatSnackBar); private readonly snackBar = inject(MatSnackBar);
private isSavingSubject = new BehaviorSubject<boolean>(false); private isSavingSubject = new BehaviorSubject<boolean>(false);
private subscriptions: Subscription[] = []; private subscriptions: Subscription[] = [];
publication!: Publication; publication = signal<Publication | undefined>(undefined);
publicationIsNotNull = computed(() => !!this.publication());
get isSaving$(): Observable<boolean> { get isSaving$(): Observable<boolean> {
return this.isSavingSubject.asObservable(); return this.isSavingSubject.asObservable();
@@ -40,7 +41,7 @@ export class PublicationCreationComponent implements OnInit {
name: authenticatedUser.pseudo, name: authenticatedUser.pseudo,
image: authenticatedUser.photoId ?? '' image: authenticatedUser.photoId ?? ''
}; };
this.publication = { const newPublication: Publication = {
id: '', id: '',
key: '', key: '',
title: '', title: '',
@@ -52,6 +53,7 @@ export class PublicationCreationComponent implements OnInit {
categoryId: '', categoryId: '',
author author
}; };
this.publication.set(newPublication);
} }
} }
@@ -63,13 +65,13 @@ export class PublicationCreationComponent implements OnInit {
this.isSavingSubject.next(true); this.isSavingSubject.next(true);
this.publicationRestService.create(publication) this.publicationRestService.create(publication)
.then(() => { .then(() => {
this.snackBar.open('Publication created succesfully!', '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 = '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, 'Close', { duration: 5000 }); this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
}) })
.finally(() => this.isSavingSubject.next(false)); .finally(() => this.isSavingSubject.next(false));
} }

View File

@@ -1,13 +1,20 @@
@if ((isLoading$ | async) == true) { @if (isLoading()) {
<h2 i18n>Loading publication to edit...</h2>
<mat-spinner></mat-spinner> <mat-spinner></mat-spinner>
} }
@else { @else {
@if (publication) { @if (publication) {
<app-publication-edition title="Update publication {{ publication.title }}" [publication]="publication" [isSaving$]="isSaving$" (publicationSave)="onPublicationSave($event)"></app-publication-edition> <app-publication-edition
title="Update publication {{ publication.title }}"
[publication]="publication"
[isSaving$]="isSaving$"
(publicationSave)="onPublicationSave($event)"
i18n-title>
</app-publication-edition>
} }
@else { @else {
<div class="loading-failed"> <div class="loading-failed">
<h1>Publication failed to load...</h1> <h1 i18n>Publication failed to load...</h1>
</div> </div>
} }
} }

View File

@@ -1,5 +1,5 @@
import { CommonModule, Location } from '@angular/common'; import { CommonModule, Location } from '@angular/common';
import { Component, inject, OnDestroy, OnInit } from '@angular/core'; import { Component, inject, OnDestroy, OnInit, signal } 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';
@@ -41,25 +41,21 @@ export class PublicationUpdateComponent implements OnInit, OnDestroy {
private readonly location = inject(Location); private readonly location = inject(Location);
private readonly router = inject(Router); private readonly router = inject(Router);
private readonly snackBar = inject(MatSnackBar); private readonly snackBar = inject(MatSnackBar);
private isLoadingSubject = new BehaviorSubject<boolean>(false);
private isSavingSubject = new BehaviorSubject<boolean>(false); private isSavingSubject = new BehaviorSubject<boolean>(false);
private subscriptions: Subscription[] = []; private subscriptions: Subscription[] = [];
isLoading = signal(false);
publication: Publication | undefined; publication: Publication | undefined;
get isLoading$(): Observable<boolean> {
return this.isLoadingSubject.asObservable();
}
get isSaving$(): Observable<boolean> { get isSaving$(): Observable<boolean> {
return this.isSavingSubject.asObservable(); return this.isSavingSubject.asObservable();
} }
ngOnInit(): void { ngOnInit(): void {
this.isLoadingSubject.next(true); this.isLoading.set(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('A technical error occurred while loading publication data.', '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)
@@ -67,11 +63,11 @@ export class PublicationUpdateComponent implements OnInit, OnDestroy {
this.publication = publication; this.publication = publication;
}) })
.catch(error => { .catch(error => {
const errorMessage = 'A technical error occurred while loading publication data.'; const errorMessage = $localize`A technical error occurred while loading publication data.`;
this.snackBar.open(errorMessage, 'Close', { duration: 5000 }); this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
console.error(errorMessage, error) console.error(errorMessage, error)
}) })
.finally(() => this.isLoadingSubject.next(false)); .finally(() => this.isLoading.set(false));
} }
}); });
} }
@@ -84,13 +80,13 @@ export class PublicationUpdateComponent implements OnInit, OnDestroy {
this.isSavingSubject.next(true); this.isSavingSubject.next(true);
this.publicationRestService.update(publication) this.publicationRestService.update(publication)
.then(() => { .then(() => {
this.snackBar.open('Publication updated succesfully!', '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 = '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, 'Close', { duration: 5000 }); this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
}) })
.finally(() => this.isSavingSubject.next(false)); .finally(() => this.isSavingSubject.next(false));
} }

View File

@@ -1,48 +1,48 @@
@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) { @if (isPublicationUndefined()) {
<div class="loading-failed">
<h1 i18n>Publication failed to load...</h1>
</div>
} @else {
<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"
i18n-mapTooltip> i18n-matTooltip>
<mat-icon>edit</mat-icon> <mat-icon>edit</mat-icon>
</a> </a>
} }
</header> </header>
<main [innerHTML]="publication.parsedText"></main> <main [innerHTML]="publication()?.parsedText"></main>
<footer> <footer>
<div class="metadata"> <div class="metadata">
<img src="/api/pictures/{{ publication.author.image }}" [matTooltip]="publication.author.name" /> <img src="/api/pictures/{{ publication()?.author?.image }}" [matTooltip]="publication()?.author?.name" />
<div class="posting-data"> <div class="posting-data">
<span i18n>Publication posted by {{ publication.author.name }}</span> <span i18n>Publication posted by {{ publication()?.author?.name }}</span>
<span class="publication-date"> <span class="publication-date">
({{ publication.creationDate | date: 'short' }}) ({{ publication()?.creationDate | date: 'short' }})
</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"
i18n-mapTooltip> i18n-matTooltip>
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
Delete Delete
</button> </button>
} }
</footer> </footer>
</div> </div>
} @else {
<div class="loading-failed">
<h1 i18n>Publication failed to load...</h1>
</div>
} }
} }

View File

@@ -2,7 +2,8 @@ $cardBorderRadius: .5em;
:host { :host {
display: flex; display: flex;
justify-content: center; flex-direction: column;
align-items: center;
.card { .card {
display: flex; display: flex;

View File

@@ -1,4 +1,4 @@
import { Component, OnDestroy, OnInit, inject } from '@angular/core'; import { Component, OnDestroy, OnInit, computed, inject, signal } from '@angular/core';
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 { ActivatedRoute, Router, RouterModule } from '@angular/router';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
@@ -30,9 +30,10 @@ 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: boolean = false; isLoading = signal(false);
isAuthorAndUserEquals: boolean = false; isAuthorAndUserEquals = computed(() => this.authenticationService.getAuthenticatedUser()?.id === this.publication()?.author.id);
publication?: Publication; publication = signal<Publication | undefined>(undefined);
isPublicationUndefined = computed(() => !this.publication())
ngOnInit(): void { ngOnInit(): void {
this.paramMapSubscription = this.activatedRoute this.paramMapSubscription = this.activatedRoute
@@ -41,12 +42,11 @@ export class PublicationComponent implements OnInit, OnDestroy {
const publicationId = params.get('publicationId'); const publicationId = params.get('publicationId');
if (publicationId) { if (publicationId) {
this.isLoading = true; this.isLoading.set(true);
this.publicationRestService.getById(publicationId) this.publicationRestService.getById(publicationId)
.then(publication => { .then(publication => {
this.publication = publication; this.publication.set(publication);
this.isAuthorAndUserEquals = this.authenticationService.getAuthenticatedUser()?.id === this.publication.author.id;
setTimeout(() => Prism.highlightAll(), 100); setTimeout(() => Prism.highlightAll(), 100);
}) })
.catch(error => { .catch(error => {
@@ -55,7 +55,7 @@ export class PublicationComponent implements OnInit, OnDestroy {
console.error(errorMessage, error); console.error(errorMessage, error);
}) })
.finally(() => { .finally(() => {
this.isLoading = false; this.isLoading.set(false);
}); });
} }
}); });
@@ -79,8 +79,8 @@ export class PublicationComponent implements OnInit, OnDestroy {
this.afterDialogCloseSubscription = dialogRef.afterClosed() this.afterDialogCloseSubscription = dialogRef.afterClosed()
.subscribe(response => { .subscribe(response => {
if (response && this.publication?.id) { if (response && !this.isPublicationUndefined()) {
this.publicationRestService.delete(this.publication.id); this.publicationRestService.delete(this.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();
} }

View File

@@ -1,13 +1,13 @@
<h1>Search results</h1> <h1 i18n>Search results</h1>
@if((isLoading$ | async) === true) { @if((isLoading$ | async) === true) {
<h2>Search in progress...</h2> <h2 i18n>Search in progress...</h2>
<mat-spinner></mat-spinner> <mat-spinner></mat-spinner>
} @else if((isLoaded$ | async) === true) { } @else if((isLoaded$ | async) === true) {
@if((publications$ | async)?.length) { @if((publications$ | async)?.length) {
<app-publication-list [publications$]="publications$"></app-publication-list> <app-publication-list [publications$]="publications$"></app-publication-list>
} @else { } @else {
No any result. <span i18n>No any result.</span>
} }
} @else { } @else {
No any result. <span i18n>No any result.</span>
} }

View File

@@ -36,9 +36,9 @@ export class SearchPublicationsService {
}) })
.catch(error => { .catch(error => {
if (error.status !== 404) { if (error.status !== 404) {
const errorMessage = '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, 'Close', { duration: 5000 }); this.snackBar.open(errorMessage, $localize`Close`, { duration: 5000 });
} }
}) })
.finally(() => { .finally(() => {

View File

@@ -1,8 +1,8 @@
<form [formGroup]="signinForm" (submit)="performSignin()" ngNativeValidate> <form [formGroup]="signinForm" (submit)="performSignin()" ngNativeValidate>
<h1>Signin</h1> <h1 i18n>Signin</h1>
<div> <div>
<mat-icon>person</mat-icon> <mat-icon>person</mat-icon>
<label for="pseudo"> <label for="pseudo" i18n>
Pseudo Pseudo
<span class="required">*</span> <span class="required">*</span>
</label> </label>
@@ -10,7 +10,7 @@
</div> </div>
<div> <div>
<mat-icon>mail</mat-icon> <mat-icon>mail</mat-icon>
<label for="email"> <label for="email" i18n>
Email address Email address
<span class="required">*</span> <span class="required">*</span>
</label> </label>
@@ -18,7 +18,7 @@
</div> </div>
<div> <div>
<mat-icon>lock</mat-icon> <mat-icon>lock</mat-icon>
<label for="password"> <label for="password" i18n>
Password Password
<span class="required">*</span> <span class="required">*</span>
</label> </label>
@@ -26,14 +26,14 @@
</div> </div>
<div> <div>
<mat-icon>lock</mat-icon> <mat-icon>lock</mat-icon>
<label for="confirm-password"> <label for="confirm-password" i18n>
Confirm password Confirm password
<span class="required">*</span> <span class="required">*</span>
</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"> <div class="actions">
<button type="submit">Send</button> <button type="submit" i18n>Send</button>
<a [routerLink]="['/login']">I already have an account</a> <a [routerLink]="['/login']" i18n>I already have an account</a>
</div> </div>
</form> </form>

View File

@@ -1,23 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { SigninComponent } from './signin.component';
describe('SigninComponent', () => {
let component: SigninComponent;
let fixture: ComponentFixture<SigninComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [SigninComponent]
})
.compileComponents();
fixture = TestBed.createComponent(SigninComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -76,7 +76,7 @@ export class SigninService {
if (state.request.password !== state.confirmPassword) { if (state.request.password !== state.confirmPassword) {
const confirmPasswordError: FormError = { const confirmPasswordError: FormError = {
fieldName: 'confirmPassword', fieldName: 'confirmPassword',
errorMessage: 'Typed password are different.' errorMessage: $localize`Typed passwords are different.`
} }
state.errors.filter(error => error.fieldName !== 'confirmPassword'); state.errors.filter(error => error.fieldName !== 'confirmPassword');
state.errors.push(confirmPasswordError) state.errors.push(confirmPasswordError)

View File

@@ -1,14 +1,58 @@
{ {
"locale": "fr-FR", "locale": "fr-FR",
"translations": { "translations": {
"3603720768157919481": "Non",
"4861926948802653243": "Oui",
"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...",
"1711651175531679766": "La documentation sera disponible ultérieurement...",
"6299155290121808295": "Développements realisés par",
"6413533995205687351": "Cliquez pour afficher le menu",
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} Mes publications",
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Déconnexion",
"2454050363478003966": "Connexion",
"6379828571327118783": "Ajouter un bloc de code",
"933522671092765466": "Langage de programmation",
"5953425146193292178": "Bloc de code",
"7975252153657972743": "Valider",
"2330577642930707695": "Annuler",
"162921950259491830": "Sélectionnez une illustation",
"1678880547384144969": "Chargement des images...",
"4111988153902305972": "Choisir cette illustation",
"4491342806775118195": "Il n'y a aucune image.",
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Ajouter une nouvelle image",
"6852365376059142995": "Une erreur est survenue lors du chargements de vos images.",
"7819314041543176992": "Fermer",
"6198966268398913224": "Une erreur technique est survenue lors de l'ajout de votre image.",
"3603937053948195893": "Édition",
"5701618810648052610": "Titre",
"4902817035128594900": "Description",
"1806667489382256324": "Categorie",
"4954740313142081867": "Cliquez pour changer l'illustation",
"382530603854484923": "Cliquez pour ajouter une section titre de niveau 1",
"7918008528690631661": "Cliquez pour ajouter une section titre de niveau 2",
"200884310255063303": "Cliquez pour ajouter une section titre de niveau 3",
"327371240590280003": "Cliquez pour ajouter une image",
"2615926469669796978": "Cliquez pour ajouter un lien",
"4689637499823680515": "Cliquez pour ajouter un bloc de code",
"1065684538660053227": "Cliquez pour afficher l'aide",
"6205355627445317276": "Contenu",
"725618658772732433": "Prévisualisation",
"1775659119052622417": "Chargement du rendu de la prévisualisation...",
"3768927257183755959": "Enregistrer",
"4580042433737768435": "Une erreur technique est survenue lors du chargement de la publication à modifier.",
"2578598149846191609": "Publication postée par {$INTERPOLATION}", "2578598149846191609": "Publication postée par {$INTERPOLATION}",
"6514394873612421064": "Rechercher quelque chose...",
"9122763438636464100": "Fermer le menu",
"1902100407096396858": "Catégories",
"6940115735259407353": "Une erreur est survenue lors du chargement des catégories.",
"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.",
"4011987306265136481": "Déconnexion...", "4011987306265136481": "Déconnexion...",
"4869473828758837325": "Dernières publications", "4869473828758837325": "Dernières publications",
"5148998676057880041": "Chargement des publications...", "5148998676057880041": "Chargement des publications...",
"3688381096110057852": "Il n'y a aucune publication.", "3688381096110057852": "Il n'y a aucune publication.",
"8393632007890629197": "Une erreur est survenue lors du chargement des dernières publications...", "8393632007890629197": "Une erreur est survenue lors du chargement des dernières publications...",
"7819314041543176992": "Fermer",
"2454050363478003966": "Connexion",
"8138320902772264034": "Adresse email {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}", "8138320902772264034": "Adresse email {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}",
"9175472990822669391": "Mot de passe {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}", "9175472990822669391": "Mot de passe {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}",
"6490688569532630280": "Valider", "6490688569532630280": "Valider",
@@ -20,12 +64,29 @@
"1519054954638405159": "Chargement de la liste de vos publications...", "1519054954638405159": "Chargement de la liste de vos publications...",
"5982957837973242128": "Vous n'avez rien publié...", "5982957837973242128": "Vous n'avez rien publié...",
"6147923540123489141": "Une erreur est survenue lors de la récupération de vos publications...", "6147923540123489141": "Une erreur est survenue lors de la récupération de vos publications...",
"3450287383703155559": "Vous n'êtes pas connecté. Veuillez vous connecter avant de réessayer.", "2804059545779555969": "Rédaction d'une nouvelle publication",
"9035578711395348230": "Chargement du contenu de la publication...", "4229813881636784544": "Publication créée avec succès !",
"1772332295232318552": "Une erreur est survenue lors de l'enregistrement de la nouvelle publication.",
"5585500423922995936": "Chargement de la publication à modifier...",
"1487849090405054079": "Modification de la publication {$INTERPOLATION}",
"570282468314450588": "La publication n'a pas pu être chargée...", "570282468314450588": "La publication n'a pas pu être chargée...",
"1766298802296530620": "Publication modifiée avec succès !",
"5690532907092398845": "Une erreur est survenue lors de l'enregistrement des modifications de la publication.",
"9035578711395348230": "Chargement du contenu de la publication...",
"1224244276514211842": "Cliquez pour modifier la publication",
"2759576657543552825": "Cliquez pour supprimer la publication",
"3861667381167371965": "Une erreur est survenue lors du chargement de la publication...", "3861667381167371965": "Une erreur est survenue lors du chargement de la publication...",
"3189372093194446122": "Suppression de la publication", "3189372093194446122": "Suppression de la publication",
"7149611045520326321": "Êtes vous sûr de vouloir supprimer cette publication ?", "7149611045520326321": "Êtes vous sûr de vouloir supprimer cette publication ?",
"4353366709080867962": "Publication supprimée" "4353366709080867962": "Publication supprimée",
"1460318440531551596": "Résultats de la recherche",
"886526241743571962": "Recherche des publications...",
"3467080651873197381": "Il n'y a aucun résultat.",
"8212807341111457015": "Une erreur est survenue lors de la recherche des publications..",
"2101902914887471883": "Créer un compte",
"963610942522043725": "Pseudo {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}",
"5090593460426139718": "Confirmation du mot de passe {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}",
"3461230574295546047": "J'ai déjà un compte",
"5052944271008222026": "Les mots de passe saisis sont différents."
} }
} }

View File

@@ -1,14 +1,58 @@
{ {
"locale": "en-UK", "locale": "en-UK",
"translations": { "translations": {
"3603720768157919481": " No ",
"4861926948802653243": " Yes ",
"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...",
"1711651175531679766": "Documentation will be available in future...",
"6299155290121808295": "Development realised by",
"6413533995205687351": "Click to show side menu",
"3394094310583807145": "{$START_TAG_MAT_ICON}description{$CLOSE_TAG_MAT_ICON} My publications ",
"5690703874094076840": "{$START_TAG_MAT_ICON}logout{$CLOSE_TAG_MAT_ICON} Disconnect ",
"2454050363478003966": "Login",
"6379828571327118783": "Add a code block",
"933522671092765466": "Programming language",
"5953425146193292178": "Code block",
"7975252153657972743": " Validate ",
"2330577642930707695": " Cancel ",
"162921950259491830": "Select an illustration",
"1678880547384144969": "Pictures loading...",
"4111988153902305972": "Choose this illustration",
"4491342806775118195": "There is no any picture.",
"5036131155743433968": "{$START_TAG_MAT_ICON}upload_file{$CLOSE_TAG_MAT_ICON} Add new picture ",
"6852365376059142995": "An error occured while loading pictures.",
"7819314041543176992": "Close",
"6198966268398913224": "A technical error occured while uploading your picture.",
"3603937053948195893": "Edition",
"5701618810648052610": "Title",
"4902817035128594900": "Description",
"1806667489382256324": "Category",
"4954740313142081867": "Click to change illustration",
"382530603854484923": "Click to insert a title 1 section",
"7918008528690631661": "Click to insert a title 2 section",
"200884310255063303": "Click to insert a title 3 section",
"327371240590280003": "Click to insert a picture",
"2615926469669796978": "Click to insert a link",
"4689637499823680515": "Click to insert a code block",
"1065684538660053227": "Click to display editor help",
"6205355627445317276": "Content",
"725618658772732433": "Previewing",
"1775659119052622417": "Preview is loading...",
"3768927257183755959": "Save",
"4580042433737768435": "A technical error occurred while loading publication data.",
"2578598149846191609": "Publication posted by {$INTERPOLATION}", "2578598149846191609": "Publication posted by {$INTERPOLATION}",
"6514394873612421064": "Search something...",
"9122763438636464100": "Close the menu",
"1902100407096396858": "Categories",
"6940115735259407353": "An error occured while loading categories.",
"3450287383703155559": "You are unauthenticated. Please, log-in first.",
"5455465794443528807": "You are unauthenticated. Please, re-authenticate before retrying your action.",
"4011987306265136481": "Disconnection...", "4011987306265136481": "Disconnection...",
"4869473828758837325": "Last publications", "4869473828758837325": "Last publications",
"5148998676057880041": "Publications loading...", "5148998676057880041": "Publications loading...",
"3688381096110057852": "No any publication.", "3688381096110057852": "No any publication.",
"8393632007890629197": "An error occurred while retrieving latest publications...", "8393632007890629197": "An error occurred while retrieving latest publications...",
"7819314041543176992": "Close",
"2454050363478003966": "Login",
"8138320902772264034": " Email address {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}", "8138320902772264034": " Email address {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}",
"9175472990822669391": " Password {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}", "9175472990822669391": " Password {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}",
"6490688569532630280": "Send", "6490688569532630280": "Send",
@@ -20,12 +64,29 @@
"1519054954638405159": "Publication loading...", "1519054954638405159": "Publication loading...",
"5982957837973242128": "There is no any publication...", "5982957837973242128": "There is no any publication...",
"6147923540123489141": "An error occurred while retrieving your publications...", "6147923540123489141": "An error occurred while retrieving your publications...",
"3450287383703155559": "You are unauthenticated. Please, log-in first.", "2804059545779555969": "Creation of a new publication",
"9035578711395348230": "Publication content loading...", "4229813881636784544": "Publication created succesfully!",
"1772332295232318552": "An error occured while saving new publication.",
"5585500423922995936": "Loading publication to edit...",
"1487849090405054079": "Update publication {$INTERPOLATION}",
"570282468314450588": "Publication failed to load...", "570282468314450588": "Publication failed to load...",
"1766298802296530620": "Publication updated succesfully!",
"5690532907092398845": "An error occured while saving publication modifications.",
"9035578711395348230": "Publication content loading...",
"1224244276514211842": "Click to edit the publication",
"2759576657543552825": "Click to delete the publication",
"3861667381167371965": "An error occurred while loading publication...", "3861667381167371965": "An error occurred while loading publication...",
"3189372093194446122": "Publication deletion", "3189372093194446122": "Publication deletion",
"7149611045520326321": "Are you sure you want to delete this publication?", "7149611045520326321": "Are you sure you want to delete this publication?",
"4353366709080867962": "Publication deleted" "4353366709080867962": "Publication deleted",
"1460318440531551596": "Search results",
"886526241743571962": "Search in progress...",
"3467080651873197381": "No any result.",
"8212807341111457015": "An error occured while retrieving publications.",
"2101902914887471883": "Signin",
"963610942522043725": " Pseudo {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}",
"5090593460426139718": " Confirm password {$START_TAG_SPAN}*{$CLOSE_TAG_SPAN}",
"3461230574295546047": "I already have an account",
"5052944271008222026": "Typed passwords are different."
} }
} }