Merge branch 'main' into login-design

nepalcodes · Jul 21, 2024 · eec91a7 · eec91a7
2 parents 8bb2e8b + d383cb3
commit eec91a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 27 deletions.
diff --git a/nepalingo-web/src/components/GreetingCard.tsx b/nepalingo-web/src/components/GreetingCard.tsx
@@ -28,7 +28,7 @@ const GreetingCard: React.FC<GreetingCardProps> = ({ name }) => {
       <h1 className="text-3xl font-bold leading-7 text-white">
         {`${getCurrentGreeting()} ${name},`}
       </h1>
-      <p className="px-1 text-sm font-light leading-6 text- mt-2 text-white text-left">
+      <p className=" text-md font-light leading-6 text- mt-2 text-white text-left">
         Lets learn some new words today!
       </p>
     </div>

diff --git a/nepalingo-web/src/pages/Home.tsx b/nepalingo-web/src/pages/Home.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import logo from "@/assets/NewLogoCircular.png";
 import ReactGA from "react-ga4";
 import { useAuth } from "@/hooks/Auth";
 import Header from "@/components/header/Header";
@@ -17,38 +16,21 @@ const Home: React.FC = () => {
   const { user } = useAuth();
 
   return (
-    <div className="flex flex-col w-full justify-between h-screen bg-black text-white font-primary">
+    <div className="flex flex-col w-full h-screen bg-black text-white font-primary">
       <Header />
-      <div className="flex flex-col px-6 items-center justify-center flex-grow">
-        <div className="flex items-center justify-between w-full mt-5 text-xl font-primary font-bold">
+      <div className="flex flex-col px-6 flex-grow">
+        <div className="flex justify-between mt-5 text-xl font-primary font-bold">
           <GreetingCard name={user?.user_metadata?.username} />
           <StreakDisplay />
         </div>
-
-        <div className="flex flex-col items-center mt-5">
-          <div className="w-40 h-40 border-2 border-white rounded-full flex items-center justify-center">
-            <img
-              src={logo}
-              alt="Nepalingo Logo"
-              className="w-full h-full object-contain"
-            />
-          </div>
-          <div className="text-center mt-4">
-            <p className="text-3xl font-bold">Nepalingo</p>
+        <div className="flex flex-row justify-center items-center mt-10 space-x-4 h-full">
+          <div className="flex-1 h-full">
+            <DailyQuiz />
           </div>
-          <div className="text-center mt-2">
-            <p className="text-xl">
-              Learn indigenous languages of Nepal for free
-            </p>
+          <div className="flex-1 h-full">
+            <ViewDictionary />
           </div>
         </div>
-        <div className="mb-5 pt-5">
-          <DailyQuiz />
-        </div>
-
-        <div className="mb-5 pt-5">
-          <ViewDictionary />
-        </div>
       </div>
     </div>
   );