Commit 8e8058a82f83e4b4d31a49a03b6cf50e41282c7d

Authored by Rachel Lee
1 parent 80d1e57aa5

Working on flashcard directive

Showing 6 changed files with 66 additions and 1 deletions Inline Diff

angular.module('flashy', [ 1 1 angular.module('flashy', [
'flashy.LogoutController', 2 2 'flashy.LogoutController',
'flashy.LoginController', 3 3 'flashy.LoginController',
'flashy.RootController', 4 4 'flashy.RootController',
'flashy.FeedController', 5 5 'flashy.FeedController',
'flashy.DeckController', 6 6 'flashy.DeckController',
'flashy.ClassAddController', 7 7 'flashy.ClassAddController',
'flashy.RequestResetController', 8 8 'flashy.RequestResetController',
9 'flashy.ReviewController',
'flashy.UserService', 9 10 'flashy.UserService',
11 'flashy.FlashcardDirective',
'ngCookies']). 10 12 'ngCookies']).
config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 11 13 config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$locationProvider', 12 14 '$locationProvider',
function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) { 13 15 function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
'use strict'; 14 16 'use strict';
$httpProvider.defaults.withCredentials = true; 15 17 $httpProvider.defaults.withCredentials = true;
$httpProvider.defaults.xsrfCookieName = 'csrftoken'; 16 18 $httpProvider.defaults.xsrfCookieName = 'csrftoken';
$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken'; 17 19 $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
$locationProvider.html5Mode(true); 18 20 $locationProvider.html5Mode(true);
$urlRouterProvider.otherwise('/home'); 19 21 $urlRouterProvider.otherwise('/home');
$stateProvider. 20 22 $stateProvider.
state('login', { 21 23 state('login', {
url: '/login', 22 24 url: '/login',
templateUrl: 'templates/login.html', 23 25 templateUrl: 'templates/login.html',
controller: 'LoginController' 24 26 controller: 'LoginController'
}). 25 27 }).
state('logout', { 26 28 state('logout', {
url: '/logout', 27 29 url: '/logout',
templateUrl: 'templates/logout.html', 28 30 templateUrl: 'templates/logout.html',
controller: 'LogoutController' 29 31 controller: 'LogoutController'
}). 30 32 }).
state('root', { 31 33 state('root', {
url: '/', 32 34 url: '/',
templateUrl: 'templates/root.html', 33 35 templateUrl: 'templates/root.html',
controller: 'RootController' 34 36 controller: 'RootController'
}). 35 37 }).
state('feed', { 36 38 state('feed', {
url: '/feed', 37 39 url: '/feed',
templateUrl: 'templates/feed.html', 38 40 templateUrl: 'templates/feed.html',
controller: 'FeedController' 39 41 controller: 'FeedController'
}). 40 42 }).
state('addclass', { 41 43 state('addclass', {
url: '/addclass', 42 44 url: '/addclass',
templateUrl: 'templates/addclass.html', 43 45 templateUrl: 'templates/addclass.html',
controller: 'ClassAddController' 44 46 controller: 'ClassAddController'
}). 45 47 }).
state('deck', { 46 48 state('deck', {
url: '/deck', 47 49 url: '/deck',
templateUrl: 'templates/deck.html', 48 50 templateUrl: 'templates/deck.html',
controller: 'DeckController' 49 51 controller: 'DeckController'
52 }).
53 state('review', {
54 url: '/review',
55 templateUrl: 'templates/review.html',
56 controller: 'ReviewController'
57 }).
58 state('flashcard', {
59 url: '/flashcard',
60 templateUrl: 'templates/flashcard.html',
61 controller: 'FlashcardController'
}). 50 62 }).
state('requestpasswordreset', { 51 63 state('requestpasswordreset', {
url: '/requestpasswordreset', 52 64 url: '/requestpasswordreset',
templateUrl: 'templates/requestpasswordreset.html', 53 65 templateUrl: 'templates/requestpasswordreset.html',
controller: 'RequestResetController' 54 66 controller: 'RequestResetController'
}); 55 67 });
56 68
<!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" media="screen,projection"/> 5 5 <link type="text/css" rel="stylesheet" href="styles/materialize.min.css" media="screen,projection"/>
<!--<link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css"/>--> 6 6 <!--<link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css"/>-->
<link rel="stylesheet" href="flashy.css"/> 7 7 <link rel="stylesheet" href="flashy.css"/>
</head> 8 8 </head>
9 9
<body ng-controller="RootController"> 10 10 <body ng-controller="RootController">
11 11
<ul id="nav" class="side-nav fixed"> 12 12 <ul id="nav" class="side-nav fixed">
<li class="bold"><a ui-sref="login">Login</a></li> 13 13 <li class="bold"><a ui-sref="login">Login</a></li>
<li class="bold"><a ui-sref="addclass">Add Class</a></li> 14 14 <li class="bold"><a ui-sref="addclass">Add Class</a></li>
</ul> 15 15 </ul>
<div class="container" ui-view></div> 16 16 <div class="container" ui-view></div>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script> 17 17 <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> 18 18 <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> 19 19 <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> 20 20 <script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="scripts/materialize.min.js"></script> 21 21 <script type="text/javascript" src="scripts/materialize.min.js"></script>
22 22
<script src="config.js"></script> 23 23 <script src="config.js"></script>
24 24
25 <!-- Controllers -->
<script src="scripts/FeedController.js"></script> 25 26 <script src="scripts/FeedController.js"></script>
<script src="scripts/RootController.js"></script> 26 27 <script src="scripts/RootController.js"></script>
<script src="scripts/LoginController.js"></script> 27 28 <script src="scripts/LoginController.js"></script>
<script src="scripts/LogoutController.js"></script> 28 29 <script src="scripts/LogoutController.js"></script>
<script src="scripts/DeckController.js"></script> 29 30 <script src="scripts/DeckController.js"></script>
<script src="scripts/RequestResetController.js"></script> 30 31 <script src="scripts/RequestResetController.js"></script>
<script src="scripts/ClassAddController.js"></script> 31 32 <script src="scripts/ClassAddController.js"></script>
33 <script src="scripts/ReviewController.js"></script>
34
35 <!-- Services -->
<script src="scripts/UserService.js"></script> 32 36 <script src="scripts/UserService.js"></script>
37
38 <!-- Directives -->
39 <script src="scripts/FlashcardDirective.js"></script>
40
41 <!-- Other -->
scripts/FlashcardDirective.js View file @ 8e8058a
File was created 1 angular.module('flashy.FlashcardDirective', []).
2
3 directive('flashcard', function() {
4 return {
5 templateUrl: '/app/templates/flashcard.html',
6 restrict: 'E',
7 link: function() {
8 console.log("HELLO FROM FLASHCARD DIRECTIVE");
9 }
10 };
scripts/ReviewController.js View file @ 8e8058a
File was created 1 angular.module('flashy.ReviewController', ['ui.router']).
2
3 controller('ReviewController', ['$scope', '$state',
4 function($scope, $state) {
5 console.log("hello from review controller");
6 }
templates/flashcard.html View file @ 8e8058a
File was created 1 <div class="row">
2 <div class="col s12 m6">
3 <div class="card">
4 <div class="card-image">
5 <img src="images/sample-1.jpg">
6 <span class="card-title">Card Title</span>
7 </div>
8 <div class="card-content">
9 <p>{{htmlContent}}</p>
10 </div>
11 <div class="card-action">
12 <a href="#">This is a link</a>
13 <a href='#'>This is a link</a>
14 </div>
15 </div>
16 </div>
17 </div>
templates/review.html View file @ 8e8058a
File was created 1 <div class="container">
2 Hello<br>
3 1. Get card from server.<br>
4 2. Show card<br>
5 3. Inputs<br>
6 4. Compare answers<br>
7 5. User decides for correct/incorrect<br>
8 <flashcard>Hello</flashcard>
9 </div>