Merge pull request #19 from khanghy2130/style-profile-route

Style profile route
khanghy2130 · Sep 21, 2024 · 84eeab4 · 84eeab4
2 parents f3d5947 + fc2e709
commit 84eeab4
Show file tree

Hide file tree

Showing 23 changed files with 1,140 additions and 670 deletions.
diff --git a/app/components/Footer.tsx b/app/components/Footer.tsx
@@ -0,0 +1,13 @@
+export default function Footer() {
+    return (
+        <div className="flex w-full flex-grow items-end pt-10">
+            <div className="text-md flex w-full flex-col items-center bg-black px-2 py-3 text-center text-gray-200 sm:px-20 sm:text-lg">
+                <h2>&copy; {new Date().getFullYear()} Hy Nguyen</h2>
+                <h2>
+                    <span className="font-bold">Disclaimer:</span> This is a
+                    demo website project, not a real online store!
+                </h2>
+            </div>
+        </div>
+    );
+}
diff --git a/app/components/Navbar.tsx b/app/components/Navbar.tsx
@@ -1,4 +1,3 @@
-import { useEffect, useState, useRef } from "react";
 import { Link } from "@remix-run/react";
 
 import brandTextImage from "~/assets/brand_text.png";

diff --git a/app/root.tsx b/app/root.tsx
@@ -31,6 +31,7 @@ import {
     RawCartItem,
 } from "./utils/types/ContextProps.type";
 import PopupNotificationsList from "./components/PopupNotificationsList";
+import Footer from "./components/Footer";
 
 export const links: LinksFunction = () => [
     { rel: "stylesheet", href: stylesheet },
@@ -218,6 +219,8 @@ function App() {
                     />
                 </div>
 
+                <Footer />
+
                 <PopupNotificationsList notifications={notifications} />
 
                 <Scripts />

diff --git a/app/routes/orders/OrderItem.tsx b/app/routes/orders/OrderItem.tsx
diff --git a/app/routes/orders/OrderModal.tsx b/app/routes/orders/OrderModal.tsx
diff --git a/app/routes/product.$productID/reviews_section/ReviewForm.tsx b/app/routes/product.$productID/reviews_section/ReviewForm.tsx
@@ -182,14 +182,14 @@ export default function ReviewForm({
             {!enableFormInput ? (
                 <div className="flex justify-end">
                     <button
-                        className="rounded-md bg-bgColor2 px-3 py-1 text-sm font-medium text-primaryTextColor hover:bg-bgColor3"
+                        className="rounded-md bg-bgColor2 px-3 py-1 text-sm font-medium text-textColor1 hover:bg-bgColor3"
                         type="button"
                         onClick={() => setEnableFormInput(true)}
                     >
                         Edit
                     </button>
                     <button
-                        className="ml-2 rounded-md bg-bgColor2 px-3 py-1 text-sm font-medium text-primaryTextColor hover:bg-bgColor3"
+                        className="ml-2 rounded-md bg-bgColor2 px-3 py-1 text-sm font-medium text-textColor1 hover:bg-bgColor3"
                         type="button"
                         onClick={deleteReview}
                     >