Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/sdc-frontend",
"index": "src/index.html",
"main": "src/main.single-spa.ts",
"main": "src/main.ts",
"polyfills": [
"zone.js"
],
Expand All @@ -34,11 +34,6 @@
"src/styles.scss"
],
"scripts": [],
"customWebpackConfig": {
"path": "extra-webpack.config.js",
"libraryName": "sdc-frontend",
"libraryTarget": "umd"
},
"deployUrl": "http://localhost:4200/"
},
"configurations": {
Expand Down Expand Up @@ -76,7 +71,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-builders/custom-webpack:dev-server",
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "sdc-frontend:build:production"
Expand Down
8 changes: 0 additions & 8 deletions frontend/extra-webpack.config.js

This file was deleted.

4,779 changes: 2,741 additions & 2,038 deletions frontend/package-lock.json

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,10 @@
"build": "^0.1.4",
"moment": "^2.29.4",
"rxjs": "~7.8.0",
"single-spa": ">=4.0.0",
"single-spa-angular": "^8.1.0",
"tslib": "^2.3.0",
"zone.js": "~0.13.0"
},
"devDependencies": {
"@angular-builders/custom-webpack": "~16.0.0",
"@angular-devkit/build-angular": "^16.1.0",
"@angular/cli": "~16.1.0",
"@angular/compiler-cli": "^16.1.0",
Expand All @@ -50,4 +47,4 @@
"style-loader": "^3.3.1",
"typescript": "~5.1.3"
}
}
}
5 changes: 2 additions & 3 deletions frontend/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import { ExtraOptions, RouterModule, Routes } from "@angular/router";
import { NgModule } from "@angular/core";
import { EmptyRouteComponent } from "./empty-route/empty-route.component";
import { APP_BASE_HREF } from "@angular/common";
import { singleSpaPropsSubject } from "src/single-spa/single-spa-props";

let isStandalone = true;
singleSpaPropsSubject.subscribe((props: any) => {
/*singleSpaPropsSubject.subscribe((props: any) => {
isStandalone = props.standalone;
});
});*/
let rts: Routes = [];
rts = [
{ path: "", redirectTo: "pages", pathMatch: "full" },
Expand Down
5 changes: 2 additions & 3 deletions frontend/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Component, OnInit } from "@angular/core";
import { interval } from "rxjs";
import { singleSpaPropsSubject } from "src/single-spa/single-spa-props";

/**
* Application root component
Expand Down Expand Up @@ -55,7 +54,7 @@ export class AppComponent implements OnInit {
}

public ngOnInit(): void {
singleSpaPropsSubject.subscribe((props: any) => {
/*singleSpaPropsSubject.subscribe((props: any) => {
if(props.standalone) {
this.authTest();
} else {
Expand All @@ -75,7 +74,7 @@ export class AppComponent implements OnInit {
this._unsetValuationServiceAuth();
}
});
});
});*/
}

//@todo: rewrite it after getting AccessToken
Expand Down
5 changes: 2 additions & 3 deletions frontend/src/app/pages/pages.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Component } from "@angular/core";
import { BreakpointObserver, Breakpoints } from "@angular/cdk/layout";
import { Observable } from "rxjs";
import { map, shareReplay } from "rxjs/operators";
import { singleSpaPropsSubject } from "src/single-spa/single-spa-props";

/**
* Navigation bar and master viewport component.
Expand All @@ -22,13 +21,13 @@ export class PagesComponent {
);

constructor(private breakpointObserver: BreakpointObserver) {
singleSpaPropsSubject.subscribe((props: any) => {
/*singleSpaPropsSubject.subscribe((props: any) => {
this.isStandalone = props.standalone;
window.addEventListener('isSignedIn',(event: any) => {
if(event.detail === false) {
window.location.href = '/';
}
});
});
});*/
}
}
30 changes: 0 additions & 30 deletions frontend/src/main.single-spa.ts

This file was deleted.

10 changes: 5 additions & 5 deletions frontend/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
import { AppModule } from "./app/app.module";
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

platformBrowserDynamic()
.bootstrapModule(AppModule)
.catch((err) => console.error(err));
import { AppModule } from './app/app.module';

platformBrowserDynamic().bootstrapModule(AppModule)
.catch(err => console.error(err));
12 changes: 0 additions & 12 deletions frontend/src/single-spa/asset-url.ts

This file was deleted.

8 changes: 0 additions & 8 deletions frontend/src/single-spa/single-spa-props.ts

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"types": []
},
"files": [
"src/main.single-spa.ts"
"src/main.ts"
],
"include": [
"src/**/*.d.ts"
]
}
}