From f02fb4d670aeb0d729fff16269ee28a5d31b44a5 Mon Sep 17 00:00:00 2001 From: Jaime Caso Date: Wed, 25 Sep 2024 12:43:00 +0200 Subject: [PATCH] fix: missing very_high state and update vote receipt and other UI fixes (#591) * fix: open terms and package.json details * fix: open github commit from current version * feat: set matomo env vars * feat: parse matomo project id * feat: add trackEvents * feat: set VITE_MATOMO_PROJECT_ID 1 by default * fix: remove debugs * fix: update status page * feat: multiple winners * fix: winner learn more * fix: include missing VERY_HIGH state * fix: dispatch update receipt * fix: view viewOnChainVote when STATE.FULL * fix: selected category id and run prettier * fix: remove debugs * fix: add debugs * fix: ConnectWalletButton styles * fix: options hover bg in header * fix: link categories and leaderboard cards in home * feat: add share icon in bio modal * feat: align share icon in bio modal * feat: remove border for share button * feat: terms and conditions * feat: toast message on decline terms * fix: cookies open privacy policy * fix: Optim Finance url * fix: share icon * fix: I am not a robot click check box * fix: nominees grid left align * fix: modal fontWeight * fix: layout menu padding * fix: home background hover --- ui/summit-2024/src/assets/share.svg | 11 +++ .../common/resources/data/privacyPolicy.json | 2 +- .../data/summit2024MainnetContent.json | 2 +- .../resources/data/termsAndConditions.json | 6 +- .../ConnectWalletButton.scss | 9 +- .../ConnectWalletButton.tsx | 4 +- .../src/components/Header/Header.tsx | 23 ++++- .../src/components/Layout/Layout.tsx | 97 ++++++++----------- .../components/LegalOptInModal/Cookies.tsx | 3 +- .../TermsAndConditionsModal.tsx | 12 ++- .../VerifyWalletModal/VerifyWalletModal.tsx | 1 + .../src/components/common/Modal/Modal.tsx | 3 +- .../src/pages/Categories/Categories.tsx | 8 +- .../pages/Categories/components/BioModal.tsx | 33 ++++++- .../pages/Categories/components/Nominees.tsx | 2 +- .../Categories/components/ViewReceipt.tsx | 20 +++- .../pages/Home/components/ExploreSection.tsx | 34 ++++++- .../pages/Home/components/TicketsSection.tsx | 11 ++- 18 files changed, 194 insertions(+), 87 deletions(-) create mode 100644 ui/summit-2024/src/assets/share.svg diff --git a/ui/summit-2024/src/assets/share.svg b/ui/summit-2024/src/assets/share.svg new file mode 100644 index 000000000..44715287e --- /dev/null +++ b/ui/summit-2024/src/assets/share.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ui/summit-2024/src/common/resources/data/privacyPolicy.json b/ui/summit-2024/src/common/resources/data/privacyPolicy.json index 664c25578..4b17f4b35 100644 --- a/ui/summit-2024/src/common/resources/data/privacyPolicy.json +++ b/ui/summit-2024/src/common/resources/data/privacyPolicy.json @@ -1,6 +1,6 @@ { "title": "Privacy Policy", - "date": "Last updated: July, 2023", + "date": "Last updated: July, 2024", "description": [ "This Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your information when You use the Service and tells You about Your privacy rights and how the law protects You.", "We use Your Personal data to provide and improve the Service. By using the Service, You agree to the collection and use of information in accordance with this Privacy Policy." diff --git a/ui/summit-2024/src/common/resources/data/summit2024MainnetContent.json b/ui/summit-2024/src/common/resources/data/summit2024MainnetContent.json index 11f1e7524..ddcf6010e 100644 --- a/ui/summit-2024/src/common/resources/data/summit2024MainnetContent.json +++ b/ui/summit-2024/src/common/resources/data/summit2024MainnetContent.json @@ -402,7 +402,7 @@ "presentationName": "Optim Finance", "x": "https://x.com/optimfi", "linkedin": "", - "url": "https://dao.optim.finance/" + "url": "https://optim.finance/" } ] }, diff --git a/ui/summit-2024/src/common/resources/data/termsAndConditions.json b/ui/summit-2024/src/common/resources/data/termsAndConditions.json index f94be280c..96b006e5a 100644 --- a/ui/summit-2024/src/common/resources/data/termsAndConditions.json +++ b/ui/summit-2024/src/common/resources/data/termsAndConditions.json @@ -1,6 +1,6 @@ { "title": "Terms and Conditions", - "date": "Last updated: August, 2023", + "date": "Last updated: August, 2024", "sections": [ { "title": "Interpretation and Definitions", @@ -13,7 +13,7 @@ "title": "Definitions", "content": ["For the purposes of these Terms and Conditions:"], "definitions": { - "Website": "Website means the server provided by the Company to You on any electronic device, named Cardano Summit 2023.", + "Website": "Website means the server provided by the Company to You on any electronic device, named Cardano Summit 2024.", "Country": "Country refers to Switzerland.", "Company": "Company refers to Cardano Foundation, Dammstrasse 16, 6300 Zug, Switzerland, and is referred to as either 'the Company,' 'We,' 'Us,' or 'Our' in this Agreement.", "Device": "Device means any device that can access the Service such as a computer, a mobile phone, or a digital tablet.", @@ -133,7 +133,7 @@ "list": [ { "number": "2.1", - "content": ["2.1 The Web Application is a platform that offers a verified e-voting platform. The Web Application Cardano Ballot is only being made available for the Cardano Summit 2023 as is designed only for the Summit use case. This is a platform where users can choose between two methods of registration and authentication. One method is via email and SMS, the other is via a Cardano Wallet and Discord bot. (User Discord account required). The site provides a facility for users to generate ballots and submit votes for the Cardano Summit 2023. The process will be anonymously recorded on the Cardano blockchain."] + "content": ["2.1 The Web Application is a platform that offers a verified e-voting platform. The Web Application Cardano Ballot is only being made available for the Cardano Summit 2024 as is designed only for the Summit use case. This is a platform where users can choose between two methods of registration and authentication. One method is via email and SMS, the other is via a Cardano Wallet and Discord bot. (User Discord account required). The site provides a facility for users to generate ballots and submit votes for the Cardano Summit 2024. The process will be anonymously recorded on the Cardano blockchain."] }, { "number": "2.2", diff --git a/ui/summit-2024/src/components/ConnectWalletButton/ConnectWalletButton.scss b/ui/summit-2024/src/components/ConnectWalletButton/ConnectWalletButton.scss index f72d7bb9a..81908b21f 100644 --- a/ui/summit-2024/src/components/ConnectWalletButton/ConnectWalletButton.scss +++ b/ui/summit-2024/src/components/ConnectWalletButton/ConnectWalletButton.scss @@ -1,7 +1,9 @@ .button-container { position: relative; - + z-index: 1300; .main-button { + position: relative; + z-index: 1301; border-radius: 12px; border: 1px solid var(--orange, #ee9766); display: inline-flex; @@ -72,6 +74,10 @@ line-height: 20px; height: 44px; + &:hover { + background-color: #282828; + } + .MuiTypography-root { font-size: 12px; } @@ -102,7 +108,6 @@ border: 1px solid #d2d2d9; background: var(--color-light-blue); display: inline-flex; - padding: 16px 20px; justify-content: center; align-items: center; gap: 10px; diff --git a/ui/summit-2024/src/components/ConnectWalletButton/ConnectWalletButton.tsx b/ui/summit-2024/src/components/ConnectWalletButton/ConnectWalletButton.tsx index d31f21c1a..c0c6ea074 100644 --- a/ui/summit-2024/src/components/ConnectWalletButton/ConnectWalletButton.tsx +++ b/ui/summit-2024/src/components/ConnectWalletButton/ConnectWalletButton.tsx @@ -73,7 +73,7 @@ const ConnectWalletButton = (props: ConnectWalletButtonProps) => { >