Merge pull request #5 from UWCS/publicity

Publicity

Author: Mole1424

USER.md

@@ -70,11 +70,11 @@ An event can be edited by going to its permalink and clicking the edit button in
 
 Follow the steps to edit an event, but once in the edit form scroll to the bottom and click the delete button. Confirm your chouse and the event will be deleted. THIS CANNOT BE UNDONE.
 
-## iCal
+## [iCal](https://events.uwcs.co.uk/uwcs.ics)
 
 An ical feed for all events is available at `/uwcs.ics`. This can be added to any calendar application that supports ical feeds, such as Google Calendar or Outlook. Note that the feed is read-only, and any changes made to events on the site will be reflected in the feed.
 
-## Publicity
+## [Publicity](https://events.uwcs.co.uk/exec/publicity/)
 
 An exec-only endpoint for creating single week calendars is available at `/exec/publicity/`.
 
@@ -86,4 +86,4 @@ If the generated SVG looks good, it can be downloaded direct to PNG via the `Sav
 
 ### Multi week calendar
 
-soonTM
+Same as single week calendar, but select a different `End Week`. Note if more than 4 events are in a single day, only the first 4 will be shown.

auth/api.py

@@ -2,16 +2,7 @@
 from functools import wraps
 from typing import Callable
 
-from flask import (
-    Blueprint,
-    abort,
-    flash,
-    jsonify,
-    redirect,
-    render_template,
-    request,
-    url_for,
-)
+from flask import Blueprint, abort, flash, jsonify, redirect, render_template, request, url_for
 from werkzeug.security import check_password_hash, generate_password_hash
 from werkzeug.wrappers import Response
 

config.py

@@ -39,8 +39,7 @@
 phosphor_icons = sorted(
     set(
         re.findall(
-            r"\.ph-bold\.ph-([a-z0-9-]+):before",
-            Path("static/icons/phosphor-bold.css").read_text(),
+            r"\.ph-bold\.ph-([a-z0-9-]+):before", Path("static/icons/phosphor-bold.css").read_text()
         )
     )
 )
@@ -51,11 +50,7 @@
 phosphor_icon_paths = json.loads(Path("icons.json").read_text())
 
 custom_icon_paths = {
-    icon: re.search(
-        r"<path d=\"([^\"]+)\"", Path(f"static/icons/{icon}.svg").read_text()
-    ).group(  # type: ignore
-        1
-    )
+    icon: re.search(r"<path d=\"([^\"]+)\"", Path(f"static/icons/{icon}.svg").read_text()).group(1)  # type: ignore
     for icon in custom_icons
 }
 

events/api.py

@@ -319,13 +319,7 @@ def create_event_api() -> tuple[Response, int]:  # noqa: PLR0911
     if not data:
         return jsonify({"error": "No data provided"}), 400
 
-    required_fields = [
-        "name",
-        "description",
-        "location",
-        "start_time",
-        "end_time",
-    ]
+    required_fields = ["name", "description", "location", "start_time", "end_time"]
 
     for field in required_fields:
         if field not in data:
@@ -444,13 +438,7 @@ def create_repeat_event_api() -> tuple[Response, int]:  # noqa: PLR0911
     if not data:
         return jsonify({"error": "No data provided"}), 400
 
-    required_fields = [
-        "name",
-        "description",
-        "location",
-        "start_times",
-        "end_times",
-    ]
+    required_fields = ["name", "description", "location", "start_times", "end_times"]
 
     for field in required_fields:
         if field not in data:

events/ui.py

@@ -44,9 +44,7 @@ def get_event_from_form(form_data: ImmutableMultiDict) -> dict:
         "text_colour": (form_data["text_colour"] if form_data["text_colour"] != "" else None),
         "color_colour": (form_data["color_colour"] if form_data["color_colour"] != "" else None),
         "times": zip(
-            form_data.getlist("start_time[]"),
-            form_data.getlist("end_time[]"),
-            strict=True,
+            form_data.getlist("start_time[]"), form_data.getlist("end_time[]"), strict=True
         ),
         "duration": (form_data["duration"] if form_data["duration"] != "" else None),
         "tags": [tag for tag in form_data.getlist("tags[]") if tag],
@@ -271,10 +269,7 @@ def view(year: int, term: int, week: int, slug: str) -> str:
 
     event = prepare_event(event)
 
-    return render_template(
-        "events/event.html",
-        event=event,
-    )
+    return render_template("events/event.html", event=event)
 
 
 @events_ui_bp.route("/<int:year>/")
@@ -345,8 +340,7 @@ def get_calendar(events: list[Event]) -> Calendar:
         ical_event.add("uid", f"{event.id}@uwcs-fulcrum")
         ical_event.add("dtstart", event.start_time)
         ical_event.add(
-            "dtend",
-            event.end_time if event.end_time else event.start_time + timedelta(hours=1),
+            "dtend", event.end_time if event.end_time else event.start_time + timedelta(hours=1)
         )
         ical_event.add("dtstamp", datetime.now(timezone("Europe/London")))
         ical_event.add(

events/utils.py

@@ -107,8 +107,8 @@ def create_event(  # noqa: PLR0913
     if get_event_by_slug(week.academic_year, week.term, week.week, event.slug):
         db.session.rollback()
         return (
-            f"An event with the name '{event.slug}' already exists in "
-            f"{week.academic_year} t{week.term} w{week.week}"
+            f"An event with the name '{event.slug}' already "
+            f"exists in {week.academic_year} t{week.term} w{week.week}"
         )
 
     # add the event to db to allow tags
@@ -401,10 +401,7 @@ def group_events(events: list[Event]) -> list[dict]:
                 start_date = next(iter(days.values()))[0].week.start_date
                 for day, day_events in days.items():
                     day_list.append(
-                        {
-                            "day": day,
-                            "events": [prepare_event(event) for event in day_events],
-                        }
+                        {"day": day, "events": [prepare_event(event) for event in day_events]}
                     )
                 week_list.append({"week": week, "days": day_list, "start_date": start_date})
             term_list.append({"term": term, "weeks": week_list})