Merge branch 'saadpasta:master' into master

Author: ehsanera

Dockerfile

@@ -1,7 +1,7 @@
 # This file is the main docker file configurations
 
 # Official Node JS runtime as a parent image
-FROM node:10.16.0-alpine
+FROM node:20.0-alpine
 
 # Set the working directory to ./app
 WORKDIR /app

README.md

@@ -189,14 +189,16 @@ const contactInfo = { .... }
 const twitterDetails = { ... }
 
 ```
+#### Resume upload
+To upload your own resume, simply upload a pdf to `src/containers/greeting/resume` and rename the pdf to `resume.pdf`. 
 
 #### Using Emojis
 
 For adding emoji 😃 into the texts in `Portfolio.js`, use the `emoji()` function and pass the text you need as an argument. This would help in keeping emojis compatible across different browsers and platforms.
 
 #### Customize Lottie Animations
 
-You can choose a Lottie and download it in json format from from sites like [this](https://lottiefiles.com/). In `src/assets/lottie`, replace the Lottie json file you want to alter with the same file name. If you want to change the Lottie options, go to `src/components/displayLottie/DisplayLottie.js` and change the `defaultOptions` object, you can refer [lottie-react docs](https://www.npmjs.com/package/lottie-react) for more info on the `defaultOptions` object.
+You can choose a Lottie and download it in json format from sites like [this](https://lottiefiles.com/). In `src/assets/lottie`, replace the Lottie json file you want to alter with the same file name. If you want to change the Lottie options, go to `src/components/displayLottie/DisplayLottie.js` and change the `defaultOptions` object, you can refer [lottie-react docs](https://www.npmjs.com/package/lottie-react) for more info on the `defaultOptions` object.
 
 #### Adding Twitter Time line to your Page
 Insert your Twitter username in `portfolio.js` to show your recent activity on your page.

src/components/footer/Footer.js

@@ -14,7 +14,11 @@ export default function Footer() {
         </p>
         <p className={isDark ? "dark-mode footer-text" : "footer-text"}>
           Theme by{" "}
-          <a href="https://github.com/saadpasta/developerFolio">
+          <a
+            href="https://github.com/saadpasta/developerFolio"
+            target="_blank"
+            rel="noreferrer"
+          >
             developerFolio
           </a>
         </p>

src/components/header/Header.js

@@ -10,7 +10,8 @@ import {
   openSource,
   blogSection,
   talkSection,
-  achievementSection
+  achievementSection,
+  resumeSection
 } from "../../portfolio";
 
 function Header() {
@@ -21,6 +22,7 @@ function Header() {
   const viewAchievement = achievementSection.display;
   const viewBlog = blogSection.display;
   const viewTalks = talkSection.display;
+  const viewResume = resumeSection.display;
 
   return (
     <Headroom>
@@ -69,6 +71,11 @@ function Header() {
               <a href="#talks">Talks</a>
             </li>
           )}
+          {viewResume && (
+            <li>
+              <a href="#resume">Resume</a>
+            </li>
+          )}
           <li>
             <a href="#contact">Contact Me</a>
           </li>

src/containers/blogs/Blogs.js

@@ -14,9 +14,10 @@ export default function Blogs() {
   function extractTextContent(html) {
     return typeof html === "string"
       ? html
-          .split("p>")
-          .filter(el => !el.includes(">"))
-          .map(el => el.replace("</", ".").replace("<", ""))
+          .split(/<\/p>/i)
+          .map(part => part.split(/<p[^>]*>/i).pop())
+          .filter(el => el.trim().length > 0)
+          .map(el => el.replace(/<\/?[^>]+(>|$)/g, "").trim())
           .join(" ")
       : NaN;
   }

src/containers/greeting/Greeting.js

@@ -6,7 +6,6 @@ import landingPerson from "../../assets/lottie/landingPerson";
 import DisplayLottie from "../../components/displayLottie/DisplayLottie";
 import SocialMedia from "../../components/socialMedia/SocialMedia";
 import Button from "../../components/button/Button";
-
 import {illustration, greeting} from "../../portfolio";
 import StyleContext from "../../contexts/StyleContext";
 
@@ -37,15 +36,18 @@ export default function Greeting() {
               >
                 {greeting.subTitle}
               </p>
+              <div id="resume" className="empty-div"></div>
               <SocialMedia />
               <div className="button-greeting-div">
                 <Button text="Contact me" href="#contact" />
                 {greeting.resumeLink && (
-                  <Button
-                    text="See my resume"
-                    newTab={true}
-                    href={greeting.resumeLink}
-                  />
+                  <a
+                    href={require("./resume.pdf")}
+                    download="Resume.pdf"
+                    className="download-link-button"
+                  >
+                    <Button text="Download my resume" />
+                  </a>
                 )}
               </div>
             </div>

src/containers/greeting/Greeting.scss

@@ -29,9 +29,17 @@
   flex: 1;
   margin-bottom: 30px;
 }
+
+.empty-div {
+  margin-bottom: 40px;
+}
+
 .button-greeting-div {
   display: flex;
-  margin-top: 20px;
+  margin-top: 40px;
+}
+.download-link-button {
+  text-decoration: none;
 }
 
 .greeting-text {

src/containers/greeting/resume.pdf

@@ -454,6 +454,15 @@ const podcastSection = {
   display: true // Set false to hide this section, defaults to true
 };
 
+// Resume Section
+const resumeSection = {
+  title: "Resume",
+  subtitle: "Feel free to download my resume",
+
+  // Please Provide with Your Podcast embeded Link
+  display: true // Set false to hide this section, defaults to true
+};
+
 const contactInfo = {
   title: emoji("Contact Me ☎️"),
   subtitle:
@@ -488,5 +497,6 @@ export {
   podcastSection,
   contactInfo,
   twitterDetails,
-  isHireable
+  isHireable,
+  resumeSection
 };