Merge pull request #43 from eksqtr/development

Fixes regarding responsiveness of the design, Fixes of design utility mousecirclehover, Updates on Tech Sections Experience

package.json

@@ -9,13 +9,17 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "dompurify": "^3.1.6",
+    "moment": "^2.30.1",
+    "moment-timezone": "^0.5.45",
     "next": "14.2.5",
     "react": "^18",
     "react-dom": "^18",
     "react-icons": "^5.3.0",
     "sharp": "^0.33.5"
   },
   "devDependencies": {
+    "@types/dompurify": "^3.0.5",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",

src/app/components/techsection/jobsList.tsx

@@ -1,8 +1,11 @@
 import { useState} from "react";
+import DOMPurify from 'dompurify';
+import moment from 'moment-timezone';
 
 // props
 type JobProps = {
-    year: string;
+    dateStarted: Date;
+    dateEnded: Date,
     company: string;
     position: string;
     responsibilities: string;
@@ -12,47 +15,104 @@ type JobProps = {
 // Array jobs info my friend
 const jobs: JobProps[] = [
     {
-        year: "2022 - 2024",
+        dateStarted: new Date("2022-03-21"),
+        dateEnded: new Date("2024-07-31"),
         company: "PEDDLR PHILIPPINES INC.",
-        position: "Software Engineer Full Stack",
-        responsibilities: "Developed and maintained web applications...\nasdasd",
-        techStacks: ["Node.js", "Vue.js", "React", "Next.js"],
+        position: "Software Engineer - Full Stack",
+        responsibilities: `
+            <div>
+                <span class="text-gray-400">Developed and maintained new features of Web Front-End, Back-End and Back-End mobile applications.</span>
+                <br/><strong>Highlights:</strong>
+                <ul class="list-disc ml-5 mt-2">
+                    <li>Overhauled Back-End Laravel to NodeJS AWS Lambda API and Improved performance.</li>
+                    <li>Refactored legacy code and applied AWS ElasticCache.</li>
+                    <li>Integrated 3rd Party API like Payment Gateaway, KYC, All-In-One engagement, SMS as well webhooks (Paymongo, Shufti, OnFido, CleverTap, M360, Semaphore).</li>
+                    <li>Contributed development on Kanto Ads project using Amplify, Cognito, API Gateway, RDS, DynamoDB and etc.</li>
+                    <li>Managed Dynamic Roleta System web front-end, back-end and back-end mobile application.</li>
+                    <li>Managed Offline-Eloading System back-end allowing users to use E-Load without data / offline.</li>
+                </ul>
+            </div>
+            `,
+        techStacks: ["NodeJS", "VueJS", "Vuetify", "Vuex", "TypeScript","AWS Cloud Services", "Laravel MIX", "Git", "Jira", "Bitbucket", "Nginx"],
     },
     {
-        year: "2020 - 2022",
+        dateStarted: new Date("2020-05-25"),
+        dateEnded: new Date("2022-02-20"),
         company: "Equity Gaming",
         position: "President & Head of Development Team",
-        responsibilities: "Led a team of developers, managed projects...",
-        techStacks: ["Laravel", "PHP", "MySQL", "AWS"],
+        responsibilities: `
+            <div>
+                <span class="text-gray-400">Establish a gaming community for GTA SA-MP Online Roleplay, Led a team and managed developments of the product and organization operation.</span>
+                <br/><strong>Highlights:</strong>
+                <ul class="list-disc ml-5 mt-2">
+                    <li>Built a gaming community and developed a server for 1,000+ active players for the roleplay game GTA-SA Online.</li>
+                    <li>Streamlined operations by establishing organization charts and chain of command processes.</li>
+                    <li>Led a team to release new game versions and features, improving player retention by 80% with a positive 90% positive feedback from the community.</li>
+                    <li>Implemented in-game voice chat and roleplay dynamic environments interactions which enhance player engagement for 1,000+ active players.</li>
+                    <li>Deployed and maintain 3 Dedicated Virtual Private Server for Web and Game, ensuring 99.9% uptime.</li>
+                    <li>Implemented network security measures, mitigating DDOS attacks reduced by 80%</li>
+                </ul>
+            </div>
+        `,
+        techStacks: ["Pawn", "VueJS", "OVH Cloud", "Cloudflare", "Trello", "Discord", "Socket.io", "NodeJS", "ExpressJS", "MySQL"],
     },
 ];
-
 const JobExperience = () => {
     const [selectedJob, setSelectedJob] = useState<JobProps | null>(jobs[0]);
 
+    // We need to sanitize the possibilies of XSS attack so we use dom prufiy for this shit
+    const arrTags: Array<string> = ['b', 'i', 'span', 'strong', 'a', 'div', 'ul', 'li', 'em', 'br'];
+    const arrAttr: Array<string> = ['href', 'class'];
+    const sanitizedResponsibilities = selectedJob ? DOMPurify.sanitize(selectedJob.responsibilities, {
+                ALLOWED_TAGS: arrTags,
+                ALLOWED_ATTR: arrAttr
+            }
+        ) : '';
+
     return (
       <div className="flex flex-col md:flex-row gap-5">
-        <div className="flex-shrink-0 overflow-x-auto border-r border-gray-300 dark:border-gray-700 md:h-[400px] md:w-[300px] sm:w-full sm:h-[250px] sm:overflow-x-scroll">
+        <div className="flex-shrink-0 overflow-x-auto border-r border-gray-300 dark:border-gray-700 md:h-[400px] md:w-[300px] sm:w-full sm:h-[150px] sm:overflow-x-scroll">
             <ul className="flex md:flex-col flex-row sm:flex-nowrap gap-4 p-2 overflow-x-auto">
-                {jobs.map((job, index) => (
+
+            {jobs.map((job, index) => {
+
+                // we gonna use the moment timezone on this part
+                const startDate = moment(job.dateStarted).tz('Asia/Manila');
+                const endDate = moment(job.dateEnded).tz('Asia/Manila');
+                const duration = moment.duration(endDate.diff(startDate));
+
+                const years = duration.years();
+                const months = duration.months();
+                const formattedDuration = `${years} yr${years !== 1 ? 's' : ''} ${months} mo${months !== 1 ? 's' : ''}`;
+
+                return (
                 <li
                     key={index}
-                    className={`cursor-pointer p-4 rounded-lg transition-all duration-300 ease-in-out ${
+                    className={`cursor-pointer p-4 rounded-lg transition-all duration-300 ease-in-out md:w-full sm:w-[200px] ${
                     selectedJob === job ? "bg-teal-600 text-white" : "bg-gray-100 dark:bg-gray-700"
                     } hover:bg-teal-500 hover:text-white`}
                     onClick={() => setSelectedJob(job)}
                 >
-                    <h3 className="text-lg md:text-xl font-semibold dark:text-gray-100">{job.year}</h3>
+                    <div className="flex justify-start flex-col">
+                    <span className="text-lg md:text-xl font-semibold dark:text-gray-100">
+                        {`${moment(job.dateStarted).format("YYYY")} - ${moment(job.dateEnded).format("YYYY")}`}
+                    </span>
+                    <span className="text-[11px] p-0 m-0 dark:text-gray-100">{formattedDuration}</span>
                     <p className="text-xs md:text-sm dark:text-gray-200">{job.company}</p>
+                    </div>
                 </li>
-                ))}
+                );
+            })}
             </ul>
         </div>
         <div className="flex-1 p-5 bg-gray-100 dark:bg-gray-800 rounded-lg shadow-lg">
           {selectedJob && (
             <>
-              <h3 className="text-2xl font-bold text-teal-600 ">{selectedJob.position}</h3>
-              <p className="text-gray-600 dark:text-gray-300 mt-2">{selectedJob.responsibilities}</p>
+              <h3 className="text-2xl font-bold text-teal-400 ">{selectedJob.position}</h3>
+              <p
+                className="text-gray-600 dark:text-gray-300 mt-2"
+                dangerouslySetInnerHTML={{ __html: sanitizedResponsibilities }}
+              />
               <div className="mt-4">
                 <h4 className="font-semibold dark:text-gray-200">Tech Stacks:</h4>
                 <div className="flex flex-wrap gap-2 mt-2">

src/app/components/techsection/tech.tsx

@@ -1,5 +1,5 @@
 import { RefObject, useState} from "react";
-
+import { MdOpenInNew } from "react-icons/md";
 import JobExperience from "./jobsList"
 import techIcons from "./techIcons";
 
@@ -9,23 +9,24 @@ type TechProps = {
 const TechSection = (props: TechProps) => {
     const [activeTab, setActiveTab] = useState<'tech' | 'experience'>('tech');
     const [iconSize] = useState('30px'); // Increased size for better visibility
+    const [resume_link, _] = useState("https://drive.google.com/file/d/1CXssqhJuY_-xgjQDOagCLyTckRvozBZr/view");
 
     return (
         <section
           ref={props.sectionRef}
-          className="p-8 md:p-16 bg-gray-100 dark:bg-gray-900 lg:h-screen"
+          className="p-8 md:p-16 dark:bg-gray-900 lg:h-screen"
           id="tech-stack"
         >
           {/* Tabs */}
           <div className="mt-20 flex justify-center md:justify-start mb-8">
             <button
-              className={`px-4 py-2 text-lg font-medium ${activeTab === 'tech' ? 'text-teal-600 border-b-2 border-teal-600' : 'text-gray-600 dark:text-gray-300'}`}
+              className={`px-4 text-lg font-medium ${activeTab === 'tech' ? 'text-teal-600 border-b-2 border-teal-600' : 'text-gray-600 dark:text-gray-300'}`}
               onClick={() => setActiveTab('tech')}
             >
               Tech Stacks
             </button>
             <button
-              className={`px-4 py-2 text-lg font-medium ml-4 ${activeTab === 'experience' ? 'text-teal-600 border-b-2 border-teal-600' : 'text-gray-600 dark:text-gray-300'}`}
+              className={`px-4 text-lg font-medium ml-4 ${activeTab === 'experience' ? 'text-teal-600 border-b-2 border-teal-600' : 'text-gray-600 dark:text-gray-300'}`}
               onClick={() => setActiveTab('experience')}
             >
               Experience
@@ -82,10 +83,15 @@ const TechSection = (props: TechProps) => {
               </div>
             </div>
           ) : (
-            <div className="flex-1">
-              <h2 className="text-4xl md:text-5xl py-4 text-teal-600 font-medium text-center md:text-left">Experience</h2>
-              <JobExperience />
+            <div className="flex-1  ">
+                <h2 className="flex item-center sm:flex-row text-4xl md:text-5xl py-2 text-teal-600 font-medium text-center md:text-left">Experience
+                    <a href={resume_link} target="_blank" className={`flex item-center gap-2 mt-auto text-sm text-gray-300 font-medium ml-4 hover:scale-105 transition-transform ease-in-out hover:text-teal-500`}>
+                    View Full Resume <MdOpenInNew className="text-1xl"/>
+                    </a>
+                </h2>
+                <JobExperience />
             </div>
+
           )}
         </section>
       );

src/app/components/utilities/mousecirclehover.tsx

@@ -23,8 +23,9 @@ export const MouseHoverCircle = () => {
                 top: position.y  + 'px',
                 left: position.x  + 'px',
                 transform: 'translate(-50%, -50%)',
-                zIndex: 0,
+                zIndex: 1,
                 filter: 'blur(100px)', 
+                pointerEvents: 'none'
             }}
         ></div>
     )