110swag / flashy-frontend

Download as
Browse Code ยป

Commit 6181c34f4cf869f3968f1181029a47c11e7c8c5a

Authored by Tetranoir
2 parents f29eea44a1 8607c44bb6
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

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

Showing 6 changed files Side-by-side Diff

config.js View file @ 6181c34
... ... @@ -6,8 +6,10 @@
6 6 'flashy.DeckController',
7 7 'flashy.ClassAddController',
8 8 'flashy.RequestResetController',
  9 + 'flashy.ReviewController',
9 10 'flashy.UserService',
10   - 'flashy.ResetPasswordController',
  11 + 'flashy.FlashcardDirective',
  12 + 'flashy.ResetPasswordController',
11 13 'ngCookies']).
12 14 config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
13 15 '$locationProvider',
... ... @@ -48,6 +50,16 @@
48 50 url: '/deck',
49 51 templateUrl: 'templates/deck.html',
50 52 controller: 'DeckController'
  53 + }).
  54 + state('review', {
  55 + url: '/review',
  56 + templateUrl: 'templates/review.html',
  57 + controller: 'ReviewController'
  58 + }).
  59 + state('flashcard', {
  60 + url: '/flashcard',
  61 + templateUrl: 'templates/flashcard.html',
  62 + controller: 'FlashcardController'
51 63 }).
52 64 state('requestpasswordreset', {
53 65 url: '/requestpasswordreset',
home.html View file @ 6181c34
... ... @@ -27,6 +27,7 @@
27 27  
28 28 <script src="config.js"></script>
29 29  
  30 +<!-- Controllers -->
30 31 <script src="scripts/FeedController.js"></script>
31 32 <script src="scripts/RootController.js"></script>
32 33 <script src="scripts/LoginController.js"></script>
... ... @@ -34,6 +35,15 @@
34 35 <script src="scripts/DeckController.js"></script>
35 36 <script src="scripts/RequestResetController.js"></script>
36 37 <script src="scripts/ClassAddController.js"></script>
  38 +<script src="scripts/ReviewController.js"></script>
  39 +
  40 +<!-- Services -->
  41 +<script src="scripts/UserService.js"></script>
  42 +
  43 +<!-- Directives -->
  44 +<script src="scripts/FlashcardDirective.js"></script>
  45 +
  46 +<!-- Other -->
37 47 <!--<script src="scripts/StudyController.js"></script>-->
38 48 <script src="scripts/UserService.js"></script>
39 49 <script src="scripts/ResetPasswordController.js"></script>
scripts/FlashcardDirective.js View file @ 6181c34
  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 + };
  11 +});
scripts/ReviewController.js View file @ 6181c34
  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 + }
  7 +]);
templates/flashcard.html View file @ 6181c34
  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 @ 6181c34
  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>