From e004b31fa68e9ffec745e12ed2b00e33137c8e53 Mon Sep 17 00:00:00 2001 From: Troplo Date: Wed, 25 Nov 2020 22:36:05 +1100 Subject: [PATCH] Finishing off Marketplace for release --- .gitignore | 4 + frontend/package.json | 1 + frontend/src/App.vue | 1 + frontend/src/components/routes/Character.vue | 194 +++++++++++++++--- .../src/components/routes/Marketplace.vue | 2 +- .../components/routes/MarketplaceCreate.vue | 139 +++++++++---- .../src/components/routes/MarketplaceItem.vue | 3 +- frontend/yarn.lock | 5 + lib/errors.js | 4 + models/item.js | 15 +- models/user.js | 58 +++++- rendering/faces/defaultFace.png | Bin 17615 -> 0 bytes rendering/usercontent/1.py | 22 +- rendering/usercontent/15.py | 46 +++++ rendering/usercontent/16.py | 46 +++++ rendering/usercontent/17.py | 46 +++++ rendering/usercontent/18.py | 46 +++++ rendering/usercontent/19.py | 46 +++++ rendering/usercontent/20.py | 46 +++++ rendering/usercontent/21.py | 46 +++++ rendering/usercontent/22.py | 46 +++++ rendering/usercontent/23.py | 46 +++++ rendering/usercontent/24.py | 46 +++++ rendering/usercontent/25.py | 46 +++++ rendering/usercontent/26.py | 46 +++++ rendering/usercontent/27.py | 46 +++++ rendering/usercontent/28.py | 46 +++++ rendering/usercontent/29.py | 46 +++++ routes/avatar.js | 75 ++++++- routes/marketplace.js | 164 ++++++++++++++- server.js | 1 + 31 files changed, 1274 insertions(+), 104 deletions(-) delete mode 100644 rendering/faces/defaultFace.png create mode 100644 rendering/usercontent/15.py create mode 100644 rendering/usercontent/16.py create mode 100644 rendering/usercontent/17.py create mode 100644 rendering/usercontent/18.py create mode 100644 rendering/usercontent/19.py create mode 100644 rendering/usercontent/20.py create mode 100644 rendering/usercontent/21.py create mode 100644 rendering/usercontent/22.py create mode 100644 rendering/usercontent/23.py create mode 100644 rendering/usercontent/24.py create mode 100644 rendering/usercontent/25.py create mode 100644 rendering/usercontent/26.py create mode 100644 rendering/usercontent/27.py create mode 100644 rendering/usercontent/28.py create mode 100644 rendering/usercontent/29.py diff --git a/.gitignore b/.gitignore index ebccbc9..ee1c646 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,7 @@ config/config.json *.sln >>>>>>> frontend frontend/dist1/ +rendering/global +rendering/global/5c2f8896a2b7169d4e253944f3b733e2.png +rendering/global/81df1ac4d303319a79db19f45c5c475c.png +rendering/global/d24b3e361c4fc6263e0276f52ada9694.png diff --git a/frontend/package.json b/frontend/package.json index bd84a31..3619b11 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -54,6 +54,7 @@ "vue-matomo": "^3.14.0-0", "vue-router": "^2.7.0", "vue-router-sitemap": "^0.0.4", + "vue-swatches": "^2.1.0", "vuedraggable": "^2.24.3", "vuejs-paginator": "^2.0.2", "vuetify": "^2.3.8", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index f23ac84..3f1d2cc 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -753,6 +753,7 @@ blockquote { Inventory Transactions Friends + Character Notifications Admin Panel Upgrade diff --git a/frontend/src/components/routes/Character.vue b/frontend/src/components/routes/Character.vue index 9334a7a..c864275 100644 --- a/frontend/src/components/routes/Character.vue +++ b/frontend/src/components/routes/Character.vue @@ -11,6 +11,30 @@ margin-top: 0.5rem; word-break: break-all; } +.zoom_sp { + transition: transform .2s; +} +.zoom_sp:hover { + transform: scale(1.2); + cursor: hand; +} + +.wrapper { + +} + +.wrapper > div { + border: 1px solid #000000; + border-radius: 0px; + padding: 1px; + height: 32px; + width: 32px; +} +.wrapper { + display: grid; + grid-template-columns: repeat(15, 1fr); + grid-gap: 12px; +} diff --git a/frontend/src/components/routes/Marketplace.vue b/frontend/src/components/routes/Marketplace.vue index ba54fcf..c889db0 100644 --- a/frontend/src/components/routes/Marketplace.vue +++ b/frontend/src/components/routes/Marketplace.vue @@ -65,7 +65,7 @@
- + diff --git a/frontend/src/components/routes/MarketplaceCreate.vue b/frontend/src/components/routes/MarketplaceCreate.vue index 23829a7..e46a9db 100644 --- a/frontend/src/components/routes/MarketplaceCreate.vue +++ b/frontend/src/components/routes/MarketplaceCreate.vue @@ -1,61 +1,111 @@