Merge pull request #6 from marcusfrdk/development

Some changes and fixes
marcusfrdk · Sep 1, 2024 · eee754a · eee754a
2 parents b9aafbe + 596104f
commit eee754a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/app/components/Menu.tsx b/app/components/Menu.tsx
@@ -32,9 +32,9 @@ export default function Menu({isOpen, setIsOpen}: Props){
         <>
             <Container className={isOpen ? "open" : ""}>
                 <CloseContainer>
-                    <div>
+                    <div className="ellipsis">
                         <p className="ellipsis">{selectedProgram?.name}</p>
-                        <p>{(selectedProgram?.code || "") + selectedProgram?.semester}</p>
+                        <p className="ellipsis">{(selectedProgram?.code || "") + selectedProgram?.semester}</p>
                     </div>
                     <div onClick={() => setIsOpen(false)}>
                         <MenuIconClose size="75%" fill="var(--muted)" />

diff --git a/app/components/MenuChange.tsx b/app/components/MenuChange.tsx
@@ -12,11 +12,11 @@ export default function MenuChange(){
             <h2>Ändra Program</h2>
 
             <Select>
-                <p>{selectedProgram !== null ? selectedProgram.code + selectedProgram.semester : "Select program"}</p>
+                <p>{selectedProgram !== null ? selectedProgram.code + selectedProgram.semester : "Välj program"}</p>
                 <div>
                     <ChevronDown fill="var(--weak)" />
                 </div>
-                <select onChange={(e) => updateSelectedProgram(e.target.value)}>
+                <select defaultValue={selectedProgram ? selectedProgram?.code + selectedProgram?.semester : ""} onChange={(e) => updateSelectedProgram(e.target.value)}>
                     {Object.entries(programs).sort().map(([code, semesters]) => {
                         return (
                             <optgroup key={code} label={code}>

diff --git a/app/components/MenuCompare.tsx b/app/components/MenuCompare.tsx
@@ -43,8 +43,7 @@ export default function MenuCompare(){
                 <div>
                     <AddIcon size="1.25rem" fill="var(--muted)" />
                 </div>
-                <select defaultValue="default" onChange={(e) => addComparison(e.target.value)}>
-                    <option disabled value="default">Select from {Object.keys(programs).length} programs</option>
+                <select defaultChecked defaultValue={selectedProgram ? selectedProgram?.code + selectedProgram?.semester : ""} onChange={(e) => addComparison(e.target.value)}>
                     {Object.entries(programs).sort().map(([code, semesters]) => {
                         return (
                             <optgroup key={code} label={code}>

diff --git a/app/components/Schedule.tsx b/app/components/Schedule.tsx
@@ -196,7 +196,9 @@ export default function Schedule(){
                                                                         code = "code";
                                                                     }
 
-                                                                    const hasPrerequisites = course.prerequisites && (course.prerequisites.includes("avklar") || course.prerequisites.includes("genom"));
+                                                                    const prerequisites = course ? course.prerequisites.toLowerCase() : "";
+                                                                    const keywords = ["avkl"];
+                                                                    const hasPrerequisites = prerequisites && keywords.some(keyword => prerequisites.includes(keyword));
 
                                                                     return (
                                                                         <li 

diff --git a/app/components/SelectInitialProgram.tsx b/app/components/SelectInitialProgram.tsx
@@ -35,7 +35,7 @@ export default function SelectInitialProgram(){
             </div>
             <Select>
                 <p>Välj ditt program</p>
-                <select defaultValue="default" onChange={handleSelection}>
+                <select defaultChecked defaultValue="default" onChange={handleSelection}>
                     <option disabled value="default">Välj bland {Object.keys(programs).length} program</option>
                     {Object.entries(programs).sort().map(([code, semesters]) => {
                         return (