110swag / flashy-frontend

Download as
Browse Code ยป

Commit c317a9f1d7cda193ff1f27cfc9ae70e250a2bdf8

Authored by Rachel Lee
2 parents 81235cb848 57d997404b
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

Merge branch 'master' of https://git.ucsd.edu/110swag/flashy-frontend

Showing 4 changed files Side-by-side Diff

config.js View file @ c317a9f
... ... @@ -61,7 +61,7 @@
61 61 }).
62 62 state('deck', {
63 63 resolve: auth_resolve,
64   - url: '/deck',
  64 + url: '/deck/{sectionId}',
65 65 templateUrl: 'templates/deck.html',
66 66 controller: 'DeckController'
67 67 }).
flashy.css View file @ c317a9f
... ... @@ -47,6 +47,10 @@
47 47 font-size:24px;
48 48 }
49 49  
  50 +ul.side-nav.fixed li.class a{
  51 + font-size:24px;
  52 + height: 36px;
  53 +}
50 54  
51 55 ul.side-nav.fixed li ul li {
52 56 /*line-height: 30px;*/
home.html View file @ c317a9f
... ... @@ -15,20 +15,16 @@
15 15  
16 16 <ul id="slide-out" ng-show="isLoggedIn" class="side-nav fixed">
17 17 <li class="logo"><a href="//flashy.cards/" id="logo-container">
  18 +
18 19 <h1>Flashy</h1>
19 20 </a></li>
20 21 <li class="bold">
21   - <a>Classes</a>
22   - <!--<a ui-sref="addclass"><i class="mdi-content-add"></i></a>-->
23   - </li>
24   - <li>
25   - <ul ng-repeat="section in sections">
26   - <li ui-sref="feed({{section.id}})">{{section.short_name}} </li>
27   - </ul>
28   - </li>
  22 + <a>Classes:</a></li>
  23 + <div ng-repeat="section in sections">
  24 + <li class="bold class"><a ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a></li>
  25 + </div>
29 26 <li class="bold"><a ui-sref="addclass">Add Class</a></li>
30   - <li class="bold"><a ui-sref="feed">Feed</a></li>
31   - <li class="bold"><a ui-sref="deck">Deck</a></li>
  27 + <li class="bold"><a ui-sref="study">Study</a></li>
32 28 <li class="bold"><a ui-sref="logout">Logout</a></li>
33 29 </ul>
34 30  
scripts/FeedController.js View file @ c317a9f
... ... @@ -20,7 +20,7 @@
20 20 });
21 21  
22 22 $scope.viewDeck = function() {
23   - $state.go('deck');
  23 + $state.go('deck', {sectionId: sectionId});
24 24 console.log('go to deck');
25 25 };
26 26