From a91430c6395cf6470b82436cb4fbe22c97e19e9a Mon Sep 17 00:00:00 2001 From: rwuebker Date: Mon, 2 Feb 2015 16:17:34 -0800 Subject: [PATCH 1/2] committing about page --- client/app/src/img/github.png | Bin 0 -> 8949 bytes client/app/src/js/app.js | 5 ++++ client/app/src/js/controllers/auth.js | 2 ++ client/app/src/js/controllers/nav.js | 8 ++++-- client/app/src/views/about.html | 36 ++++++++++++++++++++++++++ server/views/_partials/header.jade | 4 +++ 6 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 client/app/src/img/github.png create mode 100644 client/app/src/views/about.html diff --git a/client/app/src/img/github.png b/client/app/src/img/github.png new file mode 100644 index 0000000000000000000000000000000000000000..89bc8607657e6075c0ee15cbd90ac2e4f248112f GIT binary patch literal 8949 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 J^~Nmte*j7Vdno__ literal 0 HcmV?d00001 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..b15a8a0 --- /dev/null +++ b/client/app/src/views/about.html @@ -0,0 +1,36 @@ + +

About Archivr

+

Archivr was created for developer, designers or just everyday fans of the world wide webs. With Archivr you can capture screenshots of your favorite websites, then annotate them with your own notes.

+

Creators

+ + +
+
+
    +
  • +

    Jackson Hoose

    + + github octocat + +
    • +
  • +

    Ruben Gonzalez

    + + github octocat + +
    • +
  • +

    Andrew Smith

    + + github octocat + +
    • +
  • +

    Rick Wuebker

    + + github octocat + +
    • +
+
+
diff --git a/server/views/_partials/header.jade b/server/views/_partials/header.jade index 123bb64..6714c26 100644 --- a/server/views/_partials/header.jade +++ b/server/views/_partials/header.jade @@ -15,5 +15,9 @@ header(role="header" id="header" ng-controller="NavController as NavCtrl") a(href="/signup") Signup li(ng-show="NavCtrl.loggedIn") a(href="#" ng-click="NavCtrl.logout()") Logout + li + a(ui-sref="about") About + li(ng-show="NavCtrl.loggedIn") + a(href="#" ng-click="NavCtrl.goToMyScreenshots()") My Archivs From 36559bd2fcefeacc9f3cffff6c228e2b0ffaab93 Mon Sep 17 00:00:00 2001 From: rwuebker Date: Mon, 2 Feb 2015 16:47:04 -0800 Subject: [PATCH 2/2] added quote --- client/app/src/views/about.html | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/client/app/src/views/about.html b/client/app/src/views/about.html index b15a8a0..c527e17 100644 --- a/client/app/src/views/about.html +++ b/client/app/src/views/about.html @@ -1,6 +1,14 @@

About Archivr

-

Archivr was created for developer, designers or just everyday fans of the world wide webs. With Archivr you can capture screenshots of your favorite websites, then annotate them with your own notes.

+

Archivr was created for developers, designers and everyday fans of the world wide webs. With Archivr you can capture screenshots of your favorite websites, then annotate them with your own notes.

+
+

+

"Archivr made all of my archiving and annotating dreams come true."

+

+

+

- Bryan Venable, Software Engineer

+ +

Creators

@@ -8,24 +16,28 @@

Creators

  • + Jackson Hoose

    Jackson Hoose

    github octocat
  • + Ruben Gonzalez

    Ruben Gonzalez

    github octocat
  • + Andrew Smith

    Andrew Smith

    github octocat
  • + Rick Wuebker

    Rick Wuebker

    github octocat