From c5f63dac00032424ccb7597d4b2e278262647b18 Mon Sep 17 00:00:00 2001 From: Maruf Bepary Date: Sun, 21 Apr 2024 11:50:20 +0100 Subject: [PATCH] Moved files around for better clarity --- .../material/experience/filterRolesByType.ts | 2 +- .../group/groupMaterialsByMaterialType.ts | 6 +-- app/certificates/[certificateKey]/page.tsx | 4 +- app/experience/components/ExperienceView.tsx | 2 +- components/MaterialLists/MaterialList.tsx | 4 +- components/MaterialLists/MaterialTab.tsx | 14 +++--- database/modules.ts | 46 +++++++++---------- database/roles.ts | 14 +++--- ...egories.ts => ExperienceCategoriesEnum.ts} | 4 +- enums/ExperienceType.ts | 6 --- enums/ExperienceTypeEnum.ts | 10 ++++ .../{MaterialType.ts => MaterialTypeEnum.ts} | 4 +- enums/ModuleYearGroups.ts | 7 --- enums/ModuleYearGroupsEnum.ts | 11 +++++ interfaces/material/RoleInterface.ts | 9 ++-- .../material/UniversityModuleInterface.ts | 6 +-- 16 files changed, 79 insertions(+), 70 deletions(-) rename enums/{ExperienceCategories.ts => ExperienceCategoriesEnum.ts} (74%) delete mode 100644 enums/ExperienceType.ts create mode 100644 enums/ExperienceTypeEnum.ts rename enums/{MaterialType.ts => MaterialTypeEnum.ts} (89%) delete mode 100644 enums/ModuleYearGroups.ts create mode 100644 enums/ModuleYearGroupsEnum.ts diff --git a/actions/material/experience/filterRolesByType.ts b/actions/material/experience/filterRolesByType.ts index 43ed832e..0e8938c6 100644 --- a/actions/material/experience/filterRolesByType.ts +++ b/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"; /** diff --git a/actions/material/group/groupMaterialsByMaterialType.ts b/actions/material/group/groupMaterialsByMaterialType.ts index 5aceb689..21fbb0e3 100644 --- a/actions/material/group/groupMaterialsByMaterialType.ts +++ b/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, - groupName: MaterialType + groupName: MaterialTypeEnum ): MaterialGroupInterface[] { // Filter materialKeys to ensure they exist in the materialsMap const validMaterialsKeys: string[] = materialsKeys.filter( diff --git a/app/certificates/[certificateKey]/page.tsx b/app/certificates/[certificateKey]/page.tsx index 27583536..6c806079 100644 --- a/app/certificates/[certificateKey]/page.tsx +++ b/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 = ({ params }) => { <> diff --git a/app/experience/components/ExperienceView.tsx b/app/experience/components/ExperienceView.tsx index b19b4908..8890de04 100644 --- a/app/experience/components/ExperienceView.tsx +++ b/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"; diff --git a/components/MaterialLists/MaterialList.tsx b/components/MaterialLists/MaterialList.tsx index 55bfded5..b5c0b19c 100644 --- a/components/MaterialLists/MaterialList.tsx +++ b/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; } diff --git a/components/MaterialLists/MaterialTab.tsx b/components/MaterialLists/MaterialTab.tsx index ecf38cc0..f4ed3de4 100644 --- a/components/MaterialLists/MaterialTab.tsx +++ b/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; basePath?: string; @@ -64,7 +64,7 @@ const MaterialTab: React.FC = ({ const sections: MaterialSectionInterface[] = [ { // Projects - name: MaterialType.Projects, + name: MaterialTypeEnum.Projects, materials: projectKeys, materialHashmap: projectDatabase, basePath: PROJECTS_PAGE.path, @@ -72,7 +72,7 @@ const MaterialTab: React.FC = ({ }, { // Work Experiences - name: MaterialType.WorkExperiences, + name: MaterialTypeEnum.WorkExperiences, materials: roleKeys, materialHashmap: rolesDatabase, ListComponent: WorkList, @@ -80,14 +80,14 @@ const MaterialTab: React.FC = ({ }, { // 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, @@ -95,7 +95,7 @@ const MaterialTab: React.FC = ({ }, { // Blogs - name: MaterialType.Blogs, + name: MaterialTypeEnum.Blogs, materials: blogKeys, materialHashmap: blogDatabase, basePath: BLOG_PAGE.path, diff --git a/database/modules.ts b/database/modules.ts index 8def9a6a..e3a3a35c 100644 --- a/database/modules.ts +++ b/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 = { //* 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 = { }, [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 = { }, [UniversityModuleKeysEnum.RHUL_ProgrammingLaboratory]: { name: "Programming Laboratory", - category: ModuleYearGroups.Year1, + category: ModuleYearGroupsEnum.Year1, skills: [ SkillKeysEnum.Python, SkillKeysEnum.SimpleGUI, @@ -107,7 +107,7 @@ const modulesMap: Database = { }, [UniversityModuleKeysEnum.RHUL_InternetServices]: { name: "Internet Services", - category: ModuleYearGroups.Year1, + category: ModuleYearGroupsEnum.Year1, skills: [ SkillKeysEnum.HTML, SkillKeysEnum.CSS, @@ -136,7 +136,7 @@ const modulesMap: Database = { }, [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 = { }, [UniversityModuleKeysEnum.RHUL_MachineFundamentals]: { name: "Machine Fundamentals", - category: ModuleYearGroups.Year1, + category: ModuleYearGroupsEnum.Year1, skills: [ SkillKeysEnum.Mathematics, SkillKeysEnum.Logics, @@ -191,7 +191,7 @@ const modulesMap: Database = { }, [UniversityModuleKeysEnum.RHUL_SoftwareDesign]: { name: "Software Design", - category: ModuleYearGroups.Year1, + category: ModuleYearGroupsEnum.Year1, skills: [ SkillKeysEnum.ProblemSolving, SkillKeysEnum.CriticalThinking, @@ -217,7 +217,7 @@ const modulesMap: Database = { //* 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 = { }, [UniversityModuleKeysEnum.RHUL_TeamProject]: { name: "Team Project", - category: ModuleYearGroups.Year2, + category: ModuleYearGroupsEnum.Year2, skills: [ SkillKeysEnum.TypeScript, SkillKeysEnum.Prisma, @@ -295,7 +295,7 @@ const modulesMap: Database = { }, [UniversityModuleKeysEnum.RHUL_OperatingSystems]: { name: "Operating Systems", - category: ModuleYearGroups.Year2, + category: ModuleYearGroupsEnum.Year2, skills: [ SkillKeysEnum.C, SkillKeysEnum.ProblemSolving, @@ -333,7 +333,7 @@ const modulesMap: Database = { }, [UniversityModuleKeysEnum.RHUL_Databases]: { name: "Databases", - category: ModuleYearGroups.Year2, + category: ModuleYearGroupsEnum.Year2, skills: [ SkillKeysEnum.RelationalDatabases, SkillKeysEnum.Normalisation, @@ -360,7 +360,7 @@ const modulesMap: Database = { }, [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 = { }, [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 = { }, [UniversityModuleKeysEnum.RHUL_ArtificialIntelligence]: { name: "Artificial Intelligence", - category: ModuleYearGroups.Year2, + category: ModuleYearGroupsEnum.Year2, skills: [ SkillKeysEnum.ArtificialIntelligence, SkillKeysEnum.Algorithms, @@ -442,7 +442,7 @@ const modulesMap: Database = { }, [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 = { //* 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 = { }, [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 = { }, [UniversityModuleKeysEnum.RHUL_FunctionalProgramming]: { name: "Functional Programming", - category: ModuleYearGroups.Year3, + category: ModuleYearGroupsEnum.Year3, skills: [ SkillKeysEnum.Haskell, SkillKeysEnum.Scala, @@ -580,7 +580,7 @@ const modulesMap: Database = { }, [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 = { }, [UniversityModuleKeysEnum.RHUL_MachineLearning]: { name: "Machine Learning", - category: ModuleYearGroups.Year3, + category: ModuleYearGroupsEnum.Year3, skills: [ SkillKeysEnum.Python, SkillKeysEnum.MachineLearning, @@ -686,7 +686,7 @@ const modulesMap: Database = { }, [UniversityModuleKeysEnum.RHUL_ComputationalFinance]: { name: "Computational Finance", - category: ModuleYearGroups.Year3, + category: ModuleYearGroupsEnum.Year3, skills: [ SkillKeysEnum.Python, SkillKeysEnum.Probability, @@ -721,7 +721,7 @@ const modulesMap: Database = { }, [UniversityModuleKeysEnum.RHUL_SecurityManagement]: { name: "Security Management", - category: ModuleYearGroups.Year3, + category: ModuleYearGroupsEnum.Year3, skills: [ SkillKeysEnum.CyberSecurity, SkillKeysEnum.ProblemSolving, diff --git a/database/roles.ts b/database/roles.ts index 97bd325c..a1dffaa6 100644 --- a/database/roles.ts +++ b/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 = { [RoleKeyEnum.CommerzbankDevOpsEngineer]: { name: "DevOps Engineer", - category: ExperienceCategories.Software, + category: ExperienceCategoriesEnum.Software, type: ExperienceTypeEnum.Professional, skills: [ SkillKeysEnum.Python, @@ -76,7 +76,7 @@ const rolesMap: Database = { }, [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 = { }, [RoleKeyEnum.GoogleRHULDevelopersClubSoftwareEngineer]: { name: "Software Engineer", - category: ExperienceCategories.Software, + category: ExperienceCategoriesEnum.Software, type: ExperienceTypeEnum.Volunteering, skills: [ SkillKeysEnum.Python, @@ -175,7 +175,7 @@ const rolesMap: Database = { }, [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 = { }, [RoleKeyEnum.MadhusTeamLeader]: { name: "Team Leader", - category: ExperienceCategories.Other, + category: ExperienceCategoriesEnum.Other, type: ExperienceTypeEnum.Professional, company: CompanyKeyEnum.Madhus, startDate: "June 2018", diff --git a/enums/ExperienceCategories.ts b/enums/ExperienceCategoriesEnum.ts similarity index 74% rename from enums/ExperienceCategories.ts rename to enums/ExperienceCategoriesEnum.ts index 37f21914..13d45b79 100644 --- a/enums/ExperienceCategories.ts +++ b/enums/ExperienceCategoriesEnum.ts @@ -2,9 +2,9 @@ * Enum for experience categories. * This enum is used to avoid hardcoding the categories in the code, getting autocompletion support and avoiding typos. */ -enum ExperienceCategories { +enum ExperienceCategoriesEnum { Software = "Software", Other = "Other", } -export default ExperienceCategories; +export default ExperienceCategoriesEnum; diff --git a/enums/ExperienceType.ts b/enums/ExperienceType.ts deleted file mode 100644 index 65ad2628..00000000 --- a/enums/ExperienceType.ts +++ /dev/null @@ -1,6 +0,0 @@ -enum ExperienceTypeEnum { - Professional = "Professional", - Volunteering = "Volunteering", -} - -export default ExperienceTypeEnum; diff --git a/enums/ExperienceTypeEnum.ts b/enums/ExperienceTypeEnum.ts new file mode 100644 index 00000000..ab11e15d --- /dev/null +++ b/enums/ExperienceTypeEnum.ts @@ -0,0 +1,10 @@ +/** + * This enum is used to represent the types of the experiences. + * This enum is used to avoid hardcoding the types in the code, getting autocompletion support and avoiding typos. + */ +enum ExperienceTypeEnum { + Professional = "Professional", + Volunteering = "Volunteering", +} + +export default ExperienceTypeEnum; diff --git a/enums/MaterialType.ts b/enums/MaterialTypeEnum.ts similarity index 89% rename from enums/MaterialType.ts rename to enums/MaterialTypeEnum.ts index 7db5651c..9ef90487 100644 --- a/enums/MaterialType.ts +++ b/enums/MaterialTypeEnum.ts @@ -7,7 +7,7 @@ * @see {@link CourseInterface} * @see {@link UniversityModuleInterface} */ -enum MaterialType { +enum MaterialTypeEnum { Projects = "Projects", Courses = "Courses", UniversityModules = "University Modules", @@ -16,4 +16,4 @@ enum MaterialType { Blogs = "Blogs", } -export default MaterialType; +export default MaterialTypeEnum; diff --git a/enums/ModuleYearGroups.ts b/enums/ModuleYearGroups.ts deleted file mode 100644 index bbf91123..00000000 --- a/enums/ModuleYearGroups.ts +++ /dev/null @@ -1,7 +0,0 @@ -enum ModuleYearGroups { - Year1 = "Year 1", - Year2 = "Year 2", - Year3 = "Year 3", -} - -export default ModuleYearGroups; diff --git a/enums/ModuleYearGroupsEnum.ts b/enums/ModuleYearGroupsEnum.ts new file mode 100644 index 00000000..4c4aeca8 --- /dev/null +++ b/enums/ModuleYearGroupsEnum.ts @@ -0,0 +1,11 @@ +/** + * This enum represents the year groups that a module can belong to. + * This enum is used to avoid hardcoding the year groups in the code, getting autocompletion support and avoiding typos. + */ +enum ModuleYearGroupsEnum { + Year1 = "Year 1", + Year2 = "Year 2", + Year3 = "Year 3", +} + +export default ModuleYearGroupsEnum; diff --git a/interfaces/material/RoleInterface.ts b/interfaces/material/RoleInterface.ts index 0b604020..8e8c34ff 100644 --- a/interfaces/material/RoleInterface.ts +++ b/interfaces/material/RoleInterface.ts @@ -1,13 +1,14 @@ -import ExperienceCategories from "@/enums/ExperienceCategories"; +import ExperienceCategoriesEnum from "@/enums/ExperienceCategoriesEnum"; import MaterialInterface from "./MaterialInterface"; -import ExperienceTypeEnum from "@/enums/ExperienceType"; +import ExperienceTypeEnum from "@/enums/ExperienceTypeEnum"; import CompanyKeyEnum from "@/enums/DatabaseKeysEnums/ExperienceCompanyEnum"; + /** * Interface representing a role related to work experience. * These roles are displayed on the website and show the roles held by the user. * * The fields are: - * - `category`: the category of the role which is one of the categories defined in {@link ExperienceCategories} + * - `category`: the category of the role which is one of the categories defined in {@link ExperienceCategoriesEnum} * - `type`: the type of the experience which is one of the types defined in {@link ExperienceTypeEnum} * - `startDate`: the start date of the role * - `endDate`: the end date of the role @@ -18,7 +19,7 @@ import CompanyKeyEnum from "@/enums/DatabaseKeysEnums/ExperienceCompanyEnum"; * it inherits the field `skills` which is an array of `SkillKeysEnum` which is used to represent the skills that are associated to understand the material. */ export default interface RoleInterface extends MaterialInterface { - category: ExperienceCategories; + category: ExperienceCategoriesEnum; type: ExperienceTypeEnum; startDate: string; endDate: string | "Present"; diff --git a/interfaces/material/UniversityModuleInterface.ts b/interfaces/material/UniversityModuleInterface.ts index 39c62653..01fb6250 100644 --- a/interfaces/material/UniversityModuleInterface.ts +++ b/interfaces/material/UniversityModuleInterface.ts @@ -1,4 +1,4 @@ -import ModuleYearGroups from "@/enums/ModuleYearGroups"; +import ModuleYearGroupsEnum from "@/enums/ModuleYearGroupsEnum"; import MaterialInterface from "./MaterialInterface"; import UniversityCourseKeysEnum from "@/enums/DatabaseKeysEnums/UniversityCourseKeysEnum"; @@ -9,7 +9,7 @@ import UniversityCourseKeysEnum from "@/enums/DatabaseKeysEnums/UniversityCourse * The fields are: * - `learningOutcomes`: the learning outcomes of the module * - `score`: the score achieved in the module - * - `category`: the year group of the module which is one of the categories defined in {@link ModuleYearGroups} + * - `category`: the year group of the module which is one of the categories defined in {@link ModuleYearGroupsEnum} * - `parentCourse`: the course to which the module belongs * * Importantly, because the `UniversityModuleInterface` extends the `MaterialInterface`, it inherits the field `skills` which is an array of `SkillKeysEnum` which is used to represent the skills that are associated to understand the material. @@ -17,6 +17,6 @@ import UniversityCourseKeysEnum from "@/enums/DatabaseKeysEnums/UniversityCourse export default interface UniversityModuleInterface extends MaterialInterface { learningOutcomes: string[]; score?: number; - category: ModuleYearGroups; + category: ModuleYearGroupsEnum; parentCourse: UniversityCourseKeysEnum; }