[web] - update signup flow (#586)

* [web] - rework onboarding flow * [web] - fix onboarding flow * [web] - fix bug in add dao members by email * [web] - add DAO partners block * [web] - small fix * [web] - cleanup
gosh-sh · Sep 25, 2023 · 9045f6a · 9045f6a
1 parent 074e86a
commit 9045f6a
Show file tree

Hide file tree

Showing 76 changed files with 1,328 additions and 1,402 deletions.
diff --git a/web/.env.ci b/web/.env.ci
@@ -6,4 +6,5 @@ REACT_APP_IPFS = https://ipfs.network.gosh.sh
 REACT_APP_GOSHAI_PROFILE =
 REACT_APP_GOSHAI_NAME =
 REACT_APP_ISDOCKEREXT = false
-REACT_APP_MAINTENANCE = 0 # 0 - none | 1 - alert | 2 - full
+REACT_APP_MAINTENANCE = 0 # 0 - none | 1 - alert | 2 - full
+REACT_APP_DAO_PARTNER = []
diff --git a/web/.env.development b/web/.env.development
@@ -1,9 +1,10 @@
 PUBLIC_URL=/
 REACT_APP_GOSH_NETWORK = http://localhost
-REACT_APP_GOSH_ROOTADDR = 0:38f66aaea340f6022c2c007a6748db6f6e4695ed887b9fb428ddae735409f850
-REACT_APP_GOSH = {"6.0.0": "0:3947ce84d7b11e5e5dc2f2089a6e33486727b1baf7772918b7126710fee25b20", "6.1.0": "0:fa4201a1fcaa671f5acae9e34f6f180b2dc3ee41ee326502a24c9ed491fbf35a"}
+REACT_APP_GOSH_ROOTADDR = 0:8e4ac7d5eb19dd608ae9b8c82773bb171dd756186ae938356229db5ae0ca335d
+REACT_APP_GOSH = {"6.1.0": "0:468a6f03824c527038baca8d0bce32e37875d5c9e2c4da20e5f2ad401b447135"}
 REACT_APP_IPFS = https://ipfs.network.gosh.sh
 REACT_APP_GOSHAI_PROFILE = 0:3b3484aa0585b43397e864d74cf20df53e20411201573344910a155aff61e507
 REACT_APP_GOSHAI_NAME = gosh-ai
 REACT_APP_ISDOCKEREXT = false
 REACT_APP_MAINTENANCE = 0 # 0 - none | 1 - alert | 2 - full
+REACT_APP_DAO_PARTNER = []
diff --git a/web/.env.docker.development b/web/.env.docker.development
@@ -7,3 +7,4 @@ REACT_APP_GOSHAI_PROFILE = 0:e8db351957df2342f9196fde67cda7719326e3da04d93d23f8c
 REACT_APP_GOSHAI_NAME = gosh-ai
 REACT_APP_ISDOCKEREXT = true
 REACT_APP_MAINTENANCE = 0 # 0 - none | 1 - alert | 2 - full
+REACT_APP_DAO_PARTNER = []
diff --git a/web/.env.docker.production b/web/.env.docker.production
@@ -7,3 +7,4 @@ REACT_APP_GOSHAI_PROFILE = 0:7de5c13a1ab0f38232f94f4ba2e520bca9dcc30eb5134e98559
 REACT_APP_GOSHAI_NAME = gosh-ai-bot
 REACT_APP_ISDOCKEREXT = true
 REACT_APP_MAINTENANCE = 0 # 0 - none | 1 - alert | 2 - full
+REACT_APP_DAO_PARTNER = []
diff --git a/web/.env.production b/web/.env.production
@@ -7,3 +7,4 @@ REACT_APP_GOSHAI_PROFILE = 0:7de5c13a1ab0f38232f94f4ba2e520bca9dcc30eb5134e98559
 REACT_APP_GOSHAI_NAME = gosh-ai-bot
 REACT_APP_ISDOCKEREXT = false
 REACT_APP_MAINTENANCE = 0 # 0 - none | 1 - alert | 2 - full
+REACT_APP_DAO_PARTNER = []
diff --git a/web/public/images/github.webp b/web/public/images/github.webp
diff --git a/web/src/appconfig.ts b/web/src/appconfig.ts
@@ -69,6 +69,19 @@ export class AppConfig {
         AppConfig._setupReactGosh()
     }
 
+    static getVersions(options: { reverse?: boolean } = {}) {
+        const { reverse } = options
+
+        let active = Object.keys(AppConfig.versions).filter((v) => {
+            return DISABLED_VERSIONS.indexOf(v) < 0
+        })
+        if (reverse) {
+            active = active.reverse()
+        }
+
+        return Object.fromEntries(active.map((v) => [v, AppConfig.versions[v]]))
+    }
+
     static getLatestVersion() {
         return Object.keys(AppConfig.versions)
             .reverse()

diff --git a/web/src/constants.ts b/web/src/constants.ts
@@ -8,6 +8,10 @@ export const DAO_TOKEN_TRANSFER_TAG = '___!daotokentransfer!___'
 export const VESTING_BALANCE_TAG = '___!vestingbalance!___'
 export const DISABLED_VERSIONS = ['5.0.0', '6.0.0']
 
+export const PARTNER_DAO_NAMES: string[] = JSON.parse(
+    import.meta.env.REACT_APP_DAO_PARTNER || '[]',
+)
+
 export const DaoEventType: { [key: number]: string } = {
     1: 'Pull request',
     2: 'Add branch protection',

diff --git a/web/src/pages/Home/Home.tsx b/web/src/pages/Home/Home.tsx
@@ -1,48 +1,39 @@
-import { Link } from 'react-router-dom'
 import { useRecoilValue } from 'recoil'
-import { userPersistAtom } from 'react-gosh'
+import { ButtonLink } from '../../components/Form'
+import { userPersistAtom } from '../../store/user.state'
+import { Navigate } from 'react-router-dom'
 
 const HomePage = () => {
-    const userStatePersist = useRecoilValue(userPersistAtom)
+    const user = useRecoilValue(userPersistAtom)
+
+    if (user.phrase) {
+        return <Navigate to="/a/orgs" />
+    }
 
     return (
-        <div className="container pt-16">
-            <div className="text-center">
-                <h1 className="text-4xl sm:text-5xl md:text-6xl font-extrabold tracking-tight">
-                    Git Open Source Hodler
-                </h1>
-                <div className="text-base mt-10 sm:text-lg sm:max-w-2xl sm:mx-auto md:text-xl text-left">
-                    <p>GOSH secures delivery and decentralization of your code.</p>
-                    <p className="mt-6">
-                        The first development platform blockchain, purpose-built for
-                        securing the software supply chain and extracting the value locked
-                        in your projects.
-                    </p>
-                </div>
-                <div className="my-10 flex flex-wrap justify-center gap-x-8 gap-y-4">
-                    {userStatePersist.phrase ? (
-                        <Link
-                            to="/a/orgs"
-                            className="btn btn--body py-3 px-10 text-xl leading-normal w-full sm:w-auto"
-                        >
-                            Organizations
-                        </Link>
-                    ) : (
-                        <>
-                            <Link
-                                to="/a/signin"
-                                className="btn btn--body py-3 px-10 text-xl leading-normal w-full sm:w-auto"
-                            >
-                                Sign in
-                            </Link>
-                            <Link
-                                to="/a/signup"
-                                className="btn btn--body py-3 px-10 text-xl leading-normal w-full sm:w-auto"
-                            >
-                                Create account
-                            </Link>
-                        </>
-                    )}
+        <div className="container pt-20 pb-8">
+            <div className="w-full lg:w-1/2">
+                <div className="py-24">
+                    <h1 className="text-5xl font-semibold">
+                        Git Open
+                        <br />
+                        Source Hodler
+                    </h1>
+
+                    <div className="mt-4 text-lg text-gray-53596d">
+                        <p>GOSH secures delivery and decentralization of your code.</p>
+                        <p>
+                            The first development platform blockchain, purpose-built for
+                            securing the software supply chain and extracting the value
+                            locked in your projects.
+                        </p>
+                    </div>
+
+                    <div className="mt-14">
+                        <ButtonLink to="/a/signup" size="xl">
+                            Create account
+                        </ButtonLink>
+                    </div>
                 </div>
             </div>
         </div>

diff --git a/web/src/pages/OnboardingAi/OnboardingAi.tsx b/web/src/pages/OnboardingAi/OnboardingAi.tsx
diff --git a/web/src/pages/OnboardingAi/components/GoshPhrase.tsx b/web/src/pages/OnboardingAi/components/GoshPhrase.tsx