Commit ff1a1f0f52f19d173d64958787f29311766c0a79
Exists in
master
and in
1 other branch
Merge branch 'master' of https://git.ucsd.edu/110swag/flashy-frontend
Showing 2 changed files Inline Diff
home.html
View file @
ff1a1f0
<!DOCTYPE html> | 1 | 1 | <!DOCTYPE html> | |
<html ng-app="flashy"> | 2 | 2 | <html ng-app="flashy"> | |
<base href="/app/"> | 3 | 3 | <base href="/app/"> | |
<head> | 4 | 4 | <head> | |
<link type="text/css" rel="stylesheet" href="styles/materialize.min.css" | 5 | 5 | <link type="text/css" rel="stylesheet" href="styles/materialize.min.css" | |
media="screen,projection"/> | 6 | 6 | media="screen,projection"/> | |
<!--<link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css"/>--> | 7 | 7 | <!--<link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css"/>--> | |
<link rel="stylesheet" | 8 | 8 | <link rel="stylesheet" | |
href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css"> | 9 | 9 | href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css"> | |
10 | 10 | |||
<link rel="stylesheet" href="flashy.css"/> | 11 | 11 | <link rel="stylesheet" href="flashy.css"/> | |
</head> | 12 | 12 | </head> | |
13 | 13 | |||
<body ng-controller="RootController"> | 14 | 14 | <body ng-controller="RootController"> | |
15 | 15 | |||
<ul id="slide-out" ng-show="isLoggedIn" class="side-nav fixed"> | 16 | 16 | <ul id="slide-out" ng-show="isLoggedIn" class="side-nav fixed"> | |
<li class="logo"><a href="//flashy.cards/" id="logo-container"> | 17 | 17 | <li class="logo"><a href="//flashy.cards/" id="logo-container"> | |
18 | 18 | |||
<h1>Flashy</h1> | 19 | 19 | <h1>Flashy</h1> | |
</a></li> | 20 | 20 | </a></li> | |
<li class="bold"> | 21 | 21 | <li class="bold"> | |
<a>Classes:</a></li> | 22 | 22 | <a>Classes:</a></li> | |
<div ng-repeat="section in sections"> | 23 | 23 | <div ng-repeat="section in sections"> | |
<li class="bold class"><a ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a></li> | 24 | 24 | <li class="bold class"><a ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a></li> | |
</div> | 25 | 25 | </div> | |
<li class="bold"><a ui-sref="addclass">Add Class</a></li> | 26 | 26 | <li class="bold"><a ui-sref="addclass">Add Class</a></li> | |
<li class="bold"><a ui-sref="study">Study</a></li> | 27 | 27 | <li class="bold"><a ui-sref="study">Study</a></li> | |
<li class="bold"><a ui-sref="logout">Logout</a></li> | 28 | 28 | <li class="bold"><a ui-sref="logout">Logout</a></li> | |
</ul> | 29 | 29 | </ul> | |
30 | <a href="#slide-out" data-activates="slide-out" class="button-collapse"><i class="mdi-navigation-menu"></i></a> | |||
30 | 31 | |||
31 | 32 | |||
<div class="container" ui-view></div> | 32 | 33 | <div class="container" ui-view></div> | |
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script> | 33 | 34 | <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script> | |
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script> | 34 | 35 | <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script> | |
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script> | 35 | 36 | <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script> | |
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script> | 36 | 37 | <script src="//code.jquery.com/jquery-2.1.4.min.js"></script> | |
<script type="text/javascript" src="scripts/materialize.min.js"></script> | 37 | 38 | <script type="text/javascript" src="scripts/materialize.min.js"></script> | |
<script type="text/javascript" src="scripts/jquery.collapsible.js"></script> | 38 | 39 | <script type="text/javascript" src="scripts/jquery.collapsible.js"></script> | |
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.js"></script> | 39 | 40 | <script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.js"></script> | |
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.min.js"></script> | 40 | 41 | <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.min.js"></script> | |
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-aria.min.js"></script> | 41 | 42 | <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-aria.min.js"></script> | |
42 | 43 | |||
<script src="config.js"></script> | 43 | 44 | <script src="config.js"></script> | |
44 | 45 | |||
<!-- Controllers --> | 45 | 46 | <!-- Controllers --> | |
<script src="scripts/FeedController.js"></script> | 46 | 47 | <script src="scripts/FeedController.js"></script> | |
<script src="scripts/RootController.js"></script> | 47 | 48 | <script src="scripts/RootController.js"></script> | |
<script src="scripts/LoginController.js"></script> | 48 | 49 | <script src="scripts/LoginController.js"></script> | |
<script src="scripts/LogoutController.js"></script> | 49 | 50 | <script src="scripts/LogoutController.js"></script> | |
<script src="scripts/DeckController.js"></script> | 50 | 51 | <script src="scripts/DeckController.js"></script> | |
<script src="scripts/RequestResetController.js"></script> | 51 | 52 | <script src="scripts/RequestResetController.js"></script> | |
<script src="scripts/ClassAddController.js"></script> | 52 | 53 | <script src="scripts/ClassAddController.js"></script> | |
<script src="scripts/StudyController.js"></script> | 53 | 54 | <script src="scripts/StudyController.js"></script> | |
<script src="scripts/ResetPasswordController.js"></script> | 54 | 55 | <script src="scripts/ResetPasswordController.js"></script> | |
<script src="scripts/VerifyEmailController.js"></script> | 55 | 56 | <script src="scripts/VerifyEmailController.js"></script> | |
<!--<script src="scripts/SidebarController.js"></script>--> | 56 | 57 | <!--<script src="scripts/SidebarController.js"></script>--> |
scripts/RootController.js
View file @
ff1a1f0
angular.module('flashy.RootController', ['ui.router']). | 1 | 1 | angular.module('flashy.RootController', ['ui.router']). | |
2 | 2 | |||
controller('RootController', ['$rootScope', '$scope', '$state', 'UserService', function($rootScope, $scope, $state, UserService) { | 3 | 3 | controller('RootController', ['$rootScope', '$scope', '$state', 'UserService', function($rootScope, $scope, $state, UserService) { | |
//UserService.getUserData(); | 4 | 4 | //UserService.getUserData(); | |
//$('#top').collapsible('accordion'); | 5 | 5 | //$('#top').collapsible('accordion'); | |
if (UserService.isLoggedIn()) $state.go('login'); | 6 | 6 | if (UserService.isLoggedIn()) $state.go('login'); | |
else $state.go('addclass'); | 7 | 7 | else $state.go('addclass'); | |
$rootScope.isLoggedIn = false; | 8 | 8 | $rootScope.isLoggedIn = false; | |
console.log(UserService._user); | 9 | 9 | console.log(UserService._user); | |
UserService.getUserData().then(function(data) { | 10 | 10 | UserService.getUserData().then(function(data) { | |
console.log(data); | 11 | 11 | console.log(data); | |
$rootScope.user = data; | 12 | 12 | $rootScope.user = data; | |
}); | 13 | 13 | }); | |
14 | ||||
15 | $('.button-collapse').sideNav({ | |||
16 | menuWidth: 300, // Default is 240 | |||
17 | edge: 'right', // Choose the horizontal origin | |||
18 | closeOnClick: true // Closes side-nav on <a> clicks, useful for Angular/Meteor | |||
19 | } | |||
20 | ); |