From 2f58f55939462389f33aa075ef9ee9e3e35fb627 Mon Sep 17 00:00:00 2001 From: Vitalii Vozniak Date: Wed, 26 Jul 2023 10:44:38 +0300 Subject: [PATCH] feat(cip-1694): restyle voting page --- README.md | 29 +- ui/cip-1694/.env.example | 16 ++ .../cypress/e2e/count-down-timer.cy.ts | 6 +- ui/cip-1694/src/App.module.scss | 5 + ui/cip-1694/src/App.tsx | 35 +-- ui/cip-1694/src/common/api/voteService.ts | 4 +- .../src/common/constants/appConstants.ts | 6 + .../src/common/handlers/httpHandler.ts | 18 +- ui/cip-1694/src/common/store/index.ts | 18 +- ui/cip-1694/src/common/store/types.ts | 12 +- ui/cip-1694/src/common/store/userSlice.ts | 34 +-- ui/cip-1694/src/common/utils/voteUtils.ts | 2 +- .../ConnectWalletModal.module.scss | 33 +++ .../ConnectWalletModal/ConnectWalletModal.tsx | 112 ++++---- .../CountDownTimer/CountDownTimer.module.scss | 1 - .../CountDownTimer/CountDownTimer.tsx | 15 +- .../components/IntroSlides/IntroSlides.scss | 82 ------ .../components/OptionCard/OptionCard.cy.tsx | 2 +- .../OptionCard/OptionCard.module.scss | 30 +++ .../src/components/OptionCard/OptionCard.scss | 19 -- .../src/components/OptionCard/OptionCard.tsx | 92 +++---- .../components/OptionCard/OptionCard.types.ts | 1 + .../VoteSubmittedModal.module.scss | 58 ++++ .../VoteSubmittedModal/VoteSubmittedModal.tsx | 85 ++++++ .../common/Content/Content.module.scss | 5 + .../src/components/common/Content/Content.tsx | 55 +++- .../common/Footer/Footer.module.scss | 20 +- .../src/components/common/Footer/Footer.tsx | 27 +- .../common/Header/ConnectWallet.tsx | 72 ----- .../common/Header/ConnectWalletButton.tsx | 113 ++++++++ .../common/Header/Header.module.scss | 31 ++- .../src/components/common/Header/Header.tsx | 4 +- .../common/Layout/Layout.module.scss | 1 + .../common/Slides/Slides.module.scss | 125 +++++++++ .../Slides/Slides.tsx} | 59 +---- .../Slides/Slides.types.ts} | 0 ui/cip-1694/src/index.tsx | 15 +- .../src/pages/Introduction/Introduction.scss | 10 +- .../src/pages/Introduction/Introduction.tsx | 8 +- ui/cip-1694/src/pages/Vote/Vote.module.scss | 47 ++++ ui/cip-1694/src/pages/Vote/Vote.scss | 2 - ui/cip-1694/src/pages/Vote/Vote.tsx | 247 +++++++----------- 42 files changed, 938 insertions(+), 618 deletions(-) create mode 100644 ui/cip-1694/.env.example create mode 100644 ui/cip-1694/src/App.module.scss create mode 100644 ui/cip-1694/src/components/ConnectWalletModal/ConnectWalletModal.module.scss delete mode 100644 ui/cip-1694/src/components/IntroSlides/IntroSlides.scss create mode 100644 ui/cip-1694/src/components/OptionCard/OptionCard.module.scss delete mode 100644 ui/cip-1694/src/components/OptionCard/OptionCard.scss create mode 100644 ui/cip-1694/src/components/VoteSubmittedModal/VoteSubmittedModal.module.scss create mode 100644 ui/cip-1694/src/components/VoteSubmittedModal/VoteSubmittedModal.tsx create mode 100644 ui/cip-1694/src/components/common/Content/Content.module.scss delete mode 100644 ui/cip-1694/src/components/common/Header/ConnectWallet.tsx create mode 100644 ui/cip-1694/src/components/common/Header/ConnectWalletButton.tsx create mode 100644 ui/cip-1694/src/components/common/Slides/Slides.module.scss rename ui/cip-1694/src/components/{IntroSlides/IntroSlides.tsx => common/Slides/Slides.tsx} (66%) rename ui/cip-1694/src/components/{IntroSlides/IntroSlides.types.ts => common/Slides/Slides.types.ts} (100%) create mode 100644 ui/cip-1694/src/pages/Vote/Vote.module.scss delete mode 100644 ui/cip-1694/src/pages/Vote/Vote.scss diff --git a/README.md b/README.md index 5de115ed2..a3ab1680b 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,39 @@ Voltaire Voting Applications to be used by Cardano Community to cast CIP-1694 pr - Docker-Compose ## Running (Development) + +- create `.env` file on the same level as `.env.development` + +```shell +brew install maven +``` + +```shell +git clone git@github.com:cardano-foundation/merkle-tree-java.git +mvn clean install +``` + ```shell -docker-compose up -d +git clone https://github.com/cardano-foundation/cip30-data-signature-parser +mvn install clean ``` + +```shell +cd cf-voting-app +rm -rf db +docker-compose rm +docker-compose up +``` + +```shell +cd cf-voting-app/backend-services/voting-app ./gradlew bootRun ``` +```shell +npm run start +``` + ## Repository Structure - service - contains java backend code needed for the frontend - ui - contains React.JS frontend code to cast votes / display voting results diff --git a/ui/cip-1694/.env.example b/ui/cip-1694/.env.example new file mode 100644 index 000000000..8b147ba14 --- /dev/null +++ b/ui/cip-1694/.env.example @@ -0,0 +1,16 @@ +REACT_APP_VERSION=$npm_package_version +REACT_APP_SERVER_URL="http://localhost:3000" +REACT_APP_TARGET_NETWORK=PREPROD + +REACT_APP_EVENT_ID=CIP-1694_Pre_Ratification_4619 +REACT_APP_CATEGORY_ID=CIP-1694_Pre_Ratification_4619 + +REACT_APP_EVENT_BY_ID_REFERENCE_URL=${REACT_APP_SERVER_URL}/api/reference/event +REACT_APP_CAST_VOTE_URL=${REACT_APP_SERVER_URL}/api/vote/cast +REACT_APP_BLOCKCHAIN_TIP_URL=${REACT_APP_SERVER_URL}/api/blockchain/tip +REACT_APP_VOTING_POWER_URL=${REACT_APP_SERVER_URL}/api/account + +REACT_APP_SUPPORTED_WALLETS=flint,eternl,nami,typhon,yoroi,nufi,gerowallet,lace +REACT_APP_ALWAYS_VISIBLE_WALLETS=lace +REACT_APP_EVENT_END_TIME=09-01-2023 +REACT_APP_EVENT_END_TIME_FORMAT=MM-DD-YYYY diff --git a/ui/cip-1694/cypress/e2e/count-down-timer.cy.ts b/ui/cip-1694/cypress/e2e/count-down-timer.cy.ts index 078198158..81960fbe3 100644 --- a/ui/cip-1694/cypress/e2e/count-down-timer.cy.ts +++ b/ui/cip-1694/cypress/e2e/count-down-timer.cy.ts @@ -1,9 +1,5 @@ describe('count down timer spec', () => { it('passes', () => { - cy.visit('http://localhost:3000/') - }) - it('should timer exists', () => { cy.visit('http://localhost:3000/'); - cy.get('[data-testid="count-down-timer"]').contains("days"); }); -}) \ No newline at end of file +}); diff --git a/ui/cip-1694/src/App.module.scss b/ui/cip-1694/src/App.module.scss new file mode 100644 index 000000000..85b6d6013 --- /dev/null +++ b/ui/cip-1694/src/App.module.scss @@ -0,0 +1,5 @@ +.toast { + border-radius: 10px; + background: #030321; + color: #fff; +} diff --git a/ui/cip-1694/src/App.tsx b/ui/cip-1694/src/App.tsx index 4db541f58..0057246f7 100644 --- a/ui/cip-1694/src/App.tsx +++ b/ui/cip-1694/src/App.tsx @@ -1,33 +1,22 @@ import React from 'react'; -import { BrowserRouter as Router } from 'react-router-dom'; import { Toaster } from 'react-hot-toast'; import CssBaseline from '@mui/material/CssBaseline'; -import { ThemeProvider } from '@mui/material/styles'; import { Layout } from 'components/common/Layout/Layout'; import Content from './components/common/Content/Content'; import { Footer } from './components/common/Footer/Footer'; import { Header } from './components/common/Header/Header'; -import theme from './common/styles/theme'; +import styles from './App.module.scss'; export const App = () => ( - - - -
- -