Merge branch 'develop'

28softwares · Oct 22, 2024 · b996fd5 · b996fd5
2 parents 6c95578 + 0a672b7
commit b996fd5
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 19 deletions.
diff --git a/public/projects/investiaa.png b/public/projects/investiaa.png
diff --git a/src/UI/pages/About.tsx b/src/UI/pages/About.tsx
@@ -26,8 +26,12 @@ export const About = () => {
                 <CardContent className="p-4">
                   <h3 className="text-xl font-semibold">{member.name}</h3>
                   <p className="text-muted-foreground">{member.role}</p>
-                  <span title="Points is no.of involved projects">
-                    Points :&nbsp;{member.projectsInvolved.length}
+                  No.of Involved Projects &nbsp;
+                  <span
+                    title="Points is no.of involved projects"
+                    className="inline-flex items-center rounded-md bg-yellow-50 px-2 py-1 text-xs font-medium text-yellow-800 ring-1 ring-inset ring-yellow-600/20"
+                  >
+                    {member.projectsInvolved.length}
                   </span>
                 </CardContent>
               </Card>

diff --git a/src/assets/images/projects/investiaa.png b/src/assets/images/projects/investiaa.png
diff --git a/src/assets/images/projects/uniplan.png b/src/assets/images/projects/uniplan.png
diff --git a/src/constants/data/members.ts b/src/constants/data/members.ts
@@ -1,3 +1,4 @@
+import { ImageConstants } from '../image.constant'
 import { projectNames } from './projects'
 
 interface Member {
@@ -7,33 +8,36 @@ interface Member {
   image: string
 }
 
-const baseURL =
-  'https://raw.githubusercontent.com/28softwares/28softwares.com--assets/refs/heads/main/images/members/'
-
 const members: Member[] = [
   {
     name: 'Sushil Gyawali',
     role: 'Mobile App Developer',
     projectsInvolved: [projectNames.UNIPLAN],
-    image: `${baseURL}/SushilGyawali_MobileAppDeveloper.png`,
+    image: ImageConstants.MEMBERS.sushilGyawali,
   },
   {
     name: 'Grishmin Karki',
     role: 'Frontend Developer',
     projectsInvolved: [projectNames.A_TO_Z_ECOMMERCE],
-    image: `${baseURL}/GrishminKarki_FrontendDeveloper.png`,
+    image: ImageConstants.MEMBERS.grishminKarki,
   },
   {
     name: 'Simon Chaudhary',
     role: 'Mobile App Developer',
     projectsInvolved: [projectNames.INVESTIAA],
-    image: `${baseURL}/SimonChaudhary_BackendDeveloper.png`,
+    image: ImageConstants.MEMBERS.simonChaudhary,
   },
   {
     name: 'Nirmal Neupane',
     role: 'Fullstack Developer',
     projectsInvolved: [projectNames.INVESTIAA, projectNames.A_TO_Z_ECOMMERCE],
-    image: `${baseURL}/NirmalNeupane_FullStackDeveloper.png`,
+    image: ImageConstants.MEMBERS.nirmalNeupane,
+  },
+  {
+    name: 'Prayukta Mishra',
+    role: 'UI/UX Designer',
+    projectsInvolved: [projectNames.A_TO_Z_ECOMMERCE],
+    image: ImageConstants.MEMBERS.prayuktaMishra,
   },
 ]
 members.sort((a, b) => b.projectsInvolved.length - a.projectsInvolved.length)

diff --git a/src/constants/data/projects.ts b/src/constants/data/projects.ts
@@ -1,4 +1,4 @@
-import images from '@/constants/image.constant'
+import { ImageConstants } from '../image.constant'
 
 export enum projectNames {
   'UNIPLAN' = 'Uniplan',
@@ -12,7 +12,7 @@ export const projectList = [
       'AI based Mobile App for teachers for creating and sharing curriculum and lesson plans.',
     type: 'Mobile Application',
     link: 'https://play.google.com/store/apps/details?id=com.uniplan',
-    image: images.uniplanLogo,
+    image: ImageConstants.PROJECTS.uniplan,
     year: 2024,
   },
   {
@@ -21,7 +21,7 @@ export const projectList = [
       'An online ecosystem for startups, connecting incubators, angel investors, venture capitalists, and academia for seamless access and growth.',
     link: 'https://www.investiaa.com/',
     type: 'Web Application',
-    image: images.investiaaImage,
+    image: ImageConstants.PROJECTS.investiaa,
     year: 2024,
   },
 ]
diff --git a/src/constants/image.constant.ts b/src/constants/image.constant.ts
@@ -1,9 +1,17 @@
-import investiaaLogo from '../assets/images/projects/investiaa.png'
-import uniplanLogo from '../assets/images/projects/uniplan.png'
-import investiaaImage from '/public/projects/investiaa.png'
+export class ImageConstants {
+  static baseURL =
+    'https://raw.githubusercontent.com/28softwares/28softwares.com--assets/refs/heads/main/images/'
 
-export default {
-  investiaaImage,
-  investiaaLogo,
-  uniplanLogo,
+  public static readonly MEMBERS = {
+    sushilGyawali: `${this.baseURL}/members/SushilGyawali_MobileAppDeveloper.png`,
+    grishminKarki: `${this.baseURL}/members/GrishminKarki_FrontendDeveloper.png`,
+    simonChaudhary: `${this.baseURL}/members/SimonChaudhary_BackendDeveloper.png`,
+    nirmalNeupane: `${this.baseURL}/members/NirmalNeupane_FullStackDeveloper.png`,
+    prayuktaMishra: `${this.baseURL}/members/PrayuktaMishra_UI_UXDesigner.png`,
+  }
+
+  public static readonly PROJECTS = {
+    investiaa: `${this.baseURL}/projects/investiaa.png`,
+    uniplan: `${this.baseURL}/projects/uniplan.png`,
+  }
 }