GH-256: Add todo notes to website

modmark-org · May 10, 2023 · 74e46b3 · 74e46b3
1 parent 85af2ce
commit 74e46b3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/DeployMain.yml b/.github/workflows/DeployMain.yml
@@ -24,36 +24,37 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./playground
+        working-directory: ./website
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup Pages
         uses: actions/configure-pages@v2
-      - name: Setup output directory
-        run: mkdir build
       - name: Install toolchain (minimal, stable, wasm32-unknown-unknown + wasm32-wasi)
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: wasm32-unknown-unknown, wasm32-wasi
       - name: Install wasm-pack
         uses: jetli/[email protected]
-      - name: Make build script executable
-        run: chmod +x ./build-playground.sh
-      - name: Build Playground
-        run: ./build-playground.sh
+      - name: Build website
+        run: |
+          npm ci
+          chmod +x ./build_website.sh
+          ./build_website.sh
+        env:
+          BASE: ${{ github.event.number }}
       - name: Remove auto-generated .gitignore
-        run: rm build/pkg/.gitignore
+        run: rm dist/pkg/.gitignore
       - name: Copy deployment files
         run: |
           mkdir site-deploy
-          cp -r build/* site-deploy
+          cp -r dist/* site-deploy
       - name: Print generated files
         run: ls -R site-deploy
-      - name: Deploy Playground
+      - name: Deploy website
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          folder: ./playground/site-deploy/
+          folder: ./website/site-deploy/
           branch: gh-pages
           clean: true
           clean-exclude: pr-preview

diff --git a/.github/workflows/DeployPreview.yml b/.github/workflows/DeployPreview.yml
@@ -31,8 +31,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Setup output directory
-        run: mkdir build
       - name: Install toolchain (minimal, stable, wasm32-unknown-unknown + wasm32-wasi)
         uses: dtolnay/rust-toolchain@stable
         with:
@@ -42,8 +40,8 @@ jobs:
       - name: Build website
         run: |
           npm ci
-          chmod +x ./build_playground.sh
-          ./build_playground.sh
+          chmod +x ./build_website.sh
+          ./build_website.sh
         env:
           BASE: ${{ github.event.number }}
       - name: Remove auto-generated .gitignore

diff --git a/website/build_playground.sh → website/build_website.sh b/website/build_playground.sh → website/build_website.sh
diff --git a/website/src/Homepage.tsx b/website/src/Homepage.tsx
@@ -279,7 +279,7 @@ export default function Homepage() {
         <FiGithub size={80} style={{ marginTop: "0.3rem", float: "right" }} />
       </Feature>
       <Feature
-        action={<a href="">Read developer guide <FiCode /></a>}
+        action={<a href=""><del>Read developer guide</del>TODO <FiCode /></a>}
         color="#748E54"
         gridStart="start"
         gridEnd="right"
@@ -293,7 +293,7 @@ export default function Homepage() {
         <img width="70%" src="./languages.svg" />
 
       </Feature>
-      <Feature action={<>Download thesis <FiDownload /> </>} color="#0F8B8D">
+      <Feature action={<><del>Download thesis</del> TODO <FiDownload /></>} color="#0F8B8D">
         <h1>Learn more</h1>
         <p>
           ModMark was created as a bachelor's thesis project at Chalmers University of Technology in Gothenburg, Sweden.