From 74e46b31323a5c3bf6e60024b72cac3afd8e45bc Mon Sep 17 00:00:00 2001 From: Eli Adelhult Date: Wed, 10 May 2023 15:45:57 +0200 Subject: [PATCH] GH-256: Add todo notes to website --- .github/workflows/DeployMain.yml | 23 ++++++++++--------- .github/workflows/DeployPreview.yml | 6 ++--- .../{build_playground.sh => build_website.sh} | 0 website/src/Homepage.tsx | 4 ++-- 4 files changed, 16 insertions(+), 17 deletions(-) rename website/{build_playground.sh => build_website.sh} (100%) diff --git a/.github/workflows/DeployMain.yml b/.github/workflows/DeployMain.yml index 9412cb36..5bc2700f 100644 --- 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/wasm-pack-action@v0.4.0 - - 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 index ed76b479..fa2e236b 100644 --- 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 b/website/build_website.sh similarity index 100% rename from website/build_playground.sh rename to website/build_website.sh diff --git a/website/src/Homepage.tsx b/website/src/Homepage.tsx index cdbfc3df..d4c9e8d7 100644 --- a/website/src/Homepage.tsx +++ b/website/src/Homepage.tsx @@ -279,7 +279,7 @@ export default function Homepage() { Read developer guide } + action={Read developer guideTODO } color="#748E54" gridStart="start" gridEnd="right" @@ -293,7 +293,7 @@ export default function Homepage() { - Download thesis } color="#0F8B8D"> + Download thesis TODO } color="#0F8B8D">

Learn more

ModMark was created as a bachelor's thesis project at Chalmers University of Technology in Gothenburg, Sweden.