Skip to content

Commit

Permalink
Merge pull request #292 from vplan-fr/main
Browse files Browse the repository at this point in the history
Changes from main
  • Loading branch information
OfficialFreak authored Mar 19, 2024
2 parents ff40bb2 + 30923ae commit ec6be59
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion client/src/components/LandingPage.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
</div>
<div class="presentation reverse">
<h2 class="responsive-heading" style="color: rgb(150, 150, 150)">Freie Räume</h2>
<div style="box-shadow: 5px 5px 15px rgb(10, 10, 10); border-radius: 1rem;">
<div style="box-shadow: 5px 5px 15px rgb(10, 10, 10); border-radius: 1rem; height: 80vh;">
<img src="/public/base_static/images/landing_page/vplanfr_room_overview.png" alt="Raum-Übersicht in Better VPlan">
</div>
</div>
Expand Down
6 changes: 5 additions & 1 deletion endpoints/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ def plan(school_num: str) -> Response:
default_plan_data = json.loads(cache.get_meta_file("default_plan.json"))

newest_date = cache.get_days()[0]
newest_date_week = json.loads(cache.get_plan_file(newest_date, ".newest", "_default_plan.json"))["week"]
try:
newest_date_week = json.loads(cache.get_plan_file(newest_date, ".newest", "_default_plan.json"))["week"]
except FileNotFoundError:
# TODO temporary fix oops, use newest _default_plan.json instead
return send_error("No default plan available for this date.")

week = vplan_utils.get_future_week(
holidays=holidays,
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ Werkzeug~=2.3.6
discord-webhook~=1.3.0
brotlicffi~=1.1.0.0
pywebpush~=1.14.0
py-vapid~=1.9.0
py-vapid~=1.9.0
aiohttp~=3.9.3

0 comments on commit ec6be59

Please sign in to comment.