chore: almost done

Author: tanayvaswani

components.json

@@ -6,7 +6,7 @@
   "tailwind": {
     "config": "tailwind.config.js",
     "css": "app/globals.css",
-    "baseColor": "gray",
+    "baseColor": "neutral",
     "cssVariables": true,
     "prefix": ""
   },

package.json

@@ -28,7 +28,7 @@
     "discord-oauth2": "^2.11.0",
     "discord.js": "^14.14.1",
     "jsonwebtoken": "^9.0.2",
-    "lucide-react": "^0.307.0",
+    "lucide-react": "^0.321.0",
     "next": "14.0.2",
     "next-auth": "^4.24.5",
     "next-themes": "^0.2.1",
@@ -39,7 +39,7 @@
     "react-notion-x": "^6.16.0",
     "react-resizable-panels": "^1.0.7",
     "recoil": "^0.7.7",
-    "tailwind-merge": "^2.2.0",
+    "tailwind-merge": "^2.2.1",
     "tailwindcss-animate": "^1.0.7",
     "video.js": "^8.6.1",
     "videojs-contrib-eme": "^3.11.1",

public/fonts/font.woff2

@@ -0,0 +1,11 @@
+import React from 'react';
+
+const MarketingLayout = ({ children }: { children: React.ReactNode }) => {
+  return (
+    <div>
+      <main className="pt-36 pb-20">{children}</main>
+    </div>
+  );
+};
+
+export default MarketingLayout;

public/harkirat.png

@@ -1,5 +1,5 @@
-import { LoginGate } from '@/components/LoginGate';
 import { MyCourses } from '@/components/MyCourses';
+import LandingPage from '@/components/landing/landing-page';
 import { authOptions } from '@/lib/auth';
 import { getServerSession } from 'next-auth';
 
@@ -23,5 +23,5 @@ export default async function Home() {
     );
   }
 
-  return <LoginGate />;
+  return <LandingPage />;
 }

public/next.svg

@@ -1,71 +1,54 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
- 
+
 @layer base {
   :root {
     --background: 0 0% 100%;
     --foreground: 222.2 84% 4.9%;
-
     --card: 0 0% 100%;
     --card-foreground: 222.2 84% 4.9%;
- 
     --popover: 0 0% 100%;
     --popover-foreground: 222.2 84% 4.9%;
- 
-    --primary: 222.2 47.4% 11.2%;
+    --primary: 221.2 83.2% 53.3%;
     --primary-foreground: 210 40% 98%;
- 
     --secondary: 210 40% 96.1%;
     --secondary-foreground: 222.2 47.4% 11.2%;
- 
     --muted: 210 40% 96.1%;
     --muted-foreground: 215.4 16.3% 46.9%;
- 
     --accent: 210 40% 96.1%;
     --accent-foreground: 222.2 47.4% 11.2%;
- 
     --destructive: 0 84.2% 60.2%;
     --destructive-foreground: 210 40% 98%;
-
     --border: 214.3 31.8% 91.4%;
     --input: 214.3 31.8% 91.4%;
-    --ring: 222.2 84% 4.9%;
- 
+    --ring: 221.2 83.2% 53.3%;
     --radius: 0.5rem;
   }
- 
+
   .dark {
     --background: 222.2 84% 4.9%;
     --foreground: 210 40% 98%;
- 
     --card: 222.2 84% 4.9%;
     --card-foreground: 210 40% 98%;
- 
     --popover: 222.2 84% 4.9%;
     --popover-foreground: 210 40% 98%;
- 
-    --primary: 210 40% 98%;
+    --primary: 217.2 91.2% 59.8%;
     --primary-foreground: 222.2 47.4% 11.2%;
- 
     --secondary: 217.2 32.6% 17.5%;
     --secondary-foreground: 210 40% 98%;
- 
     --muted: 217.2 32.6% 17.5%;
     --muted-foreground: 215 20.2% 65.1%;
- 
     --accent: 217.2 32.6% 17.5%;
     --accent-foreground: 210 40% 98%;
- 
     --destructive: 0 62.8% 30.6%;
     --destructive-foreground: 210 40% 98%;
- 
     --border: 217.2 32.6% 17.5%;
     --input: 217.2 32.6% 17.5%;
-    --ring: 212.7 26.8% 83.9%;
+    --ring: 224.3 76.3% 48%;
   }
 }
- 
+
 @layer base {
   * {
     @apply border-border;
@@ -75,5 +58,5 @@
   }
 }
 .video-js .vjs-progress-control:hover .vjs-play-progress:after {
-    display:none;
-}
+  display: none;
+}

public/platform/dashboard.png

@@ -6,15 +6,23 @@ import './globals.css';
 import { Appbar } from '@/components/Appbar';
 import { Providers } from './providers';
 import { GoogleAnalytics } from '@/components/analytics/GoogleAnalytics';
+import { siteConfig } from '@/config/site-config';
+import Footer from '@/components/landing/footer/footer';
 
 const fontSans = FontSans({
   subsets: ['latin'],
   variable: '--font-sans',
 });
 
 export const metadata: Metadata = {
-  title: '100xdevs cohort',
-  description: '100xdevs Cohort by Harkirat Singh',
+  title: siteConfig.title,
+  description: siteConfig.description,
+  icons: [
+    {
+      url: '/harkirat.png',
+      href: '/harkirat.png',
+    },
+  ],
 };
 
 export default function RootLayout({
@@ -34,6 +42,7 @@ export default function RootLayout({
         <Providers>
           <Appbar />
           {children}
+          <Footer />
         </Providers>
       </body>
     </html>

public/platform/discord.png

@@ -1,63 +1,76 @@
 'use client';
+
 import Link from 'next/link';
 import React from 'react';
-import {
-  NavigationMenu,
-  NavigationMenuItem,
-  NavigationMenuLink,
-  NavigationMenuList,
-  navigationMenuTriggerStyle,
-} from '@/components/ui/navigation-menu';
 import { JoinDiscord } from './JoinDiscord';
 import { AppbarAuth } from './AppbarAuth';
 import { useSession } from 'next-auth/react';
+import Logo from './landing/logo/logo';
+import { Button } from './ui/button';
+import { Sparkles } from 'lucide-react';
 
 export const Appbar = () => {
   const session = useSession();
 
   return (
-    <nav className="">
-      <div className="flex flex-wrap items-center justify-between mx-auto p-4">
-        <div className="flex">
-          <Link
-            href="/"
-            className="flex items-center space-x-3 rtl:space-x-reverse"
-          >
-            <img
-              src="https://appx-wsb.classx.co.in/subject/2023-01-17-0.17044360120951185.jpg"
-              className="h-8 rounded-full"
-              alt="Flowbite Logo"
-            />
-            <span className="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">
-              100xdevs
-            </span>
-          </Link>
-          <div className="flex justify-center ml-4">
-            {session?.data?.user ? (
-              <NavigationMenu>
-                <NavigationMenuList>
-                  <NavigationMenuItem>
-                    <JoinDiscord />
-                  </NavigationMenuItem>
-                  <NavigationMenuItem>
-                    <Link
-                      href="https://github.com/100xdevs-cohort-2/assignments"
-                      legacyBehavior
-                      passHref
+    <nav className="fixed z-50 top-0 px-4 w-full h-16 border-b shadow-sm bg-background/60 backdrop-blur-md flex items-center">
+      <div className="md:max-w-screen-2xl mx-auto flex items-center justify-between w-full">
+        <Logo />
+        {/* {session?.data?.user ? (
+            <NavigationMenu>
+              <NavigationMenuList>
+                <NavigationMenuItem>
+                  <JoinDiscord />
+                </NavigationMenuItem>
+
+                <NavigationMenuItem>
+                  <Link
+                    href="https://github.com/100xdevs-cohort-2/assignments"
+                    legacyBehavior
+                    passHref
+                  >
+                    <NavigationMenuLink
+                      className={navigationMenuTriggerStyle()}
                     >
-                      <NavigationMenuLink
-                        className={navigationMenuTriggerStyle()}
-                      >
-                        Assignments
-                      </NavigationMenuLink>
-                    </Link>
-                  </NavigationMenuItem>
-                </NavigationMenuList>
-              </NavigationMenu>
-            ) : null}
+                      Assignments
+                    </NavigationMenuLink>
+                  </Link>
+                </NavigationMenuItem>
+              </NavigationMenuList>
+            </NavigationMenu>
+          ) : null} */}
+
+        {session?.data?.user ? (
+          <div className="flex items-center justify-around md:w-auto md:block space-x-2">
+            <Button variant={'outline'} size={'sm'} asChild>
+              <JoinDiscord isNavigated={false} />
+            </Button>
+
+            <Button size={'sm'} asChild>
+              <Link
+                href={'https://github.com/100xdevs-cohort-2/assignments'}
+                target="_blank"
+              >
+                Assignments
+              </Link>
+            </Button>
+
+            <AppbarAuth />
+          </div>
+        ) : (
+          <div className="flex items-center justify-around md:w-auto md:block space-x-3">
+            <AppbarAuth />
+
+            <Button size={'sm'} asChild>
+              <Link
+                href={'https://harkirat.classx.co.in/new-courses'}
+                target="_blank"
+              >
+                Join now <Sparkles className="ml-1 h-4 w-4" />
+              </Link>
+            </Button>
           </div>
-        </div>
-        <AppbarAuth />
+        )}
       </div>
     </nav>
   );

public/platform/platform.png

@@ -1,30 +1,28 @@
 'use client';
+
 import { signOut } from 'next-auth/react';
 import { useSession } from 'next-auth/react';
 import { useRouter } from 'next/navigation';
+import { Button } from './ui/button';
 
 export const AppbarAuth = () => {
   const session = useSession();
   const router = useRouter();
 
   return (
-    <div className="hidden w-full md:block md:w-auto" id="navbar-default">
-      <ul className="font-medium flex flex-col p-4 md:p-0 mt-4 border border-gray-100 rounded-lg bg-gray-50 md:flex-row md:space-x-8 rtl:space-x-reverse md:mt-0 md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700 p-4">
-        <li>
-          <div
-            onClick={() => {
-              if (session.data?.user) {
-                signOut();
-              } else {
-                router.push('/api/auth/signin');
-              }
-            }}
-            className="cursor-pointer p-2 "
-          >
-            {session.data?.user ? 'Logout' : 'Sign in'}
-          </div>
-        </li>
-      </ul>
-    </div>
+    <Button
+      size={'sm'}
+      variant={'outline'}
+      id="navbar-default"
+      onClick={() => {
+        if (session.data?.user) {
+          signOut();
+        } else {
+          router.push('/api/auth/signin');
+        }
+      }}
+    >
+      {session.data?.user ? 'Logout' : 'Login'}
+    </Button>
   );
 };

public/platform/playstore.png

@@ -4,13 +4,28 @@ import {
   NavigationMenuLink,
   navigationMenuTriggerStyle,
 } from '@/components/ui/navigation-menu';
+import { Button } from './ui/button';
+
+export const JoinDiscord = ({
+  isNavigated = true,
+}: {
+  isNavigated?: boolean
+}) => {
+  if (isNavigated) {
+    return (
+      <Link href={getOauthUrl()} target="_blank" legacyBehavior passHref>
+        <NavigationMenuLink className={navigationMenuTriggerStyle()}>
+          Join Discord
+        </NavigationMenuLink>
+      </Link>
+    );
+  }
 
-export const JoinDiscord = () => {
   return (
     <Link href={getOauthUrl()} target="_blank" legacyBehavior passHref>
-      <NavigationMenuLink className={navigationMenuTriggerStyle()}>
+      <Button variant={'outline'} size={'sm'}>
         Join Discord
-      </NavigationMenuLink>
+      </Button>
     </Link>
   );
 };