Skip to content

Commit 754ffa7

Browse files
ironydipsironydips
committed
Admin -Timeslots,ZipCodes
1 parent bac9350 commit 754ffa7

File tree

403 files changed

+4839
-117516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+4839
-117516
lines changed

‎.bowerrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"directory": "app/bower_components",
3+
"interactive": false
4+
}

‎app/admin-panel/admin-panel.template.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<li><a href="#">Events</a></li>
2828
<li><a href="#">Customers</a></li>
2929
<li><a href="#">Inventory</a></li>
30-
<li><a href="#">Wearhouse</a></li>
30+
<li><a href="#">Warehouse</a></li>
3131
</ul>
3232

3333
</div><!-- /.navbar-collapse -->

‎app/admin-sub-panel/admin-sub-panel.template.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<li ng-class="{'active': $root.$state.includes('driver')}"><a ui-sref="adminLayout.drivers">Drivers</a></li>
99
<li ng-class="{'active': $root.$state.includes('truck')}"><a ui-sref="adminLayout.trucks">Trucks</a></li>
1010
<li ng-class="{'active': $root.$state.includes('timeslot')}"><a ui-sref="adminLayout.timeslot">Time Slots</a></li>
11-
<li><a href="admin/zipcodes.jsp">Zip Codes</a></li>
11+
<li ng-class="{'active': $root.$state.includes('zipCode')}"><a ui-sref="adminLayout.zipCodes">Zip Codes</a></li>
1212
</ul>
1313

1414
</div>

‎app/app.config.js

+12-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ angular.
77

88
//HTTP Provider Config
99
$httpProvider.defaults.useXDomain = true;
10-
// $httpProvider.interceptors.push('InterceptorService');
10+
$httpProvider.interceptors.push('InterceptorService');
1111

1212
// UI-Routing Config
1313
$urlRouterProvider.otherwise('/');
@@ -52,13 +52,21 @@ angular.
5252
}
5353
}
5454
})
55-
.state('adminLayout.timeslot',{
56-
url:'/timeslot',
57-
views:{
55+
.state('adminLayout.timeslot',{
56+
url:'/timeslot',
57+
views:{
5858
'contentSection@adminLayout':{
5959
template:'<timeslot-details></timeslot-details>'
6060
}
6161
}
6262
})
63+
.state('adminLayout.zipCodes',{
64+
url:'/zipCodes',
65+
views:{
66+
'contentSection@adminLayout':{
67+
template:'<zipcode-details></zipcode-details>'
68+
}
69+
}
70+
})
6371
}
6472
]);

‎app/app.module.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ angular.module('bathwaterApp', [
88
'googleSignIn',
99
'naif.base64',
1010
'ui.bootstrap',
11+
'images-resizer',
12+
'720kb.datepicker',
1113
'index',
1214
'adminLayout',
1315
'adminPanel',
1416
'adminSubPanel',
1517
'driverDetails',
1618
'truckDetails',
17-
'timeslotDetails'
19+
'timeslotDetails',
20+
'zipcodeDetails'
1821
]);

‎app/app.run.js

+24-21
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,30 @@ angular.
1111
GAuth.setClient(CLIENT);
1212
GAuth.load();
1313

14-
GAuth.checkAuth().then(
15-
function (profile) {
16-
var params = JSON.stringify({
17-
email: profile.email,
18-
name: profile.name
19-
});
14+
GAuth.checkAuth()
15+
.then(function (profile) {
16+
var params = JSON.stringify({
17+
email: profile.email,
18+
name: profile.name
19+
});
2020

21-
$http.post("https://staging.bathwaterkids.com/rest/oauth/login",params)
22-
.then(function (data) {
23-
if (data.data.message != 'success') {
24-
$state.go('gSignIn');
25-
}
26-
})
27-
.catch(function(err){
28-
$state.go('gSignIn');
29-
console.log('Error on Oauth Login!!' + err);
30-
});
31-
$state.go('index');
32-
},
33-
function(){
21+
$http.post("/rest/oauth/login",params)
22+
.then(function (data) {
23+
if (data.data.message != 'success') {
24+
$state.go('gSignIn');
25+
}
26+
})
27+
.catch(function(err){
3428
$state.go('gSignIn');
35-
}
36-
);
29+
console.log('Error on Oauth Login!!' + err);
30+
});
31+
$state.go('index');
32+
},
33+
function(){
34+
$state.go('gSignIn');
35+
})
36+
.catch(function(err){
37+
$state.go('gSignIn');
38+
console.log('Error on checkAuth Login!!' + err);
39+
});
3740
}]);

‎app/app.services.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ angular.module('bathwaterApp')
44

55
object = {
66
'request': function(config){
7-
config.headers["Authorization"] = "BASIC YWRtaW46YWRtaW4=";
8-
config.useXDomain = true;
9-
if(config.method == "POST"){
10-
config.headers["Content-Type"] = "application/x-www-form-urlencoded";
7+
8+
//Adding base URL to the Request object
9+
if(["GET","POST"].indexOf(config.method) > -1 && !config.url.includes('.html')){
10+
config.url = angular.config.baseUrl + config.url;
1111
}
12+
1213
return config;
1314
},
1415
'requestError':function(rejection){

‎app/bower_components/angular-images-resizer/.bower.json

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"name": "angular-images-resizer",
3+
"version": "0.9.0",
4+
"homepage": "https://github.com/FBerthelot/angular-images-resizer",
5+
"authors": [
6+
"Florent Berthelot <[email protected]>"
7+
],
8+
"description": "Resize images client-side is now possible with this angular module",
9+
"main": [
10+
"angular-images-resizer.js"
11+
],
12+
"ignore": [],
13+
"keywords": [
14+
"angular",
15+
"angularjs",
16+
"image",
17+
"resize",
18+
"resizer",
19+
"client-side"
20+
],
21+
"license": "MIT",
22+
"devDependencies": {
23+
"angular": "~1.3.1",
24+
"mocha": "~2.0.1",
25+
"sinon": "~1.11.1",
26+
"chai": "~1.9.2",
27+
"angular-mocks": "~1.3.1"
28+
},
29+
"private": false,
30+
"_release": "0.9.0",
31+
"_resolution": {
32+
"type": "version",
33+
"tag": "0.9.0",
34+
"commit": "5fa8056b6da40380aa0337337861bd7ae27f9d85"
35+
},
36+
"_source": "https://github.com/FBerthelot/angular-images-resizer.git",
37+
"_target": "0.9.0",
38+
"_originalSource": "angular-images-resizer",
39+
"_direct": true
40+
}

‎app/bower_components/angular-images-resizer/.gitignore

+119
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
# Node
2+
lib-cov
3+
*.seed
4+
*.log
5+
*.dat
6+
*.out
7+
*.pid
8+
pids
9+
logs
10+
npm-debug.log
11+
node_modules
12+
#Kubuntu
13+
.directory
14+
#Eclipse
15+
*.pydevproject
16+
.project
17+
.metadata
18+
bin/**
19+
tmp/**
20+
tmp/**/*
21+
*.tmp
22+
*.bak
23+
*.swp
24+
*~.nib
25+
local.properties
26+
.classpath
27+
.settings/
28+
.loadpath
29+
# External tool builders
30+
.externalToolBuilders/
31+
# Locally stored "Eclipse launch configurations"
32+
*.launch
33+
# CDT-specific
34+
.cproject
35+
# PDT-specific
36+
.buildpath
37+
38+
#intellij
39+
*.iml
40+
*.ipr
41+
*.iws
42+
.idea/
43+
44+
#linux
45+
!.gitignore
46+
47+
#OSX
48+
.DS_Store
49+
.AppleDouble
50+
.LSOverride
51+
Icon
52+
# Thumbnails
53+
._*
54+
# Files that might appear on external disk
55+
.Spotlight-V100
56+
.Trashes
57+
58+
#Sublime
59+
# SublimeText project files
60+
*.sublime-workspace
61+
62+
#textmate
63+
*.tmproj
64+
*.tmproject
65+
tmtags
66+
67+
#windows
68+
# Windows image file caches
69+
Thumbs.db
70+
ehthumbs.db
71+
# Folder config file
72+
Desktop.ini
73+
# Recycle Bin used on file shares
74+
$RECYCLE.BIN/
75+
76+
#vim
77+
.*.s[a-w][a-z]
78+
*.un~
79+
Session.vim
80+
.netrwhist
81+
*~
82+
83+
#Android
84+
# built application files
85+
*.apk
86+
*.ap_
87+
# files for the dex VM
88+
*.dex
89+
# Java class files
90+
*.class
91+
# generated files
92+
bin/
93+
gen/
94+
# Local configuration file (sdk path, etc)
95+
local.properties
96+
# Eclipse project files
97+
.classpath
98+
.project
99+
# Proguard folder generated by Eclipse
100+
proguard/
101+
# Intellij project files
102+
*.iml
103+
*.ipr
104+
*.iws
105+
.idea/
106+
107+
#Java
108+
*.class
109+
# Package Files #
110+
*.jar
111+
*.war
112+
*.ear
113+
114+
#Error Generator
115+
**/data/errors.json
116+
117+
#bower_components
118+
**/bower_components
119+

‎app/bower_components/angular-images-resizer/.jshintrc

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"node": true,
3+
"browser": true,
4+
"esnext": true,
5+
"bitwise": true,
6+
"camelcase": true,
7+
"curly": true,
8+
"eqeqeq": true,
9+
"immed": true,
10+
"indent": 4,
11+
"latedef": true,
12+
"newcap": true,
13+
"noarg": true,
14+
"quotmark": "single",
15+
"regexp": true,
16+
"undef": true,
17+
"unused": true,
18+
"strict": true,
19+
"trailing": true,
20+
"smarttabs": true,
21+
"expr": true,
22+
"globals": {
23+
"angular": false,
24+
"sinon": false,
25+
"chai": false,
26+
"describe": false,
27+
"beforeEach": false,
28+
"afterEach": false,
29+
"inject": false,
30+
"it": false,
31+
"expect": false
32+
}
33+
}

‎app/bower_components/angular-images-resizer/Gruntfile.js

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/**
2+
* Created by berthelot on 05/06/14.
3+
*/
4+
'use strict';
5+
6+
module.exports = function (grunt) {
7+
8+
// Time how long tasks take. Can help when optimizing build times
9+
require('time-grunt')(grunt);
10+
11+
// Load grunt tasks automatically
12+
require('load-grunt-tasks')(grunt);
13+
14+
// Load tasks config and custom grunt tasks
15+
grunt.loadTasks('tasks/config');
16+
grunt.loadTasks('tasks');
17+
18+
// By default, grunt will test then build the app
19+
grunt.registerTask('default', [
20+
'jshint',
21+
'test',
22+
'uglify:dist'
23+
]);
24+
};

‎bower_components/angular/LICENSE.md ‎app/bower_components/angular-images-resizer/LICENSE

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 Angular
3+
Copyright (c) 2014 Florent Berthelot
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.
22+

0 commit comments

Comments
 (0)