diff --git a/package.json b/package.json index 6e4345f..5446d3d 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "private": true, "scripts": { "clean": "rm ./public_html/*.{js,css,html,svg,map}", - "dev": "parcel index.html --out-dir ./public_html", - "build": "parcel build index.html --out-dir ./public_html" + "dev": "parcel ./parcel/index.html --out-dir ./public_html", + "build": "parcel build ./parcel/index.html --out-dir ./public_html" }, "dependencies": { "vue": "^2.5.9", diff --git a/asset/svg/arrow.down.svg b/parcel/asset/svg/arrow.down.svg similarity index 100% rename from asset/svg/arrow.down.svg rename to parcel/asset/svg/arrow.down.svg diff --git a/asset/svg/arrow.down@hover.svg b/parcel/asset/svg/arrow.down@hover.svg similarity index 100% rename from asset/svg/arrow.down@hover.svg rename to parcel/asset/svg/arrow.down@hover.svg diff --git a/asset/svg/arrow.left.svg b/parcel/asset/svg/arrow.left.svg similarity index 100% rename from asset/svg/arrow.left.svg rename to parcel/asset/svg/arrow.left.svg diff --git a/asset/svg/arrow.left@hover.svg b/parcel/asset/svg/arrow.left@hover.svg similarity index 100% rename from asset/svg/arrow.left@hover.svg rename to parcel/asset/svg/arrow.left@hover.svg diff --git a/asset/svg/arrow.right.svg b/parcel/asset/svg/arrow.right.svg similarity index 100% rename from asset/svg/arrow.right.svg rename to parcel/asset/svg/arrow.right.svg diff --git a/asset/svg/arrow.right@hover.svg b/parcel/asset/svg/arrow.right@hover.svg similarity index 100% rename from asset/svg/arrow.right@hover.svg rename to parcel/asset/svg/arrow.right@hover.svg diff --git a/asset/svg/arrow.up.svg b/parcel/asset/svg/arrow.up.svg similarity index 100% rename from asset/svg/arrow.up.svg rename to parcel/asset/svg/arrow.up.svg diff --git a/asset/svg/arrow.up@hover.svg b/parcel/asset/svg/arrow.up@hover.svg similarity index 100% rename from asset/svg/arrow.up@hover.svg rename to parcel/asset/svg/arrow.up@hover.svg diff --git a/asset/svg/audio.close.svg b/parcel/asset/svg/audio.close.svg similarity index 100% rename from asset/svg/audio.close.svg rename to parcel/asset/svg/audio.close.svg diff --git a/asset/svg/checked.svg b/parcel/asset/svg/checked.svg similarity index 100% rename from asset/svg/checked.svg rename to parcel/asset/svg/checked.svg diff --git a/asset/svg/cross.svg b/parcel/asset/svg/cross.svg similarity index 100% rename from asset/svg/cross.svg rename to parcel/asset/svg/cross.svg diff --git a/asset/svg/dialog.add.svg b/parcel/asset/svg/dialog.add.svg similarity index 100% rename from asset/svg/dialog.add.svg rename to parcel/asset/svg/dialog.add.svg diff --git a/asset/svg/dialog.add@hover.svg b/parcel/asset/svg/dialog.add@hover.svg similarity index 100% rename from asset/svg/dialog.add@hover.svg rename to parcel/asset/svg/dialog.add@hover.svg diff --git a/asset/svg/dialog.text.svg b/parcel/asset/svg/dialog.text.svg similarity index 100% rename from asset/svg/dialog.text.svg rename to parcel/asset/svg/dialog.text.svg diff --git a/asset/svg/dialog.text@active.svg b/parcel/asset/svg/dialog.text@active.svg similarity index 100% rename from asset/svg/dialog.text@active.svg rename to parcel/asset/svg/dialog.text@active.svg diff --git a/asset/svg/dialog.voice.svg b/parcel/asset/svg/dialog.voice.svg similarity index 100% rename from asset/svg/dialog.voice.svg rename to parcel/asset/svg/dialog.voice.svg diff --git a/asset/svg/dialog.voice@active.svg b/parcel/asset/svg/dialog.voice@active.svg similarity index 100% rename from asset/svg/dialog.voice@active.svg rename to parcel/asset/svg/dialog.voice@active.svg diff --git a/asset/svg/loader.svg b/parcel/asset/svg/loader.svg similarity index 100% rename from asset/svg/loader.svg rename to parcel/asset/svg/loader.svg diff --git a/asset/svg/menu.add.svg b/parcel/asset/svg/menu.add.svg similarity index 100% rename from asset/svg/menu.add.svg rename to parcel/asset/svg/menu.add.svg diff --git a/asset/svg/menu.add@hover.svg b/parcel/asset/svg/menu.add@hover.svg similarity index 100% rename from asset/svg/menu.add@hover.svg rename to parcel/asset/svg/menu.add@hover.svg diff --git a/asset/svg/menu.group.svg b/parcel/asset/svg/menu.group.svg similarity index 100% rename from asset/svg/menu.group.svg rename to parcel/asset/svg/menu.group.svg diff --git a/asset/svg/minipopup.category.svg b/parcel/asset/svg/minipopup.category.svg similarity index 100% rename from asset/svg/minipopup.category.svg rename to parcel/asset/svg/minipopup.category.svg diff --git a/asset/svg/minipopup.create.svg b/parcel/asset/svg/minipopup.create.svg similarity index 100% rename from asset/svg/minipopup.create.svg rename to parcel/asset/svg/minipopup.create.svg diff --git a/asset/svg/minipopup.edit.svg b/parcel/asset/svg/minipopup.edit.svg similarity index 100% rename from asset/svg/minipopup.edit.svg rename to parcel/asset/svg/minipopup.edit.svg diff --git a/asset/svg/minipopup.invite.svg b/parcel/asset/svg/minipopup.invite.svg similarity index 100% rename from asset/svg/minipopup.invite.svg rename to parcel/asset/svg/minipopup.invite.svg diff --git a/asset/svg/minipopup.leave.svg b/parcel/asset/svg/minipopup.leave.svg similarity index 100% rename from asset/svg/minipopup.leave.svg rename to parcel/asset/svg/minipopup.leave.svg diff --git a/asset/svg/minipopup.logout.svg b/parcel/asset/svg/minipopup.logout.svg similarity index 100% rename from asset/svg/minipopup.logout.svg rename to parcel/asset/svg/minipopup.logout.svg diff --git a/asset/svg/minipopup.password.svg b/parcel/asset/svg/minipopup.password.svg similarity index 100% rename from asset/svg/minipopup.password.svg rename to parcel/asset/svg/minipopup.password.svg diff --git a/asset/svg/minipopup.remove.svg b/parcel/asset/svg/minipopup.remove.svg similarity index 100% rename from asset/svg/minipopup.remove.svg rename to parcel/asset/svg/minipopup.remove.svg diff --git a/asset/svg/minipopup.remove@hover.svg b/parcel/asset/svg/minipopup.remove@hover.svg similarity index 100% rename from asset/svg/minipopup.remove@hover.svg rename to parcel/asset/svg/minipopup.remove@hover.svg diff --git a/asset/svg/voice.connected.svg b/parcel/asset/svg/voice.connected.svg similarity index 100% rename from asset/svg/voice.connected.svg rename to parcel/asset/svg/voice.connected.svg diff --git a/index.html b/parcel/index.html similarity index 79% rename from index.html rename to parcel/index.html index 3d741db..8bdbae4 100644 --- a/index.html +++ b/parcel/index.html @@ -22,8 +22,8 @@ - - + + @@ -32,7 +32,7 @@
- + diff --git a/webpack/lib/api-client.js b/parcel/lib/api-client.js similarity index 100% rename from webpack/lib/api-client.js rename to parcel/lib/api-client.js diff --git a/webpack/lib/audio-manager.js b/parcel/lib/audio-manager.js similarity index 100% rename from webpack/lib/audio-manager.js rename to parcel/lib/audio-manager.js diff --git a/webpack/lib/authentication.js b/parcel/lib/authentication.js similarity index 100% rename from webpack/lib/authentication.js rename to parcel/lib/authentication.js diff --git a/webpack/lib/channel-controller.js b/parcel/lib/channel-controller.js similarity index 100% rename from webpack/lib/channel-controller.js rename to parcel/lib/channel-controller.js diff --git a/webpack/lib/client/client-driver.js b/parcel/lib/client/client-driver.js similarity index 100% rename from webpack/lib/client/client-driver.js rename to parcel/lib/client/client-driver.js diff --git a/webpack/lib/client/ws.js b/parcel/lib/client/ws.js similarity index 100% rename from webpack/lib/client/ws.js rename to parcel/lib/client/ws.js diff --git a/webpack/lib/client/xhr.js b/parcel/lib/client/xhr.js similarity index 100% rename from webpack/lib/client/xhr.js rename to parcel/lib/client/xhr.js diff --git a/webpack/lib/content-controller.js b/parcel/lib/content-controller.js similarity index 100% rename from webpack/lib/content-controller.js rename to parcel/lib/content-controller.js diff --git a/webpack/lib/field-manager.js b/parcel/lib/field-manager.js similarity index 100% rename from webpack/lib/field-manager.js rename to parcel/lib/field-manager.js diff --git a/webpack/lib/field-validator.js b/parcel/lib/field-validator.js similarity index 100% rename from webpack/lib/field-validator.js rename to parcel/lib/field-validator.js diff --git a/webpack/lib/gstore.js b/parcel/lib/gstore.js similarity index 100% rename from webpack/lib/gstore.js rename to parcel/lib/gstore.js diff --git a/webpack/lib/local-storage-interface.js b/parcel/lib/local-storage-interface.js similarity index 100% rename from webpack/lib/local-storage-interface.js rename to parcel/lib/local-storage-interface.js diff --git a/webpack/lib/popup-controller.js b/parcel/lib/popup-controller.js similarity index 100% rename from webpack/lib/popup-controller.js rename to parcel/lib/popup-controller.js diff --git a/webpack/lib/room-controller.js b/parcel/lib/room-controller.js similarity index 100% rename from webpack/lib/room-controller.js rename to parcel/lib/room-controller.js diff --git a/webpack/main.js b/parcel/main.js similarity index 100% rename from webpack/main.js rename to parcel/main.js diff --git a/webpack/mockup/api-channel-init.json b/parcel/mockup/api-channel-init.json similarity index 100% rename from webpack/mockup/api-channel-init.json rename to parcel/mockup/api-channel-init.json diff --git a/webpack/mockup/api-channels.json b/parcel/mockup/api-channels.json similarity index 100% rename from webpack/mockup/api-channels.json rename to parcel/mockup/api-channels.json diff --git a/webpack/mockup/api.list b/parcel/mockup/api.list similarity index 100% rename from webpack/mockup/api.list rename to parcel/mockup/api.list diff --git a/webpack/mockup/ws-login-error.json b/parcel/mockup/ws-login-error.json similarity index 100% rename from webpack/mockup/ws-login-error.json rename to parcel/mockup/ws-login-error.json diff --git a/webpack/mockup/ws-login-success.json b/parcel/mockup/ws-login-success.json similarity index 100% rename from webpack/mockup/ws-login-success.json rename to parcel/mockup/ws-login-success.json diff --git a/webpack/mockup/ws-text-room-update.json b/parcel/mockup/ws-text-room-update.json similarity index 100% rename from webpack/mockup/ws-text-room-update.json rename to parcel/mockup/ws-text-room-update.json diff --git a/webpack/page/auth/channel.js b/parcel/page/auth/channel.js similarity index 100% rename from webpack/page/auth/channel.js rename to parcel/page/auth/channel.js diff --git a/webpack/page/noauth/login.js b/parcel/page/noauth/login.js similarity index 100% rename from webpack/page/noauth/login.js rename to parcel/page/noauth/login.js diff --git a/webpack/page/noauth/register.js b/parcel/page/noauth/register.js similarity index 100% rename from webpack/page/noauth/register.js rename to parcel/page/noauth/register.js diff --git a/webpack/routes.js b/parcel/routes.js similarity index 100% rename from webpack/routes.js rename to parcel/routes.js diff --git a/scss/constants.scss b/parcel/scss/constants.scss similarity index 100% rename from scss/constants.scss rename to parcel/scss/constants.scss diff --git a/scss/container.scss b/parcel/scss/container.scss similarity index 100% rename from scss/container.scss rename to parcel/scss/container.scss diff --git a/scss/dialog.scss b/parcel/scss/dialog.scss similarity index 100% rename from scss/dialog.scss rename to parcel/scss/dialog.scss diff --git a/scss/global.scss b/parcel/scss/global.scss similarity index 100% rename from scss/global.scss rename to parcel/scss/global.scss diff --git a/scss/layout.scss b/parcel/scss/layout.scss similarity index 100% rename from scss/layout.scss rename to parcel/scss/layout.scss diff --git a/scss/menu.scss b/parcel/scss/menu.scss similarity index 100% rename from scss/menu.scss rename to parcel/scss/menu.scss diff --git a/scss/pop-up.scss b/parcel/scss/pop-up.scss similarity index 100% rename from scss/pop-up.scss rename to parcel/scss/pop-up.scss diff --git a/scss/side-menu.scss b/parcel/scss/side-menu.scss similarity index 100% rename from scss/side-menu.scss rename to parcel/scss/side-menu.scss diff --git a/webpack/setup.js b/parcel/setup.js similarity index 100% rename from webpack/setup.js rename to parcel/setup.js diff --git a/webpack/vue/auth/channel.vue b/parcel/vue/auth/channel.vue similarity index 100% rename from webpack/vue/auth/channel.vue rename to parcel/vue/auth/channel.vue diff --git a/webpack/vue/auth/dialog.vue b/parcel/vue/auth/dialog.vue similarity index 100% rename from webpack/vue/auth/dialog.vue rename to parcel/vue/auth/dialog.vue diff --git a/webpack/vue/auth/menu.vue b/parcel/vue/auth/menu.vue similarity index 100% rename from webpack/vue/auth/menu.vue rename to parcel/vue/auth/menu.vue diff --git a/webpack/vue/auth/side-menu.vue b/parcel/vue/auth/side-menu.vue similarity index 100% rename from webpack/vue/auth/side-menu.vue rename to parcel/vue/auth/side-menu.vue diff --git a/webpack/vue/auth/wrapper.vue b/parcel/vue/auth/wrapper.vue similarity index 100% rename from webpack/vue/auth/wrapper.vue rename to parcel/vue/auth/wrapper.vue diff --git a/webpack/vue/noauth/login.vue b/parcel/vue/noauth/login.vue similarity index 100% rename from webpack/vue/noauth/login.vue rename to parcel/vue/noauth/login.vue diff --git a/webpack/vue/noauth/register.vue b/parcel/vue/noauth/register.vue similarity index 100% rename from webpack/vue/noauth/register.vue rename to parcel/vue/noauth/register.vue diff --git a/webpack/vue/noauth/wrapper.vue b/parcel/vue/noauth/wrapper.vue similarity index 100% rename from webpack/vue/noauth/wrapper.vue rename to parcel/vue/noauth/wrapper.vue diff --git a/public_html/index.html b/public_html/index.html index 980c2df..be1d981 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -1 +1 @@ - Douscord
\ No newline at end of file + Douscord
\ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index aea2ea3..0000000 --- a/webpack.config.js +++ /dev/null @@ -1,85 +0,0 @@ -var path = require('path'); -var webpack = require('webpack'); -var UglifyJSPlugin = require('uglifyjs-webpack-plugin'); - -const ExtractTextPlugin = require("extract-text-webpack-plugin"); - -const extractSass = new ExtractTextPlugin({ - filename: "[name].css", - disable: process.env.NODE_ENV === "development" -}); - -var mod_common = { - rules: [ - { - test: /\.css$/, - use: [ - 'vue-style-loader', - 'css-loader' - ], - }, { - test: /\.vue$/, - loader: 'vue-loader', - options: { - loaders: {} // other vue-loader options go here - } - }, { - test: /\.js$/, - loader: 'babel-loader', - exclude: /node_modules/ - }, { - test: /\.(png|jpg|gif)$/, - loader: 'file-loader', - options: { name: '[name].[ext]?[hash]' } - }, { - test: /\.svg$/, - loader: 'vue-svg-loader', // `vue-svg` for webpack 1.x - options: { - // optional [svgo](https://github.com/svg/svgo) options - svgo: { - plugins: [ - {removeDoctype: true}, - {removeComments: true} - ] - } - } - } - ] -}; - - - -module.exports = { - - name: "main", - entry: './webpack/main.js', - output: { - path: path.resolve(__dirname, './public_html/js'), - publicPath: '/js/', - filename: 'bundle.js' - }, - module: mod_common, - devtool: (process.env.NODE_ENV!=='production') ? '#eval-source-map' : false - -} - - - -if (process.env.NODE_ENV === 'production') { - - // http://vue-loader.vuejs.org/en/workflow/production.html - module.exports.plugins = (module.exports.plugins || []).concat([ - new webpack.DefinePlugin({ - 'process.env': { - NODE_ENV: '"production"' - } - }), - new UglifyJSPlugin({ - sourceMap: true - }), - new webpack.LoaderOptionsPlugin({ - minimize: true - }) - ]) - -}