diff --git a/package.json b/package.json index cb993aa..74ec45b 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dotenv-webpack": "^6.0.0", "socket.io": "^3.1.0", "to-boolean": "^1.0.0", + "v-offline": "^1.3.0", "vue": "^2.6.11", "vue-axios": "^3.2.2", "vue-i18n": "^8.17.3", diff --git a/src/components/Badges.vue b/src/components/Badges.vue index 6624a3b..04fae23 100644 --- a/src/components/Badges.vue +++ b/src/components/Badges.vue @@ -48,7 +48,7 @@ \ No newline at end of file diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index 927c20b..d68a535 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -134,6 +134,11 @@ + @@ -226,6 +231,9 @@ {{$t('navbar.home')}} + + {{$t('navbar.forums')}} + {{$t('navbar.marketplace')}} diff --git a/src/components/NoItems.vue b/src/components/NoItems.vue new file mode 100644 index 0000000..6cd6861 --- /dev/null +++ b/src/components/NoItems.vue @@ -0,0 +1,18 @@ + + + + + {{$t('generic.noItemsStart')}} {{type}} {{$t('generic.noItemsEnd')}} + + + + {{$t('generic.noItemsConnection')}} + + + + \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index 935cf27..2413059 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -165,13 +165,20 @@ }, "generic": { "name": "Kaverti", - "loading": "Loading" + "loading": "Loading", + "noItemsConnection": "Please check your internet connection, or try again later.", + "noItemsStart": "There are no", + "noItemsEnd": "to display." }, "relationships": { "pending": "Cancel Friend Request", "notFriends": "Send Friend Request", "pendingCanAccept": "Accept Friend Request" }, + "modifyUser": { + "title": "Modify User", + "text": "Modify user badges" + }, "badges": { "admin": "Admin", "bot": "Bot", @@ -217,10 +224,26 @@ "settings": { "title": "User Settings", "general": { - "title": "General" + "title": "General", + "about": "About", + "description": "Your description", + "hi": "Hi, I'm", + "saveDesc": "Save description", + "savePref": "Save preferences", + "preferences": "Preferences", + "devMode": "Developer mode" }, "security": { "title": "Security" + }, + "privacy": { + "title": "Privacy" + }, + "experiments": { + "title": "Experiments" + }, + "about": { + "title": "About" } }, "languages": { diff --git a/src/router/index.js b/src/router/index.js index bcbdad9..2974903 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -56,6 +56,11 @@ const routes = [ name: 'Awards', component: route('Awards') }, + { + path: '/transactions', + name: 'Transactions', + component: route('Transaction') + }, { path: '/forums', name: 'Forums', diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue new file mode 100644 index 0000000..b08b33c --- /dev/null +++ b/src/views/Transaction.vue @@ -0,0 +1,160 @@ + + + + + Transaction Log + + + + {{ props.row.text }} + + + + + {{ props.row.priceOfPurchase }} + + + + + {{ new Date(props.row.createdAt).toLocaleDateString() }} + + + + + + + + + diff --git a/src/views/Users.vue b/src/views/Users.vue index a333130..a4c316b 100644 --- a/src/views/Users.vue +++ b/src/views/Users.vue @@ -1,5 +1,125 @@ - + + + + + + + + + {{user.username}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + + \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index eb17d59..8828309 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9661,6 +9661,11 @@ pify@^4.0.1: resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== +ping.js@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/ping.js/-/ping.js-0.2.3.tgz#bd84ab80919b59fdfe713a93f22262564ed91d2b" + integrity sha512-mUxaydie369PF+uwNDepRinpfbHXtqPvTvKahtU2L0zz1Wu65ib+++QLX0xFpnRNOFxaG9CyAXa5voNrhLU8Ew== + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -12452,6 +12457,13 @@ uuid@^8.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +v-offline@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/v-offline/-/v-offline-1.3.0.tgz#e3e73bbf8b194a625d03e37167535df8b2763ad4" + integrity sha512-y9sUj4BDoPpGawHlh647FthhlW4DeXzIrWDxD4XkUKbb9avZqyulGkO9pvf2pGzsq2mKat7Ey3qSLKGBGWKxpA== + dependencies: + ping.js "^0.2.3" + v8-compile-cache@^2.0.3: version "2.2.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"