diff --git a/.gitignore b/.gitignore index 6ebfbcb..7d5efcd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ #node_modules ignore -node_modules +src/node_modules +server/node_modules #.envs -.env -#build -/build \ No newline at end of file +src/.env +server/.env +#builds +src/build +server/build \ No newline at end of file diff --git a/.babelrc b/src/.babelrc similarity index 100% rename from .babelrc rename to src/.babelrc diff --git a/.env.example b/src/.env.example similarity index 100% rename from .env.example rename to src/.env.example diff --git a/LICENSE b/src/LICENSE similarity index 100% rename from LICENSE rename to src/LICENSE diff --git a/PRNameGenerator.ts b/src/PRNameGenerator.ts similarity index 100% rename from PRNameGenerator.ts rename to src/PRNameGenerator.ts diff --git a/src/components/App.jsx b/src/frontend/components/App.jsx similarity index 100% rename from src/components/App.jsx rename to src/frontend/components/App.jsx diff --git a/src/index.js b/src/frontend/index.js similarity index 100% rename from src/index.js rename to src/frontend/index.js diff --git a/src/styles/global.sass b/src/frontend/styles/global.sass similarity index 100% rename from src/styles/global.sass rename to src/frontend/styles/global.sass diff --git a/package-lock.json b/src/package-lock.json similarity index 100% rename from package-lock.json rename to src/package-lock.json diff --git a/package.json b/src/package.json similarity index 100% rename from package.json rename to src/package.json diff --git a/public/index.html b/src/public/index.html similarity index 100% rename from public/index.html rename to src/public/index.html diff --git a/webpack.config.dev.js b/src/webpack.config.dev.js similarity index 90% rename from webpack.config.dev.js rename to src/webpack.config.dev.js index 307e003..e52182f 100644 --- a/webpack.config.dev.js +++ b/src/webpack.config.dev.js @@ -1,11 +1,11 @@ const path = require('path'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); -const { config: { portDev, portReloadDev } } = require('./src/config') +const { config: { portDev, portReloadDev } } = require('./config') module.exports = { - entry: './src/index.js', + entry: './frontend/index.js', output: { path: path.resolve(__dirname, 'build'), filename: 'bundle.js', @@ -50,7 +50,7 @@ module.exports = { ], devServer: { static: { - directory: path.join(__dirname, 'dist') + directory: path.join(__dirname, 'build') }, allowedHosts: "all", compress: true, diff --git a/webpack.config.js b/src/webpack.config.js similarity index 94% rename from webpack.config.js rename to src/webpack.config.js index 9fdb70d..d24fecc 100644 --- a/webpack.config.js +++ b/src/webpack.config.js @@ -6,7 +6,7 @@ const TerserPlugin = require('terser-webpack-plugin'); const { CleanWebpackPlugin } = require('clean-webpack-plugin'); module.exports = { - entry: './src/index.js', + entry: './frontend/index.js', output: { path: path.resolve(__dirname, 'build'), filename: 'bundle.js', @@ -16,7 +16,7 @@ module.exports = { extensions: ['.js', '.jsx'], alias: { '@components': path.resolve(__dirname, 'src/components/'), - '@styles': path.resolve(__dirname, 'src/styles/'), + '@styles': path.resolve(__dirname, 'frontend/styles/'), } }, mode: 'production',