SPA: basket and authentication
This commit is contained in:
commit
fa20099a16
@ -3,23 +3,18 @@
|
|||||||
@font-face {
|
@font-face {
|
||||||
font-family: Montserrat;
|
font-family: Montserrat;
|
||||||
font-weight: 400;
|
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-face {
|
||||||
font-family: Montserrat;
|
font-family: Montserrat;
|
||||||
font-weight: 700;
|
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;*/
|
|
||||||
font-family: Montserrat,sans-serif;
|
|
||||||
min-width:480px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.app {
|
.app {
|
||||||
|
font-family: Montserrat,sans-serif;
|
||||||
|
|
||||||
&-footer {
|
&-footer {
|
||||||
padding-top: 40px;
|
padding-top: 40px;
|
||||||
padding-bottom: 40px;
|
padding-bottom: 40px;
|
||||||
|
@ -5,7 +5,7 @@ import { IBasket } from '../shared/models/basket.model';
|
|||||||
import { IBasketItem } from '../shared/models/basketItem.model';
|
import { IBasketItem } from '../shared/models/basketItem.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'esh-basket',
|
selector: 'esh-basket .esh-basket',
|
||||||
styleUrls: ['./basket.component.scss'],
|
styleUrls: ['./basket.component.scss'],
|
||||||
templateUrl: './basket.component.html'
|
templateUrl: './basket.component.html'
|
||||||
})
|
})
|
||||||
|
@ -8,7 +8,7 @@ import { IPager } from '../shared/models/pager.model';
|
|||||||
import { BasketWrapperService} from '../shared/services/basket.wrapper.service';
|
import { BasketWrapperService} from '../shared/services/basket.wrapper.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'esh-catalog',
|
selector: 'esh-catalog .catalog',
|
||||||
styleUrls: ['./catalog.component.scss'],
|
styleUrls: ['./catalog.component.scss'],
|
||||||
templateUrl: './catalog.component.html'
|
templateUrl: './catalog.component.html'
|
||||||
})
|
})
|
||||||
|
@ -6,6 +6,7 @@ var extractCSS = new ExtractTextPlugin('styles.css');
|
|||||||
var ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
|
var ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
|
||||||
var devConfig = require('./webpack.config.dev');
|
var devConfig = require('./webpack.config.dev');
|
||||||
var prodConfig = require('./webpack.config.prod');
|
var prodConfig = require('./webpack.config.prod');
|
||||||
|
var CopyWebpackPlugin = require('copy-webpack-plugin');
|
||||||
var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development';
|
var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development';
|
||||||
|
|
||||||
console.log("==========Dev Mode = " + isDevelopment + " ============" )
|
console.log("==========Dev Mode = " + isDevelopment + " ============" )
|
||||||
@ -74,6 +75,9 @@ module.exports = merge({
|
|||||||
'process.env': {
|
'process.env': {
|
||||||
'ENV': JSON.stringify(process.env.ASPNETCORE_ENVIRONMENT)
|
'ENV': JSON.stringify(process.env.ASPNETCORE_ENVIRONMENT)
|
||||||
}
|
}
|
||||||
})
|
}),
|
||||||
|
new CopyWebpackPlugin([
|
||||||
|
{ from: 'Client/fonts', to: 'fonts' }
|
||||||
|
])
|
||||||
]
|
]
|
||||||
}, isDevelopment ? devConfig : prodConfig);
|
}, isDevelopment ? devConfig : prodConfig);
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
"angular2",
|
"angular2",
|
||||||
"webpack2",
|
"webpack2",
|
||||||
"typescript2",
|
"typescript2",
|
||||||
"bootstrap4",
|
"bootstrap4",
|
||||||
"docker"
|
"docker"
|
||||||
],
|
],
|
||||||
"author": {
|
"author": {
|
||||||
@ -71,11 +71,11 @@
|
|||||||
"@types/source-map": "0.1.28",
|
"@types/source-map": "0.1.28",
|
||||||
"@types/uglify-js": "2.6.28",
|
"@types/uglify-js": "2.6.28",
|
||||||
"@types/webpack": "1.12.35",
|
"@types/webpack": "1.12.35",
|
||||||
"angular2-template-loader": "0.6.0",
|
|
||||||
"angular2-router-loader": "0.3.4",
|
"angular2-router-loader": "0.3.4",
|
||||||
|
"angular2-template-loader": "0.6.0",
|
||||||
"awesome-typescript-loader": "2.2.4",
|
"awesome-typescript-loader": "2.2.4",
|
||||||
"codelyzer": "1.0.0-beta.3",
|
"codelyzer": "1.0.0-beta.3",
|
||||||
"copy-webpack-plugin": "^4.0.0",
|
"copy-webpack-plugin": "^4.0.1",
|
||||||
"css": "2.2.1",
|
"css": "2.2.1",
|
||||||
"css-loader": "0.25.0",
|
"css-loader": "0.25.0",
|
||||||
"es6-promise": "3.2.1",
|
"es6-promise": "3.2.1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user