from django.conf.urls import patterns, include, url
from django.contrib import admin
from django.conf import settings
#from . import views



urlpatterns = patterns('',
    # Examples:
    # url(r'^$', 'app.views.home', name='home'),
    # url(r'^blog/', include('blog.urls')),

    url(r'^$', 'app.views.splash', name='splash'),
    url(r'^feed', 'app.views.feed', name='feed'),
    url(r'^about', 'app.views.about', name='about'),
    url(r'^explore', 'app.views.explore', name='explore'),
    url(r'^profile_picture', 'app.views.profile_picture', name='profile_picture'),
    url(r'^dashboard', 'app.views.dashboard', name='dashboard'),
    url(r'^login', 'app.views.login', name='login'),
    url(r'^logout', 'app.views.logout', name='logout'),
    url(r'^temp', 'app.views.temp', name='temp'), #delete eventually
    url(r'^posts', 'app.views.posts', name='posts'),
    url(r'^admin/', include(admin.site.urls))
)


from django.conf.urls import patterns, include, url
from django.contrib import admin
from django.conf import settings
#from . import views

urlpatterns = patterns('',
    # Examples:
    # url(r'^$', 'app.views.home', name='home'),
    # url(r'^blog/', include('blog.urls')),

    url(r'^$', 'app.views.splash', name='splash'),
    url(r'^feed', 'app.views.feed', name='feed'),
    url(r'^about', 'app.views.about', name='about'),
    url(r'^explore', 'app.views.explore', name='explore'),
    url(r'^profile_picture', 'app.views.profile_picture', name='profile_picture'),
    url(r'^dashboard', 'app.views.dashboard', name='dashboard'),
    url(r'^login', 'app.views.login', name='login'),
    url(r'^logout', 'app.views.logout', name='logout'),
    url(r'^temp', 'app.views.temp', name='temp'),

    url(r'^admin/', include(admin.site.urls))
)

Revert "Added a post view"
Revert "Added a post view"

This reverts commit b1063480e7b2e1128c457e9e65c52f742109d90d.

  from django.conf.urls import patterns, include, url
  from django.contrib import admin
  from django.conf import settings
  #from . import views
- 
- 
  
  urlpatterns = patterns('',
      # Examples:
      # url(r'^$', 'app.views.home', name='home'),
      # url(r'^blog/', include('blog.urls')),
  
      url(r'^$', 'app.views.splash', name='splash'),
      url(r'^feed', 'app.views.feed', name='feed'),
      url(r'^about', 'app.views.about', name='about'),
      url(r'^explore', 'app.views.explore', name='explore'),
      url(r'^profile_picture', 'app.views.profile_picture', name='profile_picture'),
      url(r'^dashboard', 'app.views.dashboard', name='dashboard'),
      url(r'^login', 'app.views.login', name='login'),
      url(r'^logout', 'app.views.logout', name='logout'),
-     url(r'^temp', 'app.views.temp', name='temp'), #delete eventually
+     url(r'^temp', 'app.views.temp', name='temp'),
-     url(r'^posts', 'app.views.posts', name='posts'),
+ 
      url(r'^admin/', include(admin.site.urls))
  )
  
- 
Revert "Added a post view"
## Code Before:
from django.conf.urls import patterns, include, url
from django.contrib import admin
from django.conf import settings
#from . import views



urlpatterns = patterns('',
    # Examples:
    # url(r'^$', 'app.views.home', name='home'),
    # url(r'^blog/', include('blog.urls')),

    url(r'^$', 'app.views.splash', name='splash'),
    url(r'^feed', 'app.views.feed', name='feed'),
    url(r'^about', 'app.views.about', name='about'),
    url(r'^explore', 'app.views.explore', name='explore'),
    url(r'^profile_picture', 'app.views.profile_picture', name='profile_picture'),
    url(r'^dashboard', 'app.views.dashboard', name='dashboard'),
    url(r'^login', 'app.views.login', name='login'),
    url(r'^logout', 'app.views.logout', name='logout'),
    url(r'^temp', 'app.views.temp', name='temp'), #delete eventually
    url(r'^posts', 'app.views.posts', name='posts'),
    url(r'^admin/', include(admin.site.urls))
)


## Instruction:
Revert "Added a post view"
## Code After:
from django.conf.urls import patterns, include, url
from django.contrib import admin
from django.conf import settings
#from . import views

urlpatterns = patterns('',
    # Examples:
    # url(r'^$', 'app.views.home', name='home'),
    # url(r'^blog/', include('blog.urls')),

    url(r'^$', 'app.views.splash', name='splash'),
    url(r'^feed', 'app.views.feed', name='feed'),
    url(r'^about', 'app.views.about', name='about'),
    url(r'^explore', 'app.views.explore', name='explore'),
    url(r'^profile_picture', 'app.views.profile_picture', name='profile_picture'),
    url(r'^dashboard', 'app.views.dashboard', name='dashboard'),
    url(r'^login', 'app.views.login', name='login'),
    url(r'^logout', 'app.views.logout', name='logout'),
    url(r'^temp', 'app.views.temp', name='temp'),

    url(r'^admin/', include(admin.site.urls))
)
