#46 | Deploy with github

LuongXuanNhat · Dec 9, 2023 · 735a52b · 735a52b
1 parent 3b23ede
commit 735a52b
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 45 deletions.
diff --git a/angular.json b/angular.json
@@ -13,7 +13,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "baseHref": "/VietNamHistory/",
+            "baseHref": "/VietNamHistory_FEweb/",
             "allowedCommonJsDependencies": ["@ckeditor/ckeditor5-build-classic"],
             "outputPath": "docs",
             "index": "src/index.html",

diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/main.76ce9815511532a2.js → docs/main.528272446034d854.js b/docs/main.76ce9815511532a2.js → docs/main.528272446034d854.js
diff --git a/docs/styles.48fb634aba0d3813.css b/docs/styles.48fb634aba0d3813.css
diff --git a/docs/styles.8137fd47bbcf7af2.css b/docs/styles.8137fd47bbcf7af2.css
diff --git a/docs/web.config b/docs/web.config
@@ -1,38 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-
-<system.webServer>
-  <rewrite>
-    <rules>
-      <rule name="Angular Routes" stopProcessing="true">
-        <match url=".*" />
-        <conditions logicalGrouping="MatchAll">
-          <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
-          <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
-        </conditions>
-        <action type="Rewrite" url="./index.html" />
-      </rule>
-    </rules>
-  </rewrite>
-        <security>
-            <requestFiltering>
-                <fileExtensions>
-                    <add fileExtension=".svg" allowed="true" />
-                    <add fileExtension=".woff" allowed="true" />
-                    <add fileExtension=".woff2" allowed="true" />
-                </fileExtensions>
-            </requestFiltering>
-        </security>
-
-<httpProtocol>
-    <customHeaders>
-        <!-- <add name="X-Content-Type-Options" value="no-sniff"/>
-        <add name="X-Frame-Options" value="SAMEORIGIN"/>
-        <add name="X-Xss-Protection" value="1; mode=block"/>
-        <add name="Strict-Transport-Security" value="max-age=31536000; includeSubDomains"/> -->
-    </customHeaders>
-  </httpProtocol>
-        <httpRedirect enabled="false" destination="" />
-</system.webServer>
+  <system.webServer>
+    <staticContent>
+          <mimeMap fileExtension=".json" mimeType="application/json" />
+          <remove fileExtension=".woff"/>
+          <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
+          <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
+    </staticContent>
+    <rewrite>
+      <rules>
+        <rule name="Angular Routes" stopProcessing="true">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/" />
+        </rule>
+      </rules>
+    </rewrite>
+    <security>
+        <requestFiltering>
+            <fileExtensions>
+                <add fileExtension=".svg" allowed="true" />
+                <add fileExtension=".woff" allowed="true" />
+                <add fileExtension=".woff2" allowed="true" />
+            </fileExtensions>
+        </requestFiltering>
+    </security>
+
+  <httpProtocol>
+      <customHeaders>
+          <!-- <add name="X-Content-Type-Options" value="no-sniff"/>
+          <add name="X-Frame-Options" value="SAMEORIGIN"/>
+          <add name="X-Xss-Protection" value="1; mode=block"/>
+          <add name="Strict-Transport-Security" value="max-age=31536000; includeSubDomains"/> -->
+      </customHeaders>
+    </httpProtocol>
+    <httpRedirect enabled="false" destination="" />
+  </system.webServer>
 
 </configuration>
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -81,7 +81,7 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes), HttpClientModule],
+  imports: [RouterModule.forRoot(routes, {useHash: true} ), HttpClientModule],
   exports: [RouterModule],
   providers: [
     {

diff --git a/src/app/service/auth.service.ts b/src/app/service/auth.service.ts
@@ -7,8 +7,8 @@ import { Injectable } from '@angular/core';
 export class AuthService {
 
   constructor(private http: HttpClient ) { }
-  // apiurl = 'https://vuanhpham25-001-site1.gtempurl.com';
-  apiurl = 'https://localhost:7138';
+   apiurl = 'https://vuanhpham25-001-site1.gtempurl.com';
+  // apiurl = 'https://localhost:7138';
   getApiUrl(){
     return this.apiurl;
   }

diff --git a/src/index.html b/src/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>Tôi yêu lịch sử</title>
-  <base href="/">
+  <base href="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="assets/Icon/onepangoda.png">
   <link rel="preconnect" href="https://fonts.gstatic.com">