Skip to content

Commit

Permalink
rename src
Browse files Browse the repository at this point in the history
  • Loading branch information
dsaco committed Aug 17, 2016
1 parent 7880ac7 commit c0f513a
Show file tree
Hide file tree
Showing 128 changed files with 12 additions and 12 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ export default class PostPanel extends Component{


let skuDiv = ''
if (this.props.post.sku !== 'undefined' && this.props.post.sku !== null) {
if (this.props.post.toys !== undefined && this.props.post.toys !== null) {
skuDiv = (
<Link to={'/sku/'+this.props.post.sku.id+'/edit'}>
<span className='label label-success label-margin'>{this.props.post.sku.name.substring(0, 25)+'...'}</span>
<Link to={'/sku/'+this.props.post.toys.id+'/edit'}>
<span className='label label-success label-margin'>{this.props.post.toys.name.substring(0, 25)+'...'}</span>
</Link>
)
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
entry: {
app: ['webpack/hot/dev-server',
'webpack-dev-server/client?http://localhost:8081',
path.resolve(__dirname, 'app/scripts/main.js')
path.resolve(__dirname, 'src/scripts/main.js')
],
vendor: [
'jquery',
Expand All @@ -18,15 +18,15 @@ module.exports = {
extensions: ['', '.js', '.jsx']
},
output: {
path: path.resolve(__dirname, 'app'),
path: path.resolve(__dirname, 'src'),
filename: '/scripts/bundle.js'
},
module: {
loaders: [{
test: /\.jsx?$/,
// exclude:/node_modules/,
loaders: ['babel'],
include: [path.join(__dirname, 'app')]
include: [path.join(__dirname, 'src')]
}, {
test: /\.scss$/,
loader: 'style!css!autoprefixer?browsers=last 5 version!sass',
Expand Down Expand Up @@ -57,7 +57,7 @@ module.exports = {
})
],
devServer: {
contentBase: "app",
contentBase: "src",
hot: true,
progress: true,
inline: true,
Expand Down
10 changes: 5 additions & 5 deletions webpack.production.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ const ExtractMain = new ExtractTextPlugin('styles/main.css');

const config = {
entry: {
app: path.resolve(__dirname, 'app/scripts/main.js'),
app: path.resolve(__dirname, 'src/scripts/main.js'),
vendor: [
'jquery',
'bootstrap-sass/assets/javascripts/bootstrap.js',
'admin-lte/dist/js/app.js'
]
},
output: {
path: path.resolve(__dirname, 'dist'),
path: path.resolve(__dirname, 'build'),
filename: 'scripts/bundle.js'
},
resolve: {
Expand All @@ -29,7 +29,7 @@ const config = {
test: /\.jsx?$/,
exclude: [node_modules_dir],
loaders: ['babel'],
include: [path.join(__dirname, 'app')]
include: [path.join(__dirname, 'src')]
},
// {
// test: /\.less$/,
Expand Down Expand Up @@ -65,8 +65,8 @@ const config = {
"window.jQuery": "jquery"
}),
new CopyWebpackPlugin([{
from: path.resolve(__dirname, "app/index.html"),
to: path.resolve(__dirname, "dist/index.html")
from: path.resolve(__dirname, "src/index.html"),
to: path.resolve(__dirname, "build/index.html")
}]),
// ExtractVendor,
ExtractMain,
Expand Down

0 comments on commit c0f513a

Please sign in to comment.