Home Explore Help
Sign In
radu
/
Django-Hackathon-Starter
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Resolving #32: Making landing page default to starting server url

DrkSephy 9 years ago
parent
b192914546
commit
2b8a573792
5 changed files with 7 additions and 5 deletions
Unified View Show Diff Stats
  1. 1 1
      hackathon_starter/hackathon/templates/hackathon/base.html
  2. 1 1
      hackathon_starter/hackathon/templates/hackathon/register.html
  3. 0 1
      hackathon_starter/hackathon/urls.py
  4. 3 2
      hackathon_starter/hackathon/views.py
  5. 2 0
      hackathon_starter/hackathon_starter/urls.py

+ 1 - 1
hackathon_starter/hackathon/templates/hackathon/base.html
View File 

@@ -24,7 +24,7 @@
 
             <span class="icon-bar"></span>
 
             <span class="icon-bar"></span>
 
             <span class="icon-bar"></span>
 
             <span class="icon-bar"></span>
 
           </button>
 
           </button>
 
-          <a class="navbar-brand" href="/hackathon">Django Hackathon Starter</a>
 
+          <a class="navbar-brand" href="/">Django Hackathon Starter</a>
 
       </div>
 
       </div>
 
 
 
       <!-- Collect the nav links, forms, and other content for toggling -->
 
       <!-- Collect the nav links, forms, and other content for toggling -->

+ 1 - 1
hackathon_starter/hackathon/templates/hackathon/register.html
View File 

@@ -5,7 +5,7 @@
 
     <body>
 
     <body>
 
         {% if registered %}
 
         {% if registered %}
 
           <strong>Thank you for registering!</strong>
 
           <strong>Thank you for registering!</strong>
 
-          <a href="/hackathon/">Return to the homepage.</a><br />
 
+          <a href="/hackathon/login/">Return to the homepage.</a><br />
 
         
         
         {% else %}
 
         {% else %}
 
           <div class='container text-center'>
 
           <div class='container text-center'>

+ 0 - 1
hackathon_starter/hackathon/urls.py
View File 

@@ -7,7 +7,6 @@ router = DefaultRouter()
 
 router.register(r'snippets', views.SnippetView)
 
 router.register(r'snippets', views.SnippetView)
 
 
 
 urlpatterns = patterns('',
 
 urlpatterns = patterns('',
 
-    url(r'^$', views.index, name='index'),
 
     url(r'^', include(router.urls)),
 
     url(r'^', include(router.urls)),
 
     url(r'^register/$', views.register, name='register'),
 
     url(r'^register/$', views.register, name='register'),
 
     url(r'^login/$', views.user_login, name='login'),
 
     url(r'^login/$', views.user_login, name='login'),

+ 3 - 2
hackathon_starter/hackathon/views.py
View File 

@@ -739,6 +739,7 @@ def register(request):
 
             user.set_password(user.password)
 
             user.set_password(user.password)
 
             user.save()
 
             user.save()
 
             registered = True
 
             registered = True
 
+            return HttpResponseRedirect('/hackathon/login/')
 
         else:
 
         else:
 
             print user_form.errors
 
             print user_form.errors
 
     else:
 
     else:
 
@@ -759,7 +760,7 @@ def user_login(request):
 
         if user:
 
         if user:
 
             if user.is_active:
 
             if user.is_active:
 
                 login(request, user)
 
                 login(request, user)
 
-                return HttpResponseRedirect('/hackathon/')
 
+                return HttpResponseRedirect('/hackathon/api/')
 
             else:
 
             else:
 
                 return HttpResponse("Your Django Hackathon account is disabled.")
 
                 return HttpResponse("Your Django Hackathon account is disabled.")
 
         else:
 
         else:
 
@@ -771,7 +772,7 @@ def user_login(request):
 
 
 
 def user_logout(request):
 
 def user_logout(request):
 
     logout(request)
 
     logout(request)
 
-    return HttpResponseRedirect('/hackathon/')
 
+    return HttpResponseRedirect('/hackathon/login/')
 
 
 
 
 
 def instagram_login(request):
 
 def instagram_login(request):

+ 2 - 0
hackathon_starter/hackathon_starter/urls.py
View File 

@@ -1,7 +1,9 @@
 
 from django.conf.urls import patterns, include, url
 
 from django.conf.urls import patterns, include, url
 
 from django.contrib import admin
 
 from django.contrib import admin
 
+from hackathon import views
 
 
 
 urlpatterns = patterns('',
 
 urlpatterns = patterns('',
 
+    url(r'^$', views.index, name='index'),
 
     url(r'^hackathon/', include('hackathon.urls')),
 
     url(r'^hackathon/', include('hackathon.urls')),
 
     url(r'^admin/', include(admin.site.urls)),
 
     url(r'^admin/', include(admin.site.urls)),
 
     # url(r'^openid/(.*)', SessionConsumer()),
 
     # url(r'^openid/(.*)', SessionConsumer()),