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 0eef027

Browse filesBrowse files
pkrawat1pkrawat1
authored
angular 8 migrate (aviabird#343)
1 parent e0fcfa6 commit 0eef027
Copy full SHA for 0eef027

62 files changed

+3,204-1,958Lines changed: 3204 additions & 1958 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.json‎

Copy file name to clipboardExpand all lines: angular.json
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
"angularspree": {
77
"root": "",
88
"projectType": "application",
9+
"schematics": {
10+
"@schematics/angular:component": {
11+
"prefix": "app",
12+
"styleext": "scss"
13+
},
14+
"@schematics/angular:directive": {
15+
"prefix": "app"
16+
}
17+
},
918
"architect": {
1019
"build": {
1120
"builder": "@angular-devkit/build-angular:browser",
@@ -254,14 +263,5 @@
254263
},
255264
"cli": {
256265
"defaultCollection": "@ngrx/schematics"
257-
},
258-
"schematics": {
259-
"@schematics/angular:component": {
260-
"prefix": "app",
261-
"styleext": "scss"
262-
},
263-
"@schematics/angular:directive": {
264-
"prefix": "app"
265-
}
266266
}
267267
}
Collapse file

‎package.json‎

Copy file name to clipboardExpand all lines: package.json
+33-36Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,34 +31,33 @@
3131
},
3232
"private": true,
3333
"dependencies": {
34-
"@angular/animations": "^7.2.1",
35-
"@angular/common": "^7.2.1",
36-
"@angular/compiler": "^7.2.1",
37-
"@angular/core": "^7.2.1",
38-
"@angular/forms": "^7.2.1",
39-
"@angular/http": "^7.2.1",
40-
"@angular/platform-browser": "^7.2.1",
41-
"@angular/platform-browser-dynamic": "^7.2.1",
42-
"@angular/platform-server": "^7.2.1",
34+
"@angular/animations": "~8.2.9",
35+
"@angular/common": "~8.2.9",
36+
"@angular/compiler": "~8.2.9",
37+
"@angular/core": "~8.2.9",
38+
"@angular/forms": "~8.2.9",
39+
"@angular/platform-browser": "~8.2.9",
40+
"@angular/platform-browser-dynamic": "~8.2.9",
41+
"@angular/router": "~8.2.9",
42+
"@angular/platform-server": "^8.2.3",
4343
"@angular/pwa": "^0.10.6",
44-
"@angular/router": "^7.2.1",
45-
"@angular/service-worker": "^7.2.1",
44+
"@angular/service-worker": "^8.2.3",
4645
"@ngrx/core": "^1.2.0",
47-
"@ngrx/effects": "^7.0.0",
48-
"@ngrx/entity": "^7.0.0",
49-
"@ngrx/store": "^7.0.0",
46+
"@ngrx/effects": "^8.2.0",
47+
"@ngrx/entity": "^8.2.0",
48+
"@ngrx/store": "^8.2.0",
5049
"@ngu/carousel": "^1.5.4",
51-
"@nguniversal/common": "^7.0.2",
52-
"@nguniversal/express-engine": "^7.0.2",
53-
"@nguniversal/module-map-ngfactory-loader": "^7.0.2",
50+
"@nguniversal/common": "^8.1.1",
51+
"@nguniversal/express-engine": "^8.1.1",
52+
"@nguniversal/module-map-ngfactory-loader": "^8.1.1",
5453
"@ngx-lite/input-star-rating": "^0.2.5",
5554
"ng5-slider": "^1.1.11",
5655
"@ngx-lite/json-ld": "^0.5.2",
5756
"@ngx-progressbar/core": "^5.2.1",
5857
"@ngx-progressbar/http": "^5.2.1",
5958
"@types/crypto-js": "^3.1.40",
60-
"angular-svg-round-progressbar": "^2.0.0",
61-
"bootstrap": "^4.3.1",
59+
"angular-svg-round-progressbar": "^3.0.1",
60+
"bootstrap": "^4.1.3",
6261
"core-js": "^2.5.7",
6362
"crypto-js": "^3.1.9-1",
6463
"font-awesome": "^4.7.0",
@@ -72,46 +71,44 @@
7271
"ngx-toastr": "^9.1.1",
7372
"reselect": "^4.0.0",
7473
"scriptjs": "^2.5.9",
75-
"rxjs": "^6.3.3",
76-
"rxjs-compat": "^6.3.3",
74+
"tslib": "^1.10.0",
75+
"rxjs": "~6.4.0",
76+
"rxjs-compat": "^6.5.2",
7777
"ts-loader": "^5.3.0",
78-
"webpack-bundle-analyzer": "^3.3.2",
79-
"zone.js": "^0.8.26"
78+
"webpack-bundle-analyzer": "^3.4.1",
79+
"zone.js": "~0.9.1"
8080
},
8181
"devDependencies": {
82-
"@angular-devkit/build-angular": "^0.11.3",
83-
"@angular/cli": "^7.2.1",
84-
"@angular/compiler-cli": "^7.2.1",
85-
"@angular/language-service": "^7.2.1",
82+
"@angular-devkit/build-angular": "~0.803.8",
83+
"@angular/cli": "~8.3.8",
84+
"@angular/compiler-cli": "~8.2.9",
85+
"@angular/language-service": "~8.2.9",
86+
"@types/jasmine": "~3.3.8",
87+
"codelyzer": "^5.0.0",
88+
"jasmine-core": "~3.4.0",
89+
"karma": "~4.1.0",
8690
"@angularclass/hmr": "^2.1.3",
8791
"@compodoc/compodoc": "^1.1.6",
8892
"@ngrx/schematics": "^6.1.2",
8993
"@ngrx/store-devtools": "^6.1.2",
9094
"@types/grecaptcha": "^2.0.35",
91-
"@types/jasmine": "~2.8.11",
9295
"@types/jasminewd2": "~2.0.6",
9396
"@types/morris.js": "~0.5.7",
9497
"@types/node": "~10.12.9",
9598
"@types/scriptjs": "^0.0.2",
96-
"codelyzer": "~4.5.0",
97-
"jasmine-core": "~3.3.0",
9899
"jasmine-spec-reporter": "~4.2.1",
99-
"karma": "~3.1.1",
100100
"karma-chrome-launcher": "~2.2.0",
101101
"karma-cli": "~1.0.1",
102102
"karma-coverage-istanbul-reporter": "~2.0.4",
103103
"karma-jasmine": "~2.0.0",
104104
"karma-jasmine-html-reporter": "^1.4.0",
105-
"ngrx-store-freeze": "^0.2.4",
106-
"node-sass": "^4.10.0",
107105
"nswag": "^11.20.1",
108106
"protractor": "~5.4.1",
109-
"sass-loader": "^7.1.0",
110107
"source-map-explorer": "^1.6.0",
111108
"sw-precache": "^5.2.1",
112109
"ts-node": "~7.0.1",
113-
"tslint": "~5.11.0",
114-
"typescript": "^3.1.6",
110+
"tslint": "~5.15.0",
111+
"typescript": "^3.5.3",
115112
"webpack-cli": "^3.1.2"
116113
},
117114
"description": "Spree for Angular2",
Collapse file

‎src/app/app.component.scss‎

Copy file name to clipboardExpand all lines: src/app/app.component.scss
+31-31Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
}
88
}
99

10-
.issearchopen :host /deep/ .main-body {
10+
.issearchopen :host ::ng-deep .main-body {
1111
@media screen and(min-width: 320px) and(max-width: 768px) {
1212
margin-top: 48px;
1313
}
1414
}
1515

16-
:host /deep/.ngx-input-star-rating__btn {
16+
:host ::ng-deep.ngx-input-star-rating__btn {
1717
background-color: transparent;
1818
border: 0;
1919
cursor: pointer;
@@ -22,13 +22,13 @@
2222
height: 8px;
2323
}
2424

25-
:host /deep/.ngx-input-star-rating__btn svg {
25+
:host ::ng-deep.ngx-input-star-rating__btn svg {
2626
position: absolute;
2727
top: -12px;
2828
left: 5px;
2929
}
3030

31-
:host /deep/.ngx-input-star-rating__btn {
31+
:host ::ng-deep.ngx-input-star-rating__btn {
3232
background-color: transparent;
3333
border: 0;
3434
cursor: pointer;
@@ -37,46 +37,46 @@
3737
height: 8px;
3838
}
3939

40-
:host /deep/.ngx-input-star-rating__btn svg {
40+
:host ::ng-deep.ngx-input-star-rating__btn svg {
4141
position: absolute;
4242
top: -12px;
4343
left: 5px;
4444
}
4545

46-
:host /deep/ngx-input-star-rating {
46+
:host ::ng-deepngx-input-star-rating {
4747
display: inline-block;
4848
--color-star-default: #ddd;
4949
--color-star-highlight: #fe9700;
5050
}
5151

52-
:host /deep/ngx-input-star-rating {
52+
:host ::ng-deepngx-input-star-rating {
5353
display: inline-block;
5454
--color-star-default: #ddd;
5555
--color-star-highlight: #fe9700;
5656
}
5757

58-
:host /deep/.themebtnprimary {
59-
background: $theme-action-color - 60;
58+
:host ::ng-deep.themebtnprimary {
59+
background: darken($theme-action-color, 30);
6060
&:focus {
6161
@include gradient-y(
6262
$start-color: $theme-action-color,
63-
$end-color: $theme-action-color - 40,
63+
$end-color: darken($theme-action-color, 40),
6464
$start-percent: 0%,
6565
$end-percent: 45%
6666
);
6767
}
6868
@include gradient-y(
6969
$start-color: $theme-action-color,
70-
$end-color: $theme-action-color - 40,
70+
$end-color: darken($theme-action-color, 40),
7171
$start-percent: 0%,
7272
$end-percent: 45%
7373
);
7474
color: $white;
75-
border: 1px solid $theme-action-color - 80;
75+
border: 1px solid darken($theme-action-color, 55);
7676
border-radius: 0.4rem;
7777
padding: 0.5rem;
7878
font-weight: 300 !important;
79-
box-shadow: 0px 2px 4.6px $theme-action-color - 20;
79+
box-shadow: 0px 2px 4.6px darken($theme-action-color, 25);
8080
width: 100%;
8181
color: $white;
8282
// font-family: "Roboto Regular";
@@ -85,60 +85,60 @@
8585
text-transform: capitalize;
8686
}
8787

88-
:host /deep/.themebtnprimarybasic {
88+
:host ::ng-deep.themebtnprimarybasic {
8989
&:focus {
9090
@include gradient-y(
9191
$start-color: $theme-action-color,
92-
$end-color: $theme-action-color - 40,
92+
$end-color: darken($theme-action-color, 40),
9393
$start-percent: 0%,
9494
$end-percent: 45%
9595
);
9696
}
9797
text-transform: capitalize;
9898
color: $white;
99-
border: 1px solid $theme-action-color - 80;
100-
box-shadow: 0px 2px 4.6px $theme-action-color - 20;
99+
border: 1px solid darken($theme-action-color, 55);
100+
box-shadow: 0px 2px 4.6px darken($theme-action-color, 25);
101101
&:focus {
102102
@include gradient-y(
103103
$start-color: $theme-action-color,
104-
$end-color: $theme-action-color - 40,
104+
$end-color: darken($theme-action-color, 40),
105105
$start-percent: 0%,
106106
$end-percent: 45%
107107
);
108108
}
109109
@include gradient-y(
110110
$start-color: $theme-action-color,
111-
$end-color: $theme-action-color - 40,
111+
$end-color: darken($theme-action-color, 40),
112112
$start-percent: 0%,
113113
$end-percent: 45%
114114
);
115115
}
116116

117-
:host /deep/.themebtnprimarysade {
117+
:host ::ng-deep.themebtnprimarysade {
118118
@include gradient-y(
119119
$start-color: $theme-action-color,
120-
$end-color: $theme-action-color - 60,
120+
$end-color: darken($theme-action-color, 30),
121121
$start-percent: 0%,
122122
$end-percent: 95%
123123
);
124124
}
125125

126-
:host /deep/.themebtndisable {
126+
:host ::ng-deep.themebtndisable {
127127
@include gradient-y(
128128
$start-color: $gray-200,
129129
$end-color: $gray-600,
130130
$start-percent: 0%,
131131
$end-percent: 95%
132132
);
133-
box-shadow: 0px 2px 4.6px $gray-600 - 20;
134-
border: 1px solid $gray-600 - 80;
133+
box-shadow: 0px 2px 4.6px darken($gray-600, 25);
134+
border: 1px solid darken($gray-600, 55);
135135
}
136136

137137
.btn:not(:disabled):not(.disabled):active,
138138
.btn:not(:disabled):not(.disabled).active {
139139
@include gradient-y(
140140
$start-color: $theme-action-color,
141-
$end-color: $theme-action-color - 50,
141+
$end-color: darken($theme-action-color, 25),
142142
$start-percent: 0%,
143143
$end-percent: 80%
144144
);
@@ -149,17 +149,17 @@
149149
background-image: auto !important;
150150
}
151151

152-
:host /deep/ .page-item.active .page-link {
152+
:host ::ng-deep .page-item.active .page-link {
153153
z-index: 1;
154154
color: $white;
155-
background-color: $theme-action-color - 80;
156-
border-color: $theme-action-color - 80;
155+
background-color: darken($theme-action-color, 55);
156+
border-color: darken($theme-action-color, 55);
157157
}
158158

159-
:host /deep/ .page-link {
159+
:host ::ng-deep .page-link {
160160
color: $gray-900;
161161
&:hover {
162-
background-color: $theme-action-color - 100;
163-
border-color: $theme-action-color - 100;
162+
background-color: darken($theme-action-color, 25);
163+
border-color: darken($theme-action-color, 25);
164164
}
165165
}
Collapse file

‎src/app/app.module.ts‎

Copy file name to clipboardExpand all lines: src/app/app.module.ts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import { AddressService } from './checkout/address/services/address.service';
4141
preloadingStrategy: AppPreloadingStrategy,
4242
initialNavigation: 'enabled'
4343
}),
44-
StoreModule.forRoot(reducers, { metaReducers }),
44+
StoreModule.forRoot(reducers, { metaReducers, runtimeChecks: { strictStateImmutability: true, strictActionImmutability: true } }),
4545

4646
/**
4747
* Store devtools instrument the store retaining past versions of state
Collapse file

‎src/app/app.reducers.ts‎

Copy file name to clipboardExpand all lines: src/app/app.reducers.ts
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { AppState as State } from './interfaces';
3333
* exception will be thrown. This is useful during development mode to
3434
* ensure that none of the reducers accidentally mutates the state.
3535
*/
36-
import { storeFreeze } from 'ngrx-store-freeze';
36+
3737

3838
export const reducers: ActionReducerMap<State> = {
3939
products: fromProduct.reducer,
@@ -61,5 +61,5 @@ export function logger(
6161
* that will be composed to form the root meta-reducer.
6262
*/
6363
export const metaReducers: MetaReducer<State>[] = !environment.production
64-
? [logger, storeFreeze]
64+
? [logger]
6565
: [];
Collapse file

‎src/app/auth/components/forget-password/forget-password.component.scss‎

Copy file name to clipboardExpand all lines: src/app/auth/components/forget-password/forget-password.component.scss
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ fieldset {
135135
border: 0;
136136
text-transform: uppercase;
137137
border-radius: 3px;
138-
background-color: $theme-action-color - 50;
138+
background-color: darken($theme-action-color, 25);
139139
color: $white;
140140
}
141141

@@ -319,7 +319,7 @@ p {
319319
.login-input-container {
320320
&:hover {
321321
border: 1px solid $theme-main-color;
322-
box-shadow: 0.1px 0.2px 0.4px $theme-main-color - 100;
322+
box-shadow: 0.1px 0.2px 0.4px darken($theme-main-color, 25);
323323
}
324324
}
325325

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
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fieldset {
128128
border: 0;
129129
text-transform: uppercase;
130130
border-radius: 3px;
131-
background-color: $theme-action-color - 50;
131+
background-color: darken($theme-action-color, 25);
132132
color: $white;
133133
}
134134

@@ -313,7 +313,7 @@ p {
313313
background-color: $white;
314314
&:hover {
315315
border: 1px solid $theme-main-color;
316-
box-shadow: 0.1px 0.2px 0.4px $theme-main-color - 100;
316+
box-shadow: 0.1px 0.2px 0.4px darken($theme-main-color, 25);
317317
}
318318
}
319319

0 commit comments

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