Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 59bf08f

Browse filesBrowse files
pkrawat1pkrawat1
committed
fixed variable imports, reduced module size with better import variab… (aviabird#93)
* fixed variable imports, reduced module size with better import variable structuring * custom environment with config added * component upgrades, assets configurations
1 parent 21ea065 commit 59bf08f
Copy full SHA for 59bf08f

82 files changed

+1,318-1,977Lines changed: 1318 additions & 1977 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.angular-cli.json‎

Copy file name to clipboardExpand all lines: .angular-cli.json
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
"scripts": [],
2828
"environmentSource": "environments/environment.ts",
2929
"environments": {
30-
"mock": "environments/environment.mock.ts",
31-
"dev": "environments/environment.ts",
32-
"prod": "environments/environment.prod.ts"
30+
"mock-ng-spree": "environments/environment.mock-ng-spree.ts",
31+
"dev-ng-spree": "environments/environment.dev-ng-spree.ts",
32+
"prod-ng-spree": "environments/environment.prod-ng-spree.ts",
33+
"dev-custom": "environments/environment.dev-custom.ts",
34+
"prod-custom": "environments/environment.prod-custom.ts"
3335
}
3436
}
3537
],
Collapse file

‎.gitignore‎

Copy file name to clipboardExpand all lines: .gitignore
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ testem.log
4343
Thumbs.db
4444
/functions/node_modules
4545
documentation
46+
47+
#Custom Config
48+
/src/config/custom.ts
Collapse file

‎.vscode/settings.json‎

Copy file name to clipboardExpand all lines: .vscode/settings.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"**/.svn": true,
66
"**/.hg": true,
77
"**/.DS_Store": true,
8-
// "node_modules": true,
8+
"node_modules": true,
99
"bin": true,
1010
"obj": true,
1111
"dist": true,
Collapse file

‎README.md‎

Copy file name to clipboardExpand all lines: README.md
+7-4Lines changed: 7 additions & 4 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -185,19 +185,21 @@ There are many different ways to contribute to AngularSpree's development, just
185185
Big features are also welcome but if you want to see your contributions included in AngularSpree's codebase we strongly recommend you start by initiating a chat on our __[slack channel](https://angular-spree.herokuapp.com/)__.
186186

187187
## Development server & Mock Api
188-
Run `npm start-mock` for a dev server with 'mock' api. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files and will fetch data from mock api;
188+
189+
Run `npm start:mock-ng-spree` for a dev server with 'mock' api. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files and will fetch data from mock api;
189190

190191
## Development server
191-
Run `npm start` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
192+
193+
Run `npm start:dev-ng-spree` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
192194

193195
## Development server with Service Worker
194-
Run `npm run build--prod` to build in production with service worker pre-cache and then `npm run static-serve` to serve.
196+
197+
Run `npm run build:prod-ng-spree` to build in production with service worker pre-cache and then `npm run static-serve` to serve.
195198

196199
## Build with Service Worker
197200

198201
Run `npm run build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `npm run build--prod` for a production build.
199202

200-
201203
## Who are we?
202204

203205
We are [Aviabird Technologies](https://aviabird.com).
@@ -209,6 +211,7 @@ __We are very proud of our work.__
209211
We love technologies like Golang, Elixir, Scala, Ruby, Javascript, Typescript, Swift, Java.
210212

211213
We love some frameworks too:-
214+
212215
* Ruby On Rails
213216
* Phoenix/Elixir framework.
214217
* Spring framework.
Collapse file

‎package.json‎

Copy file name to clipboardExpand all lines: package.json
+20-13Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,23 @@
44
"license": "MIT",
55
"scripts": {
66
"ng": "./node_modules/@angular/cli/bin/ng",
7-
"start:mock": "ng serve -H 0.0.0.0 --environment=mock",
8-
"start": "ng serve -H 0.0.0.0",
9-
"build": "ng build",
10-
"test": "ng test",
11-
"lint": "ng lint",
12-
"e2e": "ng e2e",
7+
8+
"start:mock-ng-spree": "ng serve -H 0.0.0.0 --environment=mock-ng-spree",
9+
"start:dev-ng-spree": "ng serve -H 0.0.0.0 --environment=dev-ng-spree",
10+
"build:dev-ng-spree": "ng build --environment=dev-ng-spree",
11+
"build:prod-ng-spree": "ng build --environment=prod-ng-spree --no-sourcemap --stats-json && npm run sw",
12+
"test:dev-ng-spree": "ng test --environment=dev-ng-spree",
13+
"lint:dev-ng-spree": "ng lint --environment=dev-ng-spree",
14+
"e2e:dev-ng-spree": "ng e2e --environment=dev-ng-spree",
15+
16+
"start:dev-custom": "ng serve -H 0.0.0.0 --environment=dev-custom",
17+
"build:dev-custom": "ng build --environment=dev-custom",
18+
"test:dev-custom": "ng test --environment=dev-custom",
19+
"lint:dev-custom": "ng lint --environment=dev-custom",
20+
"e2e:dev-custom": "ng e2e --environment=dev-custom",
21+
"build:prod-custom": "ng build --environment=prod-custom --no-sourcemap --stats-json && npm run sw",
22+
1323
"compodoc": "./node_modules/.bin/compodoc -p src/tsconfig.app.json -d docs/",
14-
"build:prod": "ng build --prod --no-sourcemap --stats-json && npm run sw",
1524
"sw": "sw-precache --root=dist --config=sw-precache-config.js",
1625
"static-serve": "cd dist && live-server --port=4200 --host=localhost --entry-file=/index.html"
1726
},
@@ -30,13 +39,12 @@
3039
"@ngrx/effects": "^5.2.0",
3140
"@ngrx/router-store": "^5.2.0",
3241
"@ngrx/store": "^5.2.0",
33-
"bootstrap": "^3.3.7",
34-
"bootstrap-sass": "^3.3.7",
42+
"bootstrap": "^4.1.0",
3543
"core-js": "^2.4.1",
3644
"font-awesome": "^4.7.0",
3745
"immutable": "^3.8.1",
3846
"ng2-ui-auth": "^8.0.1",
39-
"ngx-bootstrap": "^1.7.1",
47+
"ngx-bootstrap": "^2.0.4",
4048
"reselect": "^2.5.4",
4149
"rxjs": "^5.5.6",
4250
"zone.js": "^0.8.14"
@@ -62,11 +70,10 @@
6270
"karma-jasmine": "~1.1.0",
6371
"karma-jasmine-html-reporter": "^0.2.2",
6472
"ngrx-store-freeze": "0.2.2",
65-
"node-sass": "^4.7.2",
73+
"node-sass": "^4.8.3",
6674
"nswag": "10.6.0",
6775
"protractor": "~5.1.2",
68-
"raw-loader": "^0.5.1",
69-
"sass-loader": "^6.0.6",
76+
"sass-loader": "^7.0.1",
7077
"sw-precache": "^5.0.0",
7178
"ts-node": "~3.2.0",
7279
"tslint": "~5.7.0",
Collapse file

‎src/app/app.component.html‎

Copy file name to clipboardExpand all lines: src/app/app.component.html
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="default">
1+
<div class="selected-theme">
22
<section>
33
<app-header *ngIf="currentUrl && !isCheckoutRoute()"></app-header>
44
<app-checkout-header [currentStep]="currentStep" *ngIf="currentUrl && isCheckoutRoute()"></app-checkout-header>
Collapse file

‎src/app/auth/components/login/login.component.scss‎

Copy file name to clipboardExpand all lines: src/app/auth/components/login/login.component.scss
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../../shared/scss/themes";
1+
@import "../../../shared/scss/selected_theme_variables";
22

33
.panel {
44
margin-bottom: 20px;
@@ -255,7 +255,7 @@ button, input, select, textarea {
255255
}
256256

257257
.login-error-icon {
258-
border: 2px solid $state-danger-text;
258+
border: 2px solid $danger;
259259
padding: 0 7px;
260260
display: inline-block;
261261
position: absolute;
@@ -289,7 +289,7 @@ p {
289289

290290
.login-input-container {
291291
&:hover {
292-
border: 1px solid $brand-danger;
293-
box-shadow: 0 2px 5px $brand-danger + 100;
292+
border: 1px solid $danger;
293+
box-shadow: 0 2px 5px $danger + 100;
294294
}
295-
}
295+
}
Collapse file

‎src/app/auth/components/login/login.component.ts‎

Copy file name to clipboardExpand all lines: src/app/auth/components/login/login.component.ts
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { Subscription } from 'rxjs/Subscription';
1616
})
1717
export class LoginComponent implements OnInit, OnDestroy {
1818
signInForm: FormGroup;
19-
title = environment.AppName;
19+
title = environment.appName;
2020
loginSubs: Subscription;
2121
returnUrl: string;
2222

@@ -90,4 +90,4 @@ export class LoginComponent implements OnInit, OnDestroy {
9090
socialLogin(provider: string) {
9191
this.store.dispatch(this.actions.oAuthLogin(provider));
9292
}
93-
}
93+
}
Collapse file

‎src/app/auth/components/sign-up/sign-up.component.scss‎

Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.scss
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../../../shared/scss/_themes.scss";
1+
@import "../../../shared/scss/selected_theme_variables";
22

33
.panel {
44
margin-bottom: 20px;
@@ -328,7 +328,7 @@ button, input, select, textarea {
328328

329329
.register-input-container {
330330
&:hover {
331-
border: 1px solid $brand-danger;
332-
box-shadow: 0 2px 5px $brand-danger + 100;
331+
border: 1px solid $danger;
332+
box-shadow: 0 2px 5px $danger + 100;
333333
}
334-
}
334+
}
Collapse file

‎src/app/auth/components/sign-up/sign-up.component.ts‎

Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.ts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { AuthActions } from '../../actions/auth.actions';
1717
export class SignUpComponent implements OnInit, OnDestroy {
1818
signUpForm: FormGroup;
1919
formSubmit = false;
20-
title = environment.AppName;
20+
title = environment.appName;
2121
registerSubs: Subscription;
2222

2323
constructor(

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.