From 3f73a94b834eef3c6c9c3c7f32b22e9d01c39465 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Thu, 6 Apr 2017 21:03:43 +0300 Subject: [PATCH] Separate urls.py into modular pieces --- infoscreen/urls.py | 53 ++++++++++++++++++++ members/urls.py | 59 +++++++++++++++++++++++ sikweb/urls.py | 118 +++------------------------------------------ webapp/urls.py | 18 +++++++ 4 files changed, 137 insertions(+), 111 deletions(-) create mode 100644 infoscreen/urls.py create mode 100644 members/urls.py create mode 100644 webapp/urls.py diff --git a/infoscreen/urls.py b/infoscreen/urls.py new file mode 100644 index 0000000..d736bd6 --- /dev/null +++ b/infoscreen/urls.py @@ -0,0 +1,53 @@ +from django.conf.urls import url + +#infoscreen +from infoscreen.views import index +from infoscreen.views import admin +from infoscreen.views import default +from infoscreen.views import rotation +from infoscreen.views import rotations +from infoscreen.views import info_items +from infoscreen.views import info_types +from infoscreen.views import delete_info_item +from infoscreen.views import createInstance +from infoscreen.views import deleteInstance +from infoscreen.views import createExternalImageInfoItem +from infoscreen.views import create_image_item +from infoscreen.views import createABBItem +from infoscreen.views import createSossoItem +from infoscreen.views import createHslItem +from infoscreen.views import createEventItem +from infoscreen.views import createExternalWebsiteItem +from infoscreen.views import create_rotation +from infoscreen.views import delete_rotation +from infoscreen.views import CurrentHSLView +from infoscreen.views import createApyItem +from infoscreen.views import hsl_timetable_settings +from infoscreen.views import get_apy_json + +urlpatterns = [ + #infoscreen + url(r'^$', default), + url(r'^admin$', admin), + url(r'^(?P\d+)$', index), + url(r'^items$', info_items), + url(r'^rotation/(?P\d+)$', rotation), + url(r'^rotations$', rotations), + url(r'^instance$', createInstance), + url(r'^instance/(?P\d+)$', deleteInstance), + url(r'^types$', info_types), + url(r'^delete_item/(?P\d+)/(?P\d+)$', delete_info_item), + url(r'^create_external_image$', createExternalImageInfoItem), + url(r'^create_image$', create_image_item), + url(r'^create_abbitem$', createABBItem), + url(r'^create_sossoitem$', createSossoItem), + url(r'^create_eventitem$', createEventItem), + url(r'^create_hslitem$', createHslItem), + url(r'^create_apyitem$', createApyItem), + url(r'^create_websiteitem$', createExternalWebsiteItem), + url(r'^create_rotation$', create_rotation), + url(r'^delete_rotation/(?P\d+)$', delete_rotation), + url(r'^hsl_data$', CurrentHSLView), + url(r'^hsl_data/settings$', hsl_timetable_settings), + url(r'^apyjson', get_apy_json), +] diff --git a/members/urls.py b/members/urls.py new file mode 100644 index 0000000..20eb6e9 --- /dev/null +++ b/members/urls.py @@ -0,0 +1,59 @@ +from django.conf.urls import url +from django.views.generic.base import RedirectView + +# members +from members.views import member_list +from members.views import add_member +from members.views import add_many_members +from members.views import edit_member +from members.views import members as mems +from members.views import member as mem +from members.views import handle_mem_request +from members.views import csv_import as mem_csv_import +from members.views import new_member_request +from members.views import member_requests +from members.views import export_csv as mem_csv_export +from members.views import tommy_blooper +# members API +from members.views import MembersList as memsListAPI +from members.views import MemberDetails as memDetailAPI +from members.views import MemberRequestList as reqListAPI +from members.views import MemberRequestDetail as reqDetailAPI +#application +from members.views import application_index +from members.views import list_applications +from members.views import edit_application +from members.views import application_success_index + +favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True) + +urlpatterns = [ + + # members + url(r'^$', member_list), + url(r'^list$', member_list), + url(r'^add$', add_member), + url(r'^add_many$', add_many_members), + url(r'^edit/(?P\d+)$', edit_member), + url(r'^applications$', list_applications), + url(r'^edit_application/(?P\d+)$', edit_application), + url(r'^api/members$', mems), + url(r'^api/member/(?P\d+)$', mem), + url(r'^api/member/$', mem), + url(r'^api/csvimport$', mem_csv_import), + url(r'^api/requests$', member_requests), + url(r'^api/request$', new_member_request), + url(r'^api/request/(?P\d+)$', handle_mem_request), + url(r'^api/getCSV$', mem_csv_export), + url(r'^tommy$', tommy_blooper), + url(r'^rest/api/members/$', memsListAPI.as_view()), + url(r'^rest/api/members/(?P\d+)/$', memDetailAPI.as_view()), + url(r'^rest/api/requests/$', reqListAPI.as_view()), + url(r'^rest/api/requests/(?P\d+)/$', reqDetailAPI.as_view()), + + #application + url(r'^application/$', application_index), + url(r'^application/success$', application_success_index), + url(r'^favicon\.ico$', favicon_view), +] + diff --git a/sikweb/urls.py b/sikweb/urls.py index 611e570..b112e52 100644 --- a/sikweb/urls.py +++ b/sikweb/urls.py @@ -16,128 +16,24 @@ Including another URLconf """ from django.conf.urls import url from django.contrib import admin -from django.views.generic.base import RedirectView from django.views.static import serve as static_serve from django.conf.urls import include from django.conf.urls.static import static from django.conf import settings from django.contrib.staticfiles import views as static_views -# main -from webapp.views import main_index -from webapp.views import admin_index -# login -from webapp.views import login_view -from webapp.views import logout_view -# members -from members.views import member_list -from members.views import add_member -from members.views import add_many_members -from members.views import edit_member -from members.views import members as mems -from members.views import member as mem -from members.views import handle_mem_request -from members.views import csv_import as mem_csv_import -from members.views import new_member_request -from members.views import member_requests -from members.views import export_csv as mem_csv_export -from members.views import tommy_blooper -# members API -from members.views import MembersList as memsListAPI -from members.views import MemberDetails as memDetailAPI -from members.views import MemberRequestList as reqListAPI -from members.views import MemberRequestDetail as reqDetailAPI -#infoscreen -from infoscreen.views import index as infoindex -from infoscreen.views import default as infodefault -from infoscreen.views import rotation -from infoscreen.views import rotations -from infoscreen.views import info_items -from infoscreen.views import info_types -from infoscreen.views import delete_info_item -from infoscreen.views import createInstance as createInfoInstance -from infoscreen.views import deleteInstance as deleteInfoInstance -from infoscreen.views import createExternalImageInfoItem -from infoscreen.views import create_image_item -from infoscreen.views import createABBItem -from infoscreen.views import createSossoItem -from infoscreen.views import createHslItem -from infoscreen.views import createEventItem -from infoscreen.views import createExternalWebsiteItem -from infoscreen.views import create_rotation -from infoscreen.views import delete_rotation -from infoscreen.views import CurrentHSLView -from infoscreen.views import createApyItem -from infoscreen.views import admin as infoscreen_admin -from infoscreen.views import hsl_timetable_settings -from infoscreen.views import get_apy_json -#application -from members.views import application_index -from members.views import list_applications -from members.views import edit_application -from members.views import application_success_index +import webapp.urls +import infoscreen.urls +import members.urls -favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True) urlpatterns = [ - # main - url(r'^$', main_index), - url(r'^sikadmin$', admin_index), + url(r'', include('webapp.urls')), + url(r'^members/', include('members.urls')), + url(r'^infoscreen/', include('infoscreen.urls')), + # admin url(r'^admin/', admin.site.urls), - # login stuff - url(r'^login$', login_view), - url(r'^logout$', logout_view), - # members - url(r'^members/$', member_list), - url(r'^members/list$', member_list), - url(r'^members/add$', add_member), - url(r'^members/add_many$', add_many_members), - url(r'^members/edit/(?P\d+)$', edit_member), - url(r'^members/applications$', list_applications), - url(r'^members/edit_application/(?P\d+)$', edit_application), - url(r'^members/api/members$', mems), - url(r'^members/api/member/(?P\d+)$', mem), - url(r'^members/api/member/$', mem), - url(r'^members/api/csvimport$', mem_csv_import), - url(r'^members/api/requests$', member_requests), - url(r'^members/api/request$', new_member_request), - url(r'^members/api/request/(?P\d+)$', handle_mem_request), - url(r'^members/api/getCSV$', mem_csv_export), - url(r'^members/tommy$', tommy_blooper), - url(r'^members/rest/api/members/$', memsListAPI.as_view()), - url(r'^members/rest/api/members/(?P\d+)/$', memDetailAPI.as_view()), - url(r'^members/rest/api/requests/$', reqListAPI.as_view()), - url(r'^members/rest/api/requests/(?P\d+)/$', reqDetailAPI.as_view()), - - #infoscreen - url(r'^infoscreen/$', infodefault), - url(r'^infoscreen/(?P\d+)$', infoindex), - url(r'^infoscreen/items$', info_items), - url(r'^infoscreen/rotation/(?P\d+)$', rotation), - url(r'^infoscreen/rotations$', rotations), - url(r'^infoscreen/instance$', createInfoInstance), - url(r'^infoscreen/instance/(?P\d+)$', deleteInfoInstance), - url(r'^infoscreen/types$', info_types), - url(r'^infoscreen/delete_item/(?P\d+)/(?P\d+)$', delete_info_item), - url(r'^infoscreen/create_external_image$', createExternalImageInfoItem), - url(r'^infoscreen/create_image$', create_image_item), - url(r'^infoscreen/create_abbitem$', createABBItem), - url(r'^infoscreen/create_sossoitem$', createSossoItem), - url(r'^infoscreen/create_eventitem$', createEventItem), - url(r'^infoscreen/create_hslitem$', createHslItem), - url(r'^infoscreen/create_apyitem$', createApyItem), - url(r'^infoscreen/create_websiteitem$', createExternalWebsiteItem), - url(r'^infoscreen/admin$', infoscreen_admin), - url(r'^infoscreen/create_rotation$', create_rotation), - url(r'^infoscreen/delete_rotation/(?P\d+)$', delete_rotation), - url(r'^infoscreen/hsl_data$', CurrentHSLView), - url(r'^infoscreen/hsl_data/settings$', hsl_timetable_settings), - url(r'^infoscreen/apyjson', get_apy_json), - #application - url(r'^application/$', application_index), - url(r'^application/success$', application_success_index), - url(r'^favicon\.ico$', favicon_view), # i18n default view for changing the active language url(r'^i18n/', include('django.conf.urls.i18n')), diff --git a/webapp/urls.py b/webapp/urls.py new file mode 100644 index 0000000..9cf1172 --- /dev/null +++ b/webapp/urls.py @@ -0,0 +1,18 @@ +from django.conf.urls import url + +# main +from webapp.views import main_index +from webapp.views import admin_index +# login +from webapp.views import login_view +from webapp.views import logout_view + +urlpatterns = [ + # main + url(r'^$', main_index), + url(r'^sikadmin$', admin_index), + + # login stuff + url(r'^login$', login_view), + url(r'^logout$', logout_view), +]