From d4170133d3dff682644203e25b863d5bc1ab4c98 Mon Sep 17 00:00:00 2001 From: bitfalt <75431447+bitfalt@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:25:11 -0600 Subject: [PATCH 01/27] fix: CI Backend Pipeline --- .github/workflows/contract_checks.yml | 40 ++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/contract_checks.yml b/.github/workflows/contract_checks.yml index 363999b..b71f4c3 100644 --- a/.github/workflows/contract_checks.yml +++ b/.github/workflows/contract_checks.yml @@ -17,17 +17,17 @@ jobs: contracts_dir: - 'contracts/src/**' - - name: Install scarb + - name: Setup Scarb if: steps.changes.outputs.contracts_dir == 'true' - run: | - cd contracts - curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | sh -s -- -v 2.6.5 + working-directory: contracts + uses: software-mansion/setup-scarb@v1 + with: + scarb-version: "2.6.5" - - name: Run scarb fmt + - name: Run Scarb formatting if: steps.changes.outputs.contracts_dir == 'true' - run: | - cd contracts - scarb fmt + working-directory: contracts + run: scarb fmt check-contracts-changes: runs-on: ubuntu-latest @@ -44,15 +44,15 @@ jobs: - name: Install scarb if: steps.changes.outputs.contracts_dir == 'true' - run: | - cd contracts - curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | sh -s -- -v 2.6.5 + working-directory: contracts + uses: software-mansion/setup-scarb@v1 + with: + scarb-version: "2.6.5" - - name: Run scarb check + - name: Run Scarb check if: steps.changes.outputs.contracts_dir == 'true' - run: | - cd contracts - scarb check + working-directory: contracts + run: scarb check run-tests: runs-on: ubuntu-latest @@ -68,11 +68,13 @@ jobs: contracts_dir: - 'contracts/src/**' - - name: Install scarb + - name: Install Scarb if: steps.changes.outputs.contracts_dir == 'true' - run: | - cd contracts - curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | sh -s -- -v 2.6.5 + working-directory: contracts + uses: software-mansion/setup-scarb@v1 + with: + scarb-version: "2.6.5" + - name: Install snfoundry uses: foundry-rs/setup-snfoundry@v3 From 4a43f63ecd3fa465d4ebdc6de1a9ca9a5f1914b7 Mon Sep 17 00:00:00 2001 From: bitfalt <75431447+bitfalt@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:27:41 -0600 Subject: [PATCH 02/27] add: run CI on push and on branches --- .github/workflows/contract_checks.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/contract_checks.yml b/.github/workflows/contract_checks.yml index b71f4c3..4cc3e03 100644 --- a/.github/workflows/contract_checks.yml +++ b/.github/workflows/contract_checks.yml @@ -2,6 +2,13 @@ name: CI on: pull_request: + branches: + - dev + + push: + branches: + - dev + - main jobs: check-lint: From d5858889be4f14a4ad567c17c931d5040149bd4c Mon Sep 17 00:00:00 2001 From: bitfalt <75431447+bitfalt@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:29:12 -0600 Subject: [PATCH 03/27] add: enable CI to run manually for testing --- .github/workflows/contract_checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/contract_checks.yml b/.github/workflows/contract_checks.yml index 4cc3e03..1682584 100644 --- a/.github/workflows/contract_checks.yml +++ b/.github/workflows/contract_checks.yml @@ -10,6 +10,8 @@ on: - dev - main + workflow_dispatch: + jobs: check-lint: runs-on: ubuntu-latest From b77c4281380aa571dd6d43260237bd86154b5969 Mon Sep 17 00:00:00 2001 From: bitfalt <75431447+bitfalt@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:31:25 -0600 Subject: [PATCH 04/27] fix: CI error with scarb --- .github/workflows/contract_checks.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/contract_checks.yml b/.github/workflows/contract_checks.yml index 1682584..82ab6e4 100644 --- a/.github/workflows/contract_checks.yml +++ b/.github/workflows/contract_checks.yml @@ -27,9 +27,9 @@ jobs: - 'contracts/src/**' - name: Setup Scarb + uses: software-mansion/setup-scarb@v1 if: steps.changes.outputs.contracts_dir == 'true' working-directory: contracts - uses: software-mansion/setup-scarb@v1 with: scarb-version: "2.6.5" @@ -52,9 +52,9 @@ jobs: - 'contracts/src/**' - name: Install scarb + uses: software-mansion/setup-scarb@v1 if: steps.changes.outputs.contracts_dir == 'true' working-directory: contracts - uses: software-mansion/setup-scarb@v1 with: scarb-version: "2.6.5" @@ -78,9 +78,9 @@ jobs: - 'contracts/src/**' - name: Install Scarb + uses: software-mansion/setup-scarb@v1 if: steps.changes.outputs.contracts_dir == 'true' working-directory: contracts - uses: software-mansion/setup-scarb@v1 with: scarb-version: "2.6.5" From d20af192557bfee8b4f94052e1a54db04a46d977 Mon Sep 17 00:00:00 2001 From: bitfalt <75431447+bitfalt@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:34:57 -0600 Subject: [PATCH 05/27] fix: CI error with working-directory key --- .github/workflows/contract_checks.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/contract_checks.yml b/.github/workflows/contract_checks.yml index 82ab6e4..ac4ac32 100644 --- a/.github/workflows/contract_checks.yml +++ b/.github/workflows/contract_checks.yml @@ -29,7 +29,6 @@ jobs: - name: Setup Scarb uses: software-mansion/setup-scarb@v1 if: steps.changes.outputs.contracts_dir == 'true' - working-directory: contracts with: scarb-version: "2.6.5" @@ -54,7 +53,6 @@ jobs: - name: Install scarb uses: software-mansion/setup-scarb@v1 if: steps.changes.outputs.contracts_dir == 'true' - working-directory: contracts with: scarb-version: "2.6.5" @@ -80,7 +78,6 @@ jobs: - name: Install Scarb uses: software-mansion/setup-scarb@v1 if: steps.changes.outputs.contracts_dir == 'true' - working-directory: contracts with: scarb-version: "2.6.5" From 1c8109ec4938916c6348debdd12c714130e02096 Mon Sep 17 00:00:00 2001 From: bitfalt <75431447+bitfalt@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:38:14 -0600 Subject: [PATCH 06/27] build: comment if statement --- .github/workflows/contract_checks.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/contract_checks.yml b/.github/workflows/contract_checks.yml index ac4ac32..90b17b5 100644 --- a/.github/workflows/contract_checks.yml +++ b/.github/workflows/contract_checks.yml @@ -28,12 +28,12 @@ jobs: - name: Setup Scarb uses: software-mansion/setup-scarb@v1 - if: steps.changes.outputs.contracts_dir == 'true' + #if: steps.changes.outputs.contracts_dir == 'true' with: scarb-version: "2.6.5" - name: Run Scarb formatting - if: steps.changes.outputs.contracts_dir == 'true' + #if: steps.changes.outputs.contracts_dir == 'true' working-directory: contracts run: scarb fmt @@ -52,12 +52,12 @@ jobs: - name: Install scarb uses: software-mansion/setup-scarb@v1 - if: steps.changes.outputs.contracts_dir == 'true' + #if: steps.changes.outputs.contracts_dir == 'true' with: scarb-version: "2.6.5" - name: Run Scarb check - if: steps.changes.outputs.contracts_dir == 'true' + #if: steps.changes.outputs.contracts_dir == 'true' working-directory: contracts run: scarb check @@ -77,7 +77,7 @@ jobs: - name: Install Scarb uses: software-mansion/setup-scarb@v1 - if: steps.changes.outputs.contracts_dir == 'true' + #if: steps.changes.outputs.contracts_dir == 'true' with: scarb-version: "2.6.5" From 3b2957a64d353732cdbabb6ceb157bff93bfac7e Mon Sep 17 00:00:00 2001 From: Mariangela N Date: Fri, 27 Sep 2024 20:55:02 -0600 Subject: [PATCH 07/27] Add the NewFundingPage --- .../gostarkme-web/app/newfunding/page.tsx | 20 ++++++ .../modules/newfunding/DescriptionStep.tsx | 24 +++++++ .../modules/newfunding/FundingStep.tsx | 34 +++++++++ .../components/modules/newfunding/Stages.tsx | 70 +++++++++++++++++++ .../gostarkme-web/components/ui/Button.tsx | 20 ++++++ frontend/gostarkme-web/tailwind.config.ts | 1 + 6 files changed, 169 insertions(+) create mode 100644 frontend/gostarkme-web/app/newfunding/page.tsx create mode 100644 frontend/gostarkme-web/components/modules/newfunding/DescriptionStep.tsx create mode 100644 frontend/gostarkme-web/components/modules/newfunding/FundingStep.tsx create mode 100644 frontend/gostarkme-web/components/modules/newfunding/Stages.tsx create mode 100644 frontend/gostarkme-web/components/ui/Button.tsx diff --git a/frontend/gostarkme-web/app/newfunding/page.tsx b/frontend/gostarkme-web/app/newfunding/page.tsx new file mode 100644 index 0000000..84e92bb --- /dev/null +++ b/frontend/gostarkme-web/app/newfunding/page.tsx @@ -0,0 +1,20 @@ +// pages/NewFundingPage.tsx + +"use client"; // Mark this component as a Client Component +import Bounded from "@/components/ui/Bounded"; +import Divider from "@/components/ui/Divider"; +import Stages from "@/components/modules/newfunding/Stages"; + +const NewFundingPage = ({ params }: { params: { fundId: string } }) => { + return ( + <> + +

Your new fund!

+ + +
+ + ); +}; + +export default NewFundingPage; diff --git a/frontend/gostarkme-web/components/modules/newfunding/DescriptionStep.tsx b/frontend/gostarkme-web/components/modules/newfunding/DescriptionStep.tsx new file mode 100644 index 0000000..7dd8d56 --- /dev/null +++ b/frontend/gostarkme-web/components/modules/newfunding/DescriptionStep.tsx @@ -0,0 +1,24 @@ +import React from "react"; + +interface DescriptionStepProps { + fundingDescription: string; + setFundingDescription: (description: string) => void; +} + +const DescriptionStep: React.FC = ({ + fundingDescription, + setFundingDescription, +}) => ( +
+ Note: You can always edit your funding description later ;) +