Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #51

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Dev #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
edc0aa8
Change calendar to 1 week
Baraban511 Oct 7, 2024
8b573f1
Bump @iconify-json/fluent from 1.1.63 to 1.2.7
dependabot[bot] Nov 11, 2024
b040808
Bump vite from 5.4.8 to 5.4.11
dependabot[bot] Nov 11, 2024
1e2cd3e
Merge pull request #29 from Baraban511/dependabot/npm_and_yarn/dev/ic…
Baraban511 Nov 12, 2024
2a04126
Merge pull request #30 from Baraban511/dependabot/npm_and_yarn/dev/vi…
Baraban511 Nov 13, 2024
6a0418d
Bump unplugin-icons from 0.19.2 to 0.20.1
dependabot[bot] Nov 13, 2024
f6eae36
Merge pull request #26 from Baraban511/dependabot/npm_and_yarn/dev/un…
Baraban511 Nov 13, 2024
c036cd3
Minor changes
Baraban511 Nov 16, 2024
537394c
Bump cssnano from 7.0.5 to 7.0.6
dependabot[bot] Nov 18, 2024
36fdc37
Bump wrangler from 3.72.2 to 3.93.0
dependabot[bot] Dec 9, 2024
a0952b7
Bump tailwindcss from 3.4.10 to 3.4.16
dependabot[bot] Dec 9, 2024
425e9aa
Merge pull request #46 from Baraban511/dependabot/npm_and_yarn/dev/ta…
Baraban511 Dec 13, 2024
6a0b340
Merge pull request #45 from Baraban511/dependabot/npm_and_yarn/dev/wr…
Baraban511 Dec 13, 2024
59830db
Merge pull request #32 from Baraban511/dependabot/npm_and_yarn/dev/cs…
Baraban511 Dec 13, 2024
fb2619c
Bump @iconify-json/tabler from 1.1.120 to 1.2.11
dependabot[bot] Dec 13, 2024
b2fa06d
Bump svelte-check from 3.8.6 to 4.1.1
dependabot[bot] Dec 13, 2024
312474f
Merge pull request #44 from Baraban511/dependabot/npm_and_yarn/dev/sv…
Baraban511 Dec 13, 2024
296025d
Merge pull request #47 from Baraban511/dependabot/npm_and_yarn/dev/ic…
Baraban511 Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ vite.config.ts.timestamp-*

#other
jsconfig.json
bun.lockb
988 changes: 308 additions & 680 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
"@sveltejs/adapter-cloudflare": "^4.6.1",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"vite": "^5.4.8",
"vite": "^5.4.11",
"@tailwindcss/forms": "^0.5.7",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.39",
"svelte": "^4.2.7",
"svelte-check": "^3.6.0",
"tailwindcss": "^3.4.6",
"svelte-check": "^4.1.1",
"tailwindcss": "^3.4.16",
"typescript": "^5.0.0",
"unplugin-icons": "^0.19.0",
"@iconify-json/fluent": "^1.1.59",
"@iconify-json/tabler": "^1.1.118",
"wrangler": "^3.67.1"
"unplugin-icons": "^0.20.1",
"@iconify-json/fluent": "^1.2.7",
"@iconify-json/tabler": "^1.2.11",
"wrangler": "^3.93.0"
},
"type": "module",
"dependencies": {
"cheerio": "^1.0.0-rc.12",
"cssnano": "^7.0.2",
"cssnano": "^7.0.6",
"ics": "^3.7.2",
"luxon": "^3.4.4",
"resend": "^3.4.0"
Expand Down
2 changes: 1 addition & 1 deletion src/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
%sveltekit.head%
</head>

<body data-sveltekit-preload-data="hover" class="dark:bg-gray-950 dark:text-white">
<body data-sveltekit-preload-data="hover" class="bg-white dark:bg-gray-950 dark:text-white">
<div style="display: contents">
%sveltekit.body%
</div>
Expand Down
15 changes: 0 additions & 15 deletions src/lib/components/FAQ.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,6 @@
il vous suffit de supprimer le calendrier généré.
</p>
</div>
<div class="p-2 flex-1">
<div class="flex items-center py-2">
<TablerHelpCircleFilled class="flex-shrink-0 text-xl" />
<p class="text-lg font-bold ml-2">
Je reçois des demandes de connexions des États-Unis, est-ce
vous ?
</p>
</div>
<p class="text-gray-500 dark:text-gray-400">
Nos serveurs étant hébergé par Cloudflare, EcoleDirecte les
localise aux États-Unis et les considère donc comme suspect.
Vous devez autoriser la connexion pour que nous puissions
récupérer votre emploi du temps
</p>
</div>
<div class="p-2 flex-1">
<div class="flex items-center py-2">
<TablerHelpCircleFilled class="flex-shrink-0 text-xl" />
Expand Down
6 changes: 3 additions & 3 deletions src/lib/components/Progress.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
easing: quartInOut,
}}
>
Départ
Connexion
</div>
{/if}
</div>
Expand All @@ -58,12 +58,12 @@
easing: quartInOut,
}}
>
Etape
QCM
</div>
{/if}
</div>
<div class="text-right w-1/3">
<div class="py-1">Arrivé</div>
<div class="py-1">Calendrier</div>
</div>
</div>

Expand Down
19 changes: 10 additions & 9 deletions src/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@
{ component: HowItWorks },
{ component: Functionalities },
{ component: Faq },
{ component: Contact },
];
$: if (data?.status === "offline") {
Components = [
{ component: Header },
{ component: HowItWorks },
{ component: Functionalities },
{ component: Faq },
];
{ component: Header },
{ component: HowItWorks },
{ component: Functionalities },
{ component: Faq },
];
}
$: if (data?.step === "QCM") {
Components = [{ component: ConnexionBox, props: { data } }];
Expand Down Expand Up @@ -65,10 +66,10 @@
class="dark:bg-gray-900 min-w-screen min-h-screen text-center dark:text-white"
>
<Progress step={data.step} />
{#each Components as { component: Component, props = { } }, key (Component) }
<div animate:flip>
<svelte:component this={Component} {...props}/>
</div>
{#each Components as { component: Component, props = { } }, key (Component)}
<div animate:flip>
<svelte:component this={Component} {...props} />
</div>
{/each}
</div>
<!--Error pop-up-->
Expand Down
2 changes: 1 addition & 1 deletion src/routes/api/+server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async function getIdToken(body) {
async function getTimetable(IdToken) {
try {
let now = DateTime.now().setZone("Europe/Paris");
let body = "data=" + JSON.stringify({ "dateDebut": now.toISODate(), "dateFin": now.plus({ days: 10 }).toISODate() });
let body = "data=" + JSON.stringify({ "dateDebut": now.toISODate(), "dateFin": now.plus({ weeks:1 }).toISODate() });
let timetable = await fetch('https://api.ecoledirecte.com/v3/E/' + IdToken.id + '/emploidutemps.awp?verbe=get', {
method: 'POST',
headers: {
Expand Down
Loading