Merge pull request #35 from deniodev/dev

Submmit Reviews
deniodev · May 25, 2024 · 9b1528d · 9b1528d
2 parents 3575ebf + 3f2c915
commit 9b1528d
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 26 deletions.
diff --git a/client/src/components/Footer.jsx b/client/src/components/Footer.jsx
@@ -7,32 +7,32 @@ export default function Footer() {
     <div className="pb-4  border">
       <div className="flex items-center justify-center space-x-4 mb-2 text-3xl mt-4">
         <Link
-          to="https://github.com/deniodev/moz-services"
+          to="https://github.com/deniodev/get-services"
           target="_blank"
           className="hover:scale-110 transition-transform duration-500"
         >
-          <BsGithub />
+          <BsGithub size={20} />
         </Link>
         <Link
           to="/"
           target="_blank"
           className="hover:scale-110 transition-transform duration-500"
         >
-          <BsFacebook />
+          <BsFacebook size={20} />
         </Link>
         <Link
           to="/"
           target="_blank"
           className="hover:scale-110 transition-transform duration-500"
         >
-          <BsInstagram />
+          <BsInstagram size={20} />
         </Link>
         <Link
           to="/"
           target="_blank"
           className="hover:scale-110 transition-transform duration-500"
         >
-          <BsYoutube />
+          <BsYoutube size={20} />
         </Link>
       </div>
 

diff --git a/client/src/components/Header.jsx b/client/src/components/Header.jsx
@@ -35,7 +35,7 @@ export default function Header() {
   return (
     <div className="border-b">
       <header className="flex h-16 items-center gap-4  bg-background max-w-screen-xl mx-auto p-3">
-        <nav className="hidden flex-col gap-4 text-lg font-medium md:flex md:flex-row md:items-center md:gap-5 md:text-sm lg:gap-6 ">
+        <nav className="hidden flex-col gap-4 text-lg font-bold md:flex md:flex-row md:items-center md:gap-5 md:text-sm lg:gap-6 ">
           <Link to="/">
             <img
               src={logoBlack}

diff --git a/client/src/pages/About.jsx b/client/src/pages/About.jsx
@@ -5,7 +5,6 @@ import {
   AccordionItem,
   AccordionTrigger,
 } from '../components/ui/accordion';
-import Footer from '../components/Footer';
 
 const About = () => {
   const { t } = useTranslation();
@@ -48,7 +47,6 @@ const About = () => {
           </div>
         </div>
       </div>
-      <Footer />
     </>
   );
 };

diff --git a/client/src/pages/Contact.jsx b/client/src/pages/Contact.jsx
@@ -32,13 +32,13 @@ const Contact = () => {
 
   return (
     <section>
-      <div className="p-3 max-w-4xl mx-auto">
-        <h1 className="text-3xl font-semibold text-center p-2">
+      <div className="p-3 max-w-screen-xl mx-auto">
+        <h1 className="scroll-m-20 text-4xl font-bold tracking-tight lg:text-5xl">
           {' '}
           {t('contact1')}{' '}
         </h1>
-        <p className="text-s leading-loose text-center">{t('contact2')}</p>
-        <form ref={form} onSubmit={sendEmail} className="space-y-8 ml-5 mr-5">
+        <p className="leading-7 [&:not(:first-child)]:mt-6">{t('contact2')}</p>
+        <form ref={form} onSubmit={sendEmail} className="space-y-8 mt-8">
           <div>
             <Label htmlFor="name" className="ml-1">
               {t('name')}

diff --git a/client/src/pages/Profile.jsx b/client/src/pages/Profile.jsx
@@ -196,7 +196,7 @@ const Profile = () => {
                 src={formData.avatar || currentUser.avatar}
                 alt="profile"
               />
-              <AvatarFallback>HS</AvatarFallback>
+              <AvatarFallback>GS</AvatarFallback>
             </Avatar>
             <p className="text-sm self-center">
               {fileUploadError && (

diff --git a/client/src/pages/Service.jsx b/client/src/pages/Service.jsx
@@ -104,6 +104,32 @@ const Service = () => {
         throw new Error(result.message);
       }
 
+      setservice((prevService) => {
+        const newReview = {
+          rating,
+          reviewText,
+          createdAt: new Date().toISOString(),
+          user: {
+            avatar: currentUser.avatar,
+            username: currentUser.username,
+          },
+        };
+
+        const updatedReviews = [newReview, ...prevService.reviews];
+        const updatedTotalRating = prevService.totalRating + 1;
+        const updatedAverageRating = (
+          (prevService.averageRating * prevService.totalRating + rating) /
+          updatedTotalRating
+        ).toFixed(1);
+
+        return {
+          ...prevService,
+          reviews: updatedReviews,
+          totalRating: updatedTotalRating,
+          averageRating: updatedAverageRating,
+        };
+      });
+
       setLoading(false);
       toast.success(result.message);
     } catch (err) {
@@ -145,11 +171,13 @@ const Service = () => {
           <div className="lg:col-span-2">
             <div className="flex flex-col max-w-4xl mx-auto p-3 md:my-7 gap-4">
               <div className="flex gap-4 ">
-                <img
-                  src={service.coverImg}
-                  alt=""
-                  className="max-w-[200px] max-h-[200px] rounded-lg"
-                />
+                <Avatar className="w-[200px] h-[200px] ">
+                  <AvatarImage
+                    src={service.coverImg}
+                    alt="cover image"
+                    className="object-cover"
+                  />
+                </Avatar>
 
                 <div className="">
                   <Badge variant="outline">{service.title}</Badge>
@@ -186,25 +214,25 @@ const Service = () => {
                     <DrawerContent>
                       <DrawerFooter className="flex flex-row justify-between">
                         <Link to={`tel:${service.phone}`} target="_blank">
-                          <Button variant="outline">
+                          <Button variant="outline" title={`${service.phone}`}>
                             <PhoneCall />
                           </Button>
                         </Link>
                         <Link to={`sms:${service.phone}`} target="_blank">
-                          <Button variant="outline">
+                          <Button variant="outline" title={`${service.phone}`}>
                             <MessageSquareText />
                           </Button>
                         </Link>
                         <Link
                           to={`http://wa.me/${service.phone}`}
                           target="_blank"
                         >
-                          <Button variant="outline">
+                          <Button variant="outline" title={`${service.phone}`}>
                             <FaWhatsapp size={25} />
                           </Button>
                         </Link>
                         <DrawerClose>
-                          <Button variant="outline">
+                          <Button variant="outline" title="Exit">
                             <CircleX />
                           </Button>
                         </DrawerClose>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "home-services",
+  "name": "get-services",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -21,4 +21,4 @@
     "mongoose": "^8.3.1",
     "nodemon": "^3.1.0"
   }
-}
+}