Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Topic/auth #2

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Topic/auth #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
591a3b6
fixed fonts, added ga tracking, added auth flow for requesting wakes,…
simukka Jul 18, 2014
9314d16
added login/register modal
simukka Jul 21, 2014
1b2f226
updated components
simukka Jun 8, 2015
f9c2ab0
code review, updated services
simukka Jun 8, 2015
73b4767
testing new color scheme
simukka Jun 8, 2015
815203b
sync
simukka Jun 9, 2015
fda6b6d
added registerd view
Jun 9, 2015
588c747
auth flow updates
simukka Jun 11, 2015
459a649
signup reason concept
simukka Jun 12, 2015
9aaaf14
first pass at signup copy
simukka Jun 12, 2015
e0c24b4
added signup success flow, added protection around profile creation
simukka Jun 15, 2015
eb7e589
updated dependencies, starting to move logic around
simukka Jun 16, 2015
1f00309
refactoring after dependency updates
simukka Jun 16, 2015
461eab2
promises
simukka Jun 16, 2015
71ec009
updated wake index page, refactored controller logic
simukka Jun 18, 2015
74bac76
colors
Jun 21, 2015
1158cfd
cleaned up modules and services
simukka Jun 23, 2015
1a2b87f
fixed type error, style improvements
simukka Jul 6, 2015
953e9f2
refactored requests logic, cleaned up some code
simukka Jul 6, 2015
fc8f0ec
started profile/account refactor
simukka Jul 7, 2015
1358a53
started new wake refactor
Jul 8, 2015
0899327
cleaned up share wake form, improved styles
simukka Jul 8, 2015
0164765
finished new wake refactor
simukka Jul 9, 2015
3eb94a5
renamed some directives, moved wake thumbnail to directive, refactore…
simukka Jul 10, 2015
2024767
improved syncData factory
simukka Jul 10, 2015
1d99683
reverted some changes, finish your work first!
simukka Jul 10, 2015
4936184
fixed some issues, progress on wake and request associations
Jul 13, 2015
029a64f
added accept/decline methods to requests
Jul 13, 2015
152c2bb
added modeling for accepted/declined requests
simukka Jul 13, 2015
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
85 changes: 62 additions & 23 deletions .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,63 @@
{
"node": true,
"browser": true,
"esnext": true,
"bitwise": true,
"camelcase": true,
"curly": true,
"eqeqeq": true,
"immed": true,
"indent": 2,
"latedef": true,
"newcap": true,
"noarg": true,
"quotmark": "single",
"regexp": true,
"undef": true,
"unused": true,
"strict": true,
"trailing": true,
"smarttabs": true,
"globals": {
"angular": false
}
}
"bitwise": true,
"camelcase": true,
"curly": true,
"eqeqeq": true,
"es3": false,
"forin": true,
"freeze": true,
"immed": true,
"indent": 4,
"latedef": "nofunc",
"newcap": true,
"noarg": true,
"noempty": true,
"nonbsp": true,
"nonew": true,
"plusplus": false,
"quotmark": "single",
"undef": true,
"unused": false,
"strict": false,
"maxparams": 10,
"maxdepth": 5,
"maxstatements": 40,
"maxcomplexity": 8,
"maxlen": 220,

"asi": false,
"boss": false,
"debug": false,
"eqnull": true,
"esnext": false,
"evil": false,
"expr": false,
"funcscope": false,
"globalstrict": false,
"iterator": false,
"lastsemic": false,
"laxbreak": false,
"laxcomma": false,
"loopfunc": true,
"maxerr": false,
"moz": false,
"multistr": false,
"notypeof": false,
"proto": false,
"scripturl": false,
"shadow": false,
"sub": true,
"supernew": false,
"validthis": false,
"noyield": false,

"browser": true,
"node": true,

"globals": {
"angular": false,
"$": false,
"_":false,
"google":false
}
}
21 changes: 11 additions & 10 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = function (grunt) {

// Configurable paths for the application
var appConfig = {
app: require('./bower.json').appPath || 'app',
app: 'app',
dist: 'dist'
};

Expand Down Expand Up @@ -180,6 +180,8 @@ module.exports = function (grunt) {

// Automatically inject Bower components into the app
wiredep: {
directory: '../.bowerrc',
bowerJson: '../bower.json',
options: {
cwd: '<%= yeoman.app %>'
},
Expand Down Expand Up @@ -211,7 +213,7 @@ module.exports = function (grunt) {
flow: {
html: {
steps: {
js: ['concat', 'uglifyjs'],
js: ['concat'],
css: ['cssmin']
},
post: {}
Expand Down Expand Up @@ -280,7 +282,7 @@ module.exports = function (grunt) {
htmlmin: {
dist: {
options: {
collapseWhitespace: true,
collapseWhitespace: false,
conservativeCollapse: true,
collapseBooleanAttributes: true,
removeCommentsFromCDATA: true,
Expand Down Expand Up @@ -330,7 +332,7 @@ module.exports = function (grunt) {
'*.html',
'views/{,*/}*.html',
'images/{,*/}*.{webp}',
'fonts/*'
'.tmp/fonts/*'
]
}, {
expand: true,
Expand All @@ -339,9 +341,9 @@ module.exports = function (grunt) {
src: ['generated/*']
}, {
expand: true,
cwd: 'bower_components/bootstrap/dist',
src: 'fonts/*',
dest: '<%= yeoman.dist %>'
cwd: 'bower_components/fontawesome/fonts',
src: '*',
dest: '<%= yeoman.dist %>/fonts'
}]
},
styles: {
Expand Down Expand Up @@ -373,7 +375,6 @@ module.exports = function (grunt) {
dist: [
'less:development',
'copy:styles',
'copy:fonts',
'imagemin',
'svgmin'
]
Expand All @@ -396,7 +397,7 @@ module.exports = function (grunt) {

grunt.task.run([
'clean:server',
'wiredep',
//'wiredep',
'concurrent:server',
'autoprefixer',
'connect:livereload',
Expand Down Expand Up @@ -429,7 +430,7 @@ module.exports = function (grunt) {
'copy:dist',
'cdnify',
'cssmin',
'uglify',
//'uglify',
'filerev',
'usemin',
'htmlmin'
Expand Down
Binary file added app/images/faw-computer-animation.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/images/ocean.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/images/water.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 62 additions & 65 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,94 +9,91 @@
<link rel="stylesheet" href="/styles/main.css">
<link rel="stylesheet" href="/bower_components/animate.css/animate.css">
<!-- endbuild -->
<base href="/">
</head>
<body ng-app="findawakeApp">
<nav class="navbar navbar-default navbar-static-top animated fadeInDown" role="navigation" ng-controller="NavCtrl">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">Find A Wake <small class="label label-info">BETA</small></a>
</div>
<div class="collapse navbar-collapse" id="bnavbar-collapse-1">
<ul class="nav navbar-nav navbar-right animated fadeIn">
<li>
<a href="/wakes/new" class=""><i class="fa fa-plus"></i> Wake</a>
</li>
<li class="dropdown" ng-cloak ng-show-auth="login" ng-controller="LoginCtrl">
<a href="" class="dropdown-toggle" data-toggle="dropdown"><span ng-bind="user.email"></span> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a ng-href="/profile/{{user.id}}">My Profile</a></li>
<li><a ng-href="/my/account">My Account</a></li>
<li class="divider"></li>
<li><a href="" ng-click="logout()">Logout</a></li>
</ul>
</li>
<li ng-cloak ng-show-auth="['logout','error']"><a href="/login">Login/Register</a></li>
</ul>
</div>
</div>
</nav>
<body ng-app="findAWake">
<nav class="navbar navbar-default navbar-static-top" role="navigation" navigation></nav>
<div ng-view=""></div>
<script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-XXXXX-X');
ga('create', 'UA-45958647-2');
ga('send', 'pageview');
</script>
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=geometry"></script>

<!-- build:js(.) scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/es5-shim/es5-shim.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/json3/lib/json3.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-touch/angular-touch.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/lodash/dist/lodash.compat.js"></script>
<script src="bower_components/firebase/firebase.js"></script>
<script src="bower_components/angular-strap/dist/angular-strap.min.js"></script>
<script src="bower_components/angular-strap/dist/angular-strap.tpl.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="bower_components/firebase-simple-login/firebase-simple-login.js"></script>
<script src="bower_components/angularfire/angularfire.js"></script>
<script src="bower_components/angularjs-geolocation/src/geolocation.js"></script>
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/es5-shim/es5-shim.js"></script>
<script src="../bower_components/angular/angular.js"></script>
<script src="../bower_components/json3/lib/json3.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="../bower_components/angular-resource/angular-resource.js"></script>
<script src="../bower_components/angular-cookies/angular-cookies.js"></script>
<script src="../bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="../bower_components/angular-animate/angular-animate.js"></script>
<script src="../bower_components/angular-touch/angular-touch.js"></script>
<script src="../bower_components/angular-route/angular-route.js"></script>
<script src="../bower_components/lodash/dist/lodash.compat.js"></script>
<script src="../bower_components/firebase/firebase-debug.js"></script>
<script src="../bower_components/angular-strap/dist/angular-strap.min.js"></script>
<script src="../bower_components/angular-strap/dist/angular-strap.tpl.min.js"></script>
<script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="../bower_components/angularfire/dist/angularfire.js"></script>
<script src="../bower_components/angularjs-geolocation/src/geolocation.js"></script>
<script src="../bower_components/ks-active-link/index.js"></script>
<!-- endbower -->
<!-- endbuild -->

<!-- build:js({.tmp,app}) scripts/scripts.js -->
<!-- build:js({.tmp,app}) scripts/application.js -->
<script src="/scripts/app.js"></script>
<script src="/scripts/controllers/index.js"></script>

<script src="/scripts/controllers/login.js"></script>
<script src="/scripts/controllers/global.js"></script>
<script src="/scripts/controllers/wake.js"></script>
<script src="/scripts/controllers/user.js"></script>
<script src="/scripts/controllers/signup.controller.js"></script>
<script src="/scripts/controllers/signup-success.controller.js"></script>
<script src="/scripts/controllers/wakes-index.controller.js"></script>
<script src="/scripts/controllers/wakes-ride.controller.js"></script>
<script src="/scripts/controllers/wakes-new.controller.js"></script>
<script src="/scripts/controllers/wakes-show.controller.js"></script>
<script src="/scripts/controllers/wakes-delete.controller.js"></script>
<script src="/scripts/controllers/wakes-requests.controller.js"></script>
<script src="/scripts/controllers/wakes-edit.controller.js"></script>
<script src="/scripts/controllers/users-edit.controller.js"></script>
<script src="/scripts/controllers/users-wakes.controller.js"></script>
<script src="/scripts/controllers/users-requests.controller.js"></script>
<script src="/scripts/controllers/profile.js"></script>
<script src="/scripts/controllers/request.js"></script>
<script src="/scripts/services/security.js"></script>
<script src="/scripts/services/wakes.js"></script>
<script src="/scripts/services/users.js"></script>
<script src="/scripts/services/wakeSettings.js"></script>
<script src="/scripts/services/userSettings.js"></script>
<script src="/scripts/modules/firebase.js"></script>
<script src="/scripts/directives/profile-gear-form.directive.js"></script>
<script src="/scripts/directives/profile-avatar-form.directive.js"></script>
<script src="/scripts/directives/navigation.directive.js"></script>
<script src="/scripts/directives/file-upload.directive.js"></script>
<script src="/scripts/directives/avatar.directive.js"></script>
<script src="/scripts/directives/wake-thumbnail-form.directive.js"></script>
<script src="/scripts/directives/wake-schedule-form.directive.js"></script>
<script src="/scripts/directives/wake-location-form.directive.js"></script>
<script src="/scripts/directives/wake-types-form.directive.js"></script>
<script src="/scripts/directives/wake-info-form.directive.js"></script>
<script src="/scripts/directives/wake-thumbnail.directive.js"></script>
<script src="/scripts/directives/wake-panel.directive.js"></script>
<script src="/scripts/directives/request-panel.directive.js"></script>
<script src="/scripts/services/route-security-manager.factory.js"></script>
<script src="/scripts/services/wakes.factory.js"></script>
<script src="/scripts/services/users.factory.js"></script>
<script src="/scripts/services/wake-settings.factory.js"></script>
<script src="/scripts/services/user-settings.factory.js"></script>
<script src="/scripts/services/firebase-ref.factory.js"></script>
<script src="/scripts/services/sync-data.factory.js"></script>
<script src="/scripts/services/simple-login.factory.js"></script>
<script src="/scripts/services/firebase-models.factory.js"></script>
<script src="/scripts/services/requests.factory.js"></script>
<script src="/scripts/services/location-geocode.factory.js"></script>
<script src="/scripts/modules/imgur.js"></script>
<script src="/scripts/modules/simpleLogin.js"></script>
<script src="/scripts/modules/loginTools.js"></script>
<script src="/scripts/modules/google.js"></script>
<script src="/scripts/directives/fileUpload.js"></script>
<!-- endbuild -->
</body>
</html>
Loading