From 541f6efb9a959f59647bbd68237eb7e906077ce5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Sat, 30 Jan 2016 19:19:54 +0100 Subject: [PATCH] Moved users views to mygpo.users --- mygpo/{web => users}/urls.py | 55 +++--- mygpo/{web => users}/views/device.py | 0 mygpo/{web => users}/views/settings.py | 0 mygpo/{web/views/users.py => users/views/user.py} | 0 mygpo/web/templatetags/devices.py | 2 +- mygpo/web/urls.py | 209 +++++----------------- 6 files changed, 63 insertions(+), 203 deletions(-) copy mygpo/{web => users}/urls.py (75%) rename mygpo/{web => users}/views/device.py (100%) rename mygpo/{web => users}/views/settings.py (100%) rename mygpo/{web/views/users.py => users/views/user.py} (100%) rewrite mygpo/web/urls.py (78%) diff --git a/mygpo/web/urls.py b/mygpo/users/urls.py similarity index 75% copy from mygpo/web/urls.py copy to mygpo/users/urls.py index c3a89f1f..e75633ae 100644 --- a/mygpo/web/urls.py +++ b/mygpo/users/urls.py @@ -1,44 +1,31 @@ from django.conf.urls import url from django.contrib.auth.views import logout -from django.views.generic.base import TemplateView, RedirectView +from django.views.generic.base import TemplateView -from mygpo.web.logo import CoverArt - -from . import views -from .views import settings, device, users +from .views import registration, settings, device, user urlpatterns = [ - url(r'^$', - views.home, - name='home'), - - url(r'^logo/(?P\d+)/(?P.{3})/(?P[^/]*)$', - CoverArt.as_view(), - name='logo'), - - url(r'^tags/', - views.mytags, - name='tags'), + url(r'^register/$', + registration.RegistrationView.as_view(), + name='register'), - url(r'^online-help', - RedirectView.as_view( - url='http://gpoddernet.readthedocs.org/en/latest/user/index.html', - permanent=False, - ), - name='help'), + url(r'^registration_complete/$', + registration.TemplateView.as_view( + template_name='registration/registration_complete.html'), + name='registration-complete'), - url(r'^developer/', - TemplateView.as_view(template_name='developer.html')), + url(r'^activate/(?P\w+)$', + registration.ActivationView.as_view()), - url(r'^contribute/', - TemplateView.as_view(template_name='contribute.html'), - name='contribute'), + url(r'^registration/resend$', + registration.ResendActivationView.as_view(), + name='resend-activation'), - url(r'^privacy/', - TemplateView.as_view(template_name='privacy_policy.html'), - name='privacy-policy'), + url(r'^registration/resent$', + registration.ResentActivationView.as_view(), + name='resent-activation'), url(r'^account/$', settings.account, @@ -145,19 +132,19 @@ urlpatterns = [ name='device-upload-opml'), url(r'^register/restore_password$', - users.restore_password, + user.restore_password, name='restore-password'), url(r'^login/$', - users.LoginView.as_view(), + user.LoginView.as_view(), name='login'), url(r'^login/google$', - users.GoogleLogin.as_view(), + user.GoogleLogin.as_view(), name='login-google'), url(r'^login/oauth2callback$', - users.GoogleLoginCallback.as_view(), + user.GoogleLoginCallback.as_view(), name='login-google-callback'), url(r'^logout/$', diff --git a/mygpo/web/views/device.py b/mygpo/users/views/device.py similarity index 100% rename from mygpo/web/views/device.py rename to mygpo/users/views/device.py diff --git a/mygpo/web/views/settings.py b/mygpo/users/views/settings.py similarity index 100% rename from mygpo/web/views/settings.py rename to mygpo/users/views/settings.py diff --git a/mygpo/web/views/users.py b/mygpo/users/views/user.py similarity index 100% rename from mygpo/web/views/users.py rename to mygpo/users/views/user.py diff --git a/mygpo/web/templatetags/devices.py b/mygpo/web/templatetags/devices.py index 88f8606f..29f4ce94 100644 --- a/mygpo/web/templatetags/devices.py +++ b/mygpo/web/templatetags/devices.py @@ -8,7 +8,7 @@ from django.utils.html import strip_tags from django.contrib.staticfiles.storage import staticfiles_storage from mygpo.users.models import Client, SyncGroup -from mygpo.web.views.device import show +from mygpo.users.views.device import show _ = ugettext diff --git a/mygpo/web/urls.py b/mygpo/web/urls.py dissimilarity index 78% index c3a89f1f..91ceca6a 100644 --- a/mygpo/web/urls.py +++ b/mygpo/web/urls.py @@ -1,168 +1,41 @@ -from django.conf.urls import url -from django.contrib.auth.views import logout -from django.views.generic.base import TemplateView, RedirectView - -from mygpo.web.logo import CoverArt - -from . import views -from .views import settings, device, users - - -urlpatterns = [ - - url(r'^$', - views.home, - name='home'), - - url(r'^logo/(?P\d+)/(?P.{3})/(?P[^/]*)$', - CoverArt.as_view(), - name='logo'), - - url(r'^tags/', - views.mytags, - name='tags'), - - url(r'^online-help', - RedirectView.as_view( - url='http://gpoddernet.readthedocs.org/en/latest/user/index.html', - permanent=False, - ), - name='help'), - - url(r'^developer/', - TemplateView.as_view(template_name='developer.html')), - - url(r'^contribute/', - TemplateView.as_view(template_name='contribute.html'), - name='contribute'), - - url(r'^privacy/', - TemplateView.as_view(template_name='privacy_policy.html'), - name='privacy-policy'), - - url(r'^account/$', - settings.account, - name='account'), - - url(r'^account/privacy$', - settings.privacy, - name='privacy'), - - url(r'^account/profile$', - settings.ProfileView.as_view(), - name='profile'), - - url(r'^account/google/remove$', - settings.AccountRemoveGoogle.as_view(), - name='account-google-remove'), - - url(r'^account/flattr$', - settings.FlattrSettingsView.as_view(), - name='flattr-settings'), - - url(r'^account/flattr/token$', - settings.FlattrTokenView.as_view(), - name='flattr-token'), - - url(r'^account/flattr/logout$', - settings.FlattrLogout.as_view(), - name='flattr-logout'), - - url(r'^account/privacy/default-public$', - settings.DefaultPrivacySettings.as_view(public=True), - name='privacy_default_public'), - - url(r'^account/privacy/default-private$', - settings.DefaultPrivacySettings.as_view(public=False), - name='privacy_default_private'), - - url(r'^account/privacy/(?P[\w]+)/public$', - settings.PodcastPrivacySettings.as_view(public=True), - name='privacy_podcast_public'), - - url(r'^account/privacy/(?P[\w]+)/private$', - settings.PodcastPrivacySettings.as_view(public=False), - name='privacy_podcast_private'), - - url(r'^account/delete$', - settings.delete_account, - name='delete-account'), - - url(r'^devices/$', - device.overview, - name='devices'), - - url(r'^devices/create-device$', - device.create, - name='device-create'), - - url(r'^device/(?P[\w.-]+)\.opml$', - device.opml, - name='device-opml'), - - url(r'^device/(?P[\w.-]+)$', - device.show, - name='device'), - - url(r'^device/(?P[\w.-]+)/symbian.opml$', - device.symbian_opml, - name='device-symbian-opml'), - - url(r'^device/(?P[\w.-]+)/sync$', - device.sync, - name='device-sync'), - - url(r'^device/(?P[\w.-]+)/unsync$', - device.unsync, - name='device-unsync'), - - url(r'^device/(?P[\w.-]+)/resync$', - device.resync, - name='trigger-sync'), - - url(r'^device/(?P[\w.-]+)/delete$', - device.delete, - name='device-delete'), - - url(r'^device/(?P[\w.-]+)/remove$', - device.delete_permanently, - name='device-delete-permanently'), - - url(r'^device/(?P[\w.-]+)/undelete$', - device.undelete, - name='device-undelete'), - - url(r'^device/(?P[\w.-]+)/edit$', - device.edit, - name='device-edit'), - - url(r'^device/(?P[\w.-]+)/update$', - device.update, - name='device-update'), - - url(r'^device/(?P[\w.-]+)/upload-opml$', - device.upload_opml, - name='device-upload-opml'), - - url(r'^register/restore_password$', - users.restore_password, - name='restore-password'), - - url(r'^login/$', - users.LoginView.as_view(), - name='login'), - - url(r'^login/google$', - users.GoogleLogin.as_view(), - name='login-google'), - - url(r'^login/oauth2callback$', - users.GoogleLoginCallback.as_view(), - name='login-google-callback'), - - url(r'^logout/$', - logout, - kwargs={'next_page': '/'}, - name='logout'), - -] +from django.conf.urls import url +from django.views.generic.base import TemplateView, RedirectView + +from mygpo.web.logo import CoverArt + +from . import views + + +urlpatterns = [ + + url(r'^$', + views.home, + name='home'), + + url(r'^logo/(?P\d+)/(?P.{3})/(?P[^/]*)$', + CoverArt.as_view(), + name='logo'), + + url(r'^tags/', + views.mytags, + name='tags'), + + url(r'^online-help', + RedirectView.as_view( + url='http://gpoddernet.readthedocs.org/en/latest/user/index.html', + permanent=False, + ), + name='help'), + + url(r'^developer/', + TemplateView.as_view(template_name='developer.html')), + + url(r'^contribute/', + TemplateView.as_view(template_name='contribute.html'), + name='contribute'), + + url(r'^privacy/', + TemplateView.as_view(template_name='privacy_policy.html'), + name='privacy-policy'), + +] -- 2.11.4.GIT