ReCoded-Org · ARS-coding · Jan 9, 2024 · Jan 9, 2024 · Jan 9, 2024 · Jan 9, 2024
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v18.20.1
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,7 @@
 {
-  "editor.codeActionsOnSave": { "source.fixAll.eslint": true },
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
   "editor.formatOnSave": true,
   "eslint.alwaysShowStatus": true,
   "files.autoSave": "onFocusChange",

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "react": "^17.0.2",
     "react-bootstrap": "2.0.0-beta.0",
     "react-dom": "^17.0.2",
-    "react-hook-form": "^7.14.2",
+    "react-hook-form": "7.45.4",
     "react-i18next": "^11.11.4",
     "react-redux": "^7.2.4",
     "react-router-dom": "^5.2.0",
@@ -32,8 +32,8 @@
     "uuid": "^8.3.2"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
+    "start": "NODE_OPTIONS='--openssl-legacy-provider' react-scripts start",
+    "build": "NODE_OPTIONS='--openssl-legacy-provider' react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

diff --git a/public/index.html b/public/index.html
@@ -1,14 +1,23 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <!-- Google analytics 4 tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-70C9VF2K54"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag() {
+        dataLayer.push(arguments);
+      }
+      gtag('js', new Date());
+
+      gtag('config', 'G-70C9VF2K54');
+    </script>
+
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
+    <meta name="description" content="Web site created using create-react-app" />
     <link
       rel="icon"
       type="image/x-icon"

diff --git a/src/components/EditProfileModal/index.jsx b/src/components/EditProfileModal/index.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
 
 import { Modal, Button, Card } from "react-bootstrap";
 
@@ -31,9 +31,9 @@ const EditProfileModal = () => {
   const { district } = firestoreDoc;
   const { uid } = authCred;
 
-  function toggleEditProfileModal() {
+  const toggleEditProfileModal = useCallback(() => {
     dispatch({ type: "editProfile" });
-  }
+  }, [dispatch]);
 
   const validate = (values) => {
     const errors = {};

diff --git a/src/components/FAQ/__snapshots__/index.test.jsx.snap b/src/components/FAQ/__snapshots__/index.test.jsx.snap
@@ -14,25 +14,25 @@ exports[`FAQ Section renders Features section correctly 1`] = `
         className="first-column d-flex flex-column justify-content-center align-items-start col-md-6 col-sm-12 col-12"
       >
         <h2>
-          FAQs
+          global_FAQ
         </h2>
         <h5>
-          Are meetings safe?
+          global_safety
         </h5>
         <p>
-          For this important topic, we have collaborated with popular cafes and places all around of Istanbul so that our neighbours would be able to meet with each other without worries.
+          global_safety-text
         </p>
         <h5>
-          What is the point?
+          global_the_point
         </h5>
         <p>
-          More than 264 million people suffer from depression worldwide and with quarantine, it was not getting any better. That’s why it’s so important for us to solve the problem of people feeling more and more isolated as time progresses. We care about you, and would like you to care about your neighbour so that, we could be a stronger community.
+          global_the_point_text
         </p>
         <h5>
-          How does all of this work?
+          global_how_it_works
         </h5>
         <p>
-          With the data that you provide in your profile, we are carefully filtering neighbours that you may want to meet and network with.
+          global_how_it_works_text
         </p>
       </div>
       <div

diff --git a/src/components/FAQContent/__snapshots__/index.test.jsx.snap b/src/components/FAQContent/__snapshots__/index.test.jsx.snap
@@ -11,25 +11,25 @@ exports[`FAQContent Section renders Features section correctly 1`] = `
       className="first-column d-flex flex-column justify-content-center align-items-start col-md-6 col-sm-12 col-12"
     >
       <h2>
-        FAQs
+        global_FAQ
       </h2>
       <h5>
-        Are meetings safe?
+        global_safety
       </h5>
       <p>
-        For this important topic, we have collaborated with popular cafes and places all around of Istanbul so that our neighbours would be able to meet with each other without worries.
+        global_safety-text
       </p>
       <h5>
-        What is the point?
+        global_the_point
       </h5>
       <p>
-        More than 264 million people suffer from depression worldwide and with quarantine, it was not getting any better. That’s why it’s so important for us to solve the problem of people feeling more and more isolated as time progresses. We care about you, and would like you to care about your neighbour so that, we could be a stronger community.
+        global_the_point_text
       </p>
       <h5>
-        How does all of this work?
+        global_how_it_works
       </h5>
       <p>
-        With the data that you provide in your profile, we are carefully filtering neighbours that you may want to meet and network with.
+        global_how_it_works_text
       </p>
     </div>
     <div

diff --git a/src/components/Features/__snapshots__/index.test.jsx.snap b/src/components/Features/__snapshots__/index.test.jsx.snap
@@ -8,7 +8,7 @@ exports[`Features Section renders Features section correctly 1`] = `
     className="features-content-container d-flex flex-column justify-content-center container"
   >
     <h2>
-      Features
+      features_title
     </h2>
     <div
       className="features-content-row d-md-flex justify-content-md-around text-center row"
@@ -27,12 +27,12 @@ exports[`Features Section renders Features section correctly 1`] = `
           <div
             className="card-title h5"
           >
-            Meet
+            features_title_meet
           </div>
           <p
             className="card-text"
           >
-            Find people in your neighborhood and expand your network.
+            features_title_meet_text
           </p>
         </div>
       </div>
@@ -50,12 +50,12 @@ exports[`Features Section renders Features section correctly 1`] = `
           <div
             className="card-title h5"
           >
-            Filtering
+            features_title_message
           </div>
           <p
             className="card-text"
           >
-            Filter nearby people by their age, gender and interests.
+            features_title_message_text
           </p>
         </div>
       </div>
@@ -73,12 +73,12 @@ exports[`Features Section renders Features section correctly 1`] = `
           <div
             className="card-title h5"
           >
-            Coupons
+            features_title_coupons
           </div>
           <p
             className="card-text"
           >
-            Get coupons from our sponsored places and pay less.
+            features_title_coupons_text
           </p>
         </div>
       </div>

diff --git a/src/components/Footer/__snapshots__/index.test.jsx.snap b/src/components/Footer/__snapshots__/index.test.jsx.snap
@@ -17,34 +17,40 @@ exports[`Footer Section renders Footer section correctly 1`] = `
           href="/our-team"
           onClick={[Function]}
         >
-          Our Team
+          footer_team
         </a>
         <a
           className="mx-3"
           href="/contact-us"
           onClick={[Function]}
         >
-          Contact Us
+          footer_contact
         </a>
         <a
           href="/faq"
           onClick={[Function]}
         >
-          FAQ
+          footer_faq
         </a>
       </div>
       <div
         className="d-flex justify-content-center align-items-center my-2 my-sm-2 my-sm-0 col-md-4 col-sm-12 col-12"
       >
-        <p>
-          Copyright © Re:Coded 2021
-        </p>
+        <div
+          className="d-flex flex-column justify-content-center align-items-center"
+        >
+          <p>
+            footer_copyright
+          </p>
+        </div>
       </div>
       <div
         className="social-media-logos d-flex justify-content-center justify-content-sm-center justify-content-md-end align-items-center col-md-4 col-sm-12 col-12"
       >
+        <div />
         <a
-          href="https://twitter.com"
+          aria-label="Twitter Logo"
+          href="https://www.twitter.com"
           rel="external noreferrer"
           target="_blank"
         >
@@ -53,6 +59,7 @@ exports[`Footer Section renders Footer section correctly 1`] = `
           </svg>
         </a>
         <a
+          aria-label="Instagram Logo"
           href="https://www.instagram.com"
           rel="external noreferrer"
           target="_blank"
@@ -62,6 +69,7 @@ exports[`Footer Section renders Footer section correctly 1`] = `
           </svg>
         </a>
         <a
+          aria-label="Facebook Logo"
           href="https://www.facebook.com"
           rel="external noreferrer"
           target="_blank"

diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx
@@ -52,20 +52,23 @@ function Footer() {
               href="https://www.twitter.com"
               target="_blank"
               rel="external noreferrer"
+              aria-label="Twitter Logo"
             >
               <TwitterLogo />
             </a>
             <a
               href="https://www.instagram.com"
               target="_blank"
               rel="external noreferrer"
+              aria-label="Instagram Logo"
             >
               <InstagramLogo />
             </a>
             <a
               href="https://www.facebook.com"
               target="_blank"
               rel="external noreferrer"
+              aria-label="Facebook Logo"
             >
               <FacebookLogo />
             </a>

diff --git a/src/components/NeighborCard/__snapshots__/index.test.jsx.snap b/src/components/NeighborCard/__snapshots__/index.test.jsx.snap
@@ -25,13 +25,13 @@ exports[`NeighborCard renders NeighborCard correctly 1`] = `
     <small
       className="text-center"
     >
-      test / test
+      test / 
     </small>
     <button
-      className="sc-bdnxRM sc-fujyAs hPJaof PaHUc"
+      className="sc-aXZVg sc-imWYAI fNOrQy czbMBo"
       onClick={[Function]}
     >
-      Invite To Meet!
+      neighborcards_button
     </button>
   </div>
 </div>

diff --git a/src/components/NeighborCard/index.jsx b/src/components/NeighborCard/index.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
 
 import { Card } from "react-bootstrap";
 
@@ -36,7 +36,7 @@ function NeighborCard({
   const { t } = useTranslation();
   const { language: currentLanguage } = i18next;
 
-  function sendEmail() {
+  const sendEmail = useCallback(() => {
     setEmailAlertStatus("empty");
     send("service_9rwjsp6", "template_qlu5ttf", {
       from_name: senderFullName,
@@ -46,9 +46,16 @@ function NeighborCard({
     })
       .then(() => setEmailAlertStatus("success"))
       .catch(() => setEmailAlertStatus("danger"));
-  }
+  }, [
+    email,
+    firstName,
+    lastName,
+    senderEmail,
+    senderFullName,
+    setEmailAlertStatus,
+  ]);
 
-  function handleInvitation() {
+  const handleInvitation = useCallback(() => {
     sendEmail();
     firestore
       .collection("users")
@@ -74,7 +81,7 @@ function NeighborCard({
           id: uuidv4(),
         }),
       });
-  }
+  }, [email, firstName, lastName, sendEmail, senderFullName, uid]);
 
   return (
     <Card className="neighbor-card mb-2 mx-auto">