From 154e50357573989118ed0202fa972a3f5c0b50ee Mon Sep 17 00:00:00 2001 From: BowTiedDeployer <93231870+BowTiedDeployer@users.noreply.github.com> Date: Sun, 28 May 2023 21:17:18 +0300 Subject: [PATCH 01/19] Update CommonInfoProfile.tsx --- src/components/appMenuSections/profile/CommonInfoProfile.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/appMenuSections/profile/CommonInfoProfile.tsx b/src/components/appMenuSections/profile/CommonInfoProfile.tsx index a7a45e0..76359fa 100644 --- a/src/components/appMenuSections/profile/CommonInfoProfile.tsx +++ b/src/components/appMenuSections/profile/CommonInfoProfile.tsx @@ -49,7 +49,7 @@ const CommonInfoProfile = () => { display connected wallet: {connectedWallet !== null &&
{connectedWallet}
} -
  • option to change wallet: postponed by Suciu
  • +
  • option to change wallet: postponed, use same functionallity as authenticate with `connect wallet`
  • current role:
    {currentRole === 'NormalUser' ? 'not asked to join yet' : currentRole}
    From 2310325982608a7fe9ce45c557878592d53ea2e5 Mon Sep 17 00:00:00 2001 From: BowTiedDeployer <93231870+BowTiedDeployer@users.noreply.github.com> Date: Sun, 28 May 2023 21:35:45 +0300 Subject: [PATCH 02/19] Update readOnly.ts --- src/consts/readOnly.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/consts/readOnly.ts b/src/consts/readOnly.ts index a02c36c..dae096e 100644 --- a/src/consts/readOnly.ts +++ b/src/consts/readOnly.ts @@ -328,7 +328,6 @@ export const readOnlyGetCurrentBlock = async () => { //exchange toggle for miners //get-auto-exchange -//done by Alexis with Suciu export const readOnlyExchangeToggle = async (args: string) => { const exchangeArgs = convertPrincipalToArg(args); From 79f0a86888a905322c659241cdee341eade7df29 Mon Sep 17 00:00:00 2001 From: Alexis Date: Tue, 23 May 2023 20:48:01 +0300 Subject: [PATCH 03/19] adds redux persist but not stable version --- package-lock.json | 33 +++++++++++++++++++++ package.json | 2 ++ src/components/ConnectWallet.tsx | 4 ++- src/index.tsx | 9 ++++-- src/redux/store/index.ts | 50 ++++++++++++++++++++++++++++++-- 5 files changed, 92 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ecb3232..b3bcc9b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,8 @@ "react-redux": "^8.0.5", "react-scripts": "5.0.1", "react-virtuoso": "^4.2.1", + "redux-persist": "^6.0.0", + "redux-persist-transform-encrypt": "^5.0.0", "typescript": "^4.9.5", "web-vitals": "^2.1.4" }, @@ -5762,6 +5764,11 @@ "node": ">= 8" } }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + }, "node_modules/crypto-random-string": { "version": "2.0.0", "license": "MIT", @@ -10069,6 +10076,11 @@ "version": "1.0.1", "license": "MIT" }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" + }, "node_modules/json5": { "version": "2.2.3", "license": "MIT", @@ -12835,6 +12847,27 @@ "@babel/runtime": "^7.9.2" } }, + "node_modules/redux-persist": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-6.0.0.tgz", + "integrity": "sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==", + "peerDependencies": { + "redux": ">4.0.0" + } + }, + "node_modules/redux-persist-transform-encrypt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/redux-persist-transform-encrypt/-/redux-persist-transform-encrypt-5.0.0.tgz", + "integrity": "sha512-etgQwkGPOPM1vLyPrp6XjcjXvRbpTBQN9IY7oLqd5dFwme1VYDkf2CyFPCxszRuSBh36uwQOLAukcFULVyRnkw==", + "dependencies": { + "crypto-js": "^4.1.1", + "json-stringify-safe": "^5.0.1" + }, + "peerDependencies": { + "redux": ">3.0.0", + "redux-persist": "^6.x.x" + } + }, "node_modules/redux-thunk": { "version": "2.4.2", "license": "MIT", diff --git a/package.json b/package.json index 78a4494..c496f26 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,8 @@ "react-redux": "^8.0.5", "react-scripts": "5.0.1", "react-virtuoso": "^4.2.1", + "redux-persist": "^6.0.0", + "redux-persist-transform-encrypt": "^5.0.0", "typescript": "^4.9.5", "web-vitals": "^2.1.4" }, diff --git a/src/components/ConnectWallet.tsx b/src/components/ConnectWallet.tsx index 371bc47..da4c57b 100644 --- a/src/components/ConnectWallet.tsx +++ b/src/components/ConnectWallet.tsx @@ -2,7 +2,7 @@ import LoginIcon from '@mui/icons-material/Login'; import LogoutIcon from '@mui/icons-material/Logout'; import colors from '../consts/colorPallete'; import { useAppDispatch, useAppSelector } from '../redux/store'; -import { connectAction, disconnectAction, updateUserRoleAction } from '../redux/actions'; +import { connectAction, disconnectAction, updateAppThemeAction, updateUserRoleAction } from '../redux/actions'; import { selectCurrentTheme, selectCurrentUserRole, selectUserSessionState } from '../redux/reducers/user-state'; import { useLocation } from 'react-router-dom'; import { useEffect, useState } from 'react'; @@ -46,11 +46,13 @@ const ConnectWallet = ({ currentTheme }: ConnectWalletProps) => { }, [location]); const disconnect = () => { + // dispatch(updateAppThemeAction(appCurrentTheme)); dispatch(disconnectAction()); }; const authenticate = () => { dispatch(connectAction()); + // dispatch(updateAppThemeAction(appCurrentTheme)); }; if (userSession.isUserSignedIn()) { diff --git a/src/index.tsx b/src/index.tsx index 933ff18..b04c0c5 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -3,16 +3,21 @@ import ReactDOM from 'react-dom/client'; import './index.css'; import { BrowserRouter } from 'react-router-dom'; import { Provider } from 'react-redux'; -import { store } from '../src/redux/store'; +import { store, persistor } from '../src/redux/store'; import Authenticate from './components/Authenticate'; +import { PersistGate } from 'redux-persist/integration/react'; const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement); root.render( + {/* PersistGate is a component you want to inject in between your + Redux Provider and your main component (App) */} - + + + diff --git a/src/redux/store/index.ts b/src/redux/store/index.ts index 03a644a..b299297 100644 --- a/src/redux/store/index.ts +++ b/src/redux/store/index.ts @@ -1,11 +1,55 @@ -import { configureStore } from '@reduxjs/toolkit'; +import { configureStore, combineReducers } from '@reduxjs/toolkit'; import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'; -import mainReducer from '../reducers'; +import mainReducer, { IinitialState } from '../reducers'; + +import { createTransform, persistReducer, persistStore } from 'redux-persist'; +import { encryptTransform } from 'redux-persist-transform-encrypt'; +import storage from 'redux-persist/lib/storage'; +import { AppConfig, UserSession } from '@stacks/connect'; + +const UserSesssionPersistTransform = createTransform( + (inboundState: IinitialState, key: string | number) => { + console.log('inbount', key, inboundState); + const appConfig = new AppConfig(['store_write', 'publish_data']); + const userSession = new UserSession({ appConfig }); + return { ...inboundState, userSession }; + }, + (outboundState: IinitialState, key: string | number) => { + console.log('outbound', key); + const appConfig = new AppConfig(['store_write', 'publish_data']); + const userSession = new UserSession({ appConfig }); + return { ...outboundState, userSession }; + }, + { whitelist: ['userState'] } +); + +const persistConfig = { + key: 'root', + storage: storage, + transforms: [ + UserSesssionPersistTransform, + encryptTransform({ + secretKey: 'somekey', + onError: function (error) { + console.log(error); + }, + }), + ], + // blacklist: [''], +}; + +const persistedReducer = persistReducer(persistConfig, mainReducer); export const store = configureStore({ - reducer: mainReducer, + reducer: persistedReducer, + middleware: (getDefaultMiddleware) => + getDefaultMiddleware({ + serializableCheck: false, + }), }); +export const persistor = persistStore(store); + // Infer the `RootState` and `AppDispatch` types from the store itself export type RootState = ReturnType; // Inferred type: {users: UsersState} From 2083e7ac394421c72e04783585ad621e238d6747 Mon Sep 17 00:00:00 2001 From: Alexis Date: Wed, 24 May 2023 11:54:40 +0300 Subject: [PATCH 04/19] aligns autoexchange button on profile page for Miner --- .../reusableComponents/profile/MoreInfoAboutContainerMiner.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/reusableComponents/profile/MoreInfoAboutContainerMiner.tsx b/src/components/reusableComponents/profile/MoreInfoAboutContainerMiner.tsx index 0e62477..8583a3d 100644 --- a/src/components/reusableComponents/profile/MoreInfoAboutContainerMiner.tsx +++ b/src/components/reusableComponents/profile/MoreInfoAboutContainerMiner.tsx @@ -50,7 +50,7 @@ const MoreInfoAboutContainerMiner = ({ currentBalance, totalWithdrawals }: IMine Autoexchange stx to btc: {exchange === null || exchange === false ? 'No' : 'Yes'} -
    +
    -
    -
    +
    +
    setBtcAddress(e.target.value)}>
    -
    +
    -
    -
    +
    +
    -
    +
    -
    -
    +
    +
    -
    +
    {leavePoolButtonClicked && showAlertLeavePool && ( -
    +
    { @@ -230,7 +230,7 @@ const ActionsContainer = ({ currentNotifier, userAddress }: IActionsContainerPro
    )} -
    +
    Address: -
    {address !== null ? address : ''}
    +
    {address !== null ? address : ''}
    - Wrong Address! + Wrong Address!
    @@ -96,14 +97,18 @@ const MinerDetailsContainer = ({ className="info-container-profile-page" >
    -
    ABOUT
    +
    ABOUT
    Address: -
    {address !== null ? address : ''}
    +
    {address !== null ? address : ''}
    Role: - + {currentNotifier === address ? 'Notifier' : currentRole === 'NormalUser' ? 'Normal User' : currentRole}
    @@ -124,41 +129,43 @@ const MinerDetailsContainer = ({
    Was Blacklisted: - {wasBlacklisted !== null ? (wasBlacklisted === true ? 'Yes' : 'No') : ''} + + {wasBlacklisted !== null ? (wasBlacklisted === true ? 'Yes' : 'No') : ''} +
    Warnings: - {warnings !== null ? warnings : ''} + {warnings !== null ? warnings : ''}
    Blocks as Miner: - {blocksAsMiner !== null ? blocksAsMiner : ''} + {blocksAsMiner !== null ? blocksAsMiner : ''}
    Balance: - {currentBalance !== null ? currentBalance : ''} + {currentBalance !== null ? currentBalance : ''}
    Total Withdrawn: - {totalWithdrawals !== null ? totalWithdrawals : ''} + {totalWithdrawals !== null ? totalWithdrawals : ''}
    )} {currentRole === 'Pending' && (
    Blocks Left Until Join: - {blocksUntilJoin !== null ? blocksUntilJoin : ''} + {blocksUntilJoin !== null ? blocksUntilJoin : ''}
    )} {currentRole === 'Waiting' && (
    Positive Votes: - {positiveVotes !== null ? positiveVotes : ''} + {positiveVotes !== null ? positiveVotes : ''}
    Negative Votes: - {negativeVotes !== null ? negativeVotes : ''} + {negativeVotes !== null ? negativeVotes : ''}
    )} @@ -169,15 +176,15 @@ const MinerDetailsContainer = ({ style={{ backgroundColor: colors[appCurrentTheme].accent2, color: colors[appCurrentTheme].secondary }} > - + Visit - + diff --git a/src/components/reusableComponents/profile/styles.css b/src/components/reusableComponents/profile/styles.css index 18fe92b..c992d45 100644 --- a/src/components/reusableComponents/profile/styles.css +++ b/src/components/reusableComponents/profile/styles.css @@ -121,3 +121,9 @@ justify-content: center; align-items: center; } + +/* @media screen and (max-width: 575px) { + .profile-page-main-container .actions-container-profile-page { + background-color: blue !important; + } +} */ diff --git a/src/components/reusableComponents/voting/VotingNotifierInfoContainer.tsx b/src/components/reusableComponents/voting/VotingNotifierInfoContainer.tsx index 5a96a14..91f2996 100644 --- a/src/components/reusableComponents/voting/VotingNotifierInfoContainer.tsx +++ b/src/components/reusableComponents/voting/VotingNotifierInfoContainer.tsx @@ -38,7 +38,7 @@ const VotingNotifierInfoContainer = ({
    -
    INFO
    +
    NOTIFIER
    Who I voted for: - {votedFor !== null ? votedFor : ''} + {votedFor !== null ? votedFor : ''}
    Voting Blocks Remaining: - {blocksRemaining !== null ? blocksRemaining : ''} + {blocksRemaining !== null ? blocksRemaining : ''}
    Elected Notifier: {voteStatus && Voting is still open!} - {!voteStatus &&
    {electedNotifier !== null ? electedNotifier : ''}
    } + {!voteStatus && ( +
    {electedNotifier !== null ? electedNotifier : ''}
    + )}
    {blocksRemaining === 0 && ( diff --git a/src/components/reusableComponents/voting/VotingStatusContainer.tsx b/src/components/reusableComponents/voting/VotingStatusContainer.tsx index f51445b..5451399 100644 --- a/src/components/reusableComponents/voting/VotingStatusContainer.tsx +++ b/src/components/reusableComponents/voting/VotingStatusContainer.tsx @@ -31,7 +31,7 @@ const VotingStatusContainer = ({ notifier, votingStatus }: VotingStatusContainer
    -
    INFO
    +
    STATUS
    Current Notifier: -
    {notifier !== null ? notifier : ''}
    +
    {notifier !== null ? notifier : ''}
    Notifier Voting Status: - {votingStatus !== null ? votingStatus : ''} + {votingStatus !== null ? votingStatus : ''}
    {votingStatus === 'Ended by time!' && ( diff --git a/src/components/reusableComponents/voting/styles.css b/src/components/reusableComponents/voting/styles.css index 0729d6f..fa1de4a 100644 --- a/src/components/reusableComponents/voting/styles.css +++ b/src/components/reusableComponents/voting/styles.css @@ -15,3 +15,17 @@ justify-content: center; align-items: center; } + +@media screen and (max-width: 575px) { + /* the container with the Start vote button */ + .voting-status-page-main-container .footer-end-vote-button-container, + .voting-notifier-page-main-container .footer-end-vote-button-container { + margin-top: -15px; + margin-bottom: 10px; + } + + .voting-status-page-main-container .footer-end-vote-button-container button, + .voting-notifier-page-main-container .footer-end-vote-button-container button { + font-size: 14px; + } +} diff --git a/src/css/common-page-alignments/styles.css b/src/css/common-page-alignments/styles.css index 4c5ecb5..5c26e6b 100644 --- a/src/css/common-page-alignments/styles.css +++ b/src/css/common-page-alignments/styles.css @@ -43,3 +43,9 @@ .content-sections-title-info-container { padding-block: 3px; } + +@media screen and (max-width: 575px) { + .page-heading-title h2 { + font-size: 20px; + } +} diff --git a/src/css/navbars/styles.css b/src/css/navbars/styles.css index 7c3ec4e..4f596b9 100644 --- a/src/css/navbars/styles.css +++ b/src/css/navbars/styles.css @@ -37,6 +37,7 @@ .default-page-container { height: 100vh; + /* height: auto; */ /* width: 100vw; - Do not add this, because if there's vertical scroll, the page will also have horizontal scroll. without it, the page width will be automatically adjusted for the contents. You only need the height. */ /* background-color: #eeeeee; */ @@ -47,3 +48,9 @@ .liMenuMiningPool { display: block !important; } + +@media screen and (max-width: 575px) { + .navbar-sections-font-size span { + font-size: 14px !important; + } +} From ed435d55beb47f1ea153baa4cc244420d1fc2edf Mon Sep 17 00:00:00 2001 From: Alexis Date: Mon, 29 May 2023 18:05:13 +0100 Subject: [PATCH 11/19] fixed width bug on home page --- src/components/appMenuSections/home/styles.css | 1 + src/components/appMenuSections/miningPool/styles.css | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/src/components/appMenuSections/home/styles.css b/src/components/appMenuSections/home/styles.css index cc8e0e9..ea3f740 100644 --- a/src/components/appMenuSections/home/styles.css +++ b/src/components/appMenuSections/home/styles.css @@ -15,6 +15,7 @@ display: flex; flex-direction: column; justify-content: start; + overflow-wrap: break-word; } @media screen and (max-width: 575px) { diff --git a/src/components/appMenuSections/miningPool/styles.css b/src/components/appMenuSections/miningPool/styles.css index e4bcd5b..fb5b544 100644 --- a/src/components/appMenuSections/miningPool/styles.css +++ b/src/components/appMenuSections/miningPool/styles.css @@ -75,4 +75,14 @@ table th { table td { font-size: 11px !important; } + + /* if we want to make the table bigger, but I don't guarantee it will be horizontally centered on every scrren */ + /* .miningpool-miners-page-main-container .principal-content-profile-page { + margin-left: -40px; + width: 120%; + } */ + + /* .miningpool-miners-page-main-container .principal-content-profile-page td { + width: auto !important; + } */ } From b7783a9086640a430f3b44e4841c288f4c2fbb33 Mon Sep 17 00:00:00 2001 From: Alexis Date: Tue, 30 May 2023 10:20:16 +0100 Subject: [PATCH 12/19] makes inputs on profile page bigger --- src/components/appMenuSections/profile/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/appMenuSections/profile/styles.css b/src/components/appMenuSections/profile/styles.css index 432f707..25cbe79 100644 --- a/src/components/appMenuSections/profile/styles.css +++ b/src/components/appMenuSections/profile/styles.css @@ -123,6 +123,7 @@ /* the input line from actions container on profile page */ .custom-input { box-sizing: border-box; + height: 38px; } /* the input button container from actions container on profile page */ From 1e8c1087b5f30d4024aa3e480d1061450b6f2725 Mon Sep 17 00:00:00 2001 From: Andrei Alexandrescu Date: Fri, 16 Jun 2023 21:04:33 +0300 Subject: [PATCH 13/19] Revert "makes inputs on profile page bigger" This reverts commit ec2af42a11215253207803548309026066c5c5bd. --- src/components/appMenuSections/profile/styles.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/appMenuSections/profile/styles.css b/src/components/appMenuSections/profile/styles.css index 25cbe79..432f707 100644 --- a/src/components/appMenuSections/profile/styles.css +++ b/src/components/appMenuSections/profile/styles.css @@ -123,7 +123,6 @@ /* the input line from actions container on profile page */ .custom-input { box-sizing: border-box; - height: 38px; } /* the input button container from actions container on profile page */ From 5785ed69113cdb684a7f4708a4454387a9bd2444 Mon Sep 17 00:00:00 2001 From: Andrei Alexandrescu Date: Fri, 16 Jun 2023 21:04:33 +0300 Subject: [PATCH 14/19] Revert "fixed width bug on home page" This reverts commit aec1b9acfa27463668832d61466abea197449b4f. --- src/components/appMenuSections/home/styles.css | 1 - src/components/appMenuSections/miningPool/styles.css | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/src/components/appMenuSections/home/styles.css b/src/components/appMenuSections/home/styles.css index ea3f740..cc8e0e9 100644 --- a/src/components/appMenuSections/home/styles.css +++ b/src/components/appMenuSections/home/styles.css @@ -15,7 +15,6 @@ display: flex; flex-direction: column; justify-content: start; - overflow-wrap: break-word; } @media screen and (max-width: 575px) { diff --git a/src/components/appMenuSections/miningPool/styles.css b/src/components/appMenuSections/miningPool/styles.css index fb5b544..e4bcd5b 100644 --- a/src/components/appMenuSections/miningPool/styles.css +++ b/src/components/appMenuSections/miningPool/styles.css @@ -75,14 +75,4 @@ table th { table td { font-size: 11px !important; } - - /* if we want to make the table bigger, but I don't guarantee it will be horizontally centered on every scrren */ - /* .miningpool-miners-page-main-container .principal-content-profile-page { - margin-left: -40px; - width: 120%; - } */ - - /* .miningpool-miners-page-main-container .principal-content-profile-page td { - width: auto !important; - } */ } From fd4ef462c4caf52046f1cb65fb28a0715b62dcc7 Mon Sep 17 00:00:00 2001 From: Andrei Alexandrescu Date: Fri, 16 Jun 2023 21:04:33 +0300 Subject: [PATCH 15/19] Revert "adds css for mobile version, but home page has a bug at width" This reverts commit c8a4a0a8df7172e3e294e9cfdd6f7636de17fdd8. --- src/App.css | 11 -- src/components/LeftPanel.tsx | 66 ++------ .../appMenuSections/dashboard/Dashboard.tsx | 9 +- .../appMenuSections/dashboard/styles.css | 41 ----- src/components/appMenuSections/home/Home.tsx | 7 +- .../appMenuSections/home/styles.css | 15 -- .../appMenuSections/miningPool/MiningPool.tsx | 26 ++- .../miningPool/MiningPoolStatus.tsx | 10 +- .../appMenuSections/miningPool/styles.css | 67 -------- .../appMenuSections/profile/MinerProfile.tsx | 1 - .../profile/MinerProfileDetails.tsx | 17 +- .../appMenuSections/profile/Profile.tsx | 21 +-- .../appMenuSections/profile/styles.css | 160 ------------------ .../appMenuSections/voting/Voting.tsx | 9 +- .../appMenuSections/voting/VotingJoiners.tsx | 25 ++- .../appMenuSections/voting/VotingNotifier.tsx | 26 +-- .../appMenuSections/voting/VotingRemovals.tsx | 25 ++- .../appMenuSections/voting/styles.css | 62 ------- .../dashboard/DashboardInfoContainer.tsx | 15 +- .../reusableComponents/dashboard/styles.css | 6 - ...ontainer.tsx => MiningStatusContainer.tsx} | 10 +- .../profile/AboutContainer.tsx | 12 +- .../profile/ActionsContainer.tsx | 32 ++-- .../profile/MoreInfoAboutContainerMiner.tsx | 11 +- .../MoreInfoAboutContainerPendingMiner.tsx | 4 +- .../MoreInfoAboutContainerWaitingMiner.tsx | 6 +- .../profileDetails/MinerDetailsContainer.tsx | 43 ++--- .../reusableComponents/profile/styles.css | 6 - .../voting/VotingNotifierInfoContainer.tsx | 10 +- .../voting/VotingStatusContainer.tsx | 6 +- .../reusableComponents/voting/styles.css | 14 -- src/css/common-page-alignments/styles.css | 6 - src/css/navbars/styles.css | 7 - 33 files changed, 144 insertions(+), 642 deletions(-) delete mode 100644 src/components/appMenuSections/dashboard/styles.css delete mode 100644 src/components/appMenuSections/profile/styles.css delete mode 100644 src/components/appMenuSections/voting/styles.css rename src/components/reusableComponents/miningPool/{MiningPoolStatusContainer.tsx => MiningStatusContainer.tsx} (85%) diff --git a/src/App.css b/src/App.css index 5827444..2f442b6 100644 --- a/src/App.css +++ b/src/App.css @@ -21,14 +21,3 @@ .App-link { color: #bc93f9; } - -@media screen and (max-width: 575px) { -} - -@media screen and (min-width: 576px) and (max-width: 991px) { -} -@media screen and (min-width: 992px) and (max-width: 1180px) { -} - -@media screen and (min-width: 1181px) { -} diff --git a/src/components/LeftPanel.tsx b/src/components/LeftPanel.tsx index 39c6c20..c28780d 100644 --- a/src/components/LeftPanel.tsx +++ b/src/components/LeftPanel.tsx @@ -105,11 +105,7 @@ const LeftPanel = ({ currentTheme }: ConnectWalletProps) => { - + @@ -132,11 +128,7 @@ const LeftPanel = ({ currentTheme }: ConnectWalletProps) => { - + @@ -152,11 +144,7 @@ const LeftPanel = ({ currentTheme }: ConnectWalletProps) => { - + @@ -170,11 +158,7 @@ const LeftPanel = ({ currentTheme }: ConnectWalletProps) => { - + {openMiningPoolMenu ? ( ) : ( @@ -198,11 +182,7 @@ const LeftPanel = ({ currentTheme }: ConnectWalletProps) => { - + { - + @@ -235,11 +211,7 @@ const LeftPanel = ({ currentTheme }: ConnectWalletProps) => { - + {openVotingMenu ? ( ) : ( @@ -263,11 +235,7 @@ const LeftPanel = ({ currentTheme }: ConnectWalletProps) => { - + { - + { - + { - + diff --git a/src/components/appMenuSections/dashboard/Dashboard.tsx b/src/components/appMenuSections/dashboard/Dashboard.tsx index 43b9ae0..7c29246 100644 --- a/src/components/appMenuSections/dashboard/Dashboard.tsx +++ b/src/components/appMenuSections/dashboard/Dashboard.tsx @@ -14,7 +14,6 @@ import { } from '../../../consts/readOnly'; import DashboardInfoContainer from '../../reusableComponents/dashboard/DashboardInfoContainer'; import colors from '../../../consts/colorPallete'; -import './styles.css'; const Dashboard = () => { const [currentNotifier, setCurrentNotifier] = useState(null); @@ -74,11 +73,9 @@ const Dashboard = () => { }, [stacksRewards]); return ( -
    -
    -

    Decentralized Mining Pool

    -

    Dashboard

    -
    +
    +

    Decentralized Mining Pool

    +

    Dashboard

    { return (
    -
    -

    Decentralized Mining Pool

    -

    Home

    -
    +

    Decentralized Mining Pool

    +

    Home

    In order to connect to the pool with your main Stacks account, follow these steps: diff --git a/src/components/appMenuSections/home/styles.css b/src/components/appMenuSections/home/styles.css index cc8e0e9..3aa5580 100644 --- a/src/components/appMenuSections/home/styles.css +++ b/src/components/appMenuSections/home/styles.css @@ -8,18 +8,3 @@ color: #ab4c2b !important; transition: color 0.3s ease-in, border 0.3s ease-in; } - -.home-page-main-container { - height: auto; - padding-inline: 15px; - display: flex; - flex-direction: column; - justify-content: start; -} - -@media screen and (max-width: 575px) { - .home-page-main-container .page-heading-title { - margin-bottom: 20px; - height: 100px; - } -} diff --git a/src/components/appMenuSections/miningPool/MiningPool.tsx b/src/components/appMenuSections/miningPool/MiningPool.tsx index eb2da71..5056913 100644 --- a/src/components/appMenuSections/miningPool/MiningPool.tsx +++ b/src/components/appMenuSections/miningPool/MiningPool.tsx @@ -65,20 +65,18 @@ const MiningPool = () => { }; return ( -
    -
    -

    Decentralized Mining Pool

    -

    Mining Pool - Miners

    -
    -
    - -
    +
    +

    Decentralized Mining Pool

    +

    Mining Pool - Miners

    +
    + +
    ); }; diff --git a/src/components/appMenuSections/miningPool/MiningPoolStatus.tsx b/src/components/appMenuSections/miningPool/MiningPoolStatus.tsx index 02afe25..1566f89 100644 --- a/src/components/appMenuSections/miningPool/MiningPoolStatus.tsx +++ b/src/components/appMenuSections/miningPool/MiningPoolStatus.tsx @@ -5,7 +5,7 @@ import { readOnlyGetNotifier, readOnlyGetNotifierElectionProcessData, } from '../../../consts/readOnly'; -import MiningPoolStatusContainer from '../../reusableComponents/miningPool/MiningPoolStatusContainer'; +import MiningPoolStatusContainer from '../../reusableComponents/miningPool/MiningStatusContainer'; import colors from '../../../consts/colorPallete'; import { useAppSelector } from '../../../redux/store'; import { selectCurrentTheme } from '../../../redux/reducers/user-state'; @@ -57,11 +57,9 @@ const MiningPoolStatus = () => { }, []); return ( -
    -
    -

    Decentralized Mining Pool

    -

    Mining Pool - Status

    -
    +
    +

    Decentralized Mining Pool

    +

    Mining Pool - Status

    { const [negativeVotesThreshold, setNegativeVotesThreshold] = useState(null); const [blocksLeftUntilJoin, setBlocksLeftUntilJoin] = useState(null); - const appCurrentTheme = useAppSelector(selectCurrentTheme); - useEffect(() => { if (status === 'Pending') { const fetchBlocksLeft = async () => { @@ -99,14 +93,9 @@ const Voting = () => { }, [minerData]); return ( -
    -
    -

    Decentralized Mining Pool

    -

    Miner Details

    -
    +
    +

    Decentralized Mining Pool

    +

    Miner Details

    diff --git a/src/components/appMenuSections/profile/Profile.tsx b/src/components/appMenuSections/profile/Profile.tsx index 5abf95c..5709be5 100644 --- a/src/components/appMenuSections/profile/Profile.tsx +++ b/src/components/appMenuSections/profile/Profile.tsx @@ -1,4 +1,3 @@ -import './styles.css'; import '../../../css/buttons/styles.css'; import '../../../css/helpers/styles.css'; import '../../../css/inputs/styles.css'; @@ -111,21 +110,15 @@ const Profile = () => { }, [currentBalance, totalWithdrawals]); return ( - //
    -
    -
    -

    Decentralized Mining Pool

    -

    Profile

    +
    +
    +
    +

    Decentralized Mining Pool

    +

    Profile

    +
    + {profileMapping[currentRole]}
    - {profileMapping[currentRole]}
    - //
    ); }; diff --git a/src/components/appMenuSections/profile/styles.css b/src/components/appMenuSections/profile/styles.css deleted file mode 100644 index 432f707..0000000 --- a/src/components/appMenuSections/profile/styles.css +++ /dev/null @@ -1,160 +0,0 @@ -/* .profile-page-main-container { - height: auto; -} */ - -.profile-page-main-container, -.single-miner-page-main-container { - /* background-color: red !important; */ - height: auto; - /* height: calc(100vh - 60px); */ - display: flex; - flex-direction: column; - justify-content: start; -} - -.profile-page-main-container .page-heading-title, -.single-miner-page-main-container .page-heading-title { - /* background-color: green !important; */ - height: 100px; -} - -.profile-page-main-container .principal-content-profile-page, -.single-miner-page-main-container .principal-content-profile-page { - /* background-color: yellow !important; */ - /* height: calc(100vh - 160px); - margin: 0; */ - width: 100%; -} - -@media screen and (max-width: 575px) { - /* the introduction container (the orange rectangle) */ - .profile-page-main-container .intro-container-profile-page, - .single-miner-page-main-container .intro-container-profile-page { - width: 90%; - } - - /* the container which hold the about and actions containers */ - .profile-page-main-container .main-info-container, - .single-miner-page-main-container .main-info-container-normal-user { - width: 89%; - flex-direction: column; - margin-inline: auto; - justify-content: start; - align-items: center; - margin-top: 30px; - } - - /* the about and actions containers */ - .profile-page-main-container .info-container-profile-page, - .single-miner-page-main-container .info-container-profile-page { - width: 100%; - margin-bottom: 30px; - } - - /* profile page intro lateral information */ - .profile-page-main-container .intro-sides { - font-size: 13px; - } - - /* profile page intro central information (current role) */ - .profile-page-main-container .intro-center-side, - .single-miner-page-main-container .intro-center-side { - font-size: 15px; - } - - .profile-page-main-container .intro-icon-container, - .single-miner-page-main-container .intro-icon-container { - width: 90px; - height: 90px; - } - - /* about and actions heading title */ - .profile-page-main-container .title-info-container, - .single-miner-page-main-container .title-info-container { - font-size: 14px; - } - - /* the about and actions containers */ - .profile-page-main-container .content-info-container, - .single-miner-page-main-container .content-info-container { - height: auto; - } - - /* the sections I'm displaying in the main container */ - .profile-page-main-container .content-sections-title-info-container span, - .single-miner-page-main-container .content-sections-title-info-container span { - font-size: 14px; - } - - /* the result of the section above */ - .result-of-content-section { - font-size: 10.6px; - } - - /* autoexchange button container */ - .profile-page-main-container .autoexchange-button-container { - width: 80%; - margin-inline: auto; - margin-top: 10px; - } - - /* autoexchange button from about container on profile page */ - .profile-page-main-container .autoexchange-button-container button { - font-size: 14px; - } - - /*every input container in the actions container on profile page */ - .profile-page-main-container - .principal-content-profile-page - .main-info-container - .actions-container-profile-page - .content-info-container - .input-line-actions-container { - /* background-color: blue !important; */ - display: flex; - flex-direction: column; - } - - /* the label and input container from actions container on profile page */ - .input-line-actions-container .label-and-input-container-actions-container { - width: 100% !important; - } - - /* the input line from actions container on profile page */ - .custom-input { - box-sizing: border-box; - } - - /* the input button container from actions container on profile page */ - .button-container-action-container { - width: 80%; - } - - /* the input button from actions container on profile page */ - .button-container-action-container button { - width: 100%; - font-size: 14px; - } - - /* leave pool button container from actions container */ - .leave-pool-button-action-container { - width: 65%; - margin-inline: auto; - } - - /* the leave pool button */ - .leave-pool-button-action-container button { - font-size: 14px !important; - } - - /* the alignment of the leave pool button */ - .leave-pool-button-action-container div.flex-right { - align-items: center; - margin-top: 20px; - } - - /* the alert container when clicking the leave pool button when you are the notifier */ - .alert-container-actions-container { - margin-top: 20px !important; - } -} diff --git a/src/components/appMenuSections/voting/Voting.tsx b/src/components/appMenuSections/voting/Voting.tsx index 3aa8998..5466a43 100644 --- a/src/components/appMenuSections/voting/Voting.tsx +++ b/src/components/appMenuSections/voting/Voting.tsx @@ -4,7 +4,6 @@ import VotingStatusContainer from '../../reusableComponents/voting/VotingStatusC import colors from '../../../consts/colorPallete'; import { useAppSelector } from '../../../redux/store'; import { selectCurrentTheme } from '../../../redux/reducers/user-state'; -import './styles.css'; const Voting = () => { const [notifierVoteStatus, setNotifierVoteStatus] = useState(null); @@ -36,11 +35,9 @@ const Voting = () => { }, []); return ( -
    -
    -

    Decentralized Mining Pool

    -

    Voting - Status

    -
    +
    +

    Decentralized Mining Pool

    +

    Voting - Status

    diff --git a/src/components/appMenuSections/voting/VotingJoiners.tsx b/src/components/appMenuSections/voting/VotingJoiners.tsx index 1f2dedf..b1266d1 100644 --- a/src/components/appMenuSections/voting/VotingJoiners.tsx +++ b/src/components/appMenuSections/voting/VotingJoiners.tsx @@ -76,20 +76,17 @@ const VotingJoiners = () => { }; return ( -
    -
    -

    Decentralized Mining Pool

    -

    Voting - Joiners

    -
    -
    - -
    +
    +

    Decentralized Mining Pool

    +

    Voting - Joiners

    +
    +
    ); }; diff --git a/src/components/appMenuSections/voting/VotingNotifier.tsx b/src/components/appMenuSections/voting/VotingNotifier.tsx index 31a5caf..ef5cbf9 100644 --- a/src/components/appMenuSections/voting/VotingNotifier.tsx +++ b/src/components/appMenuSections/voting/VotingNotifier.tsx @@ -148,22 +148,22 @@ const VotingNotifier = () => { }, [userAddress]); return ( -
    +

    Decentralized Mining Pool

    Voting - Notifier

    -
    -
    -
    - +
    +
    + +
    diff --git a/src/components/appMenuSections/voting/VotingRemovals.tsx b/src/components/appMenuSections/voting/VotingRemovals.tsx index e07b167..7f5c2ce 100644 --- a/src/components/appMenuSections/voting/VotingRemovals.tsx +++ b/src/components/appMenuSections/voting/VotingRemovals.tsx @@ -89,20 +89,17 @@ const VotingRemovals = () => { // color: colors[currentTheme].secondary, // }} // > -
    -
    -

    Decentralized Mining Pool

    -

    Voting - Removals

    -
    -
    - -
    +
    +

    Decentralized Mining Pool

    +

    Voting - Removals

    +
    +
    ); // diff --git a/src/components/appMenuSections/voting/styles.css b/src/components/appMenuSections/voting/styles.css deleted file mode 100644 index 015968d..0000000 --- a/src/components/appMenuSections/voting/styles.css +++ /dev/null @@ -1,62 +0,0 @@ -.voting-status-page-main-container, -.voting-notifier-page-main-container, -.voting-joiners-page-main-container, -.voting-removals-page-main-container { - /* background-color: red !important; */ - height: calc(100vh - 60px); - display: flex; - flex-direction: column; - justify-content: start; -} - -.voting-status-page-main-container .page-heading-title, -.voting-notifier-page-main-container .page-heading-title, -.voting-joiners-page-main-container .page-heading-title, -.voting-removals-page-main-container .page-heading-title { - /* background-color: green !important; */ - height: 100px; -} - -.voting-joiners-page-main-container .principal-content-profile-page, -.voting-removals-page-main-container .principal-content-profile-page { - /* background-color: yellow !important; */ - height: calc(100vh - 160px); - margin: 0; - width: 100%; - display: flex; - justify-content: center; -} - -/* the main page where I am displaying the table */ -.voting-status-page-main-container .principal-content-profile-page, -.voting-notifier-page-main-container .principal-content-profile-page { - /* background-color: yellow !important; */ - height: calc(100vh - 160px); - margin: 0 !important; - width: 100%; -} - -@media screen and (max-width: 575px) { - /* the container with the information */ - .voting-status-page-main-container .main-info-container-normal-user, - .voting-notifier-page-main-container .main-info-container-normal-user { - width: 90%; - } - - /* the sections I'm displaying in the main container */ - .voting-status-page-main-container .content-sections-title-info-container span, - .voting-notifier-page-main-container .content-sections-title-info-container span { - font-size: 14px; - } - - /* the result of the section above */ - .voting-status-page-main-container .title-info-container, - .voting-notifier-page-main-container .title-info-container { - font-size: 14px; - } - - /* the result of the section above */ - .result-of-content-section { - font-size: 10.6px; - } -} diff --git a/src/components/reusableComponents/dashboard/DashboardInfoContainer.tsx b/src/components/reusableComponents/dashboard/DashboardInfoContainer.tsx index b5e496f..ccda771 100644 --- a/src/components/reusableComponents/dashboard/DashboardInfoContainer.tsx +++ b/src/components/reusableComponents/dashboard/DashboardInfoContainer.tsx @@ -51,26 +51,19 @@ const DashboardInfoContainer = ({ >
    Current Notifier: -
    {notifier !== null ? notifier : ''}
    +
    {notifier !== null ? notifier : ''}
    Miners List: - {minersList.length !== 0 && - minersList.map((data: string, index: number) => ( -
    - {data} -
    - ))} + {minersList.length !== 0 && minersList.map((data: string, index: number) =>
    {data}
    )}
    Number of Blocks Won: - {blocksWon !== null ? blocksWon : ''} + {blocksWon !== null ? blocksWon : ''}
    Stacks Rewards: - - {stacksRewards !== null ? stacksRewards / 1000000 + ' STX' : ''} - + {stacksRewards !== null ? stacksRewards / 1000000 + ' STX' : ''}
    {currentRole === 'NormalUser' && ( diff --git a/src/components/reusableComponents/dashboard/styles.css b/src/components/reusableComponents/dashboard/styles.css index 5df8401..ddfcf6e 100644 --- a/src/components/reusableComponents/dashboard/styles.css +++ b/src/components/reusableComponents/dashboard/styles.css @@ -16,9 +16,3 @@ justify-content: center; align-items: center; } - -@media screen and (max-width: 575px) { - .result-of-content-section { - font-size: 10.6px !important; - } -} diff --git a/src/components/reusableComponents/miningPool/MiningPoolStatusContainer.tsx b/src/components/reusableComponents/miningPool/MiningStatusContainer.tsx similarity index 85% rename from src/components/reusableComponents/miningPool/MiningPoolStatusContainer.tsx rename to src/components/reusableComponents/miningPool/MiningStatusContainer.tsx index 75e63f5..6dd5ceb 100644 --- a/src/components/reusableComponents/miningPool/MiningPoolStatusContainer.tsx +++ b/src/components/reusableComponents/miningPool/MiningStatusContainer.tsx @@ -33,7 +33,7 @@ const MiningPoolStatusContainer = ({ notifier, currentBlock, blocksWon, votingSt
    -
    STATUS
    +
    INFO
    Current Notifier: -
    {notifier !== null ? notifier : ''}
    +
    {notifier !== null ? notifier : ''}
    Ongoing Block: - {currentBlock !== null ? currentBlock : ''} + {currentBlock !== null ? currentBlock : ''}
    Number of Blocks Won: - {blocksWon !== null ? blocksWon : ''} + {blocksWon !== null ? blocksWon : ''}
    Notifier Voting Status: - {votingStatus !== null ? votingStatus : ''} + {votingStatus !== null ? votingStatus : ''}
    {votingStatus === 'Ended by time!' && ( diff --git a/src/components/reusableComponents/profile/AboutContainer.tsx b/src/components/reusableComponents/profile/AboutContainer.tsx index d10c132..8f74bf0 100644 --- a/src/components/reusableComponents/profile/AboutContainer.tsx +++ b/src/components/reusableComponents/profile/AboutContainer.tsx @@ -55,7 +55,7 @@ const AboutContainer = ({
    -
    ABOUT
    +
    ABOUT
    @@ -121,8 +121,8 @@ const ActionsContainer = ({ currentNotifier, userAddress }: IActionsContainerPro className="content-info-container justify-content-between" >
    -
    -
    +
    +
    -
    +
    -
    -
    +
    +
    setBtcAddress(e.target.value)}>
    -
    +
    -
    -
    +
    +
    -
    +
    -
    -
    +
    +
    -
    +
    {leavePoolButtonClicked && showAlertLeavePool && ( -
    +
    { @@ -230,7 +230,7 @@ const ActionsContainer = ({ currentNotifier, userAddress }: IActionsContainerPro
    )} -
    +
    Address: -
    {address !== null ? address : ''}
    +
    {address !== null ? address : ''}
    - Wrong Address! + Wrong Address!
    @@ -97,18 +96,14 @@ const MinerDetailsContainer = ({ className="info-container-profile-page" >
    -
    ABOUT
    +
    ABOUT
    Address: -
    {address !== null ? address : ''}
    +
    {address !== null ? address : ''}
    Role: - + {currentNotifier === address ? 'Notifier' : currentRole === 'NormalUser' ? 'Normal User' : currentRole}
    @@ -129,43 +124,41 @@ const MinerDetailsContainer = ({
    Was Blacklisted: - - {wasBlacklisted !== null ? (wasBlacklisted === true ? 'Yes' : 'No') : ''} - + {wasBlacklisted !== null ? (wasBlacklisted === true ? 'Yes' : 'No') : ''}
    Warnings: - {warnings !== null ? warnings : ''} + {warnings !== null ? warnings : ''}
    Blocks as Miner: - {blocksAsMiner !== null ? blocksAsMiner : ''} + {blocksAsMiner !== null ? blocksAsMiner : ''}
    Balance: - {currentBalance !== null ? currentBalance : ''} + {currentBalance !== null ? currentBalance : ''}
    Total Withdrawn: - {totalWithdrawals !== null ? totalWithdrawals : ''} + {totalWithdrawals !== null ? totalWithdrawals : ''}
    )} {currentRole === 'Pending' && (
    Blocks Left Until Join: - {blocksUntilJoin !== null ? blocksUntilJoin : ''} + {blocksUntilJoin !== null ? blocksUntilJoin : ''}
    )} {currentRole === 'Waiting' && (
    Positive Votes: - {positiveVotes !== null ? positiveVotes : ''} + {positiveVotes !== null ? positiveVotes : ''}
    Negative Votes: - {negativeVotes !== null ? negativeVotes : ''} + {negativeVotes !== null ? negativeVotes : ''}
    )} @@ -176,15 +169,15 @@ const MinerDetailsContainer = ({ style={{ backgroundColor: colors[appCurrentTheme].accent2, color: colors[appCurrentTheme].secondary }} > - + Visit - + diff --git a/src/components/reusableComponents/profile/styles.css b/src/components/reusableComponents/profile/styles.css index c992d45..18fe92b 100644 --- a/src/components/reusableComponents/profile/styles.css +++ b/src/components/reusableComponents/profile/styles.css @@ -121,9 +121,3 @@ justify-content: center; align-items: center; } - -/* @media screen and (max-width: 575px) { - .profile-page-main-container .actions-container-profile-page { - background-color: blue !important; - } -} */ diff --git a/src/components/reusableComponents/voting/VotingNotifierInfoContainer.tsx b/src/components/reusableComponents/voting/VotingNotifierInfoContainer.tsx index 91f2996..5a96a14 100644 --- a/src/components/reusableComponents/voting/VotingNotifierInfoContainer.tsx +++ b/src/components/reusableComponents/voting/VotingNotifierInfoContainer.tsx @@ -38,7 +38,7 @@ const VotingNotifierInfoContainer = ({
    -
    NOTIFIER
    +
    INFO
    Who I voted for: - {votedFor !== null ? votedFor : ''} + {votedFor !== null ? votedFor : ''}
    Voting Blocks Remaining: - {blocksRemaining !== null ? blocksRemaining : ''} + {blocksRemaining !== null ? blocksRemaining : ''}
    Elected Notifier: {voteStatus && Voting is still open!} - {!voteStatus && ( -
    {electedNotifier !== null ? electedNotifier : ''}
    - )} + {!voteStatus &&
    {electedNotifier !== null ? electedNotifier : ''}
    }
    {blocksRemaining === 0 && ( diff --git a/src/components/reusableComponents/voting/VotingStatusContainer.tsx b/src/components/reusableComponents/voting/VotingStatusContainer.tsx index 5451399..f51445b 100644 --- a/src/components/reusableComponents/voting/VotingStatusContainer.tsx +++ b/src/components/reusableComponents/voting/VotingStatusContainer.tsx @@ -31,7 +31,7 @@ const VotingStatusContainer = ({ notifier, votingStatus }: VotingStatusContainer
    -
    STATUS
    +
    INFO
    Current Notifier: -
    {notifier !== null ? notifier : ''}
    +
    {notifier !== null ? notifier : ''}
    Notifier Voting Status: - {votingStatus !== null ? votingStatus : ''} + {votingStatus !== null ? votingStatus : ''}
    {votingStatus === 'Ended by time!' && ( diff --git a/src/components/reusableComponents/voting/styles.css b/src/components/reusableComponents/voting/styles.css index fa1de4a..0729d6f 100644 --- a/src/components/reusableComponents/voting/styles.css +++ b/src/components/reusableComponents/voting/styles.css @@ -15,17 +15,3 @@ justify-content: center; align-items: center; } - -@media screen and (max-width: 575px) { - /* the container with the Start vote button */ - .voting-status-page-main-container .footer-end-vote-button-container, - .voting-notifier-page-main-container .footer-end-vote-button-container { - margin-top: -15px; - margin-bottom: 10px; - } - - .voting-status-page-main-container .footer-end-vote-button-container button, - .voting-notifier-page-main-container .footer-end-vote-button-container button { - font-size: 14px; - } -} diff --git a/src/css/common-page-alignments/styles.css b/src/css/common-page-alignments/styles.css index 5c26e6b..4c5ecb5 100644 --- a/src/css/common-page-alignments/styles.css +++ b/src/css/common-page-alignments/styles.css @@ -43,9 +43,3 @@ .content-sections-title-info-container { padding-block: 3px; } - -@media screen and (max-width: 575px) { - .page-heading-title h2 { - font-size: 20px; - } -} diff --git a/src/css/navbars/styles.css b/src/css/navbars/styles.css index 4f596b9..7c3ec4e 100644 --- a/src/css/navbars/styles.css +++ b/src/css/navbars/styles.css @@ -37,7 +37,6 @@ .default-page-container { height: 100vh; - /* height: auto; */ /* width: 100vw; - Do not add this, because if there's vertical scroll, the page will also have horizontal scroll. without it, the page width will be automatically adjusted for the contents. You only need the height. */ /* background-color: #eeeeee; */ @@ -48,9 +47,3 @@ .liMenuMiningPool { display: block !important; } - -@media screen and (max-width: 575px) { - .navbar-sections-font-size span { - font-size: 14px !important; - } -} From 834370ca2b5b5a24e560491f31b52a3b0ea52f01 Mon Sep 17 00:00:00 2001 From: Andrei Alexandrescu Date: Fri, 16 Jun 2023 21:04:33 +0300 Subject: [PATCH 16/19] Revert "added local logo" This reverts commit ebd87cd5a95ce05400218d2f2deebf99373cf1f7. --- src/components/Authenticate.tsx | 5 +++-- src/logo.png | Bin 39949 -> 0 bytes src/redux/reducers/index.ts | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 src/logo.png diff --git a/src/components/Authenticate.tsx b/src/components/Authenticate.tsx index d273d2a..f790e86 100644 --- a/src/components/Authenticate.tsx +++ b/src/components/Authenticate.tsx @@ -3,7 +3,6 @@ import { Connect } from '@stacks/connect-react'; import { useAppSelector } from '../redux/store'; import { selectCurrentTheme, selectUserSessionState } from '../redux/reducers/user-state'; import colors from '../consts/colorPallete'; -import logo from './../logo.png'; const Authenticate = () => { const userSession = useAppSelector(selectUserSessionState); @@ -18,7 +17,9 @@ const Authenticate = () => { authOptions={{ appDetails: { name: 'Stacks Decentralized Pools', - icon: logo, + // todo: + // icon: window.location.origin + '/logo.png', + icon: 'https://res.cloudinary.com/dc0esmagg/image/upload/v1685115982/Degens/appLogo_qwhdc4.png', }, redirectTo: '/', onFinish: () => { diff --git a/src/logo.png b/src/logo.png deleted file mode 100644 index 1efa30559379cd536b9f0a4a85ce4732377e7c58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39949 zcmd>nc|6qn_rGNbWtnM0A{x|GjD0QpjHOA2+$%M*j*xvVWUFL`o0LqYE~bCJv}`YRdr+y zxI#H(tAD8L7G?hs`7bLFX(8^x-hrXs0seBximq+}VW9>%5SFtG5BKR+1H*!SIcs{j ztI&LDel-8k5EV6o8nUs;9s31NU+f<;rB%?c$`;o^xKQ=m3$3mH`cgl?>8nFR?Py>3 z_J<3H*l!J_so2p%0>XmbX>hsx7nwprN#U@aDaHJan@QoYuj$*peSO11LW5mH1A_l} zk#8=TxkY=*ra!*ti#kG80yllLOQN^mUtd4DOSp{Y9|Fe(XZTg|7Jq%~*XIO&V<-Qi z4)_9gpfN2_pjSX>K!{hspPcFR*Hhc}aM$+?2=;RYWqbR%Zlb9K`fozy3)Hs;!y41N)7PZwXsBz$8g3fe?#iBSny$*a9yAYSnx3kgs-~wpjpnZVWi^{%ZwN=O zzTd7I76!{{5!F?7_0%=>G)&EjrfO<>YMLgxT6(HP4K*!QU9;&0>}dWT-iV`{`MQRL z7~lef0|Gqt;oKp*ebt6O;!6g&FHiZ;@79L828V_PQi20Ky?x;-N-(JGKQEcm_1ZAE zDRo=f1-NOFL^0Rk{x0^4`CY%-=h%8`$Gk5h3q5Z)n_Q9_HA%U*JG=KN4 zGp|}h0W*VbsNv*b5BeaJN0>Ve{B$z9QXn+?dbQK@skoL*)Ft{k{D+ z$pwO8tyDq6r>{5M$oXk<4V7YGxY$Q_@4U%e%!Do1%TuE6T?yg zZA@<4(mMo#=+-H$|!mrfGl+aRu!lTZ6#;hpJIm*HhJ_xq2w;sk(b8 zL$*{`cGFf>Rn}7VgdD1^tqyMV<^BjS8Z0>(bJUd8we8g))TrsJt9^+MlaC1r@C=Or zD>K;y-ulIWW<&_J|BMimH@bU)VbA~?sNj&TPFlc}?0Z-|6Zb;)c61D zv2ddEWB^i`8JpmDBu81hZb6dETJK02I5QwF{Rqf2dg`i>Mv%V{EhC?L!KdJ&Gd>OT z_l6)s34qKN!m;bARVluJSJr^1g#1AiG&I}l>i}`p*_LxFCk4BLivBa=_ z-F}y4{!T;x%{G5`!*{C`i7?-<(BD1xzX>`+)88$osc+a1c>14<`MYnv80kM1bSgG~ zze;C3cv_+VBa#}ZX~|g|z|wM#270P;Wccy>C05g#&T;=4NdHu1y&0RFG6S{gkN+}K z8K{EHAg!Z;t`>;=0}@X^XDZlziTpF=`eF>aGj{l0X3G&*m!si-S=?{H1xN8;#MS%9 z;%Xt{B4+Wgs#j}<-oMEEJ3IM){c33a5150-3_X64_n(;q;&Idd_5;Q{L#XKh@h8fi zY17}QTXn?O{*f_!gNy$&I{b;e|Iiq~a{r;gGp+Q$Dfk}>tn*O z<$o>mv|+#xKNN<)*DhvW|9z1HGTf9|X#SwQGt=3$g1;W}e;S4648#9Efps_nBYEQo z)11zXbN?#u47tAKjTzT}pST>iqI%=tqC&oIkr9sgOln2AikPh5x*)<~dmG|>D(dB3{&3RW+MI~@ShmObj15>8|Fj`_=lr`HX`tk z#N(L)OiMiTi!Tyu|FMd{p2&X@88Hfw7DPruh2{^yOs#3{%&>}?qD_lD zEi%WB!8WEu{sD=ko~Fi^FTU6de6Fggr#*enQ|1DuucoP`133=S{fxe> zh5onwP|la%G+V!1&zUZo9y3CI_~xQX%lM`vYZ2_aHDpR?&c~B2ShXK)!J2VcZp8PH z00-y)MIZmXk2swc{xgZp_;^Z>-&o#X8S#ILtM`8;t*#ycMsPJjTYq0z-Ty0LVg6W8 zPgnQ5gq=3?-vxj_a=m{sC}?vutMgsLYX4tpR*NGn;xvEX41OfJ&2X9N+&1I$FQID2 z$KRRQ5R~>M9{dOnp7Hb_6ISB~9PCH9;eSO~^&fCB_5UlIRr>)4`w^)AuW0s1{OkWH zfdQWQ8f5<$aDXYy_j)D*)#kB1^;RL;?E@hhZ=_4 zA%k(oOb|%>0}}sEfax4Iv(Wuw6w}r^sr&EKG0;x`Ox~GH!ru~C19mwTJiZZ^^C{wT zKOVtm+={ZhZ1*a&fuWTM;}P zGMFX(IPCT2QQ5bJS8i{v-bg;T-*=f^JZ4^=3u#q4-V?*cEyiWlwsO0b!1lwuX(oGc zB*hJvXk?c9yga39?<41RW;K?vAFZibE$ox;Ts+uNrV^U<;d38vxQ(^-V0V6GvwrWd z7O@y~L2ckjwaXTtdsLgkm9rCPK)H}( zDN0-%c;BYVU>}=5ss2^YE@2t$n>b4?wFfS>Jor2B=d1Ii`B2x1dG2t2Hk21@F>8LL z@xkWsDinU_yfr<0@+Xd5&rl+@fhS=#6(lB%UjENESRk^&X9^9-ULfW0rXG@8R^j}+9pF`>5 zmkpB19z56uVzyM=T(7M`bb(hJrFLfym(VP3s#tftv*YcRk_87 zIxz2(3o5BNp=`;kHA1C#5b-etTkp6zMg%mw_|Pj%$vlVZV&dW=@+>0OrNFr{-(CK| zI%M6dGvnPA4(T^n7+ed^sL5G6+idT0yCAJwior_@GlJ>Q83k_$X&Tu{#l$!B98R=g zb}lQ-2%+0wB)3049<}Y`2T`6qoMq-hx@D1~uCzU~>SXcyn~HmPx2%}wpuv%o zK~8r=HN(eu6fwJ7%CHXACB!D&kQ1ZeWVPpFIlEt~&2A;Cy+jUdkK;to{pwZw&!g`k zOTe|{65<1NG-zch(^5a7*N&?E8e?VAcZ5+epODsg?qCYpUOn!#=CzBThqiVOg|9XQ zt3umvzfUG>6-#EgC>ggkPpt&PoSQoi*qMo-A%|6aHRRu7N{D?;88w}RG;+|z!(;`SuZzO=)R_1R3zfjSO=7&p~0mo2+$%77(c9Fb^ZReed;O5$ur*t9DmmSd4u6mnGU1Fk)pR1gXxI1 zhfr~!$2~)ljUf7Xg-G~%B(u&5QSO;>PeUs1nVN5T&Xdq!`NcYLHkJ#M-V$t$%==bGz2*d$IT(AI z#8}o*_OZ|6K3Yg5Wg=#AekWxhB(wa!PS(rR@NJatWpWA4M(F4_93`(z$O?)*|DyI; z7TII=LSMs++;e5J1t@L&X6$w1>$3wLwZRxiiG5k;-;;SiJRJ}0*d-wGa(s6S)2VS6 zks}3I@Wa^NPh)GXWL`-;`h`L4+xAJPy9;yhVN#^(DHP|tq~ntyc5x!WC4uo;|50_r zPQ5Xgj?>~C^)xo8yhhYhIg+UcQq#^ie(I?nUT0JkeyU0>q4%7xX9BD1jWU-!XsPN{ z?8@O$y9EnGsnnVvI=-^O=={q9-4FEP@q3Mz%ZN+OIffieAF6C9@)R+)H#p}>y^A>Z zLuPu|nW*lQA9;;FBUY#+*IG<`fS6#Xk?)X{z=@;fI$O&Y3Y{`mc!hbrky;Z%zeega zx)5O`GUR>4QNvc3)Mvoi8l;ksw?b`w7X+#zP9c7k(o64bR>brMXh(!k3?yy}{7K?L z#FE}5u?nU#5?i*QoQv59yUue7JPnJi@mRvdhX-98j`*qL+I>yw(+jHTVh|e+)fvfb z+vwQk_GZvM#-wCpDEXhNrlJ+VWAd1I>?*2_rd%5x~nu2Y{KY=&YWyU)L;y1p!Dtp zlUDeNDlFM0yDemN+>;#+Jm}HbvUeMb8J|v;tAz*D^^Vo7Bc!>bCfZM$=^hB)adg)w>`7AJQsesZ z6)Wxy$U=VL=VI6!6NBhf+>qgLCU+vgg|lo~swh4Q9y!dv`}kf)%UUYyQ}`Iac^u1d z7t2x3=Y`+_W(}T@wicDOjw&oCwOW<&Xev-Ft!&Wg)l1<$E*dtJbLAc<&xkVfPR8)a z8{5j7r3oi_5o`|#jI$jFl?qdM3pd>qSDahHBoww66S-Iw+mB*#Ls(|s=R@I#9h)TP zF3HXl&FRca9g8jz^YlWpinEs5Xm?oi&HZBQ1uTvxA3>s0Ov<=tFYg@T!y*R7Hg^%^ zplw!nacuV|ZqU&19EN9no}fmK6D|@ZYm7R06(1f8nLJ6VV%8k)6yK{#w$z?hjMiZ0 z3gl`5MyTNq9bBfSR)lhwtoG!{M-2M>Js~+&J6B+ z-|jw|cKNCRC0!4DGCog&5l!rK8p#~1FYO%|tL#cW@#3U($LF;!Ra|M0G9-2cO#C|D zTiPQl%cWY%&Lk^5M~;a*NzS1swvX$!BAjhzxdl1wgW7nN+0)heajcY_JRY3Z-D9@Y zrc~8|C2M;vRX-MQX;(daq$qZfP)%)YChyAXDyw~2y&@wrjP8bYV9!!Th21az zY1UyUTyteZdS)sW5pgN@X%{JgfD44w6{@tZtlXB9|`CaYRhUA?YPq-_byzv zQG3**InI_**??twiN$qxCHBm|b>RM;9qR9f7tnW(IEQZuHE!vYLnnDqacjPA;tvapy{331sh)82%EYfq{z`uUHk{Gz16gT94? zxt}ZUzdO23$hh&XKTpnny5Dp1_5Mx0&D~9pc`d>Rv?Om^^z~FWv}dNW4y=|=;UXP0 zshe0ae%MY_=v?R`P?`of)`M`AXr^{2gkiGM8+W5iwe zYC#b}H!-TYNI1#E2`7U+852>NmR8PvbR9Z+{kad%F8cJp-F|z`IZ$@Cr7#f?Lm}I7 zx9UL02RRQe0a0)(1kl+n=JGT4NGx^Oz4F(lj?a~8uSF!fRMDf)bv2_E^EB@CgF8pBKfPX8pKmt&9=*FIbKempt!|Q2zrLC&5K}bnX;ktl>S^?) z*t5NhuQ?ggSOYIH2Za)>E3a!ZEd>K}Ws;t~`j9V^O5-!fprapyL*0{1{Pjt3<^75y zqA~=i3-Z`&V+x7Ps(O0NPdDT2<86g18Mx6X_zS2q^kq1o9|O!Tkz9H-)X zqJE9(uW)ZXKcX~vcZK;&`Jq*EJ|?zlc<@g3IM!mo2P_JDv_3wMf04lxG!^%ncrYC0 zJUdW?U>jh4?Y^{}!J&ao69ZMe8M80?qKuZv9pYZZ=K+drP%1VjH>Ek)> zjp{r{uUkPhjg3%5g4>Opq*7mVP9!XC?MjdDJoAbDRJws6$W>>7j-D%4M->}We_mkm zaOcqzyJUacok|P}BN$)cO1v9X1$qSAUg649KX2l)uvQhCUs1$e zH`+}`f$h>w5!*eVE8}@>K&K#U8V!ivc4xguOKzRYGI1PaOQl-xFSD)d}SaQ2e{k>ug(j; z)h~gZJmiE8sOH?_^;L?Pq?X3T>PN`Op2gmAQK)NHqRB=2#A|rO9kQ%!SPF;jJm4sq z<6?a+@WSTT=nQh39knKmj+AnD7yRTeS(g4h=tIfN{R&Jtxr}9E1{b~MdkD@^OJs|XN-x+^`)Da~+12$?(IF39 zu%*R^)H9;)Rq{b9a-$G8Xaj0TVrPMtk>#93fBVZtglbPaf^B4FLogw&gu7e#)tjrf ze5CT>%qyD*&yL39S!4y-iU@q+rxwh~jbuh3I6M z0MHThq~1=r^1^SUQH)v?6R#yV{G|OCam%m>x>!Y#b!#}@XQHY8s#kEOEk^7t6=xoF z(ObzKIYn;#Io`A;qyWfd6s(QMX^0_kf80}>*-2`Q@oS%m2^g$_3I~ivk7?QS;EL<0 z=}Nh-7R+mY2w=cdAUOX_acKd$e!StMU`3slst_QRl-DmpmcyB{hR~zfxV(g%7ms_J z6@}`WPx0gS$6W5_y(6dxSU=qKw+7m3qo7wrNmZ7(LnD=y9+#K6s7(H86Os}qi#1RK zfTx97AD3t^<~JY54IOUvdAKf-AJpQ3XYm4k(zUR{hC6Be)79>ar%Ck}HM}kQtSR-6 zdf$~QmI;)vb-MX{-vgIpyf_BAew5mL5HEIcQA0}{4X`ff8B|6=O>ET5UVlr}?!^w$ zb5mQ&QfQVC+DJQC+DNjYw{|@-Mv&@9D7764X@RjCBG`)`uRF=!U7S!GM1Pjm{ma~r zO2pw`|K|JYea(V7T1Fr?XiPgH%Pr_)GPyoRd4Y|urQ3Msx}dx2Yt#v8-b&mE;#32W z8C)Z}j|(>!yK{HTNLRokK8EL2uZ~?pp9KtoLeZ#5-(mlJ!IFDhSNyu#x&FYba|eYG ze*;8Rju0$Rg{;6jELe0V%->gkzU=Os4$|($-pAdmZ>_sGUe+5eiEJbR$Kh?9$7zZYXOQ$v6U9maMtlqlOx4 ztrmUmCboQLS0d1mB;E)ZUSvN_=F6_Kr;hcfEs+>~2lYn%#@|kI5GSJOZB*R{Jm~9+ ztI$cusJQn6G3{eD$Ed8mx*{JhWy)Wxn}gl@E}*>&)6lq(3;R(58@9CYodmP9SLDTg z4XcyRMl~GM3!#f|L~VRt@@wbM*LS+VZ1(3(TLooFbtbv(XR2Q~a^{&!WL>$_M45O# zIdv1`caWkvOvHwui-Jjq8qN8R&f2|?igQLXNW)$fn5!|qRXNiZp*f652q`zpsdm$; ztQ>EAWWtq+O-tS_M%=y&vTn$N1(F5^Yt20PartEI+$1=SZLaxm&c&l}L!PQ>9K&7h zk{8vqVNGGOfcX*tV1s8-SYa`23JH}B zaL!w0wk7kYaL|9~-1SQMLwu}jLZmTFMeP;#{8~kp%2EmOBHCsT)xG$__EO>lD6fQ2 zB&a-3mJzj)I0tOf>m18%CLj4oIk=&nLAdUwX6t>MBI7I#wzggLHRl6gOOHirNZ=_L z6snWh^Na&7n$Ni8A>dP}ehIAM&)YkgQCX+BNfkMGf0WTOF*Oc}LySHD>2~+gUje1} z3K6vspIBhzP#K~n=@_5%1~b-G_{xe4@(z^8lk^K@v^PkE@Ce<|zA(U`MB5O{m((J?_I3*wV_T<6bo z$c%$*VI_f7sl>k11gQqaW!A4AK5^AlT_5v6s2u~M9iK-@SH@ad^gUd!T@Y7=Qdnxy z2lQobcG9!vxAWv>(Ghf0VqZ_h=i{yGVuHfvFufLuJ$1sJ;28cSA-5^^d?6vtXVou! z=JFvf3a>E-Gisi_YMBdQA%UYKErj_7Vr(EXvykEuK`*=_4n(7NLhmKt_Q#40KH~A) zguyAw4j81~2hDePk?Ws_kDS!1%dV` zkqdoW5uDhsvZ1zV^eG>E5Q+=25c;!y`(l|@hugY>)pt%QuIcL^rcth90#?Dp6ZzYnL{J;#+Hb2Oc%wEg~P=jyp2a zI-6noN#|7=ajS$wZ2nn~40jIaDP3U$q=F2>S$%llce26uD&8K|%%5loC5wUx$#o=C z@ij(ooS`_>9@HXSR!HAdxZJ5t-xN>s3OHkM~0vf?Qw&UpNr-<#P zy9I?wK=G=pDe31NlmBX6cmyCCx>;H>xvh-txJ53~&$Zyy8$dci^!!`3jiW1$yr`93 zbLG};#r(y&Oy7w%WAHL0%XWPVQ9}R(kg8yRlV}aB3HYWCOo;{5@Ad&Y!TKvDcQRTe z#INcHpIrdxn3&_GiW^!i*IGi1!3|NFNi3r$AIhO>7SxV5uG6{sPVwr(i8Z>F0x|D6 zOe=)NB}oqN%jpuHTB8 zg%vbQOBIN@1LYwNXppv}Y)1jSPxq}d!xp}zLX$KZ5Yl!5604!0_o-~i@=>gD<1pUf ze!#5G*<{Ay-u)6;IeMy*y3&%$D@fAhv9LIvDDA5}SVbPvcJT@ap0qvW8*c){c^T0s z1&LP0K#WGs!g0XtBn#R9c;E8V0_DQettPfqW?sf}&>W93LSJr*&%*=36ileQMpxe? zcdmr!hwqz38k4C=6(lZlVl@uhY>hQyJ{FZ2Yi>Rj(WrH+C`np&W|tz zgXiV(l1G3ug7_-kG7C#eWUWJwN>(;-q9p+xy(;$nXilg0^&_9I#pY%UprZjBs3*kk z;=)LHIDN8cXz+?*O9z8#@JtIs)(=t>Kt%;#Zu5(oxWFKQJPxKmxHv#m6k*a14(g25KMG^G zZITi@Xq>R1f*mrkP!AvcB|xUPcHK9Ic=CpNlR~lgu0E%64}6k#{!^4;%=?%}J4EpP z{G>72iU3}8t>WI~mO%}%lLJR?uP{(P($rC*xc8Tq4#)=lI53MP2`c>N-R74|h$lbk zB==xGFDoPnztRj}JV)|k4xSivvCDv$!DCh@N9t3g;$+dICfjk&4@_+@wEC2i)9p~~ zjR^A#IL6K;G^k1B8ZjdfWpo>9m{heL-^niz$RQgKqNlcWJZN4$n>dGA6#==14k8K? zLpd!sUe~1(4r?=zE(XxuIoWw+)MST1h>v*Ii4|FPRzuW09w$pkJ6*i~WF zlVun5QA_Sz84)xVhl{{>Jr;<;)Cwfnap3` zY#ZYtq`g_pO~DEu8 zWmqvGi$#Wq+RQ)kp39{^5qDdl{LOG+Yb)l#4H0}7id4HaY;I|mKzYnlCGjaveQnUi zU>3EwM#cZLve+I|=PYMK;4LA?k%9YPj`S%+03&60UMscbc@AMFcOzQOebg}_DjR5A z0uwhuOx)(6ra}c0-a*+hsV$keynmj{ebsUn$*!^?e;XI$Mvm7bMFy0K!{_D$FO}M| z;g((4HDRYHVU_2@-eR^3_Lxg-pt3?oGIL*IZbMWrCR$s?*L}WtRDp@F6c{%yCZa5Y zaeFpg2ogzw7{W+i%`I=7wgfNqv{`8fc|dfQvsvLQx+B$3y84r#&N2QX3IDOM`xLTs zW}-aSArrx%2yZx1lYhyJDTfVHDfBEME*#FR zPIwKc*QJ{wC1+QD?~UKa3&JkP9ynMqJjT6`2RW__d`aY*u zdM>#2=$NXcZBCU1Qia)Uq^{&Fx@WA$w3rB?0s-1g%dHW);NrXRS1r$+dAn}!1+x8> z#E5r>;?hX_2dwk3)zPttcW9oYAt5f{OVoN>E zTYI09z8=9(2=P+cpwG-3kJ!Xj1Yb9YJw3J6TAvT!Kbv%pkhb-y5D<|Z)3cC>as9#hP}Knn_4N8XI`Pme z;bypz`k)``HmGxcx8m92^${K8ZpLUwXDLU|%koE^^E3kKJ4Q0$VfncyyGlk-SM!8P zb;Fs8ZJd<(JUaa*hi@@BXD7`t6?b3?4fYQx8mH;thuODc3*TNLXMokRKb(0qD#wN0 z$?1DRm-nNYaoP&W%A}TC5p;kVP?<+AIUW<8wP!=ie0XIZsoez^XXtdW~NXPvg;2gpHNYj;=yj+#RAR{%W2(_gTnj? zb)32l_yM2)K_$*?Ii(Y;-gr*n+u^+Tdg5P|7&5hGWCC z_VXTZ!hVqZ7+VR^{oZlbsYO(Yqs7W;A{N02Ev_Gs%(a zM8+_Je`)Dv6zp$YJyFXtQ+EmVtU*;P29L06uWdQCD8VLz{>*);AW2Jdr&6JRYVCaE zv;e%21J%h2!#HGoBLq2Xs0+Z`eDUhrR)mgRiyYfsur)pnKo|sY1GI7rEdWh?{KEX zQ-@T;L)utjBbQ=IgtK-*%xkB*Y<$hQr+%j@m`1s{>>;txX^= zV^A)+_7@B;nPt8YdKf_BKiAX{v%RSf&a{?#IAl9FLoelob9!VW*!!i`Am9 zd)qNCl0DOM+aj4|8&`zunW(N$JB`FA=$ru{>!z}fD_qS>KsvZfONh|m20HRQWT~P- zfdpG&(gSpKQxFOtyn_{M_~`>poFFw-Q&biY@y4rNotPj-!B4NsEw%{y_3RBXM;f7kJw6rlG7jfh zUSd10Ldt(+9D*|va6Gm{vC#-xd-ltEv0DkYQAz=lsiNjtSwYF8#6B~XBd?z~-$fBG zSq+b0AFt@F?>Z7Lk!^-D5=WvKB=O@xS^6V!cq|wtKQ?R!4jL#wQJsu-3z8~0z54!m z+%{`_tHdjt+531TxA|{TysgN>W}WE4yhc|PHC(a;K${YbFZ4%J=$#z)K|iJBDvE+5 zwaL)Ac4N5&_=x*^SkwP zthd)4kd$1MkY$O=YSo=>W}B-;zL#7^%ysqmO5j9Ig^^4WH!hJ=cfQ7iCAGlB479I9 zoLKGJXHo^svt%~r8ax7kc(JA|LUvx%k*v4g-4&@V)tnKAbYRr>oVpD(}DnyTtN6?4R(LgBm2O^E@3oCBtvJf3osUw3f5)u#TV-Heq22$#QA9{Dr5zPgpU*}7wcKT}4;sgqjGsZC4nGM=~OOn#I zBH>I_ZHG#;1`3Zev3(*?t||7O%DOB+1RaZdCsrXky77qJYW$t+$jL2+ZGsh-b$oh7 zb91?{!6>alk%2+f@qmKOFP5UT%^}q)N2$~Un|eIKGYH>xe%zDF#EWC0uFQ1HJDc4Z zammPw-7^1h`e7jI5RMrahVJf{=c)Em#-E#qs^&(YK!$(loI3R`xZ-9(VG;m=@#piTG10s4pNn03JB*Idbp z!N%shm5TXA`{P)vZgo`P*C1?K8)v*JwbiE~s#yhPE~-*;ze2H9!hx3|odX2AqZgjV zZ5z$BT$Ye^oD7|EhhJ>+Dfa6RW0&F~P(X@2WK=eC^_|-u;O$S*&SSMMwH8xQ&3^M8 zq!`a!6z0PXqS;kEB$%~xj@6ilO){yAUvOcM1Prh|Z&q5wv}Cd853X6thi94hnHk$Q zB78X+>mVwHm5JJt`lx3wRhul%Sg7kCreFqDKsHR!oRN|>MsqVv0Zcow7GqzFRSZ6D zJ~dVvyLDs<&Ma+Lt4{_wv?s#N3?1=wH702_1-l}_$P4N@G!>_Tl-MB|L5=6P%t650 ziP)y=JC_g6;bs6)(bTL22*fOHvNowz3|1+GxO5gb1ih8T_+^40wfiaQ8)MI#>|m|3 z=#V~Y5>7AV7)*cr>Y%Zef&K?2ky9?XIg8>E$BNY-zI^Vn=f30?K#CCOrH3Bq=y?oC z5H(h#CmwBEA}MwovJfZTYI5efpf_|SE2k9>d~Z0tK7t-h!9G+xN9yY}{H;LJUS^w@ zXttLKLfZh&*bk*hj-tf=*wj``ko-{of-vJWK8C4zU#7%^JxIX?1wFL04?_OR%H<}# z#0{N|&r8GsKoi@^68_nkKCeR714zxIC*%2WLP!+%pIGCC-<#A@(5`5VUce}|==+7Q zCd6o80*h_X7dgE7eGBF`Clc0-?Mh^A>R@N#sZbma-8iNAzy#f(C?tqf!^Z;(7lz`c zLVu!QkFpOw@bGbR7WvhA@u%|5s{KvPrxY|-@nh#_cgm(3vhA%~u?UcEK70d;x-3$k zu$+VxoH9}^g8u_m4(i=nzNr?ihF=AYwm}>#{!t$5IGz}*kx9nRW&rP=No94t1njzg zBJ`~Uxslkbk-+YAkzF?au{0pr#I_Hp5v0O$o)}r)XtZ!_C^EeDR~Pgsv?|^d6&W2X z7I^5yT1UZ_vFB&QfK;_&KlJv?&B^i5*@Ecnw~hzvn2q?USH;>ncp;ez(S~Lv5->BF zuLdJiTW)m)K&`t9#Wp}&n$+FW2?z|QM_cqY#?GRk@T*{FArGY_8JEQ!Hd9$p1&ff% z<%e>zI|D>6SMU(SnfO}*F&~<-IhMI+Qkzc5kejR~65r3heMMA)X{m+Yk;sxnM;oJ$ z?Zk(Vu|H0T)mG?JOU(mdFU1F5%SPQEqx4aFz` z0$zlZv4X?s!!k*h1Y7sUCjc8z&9tX;C@3HyJz=x^9gJ3l#+>}>BRdcv{fT=yA1U_A zg!$O!+c;$Wk{|oJ2lG>E^Kt>wQc_>_BVA-Z3$%Kec7Ay4Qv7-*oyAyeLJGJcwQMg6ZYYr6A5PD&9lH`GViC`}kB>T_ft zI!VBP=LVDCTo3L)d&+GV&H!6?GxMc7M%wBeS)so9E`Opc!djh?%BptYBK?ft+Zo_l z`eDy@mQGjBP4_8&B_E6mI}7PMN2H25}(y{%PLFIC=1 z#U)f*1}dygX(<|9!be&z;p|oha0E<=7YPurIFSxAyRj`btS8`SuWY%+*qtdYo1K#3 zysfzA-W&8PnTOgHOuuWjyvaSEObmI*__bTANwL2fk+q+q@UZ!=Hq7y=V{eoC8uxu> zI}IwU;e{R}biNg-kDKU?@Y(80GFE1`r;s3SA55J+qE3}yCKX95bYu442>PvjacVWx z@OcW)rH^4M0(!gq_^j|ify0a?FGFeA=+?${hvKT*5QOAzYRmqp1Gc_vQR9wBkoXp| zZNwOdaYL<0a~K)1hA~8?%%H=0-?yr0~HSC8(^WD!)Q#ZjHmjunrbF zW8A4Q(Y%w2!${uqlb=Om-X>&2t~ExZ5tTMh$Oww7@uSn%18G=i^=f9SV)jNnp7GPvfUL~yjUg$>Y%26efC?^mVs(9% zmv|?!owWy?G79WN_qGcYlw6Q0u>(rGU`}Z#j{V8_*r6>OH6r;4XjdG?T1qDw zR88!oAuJp+bOgkjFPI;q;EUWi1uP6JH8vUw;aO(30?fR<(%36{dC0V^&OFfLaV}E+ z+~F{H=J}O6#TSW%l?@~Xd{+@NnlLp@t%3|8!-%&U(l)W-R)QFy#*P+W3}?g%04s@o z^D7%_l1;qu{d1>=8l@U{Cb9y4X})flQ?SHelASIi4T+z*L(p7=p?z}6N!*dvE-Ys# zHp(P0h7&>HSAP_HEP4xmFTJIxh~uz|v|jp4l>}$0%$hr}M^ax{WrJE=)f|#p+lt!@ zZmM_&{Tj#_G;VjDE5*3qd`hkq$ngcKvQYG;w02PtOmVl3#X%P`6#>q3ApNQgUa1Up z8?ZsKUpx-GZllOY9Gyb==eXn{9)G%|Vkov`mR6Svzya6JKXpH2<_Ic z;{ddYDE78f29dABjnSN$HS+ZczMTmy7Y?<*)Wr67g29U;eFzTZn_Sm6ClBVJIQ{>{ zP}+9iZa4#77U)S(aaQ<9m-qW&ws2&Ki*X7;vZbFt#Ina1*m4?3z%a5dP8^^Rw;PNf z3H*3oXU$>qyThOFUfOj9T)Acfz@$*jM~C z@j^|_kU-|=AYk>~VZ&tth}l1($EzV>$Q`6F}CtUkILkr{k`yUdP|<5Iap{->Q6$9Wd?d##$=TQ zQ5XTQgjl~`h{<7wJ~eYg_P5MuA2gJ5R?gbyGzSSfll;@^;?kJ$+`62qU1X0q-^!uO zTl>>evXk~y%`g2lG`4nDWj4M6$aJr(IbKhfcGt|EmlRz_Z1`}CpoHFmyoT_u{q0$c zUa{91zB!$-GGqJC8N8=BAw$wo#sK_T6|2!eoXg7qPzgQ3#d1FW`!JHwg!kvEOWB}+ zBH8#pJ9WTdw1nscQ>lI^nLuJRD zaGogV*o5wzn|=bQXjBeu6_O88ZH&i;443os9(FS~70cl24v{Qwj@Vj&9q zX5-Mnv2i1j+IZVIP;SC9J|LrB*CY6{p%#kh&nYcyp@<&$KeTcmKXz*%JwGc}4uj;B zBILD(T!`<^wa4Nt`G8^>ZI6gFh?z$rCIXa>Zan8WHgw{#k^H9@L-O92nOdH1ao64(5n9puLXWL{=$#f_lxp4xeU z)>@@gA0Q-OQWs|b5jM+stfn^(r;WW$?E6Wi#wGxgao|{uB*7LSTQsxk3j1ILGw=N@ zw*&x+VElMWx-m+Ya)B};yOQF&@~mri4n7ya-KM<=MiIs1OzUEeqMc46Rq>5qS_-H; zf1_Zbb$p)f*iT3^3%Uqnz%QDuSJ*7!Azc=TiE7-iBioBVMcY59wEI{Y@d9Z5K=DLh zi>WOi@uRM;a)o<)rR=As+v=<3BvL%r#vXf?$Fi>FbSjhp_LS&ZElS$-S{b{SrVn?)Zt>58$v_x&9Fet{SP{CaJ6H1xqb#2s`XVuINN z*txAJG@BGOj705Kz$ME0Kstx!;I$W0GAS^$^y$(AN}G5^?~CTUnrYmO!e3q<-`710 zgXk2-kG$p7P17jg{L0x?^B5~F`hGI*m(`B8emgey=0(v`k-f#}QRwP=)OL^76^cqZ zu|Cn!52xRl%a^$*h%-xIVR3o>S7 z3X0cDF;)|xf@GH{XD6XZD$9S`SDa3+=P$^nv?(U^{!DF(ptLPQh7d9`$k6EmHgv%` zqhbdU#=_>}{XGbNT3YSNr=e!X2aj~yK4fg{0h1+fYIs~UXOqGY)TOTdz`W~{o3BE? z$aaKc310Wfw&Y>}x?MK3Cy@ms=VLHdhX9w3M}#YW9Vhc%4RkXOLF4Cw*f~&tia`0o z(!2Ee&4jd*9qB0S(~KHZ<2oftnGZ1AF&r`P2xHgCbwxYVG-j*MurObCk^oWz=J#uII`1pnqS4w58oz zAY_c5#SkfHU64^K2W4&CY*hBXI+&vQQRMaJW5q-#`5`?sr1RJt;2HlL6tiZw&=T(| z)Lw|aJ)koiCN#FCX2^*JIpLa)6@6@5ucpd6(x{0*<;lU%>IOyDbBcXxR&nG4BxEdt z!yY7I7(S{{;`T})O@m%G+mS)A&2?@py(AF_g=iCLH6~?Y<8NBfONF+LKMwl-p2d=f zLXthQy?iT!D&yZ6C1jZeg$dwG+2b)RuCW^XUNof*Xg>44{lBS=^@eE2SiQY6{=WW< zPt$DZ zMl!lz%{a{g-@k!+I)U{}d6?B1HEy%E_d!uMZUvgZKrQ4`=6d0|SiDdMNu6?@UqN1*8(9ET9(zA(7dYiVkmYjh~G2;MME zZPAJ4SCv{V*Z&&RAZnyE$2|3sOL|o7`5iEf*6MSJTp#T}RPUpw$|@xugrN!`v2a8B zOlXDeKwjxnzbGz=#KJp+FNU6mH5!Q=>Xg7g3qJiZ0p>^Et(z^3a9#*`+PG3l0Kz1= z*fY%+Zj=k7$J*Dyn}^Uigd%ry?D;21rw*C`aX4-~3#UMW84s*2`-MZV2#^fi zDOeSm7@^QKJuCpKg4BzwVr6K*b|HN<;8MGhktemiKcDuqSW_KuyBi%1Y3$?Bjh!Tz z;~}7<@07sHDM*RGZ0vePH<>=}35n`OdxwsJvM6aGu+wo>7uY$iwCgqr+QBGX0+|S1 z$EzSj;VD_|G9pZ|AcGFdh1&7kv68V}FwtcCpw-eO-IIF(u}G7o9tG#zteGk8Xv8??mnC!n|>P z`z*#;uU|Jw!JU~@=KIKy|5!z5|KSbLp)}eFvu$FP!St?eDTia$wG~VL%6)V^xut_c z9CQPK-x|l#mi+uSz#Lv%g5m~-zBbAqD8@RB1kyuC{C3wCgsEj4rH7PYINuX3Q`mVkOn&tuXucZsP{ePei$g>SVljL z*L7pGCS>;W9HpHY*cZMSJ-Q0Is2F5^iw7IVf%EI3oi7*ruDzC?TG`thlQs74RtU=3 z$V3Dk4|B?VNdg>O4~754z(!U4os|hHoX+UE;`OuIfz*OPv5Tg$pUmmLU{Q=~5CQhZ zjGYgpV097#cyPtUw75J$V{U-%a`{Ci@+isE3tWrEx1%dMl#r2OXBen^wdw7EnW;mlNatYNCgjet2WqkeP z8>Dk>9^!Dy{H<$G7WUN$D${B0j1RFj`eY5cS14XkoI;)-L5TZpb1SXr9rbo2?@J27|IkXg=BsjG-%#!q)Cbt zqKSkk@iuERrBW#+iV8`kIXexi?_4*}dwhSwcO0J|{KUO?>t5?x*L6+>HbZSMAPTB3 zIeoI~j)vufNXkRp}DjZ0vYp+jK ze2$THct?`5Gd-c;_|EeAqL*KWxlFICO-6f`_OB&k3BP<|u3;uCgHJ;P zQPkD^I7~dJQ>U~<*)8C)g@&a_sM$J|bXC#2%wSHV=)olo3&7A-DS)y^^n_kiORfci z2@p^KSvhkwZ!rFp!{t|3PV5GF!-!;SE0iUur^h7FHGm;&*KAn0Njzl}#$lsCO9cy zq$istBm}`jr37J*b$E9K}n%zZVY0zOr6I4@kmhQ~07XNXn zR!=U8hdQ^9+~p=#Hocs<0xl33xy7Pe@l*&;(UG`27NUz;{gn#$lI|>G#_5U9@E|hF zF9b5c4+2@Dsw~c4e>1@?o3quwD55ah%gmo0```qrl{Wkhk=OdH4rXjt+J`M%AR;tRbM znzo)x=)3P_i2n1jHVc(`=K>Q}0!=8c)ijnQXN=l3^u+O}S?aHWhFS&gL(en?vyxtw zJ%W(}6g9+U00WnI=KgA{PP7-*28H(+$WP0``h0z3i*g;76S7XqwhoS$_oq$U68X+2 zTjJkDt%{v!d2emqzJ%q(x*ad_&$!984_11lEF6WzfW{0{*->E`VQF^;m@g}QhD3cbgEIK697 z;1ms62ZMIekYtLa#rDNZ#U}0lmUp|=LTHw{vkD1TsbP8N4=4@!-Jl<>)I`7tCH}VQ zDgnwbK|C|Nz3FPc9DjXqv!PJq{W#VY z4$>L=EF7G_ln^X@=Cn{1q!^UqosSd69~wbQ*zsIFy>EGpV=TE;6=a9dpHS9L@*$*% zxrcNYi%5hQ6%Riv6bZC&$=ad}p4pEUB^-CVo(r z$rmlUu{Uf0UltE?Ut}il*2-58Hm`4)K31mj*zSjwhgvPmdLqlqPQOy+Z?cBO(OjcT zr8Q@Djwu#Gfl_U3%ItpnGjAl%yxmFdtxL#$E};P5I&xt{9CV22qVDB*)n*Ua|12zT zzMs)Lo8cJy%EPjFU(ePX@Dk zxgMH!kSJM6$_fk*F7!1GL<0e(ey8D8%RD;Ja1O`Zwy^Z_I|c6 zp$oz!P@XiH={EA=^N!V4t1>7P9aP_{tN?Td!_xuo&z65%!N(cDTo>qL-3Acw4H7}UCWZi91oF}$pyt@4c2(+y>z0oZT zf9f9FqF9uK?QKUT&1jdz&kAa?XDm+F$og(2BoMy2dWA8H3a&V9_&Ffj2u(Y{39)$; zT@aQAG6}@x-{oIWn#z1;p6#ciFXnzSBuJ`%5u9~>lI5+d#!PgT&6cndEL@h&4L-Vh z&q`xPtO+LFn$Si|zJcx9Yojow;F*b5Jo&q&^5^={5es42fHoO^lm z#!MZ10DF*esHw*i`5w?1GsEXHGS|#e&?PKH!8{rb9APg%`Hv+7m9RIYK;LNKhPAw2 zJ|mis4J`RFnY{2V4?xa5BUw=lqD1yd%Tg$)mc~MQev!+}HAEOZj*q~Sz|N_O^zID5 zMf24^5f6Zz=#KGAcXMJCV@>2(8LJ~D=U;el|FdVQ*qCR?@3~fRW^wF8lVf%(2D}6G z|GQIGj%@K-5u;I~XFRST+-x*D^=wJ$;T-8NGpGZBs~!j9WWeM4z*nmbju5QQ)G%se zfDRl%URqO_`57`3u=Z)-(xhHll=o2Zu+jMy$ek&DvrbE5Ujd`)z>leC2P|t&e;sy) z+`$(_;vX#^#HQ!l%II?G=F!JomXR+Hzeuy$Fav;;6K8TqO&!NgA2kwG1{bRzY|RAG zPL_f~n#1ye`APfjTKC60CU!}Phexb_vf+mZqRU(%kwm{lxGlMgN4sZ}43Mo6ZCs(k zkX!|yEoIE7A{z-$*sYXkqn|-?yj9=w{V2|ju6fHwV7=9Sxn0mr-;@{W?>%*&=QC9 z7;@u0Mi-Q%wDo)?hd=RneYn56FB5QgZN(B{DjuXx$aj!vU6hUK)17B0V3qxvRa2_a zEm1msn1eb?x!5c01@k%c&Q3FXNGc&iH7`|wS&xqbs*-@Lzi?m4BXZSSEmm53 z)0b6x<8R{S{v0w0M=3u9#7B#{h!cJtS!^Lv``zdXbfc4mNzZgJh;<78)F@yQ;at8gzVU_sGz0)`^{cCLCfm%^e~cVhLza=L2a&B9WAOLEXIy3z!Gw6+o`{> zk;CxXFtwHIrnsJj?eij$zINdiRA3bKVqPs{1vD4=l`l|Y*NFop@~{kOdlhl3#adtk z)RM4MtHq_z*AE-s$_?a$r)oDmBxZuBA+_O<`&q7F+7bfDudC5&9f%5X@g{=}1@Ed&1C7l6; zd950?pZUx$t=!o`#zH^@ai6xRVV^1R7zN~hw@u+CU8*fHIvh>mH@;k?pTFo76@KuV zM9js8Jd0cqjF&$&5z`S{XMEAOf99b!0vH`9g#x{IhJU;q|BgN2T(W0G#D#Ta6z|^n z=kd$LOxe0`?ev0rm<{92nlfJ6V>LsnD`P|_rHLc*T|C2SlN8R@qR+z1a;%YzQT4QT z>hQl5JnHDguh}>3uJtTQ;)L@}8CAs4@+mI0IUdDn{PRk6F+ecy`1gI2-{LTM)gRz& zwt2J<`RYw>OP;v5PN^9jQxSA`52<+hJ$I04zK|sJV+Jb71Fnz{x@jChkegl-AbC_($KL&lW9hEMTm! zm@IN_AG~ky9l0)#3mEVzEeK0Hc{)jBvI@$f-kRe(<~h4*;f@t9-I7=Qp>(+Nk=`0_ zrZSDNtTKK**$#@fu4C)!ti^prC$$aTM`6l+a|a}^FiqS!+j)(% z;-$R|z4oP`l#JjX)~aut`Dp6Cn<0b3NSEWw6wHzS6yLCG^8@``2|uAs`x7Y;YVOwd z@zH&Q8s4De8hd)+g(ROqC!;y0=4T2=H;ZO84eqMd^!7e=R-Ej?z$wR^jSG6>YQEKt z3;oD7pJ(;MFndMqnp4MpVh$7>;*PAN@U#9kIjbsbGPvbLmIn2qB4c)K?CN3}p1n>)m4`Py_e(W*7Fv1P^OoiJ;3zh0wIcfI9a354_L5U*_|x;#q{@t#hN% z$i!h;Jou(ldC+72`EFrTBsB7%vb|0uY=V`CM+gvZ{KsbhV*j#+w*1Sm0^Z0wFhhMgTH$I@%(UFL(n@+0#NMjX@%j^nt$y5<^VMRn zmMMAA*Br$8I>-yiY866g!qU7nq9h*fUCpbGu7CFYP3)Jh|dxNVqR4MIq)bKb}*Fd~yeP4vLl+qg` zXc4j^f{P<|%z4qUUqh%X%wYc1Q1@33`QVJ1^XxMHSDW9Na*URYwqXLXnF(+K)^C!_ z!EV1f{j$Ad)?`y=Wp2e}I;_doib&>eY8A~(fhG|}k7_OHa zUBM}oc&7&U-W<=Cx|J6oKgyv6pIm3PrA2GDo&;S?TV{io@qiz@ol|P#j{*D4@=X#MGo{!x{u6KYm-tf|qkv#+ZROsM?cj4> zs;uQ^I%k!1D0T=zOg*t}*h>g6&_2_=*|c4kRim1&5iGKCxW9PcZ_f1VyPrmi>tjLw z1Xq4VhMo3Lt!!!M`Z6ttq7jHgtZsxsyD(t^DHuZ3f|8Fp|4gcbR}EI~BeS-8r)E|` z`sAWe#U13v`~r}^LSYEeoQN#?_4xC1V<~&T#2w}uwcTgr=2~s5PVff{Qp*I1*I#ow z>NqLN`x_1(F6qTHoDXi22zveIGwe5ui7yOB9rSvy1p?27o>yAl#;g<#dNn)pw7mGe z;@!nGp~S;X%JW6S1cUe5*a}P0=02oFe(4%KZ+#=?Ho7JxsPg49RJ1<22|GuhmcD*E zsg9T3wP9dF2-|^++vqZ~2ahcV9g9>s&$Zmn+cqgWU0W5F=42@5dNu;O5e)4vKt5!X zuS>>lPA^+~HBowxYv%mz*E9T(JoN})1DoP72LWpgY??mC?jnwWg(+I@BYC=83|Oj< z1bODhtTdH$y9M98Ylu|wrYjQE(wJtA6~xg@OiLnXUolTTmOyh1h9nX+DgSzAGA$^1 zPwS0QXHyh6WO;rQu8onZ_cYVp6kocd$x`M+?pfbP)4&M-Fv2Wsv!yq<6n|^imnxyL z2QKoBAFw)k;+E|Me`78O48|N}wbz61|Fko|fJ~v=R3Z?9tN5QdkNB4j&B;p3PsC5h zt5(~l3g{0}U3I?Ez=}$hrt+-Jj0Z}MUrOe2F6?E$<&ZQ8OG~jyUQ0-<#KY3zMCQI( z0x*D?OOG|pgm3L(|0km_t^oui9^OUl0aLSIIS*ZHj$2kOHKWqHi5lL$& zHqxL9^YZig60y~@G^W$3qgg?vK=EV8l;1@4C9dJCYx0g<8t2@TZ{&^q+<#jRPu291 zeqnaJRb%!i|Dyst=MrHcic7jFtM=`XaH$Lf`EQJc$dX7V|DXv zb>I6Qr-JS?lh1AEs^_6%euLX4Ttn)=Cyp=c)thv-TPrws^iN7mv^hgPopg&FMhw4W z5)r>49G-8b%2#<+BWg_U?m3ACiE8gXOlB&dZFun5PZ~;5^v2mlDGCBW{j+eC?aMBu zm({DHf4U!sfz?B6>AVSWZVr@}(u%g8d|y7XPdhrKN*nDQpn6C-(!5Y4@r{k#;~lLS zd8|o*Tssv*drCtnfXaH-{BY)LssqQGeQKTwwkwJ!vk#^&2s>BRe}0>im9XtXD-t`J z;l0U9rci_mJgr|4(Wl`@`7%Os8E2GpyZfP2yQo$AlLJ8rLNwvYoWM`{bL23_huF6MO zuaMM?ECA0`h!(2TQ&M*@HXsD^)IZlg4fc$0(erwZDe=+rSHAQWb91W;o`QV2qD0k4K=S_0!u~h3<6fid7_U9@>6OhyB0OG~0s+}f z2`G@Lf@ED-SCFmocO9{@2!e!Y;)u2~^k!n@96k!XX_SJAVts&)9oc&DCm=)@|AJ^4 zNUp_qr0o@w?MMqEUvwk8L0pelvUCf`#@7mzWwH+usV&Q65GL&J|Dpl8k}0a52QHF_ zkDJ;_@3y&Sll)tL)QfuF2kLKdl{V$>UdN_HD_z8n;I^nZcBnj+59)miNL4SOtOyNY6sJX!F&xa z@@3^rZff#tsv--gi-P$u&ka%rODgmjsK+C?`(X$Z`u%$%?rzSCIf7(KWYgp0xo<&O zNe#0oMFCV4Bjn6|PLLo&Wk!8^vXuPjca7Gt5N^C$*6+^Y=GfSGA&QmMV7G#Z$o`}! zRUktNegfT?t^(36KIS0DfrmG#=0rf^(mbriFXS{MsM?R@UoWD9mIdtT(^2NX_G#1b zbrMI%Z}h5~Lr6}gCqdeY_m0Fmd}{-g75X7cyi#6snKRe`Z{~o{{a5?)Tsaf diff --git a/src/redux/reducers/index.ts b/src/redux/reducers/index.ts index d38599d..8308c1d 100644 --- a/src/redux/reducers/index.ts +++ b/src/redux/reducers/index.ts @@ -2,7 +2,6 @@ import { IUserState, defaultUserState, selectUserSessionState } from './user-sta import { DISCONNECT_USER_SESSION, CONNECT_USER_SESSION, UPDATE_USER_ROLE, UPDATE_APP_THEME } from '../actions'; import { showConnect } from '@stacks/connect'; -import logo from './../../logo.png'; export interface IinitialState { userState: IUserState; @@ -28,7 +27,8 @@ const mainReducer = (state = initialState, action: IreduxAction) => { showConnect({ appDetails: { name: 'Stacks Decentralized Pools', - icon: logo, + // icon: window.location.origin + '/logo.png', + icon: 'https://res.cloudinary.com/dc0esmagg/image/upload/v1685115982/Degens/appLogo_qwhdc4.png', }, redirectTo: '/', onFinish: () => { From 71864715b557d5ba60934b6d9ae5a0fea5f5f2ea Mon Sep 17 00:00:00 2001 From: Andrei Alexandrescu Date: Fri, 16 Jun 2023 21:04:33 +0300 Subject: [PATCH 17/19] Revert "Update index.ts" This reverts commit 8a8ee16df6969417b98612287d6ffbf1b6fbd75b. --- src/redux/reducers/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redux/reducers/index.ts b/src/redux/reducers/index.ts index 8308c1d..70e6898 100644 --- a/src/redux/reducers/index.ts +++ b/src/redux/reducers/index.ts @@ -26,7 +26,7 @@ const mainReducer = (state = initialState, action: IreduxAction) => { case CONNECT_USER_SESSION: showConnect({ appDetails: { - name: 'Stacks Decentralized Pools', + name: 'Stacks Decentralized', // icon: window.location.origin + '/logo.png', icon: 'https://res.cloudinary.com/dc0esmagg/image/upload/v1685115982/Degens/appLogo_qwhdc4.png', }, From af1ebf2f911f47ec8a8e3944cd39a844671cd205 Mon Sep 17 00:00:00 2001 From: Andrei Alexandrescu Date: Fri, 16 Jun 2023 21:04:33 +0300 Subject: [PATCH 18/19] Revert "Update Authenticate.tsx" This reverts commit 5ea50e51b6d005cd7c4d9b7f1836a04124e192e0. --- src/components/Authenticate.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Authenticate.tsx b/src/components/Authenticate.tsx index f790e86..bb3380a 100644 --- a/src/components/Authenticate.tsx +++ b/src/components/Authenticate.tsx @@ -16,7 +16,7 @@ const Authenticate = () => { Date: Fri, 16 Jun 2023 21:04:33 +0300 Subject: [PATCH 19/19] Revert "adds new name and logo when connecting to hiro wallet" This reverts commit 636c21b4058da5b95f48eb32543f7c30a7e9cda8. --- src/components/Authenticate.tsx | 5 ++--- src/components/ConnectWallet.tsx | 3 +++ src/redux/reducers/index.ts | 5 ++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/Authenticate.tsx b/src/components/Authenticate.tsx index bb3380a..3b1368c 100644 --- a/src/components/Authenticate.tsx +++ b/src/components/Authenticate.tsx @@ -16,10 +16,9 @@ const Authenticate = () => { { diff --git a/src/components/ConnectWallet.tsx b/src/components/ConnectWallet.tsx index a61fef7..4eab71e 100644 --- a/src/components/ConnectWallet.tsx +++ b/src/components/ConnectWallet.tsx @@ -47,16 +47,19 @@ const ConnectWallet = ({ currentTheme }: ConnectWalletProps) => { }, [location]); const disconnect = () => { + // dispatch(updateAppThemeAction(appCurrentTheme)); dispatch(disconnectAction()); }; const authenticate = () => { dispatch(connectAction()); + // dispatch(updateAppThemeAction(appCurrentTheme)); }; if (userSession.isUserSignedIn()) { if (currentRole === 'Viewer') { dispatch(updateUserRoleAction(finalStatus)); + // dispatch(updateUserRoleAction()); return
    Loading role...
    ; } return ( diff --git a/src/redux/reducers/index.ts b/src/redux/reducers/index.ts index 70e6898..3e10d1b 100644 --- a/src/redux/reducers/index.ts +++ b/src/redux/reducers/index.ts @@ -26,9 +26,8 @@ const mainReducer = (state = initialState, action: IreduxAction) => { case CONNECT_USER_SESSION: showConnect({ appDetails: { - name: 'Stacks Decentralized', - // icon: window.location.origin + '/logo.png', - icon: 'https://res.cloudinary.com/dc0esmagg/image/upload/v1685115982/Degens/appLogo_qwhdc4.png', + name: 'Stacks React Starter', + icon: window.location.origin + '/logo512.png', }, redirectTo: '/', onFinish: () => {