diff --git a/ui/ui-frontend/angular.json b/ui/ui-frontend/angular.json index 48d2df450abc1a7f0803cbe6377d525545ecdacc..206d6802f3b7843c379847fb46ac6ccd7e393bf2 100644 --- a/ui/ui-frontend/angular.json +++ b/ui/ui-frontend/angular.json @@ -678,7 +678,6 @@ "i18nFormat": "xlf", "i18nLocale": "en", "i18nMissingTranslation": "warning" - } } }, @@ -864,32 +863,39 @@ } }, "pastis": { - "projectType": "application", - "schematics": { - "@schematics/angular:component": { - "style": "scss" - } - }, - "root": "projects/pastis", + "root": "projects/pastis/", "sourceRoot": "projects/pastis/src", - "prefix": "app", + "projectType": "application", "architect": { "build": { - "builder": "@angular-devkit/build-angular:browser", + "builder": "@angular-builders/custom-webpack:browser", "options": { + "customWebpackConfig": { + "path": "./extra-webpack.config.js" + }, "outputPath": "dist/pastis", "index": "projects/pastis/src/index.html", "main": "projects/pastis/src/main.ts", "polyfills": "projects/pastis/src/polyfills.ts", "tsConfig": "projects/pastis/tsconfig.app.json", - "aot": true, + "rebaseRootRelativeCssUrls": true, "assets": [ + "projects/pastis/src/assets", "projects/pastis/src/favicon.ico", - "projects/pastis/src/assets" + { + "glob": "**/*", + "input": "node_modules/ui-frontend-common/assets", + "output": "/assets" + } ], "styles": [ "projects/pastis/src/styles.scss" ], + "stylePreprocessorOptions": { + "includePaths": [ + "projects/commons/src/sass" + ] + }, "scripts": [] }, "configurations": { @@ -924,7 +930,7 @@ } }, "serve": { - "builder": "@angular-devkit/build-angular:dev-server", + "builder": "@angular-builders/custom-webpack:dev-server", "options": { "browserTarget": "pastis:build", "host": "dev.vitamui.com", @@ -991,4 +997,4 @@ "cli": { "analytics": false } -} +} \ No newline at end of file diff --git a/ui/ui-frontend/projects/pastis/src/app/app.component.ts b/ui/ui-frontend/projects/pastis/src/app/app.component.ts index bdb297728bf08dd0a260e8fc7d2b077fea88260d..d865c1fa180e453de544c06f0ea21cea415ac12d 100644 --- a/ui/ui-frontend/projects/pastis/src/app/app.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/app.component.ts @@ -45,6 +45,10 @@ import { Component } from '@angular/core'; }) export class AppComponent { + title= 'Pastis App'; + subrogating = true; + constructor() { + } } diff --git a/ui/ui-frontend/projects/pastis/src/app/app.module.ts b/ui/ui-frontend/projects/pastis/src/app/app.module.ts index 6ed11f16243b4734a6fb750509cc2071e17729ce..b1289cd7934d7ec62a285d6e0a0dc2917be5c9ae 100644 --- a/ui/ui-frontend/projects/pastis/src/app/app.module.ts +++ b/ui/ui-frontend/projects/pastis/src/app/app.module.ts @@ -45,7 +45,6 @@ import { FormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms'; import { PortalModule } from '@angular/cdk/portal'; - //Pastis modules import { CoreModule } from './core/core.module'; import { FileTreeModule } from './profile/edit-profile/file-tree/file-tree.module'; @@ -68,9 +67,12 @@ import { PastisConfiguration } from '../app/core/classes/pastis-configuration'; import { QuicklinkModule } from 'ngx-quicklink'; import { RegisterIconsService } from './core/services/register-icons.service'; import { BASE_URL, ENVIRONMENT, LoggerModule, VitamUICommonModule, WINDOW_LOCATION } from 'ui-frontend-common'; -import { environment } from 'projects/archive-search/src/environments/environment'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { MultiTranslateHttpLoader } from 'ngx-translate-multi-http-loader'; +import {environment} from 'projects/pastis/src/environments/environment'; +import { ServiceWorkerModule } from '@angular/service-worker'; + + export function httpLoaderFactory(httpClient: HttpClient): MultiTranslateHttpLoader { return new MultiTranslateHttpLoader(httpClient, [ @@ -82,7 +84,6 @@ export function httpLoaderFactory(httpClient: HttpClient): MultiTranslateHttpLoa @NgModule({ declarations: [ AppComponent, - PastisDialogConfirmComponent, UserActionAddMetadataComponent, UserActionRemoveMetadataComponent, routingComponents, @@ -119,7 +120,8 @@ export function httpLoaderFactory(httpClient: HttpClient): MultiTranslateHttpLoa useFactory: httpLoaderFactory, deps: [HttpClient] } - }) + }), + ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }), ], exports:[ HttpClientModule, diff --git a/ui/ui-frontend/projects/pastis/src/app/shared/shared.module.ts b/ui/ui-frontend/projects/pastis/src/app/shared/shared.module.ts index d790d2342470bf77aa9004d67837ac9dd6cfb996..a5e74d489ea37305fdc28c69680bd388889c7240 100644 --- a/ui/ui-frontend/projects/pastis/src/app/shared/shared.module.ts +++ b/ui/ui-frontend/projects/pastis/src/app/shared/shared.module.ts @@ -54,6 +54,7 @@ import {MatSlideToggleModule} from '@angular/material/slide-toggle'; PastisUnderConstructionComponent, PastisToggleButtonComponent, PastisNoticeToggleButtonComponent, + PastisDialogConfirmComponent ], imports: [CommonModule, FormsModule,