diff --git a/src/App.vue b/src/App.vue index 78740f3..697f879 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,6 +3,9 @@
@@ -585,7 +583,6 @@ export default { } this.loading = false }).catch(() => { - localStorage.setItem('userCache', JSON.stringify(this.$store.state.user)); this.$buefy.snackbar.open({message:this.$t('errors.authFail'), type: 'is-warning'}) this.loading = false console.log(this.getBannerId()) diff --git a/src/locales/en.json b/src/locales/en.json index 7211afe..96c311a 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -163,6 +163,23 @@ "logout": "You have been logged out of Kaverti.", "register": "You have been registered to Kaverti, Welcome!" }, + "generic": { + "name": "Kaverti", + "loading": "Loading" + }, + "relationships": { + "pending": "Cancel Friend Request", + "notFriends": "Send Friend Request", + "pendingCanAccept": "Accept Friend Request" + }, + "badges": { + "admin": "Admin", + "bot": "Bot", + "add": "+", + "system": "System", + "banned": "Banned", + "hidden": "Hidden" + }, "user": { "title": "Loading", "about": "About", @@ -174,7 +191,18 @@ "items": "Items", "wall": "User Wall", "description": "Description", - "created": "Registered at" + "created": "Registered at", + "defaultDesc": "Hi, I'm ", + "marketplace": "Published items", + "relationships": "Friends", + "wearing": "Wearing", + "inventoryTab": { + "buyNow": "Buy now for ", + "was": "was", + "unavailable": "Item is unavailable", + "noItems": "This user doesn't have any items in their inventory yet!", + "onSale": "Item is on sale" + } }, "stats": { "title": "Stats", diff --git a/src/router/index.js b/src/router/index.js index 0cc87ec..bcbdad9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,7 +23,7 @@ const routes = [ name: 'Debug', component: route('Debug') }, - { path: '/u/:username', redirect: '/u/:username/posts', component: route('User'), children: [ + { path: '/u/:username', redirect: '/u/:username/awards', component: route('User'), children: [ { path: 'posts', component: route('UserPosts') }, { path: 'threads', component: route('UserThreads') }, { path: 'items', component: route('UserMarketplace') }, diff --git a/src/views/User.vue b/src/views/User.vue index c693e63..1aa8064 100644 --- a/src/views/User.vue +++ b/src/views/User.vue @@ -8,16 +8,26 @@
-

{{user.username}}

+

{{user.username}}  

+
+  {{$t('relationships.notFriends')}} +  {{$t('relationships.pending')}} +  {{$t('relationships.pendingCanAccept')}} +  {{$t('relationships.ignore')}} +  {{$t('relationships.accepted')}} +   {{ $t('generic.loading') }} +

{{ $t('user.about') }} {{user.username}}

- {{ $t('user.description') }}: {{user.description}}
- {{ $t('user.created') }}: {{user.createdAt}} +
{{ $t('user.description') }}: {{user.description}}

+
{{$t('user.description')}}: {{$t('user.defaultDesc')}} {{user.username}}
+ {{ $t('user.created') }}: {{user.createdAt}}
+ {{ $t('user.marketplace') }}:
@@ -47,20 +57,14 @@ \ No newline at end of file diff --git a/src/views/UserFriends.vue b/src/views/UserFriends.vue index a333130..0f4f570 100644 --- a/src/views/UserFriends.vue +++ b/src/views/UserFriends.vue @@ -1,5 +1,40 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/UserInventory.vue b/src/views/UserInventory.vue index a333130..50c034c 100644 --- a/src/views/UserInventory.vue +++ b/src/views/UserInventory.vue @@ -1,5 +1,50 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/UserPosts.vue b/src/views/UserPosts.vue index fece13a..a07d5cf 100644 --- a/src/views/UserPosts.vue +++ b/src/views/UserPosts.vue @@ -76,7 +76,7 @@ export default { }) } }, - created () { + mounted () { this.$store.dispatch('setTitle', this.$route.params.username + ' - Posts') this.axios