From a0acb4d7498a47aa885fcd9f8ab68ff3cfb88194 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 27 Feb 2024 15:02:04 +0700 Subject: [PATCH] Fix navigation and stuff --- .gitignore | 1 + web/package-lock.json | 73 ++++---- web/package.json | 2 +- web/src/assets/metadata.json | 95 ++++++++++ web/src/components/App/App.js | 34 +--- .../components/ConnectWallet/ConnectWallet.js | 1 - .../MainNavigation/MainNavigation.js | 162 ++++++++---------- web/src/components/Progress/Progress.js | 9 - web/src/index.js | 6 +- web/src/pages/begin-page/begin-page.js | 14 +- web/src/pages/done-page/done-page.js | 2 - web/src/pages/step1-page/step1-page.js | 18 +- web/src/store/actions/common.js | 3 - web/src/store/actions/routes.js | 6 - web/src/store/actions/types.js | 1 - web/src/store/reducers/root.js | 2 - web/src/store/reducers/routes.js | 22 --- 17 files changed, 225 insertions(+), 226 deletions(-) create mode 100644 .gitignore create mode 100644 web/src/assets/metadata.json delete mode 100644 web/src/store/actions/routes.js delete mode 100644 web/src/store/reducers/routes.js diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..723ef36 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea \ No newline at end of file diff --git a/web/package-lock.json b/web/package-lock.json index 1aeda64..dd2a1d4 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -25,7 +25,7 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "react-redux": "^7.2.6", - "react-router-dom": "^6.0.2", + "react-router-dom": "^6.22.1", "react-scripts": "5.0.1", "react-toastify": "^8.1.0", "redux": "^4.1.2", @@ -4028,6 +4028,14 @@ "node": ">= 8" } }, + "node_modules/@remix-run/router": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.1.tgz", + "integrity": "sha512-zcU0gM3z+3iqj8UX45AmWY810l3oUmXM7uH4dt5xtzvMhRtYVhKGOmgOd1877dOPPepfCjUv57w+syamWIYe7w==", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -11334,14 +11342,6 @@ "he": "bin/he" } }, - "node_modules/history": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/history/-/history-5.1.0.tgz", - "integrity": "sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==", - "dependencies": { - "@babel/runtime": "^7.7.6" - } - }, "node_modules/hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -17809,23 +17809,29 @@ } }, "node_modules/react-router": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.0.2.tgz", - "integrity": "sha512-8/Wm3Ed8t7TuedXjAvV39+c8j0vwrI5qVsYqjFr5WkJjsJpEvNSoLRUbtqSEYzqaTUj1IV+sbPJxvO+accvU0Q==", + "version": "6.22.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.1.tgz", + "integrity": "sha512-0pdoRGwLtemnJqn1K0XHUbnKiX0S4X8CgvVVmHGOWmofESj31msHo/1YiqcJWK7Wxfq2a4uvvtS01KAQyWK/CQ==", "dependencies": { - "history": "^5.1.0" + "@remix-run/router": "1.15.1" + }, + "engines": { + "node": ">=14.0.0" }, "peerDependencies": { "react": ">=16.8" } }, "node_modules/react-router-dom": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.0.2.tgz", - "integrity": "sha512-cOpJ4B6raFutr0EG8O/M2fEoyQmwvZWomf1c6W2YXBZuFBx8oTk/zqjXghwScyhfrtnt0lANXV2182NQblRxFA==", + "version": "6.22.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.1.tgz", + "integrity": "sha512-iwMyyyrbL7zkKY7MRjOVRy+TMnS/OPusaFVxM2P11x9dzSzGmLsebkCvYirGq0DWB9K9hOspHYYtDz33gE5Duw==", "dependencies": { - "history": "^5.1.0", - "react-router": "6.0.2" + "@remix-run/router": "1.15.1", + "react-router": "6.22.1" + }, + "engines": { + "node": ">=14.0.0" }, "peerDependencies": { "react": ">=16.8", @@ -25087,6 +25093,11 @@ } } }, + "@remix-run/router": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.1.tgz", + "integrity": "sha512-zcU0gM3z+3iqj8UX45AmWY810l3oUmXM7uH4dt5xtzvMhRtYVhKGOmgOd1877dOPPepfCjUv57w+syamWIYe7w==" + }, "@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -30718,14 +30729,6 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" }, - "history": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/history/-/history-5.1.0.tgz", - "integrity": "sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==", - "requires": { - "@babel/runtime": "^7.7.6" - } - }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -35403,20 +35406,20 @@ "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==" }, "react-router": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.0.2.tgz", - "integrity": "sha512-8/Wm3Ed8t7TuedXjAvV39+c8j0vwrI5qVsYqjFr5WkJjsJpEvNSoLRUbtqSEYzqaTUj1IV+sbPJxvO+accvU0Q==", + "version": "6.22.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.1.tgz", + "integrity": "sha512-0pdoRGwLtemnJqn1K0XHUbnKiX0S4X8CgvVVmHGOWmofESj31msHo/1YiqcJWK7Wxfq2a4uvvtS01KAQyWK/CQ==", "requires": { - "history": "^5.1.0" + "@remix-run/router": "1.15.1" } }, "react-router-dom": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.0.2.tgz", - "integrity": "sha512-cOpJ4B6raFutr0EG8O/M2fEoyQmwvZWomf1c6W2YXBZuFBx8oTk/zqjXghwScyhfrtnt0lANXV2182NQblRxFA==", + "version": "6.22.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.1.tgz", + "integrity": "sha512-iwMyyyrbL7zkKY7MRjOVRy+TMnS/OPusaFVxM2P11x9dzSzGmLsebkCvYirGq0DWB9K9hOspHYYtDz33gE5Duw==", "requires": { - "history": "^5.1.0", - "react-router": "6.0.2" + "@remix-run/router": "1.15.1", + "react-router": "6.22.1" } }, "react-scripts": { diff --git a/web/package.json b/web/package.json index dc380f8..7bec558 100644 --- a/web/package.json +++ b/web/package.json @@ -21,7 +21,7 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "react-redux": "^7.2.6", - "react-router-dom": "^6.0.2", + "react-router-dom": "^6.22.1", "react-scripts": "5.0.1", "react-toastify": "^8.1.0", "redux": "^4.1.2", diff --git a/web/src/assets/metadata.json b/web/src/assets/metadata.json new file mode 100644 index 0000000..6783a6d --- /dev/null +++ b/web/src/assets/metadata.json @@ -0,0 +1,95 @@ +{ + "root": "0x82e1cd2ef5365e6db5b707763079758302a04bb39e2b5199f460fc316b74890a", + "addresses": [ + "0xf4f86791777f5ea98d7784a53cfccbef8d9b7e6e", + "0x0ee81e715d735b2062fb08cf1f60616de434a59c", + "0x539a264545e534c2f4ba74f3908dfe8a88bf4919", + "0xe413c179782070e432fad2c3accde07e4177fe48", + "0x01fa8ca2186cb33a6be8e03a8181f7454c36c6da", + "0xcf6bf64e26c050f1f12a5b874564dda64d0d0952", + "0xa814d57f10b0e5594141063046bd3fe2d9cd5f49", + "0x54c352a55ebad76cc578b675764b20b5344ded0f", + "0xb1533050dbe2d177d00492d4c539f2b576a03987", + "0x40409ac0ffc82bc1eb00d08a1bdf78d3a56e7b5b", + "0xaf838027b6256d95a3dcdd539234e315edcb3d3e", + "0x468c1d5409236e4226ce9ff6e0524708b70d8cbc", + "0xda54a340d01c176b2dd8fad087073f0953c99bfb", + "0x971c375158d52c2a8b69e9f020fa580316ab6c85", + "0x9cc8b514f4fca4deab96e06fa1cb74af21ad6df0", + "0xda238382f964e814b10ef4ed0e112c9a78c9f9f5", + "0x86f3f299369f85022748f394e8b69c5593cd8625", + "0x126c7b77c25f0376517702a71f03acbad4d5c1df", + "0xfe0e7ca4b6a9f36ccfbfa51a60118a88b7810634", + "0xb83f4291f9c3b315cfad1a59019cbb7fae15e7eb", + "0x89e8582ee10627ab4ecf4465364730ddc06b7f0e", + "0xf78ccb5d1aa7563394d05425e88878c942e18ebb" + ], + "encryptedKeys": { + "user_1": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC1opXTl93qM3gi6NqgYN/qy5+0u+n6fgPNyoceL8sAafHZNgEXT68Z93S48I35VF35QaOBRx+RvHSTIJoFk3MsZzAidEpy8k0yg7FGLLcHQHpwjd0PoKAyAjHKYpQvkUU2CsgNzNE9H8dAWvUbptSCPlN/FyEQcQh0iLpvTt62rMzncZFuHJAJwA+Bf4KiRLs32Yfgvgkeq1mh/fM62kgpfwMXdBjFpBOFyE9oKGbcvfP4m2zanWQu2gp3HY2iB+5kpgT4dQz63aqtpXKM2JQZDf5+Pr7ZT0RAMlcdYBkrAXoeB2AXUzS/4Ms3R8Ff+qLQAXjaid0IZuGQCxQT8XLdWt4g/gsrZQt7e0wwv5+bCBWPM2uxaqBq01JkrtWDi/zLb8qX7PXMMICroPs3geNwQdn2VsBUjvaif1b5XaZqtWpS9RJdblj2aGZJgEqfumdKHfyEKYq+W2MwEXKJsWTQ1p95Gwv0msUlVFSKr6+lbZNZum4VWJKQxJ68FyezSW0=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgdjQ3UW93ClRObXFtK2hu\neEt1U0NEN0xnYXZ4bjE0cmw0SGZaWXB2b1ZNMmJYajQ1V1J6dy9xODhVY2drS2pi\nRXBkeEIrSy8KVHZoRnExQ3M4dlpIU2xGQkZKT0ZJZ05ZVTY4ZjExMnJ6ZU1yS0ww\nZGFXUWJRMlNRT2VQNzd3Uk5adW80dnNuZQpkOXdEQ2NuM0VrR3puSXFaUjJXTGRL\nMVlJT0RQNDVyb2E5aDQ5MlgrdG00SVpVcVpDK05sY2pnckRLZUZQUTd6Cjl4ZmRL\ndVc1cjZReE1jaDFmQzducCs5d2dzSFBORm5rRnJnYmVlVHYweDNpR1c1dmt0Zzh3\nWDcvMk1SejYzZ2oKa1ExajhZZ0ptaC9pRndKRTVQMFdBWjFTcmJzclhUSnMzMW1i\nNWo2MXhmWmtGRTJ6WEZaMHptVTM2OUdLN3JpdwpIMWtsbEhYcEppOEdYd3NMN2Qw\nUkZxdXVsaldXTm9QVW1iamtGUmFoR3gxUmZ5QTZOSi9kT2liWGIxL0RBRytTCmQx\na3hVWDlMOEE5NVFYOHZKcHJyUDRhSzRaL0t1M1JBY3RxMW05dHR2TDh2VlJQUE0v\nZDhYc05pTTlVQ0x6OTQKbUNuMGlhMWVrUGVFZS9qU2h6UmtDYlBpK1c4SWs5Q0hx\nSklRNzRzN3BhdFhxaGZJM1JiVHdNVkloVGZmTTV6egoKLS0tIHRwbXQvTHQ0d1RY\nR3lLOXJNNm5DaUROcVBCbmdEc0dhaEl3ay9XdXh1aWsKMN8JK/CX9b6DlMcs6wzk\nlxxT7SYzlANbWn5PTD/FufeLagGVhv3LZWd+8zk4FTG4SywvAjq6VKCdsVWwQbW8\nITH1B0nQRxIhBDEs9jMnCBfnbWyv3ceMRjk+A4xPAG0iYxY=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_2": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDeNBCRecdWqnrB/OkK7BcU7WXKrjsxtDikVWBJ26v661jovCxi8rANW3ELMWINVAVOfzh+d+3tvZeIe9OKtbi9KLlTakbFiL0+J/HrqBy+m61hI6X03/mVrxsOdKvB4RQ+2vhPSy2EY+Kp+gjvN16r5K1oVieTDnQUTAo+s/K2yRZucBFk5IxPIcgCBpc4vYK8EByZrlGNsswuO16sFnIzjN6aCjJ1EhdqlXfqj2Nmz2u4bdisN+Uzic8dUk5iR71oEwqCJ0Aqm/pIwwdyNG3v/+jkVLXg+OC7nALR2YFNohQg/6ecVf1vuH3jVF9Pyy+lVd4EgtVQsJd9PCxjaveLulnR7fxKeZqwtobF9L6aQsAGWn+8V/4PGR19/5hX9pPOcmsRYviKeos/q7f2PyKF8bxlTpQxfhCWGLCYuo1uog11hd7ulTRVehiCxE0NPx8dB9IRGKV6wmss+WHV+n7qAg5BcsPVLzbN5qvcmRRQNCBXFCqZXA9gmB119l2/WH8=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgODE3TUh3CkovVWV5MVVn\nRHozN1hwRDRrUXNoOGRYTUZPa0pIT0xGc05kZFJQYmpva3ZSSVVHelVNdTl3d1J6\nTEpXYkZNUEEKOGlaZW85RnJKL0pxMEZVWWNCOGtmRUE2Wmx4cGhGN1ZqN3NHSVA5\nSUVZU2VoNlZyamZXb1NDK2t0RnptMDdlTgo0VmRLQ1RqQ3VoUTMzbE01S1h4b3Nt\nNE5hbVB4QUxaUkRqSFJrTGxOckhsdEozVzMyUGlHYUFzSWx6WGVkMWU0ClZtTGJL\nQk9rUFhxVlBUNERsS2tHQllzQjljUG11bEowTUlkRFgzWkUzdjRGT3VvZHNCNkVS\nNzBSTVVNMFJLZTYKeEg5d09Tb3lyRXpRc3Eyb1E3Y3JiUGxNT0R1djhZRGhUeXhN\naXIweTBIT0tuZzIwbEkzL2xZN1BDM0tqRnVoQQpOc2daNTZ4YTdtR0xBL0JqZ0ZM\nRDJjcHVBUWlEWW00bkVKWnpaV0tOMW5LUWtUWFFlRzhzay8xM1loeTJWR0l1CnYw\nRm01dEQ2eHJ1b3d6V1o1RkxkNTBvZFZra2FlQWtVczRWamhmVXhtK215TWJ0NTNK\nR21TNkNVbHRtS3JoVDQKNE5jQStrOWJyd254NWxZYXora29wd3pUWkRDQzQxdGdM\ndmtFWDlVREcrS0x6cnR6YXExWTRKTUpYWGFxY1J0QgoKLS0tIFZ4K2EzOWZnYXQv\nY3VvMzl4bjZNVEJSNFJNaFdac0o0bWNHM3NVMmg1SG8KMP9lgpoSWsJUR1+1J/Qd\ndrN6AgGmQ4fUGMKdyJ+tkdFOKrYgY6Dmud8kkS5qZQ81mQaGQKG/2VxJbUdaHfGo\nSGubai9FdIq/Ou1W2GPkDTrF1gH/lGjP3OnjOt8bq7HtilE=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_3": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbu9BLJvqw/Lmk5+CoUV9szfX+aSLyZHzXBjX++cLY+/Iuwv1Ea+zLQ6JUNkZy8p31Ql76EZhh2bidMGRV/90gw/bA9nw6ZSM2xPSmDiCH38Zi8Nf9IYJBn5E1/Z8CggpzfCRkzR0lEgdEVTEBvEIn0cKlDVQmGmY2nJzt1ctbT59HLGnFJVezmo09gO7/1sG0EyfceQK3JQStTE1dm7D6tFPRS7rap7fxuYQyKs5ATWSpONPUCE0RfHzw+sRDjEvlNdlv1DMR9JZ8Eftwl1GVYNR9hXfjtQUeb6NDh4cbifbc0OipnNNYdXrphoM/jGeW8KCQG/uZcM53AxjOZ6APVZBfGTrVsNAt0pijUQf65c4w4Tvu/roNJ+YSma/8/OU03EvocEOuy0CZQD81G0i0K67yhDQDMejpneCO3Obn1rz681CllecrKN21Pn3LyB85yA047StOGzy8IgSYPvwJrCwJs76aULtj0PsJE6Cd38lHUgxfnkDvRA+B4DyP/8M=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgTG56OTZnCmtoTkNrTjZE\nZ1RaY01NMnJTMzRHQlNFcWNMdUZQOEFwN2hPSlNlc2QzeWx3OXlqWmZqQjQ2aWNE\nSnphUHpOSHIKLzNaWmV2ZEVZVkxJRGRiMkUxdjRyam5SL3BBaTVQSWNiYVNLWHZp\nY1FTVDV3RFpaenFEUkFCZ0NnKzJ6cHF6bwp2K0wvdUx0UG4yVjFBSlR1eTBubW9S\nT0xPZDN2aDVLR2dDb21WQ3FhZHkzR2RXcHFQd1FEYmxKaW1GTEZ3TU82CnRVSHZP\nRFJ5UWlNYkEyVUdtRzNlMXloMEY1blZaYlB3NUZxZ3Rya29TZWcyZ2lEMXE3cUFJ\nZXF0NGJLa0g1YmIKUDZscnJiYit5UmpiUzJzNDBqU2JqVHozSXpZaHROWTRUVEpG\nK1JIMHpSNkozREF0cVdONEhkZ2w0dHhaU0ZwVwo3OE82SUNWbDNZR1JwUG0ydm9Q\nMVA2Z2tuWFdEQWljTms4eTRqbU8xN1p5MzM1M3kyM2lDOVljazd4N2pXSTNWCjY5\nZHBiaHZ1R2dMcnMrckpBVjNBYXNlamJ3NVVQdjhUaDJMWmFJdVdLWkpLazI0dVJP\nU0cyRFJySEJKMEZQRjgKWGZCN1ljbzJSa3V1SkxYTnI0eUI0TnEvY1R4Rjh3WGdn\naFNEN2RSanp1QWI2RURTZGRXZHdka01BOGFaU1ZESgoKLS0tIFBoSGFkQXhtNXc5\nQjUyQ1hHT0ljdGJPYXdtK05iaFlJRVZmZFp4eXdLOEUKNYIiyLeBfAwjjwxBZPl6\nXR+XuI7u0lUIcYti4ebZWlMTmY1Gfp0lK90Ftxq/QQaEWVVmAKbXulsv1pvXjdlV\nV0NACOf+TBKwxZnvqy6hS/ela00nEoH5uf6Emoz4bMymX+0=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_4": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDd4KTlT5GN2+g83JWQlCY1e3pXydzH+GQEVwNBin6WLoHn4aowCmsPGKqj+yWOabGPEXSbu/6GQTKzJRycwiwm4bZA/Y6+PWce8YQVYqJYGN//ltOs8yzSrj+1dArF+yoFc1X3rtT3JXsJkzKDh06XIXnhSFs0qyyOxEiGEirZqWlD7cf5nIOkWXxoBM1T6sxWe0cOthXxiZqPvks3QpR8cqjc9pQI0Ue7aIotAuVaqeDtvylkDFpJl6A7z3ixqy3QdnqoFwLmeeGtxgHVtBidvhIbbJbSeGzfDKkGnUqZtxwXch83HfscrYFZ7+/pRYnQgvx2CGs/KmFrXLTpMoajzThFQQg7c8/F+6C42GlMj8yKVR8QAltlnsHQNC+C/7BG+F1plHstcm1F5HJvZfwW8bHIekCOKC02NFzOYtmUNUBEdQD/eezOUI37G3K701G5185LZj5mShxCvP9/f6E7uN68lLGJk+ozx9PKChaaEqZaYDc1X1cVA05gtTpBafU=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgWHJpOGZ3ClgzUGF2YTZY\nZjRHTWR5M29uR2tPUkNpQjhnSEZNdC96M0VDZTgra09KNmdZVHVVSHZIVnc4eWhp\nZExDV2wzakkKMU8wbEdSVHMzZDdCQzdGQUhjWTczWFNkNFhnNXU0Ym1lUituRnZJ\nRndZeGw2MkdwTW5pN25idzE0cVcwRE52cwpMZ043bEFhZzE4MDlQNnJaUUFVM3hI\nbUlqcmRyM0dXNUZEakJPZ0tScy9nMVNUWHBDNENiYmptNFBaWlZNN3JlCldIVjU2\nVHE1L25la0RZS2l3THlmS3VKMCs0U3hVSHBwb3Z1QW41Y0wySGZIZkJzeUJPdjJ4\nWlYwRGZ4TDZjZG0KdmY0Sk00aXY2QWp4NG1lRFFBL2VXdytaVlkwTUdTOHhrQ3R1\ncWFHcklNcklrbWlrYi9mUnd1R1d0cENrTlZDbQp1MFFiQW1sc0crVFU5TGJVZzFL\nRTFrL3N0cnlQWnM0UEtnK2EvTjJFayt5ZzVZZkVrNDhyRVZXNlBOak41VjFLCm5X\nSVRBUTVrRWVaZitwbkU1SkQwWGVFNUViMFFDcjFlMEJDdEIxbU1SMEMxd0lWcHBZ\nbGZVcUppWnlSZExFd2QKeWtNaStOUFh6K0p2YjI0QjNSWGZWMVRjb2x6aEEzWVVh\nRjNoMXg5cWRNaFM4Z1VVU2RQVUVqUm8xUFZUdmFVRwoKLS0tIGdDNThyZGRmc0ll\nVmNUNHE4TWR1U1F1cSsyOGFiSXJMT2FXVktNV2t2VGMKoRBD03G0KHl4AYpooXWL\naLTwrhXXH1EOV/FxQK/+ONK55GshVLqONVTZpW0DUuCmi2LNecTBUZJNNjm4nIk1\n/KFP5AF44sKfNrvrF4lF7yxDKPEuafxPuSoZBWJS9uHCJ3w=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_5": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCpFyWWvqDlqBPAp82KevK1cYCs8PWz15+R723ffc4ywm5obp7hhb0PB6tv1p7oUzjOnNWosV1VAZnEhsiJO/OA2TwmTvAG5msfRcbSLJiaZv9f3oB/Zm0MP9pvU34CJMZIVWn969htwXA5z7p4hvfmAVy4J9jAveOjH5kGhiysQclJCW0Ncky/YPjuCpOTrzGJzJxAmkDI9I9Fm+4kdxIpA3s1Bkp/pt2XY/jBqefD5ZXd3Bgfv1WvlpQjmYwPuJKnV3UPMSmeAZ66wp+8zUJ3h53G+/htltlB3PovvH9UEJptrrLVBQJCz8Rn0mGBt5Eq+9/OC3Mm7UMR26QiNZSqyGQxSVTg7suPbaGjp0tvCPpdsCkC0s++ANDVfMJ+aCAjTSmwTyj3CHTYpQ1OmIjtvrK8nhSfKk8Nn2LeKqiRbUXC83lSDheBvo7DHw372TeSulSravb58xQi6Q4bIkK55SUaONi3SekFWh+GANzPHreYjE/u4r/G/3zTFMXsg48=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgbXNNQ3h3CmpJRFkwbG8r\nN2cvZUEvSzZJM1ZtTDdoQ2JyK3Zxdk9YT3FRenQybnA1eU5ETUNWbEJDMWF3bHFY\nQ0tQcFdJQXIKWWVrNWpUeUg4cXR3eHIyWlhUdHFIdGtMaHFMYlVLeXpLZWVXTW55\nYkRSUVRZb29EeVhub0l3a2JXdThKWjFCMApLdVNxZU0vYm15QWk0dEhhNzAzazd2\nbmJnMmJGYnFQbTV2NTNQQzZCNUY5RGVmV3FDYTFMUDJDMmdvdjY3cjNPCnRCL28r\nSUhyNUtkK3orNHh6TW51aVZUSldacXl2Vkx2L3oxVnlzTExIaUpQUy9qVHk5R3A3\nVjdkUDhqamxLQU8KZFk2WnQ0SkRFbmpqbE4wUmM4b1JISjhRSjBKZ3VQOStadG8r\nZUFUUzU3R2Y2K0picDZvREJEYkNSWko3RTZMRwpxZ3phTE43ZXdITytnc3QvSUN5\nYjF5MjlrMHVXaGt6QlJNd0l0TU5SV3FDcnZ0ekdaWG5zNmhjK3c0d3RlQm8zCmlQ\nSGxFRXRKb21aeXdDR2lsV0FROVVSUVlWVGhYd1ZzR0NBSythczgrS25WaWdPWW5z\nTXc1MDZUbFJ0RmNRS20KR0lEbExOSUhadVYxRURRTTh6MXZtd0h0RzlkZFVXVjVM\nWFJhdk1LM09IVlNXRzlpbnFROXlRRW1UOWZJbTBXMwoKLS0tIElMSC9vZFR2SWhD\nQlFJcFhSRzZnSGJpd29XZ3U1d09vU3VPcUdlcUNrMWsK2yoQLtWLGja1QTqgsNeA\nQOVgYF/5kkYM55og77wVDNmiTD0myJb6PMytLjz5DRRfti+gpgEdcKb49XecyGLt\ncBRhUUzCFLoL3FUVwL8cnS0D9JVHeGX1sBF7ccCdmTkIyrc=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_6": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGskpLKxHaL6IzPbV6rqBA1uevWA6JV4nad7/gzq5O3jZaByherp0GZI969pvuTJaG91kt5KkamssTIi+zSdK9nh4onyMD/vCLI0pWU1sjF7YZEKW57z7ZxjHurPHzSgXJhTwCpYCvcJckEhZbTwzW8aySfoBpCjgj4XiswNdH/Wi8CYc1zZfKSfWIf3n5r8gtH/znaqb+D5ZHJwNRlfrd8bBjncRBph+LwDWXGAZfjS5EuCtM3it1TJZl0YOlXi3QGGFjOscsG8RBWSzc3T50k6gEWnyQiqyz0vDYvwkWVBY8J4fM+BUvABEqS2sHTgJVsjqfIw0bJDdh9x25iZTAHFJ7knkWn56FYcaVEDtNG1selnrhRNLzjVoheVMpnSy7b5PvugRVKVF+0cLoU/lJHfEdI09T5IpRuIc1Du1+vGYNgNHfxKks15YJLv+wx1OT3vNADu9rZdRpcGOZqCRmOIKXExwcZQnoT+PkJ6MAZodWc1gN9PmPcq0z3hx0Uds=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2Egd3NhVlhBCkNaenBraXZB\nMUx0d0p3dHltL09OWWlGLzBuam9YaVZDb2NtbVJkRTV6eXphS21VRDdPbXBiVWVj\nUEV2UlVMV3EKY1ZXOERaK0tsYUF0ZmdTa0pvY1hwTklkZUxEUlFEWnFEbVE4andT\nM3BocTRIT09FZllyN0h1L1VXa2N5STlyUApkbnRRNlRiMFFEeWZIRDhHUkVBU2gx\nR3E1enA3NXF4ZUdyM3JCRVFiTlJXOGhoakZIcmVtSEdFMFp4bTgwcWV4CmlZRUdX\nUFBGZnJraE1DOTkwN1RCYzM4UlBiT3hGNXJxTStDajhOR3pyWFVHMkZTZTNKWW8v\nbnpaOUdlYmNuM3kKWHhkY1RXK1NIT0pTYnZSUTd4MWpmWUQyMmRPMTVPOWJwbUtv\ndWt3YWIwMjFkUndFQjk4VmZHY0svSHJid2NEegpUVUQvYUhEWDhzSERwQktEVW9r\nUXVINC9ET1cyb1hjYWNaaFowTnNhT2o3N2Fvc3d3cWs3bHFPZkdzTUdVTnNFCk1E\nN0ZFWDU1aENuSEcwZFNMYitYcEpHa0YyWDJxeUs0dnZWdDk0UHhHUmsrM2lRWjFn\nRG0xYXExNjlrbUNFM1AKQ1loOXI2V0R0Vnp6V01BRjFCUnB6ZTZQdkRZYUZPNVdD\nN2JHK1l0Ty92b2ZDZDRSR05kN2VSZTJBMjdFaE80RAoKLS0tIG9JbmE0Z2dpOGZY\ndVpFMU1zWlh6bW1LVFVzS2x3MStIb0xmQ2kvYitKRlkK0aHzjL25+iyf5jcWn1v5\naLblYIlNFEDS3fbR2zlitvQhuTtn6SjENl3SWXH0uBhf50e7EmZL2JE4IBrfFSIq\nRN/56D3yjkq/vDg82Cu/lmYCqsMy1nHCSVClOu2Q2rxVf3M=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_7": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCwRag/eTkE7DeHguIFDO/+r3QUHN2d5ggB2HjCye7xZgQvlVEk3hPizZAeqaQl+j45wtcG7BpCWTr3/g/Es/XwOFM/hdtHyGTw4vkb6HPGCNMSTS5nlpNCd7fCkaP8CSxbHuErLIzGnYkDp4c6Hc6xPnkVEtnmx6mkFus/nlaFBFJa8ev+ndWonIGhblaKwzntt9kNEENSMaJMGM/nrfpyyAod0Tj3ZN3GjMrfNk2PCy2HCUK/4Ksc9N+vSl5HBuD4hKo4mItr8Ir52Jb82kaI2K/UzqzBiC6D/nzM0HIoPV3f33+cXaL3pIPlYwBfh+rthuIXjSlPCPTjhqL3/Xbf4W9n9PjMM+N3v/RZ9jsF0Q8kXfIqxtTV/G9AAdW5b3DzTHDzrEx6QuM3IX3vh92mOR+GJGVfn7/qOeIz80pj6d3aF8L66qn5uZR03LSEAnQaKmiHQsjX0C37oE3EwXVVP3xszHYvUvItD+yPeWMvvwwgBDLQXsBleaZPXwA4POU=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgaTVSSVhnCmE3NzJmdHlN\nM2dLWjUyNTQ0QkxDYVp0V3VZcnRlc0hmMUhQeGxPd0x3V25VbjZsYzVqOVZmQmFN\nM0ZRaG1sTjUKbFJ6MnJCd2xxejZKSjJwZjZ3RFcyQ2hrT3dUZmZXREhCVWNRWlF6\nTnAwSUY2YTl5OXZTZ3dxZ0VCUGY4TmQreQpQZllSR0tpT1BEbm03V1FoTGJydFlE\nRHZGWkVXQzVIUjBIVlE5THZCSWJZMVRPanhaeFlNNGZYcHcyUWJURXRyCnpZSWt6\nUEdYYTQrTWhGT2dGdmhmTnlaWjZqM0NEZTFDd1ltV21ZazlCV0cwM1B0QXdHQmF0\nb00xaDJ2bWJzbWsKUGZqTzh4SWVZazBwWlJqU3lrdkJYN0ZNMVNGcGNrKzBNWUcy\nQ1NpVGZoQ2ZXOXlMTXl4d09PMnBpSjVPVGJQOQo1a1JwYmI5ZUJFWU1hUGhzaWUr\nd1c4dW5EMkd1bWJ0OGtLN2JmdmJQakZBV09UaHp3WWkybjBXT2RyVFhMdHB5Ckpk\nSnp6Y2huNXdrMWZ4bkR1YVdmM1dRb0IybWluSnlka0tKVG5TNWNZZSs3N1VXTlp4\nM0ZHS0RmNmtlRlJacDMKV0pYV2s1K2xsWUNXdHZDb1FCR2VqRzZRSnRPMEJLaDND\ndzByRGhCL21CTmgvVHFSYis0VEVFajRTSmI0MHpyTgoKLS0tIERZUE4rSHVzUWNV\nazgxdkFsTFJydHFkUFdVTW5jM0phVng1Nk9RLzJxVWsK2kTlsXEL3+V5J2BXglu+\na2r2Blk8YMI0fUtocNg33w3ApoCbIjDw0c1JujR/jn4VJ2fQH+E4tOkC/JtDzDbF\nDgy8rgUYjP24Ap43rMc/F4Q1OjTPvALPzbUuAbk9Uh+dlVU=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_8": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7V3anf3CWctiTbZmxyLfsrrfbt7ROfNS8+OGWZTT10gQvU3EMythhpb/nOkOZuUusGG1hqyvRwrvjZ7OlKHW/Hp/H8J/+AE0AnRry/oOMw6c+j3fRFW0fl4NPxOY0oja0vVjEsdJ0uH2YpDj3rGoscPRzEVWsu51uMrNPgYkm7Sj+heQJdmvySrg9Sm/X/DCkO6UXgUuJpBHzM9uHnnQ/a/OcZz0CS42a5yc1QToa13zpsm2qogTtAZRZ7MWz4O11iMOVXNdwtDSmVPU9JLSXbhv+7vLAxrHIaIzrUqfrPW5Q75vB1ghi/BpqzbOfbJP/wID/llZ5ngypJusuIl8R0MOYmWODmyT37M+tHv+5kSXQ8Jl3FhU1g1ltuCHv8KcyPwpLdL8ksiyURXuRwUp3QpigSv64zW9KX8sajX0DoQwxdBoMB6kdmob5IErZSZRs9io1cI4izl+3QQj9U3vmzAmLXO7S8O/UXUkhTAHXaPTRBSarJCDtwcI7oH6/Zqc=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgS3pOYWFnCmNzdDNITW5s\nVEZnakNrZUdyMWkwMDJ1dFhqRjMzeUwzVDFZK2szYU5LemozTUVsYlVibGtzT2tJ\nYVNJdURXMGsKYTlVWm9NcVJ1ZUVubERUaU9wNjM4VU40UFM5dCtIZTdyYnNaekZK\nMDBxd0xReEdDVXo3MlRsSytjZWFpVkVYcApteUtCL2FJbXNOeGxFTGlpTGRncFR5\neXFDV3dTc01QSG0vVU4wdXl5bno4cnQ5ZVJqajh4MTBmbVpVbnByTzgyCnh4SDBp\nT3dZZENzWms5RkFUZlVzQUlTM1NSN0JZQjFLeDR6V1BIRTM0QVUxUTkydXplRnhM\nNUNJN1BOb05OSnkKUjFMKyszTWliek1wUzBGMEtpcTJFVmdRak1ZQUJlc1FCQk5C\nTnpHUFkvRWJyVjRJSzlGRDQ5WTlvWXArSnVidAoxVEhQOGNscUtlSmNDeTFoc09T\nNWYycEhrR2N1Tzg1d1VQWjJMbG4vR25UeUptcGJwUHNQWEV0UGVWWVZDZ2xyCjlX\nTndlNytLTWtWTjJJamYwTmVSRTFnUVBQcHh2a3Y2SlNDU1Y0OWRDSGNXVXFNbEdY\nbjlzQzEvRmJqVVgrRFYKS0wzRFg0RTBqRGdHSGNGcGQ0ZTg0OHVRaGJveVdrM2lI\nZEVpUXlGWDl1aUJuY25PaExDME13RFZ0TU1wYUhuQwoKLS0tIDJEZEFwNVpsU1Rk\nM2k0bGlzVktMRXhkOFNUKzU4ZFFGQ0pxY1gybk01Wm8Kc4oj8uhJlwU7t7PlWXRR\n5AUROFgkicwJJFf+4Mc1DNtycgobcn1vxMuuvoCQzRGFP7bqWDPjjXwoqD1vgKbo\nhPs2cT56RM1ecR1piJ0bTwUdR/Pe+X9/Ur3SLrzwjV7/qgI=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_9": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCubsXbQBbqJHqiQpJuY8DS4Lrk1cXjJa1hYxodtJ0RIoaYrTwg/eVO0lRIUvMLK1k+akgipbDthfv8Gv0Bf7dOVn5Didwdu1X8l0/FmKgz4iibxls/yM8D5KEvmEWNpIiOVOKUl2F5ss/aRSZczbok29PECaJJ1OQuFTyzn91pAmeZbtrvDA8L8NQgkoCC7CQEwKhoKXHwsWDqMgczY7ankrYrcvjHXuvbSpOJmhJdi2X0e8mKwRjdd7I52irq57cwI3Fzht2Id39IxAkLkUoZsEDlkA8cTZhSIbBgsy9EpE7rCawjaBtacJFhr2PISEIUPiTGwJLp4P0GeQmkLvCJlzwGJZ4/CONdIlufYVwhEfjyFcashmB9uACiXMkG6XhSSzubFgz4l2qdTac4eeRhD49BNr3PhnEbA9fJ6t/O95FatcJ3o0UoHrqPZ/g2/dBTFg5VPRkrmZVxJdTLg1Ho4ec8Au0eSj5GaqmOv5q7TiOX8eqKZnK0T4ynmGzpbPk=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgaUtXZjJBCmM1L2hQL1Mx\neWVYbGpNRVErdzFsNm45YmxqaitwbjNjeUF0eitLZzRLc0RKdjZCelhSdkZIMm5E\ncytjeHZLRlIKeExzRDgxMnRkcGM0RWRLZXBhMmZVcXJGWjhYMHFPNGJtNGVZeTB0\nT2VjRHJ3Tmxid0RranhHVk8wNjI2dUloSQpnR2UweUlRKyszSnZnSXpLMVNtTUVK\nWWg3WkxKY04rZXFKQjkzMng5dGF3L3BYTWtleUZGWFpUdW9XaW80MG9jClRDVnpB\nNFNMUVQwVGcwMFNOQU9HMCt3V2ZtMGNIQUpVRjVjdkJxS0VwdW00eVVrNHFSVjRv\nckNxTC9ac2F4MkoKMi9MOEZYZzgvQ1pORHM0MTBlUzl0TTZzcVAyZE5qcjI2L1N3\ncDVYdzFsSGFKRHdoZFhOaWtQMC9sMDZsRjdBNQo2WlNxNHdVYWJDVFpJZXlTT2N3\nM0lTckt0RENUbTJmQ3FacTVVNjhTZGNUTDFDcjBTYVJFZkgzNU0rKzFsWk0wCmpQ\nYTlRWkFrSlBqRUhkTk9xMW5XZFh4bjhpUTZhVlpWek10YWluUjJ6b1hadm13TU1t\nWWJ6MThhc3ZHVHEzbDYKTmZ4MEE2STc1ZmM4V2ZmZnpKY1l1Mk9mVXlZOWpCYUhv\nUzZvQzBydndtU3VzM3JUTEIzTU1mRUlJS2lmUXA5TgoKLS0tIGNWOFVxOUhaRzBh\neDhpWHpHMHNMQUxzdHFpMnNsS3pwa2lkeXkzWXBKZncK/eLPMoslvKa4CJ+UJyMd\n2FPxiGzu+b1BlgEVLByVBCzpNxTipyzVCrY7rRgbUun1gxSMy6XARNaMdd7QAkPe\nwGlIyUKg1RQ9u6zZFYaJtdF1P3Asebo3aGmLXDnyM5DxJkw=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_10": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDk3Me3RVEMRd38VQ+zJWzDcyFZ6CTdq8OVWkhKMGvfI5K4FyI9lCnJAhNrdzZSTHUk41sUdP8MSIwJaaD+mu1NfkdU5UN7CSPLhCC6xpIZcGxRqjESfM2wEaoxX57TJhHYhrguQQ5aAltdCMbee5w91qfh0/xOJEfhAMxt+OePAadsdA7ldXuxm+bgbbE13lUtbqi0+Hl5DfHiPcch/Rtfvjg65B5lKN+22JxneLjvKePKakKewh+I9w/0wPJwt0fhwbIUJvu2wn8f2HrXEMHzggxnZOyfRc1Izin1Bz3jxu+58uNIaN3MIiFe83Yp6qBFREt3OSWTiRCVAQiK4WRU+hNh1MIyDg2tUEmGHGiaZJislibIEThQfDEdEu3gvq/BWPtEpqfN/rExx/tY05Fw1RuBtlR27ZUPNEBYEhUdIYwnUHD4HHQpSBmIKX0CEi96U+LsGvR/sA5qmhW/ekWRJkMezTJHSBF1AqkHZTq/BSDSAlwXM+5KSVDDT78Ijq0=": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgeHNTNnRnCkxHbEV6MHZ0\nWUZaZHUwWlRZN0FDSE0xUUVuaFE3dTdpbktPRUhrMk0zd3M0dXp6WHd5SzZxZEk0\ncW9pRlo0dWsKQnpUWlo1NUROSnp2ck03Y0NpU1k5T0pNT2ZHN1NQZ1pkRS8rdFJB\nU3VicEtUbytnRTB6VWkraTR1Q0ZJMXM1QQpZWFowL1JCMXc5RExNU0plVmFWOXhv\naU5mckRCSmVPMzBjQTAvTnZFVk9qRWtCRENmSzlXY1lLYStMcVo1WXAwCmJiVG1z\najB6am5BLzFWcnhuOTRMYTRBd0kyU2FqOEpxNmRSaE5LM0VSV25xdFlVTWtlTzhi\nT01qUDJ5TW1uNlYKYVlOSTJoYnNDcWhQTitLV3ErSS9XL0YvZ2YvZG1KOWxPQi9V\nYjZXREFCMGZNdlFaZkpvM0pIMEVWRGlRUHlwZwpKbU45c0ZuV3VPWUxtbVVJVjlE\nUlJOWHIxZmhwN0oyTGFYZ0J6aEZRZyttODFQcDJGZGJxSmJSZFVOd1lmR2xSClJL\nbUFhcFV1ZTljNkkxOE1IOWJWM1FTSFJmaDNyTW83VVJDellJR1JWSzRpMlN3VUtR\nL05RSVg0cjhoU1ZZaVEKVVhnc2I2ZHRTZEJuRGFmbGpXN3cxOTUrUUduVjBvOG95\ndGZMaXFTNjVnN0QyTWNhWC9vbDQyTWhSSnJobFUzcAoKLS0tIGRwNUc3Sk90SllD\nUi9QQXIrNjdQMUFxSFJZRU1QQWlKMjI1NTdGbUVNancKxZy0djX2q3FEiNvE6PRw\nqHCXDKb1F+YjLANh5bxapTT/QNuvD7geiMdaVDozbKni4lavAx3sllQ1Vft1Kdjx\n2cpFcR+ViiIR5u+hZqLw0UX/oqv6kbBZYNxE9x6xHhooB0o=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_1": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBkN2QIq1ceN3kJuoG2cIAhdKjgYElhuFXfEPa/zg/Zw": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDZTazd4ZyB1cWdu\najBwS1RLRFVsdkt1TkFwa3F1OVBDckxFODRzWU1WUHJpZmtTS0RZCi9OZXoyTnlG\nV1VtKytBYzhWMkhicWhVbnNnS05seGVhWHFBeVIyUS9yYlUKLS0tIHJJN0trMkNm\nTXJqNitzd3doR0lLSnNnc3grd09jR0J4blZicjJFQTc2T00Ked3yPxdzj3SPlnLH\nYzW2Mv2Tss0/Zf4CCNNt2Ut0jrCIx+ufrWQfXI4uWgzr/KMykw5wupMcf5iFGxcw\nMYJpGkzfPVVMXEAVuYHyPS4QUJY5t5ejhFVob9W8/o/BPtX9+Z4=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_2": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHy3lRhaHpoIyOHbpRPiOgoXuMGiRDv+dt/YYAIZXsy": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFlnY2hiZyBmRWkr\ndUtvbUZlU1UzRk5GeTYzelJVM2xIdkg2bmRrRFNkNlVJSUZ3ckN3CkpIYXpEejlm\nYkg0UGJoTzFIRENuMHI0dXd6YS9lSnlET0NXei85TXpwZ00KLS0tIG16cnlISzFO\nU25PN01RZ0hWMCtnY2loNzdhZCtGczhGUkF5SU9QNCtHc1kKYQGC0PFVYNOPvN4I\nL6BPMNdCRQp3xsf7GSDW2jF1SU2y+RbZm8hmQvjiQESeZeChQ3+z+7WmeMkwGu84\nSUsWsLAyQfKxeqdaHg3QZgeGFPKQZarbleNBM7AaXuy5w8acpdg=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_3": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9W/uLjchMopVFhQCQJI36CTN1HrOKICvJK0wt8/OZu": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5ICtvcGoxQSAxbm1h\nb0hyZUpXL3Y1WVVvNm9ZUk9JKzR1RFBuUkVNR0xWYkxVZ1NJMGdJCjkwa2tML0VI\nNWRjVUJnVEcvT01OQmptVVhkWHk4aEJaOGsvSzhVVHVadXMKLS0tIHhGandmVnFq\nZk5VTUF1anBPc2pmT2tPWElEL1pTSlduL295dVUyTjBHRG8KQOaFqZ0qiL8XN7mo\nZMhGPc21n25HRXKN7EOGiaqkVmcF4r6FKbjMDwDtI0tdzq0PeXyYj6lRlVA9rtu0\nCCHnCSQnT6pInsuiOXfX9rNhnmlR2fTjyxZmjv+66vRrk015Wpo=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_4": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFv7BDHQHSoLuyy/A27sNVit0qmjiBLrPxcSWaG1sLjr": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGtML1JPZyBiYXZG\nWVNrd0VaOE9kem9GTUJFK1pVOUFNdFMwTDhyNlR6REYxMUhDc1Z3Ck9JMERxZm04\nZko2cVVMNHhnVUdqT1Rjdi8vd2xyZlN5RHZhcVRVckxQWTgKLS0tIGFjUXM1b0pE\nQUtSQWtyd1pWTWU4ZElScEs5azh1dy85cEpzc28zNjZzWEEK5taiuDQM/vhoKdca\n0BVyVCvfFDswysIvNh59jykPSIT7dfxSDthYJ7F8RDB/BEvGQqW+SVr0sOAZ2S3o\n5c2LwqFEs12rrY0QG5sY76Pi1IU0K0g4Gep4iEAhatjbG8DLhY8=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_5": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANwY/32eK7WAGqD66pzzzCWOwZ0TzKxPzCsRgnS93MQ": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZaOHpiZyBwWEc0\nUXd6NHYrNDJTdHdWSFo2TElPOE1oTWpYbG8yelFGdkhiVnZJNlNFCnJ1WWhGQ3Vr\nRUo2S1NMeDNjMzN0Y1hKNzBKZnRncmk3N0t5OENacXliSzAKLS0tIEpMN1JDZVMv\naHo3elAreU54TFJmdy93OWpJYTdFOWIwbHRmaWJGaWp5L00KXNyHCADHqfVliDvq\nYVl8WhgRvpG5KDhc0nyIUmrbEctLaOxvv0oV4PjQtPE88Fx47dpp6R5kPfUXhR29\nlcLS22l45BAv6eyBeCN+8Nk0gbqNTVwOhqGYaZf2h0gpolwD/oA=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_6": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII5phKDzDDGsEEJNTmFtcjBokjBwM7s2iuXG5bTb81or": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGZCNTF4USBtcWpY\nTnloOGRITUlMazRURWF5VGxIUk45M2lvYnFySHJPNXZpcFVmUWxrCkphQU5jenUz\nSDk2QTI3bDY4dDVZNGNXQ2Vjd3d3TG1UUFliTUprQ0tob0UKLS0tIExNZEJUMFIz\nVFlwaE9mQjh6cG5zd0xDbFV0U3VCVVI2TXE1c1pYbE1CYlUKs1NyzY8d/y6+uHS2\niR3YmJlaiGNpkpN0VLYPD+JtDmMBxUtByvmXM6VrPScCUtpyRURUGf0xnMrzVdkJ\nzmeJdGLF7ZuItVE+bJh7pyoHZg6306HTcjfxCxN7XVV3GFAwnzQ=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_7": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsde9nm4efyAf8wUpbd4CxtwmgT1ppGa4si6OpT59ZA": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEVab2x1ZyBZQmlM\nakJ1TVRqT2FydDE0T0k0eEJqVnBKc3dtZ2tHQ2daMUhHR2RDZEE4CnpRT2dMOXpq\nRDg5R0tHRWNPS0FFMzh3c2hjSE45MCtDQ0RKclBUTEhtSTAKLS0tIEtna01SMGlI\nWkV0NlkyNEhLTGNNUWsxZG1OTWRhWkhNV2dRNVM0U25VbFUKOWvQT4wKdJOJKWh7\nwolEW+BCiw4nhhc2NgiXE8k/PVUSCThvxmrZOf33V8s2vdDti5DUqqXBoERwr5an\nWJBeW+csDw6yjkuzcKUkZ2BHBbFERjwrazxEZL82aYg0N5ePcYI=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_8": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPD/FLehZAKAxgi3hPPnH3tQZePuWWUpWl2CXEBDfgbo": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHNlWitxUSA3bjJi\nbUNHNHB6dGtuZnFmWmJLN0swSnpPK3F3SWJRNi80U1dBZTNkcmdjClBjNkxPbmpO\nZUgvb1Nwd3JHRTZvSGV1bmFVVTFCUG8xSlUwL0QvN2hqNlEKLS0tIEQ3ekJzT0ll\nR0FvSVJTZ1A2L2I3MTUwZi9sV1FhaHJlV2UrMHEydkxML2cKrOvFkjEn4JBbNhMf\nE5BYXFHQSvvh0p3CwX0A1Z5x0YTcSV5vMYupYhNa3A2zQup18wHx/bTstWLX3TCX\nk4lozcK0ut/HmJ0JO6fyx5OryARbb/I1fVqvRfNX+5VKyoJRzyY=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_9": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH8EN10tMpPS2rXmjlpQcbbEW6YPAgCC4TMZesOoIvbT": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGRKRkRyZyBMOUNG\nREdCb2lxMnM0d0RFQlpSRXlqV1BpLzBsV3lXSTB4cVR4cS92UnowCmszZ2t6N2JL\nQlgwejBKTlZMQWtFQUJucUlvVFQ5VFNQNEZkazAxSkFNb28KLS0tIDlia0Y0c2RG\nWHlheUtOWitHWkovWEg2S09aZWpnSDRLUWR2amhhLzkzN0UKQw74Uevu/3yAa+8Z\nOB897eiXawCL+azpgoWg/A7W9JRBujzbd/lv3IAOJriiitUE0z2VHBop5Vzd0X/S\n9wARzk5caPYW3MvUH0NfGeeYisYjywB2plog2YOJ+j+SiJFqw1M=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "user_ed_10": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFvvL5njZja6WWzTnFzll5hb4bVMyeopSz47pWYqPxZT": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGYrckM0ZyBWSUR2\nZ2RsM1diYVBhdVA5czUvTk9tbVEwWnlIZi8rRjBMU1hWM0R5MEVRCm1nejl3V2Yr\nRkRBcFJ1dGhMVHdCRW0vZUJUTjhWSzhtQTA0WFBiRG4xeEEKLS0tIFFNUTA5eUta\nN0NVR2prSmt2ZmZvdUp2YkJveW0zZkFrNEN6MXJ1OUdRTk0K6d38eHswZ/y0Ygn2\nzSh5fdYJ0uCAi8HSeFA9suxTflJgXiCWffR6/L7lH2rDsEvt/YIaS4b/c71zohcE\no7lyAQaRIoBT5Xy412ZdmmcnxHNyL9RSC7m2lyRU0+zazTjasXc=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "elshan-eth": { + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICUFITRkeetekDlqwPGO2YBPEwMCoUDehxeDLqIPoUC+": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZHdVJJUSBXWmE1\nNk9iZEpwSmNQc0JFNzdRMWtML0ZGdUZ0OTFCMXNURmFkUXAzZWg4CmpQN2grTUo0\naFRpdStLejhHdGVMREJEamlqajJVWkxpZFhDU0Z4MzZ1d3MKLS0tIDZ0dUVvSkN3\nQXlwTnpmUElMV3EvTmZsaEV4cVlWUjlhVzkvZjhVbHFMSVEKjCfLKQnk9OTIf/QG\nrHi8sl6esFPeLEF5OD4GsqK2L0MftRvlg3d64Uly5epsNlPmBkwUoRHWgOpFR0Bm\nBBQhVRqU2IpgpABpyNPlj/tWORc97nKAAweymUy1JaxYHwS18Wk=\n-----END AGE ENCRYPTED FILE-----\n" + }, + "evgenyponomarev": { + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYEwo+vTuiuPXqDGX8MZCnP8PY1mkzBXpjGarvcpm7LiuRVsVxtaRDVAzemn2zKafETjLdgUJ7AXGMT8qqylqVzBi8ZL11TPMCsyEGmd0O8BzLrHnas22Vg9ccxExnSQUJz5WXgc9VeOiY21xKbzKs45xNlLa7WYIVB0yp8iv6ayd8WzFKm6IX6gUFeCGxzfCKZ50nNY2HbOb6y5CgZcTtaZrPLJd8AW8iYz/ftiXyG+hGogtHWdP2ZsLNdPthbwcVR6VVxrxitLp3RoLjrQVBcl2Z1M9+4syRIs6pBqDj9QIMVZRm7FqkGq3VFuzS5sEW2ctrcyLloKU4Nm1VUHruT3mP4GtMH4hW8OYCdqFdkgwNSz3vy2qA5ggle/Hcfqlrmuotln8hy6e+reLEIk0BCuddRIdFdgCxISw/VKnw46nh5RFxoO3qXGlWLQ0ghMd5+aImX0ZKn+ukXe6Q0aAIYFB+Fcj2ZFepFCnE6WIo9/8dW33AMeTlya9XrQ4i2klCOvQxhis4SQQo6IsIYzU4j7apkA+kMw2s8Lz+QXlSDIYAn6XYUZ+CDS0yq+CMtsOrbkLWyqG/guwOQJesazT73crljQaf2Tvi/mVgnjAlaATDP0blgWOsaSQO6x50oRBFQ4O25UUD4oRcmeK5T3fH+TDxG9stEtbG5gHOYwYUbQ==": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1yc2EgTTkzUnpRClZMTFJHYjB5\nVTNEbzJRM0EyeWVIcUtjTTJHU3ZzQjB3ektZUnlsSVo1YjJpSWtaRmN1amhJazJ3\nWFpOVkxScEYKL1ZwdXhiUUQ0ZWR0aTl4czAxVFNqaGNNSVh0QnNrQUNiUE8vS2xo\nWXZiQ2Z1MUtCNDYrdC92WG1rYlhjSFR6YQo5MHI3eUN0cFprWHVqMURobHRsZER6\nM1l6REZBdnF6d3p2UWF3K044QTZtQm9FT0VqTVZHQllzc3FzMGhUZko5ClRxL1Uz\nNlEreTJCTUVGSUxnREhQSnVVdFZudjMrVTNVMUJxZ0xTMzU0MUJMTFRDNHVRdEZz\nQS9TNnFONFh1L2UKWi8wMXlOSXhacnh6MFZseDM1RENMVXVWaTlmQVR4bTl0RW9u\nazNmU2g2cG9JQXFUWDNTKzV2Z0JQTEVQTVhEOQpIVE96OHgzaHppRUZLTXg3bmQz\nZWlHNnVjR0FxWE0vVElkZXRYRlM4ei90YThDV2NrSTlaM0I5L1lCUWc0QXpmCmxq\nQ09BbktBOTVRWitWTUpYUmV4WDRrczREQjNXNWNUb2pnK3FSejU4TTloL1dWQTZR\nNGh5cmJESkkxM1I1QSsKaitQSkNqODdFYkdDTFNoRDErUkhwTnRBN3ZacmRNQlVp\nTEc3OHZLQVZoZTQxN0VhM1M2QUVJSjVtOW41bXRZVword0N6NlhyeVprSURZWENW\nMFlydWNaTG5Nemo4SjcyMHhuVmg1eDFLUHlVUndEelg4QkZBZ2VCL1RiTWMvTkdM\nCkI2NDNGK0FseHZ5VE5aV1BlWnFNb3FjTEdjQ0tkam1qUHlKM3VKblR5c3NkQzlo\nbVFDb24ybzBLeEViZ2o0MXEKbkZRM3NoNGZPNjFORmxSTWR1R3pKZldQM0JuVWI1\nU1hoRElBcmt0L3FwSQotLS0gL0t5S2dkWGhyQU0xNGplNGloQzE5VGpSR1NLc3I0\nYkNvcDcrMk9PRVdjVQqPy7Ae0MBmBK2EQapWionjB5q2QXbWMPtTxz8Xqfu+PHTz\nyptkQez7cM3WLIkeJ9ZUqDNgI6J6DOJF5B2dJHZ9I1YLO/xtm14cccfL9ZkDPUjp\nBEJ54evkhai12YudvNx3dg==\n-----END AGE ENCRYPTED FILE-----\n" + } + } +} \ No newline at end of file diff --git a/web/src/components/App/App.js b/web/src/components/App/App.js index fa3ece1..103a108 100644 --- a/web/src/components/App/App.js +++ b/web/src/components/App/App.js @@ -2,8 +2,6 @@ import { Navigate, Route, Routes, - useLocation, - useNavigate, } from "react-router-dom"; import { useDispatch, useSelector } from "react-redux"; import { memo, useEffect, useState } from "react"; @@ -33,7 +31,6 @@ import { ROUTE_WALLET, } from "../../constants/routes"; import { catchError } from "../../utils"; -import { setCurrentRoute } from "../../store/actions/routes"; import { fetchCurrentAward, fetchMerkleRoot, @@ -45,22 +42,10 @@ function App() { const { network, address } = useWeb3Connection(); const dispatch = useDispatch(); - const navigate = useNavigate(); const { error } = useSelector((state) => state.error); - const [prevAddress, setPrevAddress] = useState(null); - const { username } = useSelector((state) => state.user); - const { currentRoute } = useSelector((state) => state.routes); - const location = useLocation(); - const [locationPut, setLocationPut] = useState(false); const [merkleRootFetched, setMerkleRootFetched] = useState(false); useVh(); - useEffect(() => { - if (currentRoute && !locationPut && currentRoute !== location.pathname) { - navigate(currentRoute); - setLocationPut(true); - } - }, [currentRoute]); useEffect(() => { console.log("nerwork: " + network.name); @@ -73,23 +58,8 @@ function App() { }, [network]); useEffect(() => { - if (address) { - if (prevAddress && address !== prevAddress) { - dispatch(reduxCleanup()); - navigate(ROUTE_INDEX); - dispatch(setCurrentRoute(ROUTE_INDEX)); - } else if (!address && username) { - navigate(ROUTE_WALLET); - } else { - setPrevAddress(address); - } - } - }, [address, prevAddress]); - - useEffect(() => { - window.scrollTo(0, 0); - dispatch(setCurrentRoute(location.pathname)); - }, [location]); + dispatch(reduxCleanup()); + }, [address]); useEffect(() => { if (error) { diff --git a/web/src/components/ConnectWallet/ConnectWallet.js b/web/src/components/ConnectWallet/ConnectWallet.js index df1cf11..8f8019b 100644 --- a/web/src/components/ConnectWallet/ConnectWallet.js +++ b/web/src/components/ConnectWallet/ConnectWallet.js @@ -1,6 +1,5 @@ import Button from "../Button/Button"; import { useWeb3Connection } from "../../hooks/useWeb3Connection"; -//import { getChainData } from '../../utils' const ConnectWallet = () => { const { connect, disconnect, address } = useWeb3Connection(); diff --git a/web/src/components/MainNavigation/MainNavigation.js b/web/src/components/MainNavigation/MainNavigation.js index 5b5c743..1b2baf8 100644 --- a/web/src/components/MainNavigation/MainNavigation.js +++ b/web/src/components/MainNavigation/MainNavigation.js @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import { Link, NavLink } from "react-router-dom"; import Button from "../Button/Button"; @@ -9,9 +8,41 @@ import telegram from "../../images/telegram-black.svg"; import twitter from "../../images/twitter-black.svg"; import youtube from "../../images/youtube-black.svg"; -const MainNavigation = ({ width }) => { - const [active, setActive] = useState("dao"); +const navLinks = [ + { + content: 'Developers', + link: 'https://fluence.network/build' + }, + { + content: 'Network', + link: 'https://fluencenetwork.notion.site/Employ-your-CPUs-with-Fluence-9e721f2c99c944e68e1fc8aaf5a7d96f' + }, + { + content: 'Community', + link: 'https://fluence.network/governance' + }, +]; + +const socialLinks = [ + { + content: icon, + link: 'https://fluence.chat/' + }, + { + content: icon, + link: 'https://twitter.com/fluence_project' + }, + { + content: icon, + link: 'https://t.me/fluence_project' + }, + { + content: icon, + link: 'https://www.youtube.com/@fluencelabs/videos' + }, +]; +const MainNavigation = ({ width }) => { const [IsOpenMenu, setIsOpenMenu] = useState(false); const handleOpenMenu = () => { @@ -42,68 +73,35 @@ const MainNavigation = ({ width }) => { />
-
@@ -111,33 +109,17 @@ const MainNavigation = ({ width }) => { ) : ( )} diff --git a/web/src/components/Progress/Progress.js b/web/src/components/Progress/Progress.js index 543b713..aa65410 100644 --- a/web/src/components/Progress/Progress.js +++ b/web/src/components/Progress/Progress.js @@ -26,15 +26,6 @@ const Progress = () => { Proof -
  • - - Delegation - -
  • diff --git a/web/src/index.js b/web/src/index.js index 450b447..ed06c9a 100644 --- a/web/src/index.js +++ b/web/src/index.js @@ -1,7 +1,7 @@ import "./globals"; import React from "react"; import ReactDOM from "react-dom"; -import { HashRouter as Router } from "react-router-dom"; +import { BrowserRouter } from "react-router-dom"; import { Provider } from "react-redux"; import "./index.css"; import App from "./components/App/App"; @@ -39,9 +39,9 @@ ReactDOM.render( - + - + diff --git a/web/src/pages/begin-page/begin-page.js b/web/src/pages/begin-page/begin-page.js index 58cea54..95ac024 100644 --- a/web/src/pages/begin-page/begin-page.js +++ b/web/src/pages/begin-page/begin-page.js @@ -19,12 +19,11 @@ import { ROUTE_WALLET } from "../../constants/routes"; import { useWeb3Connection } from "../../hooks/useWeb3Connection"; const PageBegin = memo(() => { - const navigate = useNavigate(); const { provider } = useWeb3Connection(); const { currentAward, nextHalvePeriod } = useSelector( (state) => state.distributor, ); - const { username, key } = useSelector((state) => state.user); + const { key } = useSelector((state) => state.user); const [name, setName] = useState(""); const dispatch = useDispatch(); @@ -35,12 +34,6 @@ const PageBegin = memo(() => { key && dispatch(storeKey(key)); }, [provider, key]); - useEffect(() => { - if (username) { - navigate(ROUTE_WALLET); - } - }, [username]); - const [inputValid, setInputValid] = useState(true); const [inputPressed, setInputPressed] = useState(false); @@ -97,6 +90,7 @@ const PageBegin = memo(() => { placeholder="Github username" onChange={handleChangeUsername} /> +

    {inputValid ? <>  : "Incorrect username"}

    diff --git a/web/src/pages/done-page/done-page.js b/web/src/pages/done-page/done-page.js index 25a87e8..1a95ab7 100644 --- a/web/src/pages/done-page/done-page.js +++ b/web/src/pages/done-page/done-page.js @@ -81,8 +81,6 @@ const DonePage = () => { />
    -

    -
    diff --git a/web/src/pages/step1-page/step1-page.js b/web/src/pages/step1-page/step1-page.js index 97e2f7d..4545224 100644 --- a/web/src/pages/step1-page/step1-page.js +++ b/web/src/pages/step1-page/step1-page.js @@ -1,4 +1,4 @@ -import React, { memo, useEffect, useState } from "react"; +import React, { memo, useCallback, useEffect, useState } from "react"; import { Link, useNavigate } from "react-router-dom"; import Header from "../../components/Header/Header"; @@ -13,19 +13,18 @@ import ConnectWallet from "../../components/ConnectWallet/ConnectWallet"; import styles from "./step1-page.module.css"; import { useSelector } from "react-redux"; -import { ROUTE_PROOF } from "../../constants/routes"; import { useWeb3Connection } from "../../hooks/useWeb3Connection"; +import Button from "../../components/Button/Button"; +import { ROUTE_PROOF } from "../../constants/routes"; const FirstStepPage = memo(() => { const navigate = useNavigate(); const { address } = useWeb3Connection(); const { currentAward } = useSelector((state) => state.distributor); - useEffect(() => { - if (address) { - navigate(ROUTE_PROOF); - } - }, [address]); + const submitProofCallback = useCallback(() => { + navigate(ROUTE_PROOF) + }, [navigate]); return (
    @@ -73,6 +72,11 @@ const FirstStepPage = memo(() => {
    + { address && ( +
    +
    + )}

    If you are not comfortable connecting your wallet and submiting the proof via web UI, you can claim directly from the smart diff --git a/web/src/store/actions/common.js b/web/src/store/actions/common.js index cbc14ab..de3c920 100644 --- a/web/src/store/actions/common.js +++ b/web/src/store/actions/common.js @@ -2,7 +2,6 @@ import { ERROR_CLEANUP, GOV_CLEANUP, GRAPH_CLEANUP, - ROUTE_CLEANUP, USER_CLEANUP, } from "./types"; @@ -10,7 +9,6 @@ export const govCleanup = () => ({ type: GOV_CLEANUP }); export const userCleanup = () => ({ type: USER_CLEANUP }); export const graphCleanup = () => ({ type: GRAPH_CLEANUP }); export const errorCleanup = () => ({ type: ERROR_CLEANUP }); -export const routeCleanup = () => ({ type: ROUTE_CLEANUP }); export const reduxCleanup = () => { return async (dispatch) => { @@ -18,6 +16,5 @@ export const reduxCleanup = () => { dispatch(userCleanup()); dispatch(graphCleanup()); dispatch(errorCleanup()); - dispatch(routeCleanup()); }; }; diff --git a/web/src/store/actions/routes.js b/web/src/store/actions/routes.js deleted file mode 100644 index a91eaf3..0000000 --- a/web/src/store/actions/routes.js +++ /dev/null @@ -1,6 +0,0 @@ -import { SET_CURRENT_ROUTE } from "./types"; - -export const setCurrentRoute = (route) => ({ - type: SET_CURRENT_ROUTE, - payload: route, -}); diff --git a/web/src/store/actions/types.js b/web/src/store/actions/types.js index c53443d..c4bd6b7 100644 --- a/web/src/store/actions/types.js +++ b/web/src/store/actions/types.js @@ -20,7 +20,6 @@ export const GOV_CLEANUP = "utils/GOV_CLEANUP"; export const GRAPH_CLEANUP = "utils/GRAPH_CLEANUP"; export const USER_CLEANUP = "utils/USER_CLEANUP"; export const ERROR_CLEANUP = "uitls/ERROR_CLEANUP"; -export const ROUTE_CLEANUP = "uitls/ROUTE_CLEANUP"; /////------------ ROUTES -----------////// export const SET_CURRENT_ROUTE = "routes/SET_CURRENT_ROUTE"; diff --git a/web/src/store/reducers/root.js b/web/src/store/reducers/root.js index eb3411b..467290a 100644 --- a/web/src/store/reducers/root.js +++ b/web/src/store/reducers/root.js @@ -2,13 +2,11 @@ import { combineReducers } from "redux"; import { governanceReducer } from "./governance"; import { userReducer } from "./user"; import { errorReducer } from "./error"; -import { routesReducer } from "./routes"; import { distributorReducer } from "./distributor"; export default combineReducers({ governance: governanceReducer, user: userReducer, error: errorReducer, - routes: routesReducer, distributor: distributorReducer, }); diff --git a/web/src/store/reducers/routes.js b/web/src/store/reducers/routes.js deleted file mode 100644 index 4a48ee8..0000000 --- a/web/src/store/reducers/routes.js +++ /dev/null @@ -1,22 +0,0 @@ -import { ROUTE_CLEANUP, SET_CURRENT_ROUTE } from "../actions/types"; - -const initialState = { - currentRoute: null, -}; - -export const routesReducer = (state = initialState, action) => { - switch (action.type) { - case ROUTE_CLEANUP: { - return initialState; - } - - case SET_CURRENT_ROUTE: - return { - ...state, - currentRoute: action.payload, - }; - - default: - return state; - } -};