Commit 4da3dd30319c3c5e9401658414737bab2c0c84a2
1 parent
0c77c1b84f
Exists in
master
and in
1 other branch
Tried unbreaking frontend. Set up gjslint. Damn it's strict
Showing 8 changed files with 53 additions and 154 deletions Inline Diff
config.js
View file @
4da3dd3
angular.module('flashy', ['flashy.controller', 'ngCookies']) | 1 | 1 | angular.module('flashy', [ | |
2 | 2 | 'flashy.LogoutController', | ||
.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider', | 3 | 3 | 'flashy.LoginController', | |
4 | 'flashy.HomeController', | |||
5 | 'flashy.FeedController', | |||
6 | 'ngCookies']). | |||
7 | config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider', | |||
function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) { | 4 | 8 | function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) { | |
9 | "use strict"; | |||
10 | $httpProvider.defaults.withCredentials = true; | |||
11 | $httpProvider.defaults.xsrfCookieName = 'csrftoken'; | |||
12 | $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken'; | |||
$locationProvider.html5Mode(true); | 5 | 13 | $locationProvider.html5Mode(true); | |
6 | ||||
7 | ||||
$urlRouterProvider.otherwise('/home'); | 8 | 14 | $urlRouterProvider.otherwise('/home'); | |
9 | ||||
$stateProvider. | 10 | 15 | $stateProvider. | |
state('home', { | 11 | 16 | state('home', { | |
url: '/home', | 12 | 17 | url: '/home', | |
templateUrl: 'home.html', | 13 | 18 | templateUrl: 'home.html', | |
controller: 'HomeController' | 14 | 19 | controller: 'HomeController' | |
}). | 15 | 20 | }). | |
state('login', { | 16 | 21 | state('login', { | |
url: '/login', | 17 | 22 | url: '/login', | |
templateUrl: 'templates/login_form.html', | 18 | 23 | templateUrl: 'templates/login_form.html', | |
controller: 'LoginController' | 19 | 24 | controller: 'LoginController' | |
}). | 20 | 25 | }). | |
state('logout', { | 21 | 26 | state('logout', { | |
url: '/logout', | 22 | 27 | url: '/logout', | |
templateUrl: 'templates/logout.html', | 23 | 28 | templateUrl: 'templates/logout.html', | |
controller: 'LogoutController' | 24 | 29 | controller: 'LogoutController' | |
}). | 25 | 30 | }). | |
state('dashboard', { | 26 | 31 | state('dashboard', { | |
url: '/dashboard', | 27 | 32 | url: '/dashboard', | |
templateUrl: 'templates/dashboard.html', | 28 | 33 | templateUrl: 'templates/dashboard.html', | |
controller: 'DashboardController' | 29 | 34 | controller: 'DashboardController' | |
}). | 30 | 35 | }). | |
state('dashboard.feed', { | 31 | 36 | state('feed', { | |
url: '/feed', | 32 | 37 | url: '/feed', | |
templateUrl: 'templates/feed.html', | 33 | 38 | templateUrl: 'templates/feed.html', | |
controller: 'FeedController' | 34 | 39 | controller: 'FeedController' | |
}) | 35 | 40 | }); | |
36 | 41 | |||
}]).run(function run($http, $cookies) { | 37 | 42 | }]); | |
console.log($cookies.csrftoken); | 38 | |||
$.getJSON('https://flashy.cards/api/sections/') | 39 | |||
$http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken; | 40 | |||
}); | 41 | |||
42 | 43 |
gjslint.conf
View file @
4da3dd3
File was created | 1 | --strict | ||
2 | --summary |
scripts/FeedController.js
View file @
4da3dd3
angular.module('flashy.controllers', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider', | 1 | 1 | angular.module('flashy.FeedController', ['ui.router']). | |
function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) { | 2 | |||
$httpProvider.defaults.withCredentials = true; | 3 | |||
$httpProvider.defaults.xsrfCookieName = 'csrftoken'; | 4 | |||
$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken'; | 5 | |||
} | 6 | |||
]). | 7 | |||
8 | 2 | |||
controller("FeedController", ['$scope', '$state', function ($scope, $state) { | 9 | 3 | controller('FeedController', ['$scope', '$state', function($scope, $state) { | |
console.log("Hello from feed"); | 10 | 4 | console.log('Hello from feed'); | |
}]); | 11 | 5 | }]); | |
12 | 6 | |||
scripts/HomeController.js
View file @
4da3dd3
angular.module('flashy.controllers', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider', | 1 | 1 | angular.module('flashy.HomeController', ['ui.router']). | |
function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) { | 2 | |||
$httpProvider.defaults.withCredentials = true; | 3 | |||
$httpProvider.defaults.xsrfCookieName = 'csrftoken'; | 4 | |||
$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken'; | 5 | |||
} | 6 | |||
]). | 7 | |||
8 | 2 | |||
controller("HomeController", ['$scope', '$state', function ($scope, $state) { | 9 | 3 | controller('HomeController', ['$scope', '$state', function($scope, $state) { | |
$state.go('login'); | 10 | 4 | $state.go('login'); | |
}]); | 11 | 5 | }]); | |
12 | 6 | |||
scripts/LoginController.js
View file @
4da3dd3
angular.module('flashy.controllers', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider', | 1 | 1 | angular.module('flashy.LoginController', ['ui.router']). | |
function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) { | 2 | 2 | controller('LoginController', ['$scope', '$state', '$http', | |
$httpProvider.defaults.withCredentials = true; | 3 | 3 | function($scope, $state, $http) { | |
$httpProvider.defaults.xsrfCookieName = 'csrftoken'; | 4 | 4 | 'use strict'; | |
$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken'; | 5 | 5 | $scope.login = function(email, password) { | |
} | 6 | 6 | $http.post('/api/login', JSON.stringify({ | |
]). | 7 | 7 | 'email': email, | |
8 | 8 | 'password': password | ||
controller('LoginController', ['$scope', '$state', '$http', function ($scope, $state, $http) { | 9 | 9 | })).success(function(data) { | |
$.ajaxPrefilter(function (options, originalOptions, jqXHR) { | 10 | 10 | $state.go('feed'); | |
options.crossDomain = { | 11 | 11 | console.log(data); | |
crossDomain: true | 12 | 12 | }); | |
}; | 13 | 13 | }; | |
options.xhrFields = { | 14 | 14 | $scope.register = function(email, password) { | |
withCredentials: true | 15 | 15 | $http.post('/api/users/me', JSON.stringify({ | |
}; | 16 | 16 | 'email': email, | |
}); | 17 | 17 | 'password': password | |
18 | 18 | })).success(function(data) { | ||
$scope.signUp = function (email, password) { | 19 | 19 | $state.go('feed'); | |
$http.post('https://flashy.cards/api/users/me', JSON.stringify({ | 20 | 20 | console.log(data); | |
"email": email, | 21 | 21 | }); | |
"password": password | 22 | 22 | }; | |
})).success(function (data) { | 23 | 23 | }]); | |
$state.go('dashboard'); | 24 | |||
console.log(data); | 25 | |||
}); | 26 | |||
27 | ||||
}; | 28 | |||
29 | ||||
$scope.login = function (email, password) { | 30 | |||
$http.post('https://flashy.cards/api/login', JSON.stringify({ | 31 | |||
"email": email, | 32 | |||
"password": password | 33 | |||
})).success(function (data) { | 34 | |||
$state.go('dashboard'); | 35 | |||
console.log(data); | 36 | |||
}); | 37 | |||
}; | 38 | |||
39 | ||||
40 | ||||
}]); | 41 | |||
42 | 24 | |||
scripts/LogoutController.js
View file @
4da3dd3
angular.module('flashy.controllers', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider', | 1 | 1 | angular.module('flashy.LogoutController', ['ui.router']). | |
function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) { | 2 | |||
$httpProvider.defaults.withCredentials = true; | 3 | |||
$httpProvider.defaults.xsrfCookieName = 'csrftoken'; | 4 | |||
$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken'; | 5 | |||
} | 6 | |||
]). | 7 | |||
8 | 2 | |||
controller("LogoutController", ['$scope', '$state', '$http', function ($s | 9 | 3 | controller('LogoutController', ['$scope', '$state', '$http', function($scope, $state, $http) { | |
$http.post('https://flashy.cards/api/logout').success(function () { | 10 | 4 | $http.post('/api/logout').success(function() { | |
$state.go('home'); | 11 | 5 | $state.go('home'); | |
}); | 12 | 6 | }); | |
}]); | 13 | 7 | }]); | |
14 | 8 | |||
scripts/controller.js
View file @
4da3dd3
var app = angular.module('flashy.controller', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider', | 1 | File was deleted | ||
function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) { | 2 | |||
$httpProvider.defaults.withCredentials = true; | 3 | |||
$httpProvider.defaults.xsrfCookieName = 'csrftoken'; | 4 | |||
$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken'; | 5 | |||
}]); | 6 | |||
7 | ||||
8 | ||||
app.controller('LoginController', ['$scope', '$state', '$http', function ($scope, $state, $http) { | 9 | |||
$.ajaxPrefilter(function (options, originalOptions, jqXHR) { | 10 | |||
options.crossDomain = { | 11 | |||
crossDomain: true | 12 | |||
}; | 13 | |||
options.xhrFields = { | 14 | |||
withCredentials: true | 15 | |||
}; | 16 | |||
}); | 17 | |||
18 | ||||
$scope.signUp = function (email, password) { | 19 | |||
$http.post('https://flashy.cards/api/users/me', JSON.stringify({ | 20 | |||
"email": email, | 21 | |||
"password": password | 22 | |||
})).success(function (data) { | 23 | |||
$state.go('dashboard'); | 24 | |||
console.log(data); | 25 | |||
}); | 26 | |||
27 | ||||
}; | 28 | |||
29 | ||||
$scope.login = function (email, password) { | 30 | |||
$http.post('https://flashy.cards/api/login', JSON.stringify({ | 31 | |||
"email": email, | 32 | |||
"password": password | 33 | |||
})).success(function (data) { | 34 | |||
$state.go('dashboard'); | 35 | |||
console.log(data); | 36 | |||
}); | 37 | |||
}; | 38 | |||
39 | ||||
40 | ||||
}]); | 41 | |||
42 | ||||
43 | ||||
app.controller("HomeController", ['$scope', '$state', function ($scope, $state) { | 44 | |||
$state.go('login'); | 45 | |||
}]); | 46 | |||
47 | ||||
app.controller("FeedController", ['$scope', '$state', function ($scope, $state) { | 48 | |||
console.log("Hello from feed"); | 49 |
templates/login_form.html
View file @
4da3dd3
<div class="container"> | 1 | 1 | <div class="container"> | |
<form id="loginform"> | 2 | 2 | <form id="loginform"> | |
<h1 class="text-success heading">Please Log In</h1> | 3 | 3 | <h1 class="text-success heading">Please Log In</h1> | |
<blockquote class="pull-left"> | 4 | 4 | <blockquote class="pull-left"> | |
<p>The System shall enlighten you.</p> | 5 | 5 | <p>The System shall enlighten you.</p> | |
<small>SWAG</small> | 6 | 6 | <small>SWAG</small> | |
</blockquote> | 7 | 7 | </blockquote> | |
<div> | 8 | 8 | <div> | |
<input type="email" class="form-control" ng-model="loginEmail" placeholder="Email"/> | 9 | 9 | <input type="email" class="form-control" ng-model="loginEmail" placeholder="Email"/> | |
</div> | 10 | 10 | </div> | |
<div class="form-group"> | 11 | 11 | <div class="form-group"> | |
<input type="password" class="form-control" ng-model="loginPassword" placeholder="Password"/> | 12 | 12 | <input type="password" class="form-control" ng-model="loginPassword" placeholder="Password"/> | |
</div> | 13 | 13 | </div> | |
<input type="submit" class="btn btn-primary" ng-click="login(loginEmail, loginPassword)" value="LOGIN"/> | 14 | 14 | <input type="submit" class="btn btn-primary" ng-click="login(loginEmail, loginPassword)" value="LOGIN"/> | |
<input type="submit" class="btn btn-primary" ng-click="signUp(loginEmail, loginPassword)" value="REGISTER"/> | 15 | 15 | <input type="submit" class="btn btn-primary" ng-click="register(loginEmail, loginPassword)" value="REGISTER"/> | |
</form> | 16 | 16 | </form> | |
</div> | 17 | 17 | </div> | |