Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added client/app/src/img/github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions client/app/src/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions client/app/src/js/controllers/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ function AuthController($window, $location, Auth, User) {
});
};



this.signup = function(user, pass) {
Auth.signup({
username: user,
Expand Down
8 changes: 6 additions & 2 deletions client/app/src/js/controllers/nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* ====================
* Handles control across the navigation bar
*/
function NavController($rootScope, Auth) {
function NavController($rootScope, Auth, User, $location) {

this.loggedIn = $rootScope.Authenticated;

Expand All @@ -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',
Expand Down
48 changes: 48 additions & 0 deletions client/app/src/views/about.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@

<h1>About Archivr</h1>
<h4><em>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.</em></h4>
<div class="row" style="margin:auto;">
<h2 class="col-md-3"><h2>
<h2 class="col-md-6" style="font-family:brush script mt;">"Archivr made all of my archiving and annotating dreams come true."</h2>
<h2 class="col-md-3"><h2>
</div>
<h2 style="font-family:brush script mt;text-align:center">- Bryan Venable, Software Engineer</h2>


<h1>Creators</h1>


<div class="row">
<div class="col-md-12">
<ul class="list-unstyled">
<li class="col-xs-6 col-md-3" style="text-align:center">
<img src="img/jh.jpeg" alt="Jackson Hoose"/>
<h3>Jackson Hoose</h3>
<a href="http://github.com/jacksonhoose">
<img src="img/github.png" alt="github octocat"/>
</a>
</li>
<li class="col-xs-6 col-md-3" style="text-align:center">
<img src="img/rg.jpeg" alt="Ruben Gonzalez"/>
<h3>Ruben Gonzalez</h3>
<a href="http://github.com/ruben1">
<img src="img/github.png" alt="github octocat"/>
</a>
</li>
<li class="col-xs-6 col-md-3" style="text-align:center">
<img src="img/as.jpeg" alt="Andrew Smith"/>
<h3>Andrew Smith</h3>
<a href="http://github.com/andrewsouthpaw">
<img src="img/github.png" alt="github octocat"/>
</a>
</li>
<li class="col-xs-6 col-md-3" style="text-align:center">
<img src="img/rw.jpeg" alt="Rick Wuebker"/>
<h3>Rick Wuebker</h3>
<a href="http://github.com/rwuebker">
<img src="img/github.png" alt="github octocat"/>
</a>
</li>
</ul>
</div>
</div>
4 changes: 4 additions & 0 deletions server/views/_partials/header.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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