110swag / flashy-frontend

Download as
Browse Code ยป

Commit a70c05102ff17ea61cd7213d680a1e3935559f9d

Authored by Kevin Mach
1 parent f6cd8fce83
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

changed sidebar to top bar

Showing 5 changed files with 63 additions and 38 deletions Side-by-side Diff

home.html View file @ a70c051
... ... @@ -12,44 +12,66 @@
12 12 <title>Flashy</title>
13 13 </head>
14 14 <header>
15   - <a href="#" style="position:absolute;top:0;left:0;" data-activates="sidebar" class="button-collapse"><i
16   - class="medium mdi-navigation-menu"></i></a>
17   - <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed ng-cloak">
18   - <li class="logo"><a href="//flashy.cards/" id="logo-container">
19 15  
20   - <h1>Flashy</h1>
21   - </a></li>
22   - <li class="no-padding">
23   - <ul class="collapsible" data-collapsible="accordion">
24   - <li class="bold">
25   - <a class="collapsible-header black-text">Classes</a>
26   - </li>
27   - <div class="collapsible-body" style="display: block">
28   - <ul>
29   - <li ui-sref-active="active" ng-repeat="section in sections">
30   - <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
31   - </li>
32   - </ul>
33   - </div>
34   - </ul>
35   - </li>
36   - <!--<li class="bold">
37   - <a>Classes:</a></li>
38   - <div ng-repeat="section in sections">
39   - <li class="bold class" ui-sref-active="active"><a ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
  16 + <!--<a href="#" style="position:absolute;top:0;left:0;" data-activates="sidebar" class="button-collapse"><i
  17 + class="medium mdi-navigation-menu"></i></a>
  18 + <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed ng-cloak">
  19 + <li class="logo"><a href="//flashy.cards/" id="logo-container">
  20 +
  21 + <h1>Flashy</h1>
  22 + </a></li>
  23 + <li class="no-padding">
  24 + <ul class="collapsible" data-collapsible="accordion">
  25 + <li class="bold">
  26 + <a class="collapsible-header black-text">Classes</a>
  27 + </li>
  28 + <div class="collapsible-body" style="display: block">
  29 + <ul>
  30 + <li ui-sref-active="active" ng-repeat="section in sections">
  31 + <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
  32 + </li>
  33 + </ul>
  34 + </div>
  35 + </ul>
40 36 </li>
41   - </div>-->
42   - <li class="bold"><a ui-sref="addclass">Add Class</a></li>
43   - <li class="bold"><a ui-sref="study">Study</a></li>
44   - <li class="bold"><a ui-sref="logout">Logout</a></li>
45   - </ul>
  37 + <li class="bold"><a ui-sref="addclass">Add Class</a></li>
  38 + <li class="bold"><a ui-sref="study">Study</a></li>
  39 + <li class="bold"><a ui-sref="logout">Logout</a></li>
  40 + </ul>-->
46 41  
  42 +
47 43 </header>
48 44 <body ng-controller="RootController">
49 45  
50   -<main>
  46 + <!-- Menu Bar -->
  47 + <nav ng-show="isLoggedIn">
  48 + <div class="nav-wrapper">
  49 + <a href="#" class="brand-logo center">Flashy</a>
  50 + <ul id="nav-mobile" class="right hide-on-med-and-down">
  51 +
  52 + <ul id="dropdown1" class="dropdown-content">
  53 +
  54 + <li ui-sref-active="active" ng-repeat="section in sections">
  55 + <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
  56 + </li>
  57 + <li class="divider"></li>
  58 + <li><a ui-sref="addclass">Add Class</a></li>
  59 + </ul>
  60 +
  61 +
  62 + <li><a class="dropdown-button" href="#!" data-activates="dropdown1">Classes<i class="mdi-navigation-arrow-drop-down right"></i></a></li>
  63 + <li><a ui-sref="study">Study</a></li>
  64 + <li><a ui-sref="logout">Logout</a></li>
  65 + </ul>
  66 + </div>
  67 + </nav>
  68 +
51 69 <div class="" ui-view></div>
52   -</main>
  70 +
  71 +
  72 + <!--<main>
  73 + <div class="" ui-view></div>
  74 + </main>-->
53 75  
54 76 </body>
55 77 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
scripts/ClassAddController.js View file @ a70c051
... ... @@ -2,6 +2,7 @@
2 2  
3 3 controller('ClassAddController', ['$scope', '$state', '$http', function($scope, $state, $http) {
4 4  
  5 +
5 6 $scope.trySearch = function(searchText) {
6 7 return $http.get('/api/sections/search/', {
7 8 params: {
scripts/FeedController.js View file @ a70c051
1 1 angular.module('flashy.FeedController', ['ui.router']).
2 2  
3   - controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function($scope, $stateParams, $state, $http) {
  3 + controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function ($scope, $stateParams, $state, $http) {
  4 +
  5 +
  6 +
4 7 console.log('Hello from feed');
5 8 sectionId = $stateParams.sectionId;
6 9 $scope.cards = [];
styles/flashy.css View file @ a70c051
... ... @@ -42,7 +42,7 @@
42 42 margin-right: 0;
43 43 }
44 44  
45   -ul.side-nav.fixed li {
  45 +/*ul.side-nav.fixed li {
46 46 font-size: 24px;
47 47 }
48 48  
... ... @@ -55,7 +55,7 @@
55 55  
56 56 ul.side-nav.fixed li a {
57 57 font-size: 24px;
58   -}
  58 +}*/
59 59  
60 60 /* Flashcard directive css */
61 61 .card {
62 62  
... ... @@ -247,7 +247,7 @@
247 247 display: none !important;
248 248 }
249 249  
250   -#sidenav-overlay {
  250 +/*#sidenav-overlay {
251 251 background-color: rgba(0, 0, 0, 0) !important;
252   -}
  252 +}*/
templates/addclass.html View file @ a70c051
1 1 <div>
2   -
3 2 <div layout="column">
4 3 <md-content layout-padding="" layout="column" style="overflow:hidden">
5 4