diff --git a/src/Web/WebSPA/.angular-cli.json b/src/Web/WebSPA/.angular-cli.json index 131f2897c..9a723a476 100644 --- a/src/Web/WebSPA/.angular-cli.json +++ b/src/Web/WebSPA/.angular-cli.json @@ -1,58 +1,55 @@ { - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "project": { - "name": "WebSPA" - }, - "apps": [ - { - "root": "Client", - "outDir": "wwwroot", - "assets": [ - "assets", - "favicon.ico" - ], - "index": "index.html", - "main": "main.ts", - "polyfills": "polyfills.ts", - "test": "test.ts", - "tsconfig": "tsconfig.app.json", - "testTsconfig": "tsconfig.spec.json", - "prefix": "app", - "styles": [ - "globals.scss", - "../node_modules/bootstrap/scss/bootstrap.scss" - ], - "scripts": [], - "environmentSource": "environments/environment.ts", - "environments": { - "dev": "environments/environment.ts", - "prod": "environments/environment.prod.ts" - } - } - ], - "e2e": { - "protractor": { - "config": "./protractor.conf.js" - } - }, - "lint": [ - { - "project": "Client/tsconfig.app.json" + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "project": { + "name": "WebSPA" }, - { - "project": "Client/tsconfig.spec.json" + "apps": [{ + "root": "Client", + "outDir": "wwwroot", + "assets": [ + "assets", + "favicon.ico" + ], + "index": "index.html", + "main": "main.ts", + "polyfills": "polyfills.ts", + "test": "test.ts", + "tsconfig": "tsconfig.app.json", + "testTsconfig": "tsconfig.spec.json", + "prefix": "app", + "styles": [ + "globals.scss", + "../node_modules/bootstrap/scss/bootstrap.scss" + ], + "scripts": [], + "environmentSource": "environments/environment.ts", + "environments": { + "dev": "environments/environment.ts", + "prod": "environments/environment.prod.ts" + } + }], + "e2e": { + "protractor": { + "config": "./protractor.conf.js" + } }, - { - "project": "e2e/tsconfig.e2e.json" - } - ], - "test": { - "karma": { - "config": "./karma.conf.js" + "lint": [{ + "project": "Client/tsconfig.app.json" + }, + { + "project": "Client/tsconfig.spec.json" + }, + { + "project": "e2e/tsconfig.e2e.json" + } + ], + "test": { + "karma": { + "config": "./karma.conf.js" + } + }, + "defaults": { + "styleExt": "scss", + "component": {} } - }, - "defaults": { - "styleExt": "scss", - "component": {} - } -} +} \ No newline at end of file diff --git a/src/Web/WebSPA/.angulardoc.json b/src/Web/WebSPA/.angulardoc.json new file mode 100644 index 000000000..dc247628d --- /dev/null +++ b/src/Web/WebSPA/.angulardoc.json @@ -0,0 +1,4 @@ +{ + "repoId": "bccb75c8-567f-4f97-923c-d56cd1208aa5", + "lastSync": 0 +} \ No newline at end of file diff --git a/src/Web/WebSPA/AppSettings.cs b/src/Web/WebSPA/AppSettings.cs index fd254c3ae..75dc88f96 100644 --- a/src/Web/WebSPA/AppSettings.cs +++ b/src/Web/WebSPA/AppSettings.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace eShopOnContainers.WebSPA +namespace eShopOnContainers.WebSPA { public class AppSettings { @@ -14,6 +9,6 @@ namespace eShopOnContainers.WebSPA public string BasketUrl { get; set; } public string MarketingUrl { get; set; } public string ActivateCampaignDetailFunction { get; set; } - public bool UseCustomizationData { get; set; } + public bool UseCustomizationData { get; set; } } } diff --git a/src/Web/WebSPA/Client/globals.scss b/src/Web/WebSPA/Client/globals.scss index e69b955dc..5a60d0570 100644 --- a/src/Web/WebSPA/Client/globals.scss +++ b/src/Web/WebSPA/Client/globals.scss @@ -1,8 +1,7 @@ /* You can add global styles to this file, and also import other style files */ -@import './modules/variables'; +@import './modules/variables'; $dist: './fonts/Montserrat-Regular'; - @font-face { font-family: Montserrat; font-weight: 400; @@ -73,5 +72,4 @@ select::-ms-expand { border: 0; color: #FB0D0D; font-size: 12px; -} - +} \ No newline at end of file diff --git a/src/Web/WebSPA/Client/guid.ts b/src/Web/WebSPA/Client/guid.ts index 1904902cb..35272c0ea 100644 --- a/src/Web/WebSPA/Client/guid.ts +++ b/src/Web/WebSPA/Client/guid.ts @@ -1,7 +1,7 @@ export class Guid { static newGuid() { return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { - var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8); + let r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8); return v.toString(16); }); } diff --git a/src/Web/WebSPA/Client/index.html b/src/Web/WebSPA/Client/index.html index 5d9432f70..566621340 100644 --- a/src/Web/WebSPA/Client/index.html +++ b/src/Web/WebSPA/Client/index.html @@ -1,18 +1,21 @@ + - - eShopConContainers.WebSPA - + + eShopConContainers.WebSPA + - - + + + - -
- -
-
+ +
+ +
+
- + + \ No newline at end of file diff --git a/src/Web/WebSPA/Client/modules/_variables.scss b/src/Web/WebSPA/Client/modules/_variables.scss index cae5cc3b7..d03df66d7 100644 --- a/src/Web/WebSPA/Client/modules/_variables.scss +++ b/src/Web/WebSPA/Client/modules/_variables.scss @@ -4,41 +4,34 @@ $color-brand-dark: darken($color-brand, 10%); $color-brand-darker: darken($color-brand, 20%); $color-brand-bright: lighten($color-brand, 10%); $color-brand-brighter: lighten($color-brand, 20%); - $color-secondary: #83D01B; $color-secondary-dark: darken($color-secondary, 5%); $color-secondary-darker: darken($color-secondary, 20%); $color-secondary-bright: lighten($color-secondary, 10%); $color-secondary-brighter: lighten($color-secondary, 20%); - $color-background-dark: #333333; $color-background-darker: #000000; $color-background-bright: #EEEEFF; $color-background-brighter: #FFFFFF; - $color-foreground-dark: #333333; $color-foreground-darker: #000000; $color-foreground-bright: #EEEEEE; $color-foreground-brighter: #FFFFFF; - // Animations $animation-speed-default: .35s; $animation-speed-slow: .5s; $animation-speed-fast: .15s; - // Fonts $font-weight-light: 200; $font-weight-semilight: 300; $font-weight-normal: 400; $font-weight-semibold: 600; $font-weight-bold: 700; - -$font-size-xs: .65rem; // 10.4px -$font-size-s: .85rem; // 13.6px -$font-size-m: 1rem; // 16px -$font-size-l: 1.25rem; // 20px -$font-size-xl: 1.5rem; // 24px - +$font-size-xs: .65rem; // 10.4px +$font-size-s: .85rem; // 13.6px +$font-size-m: 1rem; // 16px +$font-size-l: 1.25rem; // 20px +$font-size-xl: 1.5rem; // 24px // Medias $media-screen-xxs: 360px; $media-screen-xs: 640px; @@ -48,10 +41,8 @@ $media-screen-l: 1280px; $media-screen-xl: 1440px; $media-screen-xxl: 1680px; $media-screen-xxxl: 1920px; - // Borders $border-light: 1px; - // Images $image_path: '/assets/images/'; $image-main_banner: '#{$image_path}main_banner.png'; diff --git a/src/Web/WebSPA/Client/modules/app.component.html b/src/Web/WebSPA/Client/modules/app.component.html index f09edd350..ca29f4200 100644 --- a/src/Web/WebSPA/Client/modules/app.component.html +++ b/src/Web/WebSPA/Client/modules/app.component.html @@ -1,4 +1,4 @@ -