Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
BeHub-web
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dominik Rosiek
BeHub-web
Commits
527068fa
Commit
527068fa
authored
Nov 21, 2015
by
Rafal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add maps to ulr/view
parent
d4fa7172
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
urls.py
BeHub/BeHub/urls.py
+2
-1
views.py
BeHub/Hub/views.py
+5
-1
No files found.
BeHub/BeHub/urls.py
View file @
527068fa
...
@@ -5,7 +5,7 @@ from django.conf.urls.static import static
...
@@ -5,7 +5,7 @@ from django.conf.urls.static import static
from
BeHub
import
settings
from
BeHub
import
settings
from
Hub
import
views
as
hub_views
from
Hub
import
views
as
hub_views
from
Hub.views
import
login_page
,
main_page
,
dashboard
from
Hub.views
import
login_page
,
main_page
,
dashboard
,
maps
router
=
routers
.
DefaultRouter
()
router
=
routers
.
DefaultRouter
()
router
.
register
(
r'beacons'
,
hub_views
.
BeaconViewSet
)
router
.
register
(
r'beacons'
,
hub_views
.
BeaconViewSet
)
...
@@ -19,6 +19,7 @@ urlpatterns = patterns('',
...
@@ -19,6 +19,7 @@ urlpatterns = patterns('',
url
(
r'^$'
,
main_page
),
url
(
r'^$'
,
main_page
),
url
(
r'^login/$'
,
login_page
),
url
(
r'^login/$'
,
login_page
),
url
(
r'^dashboard/$'
,
dashboard
),
url
(
r'^dashboard/$'
,
dashboard
),
url
(
r'^maps/$'
,
maps
),
url
(
r'^api/'
,
include
(
router
.
urls
)),
url
(
r'^api/'
,
include
(
router
.
urls
)),
url
(
r'^admin/'
,
include
(
admin
.
site
.
urls
)),
url
(
r'^admin/'
,
include
(
admin
.
site
.
urls
)),
url
(
r'^api/uuid/(?P<pk>[0-9]+)/$'
,
hub_views
.
UuidBeaconViewSet
.
as_view
()),
url
(
r'^api/uuid/(?P<pk>[0-9]+)/$'
,
hub_views
.
UuidBeaconViewSet
.
as_view
()),
...
...
BeHub/Hub/views.py
View file @
527068fa
...
@@ -105,3 +105,7 @@ def main_page(request):
...
@@ -105,3 +105,7 @@ def main_page(request):
def
dashboard
(
request
):
def
dashboard
(
request
):
context
=
RequestContext
(
request
)
context
=
RequestContext
(
request
)
return
render_to_response
(
'user_panel/content/dashboard.html'
,
{},
context
)
return
render_to_response
(
'user_panel/content/dashboard.html'
,
{},
context
)
def
maps
(
request
):
context
=
RequestContext
(
request
)
return
render_to_response
(
'user_panel/content/maps.html'
,
{},
context
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment