diff --git a/backupDatabase.sh b/backupDatabase.sh new file mode 100755 index 0000000..77ea196 --- /dev/null +++ b/backupDatabase.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +BACKUPDIR="databaseBackupPi" + +cd .. +mkdir -p $BACKUPDIR +cd $BACKUPDIR + +NOW=$(date +"%Y-%m-%d_%H-%M") +ssh mab@avidhabit.com -p 13328 "mysqldump --all-databases --user root -pRootPass1234!" > "backup-$NOW.sql" + +cp "backup-$NOW.sql" "/mnt/Windows Data/DatabaseBackups/backup-$NOW.sql" + +echo "Database Backup Complete" + +#Restore DB +# copy file over, run restore +# scp -P 13328 backup-2019-12-04_03-00.sql mab@avidhabit.com:/home/mab +# mysql -u root -p < backup-2019-12-04_03-00.sql \ No newline at end of file diff --git a/buildAndUpdateProd.sh b/buildAndUpdateProd.sh index ca9e1dd..c6bba11 100755 --- a/buildAndUpdateProd.sh +++ b/buildAndUpdateProd.sh @@ -5,19 +5,16 @@ # Push built release files to production server # -echo -e "\e[32m\nStarting Build, hold onto your parts... \n\e[0m" +echo -e "\e[32m\nStarting Build. \n\e[0m" # Build out new release cd client npm run build cd .. -# Remove old releases -rm release.tar.gz - # only compress client/dist and server with node_modules echo -e "\e[32m\nCompressing client and server code... \n\e[0m" -tar -czf release.tar.gz server node_modules client/dist package.json +tar -czf release.tar.gz server node_modules client/dist staticFiles/assets #send compressed release to remote machine echo -e "\e[32m\nMoving compressed release to production... \n\e[0m" @@ -28,7 +25,7 @@ rm release.tar.gz #uncompress release on server echo -e "\e[32m\nExtracting release on production... \n\e[0m" -ssh mab@avidhabit.com -p 13328 "cd /home/mab/pi/; rm -r server node_modules client; tar -xzf *.tar.gz; rm *.tar.gz; pm2 reload all" +ssh mab@avidhabit.com -p 13328 "cd /home/mab/pi/; rm -r server node_modules client; tar -xzf *.tar.gz --overwrite; rm *.tar.gz; pm2 reload all" #Congratulate how awesome you are echo -e "\e[32m\nRelease Complete! Nice Work! \n\e[0m" \ No newline at end of file diff --git a/client/build/webpack.base.conf.js b/client/build/webpack.base.conf.js index a07e683..d0c7197 100644 --- a/client/build/webpack.base.conf.js +++ b/client/build/webpack.base.conf.js @@ -42,7 +42,7 @@ module.exports = { include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')] }, { - test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, + test: /\.(png|jpe?g|gif)(\?.*)?$/, loader: 'url-loader', options: { limit: 10000, @@ -58,11 +58,11 @@ module.exports = { } }, { - test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, + test: /\.(eot|ttf|otf|woff|woff2|svg)(\?.*)?$/, loader: 'url-loader', options: { limit: 10000, - name: utils.assetsPath('fonts/[name].[hash:7].[ext]') + name: utils.assetsPath('fonts/[name].[ext]') } } ] diff --git a/client/build/webpack.dev.conf.js b/client/build/webpack.dev.conf.js index 0dcf320..3784e76 100755 --- a/client/build/webpack.dev.conf.js +++ b/client/build/webpack.dev.conf.js @@ -17,6 +17,9 @@ const devWebpackConfig = merge(baseWebpackConfig, { module: { rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }) }, + watchOptions: { + ignored: ['uploads', 'node_modules'] + }, // cheap-module-eval-source-map is faster for development devtool: config.dev.devtool, diff --git a/client/config/dev.env.js b/client/config/dev.env.js index 1e22973..510a3a5 100644 --- a/client/config/dev.env.js +++ b/client/config/dev.env.js @@ -4,4 +4,4 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"' -}) +}) \ No newline at end of file diff --git a/client/config/index.js b/client/config/index.js index f1e5232..df8c6d1 100644 --- a/client/config/index.js +++ b/client/config/index.js @@ -13,7 +13,7 @@ module.exports = { proxyTable: {}, // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST + host: '0.0.0.0',//'localhost', // can be overwritten by process.env.HOST port: 8444, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/client/index.html b/client/index.html index a0bd543..e6d226e 100644 --- a/client/index.html +++ b/client/index.html @@ -3,10 +3,16 @@
-