Commit ad12ea2cddda7b0e36269ee192479827196c4b0f

Authored by Andrew Buss
1 parent f71cb843b1

progress bar on feed

Showing 3 changed files with 16 additions and 9 deletions Side-by-side Diff

... ... @@ -15,8 +15,9 @@
15 15 <body ng-controller="RootController">
16 16 <header>
17 17 <nav>
18   - <div class="nav-wrapper">
19   - <a ng-show="UserService.isLoggedIn()" href="#" data-activates="mobile-demo" class="left button-collapse hide-on-med-and-up"><i
  18 + <div class="nav-wrapper" ng-cloak>
  19 + <a ng-show="UserService.isLoggedIn()" href="#" data-activates="mobile-demo"
  20 + class="left button-collapse hide-on-med-and-up"><i
20 21 class="mdi-navigation-menu"></i></a>
21 22 <ul ng-show="currentSection.id && UserService.isLoggedIn()" class="left hide-on-small-and-down">
22 23 <li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped"
... ... @@ -98,8 +99,8 @@
98 99 <footer class="page-footer">
99 100 <div class="footer-copyright">
100 101 <div class="container">
101   - © 2015 Team Swag
102   - <a class="grey-text text-lighten-4 right" href="mailto:halp@flashy.cards">Concerns? Contact us by email</a>!
  102 + &copy; 2015 Team Swag
  103 + <a class="grey-text text-lighten-4 right" href="mailto:halp@flashy.cards">Concerns? Contact us by email!</a>
103 104 </div>
104 105 </div>
105 106 </footer>
scripts/FeedController.js View file @ ad12ea2
... ... @@ -3,7 +3,7 @@
3 3 console.log('Hello from feed');
4 4 sectionId = $stateParams.sectionId;
5 5 $rootScope.currentSection = $rootScope.SectionResource.get({sectionId: sectionId});
6   - $scope.cards = [];
  6 + $scope.cards = false;
7 7  
8 8 var loc = window.location, new_uri;
9 9 if (loc.protocol === 'https:') {
templates/feed.html View file @ ad12ea2
1 1 <div class="row">
  2 + <h2 ng-cloak ng-show="cards.length == 0">No cards. Be the first one to add a card!</h2>
  3 +
  4 + <div class="progress center-align" style="margin: 32px auto auto;width:50%;" ng-show="!cards">
  5 + <div class="indeterminate"></div>
  6 + </div>
2 7 <div ng-repeat="card in cards">
3 8 <flashcard flashcard-obj="card" refresh="refreshCards()"/>
4 9 </div>
5 10 </div>
6 11  
7   -<h2 ng-show="cards.length == 0">No cards. Be the first one to add a card!</h2>
8 12  
9 13 <!--Lil plus button in corner-->
10 14 <div class="fixed-action-btn" style="bottom: 96px; right: 24px;">
11   - <a data-target="newCard" class="btn-floating btn-large modal-trigger tooltipped" href="#newCard" data-position="left" data-delay="50"
12   - data-tooltip="(C)ompose">
  15 + <a data-target="newCard" class="btn-floating btn-large modal-trigger tooltipped" href="#newCard" data-position="left"
  16 + data-delay="50"
  17 + data-tooltip="(C)ompose">
13 18 <i class="large mdi-content-add"></i>
14 19 </a>
15 20 </div>
... ... @@ -25,7 +30,8 @@
25 30 </div>
26 31 </div>
27 32 <div class="modal-footer">
28   - <button class="btn modal-close tooltipped" type="submit" ng-click="pushCard()" data-position="left" data-delay="50"
  33 + <button class="btn modal-close tooltipped" type="submit" ng-click="pushCard()" data-position="left"
  34 + data-delay="50"
29 35 data-tooltip="Enter">Submit
30 36 <i class="mdi-hardware-keyboard-return right"></i>
31 37 </button>