diff --git a/home.html b/home.html index 61e7f27..37531c3 100644 --- a/home.html +++ b/home.html @@ -12,44 +12,66 @@ Flashy
- - +
  • Add Class
  • +
  • Study
  • +
  • Logout
  • + --> +
    -
    + + +
    -
    + + + diff --git a/scripts/ClassAddController.js b/scripts/ClassAddController.js index 1454668..a0d69f6 100644 --- a/scripts/ClassAddController.js +++ b/scripts/ClassAddController.js @@ -2,6 +2,7 @@ angular.module('flashy.ClassAddController', ['ui.router', 'ngMaterial']). controller('ClassAddController', ['$scope', '$state', '$http', function($scope, $state, $http) { + $scope.trySearch = function(searchText) { return $http.get('/api/sections/search/', { params: { diff --git a/scripts/FeedController.js b/scripts/FeedController.js index 41c63a0..3f7833d 100644 --- a/scripts/FeedController.js +++ b/scripts/FeedController.js @@ -1,6 +1,9 @@ angular.module('flashy.FeedController', ['ui.router']). - controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function($scope, $stateParams, $state, $http) { + controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function ($scope, $stateParams, $state, $http) { + + + console.log('Hello from feed'); sectionId = $stateParams.sectionId; $scope.cards = []; diff --git a/styles/flashy.css b/styles/flashy.css index f8deaf2..30f5b30 100644 --- a/styles/flashy.css +++ b/styles/flashy.css @@ -42,7 +42,7 @@ margin-right: 0; } -ul.side-nav.fixed li { +/*ul.side-nav.fixed li { font-size: 24px; } @@ -55,7 +55,7 @@ ul.side-nav.fixed li a.class { ul.side-nav.fixed li a { font-size: 24px; -} +}*/ /* Flashcard directive css */ .card { @@ -247,6 +247,6 @@ html { display: none !important; } -#sidenav-overlay { +/*#sidenav-overlay { background-color: rgba(0, 0, 0, 0) !important; -} +}*/ diff --git a/templates/addclass.html b/templates/addclass.html index caf69e7..b38c73a 100644 --- a/templates/addclass.html +++ b/templates/addclass.html @@ -1,5 +1,4 @@
    -