feat: Rebase with navigation-menu branch

State-Channel-4 · Oct 13, 2023 · 9ae5453 · 9ae5453
2 parents bd9702f + 9896fec
commit 9ae5453
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 25 deletions.
diff --git a/app/(stateless-toolbar)/me/page.tsx b/app/(stateless-toolbar)/me/page.tsx
@@ -70,7 +70,7 @@ const Account = () => {
           <Row>
             <p className="font-semibold">Network</p>
             <div className="inline-flex items-center gap-2">
-              <div className="bg-green-500 h-2 w-2 rounded-full"></div>
+              <div className="h-2 w-2 rounded-full bg-green-500"></div>
               <p>Sepolia</p>
             </div>
           </Row>

diff --git a/app/(stateless-toolbar)/sign-in/page.tsx b/app/(stateless-toolbar)/sign-in/page.tsx
@@ -149,15 +149,15 @@ const SignIn = () => {
             loading={isLoading}
             disabled={isLoading}
             onClick={clickLetMeInHandler}
-            className="border-green-500 text-green-500 w-full rounded-full py-6"
+            className="w-full rounded-full border-green-500 py-6 text-green-500"
           >
             Let me in
           </Button>
           <Button
             variant="outline"
             disabled={isLoading}
             onClick={clickDeleteHandler}
-            className="text-green-500 w-full rounded-full border-transparent py-6"
+            className="w-full rounded-full border-transparent py-6 text-green-500"
           >
             Delete local key
           </Button>
@@ -169,7 +169,7 @@ const SignIn = () => {
             loading={isLoading}
             disabled={isLoading}
             onClick={clickStartJourneyHandler}
-            className="border-green-500 text-green-500 rounded-full py-6"
+            className="rounded-full border-green-500 py-6 text-green-500"
           >
             Start your journey
           </Button>
@@ -187,7 +187,7 @@ const SignIn = () => {
                 loading={isLoading}
                 disabled={isLoading}
                 onClick={clickLoadKeyHandler}
-                className="border-green-500 text-green-500 rounded-full py-6"
+                className="rounded-full border-green-500 py-6 text-green-500"
               >
                 Load key
               </Button>
@@ -196,7 +196,7 @@ const SignIn = () => {
                 loading={isLoading}
                 disabled={isLoading}
                 onClick={clickCancelKeyHandler}
-                className="text-green-500 hover:border-green-500 mt-4 rounded-full border-transparent py-6"
+                className="mt-4 rounded-full border-transparent py-6 text-green-500 hover:border-green-500"
               >
                 Cancel
               </Button>
@@ -208,7 +208,7 @@ const SignIn = () => {
                 loading={isLoading}
                 disabled={isLoading}
                 onClick={clickAlreadyHaveKeyHandler}
-                className="text-green-500 hover:border-green-500 mt-4 rounded-full border-transparent py-6"
+                className="mt-4 rounded-full border-transparent py-6 text-green-500 hover:border-green-500"
               >
                 Do you have a key to upload?
               </Button>

diff --git a/app/(stateless-toolbar)/sign-up/page.tsx b/app/(stateless-toolbar)/sign-up/page.tsx
@@ -99,15 +99,15 @@ const SignUp = () => {
             loading={isLoading}
             loadingText="Generating key..."
             onClick={clickDownloadKeyHandler}
-            className="border-green-500 text-green-500 rounded-full py-6"
+            className="rounded-full border-green-500 py-6 text-green-500"
           >
             Download my private key
           </Button>
           {isKeyDownloaded && (
             <Button
               variant="outline"
               onClick={clickAllDoneHandler}
-              className="border-green-500 text-green-500 hover:border-green-500 mt-4 rounded-full py-6"
+              className="mt-4 rounded-full border-green-500 py-6 text-green-500 hover:border-green-500"
             >
               All done
             </Button>
@@ -129,7 +129,7 @@ const SignUp = () => {
             loading={isLoading}
             disabled={isLoading}
             onClick={clickCreateAccountHandler}
-            className="border-green-500 text-green-500 w-full rounded-full py-6"
+            className="w-full rounded-full border-green-500 py-6 text-green-500"
           >
             Create account
           </Button>

diff --git a/app/(stateless-toolbar)/submit-tag/page.tsx b/app/(stateless-toolbar)/submit-tag/page.tsx
@@ -71,7 +71,7 @@ const SubmitTag = () => {
           loading={isLoading}
           disabled={isLoading}
           onClick={onClickCreateHandler}
-          className="border-green-500 text-green-500 rounded-full py-6"
+          className="rounded-full border-green-500 py-6 text-green-500"
         >
           Share it with the world
         </Button>

diff --git a/app/(stateless-toolbar)/submit-url/page.tsx b/app/(stateless-toolbar)/submit-url/page.tsx
@@ -122,7 +122,7 @@ const SubmitUrl = () => {
           loading={isLoading}
           disabled={isLoading}
           onClick={onClickShareItHandler}
-          className="border-green-500 text-green-500 rounded-full py-6"
+          className="rounded-full border-green-500 py-6 text-green-500"
         >
           Share it with the world
         </Button>

diff --git a/components/main-menu.tsx b/components/main-menu.tsx
@@ -31,15 +31,15 @@ export default function MainMenu({ open, onClose }: MainMenuProps) {
           {signedIn && (
             <div className="mb-4 xs:mb-6">
               <Link href={siteConfig.mainNav.addSite.href}>
-                <div className="flex items-center justify-between border-b border-shark-800 p-3 xs:p-4 transition-all hover:border-c4-green">
-                  <div className="text-sm xs:text-base w-full bg-c4-gradient-separator bg-clip-text text-transparent">
+                <div className="flex items-center justify-between border-b border-shark-800 p-3 transition-all hover:border-c4-green xs:p-4">
+                  <div className="w-full bg-c4-gradient-separator bg-clip-text text-sm text-transparent xs:text-base">
                     {siteConfig.mainNav.addSite.title}
                   </div>
                   <Image alt="Browser" src={browserIcon} />
                 </div>
               </Link>
               <Link href={siteConfig.mainNav.dashboard.href}>
-                <div className="p-3 xs:p-4 text-sm xs:text-base border-b border-shark-800 p-4 text-shark-300 transition-all hover:border-c4-green hover:text-shark-200">
+                <div className="border-b border-shark-800 p-3 text-sm text-shark-300 transition-all hover:border-c4-green hover:text-shark-200 xs:p-4 xs:text-base">
                   {siteConfig.mainNav.dashboard.title}
                 </div>
               </Link>
@@ -48,13 +48,13 @@ export default function MainMenu({ open, onClose }: MainMenuProps) {
           <div className="mb-4 xs:mb-6">
             {signedIn ? (
               <Link href={siteConfig.mainNav.changeTags.href}>
-                <div className="p-3 xs:p-4 text-sm xs:text-base border-b border-shark-800 p-4 text-shark-300 transition-all hover:border-c4-green hover:text-shark-200">
+                <div className="border-b border-shark-800 p-3 text-sm text-shark-300 transition-all hover:border-c4-green hover:text-shark-200 xs:p-4 xs:text-base">
                   {siteConfig.mainNav.changeTags.title}
                 </div>
               </Link>
             ) : (
               <div
-                className="p-3 xs:p-4 text-sm xs:text-base border-b border-shark-800 cursor-pointer p-4 text-shark-300 transition-all hover:border-c4-green hover:text-shark-200"
+                className="cursor-pointer border-b border-shark-800 p-3 text-sm text-shark-300 transition-all hover:border-c4-green hover:text-shark-200 xs:p-4 xs:text-base"
                 onClick={() => {
                   signIn()
                   onClose()
@@ -64,26 +64,26 @@ export default function MainMenu({ open, onClose }: MainMenuProps) {
               </div>
             )}
             <Link href={siteConfig.mainNav.stats.href}>
-              <div className="p-3 xs:p-4 text-sm xs:text-base border-b border-shark-800 p-4 text-shark-300 transition-all hover:border-c4-green hover:text-shark-200">
+              <div className="border-b border-shark-800 p-3 text-sm text-shark-300 transition-all hover:border-c4-green hover:text-shark-200 xs:p-4 xs:text-base">
                 {siteConfig.mainNav.stats.title}
               </div>
             </Link>
             <Link href={siteConfig.mainNav.about.href}>
-              <div className="p-3 xs:p-4 text-sm xs:text-base border-b border-shark-800 p-4 text-shark-300 transition-all hover:border-c4-green hover:text-shark-200">
+              <div className="border-b border-shark-800 p-3 text-sm text-shark-300 transition-all hover:border-c4-green hover:text-shark-200 xs:p-4 xs:text-base">
                 {siteConfig.mainNav.about.title}
               </div>
             </Link>
             {signedIn && (
               <Link href={siteConfig.mainNav.feedback.href}>
-                <div className="p-3 xs:p-4 text-sm xs:text-base border-b border-shark-800 p-4 text-shark-300 transition-all hover:border-c4-green hover:text-shark-200">
+                <div className="border-b border-shark-800 p-3 text-sm text-shark-300 transition-all hover:border-c4-green hover:text-shark-200 xs:p-4 xs:text-base">
                   {siteConfig.mainNav.feedback.title}
                 </div>
               </Link>
             )}
           </div>
           {signedIn && (
             <div
-              className="p-3 xs:p-4 text-sm xs:text-base cursor-pointer p-4 text-shark-300 transition-all hover:text-shark-200"
+              className="cursor-pointer p-3 text-sm text-shark-300 transition-all hover:text-shark-200 xs:p-4 xs:text-base"
               onClick={() => {
                 signOut()
                 onClose()
@@ -93,7 +93,7 @@ export default function MainMenu({ open, onClose }: MainMenuProps) {
             </div>
           )}
           <div
-            className="p-3 xs:p-4 text-sm xs:text-base flex cursor-pointer items-center justify-between p-4 text-shark-300 transition-colors hover:text-shark-200"
+            className="flex cursor-pointer items-center justify-between p-3 text-sm text-shark-300 transition-colors hover:text-shark-200 xs:p-4 xs:text-base"
             onClick={() => onClose()}
           >
             <div>Close menu</div>

diff --git a/components/site-header.tsx b/components/site-header.tsx
@@ -23,7 +23,7 @@ export function SiteHeader() {
   return (
     <header className="w-full border-b bg-background">
       <div className="container flex h-16 items-center space-x-4 sm:justify-between sm:space-x-0">
-        <MainNav items={siteConfig.mainNav} />
+        {/* <MainNav items={siteConfig.mainNav} /> */}
         <div className="flex flex-1 items-center justify-end space-x-4">
           <nav className="flex items-center space-x-1">
             <Link
@@ -73,7 +73,8 @@ export function SiteHeader() {
             </Link>
             {/* <ThemeToggle /> */}
             {!(password && userId && token) ? (
-              <SecondaryNav items={siteConfig.secondaryNav} />
+              // <SecondaryNav items={siteConfig.secondaryNav} />
+              <></>
             ) : (
               <Button variant="ghost" onClick={onLogOutClickHandler}>
                 <Icons.logout className="h-5 w-5" />

diff --git a/contexts/AuthContext.tsx b/contexts/AuthContext.tsx
@@ -66,7 +66,7 @@ export const AuthProvider: React.FC<{ children: JSX.Element }> = ({
   }
 
   const signedIn = useMemo(() => {
-    return web3Auth?.status === "connected" && token && userId
+    return web3Auth?.status === "connected" && !!token && !!userId
   }, [token, userId, web3Auth])
 
   useEffect(() => {