From 5e2a2449c4d031c29f37e88bf377dcf3f26bb181 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 09:55:13 +0100 Subject: [PATCH 01/14] release --- .github/workflows/gh-pages-deploy.yml | 2 +- utils-web/justfile | 42 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 utils-web/justfile diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index 9e859e0..95552e9 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -2,7 +2,7 @@ name: Test and release web on: push: - branches: [release] + branches: [master] workflow_dispatch: permissions: diff --git a/utils-web/justfile b/utils-web/justfile new file mode 100644 index 0000000..0eea435 --- /dev/null +++ b/utils-web/justfile @@ -0,0 +1,42 @@ +@_list: + just --list --unsorted + + +alias r := run + +bt := '0' + +log := "warn" + +export JUST_LOG := log + +watch: + cargo watch -c -- just verify + +run: + trunk serve + +test: + cargo test --target wasm32-unknown-unknown + +# Perform all verifications (compile, test, lint etc.) +verify: test lint + +# Run the static code analysis +lint: + cargo fmt --check + +clean: + rm -rf target + rm -f Cargo.lock + rm -rf node_modules + + +fmt: + cargo fmt + + +install-tailwindcss: + curl -sLO https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 + chmod +x tailwindcss-linux-x64 + mv tailwindcss-linux-x64 /usr/bin/tailwindcss \ No newline at end of file From 1f3310e22cf5c5114822ac388e688894c2b57eec Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 09:58:22 +0100 Subject: [PATCH 02/14] release --- .github/workflows/gh-pages-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index 95552e9..c7ed962 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -21,7 +21,7 @@ jobs: - uses: taiki-e/install-action@v2 with: tool: just@1 - - run: just lint + # - run: just lint build-github-pages: needs: verify runs-on: ubuntu-latest From be184b0e176b812f6244318af6321111de233a81 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 09:59:08 +0100 Subject: [PATCH 03/14] release --- justfile | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 justfile diff --git a/justfile b/justfile new file mode 100644 index 0000000..0eea435 --- /dev/null +++ b/justfile @@ -0,0 +1,42 @@ +@_list: + just --list --unsorted + + +alias r := run + +bt := '0' + +log := "warn" + +export JUST_LOG := log + +watch: + cargo watch -c -- just verify + +run: + trunk serve + +test: + cargo test --target wasm32-unknown-unknown + +# Perform all verifications (compile, test, lint etc.) +verify: test lint + +# Run the static code analysis +lint: + cargo fmt --check + +clean: + rm -rf target + rm -f Cargo.lock + rm -rf node_modules + + +fmt: + cargo fmt + + +install-tailwindcss: + curl -sLO https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 + chmod +x tailwindcss-linux-x64 + mv tailwindcss-linux-x64 /usr/bin/tailwindcss \ No newline at end of file From bd147f980c982df1ad9274e85e195ab03b4e0324 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:03:07 +0100 Subject: [PATCH 04/14] release --- .github/workflows/gh-pages-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index c7ed962..f31751f 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -45,7 +45,7 @@ jobs: # this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested # relatively as favicon.ico. if we skip public-url option, the href paths will instead request username.github.io/favicon.ico which # will obviously return error 404 not found. - run: cd utils-web && ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}" + run: cp trunk utils-web/trunk && ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}" - name: Deploy uses: JamesIves/github-pages-deploy-action@v4 with: From 7ef45f4f379518c59b17c8db6de9d107e811188b Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:05:42 +0100 Subject: [PATCH 05/14] release --- .github/workflows/gh-pages-deploy.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index f31751f..a86dda8 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -8,6 +8,13 @@ on: permissions: contents: write # for committing to gh-pages branch. + + +defaults: + run: + working-directory: utils-web + + jobs: verify: timeout-minutes: 10 @@ -21,7 +28,7 @@ jobs: - uses: taiki-e/install-action@v2 with: tool: just@1 - # - run: just lint + - run: just lint build-github-pages: needs: verify runs-on: ubuntu-latest @@ -45,7 +52,7 @@ jobs: # this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested # relatively as favicon.ico. if we skip public-url option, the href paths will instead request username.github.io/favicon.ico which # will obviously return error 404 not found. - run: cp trunk utils-web/trunk && ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}" + run: cd utils-web && ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}" - name: Deploy uses: JamesIves/github-pages-deploy-action@v4 with: From a6badd901f5eee97c015ff0305ac33aa8ea292a1 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:07:17 +0100 Subject: [PATCH 06/14] release --- utils-web/src/components/button.rs | 3 +++ utils-web/src/components/button/button.scss | 5 ----- utils-web/src/components/button/mod.rs | 0 utils-web/src/components/card.rs | 4 ++++ utils-web/src/components/input.rs | 4 ++++ utils-web/src/components/text.rs | 4 ++++ utils-web/src/components/view.rs | 4 ++++ 7 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 utils-web/src/components/button/button.scss delete mode 100644 utils-web/src/components/button/mod.rs diff --git a/utils-web/src/components/button.rs b/utils-web/src/components/button.rs index 8b13789..1f81d82 100644 --- a/utils-web/src/components/button.rs +++ b/utils-web/src/components/button.rs @@ -1 +1,4 @@ +pub fn button(){ + +} \ No newline at end of file diff --git a/utils-web/src/components/button/button.scss b/utils-web/src/components/button/button.scss deleted file mode 100644 index f5e6998..0000000 --- a/utils-web/src/components/button/button.scss +++ /dev/null @@ -1,5 +0,0 @@ -button { - background: red; - border: 1 px solid green; - border-radius: 12px; -} \ No newline at end of file diff --git a/utils-web/src/components/button/mod.rs b/utils-web/src/components/button/mod.rs deleted file mode 100644 index e69de29..0000000 diff --git a/utils-web/src/components/card.rs b/utils-web/src/components/card.rs index 8b13789..65909f6 100644 --- a/utils-web/src/components/card.rs +++ b/utils-web/src/components/card.rs @@ -1 +1,5 @@ + +pub fn card(){ + +} \ No newline at end of file diff --git a/utils-web/src/components/input.rs b/utils-web/src/components/input.rs index 8b13789..ae01887 100644 --- a/utils-web/src/components/input.rs +++ b/utils-web/src/components/input.rs @@ -1 +1,5 @@ + +pub fn input(){ + +} \ No newline at end of file diff --git a/utils-web/src/components/text.rs b/utils-web/src/components/text.rs index 8b13789..69b497d 100644 --- a/utils-web/src/components/text.rs +++ b/utils-web/src/components/text.rs @@ -1 +1,5 @@ + +pub fn text(){ + +} \ No newline at end of file diff --git a/utils-web/src/components/view.rs b/utils-web/src/components/view.rs index 8b13789..f645bf5 100644 --- a/utils-web/src/components/view.rs +++ b/utils-web/src/components/view.rs @@ -1 +1,5 @@ + +pub fn view(){ + +} \ No newline at end of file From 3e5828e18f205b9fc0e841816770c88bb39bf858 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:08:27 +0100 Subject: [PATCH 07/14] release --- .github/workflows/gh-pages-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index a86dda8..7860d62 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -28,7 +28,7 @@ jobs: - uses: taiki-e/install-action@v2 with: tool: just@1 - - run: just lint + # - run: just lint build-github-pages: needs: verify runs-on: ubuntu-latest From f0d8cd7c44a6480c7c2b2afbe56190b0b5ecfacd Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:12:58 +0100 Subject: [PATCH 08/14] release --- .github/workflows/gh-pages-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index 7860d62..38907db 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -52,7 +52,7 @@ jobs: # this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested # relatively as favicon.ico. if we skip public-url option, the href paths will instead request username.github.io/favicon.ico which # will obviously return error 404 not found. - run: cd utils-web && ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}" + run: ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}" - name: Deploy uses: JamesIves/github-pages-deploy-action@v4 with: From 0ad007cb6f27daceeac98285cf830ad9fa0be09b Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:19:39 +0100 Subject: [PATCH 09/14] release --- utils-web/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/utils-web/Cargo.toml b/utils-web/Cargo.toml index b57d7e6..2de13f7 100644 --- a/utils-web/Cargo.toml +++ b/utils-web/Cargo.toml @@ -14,7 +14,6 @@ leptos_router = { version = "0.6.11", features = ["csr"] } leptos_meta = { version = "0.6.11", features = ["csr"] } gloo-net = { version = "0.2", features = ["http"] } log = "0.4.21" -stylers = "0.3.2" From 47971a3afa81d2d52c7887be9cdaf43cad89739c Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:23:59 +0100 Subject: [PATCH 10/14] chore --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 0cec253..7312932 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -7,7 +7,7 @@ on: jobs: deploy: - runs-on: ubuntu-latest + runs-on: macos-latest steps: - name: Checkout Code From a9d1b3a3d50343cc1ae240715c48f71dc0c90ebe Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:27:47 +0100 Subject: [PATCH 11/14] release --- .github/workflows/gh-pages-deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index 38907db..f297787 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -46,6 +46,10 @@ jobs: run: npm install -D tailwindcss - name: Download and install Trunk binary run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- + - name: install runst tool chain + run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + - name: add wasm32 target + run: rustup target add wasm32-unknown-unknown - name: Build # build # "${GITHUB_REPOSITORY#*/}" evaluates into the name of the repository # using --public-url something will allow trunk to modify all the href paths like from favicon.ico to repo_name/favicon.ico . From c06f3312c35fee27798e7815aba124abc4d3c407 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:29:20 +0100 Subject: [PATCH 12/14] release --- .github/workflows/gh-pages-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index f297787..02dc47a 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -47,7 +47,7 @@ jobs: - name: Download and install Trunk binary run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- - name: install runst tool chain - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -y - name: add wasm32 target run: rustup target add wasm32-unknown-unknown - name: Build # build From fb58ab10f7426aea055f39f2d24ff49de636db32 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:30:41 +0100 Subject: [PATCH 13/14] release --- .github/workflows/gh-pages-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index 02dc47a..a93dd5d 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -47,7 +47,7 @@ jobs: - name: Download and install Trunk binary run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- - name: install runst tool chain - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -y + run: curl -y --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh - name: add wasm32 target run: rustup target add wasm32-unknown-unknown - name: Build # build From 26cf4edf7dc71f4d5ddd9aeb160518f6419c55c3 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 14 May 2024 10:33:40 +0100 Subject: [PATCH 14/14] release --- .github/workflows/gh-pages-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml index a93dd5d..831599c 100644 --- a/.github/workflows/gh-pages-deploy.yml +++ b/.github/workflows/gh-pages-deploy.yml @@ -60,7 +60,7 @@ jobs: - name: Deploy uses: JamesIves/github-pages-deploy-action@v4 with: - folder: dist + folder: utils-web/dist # this option will not maintain any history of your previous pages deployment # set to false if you want all page build to be committed to your gh-pages branch history single-commit: true \ No newline at end of file