Merge pull request #60 from RichardRNStudio/feat/59

feat(#59): add new job
RichardRNStudio · Oct 25, 2024 · 2877b70 · 2877b70
2 parents dfa7398 + 8e20bce
commit 2877b70
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/public/butlins_logo.jpeg b/public/butlins_logo.jpeg
diff --git a/src/app/(home)/_components/About/About.tsx b/src/app/(home)/_components/About/About.tsx
@@ -12,13 +12,13 @@ const AboutMe = () => {
         <p className="my-2 leading-7">
           {`Currently, I'm working at`}{' '}
           <a
-            href="https://one-beyond.com"
+            href="https://butlins.com"
             rel="noopener noreferrer"
             className="underline hover:text-gray-300"
             target="_blank"
-            title="One Beyond"
+            title={`Butlin's`}
           >
-            One Beyond
+            {`Butlin's`}
           </a>
           {` as a Senior Frontend Engineer, where I'm focusing on developing a large booking system that aims
         to enhance user experience and streamline booking processes through advanced frontend technologies.`}

diff --git a/src/app/(home)/_components/Work/WorkItem/WorkItem.tsx b/src/app/(home)/_components/Work/WorkItem/WorkItem.tsx
@@ -9,7 +9,10 @@ const WorkItem = ({
 }: Job) => {
   const startDateYear = startDate.getFullYear();
   const endDateYear = endDate.getFullYear();
-  const isEndDateNow = endDateYear === new Date().getFullYear();
+  const endDateMonth = endDate.getMonth();
+  const isEndDateNow =
+    endDateYear === new Date().getFullYear() &&
+    endDateMonth === new Date().getMonth();
   return (
     <a
       href={link}

diff --git a/src/app/_shared/config.ts b/src/app/_shared/config.ts
@@ -26,6 +26,19 @@ export const THEMES = {
 } as const;
 
 export const JOBS: Job[] = [
+  {
+    company: {
+      name: `Butlin's`,
+      link: 'https://butlins.com',
+      logo: {
+        src: '/butlins_logo.jpeg',
+        alt: `Butlin's logo`,
+      },
+    },
+    position: 'Senior Software Engineer',
+    startDate: new Date('2024-10-01'),
+    endDate: new Date(),
+  },
   {
     company: {
       name: 'One Beyond',
@@ -37,7 +50,7 @@ export const JOBS: Job[] = [
     },
     position: 'Senior Software Engineer',
     startDate: new Date('2021-07-01'),
-    endDate: new Date(),
+    endDate: new Date('2024-09-27'),
   },
   {
     company: {