Merge remote-tracking branch 'upstream/develop' into feature/shabbatime

# Conflicts:
#	app/routers/dayview.py
#	app/static/dayview.css
#	tests/test_dayview.py
#	tests/test_weekview.py

app/routers/dayview.py

@@ -6,6 +6,10 @@
 
 from app.database.models import Event, User
 from app.dependencies import get_db, templates
+from app.internal import international_days, zodiac
+from app.internal.security.dependencies import current_user
+
+# from app.internal.security.schema import CurrentUser
 from app.internal import international_days, locations, shabbat, zodiac
 from app.routers.user import get_all_user_events
 
@@ -227,6 +231,7 @@ async def dayview(
             "international_day": inter_day,
             "zodiac": zodiac_obj,
             "view": view,
+            "current_time": current_time_with_attrs,
             "user_location": location,
             "shabbat": shabbat_obj,
         },

app/static/dayview.css

@@ -178,6 +178,15 @@ body {
   height: 1.2rem;
 }
 
+#current_time_cursor {
+  border-bottom: 2.5px dotted rgba(255, 0, 0, 0.808);
+}
+
+#all-day-events {
+  background-color: var(--primary);
+  word-spacing: 0.25em;
+}
+
 .new-location {
     position: absolute;
     right: 1.2rem;

tests/test_dayview.py

@@ -155,9 +155,16 @@ def test_wrong_timeformat(session, dayview_test_client):
     assert response.status_code == 404
 
 
-def test_dayview_html(
-        event1, event2, event3, session, user, client,
-        user_location, shabbat):
+def test_dayview_html(event1, event2, event3, session, dayview_test_client):
+    dayview_test_client.post(
+        dayview_test_client.app.url_path_for("register"),
+        data=REGISTER_DETAIL,
+    )
+    dayview_test_client.post(
+        dayview_test_client.app.url_path_for("login"),
+        data=LOGIN_DATA,
+    )
+    user = session.query(User).filter_by(username="correct_user").first()
     create_dayview_event([event1, event2, event3], session=session, user=user)
     response = dayview_test_client.get("/day/2021-2-1")
     soup = BeautifulSoup(response.content, "html.parser")
@@ -181,8 +188,6 @@ def test_dayview_html_with_multiday_event(
     dayview_test_client,
     day,
     grid_position,
-    user_location,
-    shabbat,
 ):
     dayview_test_client.post(
         dayview_test_client.app.url_path_for("register"),

tests/test_weekview.py

@@ -35,20 +35,32 @@ def test_get_week_dates(weekdays, sunday):
         assert week_dates[i].strftime("%A") == weekdays[i]
 
 
-def test_weekview_day_names(
-        session, user, client, weekdays,
-        user_location, shabbat):
-    response = client.get("/week/2021-1-3")
+def test_weekview_day_names(session, user, weekview_test_client, weekdays):
+    weekview_test_client.post(
+        weekview_test_client.app.url_path_for("register"),
+        data=REGISTER_DETAIL,
+    )
+    weekview_test_client.post(
+        weekview_test_client.app.url_path_for("login"),
+        data=LOGIN_DATA,
+    )
+    response = weekview_test_client.get("/week/2021-1-3")
     soup = BeautifulSoup(response.content, "html.parser")
     day_divs = soup.find_all("div", {"class": "day-name"})
     for i in range(6):
         assert weekdays[i][:3].upper() in str(day_divs[i])
 
 
-def test_weekview_day_dates(
-        session, user, client, sunday,
-        user_location, shabbat):
-    response = client.get("/week/2021-1-3")
+def test_weekview_day_dates(session, weekview_test_client, sunday):
+    weekview_test_client.post(
+        weekview_test_client.app.url_path_for("register"),
+        data=REGISTER_DETAIL,
+    )
+    weekview_test_client.post(
+        weekview_test_client.app.url_path_for("login"),
+        data=LOGIN_DATA,
+    )
+    response = weekview_test_client.get("/week/2021-1-3")
     soup = BeautifulSoup(response.content, "html.parser")
     day_divs = soup.find_all("span", {"class": "date-nums"})
     week_dates = list(get_week_dates(sunday))
@@ -69,8 +81,6 @@ def test_weekview_html_events(
     weekview_test_client,
     date,
     event,
-    user_location,
-    shabbat
 ):
     weekview_test_client.post(
         weekview_test_client.app.url_path_for("register"),