소스 검색

Separate views into right files

Camille Masset 9 년 전
부모
커밋
5e677e569d
3개의 변경된 파일25개의 추가작업 그리고 26개의 파일을 삭제
  1. 9 7
      counter/urls.py
  2. 1 19
      counter/views/views.py
  3. 15 0
      counter/views/reset.py

+ 9 - 7
counter/urls.py

3
 from django.contrib.auth import views as auth_views
3
 from django.contrib.auth import views as auth_views
4
 from django.views.generic.base import RedirectView
4
 from django.views.generic.base import RedirectView
5
 
5
 
6
-from .views import views, hashtag, counter, user
6
+from .views import counter, hashtag, home, reset, user
7
 
7
 
8
 urlpatterns = [
8
 urlpatterns = [
9
-    url(r'^$', views.home, name='home'),
9
+    url(r'^$', home.index, name='home'),
10
+    url(r'^toggle-notif/$', home.toggleEmailNotifications,
11
+        name='toggle_email_notifications'),
12
+    url(r'^toggle-sort-score/$', home.toggleScoreSorting,
13
+        name='toggle_sort_score'),
14
+
10
     url(r'^reset-counter/$', counter.reset_counter, name='reset-counter'),
15
     url(r'^reset-counter/$', counter.reset_counter, name='reset-counter'),
11
     url(r'^counter/(?P<id_counter>\d+)/$', counter.get, name='counter'),
16
     url(r'^counter/(?P<id_counter>\d+)/$', counter.get, name='counter'),
17
+
12
     url(r'^hashtag/(?P<keyword>.+)/$', hashtag.get, name='hashtag'),
18
     url(r'^hashtag/(?P<keyword>.+)/$', hashtag.get, name='hashtag'),
13
 
19
 
14
-    url(r'^like/$', views.like, name='like'),
15
-    url(r'^toggle-notif/$', views.toggleEmailNotifications,
16
-        name='toggle_email_notifications'),
17
-    url(r'^toggle-sort-score/$', views.toggleScoreSorting,
18
-        name='toggle_sort_score'),
20
+    url(r'^like/$', reset.like, name='like'),
19
 
21
 
20
     url(r'^create_user/$', user.create, name='create_user'),
22
     url(r'^create_user/$', user.create, name='create_user'),
21
 
23
 

+ 1 - 19
counter/views/views.py

26
 
26
 
27
 
27
 
28
 @login_required
28
 @login_required
29
-def home(request):
29
+def index(request):
30
     # Used later to keep track of the maximum JSS
30
     # Used later to keep track of the maximum JSS
31
     lastResets = []
31
     lastResets = []
32
     no_seum_delta = timedelta.max
32
     no_seum_delta = timedelta.max
293
     })
293
     })
294
 
294
 
295
 
295
 
296
-
297
-
298
-
299
-
300
-
301
-
302
 @login_required
296
 @login_required
303
 def toggleEmailNotifications(request):
297
 def toggleEmailNotifications(request):
304
     counter = Counter.objects.get(user=request.user)
298
     counter = Counter.objects.get(user=request.user)
315
     return HttpResponseRedirect(reverse('home'))
309
     return HttpResponseRedirect(reverse('home'))
316
 
310
 
317
 
311
 
318
-@login_required
319
-def like(request):
320
-    if (request.method == 'POST'):
321
-        # create a form instance and populate it with data from the request:
322
-        data = dict(request.POST)
323
-        liker = Counter.objects.get(pk=data['liker'][0])
324
-        reset = Reset.objects.get(pk=data['reset'][0])
325
-        like = Like()
326
-        like.liker = liker
327
-        like.reset = reset
328
-        like.save()
329
-    return HttpResponseRedirect(data['redirect'][0])

+ 15 - 0
counter/views/reset.py

1
+from django.contrib.auth.decorators import login_required
2
+from django.http import HttpResponseRedirect
3
+
4
+from counter.models import *
5
+
6
+
7
+@login_required
8
+def like(request):
9
+    if (request.method == 'POST'):
10
+        # create a form instance and populate it with data from the request:
11
+        data = dict(request.POST)
12
+        liker = Counter.objects.get(pk=data['liker'][0])
13
+        reset = Reset.objects.get(pk=data['reset'][0])
14
+        like = Like.objects.create(liker=liker, reset=reset)
15
+    return HttpResponseRedirect(data['redirect'][0])