From df8978e2fe69bad3cb826b5f15818860075ec8e1 Mon Sep 17 00:00:00 2001
From: Felix Rindt
{% translate "Cancel" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ephios/api/templates/api/access_token_list.html b/src/ephios/api/templates/api/access_token_list.html
similarity index 100%
rename from ephios/api/templates/api/access_token_list.html
rename to src/ephios/api/templates/api/access_token_list.html
diff --git a/ephios/api/templates/api/access_token_reveal.html b/src/ephios/api/templates/api/access_token_reveal.html
similarity index 98%
rename from ephios/api/templates/api/access_token_reveal.html
rename to src/ephios/api/templates/api/access_token_reveal.html
index 17fa18e21..bad87c050 100644
--- a/ephios/api/templates/api/access_token_reveal.html
+++ b/src/ephios/api/templates/api/access_token_reveal.html
@@ -35,4 +35,4 @@
{% block javascript %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ephios/api/templates/oauth2_provider/application_confirm_delete.html b/src/ephios/api/templates/oauth2_provider/application_confirm_delete.html
similarity index 100%
rename from ephios/api/templates/oauth2_provider/application_confirm_delete.html
rename to src/ephios/api/templates/oauth2_provider/application_confirm_delete.html
diff --git a/ephios/api/templates/oauth2_provider/application_detail.html b/src/ephios/api/templates/oauth2_provider/application_detail.html
similarity index 99%
rename from ephios/api/templates/oauth2_provider/application_detail.html
rename to src/ephios/api/templates/oauth2_provider/application_detail.html
index 2b80efbc4..a6d9c798d 100644
--- a/ephios/api/templates/oauth2_provider/application_detail.html
+++ b/src/ephios/api/templates/oauth2_provider/application_detail.html
@@ -82,4 +82,4 @@
{{ application.name }}
{% block javascript %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ephios/api/templates/oauth2_provider/application_form.html b/src/ephios/api/templates/oauth2_provider/application_form.html
similarity index 100%
rename from ephios/api/templates/oauth2_provider/application_form.html
rename to src/ephios/api/templates/oauth2_provider/application_form.html
diff --git a/ephios/api/templates/oauth2_provider/application_list.html b/src/ephios/api/templates/oauth2_provider/application_list.html
similarity index 100%
rename from ephios/api/templates/oauth2_provider/application_list.html
rename to src/ephios/api/templates/oauth2_provider/application_list.html
diff --git a/ephios/api/templates/oauth2_provider/application_registration_form.html b/src/ephios/api/templates/oauth2_provider/application_registration_form.html
similarity index 100%
rename from ephios/api/templates/oauth2_provider/application_registration_form.html
rename to src/ephios/api/templates/oauth2_provider/application_registration_form.html
diff --git a/ephios/api/templates/oauth2_provider/authorize.html b/src/ephios/api/templates/oauth2_provider/authorize.html
similarity index 100%
rename from ephios/api/templates/oauth2_provider/authorize.html
rename to src/ephios/api/templates/oauth2_provider/authorize.html
diff --git a/src/ephios/api/urls.py b/src/ephios/api/urls.py
new file mode 100644
index 000000000..141abbf05
--- /dev/null
+++ b/src/ephios/api/urls.py
@@ -0,0 +1,111 @@
+from django.urls import include, path
+from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerSplitView
+from oauth2_provider import views as oauth2_views
+from rest_framework import routers
+
+from ephios.api.access.views import (
+ AccessTokenCreateView,
+ AccessTokenRevealView,
+ AccessTokenRevokeView,
+ AccessTokensListView,
+ AllUserApplicationList,
+ ApplicationDelete,
+ ApplicationDetail,
+ ApplicationUpdate,
+)
+from ephios.api.views.events import (
+ EventViewSet,
+ ParticipationViewSet,
+ ShiftViewSet,
+ UserinfoParticipationViewSet,
+)
+from ephios.api.views.users import (
+ OwnParticipationsViewSet,
+ UserByMailView,
+ UserParticipationView,
+ UserProfileMeView,
+ UserViewSet,
+)
+from ephios.extra.permissions import staff_required
+
+router = routers.DefaultRouter()
+router.register(r"events", EventViewSet)
+router.register(r"shifts", ShiftViewSet)
+router.register(r"participations", ParticipationViewSet, basename="participations")
+router.register(
+ r"participations-userinfo", UserinfoParticipationViewSet, basename="userinfo-participations"
+)
+router.register(r"users/by_email", UserByMailView, basename="user-by-email")
+router.register(r"users", UserViewSet)
+router.register(r"users/me/participations", OwnParticipationsViewSet, basename="participations-me")
+router.register(
+ r"users/(?P{% translate "Delete events" %}
href="{% url "core:event_list" %}">{% translate "Back" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ephios/core/templates/core/event_confirm_delete.html b/src/ephios/core/templates/core/event_confirm_delete.html
similarity index 100%
rename from ephios/core/templates/core/event_confirm_delete.html
rename to src/ephios/core/templates/core/event_confirm_delete.html
diff --git a/ephios/core/templates/core/event_copy.html b/src/ephios/core/templates/core/event_copy.html
similarity index 95%
rename from ephios/core/templates/core/event_copy.html
rename to src/ephios/core/templates/core/event_copy.html
index e742067aa..a6c7e81a1 100644
--- a/ephios/core/templates/core/event_copy.html
+++ b/src/ephios/core/templates/core/event_copy.html
@@ -8,7 +8,7 @@
{% endblock %}
{% block messages %}
- {% for _, errors in form.errors.items %}
+ {% for __, errors in form.errors.items %}
{% for error in errors %}
{% endfor %}
{% endfor %}
-
\ No newline at end of file
+
diff --git a/ephios/core/templates/core/fragments/event_list_list_mode.html b/src/ephios/core/templates/core/fragments/event_list_list_mode.html
similarity index 99%
rename from ephios/core/templates/core/fragments/event_list_list_mode.html
rename to src/ephios/core/templates/core/fragments/event_list_list_mode.html
index 616839182..160667740 100644
--- a/ephios/core/templates/core/fragments/event_list_list_mode.html
+++ b/src/ephios/core/templates/core/fragments/event_list_list_mode.html
@@ -138,4 +138,4 @@
{% endfor %}
{% include 'core/pagination.html' %}
-
\ No newline at end of file
+
diff --git a/ephios/core/templates/core/fragments/pending_consequences.html b/src/ephios/core/templates/core/fragments/pending_consequences.html
similarity index 100%
rename from ephios/core/templates/core/fragments/pending_consequences.html
rename to src/ephios/core/templates/core/fragments/pending_consequences.html
diff --git a/ephios/core/templates/core/fragments/plugin_form.html b/src/ephios/core/templates/core/fragments/plugin_form.html
similarity index 100%
rename from ephios/core/templates/core/fragments/plugin_form.html
rename to src/ephios/core/templates/core/fragments/plugin_form.html
diff --git a/ephios/core/templates/core/fragments/shift_box_big.html b/src/ephios/core/templates/core/fragments/shift_box_big.html
similarity index 100%
rename from ephios/core/templates/core/fragments/shift_box_big.html
rename to src/ephios/core/templates/core/fragments/shift_box_big.html
diff --git a/ephios/core/templates/core/fragments/shift_box_small.html b/src/ephios/core/templates/core/fragments/shift_box_small.html
similarity index 99%
rename from ephios/core/templates/core/fragments/shift_box_small.html
rename to src/ephios/core/templates/core/fragments/shift_box_small.html
index 3a1f0b563..c82a0303f 100644
--- a/ephios/core/templates/core/fragments/shift_box_small.html
+++ b/src/ephios/core/templates/core/fragments/shift_box_small.html
@@ -26,4 +26,4 @@
{% translate "Signup flow" %}: {{ shift.signup_flow.verbose_name }}
{% translate "We're sorry! There is a problem displaying the state of the shift." %} -
\ No newline at end of file + diff --git a/ephios/core/templates/core/fragments/signup_stats_indicator.html b/src/ephios/core/templates/core/fragments/signup_stats_indicator.html similarity index 98% rename from ephios/core/templates/core/fragments/signup_stats_indicator.html rename to src/ephios/core/templates/core/fragments/signup_stats_indicator.html index c83fd0ff5..04c286642 100644 --- a/ephios/core/templates/core/fragments/signup_stats_indicator.html +++ b/src/ephios/core/templates/core/fragments/signup_stats_indicator.html @@ -22,4 +22,4 @@ {% else %} {% translate "open" %} {% endif %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/ephios/core/templates/core/group_confirm_delete.html b/src/ephios/core/templates/core/group_confirm_delete.html similarity index 100% rename from ephios/core/templates/core/group_confirm_delete.html rename to src/ephios/core/templates/core/group_confirm_delete.html diff --git a/ephios/core/templates/core/group_form.html b/src/ephios/core/templates/core/group_form.html similarity index 100% rename from ephios/core/templates/core/group_form.html rename to src/ephios/core/templates/core/group_form.html diff --git a/ephios/core/templates/core/group_list.html b/src/ephios/core/templates/core/group_list.html similarity index 100% rename from ephios/core/templates/core/group_list.html rename to src/ephios/core/templates/core/group_list.html diff --git a/ephios/core/templates/core/home.html b/src/ephios/core/templates/core/home.html similarity index 100% rename from ephios/core/templates/core/home.html rename to src/ephios/core/templates/core/home.html diff --git a/ephios/core/templates/core/identityprovider_confirm_delete.html b/src/ephios/core/templates/core/identityprovider_confirm_delete.html similarity index 100% rename from ephios/core/templates/core/identityprovider_confirm_delete.html rename to src/ephios/core/templates/core/identityprovider_confirm_delete.html diff --git a/ephios/core/templates/core/identityprovider_discovery.html b/src/ephios/core/templates/core/identityprovider_discovery.html similarity index 100% rename from ephios/core/templates/core/identityprovider_discovery.html rename to src/ephios/core/templates/core/identityprovider_discovery.html diff --git a/ephios/core/templates/core/identityprovider_form.html b/src/ephios/core/templates/core/identityprovider_form.html similarity index 100% rename from ephios/core/templates/core/identityprovider_form.html rename to src/ephios/core/templates/core/identityprovider_form.html diff --git a/ephios/core/templates/core/identityprovider_list.html b/src/ephios/core/templates/core/identityprovider_list.html similarity index 100% rename from ephios/core/templates/core/identityprovider_list.html rename to src/ephios/core/templates/core/identityprovider_list.html diff --git a/ephios/core/templates/core/logentry_list.html b/src/ephios/core/templates/core/logentry_list.html similarity index 100% rename from ephios/core/templates/core/logentry_list.html rename to src/ephios/core/templates/core/logentry_list.html diff --git a/ephios/core/templates/core/login.html b/src/ephios/core/templates/core/login.html similarity index 100% rename from ephios/core/templates/core/login.html rename to src/ephios/core/templates/core/login.html diff --git a/ephios/core/templates/core/mails/base.html b/src/ephios/core/templates/core/mails/base.html similarity index 100% rename from ephios/core/templates/core/mails/base.html rename to src/ephios/core/templates/core/mails/base.html diff --git a/ephios/core/templates/core/mails/base.txt b/src/ephios/core/templates/core/mails/base.txt similarity index 62% rename from ephios/core/templates/core/mails/base.txt rename to src/ephios/core/templates/core/mails/base.txt index 61d27b678..93a26f3ac 100644 --- a/ephios/core/templates/core/mails/base.txt +++ b/src/ephios/core/templates/core/mails/base.txt @@ -1,2 +1,2 @@ {% block content %}{{ body|wordwrap:80 }}{% endblock %} -{% block footer %}{% endblock %} \ No newline at end of file +{% block footer %}{% endblock %} diff --git a/ephios/core/templates/core/mails/new_account_email.html b/src/ephios/core/templates/core/mails/new_account_email.html similarity index 98% rename from ephios/core/templates/core/mails/new_account_email.html rename to src/ephios/core/templates/core/mails/new_account_email.html index a4bc93f21..c64b968ab 100644 --- a/ephios/core/templates/core/mails/new_account_email.html +++ b/src/ephios/core/templates/core/mails/new_account_email.html @@ -13,4 +13,4 @@ {% translate "Your username is your email address:" %} {{ notification.user.email }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ephios/core/templates/core/mails/new_event.html b/src/ephios/core/templates/core/mails/new_event.html similarity index 100% rename from ephios/core/templates/core/mails/new_event.html rename to src/ephios/core/templates/core/mails/new_event.html diff --git a/ephios/core/templates/core/mails/notification.html b/src/ephios/core/templates/core/mails/notification.html similarity index 100% rename from ephios/core/templates/core/mails/notification.html rename to src/ephios/core/templates/core/mails/notification.html diff --git a/ephios/core/templates/core/mails/notification.txt b/src/ephios/core/templates/core/mails/notification.txt similarity index 97% rename from ephios/core/templates/core/mails/notification.txt rename to src/ephios/core/templates/core/mails/notification.txt index 16cac6209..0c1259173 100644 --- a/ephios/core/templates/core/mails/notification.txt +++ b/src/ephios/core/templates/core/mails/notification.txt @@ -16,4 +16,4 @@ You are receiving this email as a member of {{ organization_name }}. {% translate "Click here to view and change your notification settings" %}: {{ notification_settings_url }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ephios/core/templates/core/mass_notification_write.html b/src/ephios/core/templates/core/mass_notification_write.html similarity index 100% rename from ephios/core/templates/core/mass_notification_write.html rename to src/ephios/core/templates/core/mass_notification_write.html diff --git a/ephios/core/templates/core/notification_detail.html b/src/ephios/core/templates/core/notification_detail.html similarity index 100% rename from ephios/core/templates/core/notification_detail.html rename to src/ephios/core/templates/core/notification_detail.html diff --git a/ephios/core/templates/core/notification_list.html b/src/ephios/core/templates/core/notification_list.html similarity index 100% rename from ephios/core/templates/core/notification_list.html rename to src/ephios/core/templates/core/notification_list.html diff --git a/ephios/core/templates/core/pagination.html b/src/ephios/core/templates/core/pagination.html similarity index 99% rename from ephios/core/templates/core/pagination.html rename to src/ephios/core/templates/core/pagination.html index 14ac8e069..172763303 100644 --- a/ephios/core/templates/core/pagination.html +++ b/src/ephios/core/templates/core/pagination.html @@ -44,5 +44,3 @@ {% endif %} - - diff --git a/ephios/core/templates/core/serviceworker.js b/src/ephios/core/templates/core/serviceworker.js similarity index 99% rename from ephios/core/templates/core/serviceworker.js rename to src/ephios/core/templates/core/serviceworker.js index 2323322b4..1da42cf57 100644 --- a/ephios/core/templates/core/serviceworker.js +++ b/src/ephios/core/templates/core/serviceworker.js @@ -110,4 +110,4 @@ self.addEventListener("fetch", event => { } else { event.respondWith(networkThenCacheOrOffline(event)); } -}); \ No newline at end of file +}); diff --git a/ephios/core/templates/core/settings/password_change_form.html b/src/ephios/core/templates/core/settings/password_change_form.html similarity index 100% rename from ephios/core/templates/core/settings/password_change_form.html rename to src/ephios/core/templates/core/settings/password_change_form.html diff --git a/ephios/core/templates/core/settings/settings_base.html b/src/ephios/core/templates/core/settings/settings_base.html similarity index 100% rename from ephios/core/templates/core/settings/settings_base.html rename to src/ephios/core/templates/core/settings/settings_base.html diff --git a/ephios/core/templates/core/settings/settings_calendar.html b/src/ephios/core/templates/core/settings/settings_calendar.html similarity index 98% rename from ephios/core/templates/core/settings/settings_calendar.html rename to src/ephios/core/templates/core/settings/settings_calendar.html index 1cbc295e1..8eb88de14 100644 --- a/ephios/core/templates/core/settings/settings_calendar.html +++ b/src/ephios/core/templates/core/settings/settings_calendar.html @@ -34,4 +34,4 @@