From cbcd4009b5fabeeeeb55ea2c0b295a90b900d122 Mon Sep 17 00:00:00 2001 From: pavania1 Date: Tue, 17 Oct 2023 18:14:12 +0530 Subject: [PATCH 1/5] changed the names --- ...ingpopup2.tsx => StakingDelegatepopup.tsx} | 0 ...gPopup3.tsx => StakingRedelegatePopup.tsx} | 0 ...gPopup1.tsx => StakingUndelegatePopup.tsx} | 0 frontend/src/components/tabs/Groups.tsx | 4 +- frontend/yarn.lock | 157 ++++++++++-------- 5 files changed, 92 insertions(+), 69 deletions(-) rename frontend/src/components/popups/{Stakingpopup2.tsx => StakingDelegatepopup.tsx} (100%) rename frontend/src/components/popups/{StakingPopup3.tsx => StakingRedelegatePopup.tsx} (100%) rename frontend/src/components/popups/{StakingPopup1.tsx => StakingUndelegatePopup.tsx} (100%) diff --git a/frontend/src/components/popups/Stakingpopup2.tsx b/frontend/src/components/popups/StakingDelegatepopup.tsx similarity index 100% rename from frontend/src/components/popups/Stakingpopup2.tsx rename to frontend/src/components/popups/StakingDelegatepopup.tsx diff --git a/frontend/src/components/popups/StakingPopup3.tsx b/frontend/src/components/popups/StakingRedelegatePopup.tsx similarity index 100% rename from frontend/src/components/popups/StakingPopup3.tsx rename to frontend/src/components/popups/StakingRedelegatePopup.tsx diff --git a/frontend/src/components/popups/StakingPopup1.tsx b/frontend/src/components/popups/StakingUndelegatePopup.tsx similarity index 100% rename from frontend/src/components/popups/StakingPopup1.tsx rename to frontend/src/components/popups/StakingUndelegatePopup.tsx diff --git a/frontend/src/components/tabs/Groups.tsx b/frontend/src/components/tabs/Groups.tsx index b0617c979..6844fa471 100644 --- a/frontend/src/components/tabs/Groups.tsx +++ b/frontend/src/components/tabs/Groups.tsx @@ -4,7 +4,7 @@ import Tabs from "@mui/material/Tabs"; import Tab from "@mui/material/Tab"; export default function Groups() { - const [value, setValue] = React.useState("granted-to-me"); + const [value, setValue] = React.useState("created-by-me"); const handleChange = (event: React.SyntheticEvent, newValue: string) => { console.log(newValue); @@ -37,7 +37,7 @@ export default function Groups() { textColor="primary" aria-label="groups tabs" > - + diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4a67c5223..b9625c017 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -392,6 +392,26 @@ dependencies: glob "7.1.7" +"@next/swc-darwin-arm64@13.5.2": + version "13.5.2" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.2.tgz#f099a36fdd06b1949eb4e190aee95a52b97d3885" + integrity sha512-7eAyunAWq6yFwdSQliWMmGhObPpHTesiKxMw4DWVxhm5yLotBj8FCR4PXGkpRP2tf8QhaWuVba+/fyAYggqfQg== + +"@next/swc-darwin-x64@13.5.2": + version "13.5.2" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.2.tgz#b8950fbe150db6f82961619e31fc6e9232fce8f4" + integrity sha512-WxXYWE7zF1ch8rrNh5xbIWzhMVas6Vbw+9BCSyZvu7gZC5EEiyZNJsafsC89qlaSA7BnmsDXVWQmc+s1feSYbQ== + +"@next/swc-linux-arm64-gnu@13.5.2": + version "13.5.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.2.tgz#8134d31fa9ad6848561b6969d27a8c07ab090974" + integrity sha512-URSwhRYrbj/4MSBjLlefPTK3/tvg95TTm6mRaiZWBB6Za3hpHKi8vSdnCMw5D2aP6k0sQQIEG6Pzcfwm+C5vrg== + +"@next/swc-linux-arm64-musl@13.5.2": + version "13.5.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.2.tgz#56233fe5140ed437c638194f0a01a3f89821ca89" + integrity sha512-HefiwAdIygFyNmyVsQeiJp+j8vPKpIRYDlmTlF9/tLdcd3qEL/UEBswa1M7cvO8nHcr27ZTKXz5m7dkd56/Esg== + "@next/swc-linux-x64-gnu@13.5.2": version "13.5.2" resolved "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.2.tgz" @@ -402,6 +422,21 @@ resolved "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.2.tgz" integrity sha512-UBD333GxbHVGi7VDJPPDD1bKnx30gn2clifNJbla7vo5nmBV+x5adyARg05RiT9amIpda6yzAEEUu+s774ldkw== +"@next/swc-win32-arm64-msvc@13.5.2": + version "13.5.2" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.2.tgz#c3734235e85458b76ec170dd0d6c13c2fdfac5ed" + integrity sha512-Em9ApaSFIQnWXRT3K6iFnr9uBXymixLc65Xw4eNt7glgH0eiXpg+QhjmgI2BFyc7k4ZIjglfukt9saNpEyolWA== + +"@next/swc-win32-ia32-msvc@13.5.2": + version "13.5.2" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.2.tgz#cf16184af9be8b8f7750833a441c116b7a76b273" + integrity sha512-TBACBvvNYU+87X0yklSuAseqdpua8m/P79P0SG1fWUvWDDA14jASIg7kr86AuY5qix47nZLEJ5WWS0L20jAUNw== + +"@next/swc-win32-x64-msvc@13.5.2": + version "13.5.2" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.2.tgz#cf8db00763d9219567655b90853b7d484f3fcad6" + integrity sha512-LfTHt+hTL8w7F9hnB3H4nRasCzLD/fP+h4/GUVBTxrkMJOnh/7OZ0XbYDKO/uuWwryJS9kZjhxcruBiYwc5UDw== + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" @@ -410,7 +445,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -857,16 +892,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - color-name@1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + commander@^4.0.0: version "4.1.1" resolved "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz" @@ -1436,6 +1471,11 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" @@ -1481,7 +1521,7 @@ get-tsconfig@^4.5.0: dependencies: resolve-pkg-maps "^1.0.0" -glob-parent@^5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -1495,22 +1535,15 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - glob-to-regexp@^0.4.1: version "0.4.1" resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.1.3, glob@7.1.7: - version "7.1.7" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== +glob@7.1.6: + version "7.1.6" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1519,10 +1552,10 @@ glob@^7.1.3, glob@7.1.7: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.1.6: - version "7.1.6" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== +glob@7.1.7, glob@^7.1.3: + version "7.1.7" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1664,7 +1697,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@~2.0.1, inherits@~2.0.3, inherits@2: +inherits@2, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -1854,6 +1887,11 @@ is-weakset@^2.0.1: call-bind "^1.0.2" get-intrinsic "^1.1.1" +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== + isarray@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz" @@ -1864,11 +1902,6 @@ isarray@~1.0.0: resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" @@ -2027,7 +2060,7 @@ minimist@^1.2.0, minimist@^1.2.6, minimist@~1.2.5: resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== -ms@^2.1.1, ms@2.1.2: +ms@2.1.2, ms@^2.1.1: version "2.1.2" resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== @@ -2317,15 +2350,6 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.4.23, postcss@8.4.30: - version "8.4.30" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz" - integrity sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g== - dependencies: - nanoid "^3.3.6" - picocolors "^1.0.0" - source-map-js "^1.0.2" - postcss@8.4.14: version "8.4.14" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz" @@ -2335,6 +2359,15 @@ postcss@8.4.14: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@8.4.30, postcss@^8.4.23: + version "8.4.30" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz" + integrity sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g== + dependencies: + nanoid "^3.3.6" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" @@ -2372,12 +2405,7 @@ react-dom@18.2.0: loose-envify "^1.1.0" scheduler "^0.23.0" -react-is@^16.13.1: - version "16.13.1" - resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - -react-is@^16.7.0: +react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -2545,12 +2573,7 @@ scheduler@^0.23.0: dependencies: loose-envify "^1.1.0" -semver@^6.3.0: - version "6.3.1" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -semver@^6.3.1: +semver@^6.3.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== @@ -2612,18 +2635,6 @@ streamsearch@^1.1.0: resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz" integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - string.prototype.matchall@^4.0.8: version "4.0.10" resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz" @@ -2666,6 +2677,18 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" @@ -2779,11 +2802,6 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" -through@^2.3.8: - version "2.3.8" - resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - through2@~0.4.1: version "0.4.2" resolved "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz" @@ -2792,6 +2810,11 @@ through2@~0.4.1: readable-stream "~1.0.17" xtend "~2.1.1" +through@^2.3.8: + version "2.3.8" + resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== + to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" From 1524ab2fc4833a538ce92b76262a7742dc38a610 Mon Sep 17 00:00:00 2001 From: pavania1 Date: Tue, 17 Oct 2023 18:32:52 +0530 Subject: [PATCH 2/5] added voteforproposal popup --- frontend/src/app/(routes)/groups/page.tsx | 1 + frontend/src/app/globals.css | 29 ++++++++++++++++- frontend/src/app/page.tsx | 1 + .../src/components/popups/VoteforProposal.tsx | 31 +++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 frontend/src/components/popups/VoteforProposal.tsx diff --git a/frontend/src/app/(routes)/groups/page.tsx b/frontend/src/app/(routes)/groups/page.tsx index f99f24ee6..560bfd85d 100644 --- a/frontend/src/app/(routes)/groups/page.tsx +++ b/frontend/src/app/(routes)/groups/page.tsx @@ -7,6 +7,7 @@ const page = () => {
+
); }; diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css index 729fba2bc..b5387285c 100644 --- a/frontend/src/app/globals.css +++ b/frontend/src/app/globals.css @@ -742,6 +742,33 @@ body { .leavebutton { @apply flex w-[127px] justify-center items-center gap-2.5 self-stretch border px-6 py-3.5 rounded-[100px] border-solid border-white; } - + .VoteforProposal-popup { + @apply flex w-[788px] h-[518px] flex-col justify-center items-start gap-10 backdrop-blur-[2px] px-6 py-10 rounded-2xl; + background: #20172f; + } + .vote-name { + @apply flex h-10 justify-center items-center w-full; + } + .vote-text { + @apply text-white text-xl not-italic font-bold leading-3; + } + .VoteProposal-buttons{ + @apply flex flex-row items-center gap-10 self-stretch w-full justify-between ; + } + .Proposal { + @apply flex items-start gap-2 w-[350px] self-stretch border text-white text-sm not-italic font-light leading-6 px-4 py-2 rounded-[100px] border-solid border-white; + } + .voteproposal-text { + @apply text-white space-y-2 text-sm not-italic font-bold leading-6; + } + .voteproposal-message { + @apply flex h-[86px] w-[740px] items-start gap-2 self-stretch border px-4 py-2 rounded-lg border-solid border-[rgba(176,176,176,0.20)]; + } + .voteproposal-message p{ + @apply text-white text-sm not-italic font-light leading-6; + } + .vote-confirm { + @apply flex justify-center items-center gap-2.5 self-stretch border px-6 py-3.5 rounded-[100px] border-solid border-white; + } } \ No newline at end of file diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx index c4c181551..a92b767be 100644 --- a/frontend/src/app/page.tsx +++ b/frontend/src/app/page.tsx @@ -18,6 +18,7 @@ const OverviewPage = () => { + diff --git a/frontend/src/components/popups/VoteforProposal.tsx b/frontend/src/components/popups/VoteforProposal.tsx new file mode 100644 index 000000000..fba17999a --- /dev/null +++ b/frontend/src/components/popups/VoteforProposal.tsx @@ -0,0 +1,31 @@ +import React from 'react' +import Image from 'next/image' + +const VoteforProposal = () => { + return ( +
+
+
Vote for Proposal #6 Proposal NAME
+ close +
+
+ + + +
+
+ + +
+
+

Justification

+
+

Enter here

+
+
+ +
+ ) +} + +export default VoteforProposal \ No newline at end of file From 6ce65caaa42924048340af26a09a40d7fdc459af Mon Sep 17 00:00:00 2001 From: pavania1 Date: Wed, 18 Oct 2023 14:49:22 +0530 Subject: [PATCH 3/5] added the groups 2nd page --- frontend/src/app/globals.css | 59 +++++++++++++++++++++++++ frontend/src/app/page.tsx | 3 ++ frontend/src/components/Groupspage2.tsx | 49 ++++++++++++++++++++ frontend/src/components/tabs/Groups.tsx | 1 + 4 files changed, 112 insertions(+) create mode 100644 frontend/src/components/Groupspage2.tsx diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css index b5387285c..716d56ed7 100644 --- a/frontend/src/app/globals.css +++ b/frontend/src/app/globals.css @@ -770,5 +770,64 @@ body { .vote-confirm { @apply flex justify-center items-center gap-2.5 self-stretch border px-6 py-3.5 rounded-[100px] border-solid border-white; } + .Groups-Main { + @apply flex w-[1542px] flex-col items-start gap-10 p-6 rounded-2xl ; + background: rgba(46, 32, 55, 0.75); + } + .titlegrp-Name{ + @apply text-white text-base not-italic font-bold leading-3 ml-[-1270px]; + } + .Group-details { + @apply flex items-start gap-10; + } + .headGroup1 { + @apply flex flex-col items-start gap-2; + } + .Group-first { + @apply text-[#B0B0B0] text-xs not-italic font-normal leading-3 tracking-[0.48px]; + } + .Group-second { + @apply text-white text-sm not-italic font-normal leading-10 tracking-[0.56px] flex h-6 flex-col justify-center; + } + .head-Group2 { + @apply flex flex-col items-start gap-2; + } + .Group2-first { + @apply text-[#B0B0B0] text-xs not-italic font-normal leading-3 tracking-[0.48px]; + } + .Group2-second { + @apply flex items-start gap-2; + /* @apply text-white flex-row text-sm not-italic font-normal leading-10 tracking-[0.56px] flex w-[183px] h-6 justify-center; */ + } + .Group2-Address { + @apply flex items-center w-[183px] h-6 text-right mr-2 justify-center text-white text-sm not-italic font-normal leading-10 tracking-[0.56px]; + } + .Group2-Edit { + @apply flex w-7 h-6 flex-col justify-center text-sm not-italic font-extralight leading-10 tracking-[0.56px] underline; + + } + .Group2buttons { + @apply flex items-center gap-10 self-stretch; + } + .updatebutton { + @apply flex justify-center w-[120px] items-center gap-2.5 self-stretch border px-6 py-3.5 rounded-[100px] border-solid border-white; + + /* @apply flex justify-center items-center gap-2.5 self-stretch border text-white text-sm not-italic font-normal leading-3 px-6 py-3.5 rounded-[100px] border-solid border-white; */ + } + .leaveButton { + @apply flex justify-center w-[120px] items-center gap-2.5 self-stretch border px-6 py-3.5 rounded-[100px] border-solid border-white; + + } + .groups-tablehead { + @apply flex justify-between items-center self-stretch; + } + .groups-tablehead h2 { + @apply flex w-32 flex-col justify-center self-stretch text-white text-xl not-italic font-bold leading-6; + } + .updatemembers { + @apply flex w-[200px] h-10 flex-col justify-center items-center gap-2.5 border px-4 py-1 rounded-[100px] border-solid border-white; + } + + } \ No newline at end of file diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx index a92b767be..8afdf7841 100644 --- a/frontend/src/app/page.tsx +++ b/frontend/src/app/page.tsx @@ -12,11 +12,14 @@ import AssetsTable from "./../components/AssetsTable"; + const OverviewPage = () => { return (
+ + diff --git a/frontend/src/components/Groupspage2.tsx b/frontend/src/components/Groupspage2.tsx new file mode 100644 index 000000000..b1c5687c3 --- /dev/null +++ b/frontend/src/components/Groupspage2.tsx @@ -0,0 +1,49 @@ +import React from 'react' +import Image from 'next/image' +import ValidatorsTable from './ValidatorsTable' + +const Groupspage2 = () => { + return ( +
+
+
+
+ Groupimage +
Group Name
+
Est. 2023-09
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

+ +
+
+
+
Forum
+
https:/search.google.com
+
+
+
Group’s Address
+
+
cosmos1enruju0dnejv8v..
+ Copy-logo +
Edit
+
+
+
+
Total Weight
+
2
+
+
+
Total Members
+
2
+
+
+
+
Update
+
Leave
+
+
+
+ ) +} + +export default Groupspage2 \ No newline at end of file diff --git a/frontend/src/components/tabs/Groups.tsx b/frontend/src/components/tabs/Groups.tsx index 6844fa471..a49a06000 100644 --- a/frontend/src/components/tabs/Groups.tsx +++ b/frontend/src/components/tabs/Groups.tsx @@ -3,6 +3,7 @@ import * as React from "react"; import Tabs from "@mui/material/Tabs"; import Tab from "@mui/material/Tab"; + export default function Groups() { const [value, setValue] = React.useState("created-by-me"); From 405fda1acef3f8ff01916f2540103877d6e2bfd8 Mon Sep 17 00:00:00 2001 From: pavania1 Date: Thu, 19 Oct 2023 11:12:12 +0530 Subject: [PATCH 4/5] added the group 2nd page components --- frontend/public/vote.png | Bin 0 -> 5732 bytes frontend/src/app/globals.css | 42 +++++++++-- frontend/src/app/page.tsx | 1 + frontend/src/components/GroupsCards.tsx | 5 +- frontend/src/components/Groupspage2.tsx | 2 +- frontend/src/components/Groupspage2table.tsx | 68 ++++++++++++++++++ .../popups/FeegrantCreatedPopup.tsx | 2 +- .../src/components/popups/GroupsVotePopup.tsx | 19 +++++ frontend/src/components/tabs/Groups.tsx | 2 + 9 files changed, 131 insertions(+), 10 deletions(-) create mode 100644 frontend/public/vote.png create mode 100644 frontend/src/components/Groupspage2table.tsx create mode 100644 frontend/src/components/popups/GroupsVotePopup.tsx diff --git a/frontend/public/vote.png b/frontend/public/vote.png new file mode 100644 index 0000000000000000000000000000000000000000..2435cc2d9c738481a7d9ab199307b5396b23c956 GIT binary patch literal 5732 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 WLGNA9ez+0<0000 { return (
diff --git a/frontend/src/components/GroupsCards.tsx b/frontend/src/components/GroupsCards.tsx index 938b2222a..e846fd4a5 100644 --- a/frontend/src/components/GroupsCards.tsx +++ b/frontend/src/components/GroupsCards.tsx @@ -4,6 +4,7 @@ import Image from 'next/image' const GroupsCards = () => { const groupData = [1, 2, 3, 4, 5, 6, 7, 8]; return ( +
{groupData.map((index: number, id: number) =>(
@@ -26,8 +27,8 @@ const GroupsCards = () => {
-
View
-
Leave
+ +
))} diff --git a/frontend/src/components/Groupspage2.tsx b/frontend/src/components/Groupspage2.tsx index b1c5687c3..c6ee2d1f8 100644 --- a/frontend/src/components/Groupspage2.tsx +++ b/frontend/src/components/Groupspage2.tsx @@ -1,6 +1,6 @@ import React from 'react' import Image from 'next/image' -import ValidatorsTable from './ValidatorsTable' + const Groupspage2 = () => { return ( diff --git a/frontend/src/components/Groupspage2table.tsx b/frontend/src/components/Groupspage2table.tsx new file mode 100644 index 000000000..68ae26ca5 --- /dev/null +++ b/frontend/src/components/Groupspage2table.tsx @@ -0,0 +1,68 @@ +import React from "react"; +import Image from 'next/image'; + +const Groupspage2table = () => { + const tableData = [ + { + address: "cosmos1eu0dnejv8v..", + weight: "01", + name: "Hemanth Sai Venkata Redyy Rao", + }, + { + address: "cosmos1eu0dnejv8v..", + weight: "01", + name: "Hemanth Sai Venkata Redyy Rao", + }, + { + address: "cosmos1eu0dnejv8v..", + weight: "01", + name: "Hemanth Sai Venkata Redyy Rao", + }, + { + address: "cosmos1eu0dnejv8v..", + weight: "01", + name: "Hemanth Sai Venkata Redyy Rao", + }, + + ]; + + return ( + +
+
+
Members
+ +
+
+ + + + + + + + + + + {tableData.map((row, index) => ( + + + + + + + + ))} + +
AddressWeightName
+
+ {row.address} + copy +
+ 		{row.weight}{row.name}
+
+
+ ) +} + +export default Groupspage2table; diff --git a/frontend/src/components/popups/FeegrantCreatedPopup.tsx b/frontend/src/components/popups/FeegrantCreatedPopup.tsx index 896a469cb..07ca5d172 100644 --- a/frontend/src/components/popups/FeegrantCreatedPopup.tsx +++ b/frontend/src/components/popups/FeegrantCreatedPopup.tsx @@ -12,7 +12,7 @@ const FeegrantCreatedPopup = () => {

You have successfully updated the Grant

-

Dismiss

+
) diff --git a/frontend/src/components/popups/GroupsVotePopup.tsx b/frontend/src/components/popups/GroupsVotePopup.tsx new file mode 100644 index 000000000..9f34b3b6e --- /dev/null +++ b/frontend/src/components/popups/GroupsVotePopup.tsx @@ -0,0 +1,19 @@ +import React from 'react' +import Image from 'next/image' + +const GroupsVotePopup = () => { + return ( +
+
+

You have Voted !

+
+
+ vote-image +

You have successfully casted your vote, click on dismiss to go back

+
+ +
+ ) +} + +export default GroupsVotePopup \ No newline at end of file diff --git a/frontend/src/components/tabs/Groups.tsx b/frontend/src/components/tabs/Groups.tsx index a49a06000..10c6f7ef4 100644 --- a/frontend/src/components/tabs/Groups.tsx +++ b/frontend/src/components/tabs/Groups.tsx @@ -4,6 +4,7 @@ import Tabs from "@mui/material/Tabs"; import Tab from "@mui/material/Tab"; + export default function Groups() { const [value, setValue] = React.useState("created-by-me"); @@ -43,6 +44,7 @@ export default function Groups() { + ); } From 0f0f927c9aa5cef9a3ddabedf459e75bd7db03ed Mon Sep 17 00:00:00 2001 From: hemanthghs Date: Thu, 19 Oct 2023 11:54:06 +0530 Subject: [PATCH 5/5] Add tabs group in groups page --- frontend/src/app/(routes)/groups/page.tsx | 1 - frontend/src/components/tabs/Groups.tsx | 60 +++++++++-------------- 2 files changed, 24 insertions(+), 37 deletions(-) diff --git a/frontend/src/app/(routes)/groups/page.tsx b/frontend/src/app/(routes)/groups/page.tsx index 560bfd85d..dcb2afd6a 100644 --- a/frontend/src/app/(routes)/groups/page.tsx +++ b/frontend/src/app/(routes)/groups/page.tsx @@ -6,7 +6,6 @@ const page = () => { return (
-
); diff --git a/frontend/src/components/tabs/Groups.tsx b/frontend/src/components/tabs/Groups.tsx index 10c6f7ef4..d35e0e97e 100644 --- a/frontend/src/components/tabs/Groups.tsx +++ b/frontend/src/components/tabs/Groups.tsx @@ -2,49 +2,37 @@ import * as React from "react"; import Tabs from "@mui/material/Tabs"; import Tab from "@mui/material/Tab"; - - +import CustomTabsGroup, { TabPanel } from "../CustomTabsGroup"; +import GroupsCards from "../GroupsCards"; export default function Groups() { - const [value, setValue] = React.useState("created-by-me"); - - const handleChange = (event: React.SyntheticEvent, newValue: string) => { - console.log(newValue); - setValue(newValue); - }; - - const tabStyle = { - textTransform: "none", - color: "rgba(176, 176, 176, 0.50)", // Change the text color to black when selected - fontFamily: "inter", - paddingX: "40px", - marginX: "20px", - - paddingY: "0px", - fontSize: "16px", - fontWeight: 400, - lineHeight: "12px", - "&.Mui-selected": { - color: "white", - fontWeight: 700, - }, + const [tab, setTab] = React.useState(0); + const handleTabChange = (value: number) => { + setTab(value); }; return ( <>
- - - - - + +
+
+ + + + + Create new group + + + Other groups +
- ); }