fix some errors(style not working as expected

WeihanLi · WeihanLi · commit 602d0a1c41fb · 2024-06-20T23:49:15.000+08:00
diff --git a/server.ts b/server.ts
@@ -1,6 +1,6 @@
 import { APP_BASE_HREF } from '@angular/common';
 import { CommonEngine } from '@angular/ssr';
-import express from 'express';
+import * as express from 'express';
 import { fileURLToPath } from 'node:url';
 import { dirname, join, resolve } from 'node:path';
 import AppServerModule from './src/main.server';
diff --git a/src/app/services/ConfigService.ts b/src/app/services/ConfigService.ts
@@ -7,8 +7,10 @@ import { Injectable } from '@angular/core';
 export class ConfigService {
 
     public GetApiBaseUrl(): string {
-        if (window["__env"] && window["__env"]["ApiBaseUrl"]) {           
-            return <string>window["__env"]["ApiBaseUrl"];
+        if (typeof window !== "undefined") {
+            if (window["__env"] && window["__env"]["ApiBaseUrl"]) {           
+                return <string>window["__env"]["ApiBaseUrl"];
+            }    
         }
         return environment.apiBaseUrl;
     }
diff --git a/src/app/shared/authConfig.ts b/src/app/shared/authConfig.ts
@@ -2,32 +2,12 @@
 
 import { AuthConfig } from 'angular-oauth2-oidc';
 
-export const authPasswordFlowConfig: AuthConfig = {
-  // Url of the Identity Provider
-  issuer: 'https://id.weihanli.xyz',
-
-  // URL of the SPA to redirect the user to after login
-  redirectUri: window.location.origin + '/account/callback',
-
-  // The SPA's id. The SPA is registerd with this id at the auth-server
-  clientId: 'reservation-angular-client',
-
-  dummyClientSecret: 'f6f1f917-0899-ef36-63c8-84728f411e7c',
-
-  // set the scope for the permissions the client should request
-  // The first three are defined by OIDC. The 4th is a usecase-specific one
-  scope: 'openid profile',
-
-  showDebugInformation: true,
-
-  oidc: false
-};
-
 export const authCodeFlowConfig: AuthConfig = {
   issuer: 'https://id.weihanli.xyz',
 
   // URL of the SPA to redirect the user to after login
-  redirectUri: window.location.origin + '/account/callback',
+  // redirectUri: window.location.origin + '/account/callback',
+  redirectUri: 'http://localhost:4200' + '/account/callback',
 
   // The SPA's id. The SPA is registerd with this id at the auth-server
   // clientId: 'server.code',
diff --git a/src/assets/config.js b/src/assets/config.js
@@ -1,4 +1,6 @@
 var env = {
     ApiBaseUrl: "https://reservation.weihanli.xyz"
 };
-window["__env"]= env;
+if (typeof window !== "undefined") {
+    window["__env"] = env;
+}
diff --git a/src/assets/newrelic.js b/src/assets/newrelic.js
diff --git a/src/index.html b/src/index.html
@@ -7,6 +7,7 @@
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="stylesheet" href="node_modules/@angular/material/prebuilt-themes/azure-blue.css" />
   <script src="assets/config.js"></script>
   <!-- Google Analytics -->
   <script>
@@ -18,8 +19,6 @@
   <!-- End Google Analytics -->
   <link rel="manifest" href="manifest.webmanifest">
   <meta name="theme-color" content="#1976d2">
-  <!-- newrelic -->
-  <script type="text/javascript" src="assets/newrelic.js"></script>
 </head>
 <body>
   <app-root></app-root>
diff --git a/src/styles.less b/src/styles.less
@@ -24,5 +24,3 @@
     -webkit-font-feature-settings:'liga';
     -webkit-font-smoothing: antialiased;
 }
-
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,10 @@ import { Injectable } from '@angular/core';`
`7`	`7`	`export class ConfigService {`
`8`	`8`
`9`	`9`	`public GetApiBaseUrl(): string {`
`10`		`- if (window["__env"] && window["__env"]["ApiBaseUrl"]) {`
`11`		`- return <string>window["__env"]["ApiBaseUrl"];`
	`10`	`+ if (typeof window !== "undefined") {`
	`11`	`+ if (window["__env"] && window["__env"]["ApiBaseUrl"]) {`
	`12`	`+ return <string>window["__env"]["ApiBaseUrl"];`
	`13`	`+ }`
`12`	`14`	`}`
`13`	`15`	`return environment.apiBaseUrl;`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,3 @@`
`24`	`24`	`-webkit-font-feature-settings:'liga';`
`25`	`25`	`-webkit-font-smoothing: antialiased;`
`26`	`26`	`}`
`27`		`-`
`28`		`-@import "~@angular/material/prebuilt-themes/indigo-pink.css";`