From 89b37a8166ebedaea8851c25b4a81be69aea36c9 Mon Sep 17 00:00:00 2001 From: Ganning Xu Date: Tue, 23 Nov 2021 09:19:03 -0500 Subject: [PATCH 1/3] only base64 response to a file --- client/.prettierrc.js | 2 +- client/package.json | 8 ++- client/public/index.html | 47 ++++++++---------- client/src/App.vue | 4 +- client/src/components/Product.vue | 5 +- client/src/components/ProductList.vue | 22 ++++---- client/src/components/ResetDataBtn.vue | 41 +++++++++++++-- dump.rdb | Bin 0 -> 92 bytes server/.env.example | 2 +- server/dump.rdb | Bin 0 -> 92 bytes .../controllers/Product/IndexController.js | 4 +- .../controllers/Product/ResetController.js | 1 - 12 files changed, 83 insertions(+), 53 deletions(-) create mode 100644 dump.rdb create mode 100644 server/dump.rdb diff --git a/client/.prettierrc.js b/client/.prettierrc.js index 83b090e..cc41960 100644 --- a/client/.prettierrc.js +++ b/client/.prettierrc.js @@ -10,5 +10,5 @@ module.exports = { proseWrap: 'always', htmlWhitespaceSensitivity: 'strict', endOfLine: 'lf', - arrowParens: 'avoid' + arrowParens: 'avoid', }; diff --git a/client/package.json b/client/package.json index f1edb13..b4fddb6 100644 --- a/client/package.json +++ b/client/package.json @@ -17,6 +17,8 @@ "dependencies": { "axios": "^0.21.1", "core-js": "^3.6.5", + "node-fetch": "^2.6.2", + "node-http": "0.0.5", "vue": "^2.6.12", "vuelidate": "^0.7.6", "vuetify": "^2.4.0", @@ -49,7 +51,9 @@ "parserOptions": { "parser": "babel-eslint" }, - "rules": {} + "rules": { + "vue/no-unused-components": "off" + } }, "browserslist": [ "> 1%", @@ -58,4 +62,4 @@ ], "_id": "redis-shopping-cart-client@1.0.0", "license": "MIT" -} +} \ No newline at end of file diff --git a/client/public/index.html b/client/public/index.html index 0deacb3..fba3ffd 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -1,29 +1,24 @@ - - - - - - Redis Shopping Cart - - - - - +
+ + + + \ No newline at end of file diff --git a/client/src/App.vue b/client/src/App.vue index 58be81e..4c162ed 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -5,7 +5,9 @@
mdi-cart-plus
-

TinyHat.me Online Store

+

TinyHat.me Online Store

diff --git a/client/src/components/Product.vue b/client/src/components/Product.vue index fb2e5b0..0b48443 100644 --- a/client/src/components/Product.vue +++ b/client/src/components/Product.vue @@ -2,10 +2,7 @@
- +
diff --git a/client/src/components/ProductList.vue b/client/src/components/ProductList.vue index d064de5..a718fa6 100644 --- a/client/src/components/ProductList.vue +++ b/client/src/components/ProductList.vue @@ -1,15 +1,15 @@ diff --git a/client/src/main.js b/client/src/main.js index dd71934..9800e10 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -3,6 +3,16 @@ import store from './store'; import vuetify from './plugins/vuetify'; import App from './App.vue'; import './styles/styles.scss'; +import { BootstrapVue, IconsPlugin } from 'bootstrap-vue' + +// Import Bootstrap an BootstrapVue CSS files (order is important) +import 'bootstrap/dist/css/bootstrap.css' +import 'bootstrap-vue/dist/bootstrap-vue.css' + +// Make BootstrapVue available throughout your project +Vue.use(BootstrapVue) +// Optionally install the BootstrapVue icon components plugin +Vue.use(IconsPlugin) Vue.config.productionTip = false; diff --git a/client/src/styles/styles.scss b/client/src/styles/styles.scss index 4f63dfb..d542989 100644 --- a/client/src/styles/styles.scss +++ b/client/src/styles/styles.scss @@ -41,3 +41,15 @@ input { box-shadow: 0px 3px 1px -2px rgb(0 0 0 / 20%), 0px 2px 2px 0px rgb(0 0 0 / 14%), 0px 1px 5px 0px rgb(0 0 0 / 12%) !important; } + +.file-upload { + margin-top: 1rem !important; +} + +.file-cont { + margin-top: 1rem !important; +} + +.hidden { + display: none !important; +} \ No newline at end of file From d03356e26d218301790397d172e0be2d2d4575dc Mon Sep 17 00:00:00 2001 From: Ganning Xu Date: Wed, 24 Nov 2021 21:42:31 -0500 Subject: [PATCH 3/3] fix merge conflicts --- client/src/components/ResetDataBtn.vue | 45 +++----------------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/client/src/components/ResetDataBtn.vue b/client/src/components/ResetDataBtn.vue index b3423f7..9b723e2 100644 --- a/client/src/components/ResetDataBtn.vue +++ b/client/src/components/ResetDataBtn.vue @@ -1,63 +1,26 @@