Skip to content

Commit

Permalink
chore(deps): become python 3.11, django 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
japsu committed Sep 3, 2023
1 parent b9f676f commit 76fcea4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14
FROM node:18
WORKDIR /usr/src/app
RUN git clone --depth=1 https://github.com/kcsry/infokala && \
rm -rf infokala/.git && \
Expand All @@ -7,7 +7,7 @@ RUN git clone --depth=1 https://github.com/kcsry/infokala && \
NODE_ENV=production npm run prepublish && \
rm -rf node_modules

FROM python:3.9
FROM python:3.11
COPY --from=0 /usr/src/app/infokala /usr/src/app/infokala
RUN mkdir /usr/src/app/infokala-tracon && \
groupadd -r infokala && useradd -r -g infokala infokala
Expand Down
26 changes: 13 additions & 13 deletions infokala_tracon/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.conf import settings
from django.conf.urls import include, url
from django.conf.urls import include
from django.contrib import admin
from django.views.decorators.csrf import csrf_exempt
from django.views.generic.base import RedirectView
Expand All @@ -14,36 +14,36 @@
static_app_view,
status_view,
)
from django.urls import path, re_path

urlpatterns = [
# XXX hardcoded
url(r'^$',
RedirectView.as_view(url='/events/{default_event}/messages'.format(default_event=settings.INFOKALA_DEFAULT_EVENT)),
path('', RedirectView.as_view(url='/events/{default_event}/messages'.format(default_event=settings.INFOKALA_DEFAULT_EVENT)),
name='infokala_frontpage_redirect_view',
),
url(r'^events/(?P<event_slug>[a-z0-9-]+)/messages/$', static_app_view),
url(r'^events/[a-z0-9-]+/messages$', slash_redirect_view),
url(r'^events/(?P<event_slug>[a-z0-9-]+)/messages/config.js$',
re_path(r'^events/(?P<event_slug>[a-z0-9-]+)/messages/$', static_app_view),
re_path(r'^events/[a-z0-9-]+/messages$', slash_redirect_view),
re_path(r'^events/(?P<event_slug>[a-z0-9-]+)/messages/config.js$',
csrf_exempt(ConfigView.as_view()),
name='infokala_config_view',
),
url(r'^api/v1/events/(?P<event_slug>[a-z0-9-]+)/messages/?$',
re_path(r'^api/v1/events/(?P<event_slug>[a-z0-9-]+)/messages/?$',
csrf_exempt(MessagesView.as_view()),
name='infokala_messages_view',
),
url(r'^api/v1/events/(?P<event_slug>[a-z0-9-]+)/messages/(?P<message_id>\d+)/?$',
re_path(r'^api/v1/events/(?P<event_slug>[a-z0-9-]+)/messages/(?P<message_id>\d+)/?$',
csrf_exempt(MessageView.as_view()),
name='infokala_message_view',
),
url(r'^api/v1/events/(?P<event_slug>[a-z0-9-]+)/messages/(?P<message_id>\d+)/events/?$',
re_path(r'^api/v1/events/(?P<event_slug>[a-z0-9-]+)/messages/(?P<message_id>\d+)/events/?$',
csrf_exempt(MessageEventsView.as_view()),
name='infokala_message_events_view',
),

url(r'^api/v1/status/?$', status_view, name='status_view'),
re_path(r'^api/v1/status/?$', status_view, name='status_view'),


url(r'^admin/', admin.site.urls),
url(r'^logout/?$', logout_view),
url(r'', include('kompassi_oauth2.urls')),
path('admin/', admin.site.urls),
re_path(r'^logout/?$', logout_view),
path('', include('kompassi_oauth2.urls')),
]
7 changes: 4 additions & 3 deletions kompassi_oauth2/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from django.conf.urls import include, url
from django.conf.urls import include

from .views import LoginView, CallbackView
from django.urls import re_path


urlpatterns = [
url(r'^oauth2/login/?$', LoginView.as_view(), name='oauth2_login_view'),
url(r'^oauth2/callback/?$', CallbackView.as_view(), name='oauth2_callback_view'),
re_path(r'^oauth2/login/?$', LoginView.as_view(), name='oauth2_login_view'),
re_path(r'^oauth2/callback/?$', CallbackView.as_view(), name='oauth2_callback_view'),
]

0 comments on commit 76fcea4

Please sign in to comment.