Skip to content

Commit

Permalink
use cfl package
Browse files Browse the repository at this point in the history
  • Loading branch information
SKairinos committed Sep 14, 2023
1 parent b46d789 commit 22de360
Show file tree
Hide file tree
Showing 11 changed files with 203 additions and 44 deletions.
2 changes: 1 addition & 1 deletion backend/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ verify_ssl = true
name = "pypi"

[packages]
# codeforlife = {ref = "v0.1.12", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
codeforlife = {ref = "v0.6.6", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
django = "==3.2.20"
djangorestframework = "==3.13.1"
# https://pypi.org/user/codeforlife/
Expand Down
168 changes: 157 additions & 11 deletions backend/Pipfile.lock

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

Empty file.
Empty file.
2 changes: 0 additions & 2 deletions backend/api/urls/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
from django.urls import include, path, re_path
from rest_framework import status

from .cron import urlpatterns as cron_urlpatterns
from .csrf import urlpatterns as csrf_urlpatterns
from .session import urlpatterns as session_urlpatterns

urlpatterns = [
path("cron/", include(cron_urlpatterns)),
path("csrf/", include(csrf_urlpatterns)),
path("session/", include(session_urlpatterns)),
re_path(
Expand Down
7 changes: 0 additions & 7 deletions backend/api/urls/cron/__init__.py

This file was deleted.

5 changes: 0 additions & 5 deletions backend/api/urls/cron/session.py

This file was deleted.

15 changes: 12 additions & 3 deletions backend/api/urls/session.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
from django.contrib.auth.views import LogoutView
from django.urls import path, re_path

from ..views.session import LoginView
from ..views.session import ClearExpiredView, LoginView

urlpatterns = [
re_path(
r"^(?P<user_type>teacher|dependent_student|independent_student)/login/$",
r"^(?P<user_type>teacher|dependent-student|independent-student)/login/$",
LoginView.as_view(),
name="login",
),
path("logout/", LogoutView.as_view(), name="logout"),
path(
"logout/",
LogoutView.as_view(),
name="logout",
),
path(
"clear-expired/",
ClearExpiredView.as_view(),
name="clear-expired-sessions",
),
]
Empty file removed backend/api/views/cron/__init__.py
Empty file.
Empty file removed backend/api/views/cron/session.py
Empty file.
Loading

0 comments on commit 22de360

Please sign in to comment.