Skip to content

Commit

Permalink
Merge pull request #152 from BetterLectio/dev
Browse files Browse the repository at this point in the history
Skema + bug fixes
  • Loading branch information
victorDigital committed May 4, 2023
2 parents 9b2e247 + b47834f commit b2e0ea4
Show file tree
Hide file tree
Showing 12 changed files with 620 additions and 85 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "BetterLectio",
"version": "0.9.31",
"version": "0.9.32",
"private": true,
"description": "Better Lectio er en forbedring af Lectio, et dansk lektionssystem. Vi har gjort det nemmere at finde informationer og få overblik over skolegangen. Vi har også lavet en ny, brugervenlig og moderne brugerflade. Better Lectio er open source, så alle kan se koden og bidrage. Projektet er stadig under udvikling, så hvis du har forslag eller finder fejl, er du velkommen til at åbne en issue på GitHub.",
"main": "src/electron.cjs",
Expand Down
67 changes: 34 additions & 33 deletions src/components/ErrorMsg.svelte
Original file line number Diff line number Diff line change
@@ -1,45 +1,46 @@
<!--
<script>
console.log("error check active");
let error;
let details;
addEventListener("error", (event) => {
console.log("unhandledrejection");
console.log(event);
error = event.reason;
details = JSON.stringify(event);
document.getElementById("error-modal").checked = true;
});
addEventListener("unhandledrejection", (event) => {
console.log("unhandledrejection");
console.log(event);
error = event.reason;
details = JSON.stringify(event);
document.getElementById("error-modal").checked = true;
});
function reloadPage() {
location.reload();
}
</script>

<input type="checkbox" id="error-modal" class="modal-toggle" />
<div class="modal modal-bottom sm:modal-middle">
<div class="modal-box">
<h3 class="text-2xl font-bold">Der er sket en fejl</h3>
<p class="pt-4">
Der er sket en fejl, som vi ikke forventede. Prøv at genindlæse siden. Hvis fejlen fortsætter, så kontakt os venligst.
eller opret en fejlrapport på Discord eller GitHub.
</p>
<div class="divider" />
<div class="mockup-code">
<pre class="text-warning"><code>{error}</code></pre>
<pre class="text-error"><code>{details}</code></pre>
</div>
<div class="modal-action">
<!-- reload -->
<a href="/forside" data-sveltekit-reload class="btn-success btn-sm btn">Genindlæs</a>
});
addEventListener("unhandledrejection", (event) => {
console.log("unhandledrejection");
console.log(event);
error = event.reason;
details = JSON.stringify(event);
document.getElementById("error-modal").checked = true;
});
function reloadPage() {
location.reload();
}
</script>
<input type="checkbox" id="error-modal" class="modal-toggle" />
<div class="modal modal-bottom sm:modal-middle">
<div class="modal-box">
<h3 class="text-2xl font-bold">Der er sket en fejl</h3>
<p class="pt-4">
Der er sket en fejl, som vi ikke forventede. Prøv at genindlæse siden. Hvis fejlen fortsætter, så kontakt os venligst.
eller opret en fejlrapport på Discord eller GitHub.
</p>
<div class="divider" />
<div class="mockup-code">
<pre class="text-warning"><code>{error}</code></pre>
<pre class="text-error"><code>{details}</code></pre>
</div>
<div class="modal-action">
<a href="/forside" data-sveltekit-reload class="btn-success btn-sm btn">Genindlæs</a>
</div>
</div>
</div>
</div>
-->
2 changes: 1 addition & 1 deletion src/components/SideBar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
</svg></button
>
<ul
class="dropdown-content menu rounded-box z-50 mt-3 flex w-52 bg-base-100 p-2 shadow"
class="dropdown-content menu rounded-box z-50 mt-3 flex h-96 w-52 flex-nowrap overflow-x-hidden overflow-y-scroll bg-base-100 p-2 shadow"
id="theme-select"
tabindex="0"
>
Expand Down
Loading

0 comments on commit b2e0ea4

Please sign in to comment.