diff --git a/package.json b/package.json index 43a3478..ad39f9f 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,8 @@ "main": "src/js/main.js", "scripts": { "dev": "webpack --config webpack.dev.js", - "watch": "webpack --progress --watch --config webpack.dev.js", - "build": "webpack --progress --hide-modules --config webpack.prod.js", + "watch": "webpack --progress --watch --config src/webpack.dev.js", + "build": "webpack --progress --hide-modules --config src/webpack.prod.js", "lint": "eslint --ext .js,.vue src", "lint:fix": "eslint --ext .js,.vue src --fix", "test": "jest", diff --git a/src/js/App.vue b/src/App.vue similarity index 100% rename from src/js/App.vue rename to src/App.vue diff --git a/src/js/components/_base-CloudDiv.vue b/src/components/_base-CloudDiv.vue similarity index 100% rename from src/js/components/_base-CloudDiv.vue rename to src/components/_base-CloudDiv.vue diff --git a/src/js/components/_base-Controls.vue b/src/components/_base-Controls.vue similarity index 100% rename from src/js/components/_base-Controls.vue rename to src/components/_base-Controls.vue diff --git a/src/js/components/_base-LoadingOverlay.vue b/src/components/_base-LoadingOverlay.vue similarity index 100% rename from src/js/components/_base-LoadingOverlay.vue rename to src/components/_base-LoadingOverlay.vue diff --git a/src/js/components/_base-SideBar.vue b/src/components/_base-SideBar.vue similarity index 100% rename from src/js/components/_base-SideBar.vue rename to src/components/_base-SideBar.vue diff --git a/src/js/components/_base-UserDiv.vue b/src/components/_base-UserDiv.vue similarity index 100% rename from src/js/components/_base-UserDiv.vue rename to src/components/_base-UserDiv.vue diff --git a/src/js/components/dateFormItem.vue b/src/components/dateFormItem.vue similarity index 100% rename from src/js/components/dateFormItem.vue rename to src/components/dateFormItem.vue diff --git a/src/js/components/formListItem.vue b/src/components/formListItem.vue similarity index 100% rename from src/js/components/formListItem.vue rename to src/components/formListItem.vue diff --git a/src/js/components/quizFormItem.vue b/src/components/quizFormItem.vue similarity index 100% rename from src/js/components/quizFormItem.vue rename to src/components/quizFormItem.vue diff --git a/src/js/components/resultItem.vue b/src/components/resultItem.vue similarity index 100% rename from src/js/components/resultItem.vue rename to src/components/resultItem.vue diff --git a/src/js/components/shareDiv.vue b/src/components/shareDiv.vue similarity index 100% rename from src/js/components/shareDiv.vue rename to src/components/shareDiv.vue diff --git a/src/js/components/sideBarClose.vue b/src/components/sideBarClose.vue similarity index 100% rename from src/js/components/sideBarClose.vue rename to src/components/sideBarClose.vue diff --git a/src/js/components/textFormItem.vue b/src/components/textFormItem.vue similarity index 100% rename from src/js/components/textFormItem.vue rename to src/components/textFormItem.vue diff --git a/src/js/main.js b/src/main.js similarity index 100% rename from src/js/main.js rename to src/main.js diff --git a/src/js/plugins/modalDialog.vue b/src/plugins/modalDialog.vue similarity index 100% rename from src/js/plugins/modalDialog.vue rename to src/plugins/modalDialog.vue diff --git a/src/js/plugins/plugin.js b/src/plugins/plugin.js similarity index 100% rename from src/js/plugins/plugin.js rename to src/plugins/plugin.js diff --git a/src/js/router.js b/src/router.js similarity index 100% rename from src/js/router.js rename to src/router.js diff --git a/src/js/views/Create.vue b/src/views/Create.vue similarity index 100% rename from src/js/views/Create.vue rename to src/views/Create.vue diff --git a/src/js/views/List.vue b/src/views/List.vue similarity index 100% rename from src/js/views/List.vue rename to src/views/List.vue diff --git a/src/js/views/Results.vue b/src/views/Results.vue similarity index 100% rename from src/js/views/Results.vue rename to src/views/Results.vue diff --git a/src/js/views/img/app.svg b/src/views/img/app.svg similarity index 100% rename from src/js/views/img/app.svg rename to src/views/img/app.svg diff --git a/src/js/views/img/expired-unvoted-vote.svg b/src/views/img/expired-unvoted-vote.svg similarity index 100% rename from src/js/views/img/expired-unvoted-vote.svg rename to src/views/img/expired-unvoted-vote.svg diff --git a/src/js/views/img/expired-voted-vote.svg b/src/views/img/expired-voted-vote.svg similarity index 100% rename from src/js/views/img/expired-voted-vote.svg rename to src/views/img/expired-voted-vote.svg diff --git a/src/js/views/img/open-unvoted-vote.svg b/src/views/img/open-unvoted-vote.svg similarity index 100% rename from src/js/views/img/open-unvoted-vote.svg rename to src/views/img/open-unvoted-vote.svg diff --git a/src/js/views/img/open-voted-vote.svg b/src/views/img/open-voted-vote.svg similarity index 100% rename from src/js/views/img/open-voted-vote.svg rename to src/views/img/open-voted-vote.svg diff --git a/webpack.common.js b/src/webpack.common.js similarity index 89% rename from webpack.common.js rename to src/webpack.common.js index b09f4d2..d063820 100644 --- a/webpack.common.js +++ b/src/webpack.common.js @@ -4,10 +4,10 @@ const { VueLoaderPlugin } = require('vue-loader'); module.exports = { entry: { - 'forms' : path.join(__dirname, 'src/js/', 'main.js'), + 'forms' : path.join(__dirname, 'main.js'), }, output: { - path: path.resolve(__dirname, './js'), + path: path.resolve(__dirname, '../js'), publicPath: '/js/', filename: '[name].js' }, diff --git a/webpack.dev.js b/src/webpack.dev.js similarity index 100% rename from webpack.dev.js rename to src/webpack.dev.js diff --git a/webpack.prod.js b/src/webpack.prod.js similarity index 100% rename from webpack.prod.js rename to src/webpack.prod.js