Merge remote-tracking branch 'origin/develop'

Ratchitta · Mar 17, 2024 · 48226ce · 48226ce
2 parents 45fa032 + afa4553
commit 48226ce
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 7 deletions.
diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
@@ -0,0 +1,51 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ['main']
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: 'pages'
+  cancel-in-progress: true
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
+      - name: Install dependencies
+        run: npm ci
+      - name: Build
+        run: npm run build
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload dist folder
+          path: './dist'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/docs/assets/index-B0cVmIS5.js → docs/assets/index-2ydUSxYX.js b/docs/assets/index-B0cVmIS5.js → docs/assets/index-2ydUSxYX.js
diff --git a/docs/index.html b/docs/index.html
@@ -5,15 +5,14 @@
     <link rel="icon" type="image/svg+xml" href="/wdb-sandbox/assets/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>WDB</title>
-    <script src="https://cdn.tailwindcss.com"></script>
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link
       href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
       rel="stylesheet"
     />
     <script src="https://kit.fontawesome.com/781fd0f736.js" crossorigin="anonymous"></script>
-    <script type="module" crossorigin src="/wdb-sandbox/assets/index-B0cVmIS5.js"></script>
+    <script type="module" crossorigin src="/wdb-sandbox/assets/index-2ydUSxYX.js"></script>
     <link rel="stylesheet" crossorigin href="/wdb-sandbox/assets/index-CqF6mcfn.css">
   </head>
   <body>

diff --git a/index.html b/index.html
@@ -5,7 +5,6 @@
     <link rel="icon" type="image/svg+xml" href="/assets/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>WDB</title>
-    <script src="https://cdn.tailwindcss.com"></script>
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link

diff --git a/src/Components/Footer/Footer.tsx b/src/Components/Footer/Footer.tsx
@@ -32,9 +32,9 @@ const Footer = (props: FooterProps) => {
         <div className={'flex gap-2'}>
           <p className={'text-caption'}>Powerd By</p>
           <div className={'flex items-center gap-2'}>
-            <img src="assets/skooldio-logo.png" alt="Skooldio" />
+            <img src="/assets/skooldio-logo.png" alt="Skooldio" />
             <div className="inline-block w-px self-stretch bg-neutral-100"></div>
-            <img src="assets/web-dev-logo.png" alt="Web Development Bootcamp" />
+            <img src="/assets/web-dev-logo.png" alt="Web Development Bootcamp" />
           </div>
         </div>
       </div>

diff --git a/src/Components/NavBar/NavBar.tsx b/src/Components/NavBar/NavBar.tsx
@@ -13,7 +13,7 @@ const NavBar = (props: NavBarProps) => {
       <div id="navbar-content" className="flex justify-between items-center">
         <div id="left" className="flex gap-10 items-center">
           <div id="logo" className="cursor-pointer flex gap-2.5 items-center" onClick={handleClickLogo}>
-            <img className="w-[36px] h-[36px] object-contain" src="assets/logo.svg" alt="logo" />
+            <img className="w-[36px] h-[36px] object-contain" src="/assets/logo.svg" alt="logo" />
             <p className="text-subHeading">WDB</p>
           </div>
           <div className="flex gap-6">

diff --git a/vite.config.ts b/vite.config.ts
@@ -10,4 +10,7 @@ export default defineConfig({
     },
   },
   base: '/wdb-sandbox/',
+  build: {
+    outDir: 'docs',
+  },
 });