From 541f0d6e9f5cf08f3934e91d423fee5d8ce2e2e7 Mon Sep 17 00:00:00 2001 From: Samuele Musiani Date: Thu, 6 Jun 2024 17:35:41 +0200 Subject: [PATCH 01/14] new degrees config format --- src/lib/teachings.ts | 149 +++++++++++++------ src/routes/+page.svelte | 2 +- src/routes/[...dir]/[zfile=dir]/+page.svelte | 18 +-- src/routes/build/+page.svelte | 8 +- src/routes/dash/[course]/+page.svelte | 27 +++- 5 files changed, 138 insertions(+), 66 deletions(-) diff --git a/src/lib/teachings.ts b/src/lib/teachings.ts index 09419c3c..dfcab00d 100644 --- a/src/lib/teachings.ts +++ b/src/lib/teachings.ts @@ -2,73 +2,135 @@ import { getManifest } from '$lib/api'; import { filterAsync } from './filter'; export type Teaching = { - name: string; - url: string; - chat?: string; - website?: string; - professors?: string[]; - degree?: string; + name: string; + url: string; + chat?: string; + website?: string; + professors?: string[]; + degree?: string; }; -export type YearStudyDiagram = { - mandatory?: string[]; - electives?: string[]; +export type Year = { + year: number; + chat?: string; }; -export type Year = { - year: number; - chat?: string; - teachings: YearStudyDiagram; +export type DegreeTeaching = { + name: string; + year?: number; + mandatory: boolean; }; export type Degree = { - id: string; - name: string; - icon: string; - years?: Year[]; - chat?: string; + id: string; + name: string; + icon: string; + teachings?: DegreeTeaching[]; + years?: Year[]; + chat?: string; }; async function isTeachingActiveFromName(fetch: typeof window.fetch, teaching: string) { - try { - await getManifest(fetch, teaching); - return true; - } catch { - return false; - } + try { + await getManifest(fetch, teaching); + return true; + } catch { + return false; + } } export async function isTeachingActive(fetch: typeof window.fetch, teaching: Teaching) { - return isTeachingActiveFromName(fetch, teaching.url); + return isTeachingActiveFromName(fetch, teaching.url); +} + +export function yearToFlatTeachings(d: Degree, y: number): string[] { + let res: string[] = []; + + if (d.teachings) { + d.teachings.forEach((x) => { + if ((x.year && x.year == y) || (!x.year && y == 0)) + res = res.concat(x.name); + }); + } + + //if (studyDiagram.mandatory) res = res.concat(studyDiagram.mandatory); + //if (studyDiagram.electives) res = res.concat(studyDiagram.electives); + return res; } -export function yearToFlatTeachings(y: Year): string[] { - let res: string[] = []; - const studyDiagram = y.teachings; - if (studyDiagram.mandatory) res = res.concat(studyDiagram.mandatory); - if (studyDiagram.electives) res = res.concat(studyDiagram.electives); - return res; +export function allMandatoryTeachingsFromYear(d: Degree, y: number): string[] { + let res: string[] = []; + + if (d.teachings) { + d.teachings.forEach((x) => { + if ((x.year && x.year == y) || (!x.year && y == 0)) { + if (x.mandatory) { + res = res.concat(x.name); + } + } + }); + } + + return res; +} + +export function allElectivesTeachingsFromYear(d: Degree, y: number): string[] { + let res: string[] = []; + + if (d.teachings) { + d.teachings.forEach((x) => { + if ((x.year && x.year == y) || (!x.year && y == 0)) { + if (!x.mandatory) { + res = res.concat(x.name); + } + } + }); + } + + return res; +} + +export function allTeachingsMandatoryElectives(d: Degree, mandatory: boolean): string[] { + let res: string[] = []; + if (d.teachings) { + d.teachings.forEach((x) => { + if (x.mandatory == mandatory) { + res = res.concat(x.name); + } + }); + } + return res; +} + +export function allTeachingsToString(d: Degree): string[] { + let res: string[] = []; + + if (d.teachings) { + d.teachings.forEach((x) => (res = res.concat(x.name))); + } + + return res; } export async function getActiveTeachings( - fetch: typeof window.fetch, - degree: Degree + fetch: typeof window.fetch, + degree: Degree ): Promise { - const years = degree.years; - if (!years) return []; - const allTeachings = years.flatMap(yearToFlatTeachings); - const activeTeachings = await filterAsync(allTeachings, (t) => - isTeachingActiveFromName(fetch, t) - ); - - return activeTeachings; + const years = degree.years; + if (!years) return []; + const allTeachings = allTeachingsToString(degree); + const activeTeachings = await filterAsync(allTeachings, (t) => + isTeachingActiveFromName(fetch, t) + ); + + return activeTeachings; } // TEACHINGS import teachingsArray from '../config/teachings.json' assert { type: 'json' }; function teachingToIndexedTeaching(t: Teaching): [string, Teaching] { - return [t.url, t]; + return [t.url, t]; } const TEACHINGS = new Map(teachingsArray.map(teachingToIndexedTeaching)); @@ -76,4 +138,7 @@ export { TEACHINGS }; // DEGREES import DEGREES from '../config/degrees.json' assert { type: 'Degree[]' }; +import { text } from '@sveltejs/kit'; +import { expoOut } from 'svelte/easing'; +import { derived } from 'svelte/store'; export { DEGREES }; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 5f9dbe5b..4df7ee23 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -57,7 +57,7 @@
    {#each data.degrees as degree} - {#if degree.years} + {#if degree.teachings} {:else} diff --git a/src/routes/[...dir]/[zfile=dir]/+page.svelte b/src/routes/[...dir]/[zfile=dir]/+page.svelte index 9b8cc9e1..bb5716be 100644 --- a/src/routes/[...dir]/[zfile=dir]/+page.svelte +++ b/src/routes/[...dir]/[zfile=dir]/+page.svelte @@ -2,12 +2,13 @@ import { page } from '$app/stores'; import Line from '$lib/components/Line.svelte'; - import type { Degree, Year } from '$lib/teachings'; + import { allTeachingsMandatoryElectives, type Degree, type Year } from '$lib/teachings'; import { EDIT_URLS } from '$lib/const'; import { doneFiles, anyFileDone } from '$lib/todo-file'; import type { PageData } from './$types'; import FuzzySearch from './FuzzySearch.svelte'; + import { derived } from 'svelte/store'; export let data: PageData; let fuzzy: FuzzySearch; @@ -70,19 +71,12 @@ reverseMode = !reverseMode; } - // Computes either all mandatory teachings or elective teachings for a year - function getTeachings(y: Year, electives: boolean): string[] | undefined { - if (!y) return undefined; - const studyDiagram = y.teachings; - if (!studyDiagram) return undefined; - return electives ? studyDiagram.electives : studyDiagram.mandatory; - } - // Checks if a teaching is part of a certain degree function isInDegree(teachingName: string, degree: Degree, elective: boolean): boolean { - const years = degree.years; - if (!years) return false; - return !!years.find((y) => getTeachings(y, elective)?.includes(teachingName)); + const t = degree.teachings; + if (!t) return false; + + return allTeachingsMandatoryElectives(degree, !elective).includes(teachingName); } // Skims through degrees looking for a given teaching diff --git a/src/routes/build/+page.svelte b/src/routes/build/+page.svelte index 2d310784..0f3b749c 100644 --- a/src/routes/build/+page.svelte +++ b/src/routes/build/+page.svelte @@ -26,11 +26,11 @@
    {/if}

    {degree.name}

    - {#if degree.years} - {#each degree.years as year} -

    {year.year}

    + {#if degree.teachings} + {#each [1, 2, 3] as year} +

    {year}

    - {#each yearToFlatTeachings(year) as teaching} + {#each yearToFlatTeachings(degree, year) as teaching}

    {teaching}

    {#if data.activeTeachings[i].includes(teaching)} diff --git a/src/routes/dash/[course]/+page.svelte b/src/routes/dash/[course]/+page.svelte index d5a893da..b9b7f20e 100644 --- a/src/routes/dash/[course]/+page.svelte +++ b/src/routes/dash/[course]/+page.svelte @@ -2,11 +2,18 @@ import type { PageData } from './$types'; import { page } from '$app/stores'; import { onMount } from 'svelte'; - import type { Degree, Teaching } from '$lib/teachings'; + import { + yearToFlatTeachings, + allMandatoryTeachingsFromYear, + allElectivesTeachingsFromYear, + type Degree, + type Teaching + } from '$lib/teachings'; import { getLoginUrl, getWhoAmI } from '$lib/upld'; import ListTeaching from './ListTeaching.svelte'; import type { TeachingsBatch } from './ListTeaching.svelte'; import { RISORSE_BASE_URL } from '$lib/const'; + import dayjs from 'dayjs'; export let data: PageData; let activeYears: string[] = []; @@ -25,18 +32,24 @@ } function reorganizeTeachings(degree: Degree) { - if (!degree.years) return { mandatory: [], electives: [] }; + if (!degree.teachings) return { mandatory: [], electives: [] }; const mandatory: TeachingsBatch[] = []; const electives: TeachingsBatch[] = []; - for (const year of degree.years) { - const m = year.teachings.mandatory; - const e = year.teachings.electives; + for (let i = 0; i <= 3; i++) { + const m = allMandatoryTeachingsFromYear(degree, i); + const e = allElectivesTeachingsFromYear(degree, i); - if (m) mandatory.push({ year: year.year, teachings: namesToTeachings(m) }); - if (e) electives.push({ year: year.year, teachings: namesToTeachings(e) }); + if (m) mandatory.push({ year: i, teachings: namesToTeachings(m) }); + if (e) electives.push({ year: i, teachings: namesToTeachings(e) }); } + //for (const t of degree.years) { + // const m = year.teachings.mandatory; + // const e = year.teachings.electives; + // + //} + return { mandatory, electives }; } From f2cffe985c2c696e78f5c7ca7da8a8528538deea Mon Sep 17 00:00:00 2001 From: Samuele Musiani Date: Thu, 6 Jun 2024 17:39:41 +0200 Subject: [PATCH 02/14] removed comments --- src/lib/teachings.ts | 2 -- src/routes/dash/[course]/+page.svelte | 6 ------ 2 files changed, 8 deletions(-) diff --git a/src/lib/teachings.ts b/src/lib/teachings.ts index dfcab00d..2efd6f30 100644 --- a/src/lib/teachings.ts +++ b/src/lib/teachings.ts @@ -53,8 +53,6 @@ export function yearToFlatTeachings(d: Degree, y: number): string[] { }); } - //if (studyDiagram.mandatory) res = res.concat(studyDiagram.mandatory); - //if (studyDiagram.electives) res = res.concat(studyDiagram.electives); return res; } diff --git a/src/routes/dash/[course]/+page.svelte b/src/routes/dash/[course]/+page.svelte index b9b7f20e..32f0dd99 100644 --- a/src/routes/dash/[course]/+page.svelte +++ b/src/routes/dash/[course]/+page.svelte @@ -44,12 +44,6 @@ if (e) electives.push({ year: i, teachings: namesToTeachings(e) }); } - //for (const t of degree.years) { - // const m = year.teachings.mandatory; - // const e = year.teachings.electives; - // - //} - return { mandatory, electives }; } From 6907ced3e853dbf0c25542883f2ef10b0375a18e Mon Sep 17 00:00:00 2001 From: Samuele Musiani Date: Thu, 6 Jun 2024 17:40:58 +0200 Subject: [PATCH 03/14] formatting --- src/config | 2 +- src/lib/teachings.ts | 165 +++++++++++++++++++++---------------------- 2 files changed, 83 insertions(+), 84 deletions(-) diff --git a/src/config b/src/config index 4c736544..7884d1b4 160000 --- a/src/config +++ b/src/config @@ -1 +1 @@ -Subproject commit 4c736544471b1f6d855e29db61a08509b0a9b237 +Subproject commit 7884d1b4a727672cbe45b1e6828bf2cb30380a9f diff --git a/src/lib/teachings.ts b/src/lib/teachings.ts index 2efd6f30..b397997e 100644 --- a/src/lib/teachings.ts +++ b/src/lib/teachings.ts @@ -2,133 +2,132 @@ import { getManifest } from '$lib/api'; import { filterAsync } from './filter'; export type Teaching = { - name: string; - url: string; - chat?: string; - website?: string; - professors?: string[]; - degree?: string; + name: string; + url: string; + chat?: string; + website?: string; + professors?: string[]; + degree?: string; }; export type Year = { - year: number; - chat?: string; + year: number; + chat?: string; }; export type DegreeTeaching = { - name: string; - year?: number; - mandatory: boolean; + name: string; + year?: number; + mandatory: boolean; }; export type Degree = { - id: string; - name: string; - icon: string; - teachings?: DegreeTeaching[]; - years?: Year[]; - chat?: string; + id: string; + name: string; + icon: string; + teachings?: DegreeTeaching[]; + years?: Year[]; + chat?: string; }; async function isTeachingActiveFromName(fetch: typeof window.fetch, teaching: string) { - try { - await getManifest(fetch, teaching); - return true; - } catch { - return false; - } + try { + await getManifest(fetch, teaching); + return true; + } catch { + return false; + } } export async function isTeachingActive(fetch: typeof window.fetch, teaching: Teaching) { - return isTeachingActiveFromName(fetch, teaching.url); + return isTeachingActiveFromName(fetch, teaching.url); } export function yearToFlatTeachings(d: Degree, y: number): string[] { - let res: string[] = []; + let res: string[] = []; - if (d.teachings) { - d.teachings.forEach((x) => { - if ((x.year && x.year == y) || (!x.year && y == 0)) - res = res.concat(x.name); - }); - } + if (d.teachings) { + d.teachings.forEach((x) => { + if ((x.year && x.year == y) || (!x.year && y == 0)) res = res.concat(x.name); + }); + } - return res; + return res; } export function allMandatoryTeachingsFromYear(d: Degree, y: number): string[] { - let res: string[] = []; - - if (d.teachings) { - d.teachings.forEach((x) => { - if ((x.year && x.year == y) || (!x.year && y == 0)) { - if (x.mandatory) { - res = res.concat(x.name); - } - } - }); - } - - return res; + let res: string[] = []; + + if (d.teachings) { + d.teachings.forEach((x) => { + if ((x.year && x.year == y) || (!x.year && y == 0)) { + if (x.mandatory) { + res = res.concat(x.name); + } + } + }); + } + + return res; } export function allElectivesTeachingsFromYear(d: Degree, y: number): string[] { - let res: string[] = []; - - if (d.teachings) { - d.teachings.forEach((x) => { - if ((x.year && x.year == y) || (!x.year && y == 0)) { - if (!x.mandatory) { - res = res.concat(x.name); - } - } - }); - } - - return res; + let res: string[] = []; + + if (d.teachings) { + d.teachings.forEach((x) => { + if ((x.year && x.year == y) || (!x.year && y == 0)) { + if (!x.mandatory) { + res = res.concat(x.name); + } + } + }); + } + + return res; } export function allTeachingsMandatoryElectives(d: Degree, mandatory: boolean): string[] { - let res: string[] = []; - if (d.teachings) { - d.teachings.forEach((x) => { - if (x.mandatory == mandatory) { - res = res.concat(x.name); - } - }); - } - return res; + let res: string[] = []; + if (d.teachings) { + d.teachings.forEach((x) => { + if (x.mandatory == mandatory) { + res = res.concat(x.name); + } + }); + } + return res; } export function allTeachingsToString(d: Degree): string[] { - let res: string[] = []; + let res: string[] = []; - if (d.teachings) { - d.teachings.forEach((x) => (res = res.concat(x.name))); - } + if (d.teachings) { + d.teachings.forEach((x) => (res = res.concat(x.name))); + } - return res; + return res; } export async function getActiveTeachings( - fetch: typeof window.fetch, - degree: Degree + fetch: typeof window.fetch, + degree: Degree ): Promise { - const years = degree.years; - if (!years) return []; - const allTeachings = allTeachingsToString(degree); - const activeTeachings = await filterAsync(allTeachings, (t) => - isTeachingActiveFromName(fetch, t) - ); - - return activeTeachings; + const years = degree.years; + if (!years) return []; + const allTeachings = allTeachingsToString(degree); + const activeTeachings = await filterAsync(allTeachings, (t) => + isTeachingActiveFromName(fetch, t) + ); + + return activeTeachings; } // TEACHINGS import teachingsArray from '../config/teachings.json' assert { type: 'json' }; function teachingToIndexedTeaching(t: Teaching): [string, Teaching] { - return [t.url, t]; + return [t.url, t]; } const TEACHINGS = new Map(teachingsArray.map(teachingToIndexedTeaching)); From f6cb8a5024f07cdb297950146418964c3ea85255 Mon Sep 17 00:00:00 2001 From: Samuele Musiani Date: Thu, 6 Jun 2024 17:43:37 +0200 Subject: [PATCH 04/14] fix lint --- src/routes/[...dir]/[zfile=dir]/+page.svelte | 3 +-- src/routes/dash/[course]/+page.svelte | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/routes/[...dir]/[zfile=dir]/+page.svelte b/src/routes/[...dir]/[zfile=dir]/+page.svelte index bb5716be..79cd717a 100644 --- a/src/routes/[...dir]/[zfile=dir]/+page.svelte +++ b/src/routes/[...dir]/[zfile=dir]/+page.svelte @@ -2,13 +2,12 @@ import { page } from '$app/stores'; import Line from '$lib/components/Line.svelte'; - import { allTeachingsMandatoryElectives, type Degree, type Year } from '$lib/teachings'; + import { allTeachingsMandatoryElectives, type Degree } from '$lib/teachings'; import { EDIT_URLS } from '$lib/const'; import { doneFiles, anyFileDone } from '$lib/todo-file'; import type { PageData } from './$types'; import FuzzySearch from './FuzzySearch.svelte'; - import { derived } from 'svelte/store'; export let data: PageData; let fuzzy: FuzzySearch; diff --git a/src/routes/dash/[course]/+page.svelte b/src/routes/dash/[course]/+page.svelte index 32f0dd99..ffc365fb 100644 --- a/src/routes/dash/[course]/+page.svelte +++ b/src/routes/dash/[course]/+page.svelte @@ -3,7 +3,6 @@ import { page } from '$app/stores'; import { onMount } from 'svelte'; import { - yearToFlatTeachings, allMandatoryTeachingsFromYear, allElectivesTeachingsFromYear, type Degree, @@ -13,7 +12,6 @@ import ListTeaching from './ListTeaching.svelte'; import type { TeachingsBatch } from './ListTeaching.svelte'; import { RISORSE_BASE_URL } from '$lib/const'; - import dayjs from 'dayjs'; export let data: PageData; let activeYears: string[] = []; From 6165eef350811e641497808a49c3f8b31bd4b99b Mon Sep 17 00:00:00 2001 From: Samuele Musiani Date: Thu, 6 Jun 2024 17:45:06 +0200 Subject: [PATCH 05/14] removed imports --- src/lib/teachings.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lib/teachings.ts b/src/lib/teachings.ts index b397997e..6e885139 100644 --- a/src/lib/teachings.ts +++ b/src/lib/teachings.ts @@ -135,7 +135,4 @@ export { TEACHINGS }; // DEGREES import DEGREES from '../config/degrees.json' assert { type: 'Degree[]' }; -import { text } from '@sveltejs/kit'; -import { expoOut } from 'svelte/easing'; -import { derived } from 'svelte/store'; export { DEGREES }; From acbb3e3bb1c5d36ba0558f911576e910cf186535 Mon Sep 17 00:00:00 2001 From: Samuele Musiani Date: Thu, 6 Jun 2024 18:18:52 +0200 Subject: [PATCH 06/14] max years as const --- src/lib/const.ts | 19 ++++++++++--------- src/routes/dash/[course]/+page.svelte | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/lib/const.ts b/src/lib/const.ts index d978257f..1da827b7 100644 --- a/src/lib/const.ts +++ b/src/lib/const.ts @@ -1,6 +1,6 @@ const ORG = 'csunibo'; export const RISORSE_BASE_URL = - process.env.VITE_RISORSE_BASE_URL || 'https://risorse.students.cs.unibo.it'; + process.env.VITE_RISORSE_BASE_URL || 'https://risorse.students.cs.unibo.it'; export const GH_PAGES_BASE_URL = `https://${ORG}.github.io`; const GH_BASE_URL = `https://github.com/${ORG}`; const GH_DEV_BASE_URL = `https://github.dev/${ORG}`; @@ -8,12 +8,13 @@ export const STATIK_URL = (path: string) => `${GH_PAGES_BASE_URL}/${path}/statik export const ASSET_URL = (path: string) => `${GH_PAGES_BASE_URL}/${path}`; export const FUZZY_URL = (path: string) => `${GH_PAGES_BASE_URL}/${path}/fuzzy.json`; export const EDIT_URLS = (path: string) => { - const [, repo, ...rest] = path.split('/'); - const filePath = rest.join('/'); - return { - github: `${GH_BASE_URL}/${repo}/blob/main/${filePath}`, - github_repo: `${GH_BASE_URL}/${repo}`, - github_edit: `${GH_BASE_URL}/${repo}/edit/main/${filePath}`, - github_dev: `${GH_DEV_BASE_URL}/${repo}/blob/main/${filePath}` - }; + const [, repo, ...rest] = path.split('/'); + const filePath = rest.join('/'); + return { + github: `${GH_BASE_URL}/${repo}/blob/main/${filePath}`, + github_repo: `${GH_BASE_URL}/${repo}`, + github_edit: `${GH_BASE_URL}/${repo}/edit/main/${filePath}`, + github_dev: `${GH_DEV_BASE_URL}/${repo}/blob/main/${filePath}` + }; }; +export const MAX_YEARS_FOR_DEGREE = 3; diff --git a/src/routes/dash/[course]/+page.svelte b/src/routes/dash/[course]/+page.svelte index ffc365fb..80fc6b51 100644 --- a/src/routes/dash/[course]/+page.svelte +++ b/src/routes/dash/[course]/+page.svelte @@ -11,7 +11,7 @@ import { getLoginUrl, getWhoAmI } from '$lib/upld'; import ListTeaching from './ListTeaching.svelte'; import type { TeachingsBatch } from './ListTeaching.svelte'; - import { RISORSE_BASE_URL } from '$lib/const'; + import { MAX_YEARS_FOR_DEGREE, RISORSE_BASE_URL } from '$lib/const'; export let data: PageData; let activeYears: string[] = []; @@ -34,7 +34,7 @@ const mandatory: TeachingsBatch[] = []; const electives: TeachingsBatch[] = []; - for (let i = 0; i <= 3; i++) { + for (let i = 0; i <= MAX_YEARS_FOR_DEGREE; i++) { const m = allMandatoryTeachingsFromYear(degree, i); const e = allElectivesTeachingsFromYear(degree, i); From f4509aee034f30ed824a10c94574ca89dc253f8c Mon Sep 17 00:00:00 2001 From: Samuele Musiani Date: Thu, 6 Jun 2024 18:37:18 +0200 Subject: [PATCH 07/14] refactoring --- src/lib/const.ts | 18 ++--- src/lib/teachings.ts | 71 +++----------------- src/routes/[...dir]/[zfile=dir]/+page.svelte | 4 +- src/routes/build/+page.svelte | 4 +- src/routes/dash/[course]/+page.svelte | 11 +-- 5 files changed, 26 insertions(+), 82 deletions(-) diff --git a/src/lib/const.ts b/src/lib/const.ts index 1da827b7..2d2be50a 100644 --- a/src/lib/const.ts +++ b/src/lib/const.ts @@ -1,6 +1,6 @@ const ORG = 'csunibo'; export const RISORSE_BASE_URL = - process.env.VITE_RISORSE_BASE_URL || 'https://risorse.students.cs.unibo.it'; + process.env.VITE_RISORSE_BASE_URL || 'https://risorse.students.cs.unibo.it'; export const GH_PAGES_BASE_URL = `https://${ORG}.github.io`; const GH_BASE_URL = `https://github.com/${ORG}`; const GH_DEV_BASE_URL = `https://github.dev/${ORG}`; @@ -8,13 +8,13 @@ export const STATIK_URL = (path: string) => `${GH_PAGES_BASE_URL}/${path}/statik export const ASSET_URL = (path: string) => `${GH_PAGES_BASE_URL}/${path}`; export const FUZZY_URL = (path: string) => `${GH_PAGES_BASE_URL}/${path}/fuzzy.json`; export const EDIT_URLS = (path: string) => { - const [, repo, ...rest] = path.split('/'); - const filePath = rest.join('/'); - return { - github: `${GH_BASE_URL}/${repo}/blob/main/${filePath}`, - github_repo: `${GH_BASE_URL}/${repo}`, - github_edit: `${GH_BASE_URL}/${repo}/edit/main/${filePath}`, - github_dev: `${GH_DEV_BASE_URL}/${repo}/blob/main/${filePath}` - }; + const [, repo, ...rest] = path.split('/'); + const filePath = rest.join('/'); + return { + github: `${GH_BASE_URL}/${repo}/blob/main/${filePath}`, + github_repo: `${GH_BASE_URL}/${repo}`, + github_edit: `${GH_BASE_URL}/${repo}/edit/main/${filePath}`, + github_dev: `${GH_DEV_BASE_URL}/${repo}/blob/main/${filePath}` + }; }; export const MAX_YEARS_FOR_DEGREE = 3; diff --git a/src/lib/teachings.ts b/src/lib/teachings.ts index 6e885139..c746c5d8 100644 --- a/src/lib/teachings.ts +++ b/src/lib/teachings.ts @@ -43,68 +43,17 @@ export async function isTeachingActive(fetch: typeof window.fetch, teaching: Tea return isTeachingActiveFromName(fetch, teaching.url); } -export function yearToFlatTeachings(d: Degree, y: number): string[] { +export function teachingsFilter(d: Degree, year?: number, mandatory?: boolean): string[] { let res: string[] = []; - if (d.teachings) { - d.teachings.forEach((x) => { - if ((x.year && x.year == y) || (!x.year && y == 0)) res = res.concat(x.name); - }); - } - - return res; -} - -export function allMandatoryTeachingsFromYear(d: Degree, y: number): string[] { - let res: string[] = []; - - if (d.teachings) { - d.teachings.forEach((x) => { - if ((x.year && x.year == y) || (!x.year && y == 0)) { - if (x.mandatory) { - res = res.concat(x.name); - } - } - }); - } - - return res; -} - -export function allElectivesTeachingsFromYear(d: Degree, y: number): string[] { - let res: string[] = []; - - if (d.teachings) { - d.teachings.forEach((x) => { - if ((x.year && x.year == y) || (!x.year && y == 0)) { - if (!x.mandatory) { - res = res.concat(x.name); - } - } - }); - } - - return res; -} - -export function allTeachingsMandatoryElectives(d: Degree, mandatory: boolean): string[] { - let res: string[] = []; - if (d.teachings) { - d.teachings.forEach((x) => { - if (x.mandatory == mandatory) { - res = res.concat(x.name); - } - }); - } - return res; -} - -export function allTeachingsToString(d: Degree): string[] { - let res: string[] = []; - - if (d.teachings) { - d.teachings.forEach((x) => (res = res.concat(x.name))); - } + d.teachings?.forEach((x) => { + if ( + (year == undefined || (x.year && x.year == year) || (!x.year && year == 0)) && + (mandatory == undefined || x.mandatory == mandatory) + ) { + res = res.concat(x.name); + } + }); return res; } @@ -115,7 +64,7 @@ export async function getActiveTeachings( ): Promise { const years = degree.years; if (!years) return []; - const allTeachings = allTeachingsToString(degree); + const allTeachings = teachingsFilter(degree); const activeTeachings = await filterAsync(allTeachings, (t) => isTeachingActiveFromName(fetch, t) ); diff --git a/src/routes/[...dir]/[zfile=dir]/+page.svelte b/src/routes/[...dir]/[zfile=dir]/+page.svelte index 79cd717a..6f36b9dc 100644 --- a/src/routes/[...dir]/[zfile=dir]/+page.svelte +++ b/src/routes/[...dir]/[zfile=dir]/+page.svelte @@ -2,7 +2,7 @@ import { page } from '$app/stores'; import Line from '$lib/components/Line.svelte'; - import { allTeachingsMandatoryElectives, type Degree } from '$lib/teachings'; + import { teachingsFilter, type Degree } from '$lib/teachings'; import { EDIT_URLS } from '$lib/const'; import { doneFiles, anyFileDone } from '$lib/todo-file'; @@ -75,7 +75,7 @@ const t = degree.teachings; if (!t) return false; - return allTeachingsMandatoryElectives(degree, !elective).includes(teachingName); + return teachingsFilter(degree, undefined, !elective).includes(teachingName); } // Skims through degrees looking for a given teaching diff --git a/src/routes/build/+page.svelte b/src/routes/build/+page.svelte index 0f3b749c..9af4ed85 100644 --- a/src/routes/build/+page.svelte +++ b/src/routes/build/+page.svelte @@ -1,6 +1,6 @@