--ammend

atlp-rwanda · Jul 8, 2024 · 5bef4df · 5bef4df
1 parent 1558cae
commit 5bef4df
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/public/email.png b/public/email.png
diff --git a/public/failed.png b/public/failed.png
diff --git a/public/index.html b/public/index.html
@@ -1,13 +1,16 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="shortcut icon" href="logo.png" type="image/png">
   <title>E-Commerce Ninjas FrontEnd</title>
 </head>
+
 <body>
   <div id="root"></div>
 </body>
-</html>
+
+</html>
diff --git a/src/components/GoogleCallback.tsx b/src/components/GoogleCallback.tsx
@@ -3,6 +3,8 @@ import React, { useEffect, useState } from 'react';
 import { useAppDispatch } from '../store/store';
 import { googleAuthCallback } from '../store/features/auth/authSlice';
 import { useNavigate } from 'react-router-dom';
+import { PuffLoader } from 'react-spinners';
+import "../../src/styles/Loader.scss";
 
 const GoogleCallback = () => {
   const dispatch = useAppDispatch();
@@ -42,11 +44,15 @@ const GoogleCallback = () => {
   }, [dispatch, navigate]);
 
   if (loading) {
-    return <div>Loading...</div>;
+    return (
+      <div className="loader">
+        <PuffLoader color="#ff6d18" size={300} loading={loading} />
+      </div>
+    );
   }
 
   if (error) {
-    return <div>{error}</div>;
+    return <div className="error-message">{error}</div>;
   }
 
   return <div>Authenticating....</div>;

diff --git a/src/pages/LandingPage.tsx b/src/pages/LandingPage.tsx
@@ -13,8 +13,6 @@ const LandingPage: React.FC = () => {
   const dispatch = useAppDispatch();
   const { products, isError, isSuccess, isLoading, message } = useAppSelector((state: any) => state.products);
 
-  console.log(localStorage.getItem('token'))
-  const welcomeMessage: IWelcomeMessage = useAppSelector((state) => state.initialMessage.welcomeMessage);
   useEffect(() => {
     dispatch(fetchProducts());
   }, [dispatch]);

diff --git a/src/styles/Loader.scss b/src/styles/Loader.scss
@@ -0,0 +1,7 @@
+.loader {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100vh; 
+  }
+
diff --git a/src/styles/signup.scss b/src/styles/signup.scss
@@ -205,7 +205,7 @@
         border-radius: 20px;
         border: 1px solid $border-color;
         background-color: $white-color;
-        width: 400px;
+        width: 300px;
         height: 3.5rem;
         cursor: pointer;
         p {
@@ -216,7 +216,7 @@
         }
 
         .google-icon {
-          font-size: 50px;
+          font-size: 30px;
           color: $primary-color;
         }
       }