Browse Source

SPA: basket and authentication

pull/49/merge
Carlos Cañizares Estévez 8 years ago
parent
commit
fa20099a16
5 changed files with 13 additions and 14 deletions
  1. +3
    -8
      src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss
  2. +1
    -1
      src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.ts
  3. +1
    -1
      src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.ts
  4. +5
    -1
      src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.js
  5. +3
    -3
      src/Web/WebSPA/eShopOnContainers.WebSPA/package.json

+ 3
- 8
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss View File

@ -3,23 +3,18 @@
@font-face {
font-family: Montserrat;
font-weight: 400;
src: url("../fonts/Montserrat-Regular.eot?") format("eot"),url("../fonts/Montserrat-Regular.woff") format("woff"),url("../fonts/Montserrat-Regular.ttf") format("truetype"),url("../fonts/Montserrat-Regular.svg#Montserrat") format("svg")
src: url("../dist/fonts/Montserrat-Regular.eot?") format("eot"),url("../dist/fonts/Montserrat-Regular.woff") format("woff"),url("../dist/fonts/Montserrat-Regular.ttf") format("truetype"),url("../dist/fonts/Montserrat-Regular.svg#Montserrat") format("svg")
}
@font-face {
font-family: Montserrat;
font-weight: 700;
src: url("../fonts/Montserrat-Bold.eot?") format("eot"),url("../fonts/Montserrat-Bold.woff") format("woff"),url("../fonts/Montserrat-Bold.ttf") format("truetype"),url("../fonts/Montserrat-Bold.svg#Montserrat") format("svg")
src: url("../dist/fonts/Montserrat-Bold.eot?") format("eot"),url("../dist/fonts/Montserrat-Bold.woff") format("woff"),url("../dist/fonts/Montserrat-Bold.ttf") format("truetype"),url("../dist/fonts/Montserrat-Bold.svg#Montserrat") format("svg")
}
body {
padding-top: 80px;
/*padding-bottom: 20px;*/
.app {
font-family: Montserrat,sans-serif;
min-width:480px;
}
.app {
&-footer {
padding-top: 40px;
padding-bottom: 40px;


+ 1
- 1
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.ts View File

@ -5,7 +5,7 @@ import { IBasket } from '../shared/models/basket.model';
import { IBasketItem } from '../shared/models/basketItem.model';
@Component({
selector: 'esh-basket',
selector: 'esh-basket .esh-basket',
styleUrls: ['./basket.component.scss'],
templateUrl: './basket.component.html'
})


+ 1
- 1
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.ts View File

@ -8,7 +8,7 @@ import { IPager } from '../shared/models/pager.model';
import { BasketWrapperService} from '../shared/services/basket.wrapper.service';
@Component({
selector: 'esh-catalog',
selector: 'esh-catalog .catalog',
styleUrls: ['./catalog.component.scss'],
templateUrl: './catalog.component.html'
})


+ 5
- 1
src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.js View File

@ -6,6 +6,7 @@ var extractCSS = new ExtractTextPlugin('styles.css');
var ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
var devConfig = require('./webpack.config.dev');
var prodConfig = require('./webpack.config.prod');
var CopyWebpackPlugin = require('copy-webpack-plugin');
var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development';
console.log("==========Dev Mode = " + isDevelopment + " ============" )
@ -74,6 +75,9 @@ module.exports = merge({
'process.env': {
'ENV': JSON.stringify(process.env.ASPNETCORE_ENVIRONMENT)
}
})
}),
new CopyWebpackPlugin([
{ from: 'Client/fonts', to: 'fonts' }
])
]
}, isDevelopment ? devConfig : prodConfig);

+ 3
- 3
src/Web/WebSPA/eShopOnContainers.WebSPA/package.json View File

@ -8,7 +8,7 @@
"angular2",
"webpack2",
"typescript2",
"bootstrap4",
"bootstrap4",
"docker"
],
"author": {
@ -71,11 +71,11 @@
"@types/source-map": "0.1.28",
"@types/uglify-js": "2.6.28",
"@types/webpack": "1.12.35",
"angular2-template-loader": "0.6.0",
"angular2-router-loader": "0.3.4",
"angular2-template-loader": "0.6.0",
"awesome-typescript-loader": "2.2.4",
"codelyzer": "1.0.0-beta.3",
"copy-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^4.0.1",
"css": "2.2.1",
"css-loader": "0.25.0",
"es6-promise": "3.2.1",


Loading…
Cancel
Save