Merge pull request #31 from nr2f1/deploy-to-gh-pages-round-two

Deploy to gh pages round two
nr2f1 · Jul 4, 2024 · 02980eb · 02980eb
2 parents 2f39107 + bcb239c
commit 02980eb
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 18 deletions.
diff --git a/.github/workflows/deploy-website-preview.yaml b/.github/workflows/deploy-website-preview.yaml
@@ -9,6 +9,7 @@ on:
       - website/**/*
       - .github/workflows/deploy-website-preview.yaml
       - '!CHANGELOG.md'         
+      - '!website-assets/**/*'         
   workflow_run:
     workflows: ["PR validation"]
     types:

diff --git a/website-assets/index.html b/website-assets/index.html
@@ -4,16 +4,16 @@
 <head>
   <meta charset="utf-8" />
   <title>NR2F1 Foundation | Simple Storage Service (s3)</title>
-  <base href="/" />
+  <!-- <base href="/" /> -->
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <link rel="stylesheet" href="/src/styles/index.css" />
+  <link rel="stylesheet" href="./src/index.css" />
 </head>
 
 <body>
   <header>
     <picture>
-      <img src="/assets/nr2f1-foundation-logo-color-white-text-original.png" alt="nr2f1 logo" />
+      <img src="./nr2f1-foundation-logo-color-white-text-original.png" alt="nr2f1 logo" />
     </picture>
 
     <h1>Simple Storage Service (s3)</h1>
@@ -29,48 +29,50 @@ <h2>List of assets</h2>
       <h3>Logos</h3>
       <ul>
         <li>
-          <a href="/assets/nr2f1-foundation-logo-color-navy-text-original.png">
-            <picture><img src="/assets/nr2f1-foundation-logo-color-navy-text-original.png" alt="nr2f1 foundation" />
+          <a href="./nr2f1-foundation-logo-color-navy-text-original.png">
+            <picture><img src="./nr2f1-foundation-logo-color-navy-text-original.png" alt="nr2f1 foundation" />
             </picture>
           </a>
           <p>
             <span>url:</span>
             <button>
-              https://nr2f1.github.io/website/assets/nr2f1-foundation-logo-color-navy-text-original.png
+              https://nr2f1.github.io/website/nr2f1-foundation-logo-color-navy-text-original.png
             </button>
           </p>
         </li>
         <li>
-          <a href="/assets/nr2f1-foundation-logo-color-navy-text.png">
-            <picture><img src="/assets/nr2f1-foundation-logo-color-navy-text.png" alt="nr2f1 foundation" /></picture>
+          <a href="./nr2f1-foundation-logo-color-navy-text.png">
+            <picture><img src="./nr2f1-foundation-logo-color-navy-text.png" alt="nr2f1 foundation" />
+            </picture>
           </a>
           <p>
             <span>url:</span>
             <button>
-              https://nr2f1.github.io/website/assets/nr2f1-foundation-logo-color-navy-text.png
+              https://nr2f1.github.io/website/nr2f1-foundation-logo-color-navy-text.png
             </button>
           </p>
         </li>
         <li class="inverse">
-          <a href="/assets/nr2f1-foundation-logo-color-white-text.png">
-            <picture><img src="/assets/nr2f1-foundation-logo-color-white-text.png" alt="nr2f1 foundation" /></picture>
+          <a href="./nr2f1-foundation-logo-color-white-text.png">
+            <picture><img src="./nr2f1-foundation-logo-color-white-text.png" alt="nr2f1 foundation" />
+            </picture>
           </a>
           <p>
             <span>url:</span>
             <button>
-              https://nr2f1.github.io/website/assets/nr2f1-foundation-logo-color-white-text.png
+              https://nr2f1.github.io/website/nr2f1-foundation-logo-color-white-text.png
             </button>
           </p>
         </li>
         <li class="inverse">
-          <a href="/assets/nr2f1-foundation-logo-color-white-text-original.png">
-            <picture><img src="/assets/nr2f1-foundation-logo-color-white-text-original.png" alt="nr2f1 foundation" />
+          <a href="./nr2f1-foundation-logo-color-white-text-original.png">
+            <picture><img src="./nr2f1-foundation-logo-color-white-text-original.png" alt="nr2f1 foundation" />
             </picture>
           </a>
           <p>
             <span>url:</span>
             <button>
-              https://nr2f1.github.io/website/assets/nr2f1-foundation-logo-color-white-text-original.png
+              https://nr2f1.github.io/website/nr2f1-foundation-logo-color-white-text-original.png
             </button>
           </p>
         </li>

diff --git a/website-assets/public/assets/.gitkeep b/website-assets/public/assets/.gitkeep
diff --git a/...ndation-logo-color-navy-text-original.png → ...ndation-logo-color-navy-text-original.png b/...ndation-logo-color-navy-text-original.png → ...ndation-logo-color-navy-text-original.png
diff --git a/...nr2f1-foundation-logo-color-navy-text.png → ...nr2f1-foundation-logo-color-navy-text.png b/...nr2f1-foundation-logo-color-navy-text.png → ...nr2f1-foundation-logo-color-navy-text.png
diff --git a/...dation-logo-color-white-text-original.png → ...dation-logo-color-white-text-original.png b/...dation-logo-color-white-text-original.png → ...dation-logo-color-white-text-original.png
diff --git a/...r2f1-foundation-logo-color-white-text.png → ...r2f1-foundation-logo-color-white-text.png b/...r2f1-foundation-logo-color-white-text.png → ...r2f1-foundation-logo-color-white-text.png
diff --git a/website-assets/src/styles/index.css → website-assets/src/index.css b/website-assets/src/styles/index.css → website-assets/src/index.css
@@ -1,4 +1,4 @@
 @import url('https://fonts.googleapis.com/css2?family=Nunito+Sans:ital,opsz,wght@0,6..12,200..1000;1,6..12,200..1000&display=swap');
-@import url('./normalize.css');
-@import url('./variables.css');
-@import url('./main.css')
+@import url('./styles/normalize.css');
+@import url('./styles/variables.css');
+@import url('./styles/main.css')
diff --git a/website-assets/vite.config.ts b/website-assets/vite.config.ts
@@ -6,6 +6,7 @@ import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 export default defineConfig({
   root: __dirname,
   cacheDir: '../node_modules/.vite/website-assets',
+  base: './',
 
   server: {
     port: 4200,
@@ -22,6 +23,7 @@ export default defineConfig({
   build: {
     outDir: '../dist/website-assets',
     reportCompressedSize: true,
+    assetsDir: './',
     commonjsOptions: {
       transformMixedEsModules: true,
     },