Merge pull request #97 from SilverCareOrg/ion-stefan

Changed everything to eldie
SilverCareOrg · Mar 11, 2024 · 80fccff · 80fccff
2 parents 4666101 + e2fc8e5
commit 80fccff
Show file tree

Hide file tree

Showing 19 changed files with 10,854 additions and 35 deletions.
diff --git a/.env.development b/.env.development
@@ -1,3 +1,4 @@
 REACT_APP_SERVER_IMAGE_PATH=../images/
 REACT_APP_API=http://localhost:8000
-REACT_APP_STRIPE_KEY=pk_live_51NoOzJAJfj2tXT7snl3x4aVedF1MDYUZUaq3Vb1BhYSehOpW6M5Xg3K67MDosAW0Vv5XWntJ5C6RdEJx0IzLffri00H23t5jPN
+REACT_APP_STRIPE_KEY=pk_live_51NoOzJAJfj2tXT7snl3x4aVedF1MDYUZUaq3Vb1BhYSehOpW6M5Xg3K67MDosAW0Vv5XWntJ5C6RdEJx0IzLffri00H23t5jPN
+REACT_APP_HOTJAR_SITEID = 3894382
diff --git a/.env.production b/.env.production
@@ -1,3 +1,5 @@
 REACT_APP_SERVER_IMAGE_PATH=https://eldie.ro/public-images/
 REACT_APP_API=https://eldie.ro/api
 REACT_APP_STRIPE_KEY=pk_live_51NoOzJAJfj2tXT7snl3x4aVedF1MDYUZUaq3Vb1BhYSehOpW6M5Xg3K67MDosAW0Vv5XWntJ5C6RdEJx0IzLffri00H23t5jPN
+REACT_APP_HOTJAR_SITEID = 3894382
+
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
     "dependencies": {
         "@headlessui/react": "^1.7.15",
         "@heroicons/react": "^2.0.18",
+        "@hotjar/browser": "^1.0.9",
         "@material-tailwind/react": "^2.0.6",
         "@material-ui/core": "^4.12.4",
         "@stripe/react-stripe-js": "^2.2.0",

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon.png b/public/favicon.png
diff --git a/public/index.html b/public/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
-    <title>SilverCare</title>
+    <title>Eldie</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/public/logo_sc_circle.ico b/public/logo_sc_circle.ico
diff --git a/public/logo_sc_circle.png b/public/logo_sc_circle.png
diff --git a/src/App.jsx b/src/App.jsx
@@ -32,6 +32,9 @@ import ScrollOnTopOnRefresh from "./components/ScrollOnTopOnRefresh";
 import PaymentCartPanel from "./components/PaymentCartPanel";
 import AdminUpdateArticleTable from "./pages/AdminUpdateArticleTable.jsx";
 import AdminUpdateArticle from "./pages/AdminUpdateArticle.jsx";
+import Hotjar from "@hotjar/browser";
+const hotjarVersion = 6;
+Hotjar.init(process.env.REACT_APP_HOTJAR_SITEID, hotjarVersion);
 
 const stripePromise = loadStripe(process.env.REACT_APP_STRIPE_KEY);
 

diff --git a/src/components/CheckArticles.jsx b/src/components/CheckArticles.jsx
@@ -0,0 +1,25 @@
+import { NavLink } from "react-router-dom";
+
+const CheckArticles = () => {
+  return (
+    <div className=" bg-light-purple mt-10 mb-20 h-56 lg:h-48 flex items-center justify-center ">
+      <div className="w-full flex items-center  justify-center flex-col lg:flex-row lg:justify-between md:px-28 max-w-[1450px]">
+        <div className="flex flex-col items-center lg:items-start justify-center max-lg:text-center">
+          <div className="flex-col text-lg sm:text-xl md:text-2xl tracking-[0.05em]  font-semibold flex items-center h-10 shrink-0 ">
+            Descoperă articolele noastre
+          </div>
+          <div className="text-sm pb-3 lg:pb-0 sm:text-md md:text-lg tracking-[0.025em] leading-[24px] flex items-center max-w-[350px] sm:max-w-[586px] shrink-0">
+            Explorează articolele noastre acum și descoperă modalități de a trăi o viață activă și împlinită la orice vârstă!
+          </div>
+        </div>
+        <NavLink to="/articles">
+          <div className="rounded bg-accent w-[274px] py-4 flex flex-row items-center justify-start box-border text-center text-sm text-white">
+            <b className="flex-1 tracking-[0.15em] uppercase">explorează articole</b>
+          </div>
+        </NavLink>
+      </div>
+    </div>
+  );
+};
+
+export default CheckArticles;
diff --git a/src/components/Footer.js b/src/components/Footer.js
@@ -64,7 +64,7 @@ const AboutSection = () => {
   return (
     <div className="flex-1 flex flex-col items-start justify-start max-lg:gap-[10px] lg:gap-[24px]">
       <div className="self-stretch relative tracking-[0.05em] leading-[24px] font-extrabold">
-        Despre SilverCare
+        Despre Eldie
       </div>
       <div className="self-stretch flex flex-col items-start justify-start gap-[8px]">
         <Link to="/about">
@@ -115,7 +115,7 @@ const OptionsSection = () => {
 const ExtraSection = () => {
   return (
     <div className="self-stretch w-72 flex flex-col items-start justify-start gap-[48px] text-right text-17xl text-white">
-      <div className="lg:text-right self-stretch relative tracking-[0.05em] leading-[120%] font-semibold text-3xl flex lg:items-end lg:justify-end h-8 shrink-0">{`SilverCare `}</div>
+      <div className="lg:text-right self-stretch relative tracking-[0.05em] leading-[120%] font-semibold text-3xl flex lg:items-end lg:justify-end h-8 shrink-0">{`Eldie `}</div>
       <div className="self-stretch h-5 flex flex-row items-end justify-end gap-[15px]">
         <a
           href="https://www.linkedin.com/company/96455905"
@@ -136,7 +136,7 @@ const ExtraSection = () => {
         <div className="relative tracking-[0.05em] leading-[24px] font-medium">{`Contact: `}</div>
         <div className="flex-1 flex flex-col items-start justify-start gap-[16px] text-right font-open-sans">
           <b className="self-stretch relative tracking-[0.1em] leading-[24px]">
-            office@silvercare.com
+            office@eldie.com
           </b>
           <b className="self-stretch relative tracking-[0.1em] leading-[24px]">
             +40 766 551 409
@@ -153,7 +153,7 @@ const ExtraSection = () => {
 const Copyright = () => {
   return (
     <div className="relative tracking-[0.05em] leading-[24px] max-lg:font-xsmall lg:font-medium">
-      @ Copyright 2023, SilverCare, All Rights Reserved
+      @ Copyright 2023, Eldie, All Rights Reserved
     </div>
   );
 };
@@ -162,28 +162,28 @@ const TermsSection = () => {
   return (
     <div className="max-lg:flex max-lg:flex-col justify-start">
       <div className="flex flex-row items-center justify-start gap-[32px]">
-        <div className="relative tracking-[0.05em] leading-[24px] max-lg:font-small lg:font-medium">
-          Legal
-        </div>
-        <img className="relative w-[1rem] h-[1rem]" alt="" src={slash_svg} />
+        {/* <div className="relative tracking-[0.05em] leading-[24px] max-lg:font-small lg:font-medium"> */}
+        {/*   Legal */}
+        {/* </div> */}
+        {/* <img className="relative w-[1rem] h-[1rem]" alt="" src={slash_svg} /> */}
         <div className="relative tracking-[0.05em] leading-[24px] max-lg:font-small lg:font-medium">
           <a href="/TermeniSiConditii">Termeni și conditii</a>
         </div>
-        <img
-          className="max-lg:hidden relative w-[1rem] h-[1rem]"
-          alt=""
-          src={slash_svg}
-        />
-        <div className="max-lg:hidden relative tracking-[0.05em] leading-[24px] max-lg:font-small lg:font-medium">
-          Politică de confidențialitate
-        </div>
+        {/* <img */}
+        {/*   className="max-lg:hidden relative w-[1rem] h-[1rem]" */}
+        {/*   alt="" */}
+        {/*   src={slash_svg} */}
+        {/* /> */}
+        {/* <div className="max-lg:hidden relative tracking-[0.05em] leading-[24px] max-lg:font-small lg:font-medium"> */}
+        {/*   Politică de confidențialitate */}
+        {/* </div> */}
       </div>
 
-      <div className="lg:hidden flex flex-row items-center justify-start pt-2">
-        <div className="relative tracking-[0.05em] leading-[24px] max-lg:font-small lg:font-medium">
-          Politică de confidențialitate
-        </div>
-      </div>
+      {/* <div className="lg:hidden flex flex-row items-center justify-start pt-2"> */}
+      {/*   <div className="relative tracking-[0.05em] leading-[24px] max-lg:font-small lg:font-medium"> */}
+      {/*     Politică de confidențialitate */}
+      {/*   </div> */}
+      {/* </div> */}
     </div>
   );
 };

diff --git a/src/components/JoinUs.js b/src/components/JoinUs.js
@@ -6,10 +6,10 @@ const JoinUs = () => {
       <div className="w-full flex items-center  justify-center flex-col lg:flex-row lg:justify-between md:px-28 max-w-[1450px]">
         <div className="flex flex-col items-center lg:items-start">
           <div className="flex-col text-lg sm:text-2xl md:text-3xl tracking-[0.05em]  font-semibold flex items-center h-10 shrink-0 ">
-            Alătură-te echipei SilverCare
+            Alătură-te echipei Eldie
           </div>
           <div className="text-sm pb-3 lg:pb-0 sm:text-lg md:text-xl tracking-[0.05em] leading-[24px] flex items-center max-w-[586px] h-10 shrink-0">
-            Dorești să devii partener SilverCare?
+            Dorești să devii partener Eldie?
           </div>
         </div>
         <NavLink to="/contact">

diff --git a/src/components/Navbar.js b/src/components/Navbar.js
@@ -278,7 +278,7 @@ const Navbar = () => {
           <div className="flex flex-row">
             <Link to="/">
               <div className="flex flex-row items-center">
-                <img className="w-[7.72rem] h-[2.5rem]" alt="" src={logo_img} />
+                <img className="w-[11.25rem] h-[3.375rem] " alt="" src={logo_img} />
               </div>
             </Link>
           </div>
@@ -383,7 +383,7 @@ const Navbar = () => {
           <div className="w-[77rem] flex flex-row items-center justify-center">
             <div className="flex-1 flex flex-row items-start justify-start py-[0rem] ml-0 xl:ml-8 px-[12rem] gap-[2rem]">
               <Link to="/category">
-                <b className="relative tracking-[0.15em] leading-[120%] uppercase flex items-center justify-center w-[6rem] h-[2rem] shrink-0">
+                <b className="relative tracking-[0.15em] ml-[8px] leading-[120%] uppercase flex items-center justify-center w-[6rem] h-[2rem] shrink-0">
                   EXPERIENȚE
                 </b>
               </Link>
@@ -393,7 +393,7 @@ const Navbar = () => {
             </b> */}
 
               <Link to="/articles">
-                <b className="relative tracking-[0.15em] leading-[120%] uppercase flex items-center justify-center w-[6rem] h-[2rem] shrink-0">
+                <b className="relative tracking-[0.15em] leading-[120%] ml-6 uppercase flex items-center justify-center w-[6rem] h-[2rem] shrink-0">
                   ARTICOLE
                 </b>
               </Link>
@@ -412,7 +412,7 @@ const Navbar = () => {
                   <NavLink to="/">
                     <div className="flex items-center justify-center">
                       <img
-                        className="w-[6rem] h-[2rem] sm:w-[9rem] sm:h-[3rem]"
+                        className="w-[5.985rem] h-[1.7955rem] sm:w-[9rem] sm:h-[2.7rem]"
                         alt=""
                         src={logo_img}
                       />

diff --git a/src/components/Whyme.js b/src/components/Whyme.js
@@ -75,7 +75,7 @@ const Whyme = () => {
     <div className="flex justify-center pb-[4rem] ">
       <div className=" rounded-lg bg-light-grey shadow-[0px_4px_8px_rgba(0,_0,_0,_0.25)] py-[6rem] pt-12 px-[0rem] flex justify-center flex-col items-center ">
         <div className="text-[1.9rem] lg:text-[2.25rem] tracking-[0.05em] leading-[120%] font-semibold  h-[2.5rem] ">
-          De ce SilverCare ?
+          De ce Eldie?
         </div>
         <div className="p-5 flex flex-wrap justify-center md:w-[47.5rem] lg:w-[1024px] xl:w-[77.06rem]">
           {reasons.map((reason, index) => (

diff --git a/src/images/logo_sc.png b/src/images/logo_sc.png
diff --git a/src/images/logo_sc_circle.png b/src/images/logo_sc_circle.png
diff --git a/src/pages/About.js b/src/pages/About.js
@@ -18,7 +18,7 @@ const About = () => {
                 Cine suntem noi?
               </h1>
               <p className="text-lg text-gray-700">
-              SilverCare inseamna integrare, emotii pozitive, relatii noi si grija fata de seniori. 
+              Eldie inseamna integrare, emotii pozitive, relatii noi si grija fata de seniori. 
               Serviciile noastre asigura reintegrarea in comunitate a seniorilor. Va punem la dispozitie o gama larga de optiuni, garantand siguranta domnilor si doamnelor de varsta a 3-a.
               </p>
               <p className="text-lg text-gray-700">Haideti sa ajutam seniorii sa isi regaseasca activitatile favorite!</p>
@@ -40,7 +40,7 @@ const About = () => {
                 Cine suntem noi?
               </h1>
               <p className="mt-2 text-center text-lg text-gray-700">
-              SilverCare înseamnă integrare, emoții pozitive, relații noi și grija față de seniori. 
+              Eldie înseamnă integrare, emoții pozitive, relații noi și grija față de seniori. 
               Serviciile noastre asigură reintegrarea în comunitate a seniorilor. Vă punem la dispoziție o gamă largă de opțiuni, garantând siguranța domnilor si doamnelor de vârsta a 3-a.
               </p>
               <p className="text-center text-lg text-gray-700">Haideți să ajutăm seniorii să își regăsească activitățile favorite!</p>

diff --git a/src/pages/Home.js b/src/pages/Home.js
@@ -11,6 +11,8 @@ import HomeSearch from "../components/HomeSearch";
 import Lottie from "lottie-react";
 import caring_family from "../animations/caring-family.json";
 import { WorkInProgress } from "./WorkInProgress";
+import JoinUs from "../components/JoinUs";
+import CheckArticles from "../components/CheckArticles";
 
 const Bar = () => {
   return (
@@ -27,10 +29,9 @@ const Home = () => {
       <Hero />
       <Bar />
       <FindMore />
-      <Bar />
+      <CheckArticles/>
       <Whyme />
-      <Bar />
-      <ArticlesTab />
+      {/* <ArticlesTab /> */}
 
       {/* <WorkInProgress /> */}
     </div>