diff --git a/app/404.html b/src/404.html similarity index 100% rename from app/404.html rename to src/404.html diff --git a/app/images/favicon.ico b/src/images/favicon.ico similarity index 100% rename from app/images/favicon.ico rename to src/images/favicon.ico diff --git a/app/index.html b/src/index.html similarity index 100% rename from app/index.html rename to src/index.html diff --git a/app/less/draft.less b/src/less/draft.less similarity index 100% rename from app/less/draft.less rename to src/less/draft.less diff --git a/app/less/main.less b/src/less/main.less similarity index 100% rename from app/less/main.less rename to src/less/main.less diff --git a/app/oldHtml.html b/src/oldHtml.html similarity index 100% rename from app/oldHtml.html rename to src/oldHtml.html diff --git a/app/robots.txt b/src/robots.txt similarity index 100% rename from app/robots.txt rename to src/robots.txt diff --git a/app/sass/layout/_draft.scss b/src/sass/layout/_draft.scss similarity index 100% rename from app/sass/layout/_draft.scss rename to src/sass/layout/_draft.scss diff --git a/app/sass/layout/_main.scss b/src/sass/layout/_main.scss similarity index 100% rename from app/sass/layout/_main.scss rename to src/sass/layout/_main.scss diff --git a/app/sass/style.scss b/src/sass/style.scss similarity index 100% rename from app/sass/style.scss rename to src/sass/style.scss diff --git a/app/scripts/actions/article.js b/src/scripts/actions/article.js similarity index 100% rename from app/scripts/actions/article.js rename to src/scripts/actions/article.js diff --git a/app/scripts/actions/articleAction.js b/src/scripts/actions/articleAction.js similarity index 100% rename from app/scripts/actions/articleAction.js rename to src/scripts/actions/articleAction.js diff --git a/app/scripts/actions/articleactions.js b/src/scripts/actions/articleactions.js similarity index 100% rename from app/scripts/actions/articleactions.js rename to src/scripts/actions/articleactions.js diff --git a/app/scripts/actions/banuseractions.js b/src/scripts/actions/banuseractions.js similarity index 100% rename from app/scripts/actions/banuseractions.js rename to src/scripts/actions/banuseractions.js diff --git a/app/scripts/actions/exploreAction.js b/src/scripts/actions/exploreAction.js similarity index 100% rename from app/scripts/actions/exploreAction.js rename to src/scripts/actions/exploreAction.js diff --git a/app/scripts/actions/explorebanneractions.js b/src/scripts/actions/explorebanneractions.js similarity index 100% rename from app/scripts/actions/explorebanneractions.js rename to src/scripts/actions/explorebanneractions.js diff --git a/app/scripts/actions/explorethemeactions.js b/src/scripts/actions/explorethemeactions.js similarity index 100% rename from app/scripts/actions/explorethemeactions.js rename to src/scripts/actions/explorethemeactions.js diff --git a/app/scripts/actions/feedbackactions.js b/src/scripts/actions/feedbackactions.js similarity index 100% rename from app/scripts/actions/feedbackactions.js rename to src/scripts/actions/feedbackactions.js diff --git a/app/scripts/actions/judgepostactions.js b/src/scripts/actions/judgepostactions.js similarity index 100% rename from app/scripts/actions/judgepostactions.js rename to src/scripts/actions/judgepostactions.js diff --git a/app/scripts/actions/postAction.js b/src/scripts/actions/postAction.js similarity index 100% rename from app/scripts/actions/postAction.js rename to src/scripts/actions/postAction.js diff --git a/app/scripts/actions/postactions.js b/src/scripts/actions/postactions.js similarity index 100% rename from app/scripts/actions/postactions.js rename to src/scripts/actions/postactions.js diff --git a/app/scripts/actions/recommendHomeAction.js b/src/scripts/actions/recommendHomeAction.js similarity index 100% rename from app/scripts/actions/recommendHomeAction.js rename to src/scripts/actions/recommendHomeAction.js diff --git a/app/scripts/actions/recommendhomeactions.js b/src/scripts/actions/recommendhomeactions.js similarity index 100% rename from app/scripts/actions/recommendhomeactions.js rename to src/scripts/actions/recommendhomeactions.js diff --git a/app/scripts/actions/reportactions.js b/src/scripts/actions/reportactions.js similarity index 100% rename from app/scripts/actions/reportactions.js rename to src/scripts/actions/reportactions.js diff --git a/app/scripts/actions/skuAction.js b/src/scripts/actions/skuAction.js similarity index 100% rename from app/scripts/actions/skuAction.js rename to src/scripts/actions/skuAction.js diff --git a/app/scripts/actions/skuactions.js b/src/scripts/actions/skuactions.js similarity index 100% rename from app/scripts/actions/skuactions.js rename to src/scripts/actions/skuactions.js diff --git a/app/scripts/actions/statsAction.js b/src/scripts/actions/statsAction.js similarity index 100% rename from app/scripts/actions/statsAction.js rename to src/scripts/actions/statsAction.js diff --git a/app/scripts/actions/statsactions.js b/src/scripts/actions/statsactions.js similarity index 100% rename from app/scripts/actions/statsactions.js rename to src/scripts/actions/statsactions.js diff --git a/app/scripts/actions/stickerAction.js b/src/scripts/actions/stickerAction.js similarity index 100% rename from app/scripts/actions/stickerAction.js rename to src/scripts/actions/stickerAction.js diff --git a/app/scripts/actions/stickeractions.js b/src/scripts/actions/stickeractions.js similarity index 100% rename from app/scripts/actions/stickeractions.js rename to src/scripts/actions/stickeractions.js diff --git a/app/scripts/actions/tagAction.js b/src/scripts/actions/tagAction.js similarity index 100% rename from app/scripts/actions/tagAction.js rename to src/scripts/actions/tagAction.js diff --git a/app/scripts/actions/tagClassAction.js b/src/scripts/actions/tagClassAction.js similarity index 100% rename from app/scripts/actions/tagClassAction.js rename to src/scripts/actions/tagClassAction.js diff --git a/app/scripts/actions/tagactions.js b/src/scripts/actions/tagactions.js similarity index 100% rename from app/scripts/actions/tagactions.js rename to src/scripts/actions/tagactions.js diff --git a/app/scripts/actions/tagclassactions.js b/src/scripts/actions/tagclassactions.js similarity index 100% rename from app/scripts/actions/tagclassactions.js rename to src/scripts/actions/tagclassactions.js diff --git a/app/scripts/actions/userAction.js b/src/scripts/actions/userAction.js similarity index 100% rename from app/scripts/actions/userAction.js rename to src/scripts/actions/userAction.js diff --git a/app/scripts/actions/userDetailAction.js b/src/scripts/actions/userDetailAction.js similarity index 100% rename from app/scripts/actions/userDetailAction.js rename to src/scripts/actions/userDetailAction.js diff --git a/app/scripts/actions/useractions.js b/src/scripts/actions/useractions.js similarity index 100% rename from app/scripts/actions/useractions.js rename to src/scripts/actions/useractions.js diff --git a/app/scripts/actions/userdetailactions.js b/src/scripts/actions/userdetailactions.js similarity index 100% rename from app/scripts/actions/userdetailactions.js rename to src/scripts/actions/userdetailactions.js diff --git a/app/scripts/app.js b/src/scripts/app.js similarity index 100% rename from app/scripts/app.js rename to src/scripts/app.js diff --git a/app/scripts/components/App/App.jsx b/src/scripts/components/App/App.jsx similarity index 100% rename from app/scripts/components/App/App.jsx rename to src/scripts/components/App/App.jsx diff --git a/app/scripts/components/ArticleList/ArticleList.jsx b/src/scripts/components/ArticleList/ArticleList.jsx similarity index 100% rename from app/scripts/components/ArticleList/ArticleList.jsx rename to src/scripts/components/ArticleList/ArticleList.jsx diff --git a/app/scripts/components/ArticleList/index.js b/src/scripts/components/ArticleList/index.js similarity index 100% rename from app/scripts/components/ArticleList/index.js rename to src/scripts/components/ArticleList/index.js diff --git a/app/scripts/components/EditArticle/EditArticle.jsx b/src/scripts/components/EditArticle/EditArticle.jsx similarity index 100% rename from app/scripts/components/EditArticle/EditArticle.jsx rename to src/scripts/components/EditArticle/EditArticle.jsx diff --git a/app/scripts/components/ExplorePage/ExplorePage.jsx b/src/scripts/components/ExplorePage/ExplorePage.jsx similarity index 100% rename from app/scripts/components/ExplorePage/ExplorePage.jsx rename to src/scripts/components/ExplorePage/ExplorePage.jsx diff --git a/app/scripts/components/ExplorePage/index.js b/src/scripts/components/ExplorePage/index.js similarity index 100% rename from app/scripts/components/ExplorePage/index.js rename to src/scripts/components/ExplorePage/index.js diff --git a/app/scripts/components/Home/Home.jsx b/src/scripts/components/Home/Home.jsx similarity index 100% rename from app/scripts/components/Home/Home.jsx rename to src/scripts/components/Home/Home.jsx diff --git a/app/scripts/components/Home/index.js b/src/scripts/components/Home/index.js similarity index 100% rename from app/scripts/components/Home/index.js rename to src/scripts/components/Home/index.js diff --git a/app/scripts/components/PostList/PostList.jsx b/src/scripts/components/PostList/PostList.jsx similarity index 100% rename from app/scripts/components/PostList/PostList.jsx rename to src/scripts/components/PostList/PostList.jsx diff --git a/app/scripts/components/PostList/index.js b/src/scripts/components/PostList/index.js similarity index 100% rename from app/scripts/components/PostList/index.js rename to src/scripts/components/PostList/index.js diff --git a/app/scripts/components/PostPanel/PostPanel.jsx b/src/scripts/components/PostPanel/PostPanel.jsx similarity index 96% rename from app/scripts/components/PostPanel/PostPanel.jsx rename to src/scripts/components/PostPanel/PostPanel.jsx index cfa9b8d..64423fc 100644 --- a/app/scripts/components/PostPanel/PostPanel.jsx +++ b/src/scripts/components/PostPanel/PostPanel.jsx @@ -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 = ( - - {this.props.post.sku.name.substring(0, 25)+'...'} + + {this.props.post.toys.name.substring(0, 25)+'...'} ) } diff --git a/app/scripts/components/PostPanel/postListContainer.js b/src/scripts/components/PostPanel/postListContainer.js similarity index 100% rename from app/scripts/components/PostPanel/postListContainer.js rename to src/scripts/components/PostPanel/postListContainer.js diff --git a/app/scripts/components/PostPanel/userDetailContainer.js b/src/scripts/components/PostPanel/userDetailContainer.js similarity index 100% rename from app/scripts/components/PostPanel/userDetailContainer.js rename to src/scripts/components/PostPanel/userDetailContainer.js diff --git a/app/scripts/components/RecommendHome/RecommendHome.jsx b/src/scripts/components/RecommendHome/RecommendHome.jsx similarity index 100% rename from app/scripts/components/RecommendHome/RecommendHome.jsx rename to src/scripts/components/RecommendHome/RecommendHome.jsx diff --git a/app/scripts/components/RecommendHome/index.js b/src/scripts/components/RecommendHome/index.js similarity index 100% rename from app/scripts/components/RecommendHome/index.js rename to src/scripts/components/RecommendHome/index.js diff --git a/app/scripts/components/SkuList/SkuList.jsx b/src/scripts/components/SkuList/SkuList.jsx similarity index 100% rename from app/scripts/components/SkuList/SkuList.jsx rename to src/scripts/components/SkuList/SkuList.jsx diff --git a/app/scripts/components/SkuList/index.js b/src/scripts/components/SkuList/index.js similarity index 100% rename from app/scripts/components/SkuList/index.js rename to src/scripts/components/SkuList/index.js diff --git a/app/scripts/components/StickerList/StickerList.jsx b/src/scripts/components/StickerList/StickerList.jsx similarity index 100% rename from app/scripts/components/StickerList/StickerList.jsx rename to src/scripts/components/StickerList/StickerList.jsx diff --git a/app/scripts/components/StickerList/index.js b/src/scripts/components/StickerList/index.js similarity index 100% rename from app/scripts/components/StickerList/index.js rename to src/scripts/components/StickerList/index.js diff --git a/app/scripts/components/TagList/TagList.jsx b/src/scripts/components/TagList/TagList.jsx similarity index 100% rename from app/scripts/components/TagList/TagList.jsx rename to src/scripts/components/TagList/TagList.jsx diff --git a/app/scripts/components/TagList/index.js b/src/scripts/components/TagList/index.js similarity index 100% rename from app/scripts/components/TagList/index.js rename to src/scripts/components/TagList/index.js diff --git a/app/scripts/components/UserDetail/UserDetail.jsx b/src/scripts/components/UserDetail/UserDetail.jsx similarity index 100% rename from app/scripts/components/UserDetail/UserDetail.jsx rename to src/scripts/components/UserDetail/UserDetail.jsx diff --git a/app/scripts/components/UserDetail/index.js b/src/scripts/components/UserDetail/index.js similarity index 100% rename from app/scripts/components/UserDetail/index.js rename to src/scripts/components/UserDetail/index.js diff --git a/app/scripts/components/UserList/UserList.jsx b/src/scripts/components/UserList/UserList.jsx similarity index 100% rename from app/scripts/components/UserList/UserList.jsx rename to src/scripts/components/UserList/UserList.jsx diff --git a/app/scripts/components/UserList/index.js b/src/scripts/components/UserList/index.js similarity index 100% rename from app/scripts/components/UserList/index.js rename to src/scripts/components/UserList/index.js diff --git a/app/scripts/components/articlelist.jsx b/src/scripts/components/articlelist.jsx similarity index 100% rename from app/scripts/components/articlelist.jsx rename to src/scripts/components/articlelist.jsx diff --git a/app/scripts/components/bannedusers.jsx b/src/scripts/components/bannedusers.jsx similarity index 100% rename from app/scripts/components/bannedusers.jsx rename to src/scripts/components/bannedusers.jsx diff --git a/app/scripts/components/brandlist.jsx b/src/scripts/components/brandlist.jsx similarity index 100% rename from app/scripts/components/brandlist.jsx rename to src/scripts/components/brandlist.jsx diff --git a/app/scripts/components/editarticle.jsx b/src/scripts/components/editarticle.jsx similarity index 100% rename from app/scripts/components/editarticle.jsx rename to src/scripts/components/editarticle.jsx diff --git a/app/scripts/components/editrecommend.jsx b/src/scripts/components/editrecommend.jsx similarity index 100% rename from app/scripts/components/editrecommend.jsx rename to src/scripts/components/editrecommend.jsx diff --git a/app/scripts/components/editshortvideo.jsx b/src/scripts/components/editshortvideo.jsx similarity index 100% rename from app/scripts/components/editshortvideo.jsx rename to src/scripts/components/editshortvideo.jsx diff --git a/app/scripts/components/editsku.jsx b/src/scripts/components/editsku.jsx similarity index 100% rename from app/scripts/components/editsku.jsx rename to src/scripts/components/editsku.jsx diff --git a/app/scripts/components/editsticker.jsx b/src/scripts/components/editsticker.jsx similarity index 100% rename from app/scripts/components/editsticker.jsx rename to src/scripts/components/editsticker.jsx diff --git a/app/scripts/components/editstickerset.jsx b/src/scripts/components/editstickerset.jsx similarity index 100% rename from app/scripts/components/editstickerset.jsx rename to src/scripts/components/editstickerset.jsx diff --git a/app/scripts/components/edittag.jsx b/src/scripts/components/edittag.jsx similarity index 100% rename from app/scripts/components/edittag.jsx rename to src/scripts/components/edittag.jsx diff --git a/app/scripts/components/explorepage.jsx b/src/scripts/components/explorepage.jsx similarity index 100% rename from app/scripts/components/explorepage.jsx rename to src/scripts/components/explorepage.jsx diff --git a/app/scripts/components/feedback.jsx b/src/scripts/components/feedback.jsx similarity index 100% rename from app/scripts/components/feedback.jsx rename to src/scripts/components/feedback.jsx diff --git a/app/scripts/components/home.jsx b/src/scripts/components/home.jsx similarity index 100% rename from app/scripts/components/home.jsx rename to src/scripts/components/home.jsx diff --git a/app/scripts/components/judgeposts.jsx b/src/scripts/components/judgeposts.jsx similarity index 100% rename from app/scripts/components/judgeposts.jsx rename to src/scripts/components/judgeposts.jsx diff --git a/app/scripts/components/layout.jsx b/src/scripts/components/layout.jsx similarity index 100% rename from app/scripts/components/layout.jsx rename to src/scripts/components/layout.jsx diff --git a/app/scripts/components/postlist.jsx b/src/scripts/components/postlist.jsx similarity index 100% rename from app/scripts/components/postlist.jsx rename to src/scripts/components/postlist.jsx diff --git a/app/scripts/components/postpanel.jsx b/src/scripts/components/postpanel.jsx similarity index 100% rename from app/scripts/components/postpanel.jsx rename to src/scripts/components/postpanel.jsx diff --git a/app/scripts/components/recommendhome.jsx b/src/scripts/components/recommendhome.jsx similarity index 100% rename from app/scripts/components/recommendhome.jsx rename to src/scripts/components/recommendhome.jsx diff --git a/app/scripts/components/report.jsx b/src/scripts/components/report.jsx similarity index 100% rename from app/scripts/components/report.jsx rename to src/scripts/components/report.jsx diff --git a/app/scripts/components/skulist.jsx b/src/scripts/components/skulist.jsx similarity index 100% rename from app/scripts/components/skulist.jsx rename to src/scripts/components/skulist.jsx diff --git a/app/scripts/components/stickerlist.jsx b/src/scripts/components/stickerlist.jsx similarity index 100% rename from app/scripts/components/stickerlist.jsx rename to src/scripts/components/stickerlist.jsx diff --git a/app/scripts/components/taglist.jsx b/src/scripts/components/taglist.jsx similarity index 100% rename from app/scripts/components/taglist.jsx rename to src/scripts/components/taglist.jsx diff --git a/app/scripts/components/test.jsx b/src/scripts/components/test.jsx similarity index 100% rename from app/scripts/components/test.jsx rename to src/scripts/components/test.jsx diff --git a/app/scripts/components/userdetail.jsx b/src/scripts/components/userdetail.jsx similarity index 100% rename from app/scripts/components/userdetail.jsx rename to src/scripts/components/userdetail.jsx diff --git a/app/scripts/components/userlist.jsx b/src/scripts/components/userlist.jsx similarity index 100% rename from app/scripts/components/userlist.jsx rename to src/scripts/components/userlist.jsx diff --git a/app/scripts/main.js b/src/scripts/main.js similarity index 100% rename from app/scripts/main.js rename to src/scripts/main.js diff --git a/app/scripts/reducers/articleReducer.js b/src/scripts/reducers/articleReducer.js similarity index 100% rename from app/scripts/reducers/articleReducer.js rename to src/scripts/reducers/articleReducer.js diff --git a/app/scripts/reducers/exploreReducer.js b/src/scripts/reducers/exploreReducer.js similarity index 100% rename from app/scripts/reducers/exploreReducer.js rename to src/scripts/reducers/exploreReducer.js diff --git a/app/scripts/reducers/postReducer.js b/src/scripts/reducers/postReducer.js similarity index 100% rename from app/scripts/reducers/postReducer.js rename to src/scripts/reducers/postReducer.js diff --git a/app/scripts/reducers/recommendHomeReducer.js b/src/scripts/reducers/recommendHomeReducer.js similarity index 100% rename from app/scripts/reducers/recommendHomeReducer.js rename to src/scripts/reducers/recommendHomeReducer.js diff --git a/app/scripts/reducers/skuReducer.js b/src/scripts/reducers/skuReducer.js similarity index 100% rename from app/scripts/reducers/skuReducer.js rename to src/scripts/reducers/skuReducer.js diff --git a/app/scripts/reducers/statsReducer.js b/src/scripts/reducers/statsReducer.js similarity index 100% rename from app/scripts/reducers/statsReducer.js rename to src/scripts/reducers/statsReducer.js diff --git a/app/scripts/reducers/stickerReducer.js b/src/scripts/reducers/stickerReducer.js similarity index 100% rename from app/scripts/reducers/stickerReducer.js rename to src/scripts/reducers/stickerReducer.js diff --git a/app/scripts/reducers/tagClassReducer.js b/src/scripts/reducers/tagClassReducer.js similarity index 100% rename from app/scripts/reducers/tagClassReducer.js rename to src/scripts/reducers/tagClassReducer.js diff --git a/app/scripts/reducers/tagReducer.js b/src/scripts/reducers/tagReducer.js similarity index 100% rename from app/scripts/reducers/tagReducer.js rename to src/scripts/reducers/tagReducer.js diff --git a/app/scripts/reducers/userDetailReducer.js b/src/scripts/reducers/userDetailReducer.js similarity index 100% rename from app/scripts/reducers/userDetailReducer.js rename to src/scripts/reducers/userDetailReducer.js diff --git a/app/scripts/reducers/userReducer.js b/src/scripts/reducers/userReducer.js similarity index 100% rename from app/scripts/reducers/userReducer.js rename to src/scripts/reducers/userReducer.js diff --git a/app/scripts/routes.js b/src/scripts/routes.js similarity index 100% rename from app/scripts/routes.js rename to src/scripts/routes.js diff --git a/app/scripts/store.js b/src/scripts/store.js similarity index 100% rename from app/scripts/store.js rename to src/scripts/store.js diff --git a/app/scripts/stores/activeusersstore.js b/src/scripts/stores/activeusersstore.js similarity index 100% rename from app/scripts/stores/activeusersstore.js rename to src/scripts/stores/activeusersstore.js diff --git a/app/scripts/stores/articlestore.js b/src/scripts/stores/articlestore.js similarity index 100% rename from app/scripts/stores/articlestore.js rename to src/scripts/stores/articlestore.js diff --git a/app/scripts/stores/banuserstore.js b/src/scripts/stores/banuserstore.js similarity index 100% rename from app/scripts/stores/banuserstore.js rename to src/scripts/stores/banuserstore.js diff --git a/app/scripts/stores/explorebannerstore.js b/src/scripts/stores/explorebannerstore.js similarity index 100% rename from app/scripts/stores/explorebannerstore.js rename to src/scripts/stores/explorebannerstore.js diff --git a/app/scripts/stores/explorethemestore.js b/src/scripts/stores/explorethemestore.js similarity index 100% rename from app/scripts/stores/explorethemestore.js rename to src/scripts/stores/explorethemestore.js diff --git a/app/scripts/stores/feedbackstore.js b/src/scripts/stores/feedbackstore.js similarity index 100% rename from app/scripts/stores/feedbackstore.js rename to src/scripts/stores/feedbackstore.js diff --git a/app/scripts/stores/judgepoststore.js b/src/scripts/stores/judgepoststore.js similarity index 100% rename from app/scripts/stores/judgepoststore.js rename to src/scripts/stores/judgepoststore.js diff --git a/app/scripts/stores/poststore.js b/src/scripts/stores/poststore.js similarity index 100% rename from app/scripts/stores/poststore.js rename to src/scripts/stores/poststore.js diff --git a/app/scripts/stores/recommendhomestore.js b/src/scripts/stores/recommendhomestore.js similarity index 100% rename from app/scripts/stores/recommendhomestore.js rename to src/scripts/stores/recommendhomestore.js diff --git a/app/scripts/stores/reportstore.js b/src/scripts/stores/reportstore.js similarity index 100% rename from app/scripts/stores/reportstore.js rename to src/scripts/stores/reportstore.js diff --git a/app/scripts/stores/skustore.js b/src/scripts/stores/skustore.js similarity index 100% rename from app/scripts/stores/skustore.js rename to src/scripts/stores/skustore.js diff --git a/app/scripts/stores/statsstore.js b/src/scripts/stores/statsstore.js similarity index 100% rename from app/scripts/stores/statsstore.js rename to src/scripts/stores/statsstore.js diff --git a/app/scripts/stores/stickerstore.js b/src/scripts/stores/stickerstore.js similarity index 100% rename from app/scripts/stores/stickerstore.js rename to src/scripts/stores/stickerstore.js diff --git a/app/scripts/stores/tagclassstore.js b/src/scripts/stores/tagclassstore.js similarity index 100% rename from app/scripts/stores/tagclassstore.js rename to src/scripts/stores/tagclassstore.js diff --git a/app/scripts/stores/tagstore.js b/src/scripts/stores/tagstore.js similarity index 100% rename from app/scripts/stores/tagstore.js rename to src/scripts/stores/tagstore.js diff --git a/app/scripts/stores/userdetailstore.js b/src/scripts/stores/userdetailstore.js similarity index 100% rename from app/scripts/stores/userdetailstore.js rename to src/scripts/stores/userdetailstore.js diff --git a/app/scripts/stores/userliststore.js b/src/scripts/stores/userliststore.js similarity index 100% rename from app/scripts/stores/userliststore.js rename to src/scripts/stores/userliststore.js diff --git a/app/scripts/urls.js b/src/scripts/urls.js similarity index 100% rename from app/scripts/urls.js rename to src/scripts/urls.js diff --git a/app/scripts/utils/stateToHTML.js b/src/scripts/utils/stateToHTML.js similarity index 100% rename from app/scripts/utils/stateToHTML.js rename to src/scripts/utils/stateToHTML.js diff --git a/app/scripts/widgets/cdn.jsx b/src/scripts/widgets/cdn.jsx similarity index 100% rename from app/scripts/widgets/cdn.jsx rename to src/scripts/widgets/cdn.jsx diff --git a/app/scripts/widgets/if.jsx b/src/scripts/widgets/if.jsx similarity index 100% rename from app/scripts/widgets/if.jsx rename to src/scripts/widgets/if.jsx diff --git a/app/scripts/widgets/numbercard.jsx b/src/scripts/widgets/numbercard.jsx similarity index 100% rename from app/scripts/widgets/numbercard.jsx rename to src/scripts/widgets/numbercard.jsx diff --git a/app/scripts/widgets/test.jsx b/src/scripts/widgets/test.jsx similarity index 100% rename from app/scripts/widgets/test.jsx rename to src/scripts/widgets/test.jsx diff --git a/webpack.config.js b/webpack.config.js index a1b3959..bb79289 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -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', @@ -18,7 +18,7 @@ module.exports = { extensions: ['', '.js', '.jsx'] }, output: { - path: path.resolve(__dirname, 'app'), + path: path.resolve(__dirname, 'src'), filename: '/scripts/bundle.js' }, module: { @@ -26,7 +26,7 @@ module.exports = { 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', @@ -57,7 +57,7 @@ module.exports = { }) ], devServer: { - contentBase: "app", + contentBase: "src", hot: true, progress: true, inline: true, diff --git a/webpack.production.config.js b/webpack.production.config.js index 4c95489..78301e4 100644 --- a/webpack.production.config.js +++ b/webpack.production.config.js @@ -9,7 +9,7 @@ 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', @@ -17,7 +17,7 @@ const config = { ] }, output: { - path: path.resolve(__dirname, 'dist'), + path: path.resolve(__dirname, 'build'), filename: 'scripts/bundle.js' }, resolve: { @@ -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$/, @@ -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,