diff --git a/client/app/src/img/github.png b/client/app/src/img/github.png new file mode 100644 index 0000000..89bc860 Binary files /dev/null and b/client/app/src/img/github.png differ diff --git a/client/app/src/js/app.js b/client/app/src/js/app.js index de7d951..7e8df55 100644 --- a/client/app/src/js/app.js +++ b/client/app/src/js/app.js @@ -119,6 +119,11 @@ function config($urlRouterProvider, $stateProvider, $locationProvider, $httpProv templateUrl: '/views/logout.html', controller: 'AuthController', controllerAs: 'authCtrl' + }) + + .state('about', { + url: '/about', + templateUrl: '/views/about.html' }); // default uncaught routes to landing page diff --git a/client/app/src/js/controllers/auth.js b/client/app/src/js/controllers/auth.js index eeaeb9d..4a9d3ce 100644 --- a/client/app/src/js/controllers/auth.js +++ b/client/app/src/js/controllers/auth.js @@ -18,6 +18,8 @@ function AuthController($window, $location, Auth, User) { }); }; + + this.signup = function(user, pass) { Auth.signup({ username: user, diff --git a/client/app/src/js/controllers/nav.js b/client/app/src/js/controllers/nav.js index 87bdbc8..5506a45 100644 --- a/client/app/src/js/controllers/nav.js +++ b/client/app/src/js/controllers/nav.js @@ -3,7 +3,7 @@ * ==================== * Handles control across the navigation bar */ -function NavController($rootScope, Auth) { +function NavController($rootScope, Auth, User, $location) { this.loggedIn = $rootScope.Authenticated; @@ -20,8 +20,12 @@ function NavController($rootScope, Auth) { Auth.signout(); }; + this.goToMyScreenshots = function(){ + $location.path('/users/' + User.getUser().username + '/screenshots'); + }; + } -NavController.$inject = ['$rootScope', 'Auth']; +NavController.$inject = ['$rootScope', 'Auth', 'User', '$location']; angular.module('Archivr.nav', [ 'Archivr.services.User', diff --git a/client/app/src/views/about.html b/client/app/src/views/about.html new file mode 100644 index 0000000..c527e17 --- /dev/null +++ b/client/app/src/views/about.html @@ -0,0 +1,48 @@ + +