Merge branch 'master' of gitlab.telemabk.pl:dominik/BeHub-web

BeHub/BeHub/urls.py

@@ -5,7 +5,7 @@ from django.conf.urls.static import static
 from BeHub import settings
 
 from Hub import views as hub_views
-from Hub.views import login_page, main_page, dashboard, project
+from Hub.views import login_page, main_page, dashboard, project, beacons
 
 router = routers.DefaultRouter()
 router.register(r'beacons', hub_views.BeaconViewSet)
@@ -21,6 +21,7 @@ urlpatterns = patterns('',
     url(r'^$', main_page),
     url(r'^login/$', login_page),
     url(r'^dashboard/$', dashboard),
+    url(r'^beacons/$', beacons),
     url(r'^project/(?P<project_id>\w+)/$', project),
     url(r'^api/', include(router.urls)),
     url(r'^admin/', include(admin.site.urls)),

BeHub/Hub/templates/user_panel/content/beacon_list.html

+{% extends 'user_panel/default/base.html' %}
+
+{% block content %}
+
+
+
+
+{% endblock content %}
\ No newline at end of file

BeHub/Hub/templates/user_panel/content/dashboard.html

@@ -32,6 +32,7 @@
                 <div class="info">
                     <h4 class="text-center">{{ project.name }}</h4>
                     <p>{{ project.description }}</p>
+                     <button type="button" class="btn btn-danger">Delete</button>
                 </div>
             </div>
         </div>

BeHub/Hub/templates/user_panel/default/user_bar.html

@@ -11,8 +11,11 @@
 
       <ul class="nav navbar-nav navbar-right">
 
+        <li><a href="/beacons">Beacons</a></li>
+        <li><a href="/">Projects</a></li>
         <li><a href="/logout">Logout</a></li>
 
+
       </ul>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->

BeHub/Hub/views.py

@@ -74,7 +74,6 @@ class SiteViewSet(viewsets.ModelViewSet):
     serializer_class = SiteSerializer
 
 
-
 class UuidBeaconViewSet(APIView):
     """
     API for places
@@ -125,6 +124,15 @@ class CategoryViewSet(viewsets.ModelViewSet):
     queryset = Category.objects.all()
     serializer_class = CategorySerializer
 
+    @detail_route()
+    def all(self, request, pk=None):
+        category = Category.objects.all()
+        category_serializer = CategorySerializer(category,many=True,  context={'request': request})
+        category_data = category_serializer.data
+        data = []
+        for category in category_data:
+            data.append(category['name'])
+        return Response(data=data)
 
 def login_page(request):
     context = RequestContext(request)
@@ -157,21 +165,16 @@ def dashboard(request):
     data['user_id'] = request.user.id
     return render_to_response('user_panel/content/dashboard.html', data, context)
 
+def beacons(request):
+    context = RequestContext(request)
+    data = {}
+    data['user_id'] = request.user.id
+    return render_to_response('user_panel/content/beacon_list.html', data, context)
+
 def project(request, project_id):
     context = RequestContext(request)
     data = {}
     user_project = UserProject.objects.get(id=project_id)
     data['user_project'] = user_project
-    #user_project_serializer = UserProjectSerializer(user_project, context={'request': request})
-    #data['project_data'] = user_project_serializer.data
     data['project_id'] = project_id
-    #data['beacon_display']  = []
-    # beacon_managers =  user_project.beacon_managers.all()
-    # for beacon_manager in beacon_managers:
-    #     beacon_serializer = BeaconSerializer(beacon_manager.beacon,context={'request': request})
-    #     beacon_data = beacon_serializer.data
-    #     my_sites = beacon_manager.sites.filter(author=request.user.pk)
-    #     site_serializer = SiteSerializer(my_sites, many=True, context={'request': request})
-    #     sites_data = site_serializer.data
-    #     data['beacon_display'].append({'beacon':beacon_data,'sites' :sites_data})
     return render_to_response('user_panel/content/project.html', data, context)