Moved files around for better clarity

actions/material/experience/filterRolesByType.ts

@@ -1,5 +1,5 @@
 import stringToSlug from "@/actions/stringToSlug";
-import ExperienceTypeEnum from "@/enums/ExperienceType";
+import ExperienceTypeEnum from "@/enums/ExperienceTypeEnum";
 import RoleInterface from "@/interfaces/material/RoleInterface";
 
 /**

actions/material/group/groupMaterialsByMaterialType.ts

@@ -1,9 +1,9 @@
-import MaterialType from "@/enums/MaterialType";
+import MaterialTypeEnum from "@/enums/MaterialTypeEnum";
 import MaterialGroupInterface from "@/interfaces/material/MaterialGroupInterface";
 import MaterialInterface from "@/interfaces/material/MaterialInterface";
 
 /**
- * Groups the materials based on the material type as defined in {@link MaterialType}.
+ * Groups the materials based on the material type as defined in {@link MaterialTypeEnum}.
  * A name for the group is provided.
  *
  * @param materialsKeys The keys of the materials to group
@@ -16,7 +16,7 @@ export default function groupMaterialsByMaterialType<
 >(
   materialsKeys: string[],
   materialsDatabase: Database<T>,
-  groupName: MaterialType
+  groupName: MaterialTypeEnum
 ): MaterialGroupInterface[] {
   // Filter materialKeys to ensure they exist in the materialsMap
   const validMaterialsKeys: string[] = materialsKeys.filter(

app/certificates/[certificateKey]/page.tsx

@@ -14,7 +14,7 @@ import { CERTIFICATES_PAGE } from "@/constants/pages";
 import certificateDatabase from "@/database/certificates";
 import skillDatabase from "@/database/skills";
 import SkillKeysEnum from "@/enums/DatabaseKeysEnums/SkillKeysEnum";
-import MaterialType from "@/enums/MaterialType";
+import MaterialTypeEnum from "@/enums/MaterialTypeEnum";
 import SkillTypesEnum from "@/enums/SkillTypesEnum";
 import CertificateInterface from "@/interfaces/material/CertificateInterface";
 import GroupedSkillsCategoriesInterface from "@/interfaces/skills/GroupedSkillsInterface";
@@ -266,7 +266,7 @@ const CertificatesPage: React.FC<CertificatesPageProps> = ({ params }) => {
             <>
               <MaterialList
                 materialKeys={certificateData.relatedMaterials}
-                defaultTab={MaterialType.Certificates}
+                defaultTab={MaterialTypeEnum.Certificates}
                 sectionName={certificateData.name}
               />
             </>

app/experience/components/ExperienceView.tsx

@@ -18,7 +18,7 @@ import rolesDatabase from "@/database/roles";
 import skillDatabase from "@/database/skills";
 import RoleKeyEnum from "@/enums/DatabaseKeysEnums/RoleKeyEnum";
 import SkillKeysEnum from "@/enums/DatabaseKeysEnums/SkillKeysEnum";
-import ExperienceTypeEnum from "@/enums/ExperienceType";
+import ExperienceTypeEnum from "@/enums/ExperienceTypeEnum";
 import SkillTypesEnum from "@/enums/SkillTypesEnum";
 import useFuseSearch from "@/hooks/useFuseSearch";
 import FilterCategory from "@/interfaces/filters/FilterCategory";

components/MaterialLists/MaterialList.tsx

@@ -4,13 +4,13 @@ import {
   AccordionItem,
   AccordionTrigger,
 } from "@/components/shadcn/ui/accordion";
-import MaterialType from "@/enums/MaterialType";
+import MaterialTypeEnum from "@/enums/MaterialTypeEnum";
 import React from "react";
 import MaterialTab from "./MaterialTab";
 
 export interface MaterialTabsProps {
   materialKeys: string[];
-  defaultTab?: MaterialType;
+  defaultTab?: MaterialTypeEnum;
   isCollapsible?: boolean;
   sectionName?: string;
 }

components/MaterialLists/MaterialTab.tsx

@@ -23,7 +23,7 @@ import certificateDatabase, { certificateKeys } from "@/database/certificates";
 import moduleDatabase, { moduleKeys } from "@/database/modules";
 import projectDatabase, { projectKeys } from "@/database/projects";
 import rolesDatabase, { roleKeys } from "@/database/roles";
-import MaterialType from "@/enums/MaterialType";
+import MaterialTypeEnum from "@/enums/MaterialTypeEnum";
 import MaterialGroupInterface from "@/interfaces/material/MaterialGroupInterface";
 import MaterialInterface from "@/interfaces/material/MaterialInterface";
 import MaterialListProps from "@/interfaces/props/MaterialListProps";
@@ -33,7 +33,7 @@ import { MaterialTabsProps } from "./MaterialList";
 import WorkList from "./WorkList";
 
 interface MaterialSectionInterface {
-  name: MaterialType;
+  name: MaterialTypeEnum;
   materials: string[];
   materialHashmap: Database<MaterialInterface>;
   basePath?: string;
@@ -64,38 +64,38 @@ const MaterialTab: React.FC<MaterialTabsProps> = ({
   const sections: MaterialSectionInterface[] = [
     {
       // Projects
-      name: MaterialType.Projects,
+      name: MaterialTypeEnum.Projects,
       materials: projectKeys,
       materialHashmap: projectDatabase,
       basePath: PROJECTS_PAGE.path,
       ListComponent: ProjectsList,
     },
     {
       // Work Experiences
-      name: MaterialType.WorkExperiences,
+      name: MaterialTypeEnum.WorkExperiences,
       materials: roleKeys,
       materialHashmap: rolesDatabase,
       ListComponent: WorkList,
       basePath: EXPERIENCE_PAGE.path,
     },
     {
       // University Modules
-      name: MaterialType.UniversityModules,
+      name: MaterialTypeEnum.UniversityModules,
       materials: moduleKeys,
       materialHashmap: moduleDatabase,
       ListComponent: ModuleList,
     },
     {
       // Certificates
-      name: MaterialType.Certificates,
+      name: MaterialTypeEnum.Certificates,
       materials: certificateKeys,
       materialHashmap: certificateDatabase,
       basePath: CERTIFICATES_PAGE.path,
       ListComponent: CertificatesList,
     },
     {
       // Blogs
-      name: MaterialType.Blogs,
+      name: MaterialTypeEnum.Blogs,
       materials: blogKeys,
       materialHashmap: blogDatabase,
       basePath: BLOG_PAGE.path,

database/modules.ts

@@ -2,7 +2,7 @@ import addNestedSkillsMaterialList from "@/actions/material/addNestedSkillsMater
 import ProjectKeysEnum from "@/enums/DatabaseKeysEnums/ProjectKeysEnum";
 import SkillKeysEnum from "@/enums/DatabaseKeysEnums/SkillKeysEnum";
 import UniversityModuleKeysEnum from "@/enums/DatabaseKeysEnums/UniversityModuleKeysEnum";
-import ModuleYearGroups from "@/enums/ModuleYearGroups";
+import ModuleYearGroupsEnum from "@/enums/ModuleYearGroupsEnum";
 import SkillCategoriesEnum from "@/enums/SkillCategoriesEnum";
 import SkillTypesEnum from "@/enums/SkillTypesEnum";
 import UniversityModuleInterface from "@/interfaces/material/UniversityModuleInterface";
@@ -19,7 +19,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   //* Year 1
   [UniversityModuleKeysEnum.RHUL_ObjectOrientedProgramming1]: {
     name: "Object Oriented Programming 1",
-    category: ModuleYearGroups.Year1,
+    category: ModuleYearGroupsEnum.Year1,
     skills: [
       SkillKeysEnum.Java,
       SkillKeysEnum.ObjectOrientedProgramming,
@@ -46,7 +46,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_ObjectOrientedProgramming2]: {
     name: "Object Oriented Programming 2",
-    category: ModuleYearGroups.Year1,
+    category: ModuleYearGroupsEnum.Year1,
     skills: [
       SkillKeysEnum.Java,
       SkillKeysEnum.ObjectOrientedProgramming,
@@ -75,7 +75,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_ProgrammingLaboratory]: {
     name: "Programming Laboratory",
-    category: ModuleYearGroups.Year1,
+    category: ModuleYearGroupsEnum.Year1,
     skills: [
       SkillKeysEnum.Python,
       SkillKeysEnum.SimpleGUI,
@@ -107,7 +107,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_InternetServices]: {
     name: "Internet Services",
-    category: ModuleYearGroups.Year1,
+    category: ModuleYearGroupsEnum.Year1,
     skills: [
       SkillKeysEnum.HTML,
       SkillKeysEnum.CSS,
@@ -136,7 +136,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_MathematicalStructures]: {
     name: "Mathematical Structures (Discrete Mathematics)",
-    category: ModuleYearGroups.Year1,
+    category: ModuleYearGroupsEnum.Year1,
     skills: [
       SkillKeysEnum.Mathematics,
       SkillKeysEnum.Discrete,
@@ -162,7 +162,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_MachineFundamentals]: {
     name: "Machine Fundamentals",
-    category: ModuleYearGroups.Year1,
+    category: ModuleYearGroupsEnum.Year1,
     skills: [
       SkillKeysEnum.Mathematics,
       SkillKeysEnum.Logics,
@@ -191,7 +191,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_SoftwareDesign]: {
     name: "Software Design",
-    category: ModuleYearGroups.Year1,
+    category: ModuleYearGroupsEnum.Year1,
     skills: [
       SkillKeysEnum.ProblemSolving,
       SkillKeysEnum.CriticalThinking,
@@ -217,7 +217,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   //* Year 2
   [UniversityModuleKeysEnum.RHUL_SoftwareEngineering]: {
     name: "Software Engineering",
-    category: ModuleYearGroups.Year2,
+    category: ModuleYearGroupsEnum.Year2,
     skills: [
       SkillKeysEnum.Java,
       SkillKeysEnum.JUnit,
@@ -253,7 +253,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_TeamProject]: {
     name: "Team Project",
-    category: ModuleYearGroups.Year2,
+    category: ModuleYearGroupsEnum.Year2,
     skills: [
       SkillKeysEnum.TypeScript,
       SkillKeysEnum.Prisma,
@@ -295,7 +295,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_OperatingSystems]: {
     name: "Operating Systems",
-    category: ModuleYearGroups.Year2,
+    category: ModuleYearGroupsEnum.Year2,
     skills: [
       SkillKeysEnum.C,
       SkillKeysEnum.ProblemSolving,
@@ -333,7 +333,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_Databases]: {
     name: "Databases",
-    category: ModuleYearGroups.Year2,
+    category: ModuleYearGroupsEnum.Year2,
     skills: [
       SkillKeysEnum.RelationalDatabases,
       SkillKeysEnum.Normalisation,
@@ -360,7 +360,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_AlgorithmsAndComplexity]: {
     name: "Algorithms and Complexity",
-    category: ModuleYearGroups.Year2,
+    category: ModuleYearGroupsEnum.Year2,
     skills: [
       SkillKeysEnum.Algorithms,
       SkillKeysEnum.Java,
@@ -387,7 +387,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_MultidimensionalDataProcessing]: {
     name: "Multidimensional Data Processing (Linear Algebra)",
-    category: ModuleYearGroups.Year2,
+    category: ModuleYearGroupsEnum.Year2,
     skills: [
       SkillKeysEnum.LinearAlgebra,
       SkillKeysEnum.Python,
@@ -413,7 +413,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_ArtificialIntelligence]: {
     name: "Artificial Intelligence",
-    category: ModuleYearGroups.Year2,
+    category: ModuleYearGroupsEnum.Year2,
     skills: [
       SkillKeysEnum.ArtificialIntelligence,
       SkillKeysEnum.Algorithms,
@@ -442,7 +442,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_IntroductionToInformationSecurity]: {
     name: "Introduction to Information Security",
-    category: ModuleYearGroups.Year2,
+    category: ModuleYearGroupsEnum.Year2,
     skills: [
       SkillKeysEnum.CyberSecurity,
       SkillKeysEnum.Cryptography,
@@ -471,7 +471,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   //* Year 3
   [UniversityModuleKeysEnum.RHUL_UserCentredDesign]: {
     name: "User Centred Design",
-    category: ModuleYearGroups.Year3,
+    category: ModuleYearGroupsEnum.Year3,
     skills: [
       SkillKeysEnum.UserCentricDesign,
       SkillKeysEnum.Teamwork,
@@ -508,7 +508,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_ITProjectManagement]: {
     name: "IT Project Management",
-    category: ModuleYearGroups.Year3,
+    category: ModuleYearGroupsEnum.Year3,
     skills: [
       SkillKeysEnum.ProjectManagement,
       SkillKeysEnum.Communication,
@@ -550,7 +550,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_FunctionalProgramming]: {
     name: "Functional Programming",
-    category: ModuleYearGroups.Year3,
+    category: ModuleYearGroupsEnum.Year3,
     skills: [
       SkillKeysEnum.Haskell,
       SkillKeysEnum.Scala,
@@ -580,7 +580,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_FinalYearProject]: {
     name: "Final Year Project (Web Development)",
-    category: ModuleYearGroups.Year3,
+    category: ModuleYearGroupsEnum.Year3,
     skills: [
       SkillKeysEnum.TypeScript,
       SkillKeysEnum.JavaScript,
@@ -645,7 +645,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_MachineLearning]: {
     name: "Machine Learning",
-    category: ModuleYearGroups.Year3,
+    category: ModuleYearGroupsEnum.Year3,
     skills: [
       SkillKeysEnum.Python,
       SkillKeysEnum.MachineLearning,
@@ -686,7 +686,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_ComputationalFinance]: {
     name: "Computational Finance",
-    category: ModuleYearGroups.Year3,
+    category: ModuleYearGroupsEnum.Year3,
     skills: [
       SkillKeysEnum.Python,
       SkillKeysEnum.Probability,
@@ -721,7 +721,7 @@ const modulesMap: Database<UniversityModuleInterface> = {
   },
   [UniversityModuleKeysEnum.RHUL_SecurityManagement]: {
     name: "Security Management",
-    category: ModuleYearGroups.Year3,
+    category: ModuleYearGroupsEnum.Year3,
     skills: [
       SkillKeysEnum.CyberSecurity,
       SkillKeysEnum.ProblemSolving,

database/roles.ts

@@ -3,14 +3,14 @@ import CompanyKeyEnum from "@/enums/DatabaseKeysEnums/ExperienceCompanyEnum";
 import ProjectKeysEnum from "@/enums/DatabaseKeysEnums/ProjectKeysEnum";
 import RoleKeyEnum from "@/enums/DatabaseKeysEnums/RoleKeyEnum";
 import SkillKeysEnum from "@/enums/DatabaseKeysEnums/SkillKeysEnum";
-import ExperienceCategories from "@/enums/ExperienceCategories";
-import ExperienceTypeEnum from "@/enums/ExperienceType";
+import ExperienceCategoriesEnum from "@/enums/ExperienceCategoriesEnum";
+import ExperienceTypeEnum from "@/enums/ExperienceTypeEnum";
 import RoleInterface from "@/interfaces/material/RoleInterface";
 
 const rolesMap: Database<RoleInterface> = {
   [RoleKeyEnum.CommerzbankDevOpsEngineer]: {
     name: "DevOps Engineer",
-    category: ExperienceCategories.Software,
+    category: ExperienceCategoriesEnum.Software,
     type: ExperienceTypeEnum.Professional,
     skills: [
       SkillKeysEnum.Python,
@@ -76,7 +76,7 @@ const rolesMap: Database<RoleInterface> = {
   },
   [RoleKeyEnum.GnomeFoundationCommunityMember]: {
     name: "Community Member",
-    category: ExperienceCategories.Software,
+    category: ExperienceCategoriesEnum.Software,
     type: ExperienceTypeEnum.Volunteering,
     company: CompanyKeyEnum.GnomeFoundation,
     startDate: "October 2022",
@@ -111,7 +111,7 @@ const rolesMap: Database<RoleInterface> = {
   },
   [RoleKeyEnum.GoogleRHULDevelopersClubSoftwareEngineer]: {
     name: "Software Engineer",
-    category: ExperienceCategories.Software,
+    category: ExperienceCategoriesEnum.Software,
     type: ExperienceTypeEnum.Volunteering,
     skills: [
       SkillKeysEnum.Python,
@@ -175,7 +175,7 @@ const rolesMap: Database<RoleInterface> = {
   },
   [RoleKeyEnum.AJTuitionCentreTutor]: {
     name: "Mathematics Tutor",
-    category: ExperienceCategories.Other,
+    category: ExperienceCategoriesEnum.Other,
     type: ExperienceTypeEnum.Professional,
     company: CompanyKeyEnum.AJTuitionCentre,
     startDate: "September 2018",
@@ -200,7 +200,7 @@ const rolesMap: Database<RoleInterface> = {
   },
   [RoleKeyEnum.MadhusTeamLeader]: {
     name: "Team Leader",
-    category: ExperienceCategories.Other,
+    category: ExperienceCategoriesEnum.Other,
     type: ExperienceTypeEnum.Professional,
     company: CompanyKeyEnum.Madhus,
     startDate: "June 2018",