Skip to content

Commit f221cf7

Browse files
jsharkey13jsharkey13
authored
Merge pull request #96 from isaacphysics/feature/coming-soon-dates
Add coming soon dates to all topics
2 parents 9dc9c9e + 4eefea0 commit f221cf7

File tree

3 files changed

+35
-37
lines changed

3 files changed

+35
-37
lines changed

‎src/app/components/pages/AllTopics.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const AllTopics = () => {
2020
</TextTag>
2121
</Link>
2222
{" "}
23-
{topic.comingSoon && !topic.new && <Badge color="light" className="border bg-white">Coming soon</Badge>}
23+
{topic.comingSoon && !topic.new && <Badge color="light" className="border bg-white">Coming {topic.comingSoon}</Badge>}
2424
{topic.new && !topic.comingSoon && <Badge color="secondary">New</Badge>}
2525
</React.Fragment>;
2626
};

‎src/app/services/constants.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ export enum TAG_ID {
305305
complexity = "complexity",
306306
modelsOfComputation = "models_of_computation",
307307
planningAndDebugging = "planning_and_debugging",
308-
dataStructuresTheory = "data_structures_theory",
308+
dataStructures = "data_structures",
309309
// Computer networks topics
310310
security = "security",
311311
networkStructure = "network_structure",
@@ -342,7 +342,6 @@ export enum TAG_ID {
342342
subroutines = "subroutines",
343343
files = "files",
344344
structureAndRobustness = "structure_and_robustness",
345-
dataStructuresImplementation = "data_structures_implementation",
346345
recursion = "recursion",
347346
stringManipulation = "string_manipulation",
348347
guis = "guis",

‎src/app/services/tags.ts

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ interface BaseTag {
66
id: TAG_ID;
77
title: string;
88
parent?: TAG_ID;
9-
comingSoon?: boolean;
9+
comingSoon?: string;
1010
new?: boolean;
1111
}
1212
export interface Tag extends BaseTag {
@@ -33,57 +33,56 @@ const baseTags: BaseTag[] = [
3333
// GCSE to A level transition topics
3434
{id: TAG_ID.gcseBooleanLogic, title: "Boolean logic", parent: TAG_ID.gcseToALevel},
3535
{id: TAG_ID.gcseProgrammingConcepts, title: "Programming concepts", parent: TAG_ID.gcseToALevel},
36-
{id: TAG_ID.gcseNetworking, title: "Networking", parent: TAG_ID.gcseToALevel, comingSoon: true},
36+
{id: TAG_ID.gcseNetworking, title: "Networking", parent: TAG_ID.gcseToALevel, comingSoon: 'Jan 2020'},
3737
{id: TAG_ID.gcseDataRepresentation, title: "Data representation", parent: TAG_ID.gcseToALevel},
3838
{id: TAG_ID.gcseSystems, title: "Systems", parent: TAG_ID.gcseToALevel, new: true},
3939
// Data structures and algorithms topics
4040
{id: TAG_ID.searchingSortingPathfinding, title: "Searching, sorting & pathfinding", parent: TAG_ID.dataStructuresAndAlgorithms, new: true},
41-
{id: TAG_ID.complexity, title: "Complexity", parent: TAG_ID.dataStructuresAndAlgorithms, comingSoon: true},
42-
{id: TAG_ID.modelsOfComputation, title: "Models of computation", parent: TAG_ID.dataStructuresAndAlgorithms, comingSoon: true},
43-
{id: TAG_ID.planningAndDebugging, title: "Planning and debugging", parent: TAG_ID.dataStructuresAndAlgorithms, comingSoon: true},
44-
{id: TAG_ID.dataStructuresTheory, title: "Data structures (theory)", parent: TAG_ID.dataStructuresAndAlgorithms, comingSoon: true},
41+
{id: TAG_ID.complexity, title: "Complexity", parent: TAG_ID.dataStructuresAndAlgorithms, comingSoon: 'Apr 2020'},
42+
{id: TAG_ID.modelsOfComputation, title: "Models of computation", parent: TAG_ID.dataStructuresAndAlgorithms, comingSoon: 'Jan 2020'},
43+
{id: TAG_ID.planningAndDebugging, title: "Planning and debugging", parent: TAG_ID.dataStructuresAndAlgorithms, comingSoon: 'Apr 2020'},
44+
{id: TAG_ID.dataStructures, title: "Data structures", parent: TAG_ID.dataStructuresAndAlgorithms, comingSoon: 'Jan 2020'},
4545
// Computer networks topics
46-
{id: TAG_ID.security, title: "Security", parent: TAG_ID.computerNetworks, comingSoon: true},
47-
{id: TAG_ID.networkStructure, title: "Network structure", parent: TAG_ID.computerNetworks, comingSoon: true},
48-
{id: TAG_ID.networkHardware, title: "Network hardware", parent: TAG_ID.computerNetworks, comingSoon: true},
49-
{id: TAG_ID.communication, title: "Communication", parent: TAG_ID.computerNetworks, comingSoon: true},
50-
{id: TAG_ID.internet, title: "Internet", parent: TAG_ID.computerNetworks, comingSoon: true},
46+
{id: TAG_ID.security, title: "Security", parent: TAG_ID.computerNetworks, comingSoon: 'Apr 2020'},
47+
{id: TAG_ID.networkStructure, title: "Network structure", parent: TAG_ID.computerNetworks, comingSoon: 'Jan 2020'},
48+
{id: TAG_ID.networkHardware, title: "Network hardware", parent: TAG_ID.computerNetworks, comingSoon: 'Jan 2020'},
49+
{id: TAG_ID.communication, title: "Communication", parent: TAG_ID.computerNetworks, comingSoon: 'Jan 2020'},
50+
{id: TAG_ID.internet, title: "Internet", parent: TAG_ID.computerNetworks, comingSoon: 'Jan 2020'},
5151
// Computer systems topics
5252
{id: TAG_ID.booleanLogic, title: "Boolean logic", parent: TAG_ID.computerSystems},
53-
{id: TAG_ID.architecture, title: "Architecture", parent: TAG_ID.computerSystems, comingSoon: true},
54-
{id: TAG_ID.hardware, title: "Hardware", parent: TAG_ID.computerSystems, comingSoon: true},
53+
{id: TAG_ID.architecture, title: "Architecture", parent: TAG_ID.computerSystems, comingSoon: 'Apr 2020'},
54+
{id: TAG_ID.hardware, title: "Hardware", parent: TAG_ID.computerSystems, comingSoon: 'Jan 2020'},
5555
{id: TAG_ID.operatingSystemsAndSoftware, title: "Operating systems and software", parent: TAG_ID.computerSystems, new: true},
56-
{id: TAG_ID.translators, title: "Translators", parent: TAG_ID.computerSystems, comingSoon: true},
57-
{id: TAG_ID.programmingLanguages, title: "Programming languages", parent: TAG_ID.computerSystems, comingSoon: true},
56+
{id: TAG_ID.translators, title: "Translators", parent: TAG_ID.computerSystems, comingSoon: 'Sept 2019'},
57+
{id: TAG_ID.programmingLanguages, title: "Programming languages", parent: TAG_ID.computerSystems, comingSoon: 'Sept 2019'},
5858
// Data and information topics
59-
{id: TAG_ID.numberSystems, title: "Number systems", parent: TAG_ID.dataAndInformation, comingSoon: true},
59+
{id: TAG_ID.numberSystems, title: "Number systems", parent: TAG_ID.dataAndInformation, comingSoon: 'Jan 2020'},
6060
{id: TAG_ID.numberBases, title: "Number bases", parent: TAG_ID.dataAndInformation},
61-
{id: TAG_ID.representation, title: "Representation", parent: TAG_ID.dataAndInformation, comingSoon: true},
62-
{id: TAG_ID.transmission, title: "Transmission", parent: TAG_ID.dataAndInformation, comingSoon: true},
63-
{id: TAG_ID.databases, title: "Databases", parent: TAG_ID.dataAndInformation, comingSoon: true},
64-
{id: TAG_ID.bigData, title: "Big Data", parent: TAG_ID.dataAndInformation, comingSoon: true},
65-
{id: TAG_ID.compression, title: "Compression", parent: TAG_ID.dataAndInformation, comingSoon: true},
66-
{id: TAG_ID.encryption, title: "Encryption", parent: TAG_ID.dataAndInformation, comingSoon: true},
61+
{id: TAG_ID.representation, title: "Representation", parent: TAG_ID.dataAndInformation, comingSoon: 'Jan 2020'},
62+
{id: TAG_ID.transmission, title: "Transmission", parent: TAG_ID.dataAndInformation, comingSoon: 'Apr 2020'},
63+
{id: TAG_ID.databases, title: "Databases", parent: TAG_ID.dataAndInformation, comingSoon: 'Apr 2020'},
64+
{id: TAG_ID.bigData, title: "Big Data", parent: TAG_ID.dataAndInformation, comingSoon: 'Jan 2020'},
65+
{id: TAG_ID.compression, title: "Compression", parent: TAG_ID.dataAndInformation, comingSoon: 'Apr 2020'},
66+
{id: TAG_ID.encryption, title: "Encryption", parent: TAG_ID.dataAndInformation, comingSoon: 'Sept 2019'},
6767

6868
// Functional programming topics
69-
{id: TAG_ID.functions, title: "Functions", parent: TAG_ID.functionalProgramming, comingSoon: true},
70-
{id: TAG_ID.lists, title: "Lists", parent: TAG_ID.functionalProgramming, comingSoon: true},
71-
{id: TAG_ID.higherOrderFunctions, title: "Higher order functions", parent: TAG_ID.functionalProgramming, comingSoon: true},
69+
{id: TAG_ID.functions, title: "Functions", parent: TAG_ID.functionalProgramming, comingSoon: 'Jan 2020'},
70+
{id: TAG_ID.lists, title: "Lists", parent: TAG_ID.functionalProgramming, comingSoon: 'Jan 2020'},
71+
{id: TAG_ID.higherOrderFunctions, title: "Higher order functions", parent: TAG_ID.functionalProgramming, comingSoon: 'Jan 2020'},
7272
// Object-oriented programming topics
73-
{id: TAG_ID.creatingObjects, title: "Creating objects", parent: TAG_ID.objectOrientedProgramming, comingSoon: true},
74-
{id: TAG_ID.oopConcepts, title: "OOP concepts", parent: TAG_ID.objectOrientedProgramming, comingSoon: true},
75-
{id: TAG_ID.classDiagrams, title: "Class diagrams", parent: TAG_ID.objectOrientedProgramming, comingSoon: true},
73+
{id: TAG_ID.creatingObjects, title: "Creating objects", parent: TAG_ID.objectOrientedProgramming, comingSoon: 'Jan 2020'},
74+
{id: TAG_ID.oopConcepts, title: "OOP concepts", parent: TAG_ID.objectOrientedProgramming, comingSoon: 'Jan 2020'},
75+
{id: TAG_ID.classDiagrams, title: "Class diagrams", parent: TAG_ID.objectOrientedProgramming, comingSoon: 'Jan 2020'},
7676
// Procedural programming topics
7777
{id: TAG_ID.programmingConcepts, title: "Programming concepts", parent: TAG_ID.proceduralProgramming},
7878
{id: TAG_ID.subroutines, title: "Subroutines", parent: TAG_ID.proceduralProgramming},
7979
{id: TAG_ID.files, title: "Files", parent: TAG_ID.proceduralProgramming},
80-
{id: TAG_ID.structureAndRobustness, title: "Structure & robustness", parent: TAG_ID.proceduralProgramming, comingSoon: true},
81-
{id: TAG_ID.dataStructuresImplementation, title: "Data structures (implementation)", parent: TAG_ID.proceduralProgramming, comingSoon: true},
82-
{id: TAG_ID.recursion, title: "Recursion", parent: TAG_ID.proceduralProgramming, comingSoon: true},
80+
{id: TAG_ID.structureAndRobustness, title: "Structure & robustness", parent: TAG_ID.proceduralProgramming, comingSoon: 'Apr 2020'},
81+
{id: TAG_ID.recursion, title: "Recursion", parent: TAG_ID.proceduralProgramming, comingSoon: 'Apr 2020'},
8382
{id: TAG_ID.stringManipulation, title: "String manipulation", parent: TAG_ID.proceduralProgramming, new: true},
84-
{id: TAG_ID.guis, title: "GUIs", parent: TAG_ID.proceduralProgramming, comingSoon: true},
85-
{id: TAG_ID.softwareEngineeringPrinciples, title: "Software engineering principles", parent: TAG_ID.proceduralProgramming, comingSoon: true},
86-
{id: TAG_ID.softwareProject, title: "Software project", parent: TAG_ID.proceduralProgramming, comingSoon: true},
83+
{id: TAG_ID.guis, title: "GUIs", parent: TAG_ID.proceduralProgramming, comingSoon: 'Jan 2020'},
84+
{id: TAG_ID.softwareEngineeringPrinciples, title: "Software engineering principles", parent: TAG_ID.proceduralProgramming, comingSoon: 'Apr 2020'},
85+
{id: TAG_ID.softwareProject, title: "Software project", parent: TAG_ID.proceduralProgramming, comingSoon: 'Sept 2019'},
8786
];
8887

8988
const getBaseTagById = (id: TAG_ID) => {

0 commit comments

Comments
 (0)