Update base path only for github page

glanzz · May 13, 2024 · 0a92de0 · 0a92de0
1 parent ac7acae
commit 0a92de0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/deploysite.yml b/.github/workflows/deploysite.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Build
-        run: npm run build
+        run: npm run buildgit
       - name: Setup Pages
         uses: actions/configure-pages@v4
       - name: Upload artifact

diff --git a/app/great-green/package.json b/app/great-green/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "buildgit": "vite build --base=/great-green",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview",
     "pwa-assets": "pwa-assets-generator --preset minimal-2023 public/logo.svg"

diff --git a/app/great-green/src/components/landing-page/about_us.tsx b/app/great-green/src/components/landing-page/about_us.tsx
@@ -7,8 +7,12 @@ import { useTranslation } from "react-i18next";
   //internalization
 
 
-const AboutCard = () => (
-
+const AboutCard = () => {
+    let base = "/"
+    if (window.location.href.indexOf("great-green") === -1) {
+        base = "/great-green/"
+    }
+    return (
     <div style={{padding: "40px", border: 0, display: "flex", flexWrap: "wrap", justifyContent: "space-between", color: "white"}} >
         <div style={{zIndex: 999}}>
                 <div className='about_head'>{t('aboutus.title')}</div>
@@ -19,11 +23,12 @@ const AboutCard = () => (
                 </div>
                 </div>
                 <Avatar alt="Remy Sharp"
-             src="/great green wall.jpeg"
+             src={base + "great green wall.jpeg"}
              sx={{ width: "300px", height: "300px", zIndex: 999 }}
             />
             </div>
 );
+}
 
 //interacting animation
 const InteractiveComponent: React.FC = () => {

diff --git a/app/great-green/src/i18n.ts b/app/great-green/src/i18n.ts
@@ -2,14 +2,15 @@ import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import HttpApi from 'i18next-http-backend';
 
+const base = import.meta.env.BASE_URL || "";
 i18n.use(HttpApi)
     .use(initReactI18next)
     .init({
         lng:'en',
         fallbackLng: 'en',
         ns: ['common'], 
         backend: {
-            loadPath:'/i18n/{{lng}}/{{ns}}.json'
+            loadPath: base + '/i18n/{{lng}}/{{ns}}.json'
         },
         interpolation: {
             escapeValue:false

diff --git a/app/great-green/src/pages/GithubHome.tsx b/app/great-green/src/pages/GithubHome.tsx
@@ -140,7 +140,7 @@ function GithubPage() {
         <div className="background">
           <div
             style={{
-              backgroundImage: `url('/background.png')`,
+              backgroundImage: `url('/great-green/background.png')`,
               backgroundSize: "cover",
               height: "100vh",
             }}
@@ -150,7 +150,7 @@ function GithubPage() {
               <div></div>
               <div>
                 <div className="title">
-                  <img src="/logowhite.png" width={100} alt="logo" />
+                  <img src="/great-green/logowhite.png" width={100} alt="logo" />
                 </div>
                 <div className="info">
                   {t("landing.content.label1")}

diff --git a/app/great-green/vite.config.ts b/app/great-green/vite.config.ts
@@ -4,7 +4,6 @@ import { VitePWA } from "vite-plugin-pwa";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: "/great-green",
   plugins: [
     react(),
     VitePWA({