Merge branch 'development'

fayausa · Nov 21, 2022 · c04b1fe · c04b1fe
2 parents ae2e652 + 6b5eb1a
commit c04b1fe
Show file tree

Hide file tree

Showing 53 changed files with 286 additions and 774 deletions.
diff --git a/public/assets/landing/quantumcomputing.png b/public/assets/landing/quantumcomputing.png
diff --git a/src/Components/Landing/Card/Card.module.css b/src/Components/Landing/Card/Card.module.css
@@ -6,7 +6,7 @@
   gap: 16px;
 
   width: 310px;
-  height: 450px;
+  height: 475px;
 
   background: #ffffff;
   box-shadow: 8px 8px 28px rgba(0, 0, 0, 0.12);

diff --git a/src/Pages/DomainDetails/DomainDetails.jsx b/src/Pages/DomainDetails/DomainDetails.jsx
@@ -49,25 +49,28 @@ const DomainDetails = () => {
         f.title.toLowerCase().startsWith(search.toLowerCase())
       );
     setLocalTools(result);
-    console.log(result);
   }, [search, tools]);
 
   useEffect(() => {
-    setYear(years && years[0].year);
+    if (years) {
+      setYear(years && years[0] && years[0].year);
+    }
   }, [years]);
 
   useEffect(() => {
     setLocalYear(year);
   }, [year]);
 
   useEffect(() => {
-    setSearch("");
-    import(`../../data/${id}/${year}.json`).then((response) =>
-      setTools(response[year])
-    );
-    import(`../../data/${id}/${year}.json`).then((response) =>
-      setLocalTools(response[year])
-    );
+    if (year && id) {
+      setSearch("");
+      import(`../../data/${id}/${year}.json`).then((response) =>
+        setTools(response[year])
+      );
+      import(`../../data/${id}/${year}.json`).then((response) =>
+        setLocalTools(response[year])
+      );
+    }
   }, [year, id]);
 
   if (domain) {
@@ -80,48 +83,52 @@ const DomainDetails = () => {
           <div className={styles.container}>
             <h1>{domain && domain[0].technology} Myrmidon</h1>
             <p className={styles.tagline}>
-              The best guide for you to start the next world Search Now
+              The best guide for you to start the next world.
             </p>
 
-            <input
-              className={styles.search}
-              type="text"
-              onChange={(e) => setSearch(e.target.value)}
-              placeholder="Search Now"
-            />
+            {years && years[0] && (
+              <input
+                className={styles.search}
+                type="text"
+                onChange={(e) => setSearch(e.target.value)}
+                placeholder="Search Now"
+              />
+            )}
           </div>
         </header>
 
         <main>
-          <section id="topics">
-            <div className={styles.container}>
-              <div className={styles.years}>
-                {years &&
-                  years.map((year) => (
-                    <p
-                      onClick={() => setYear(year.year)}
-                      className={
-                        localyear === year.year
-                          ? styles.year_active
-                          : styles.year
-                      }
-                    >
-                      {year.year}
-                    </p>
-                  ))}
+          {years && (
+            <section id="topics">
+              <div className={styles.container}>
+                <div className={styles.years}>
+                  {years &&
+                    years.map((year) => (
+                      <p
+                        onClick={() => setYear(year.year)}
+                        className={
+                          localyear === year.year
+                            ? styles.year_active
+                            : styles.year
+                        }
+                      >
+                        {year.year}
+                      </p>
+                    ))}
+                </div>
+                <div className={styles.cards_wrapper}>
+                  {localtools &&
+                    localtools.map((tool) => (
+                      <Card
+                        title={tool.title}
+                        desc={tool.description}
+                        link={tool.url}
+                      />
+                    ))}
+                </div>
               </div>
-              <div className={styles.cards_wrapper}>
-                {localtools &&
-                  localtools.map((tool) => (
-                    <Card
-                      title={tool.title}
-                      desc={tool.description}
-                      link={tool.url}
-                    />
-                  ))}
-              </div>
-            </div>
-          </section>
+            </section>
+          )}
           <section id="blogs">
             <div className={styles.container}>
               <h2 className={styles.section_title}>Blogs to follow</h2>

diff --git a/src/Pages/Landing/Landing.jsx b/src/Pages/Landing/Landing.jsx
@@ -116,7 +116,24 @@ const Landing = () => {
               description="
             The Actions console is the web-based tool used for developing Actions for registration, deployment, configuration, and analytics."
             />
-
+            <Card
+              image="/assets/landing/qa.png"
+              name="QA"
+              link="/qa"
+              description="Quality assurance (QA) is any systematic process of determining whether a product or service meets specified requirements."
+            />
+            <Card
+              image="/assets/landing/quantumcomputing.png"
+              name="Quantum Computing"
+              link="/quantum-computing"
+              description="A rapidly-emerging technology that harnesses the laws of quantum mechanics to solve issues too hard for computers."
+            />
+            <Card
+              image="/assets/landing/pm.png"
+              name="Product Management"
+              link="/pm"
+              description="Are you interested in learning to build the right product and the product right?."
+            />
             <Card
               image="/assets/landing/iot.png"
               name="IoT"
@@ -135,12 +152,6 @@ const Landing = () => {
               link="#"
               description="Cyber Security is the practice of defending computers, servers, mobile devices, electronic systems, networks, and data from malicious attacks. "
             />
-            <Card
-              image="/assets/landing/pm.png"
-              name="Product Management"
-              link="#"
-              description="It is the process of planning, developing, launching, and managing a product."
-            />
             <Card
               image="/assets/landing/cdesign.png"
               name="Creative Design"

diff --git a/src/data/home.json b/src/data/home.json
@@ -1,54 +1,64 @@
 {
-   "home": [
-      {
-        "technology": "Android",
-        "logo": "android-logo.png",
-        "folderName": "android"
-      },
-      {
-        "technology": "iOS",
-        "logo": "ios-logo.png",
-        "folderName": "ios"
-      },
-      {
-        "technology": "Frontend",
-        "logo": "frontend-logo.png",
-        "folderName": "frontend"
-      },
-      {
-        "technology": "Web",
-        "logo": "web-logo.png",
-        "folderName": "web"
-      },
-      {
-        "technology": "DevOps",
-        "logo": "security-logo.png",
-        "folderName": "devops"
-      },
-      {
-        "technology": "QA",
-        "logo": "qa-logo.png",
-        "folderName": "qa"
-      },
-      {
-        "technology": "Blockchain",
-        "logo": "blockchain-logo.png",
-        "folderName": "blockchain"
-      },
-      {
-        "technology": "Artificial Intelligence",
-        "logo": "ai-logo.png",
-        "folderName": "ai"
-      }, 
-      {
-        "technology": "AR/VR",
-        "logo": "arvr-logo.png",
-        "folderName": "arvr"
-      },
-      {
-        "technology": "Actions on Google",
-        "logo": "actions-on-google.png",
-        "folderName": "actions-on-google"
-      }
-   ]
+  "home": [
+    {
+      "technology": "Android",
+      "logo": "android-logo.png",
+      "folderName": "android"
+    },
+    {
+      "technology": "iOS",
+      "logo": "ios-logo.png",
+      "folderName": "ios"
+    },
+    {
+      "technology": "Frontend",
+      "logo": "frontend-logo.png",
+      "folderName": "frontend"
+    },
+    {
+      "technology": "Web",
+      "logo": "web-logo.png",
+      "folderName": "web"
+    },
+    {
+      "technology": "DevOps",
+      "logo": "security-logo.png",
+      "folderName": "devops"
+    },
+    {
+      "technology": "QA",
+      "logo": "qa-logo.png",
+      "folderName": "qa"
+    },
+    {
+      "technology": "Blockchain",
+      "logo": "blockchain-logo.png",
+      "folderName": "blockchain"
+    },
+    {
+      "technology": "Quantum Computing",
+      "logo": "quantumcomputing.png",
+      "folderName": "quantum-computing"
+    },
+    {
+      "technology": "Artificial Intelligence",
+      "logo": "ai-logo.png",
+      "folderName": "ai"
+    },
+    {
+      "technology": "AR/VR",
+      "logo": "arvr-logo.png",
+      "folderName": "arvr"
+    },
+    {
+      "technology": "Product Management",
+      "logo": "pm.png",
+      "folderName": "pm"
+    },
+    {
+      "technology": "Actions on Google",
+      "logo": "actions-on-google.png",
+      "folderName": "actions-on-google"
+    }
+  ]
 }
diff --git a/src/data/pm/blog.json b/src/data/pm/blog.json
@@ -0,0 +1,28 @@
+{
+  "blog": [
+    {
+      "blog": "https://www.appcues.com/blog",
+      "author": "AppCues Blog"
+    },
+    {
+      "blog": "https://www.productplan.com/blog/",
+      "author": "ProductPlan"
+    },
+    {
+      "blog": "https://quantum.country/",
+      "author": "Growth.Design"
+    },
+    {
+      "blog": "https://growth.design",
+      "author": "Quantum Machine Learning MOOC "
+    },
+    {
+      "blog": "https://amplitude.com/blog",
+      "author": "Amplitude Blog"
+    },
+    {
+      "blog": "https://bestpracticer.com/topic/product-management",
+      "author": "Best Practicer"
+    }
+  ]
+}
diff --git a/src/data/pm/follow.json b/src/data/pm/follow.json
@@ -0,0 +1,44 @@
+{
+  "follow": [
+    {
+      "followLink": "https://twitter.com/lennysan",
+      "photo": "lenny_rachitsky.jpg",
+      "name": "Lenny Rachitsky"
+    },
+    {
+      "followLink": "https://twitter.com/shreyas",
+      "photo": "shreyas_doshi.jpg",
+      "name": "Shreyas Doshi"
+    },
+    {
+      "followLink": "https://twitter.com/cagan",
+      "photo": "cagan.jpg",
+      "name": "Marty Cagan"
+    },
+    {
+      "followLink": "https://twitter.com/TrungTPhan",
+      "photo": "trung_phan.jpg",
+      "name": "Trung Phan"
+    },
+    {
+      "followLink": "https://twitter.com/bandanjot",
+      "photo": "bandan.jpg",
+      "name": "Bandan"
+    },
+    {
+      "followLink": "https://twitter.com/tobiasrogers",
+      "photo": "toby_rogers.jpg",
+      "name": "Toby Rogers"
+    },
+    {
+      "followLink": "https://twitter.com/Jenyangwong",
+      "photo": "jen_yang_wong.jpg",
+      "name": "Jen Yang-Wong"
+    },
+    {
+      "followLink": "https://twitter.com/ChrisJBakke",
+      "photo": "chris_bakke.jpg",
+      "name": "Chris Bakke"
+    }
+  ]
+}
diff --git a/src/data/pm/images/bandan.jpg b/src/data/pm/images/bandan.jpg
diff --git a/src/data/pm/images/cagan.jpg b/src/data/pm/images/cagan.jpg
diff --git a/src/data/pm/images/chris_bakke.jpg b/src/data/pm/images/chris_bakke.jpg
diff --git a/src/data/pm/images/jen_yang_wong.jpg b/src/data/pm/images/jen_yang_wong.jpg
diff --git a/src/data/pm/images/lenny_rachitsky.jpg b/src/data/pm/images/lenny_rachitsky.jpg
diff --git a/src/data/pm/images/shreyas_doshi.jpg b/src/data/pm/images/shreyas_doshi.jpg
diff --git a/src/data/pm/images/toby_rogers.jpg b/src/data/pm/images/toby_rogers.jpg
diff --git a/src/data/pm/images/trung_phan.jpg b/src/data/pm/images/trung_phan.jpg
diff --git a/src/data/pm/years.json b/src/data/pm/years.json
@@ -0,0 +1,3 @@
+{
+  "years": []
+}