From a9fc91f381a51f508c4bef24251bfaf483799cf0 Mon Sep 17 00:00:00 2001 From: Troplo Date: Tue, 19 Jan 2021 03:00:49 +1100 Subject: [PATCH] stuff --- assets/scss/buefy.scss | 2 + src/components/Badges.vue | 83 ++++++++++++++++++++++++++++++++++----- src/components/Navbar.vue | 13 +++++- src/locales/en.json | 3 +- src/views/User.vue | 5 ++- 5 files changed, 93 insertions(+), 13 deletions(-) diff --git a/assets/scss/buefy.scss b/assets/scss/buefy.scss index ccf49c1..102a15f 100644 --- a/assets/scss/buefy.scss +++ b/assets/scss/buefy.scss @@ -5,6 +5,8 @@ $primary: #2baaff; $primary-invert: findColorInvert($primary); $twitter: #4099FF; $twitter-invert: findColorInvert($twitter); +$booster: #2baaff; +$is-booster: #2baaff; // Import Bulma and Buefy styles @import "~bulma"; diff --git a/src/components/Badges.vue b/src/components/Badges.vue index bbf08d1..6624a3b 100644 --- a/src/components/Badges.vue +++ b/src/components/Badges.vue @@ -1,19 +1,84 @@ \ No newline at end of file diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index f43ca41..927c20b 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -289,7 +289,8 @@ {{$t('navbar.user.avatar')}} {{$t('navbar.user.creations')}} {{$t('navbar.user.downloads')}} - {{$t('navbar.user.logout')}} + 1  {{$t('navbar.user.friends')}} + {{$t('navbar.user.logout')}} @@ -328,6 +329,7 @@ export default { loading: true, settingsModal: false, showBanner: true, + friendCount: 0, settings: { tab: 0, general: { @@ -587,6 +589,15 @@ export default { this.loading = false console.log(this.getBannerId()) }) + if(this.$store.state.username) { + this.axios.get(process.env.VUE_APP_APIENDPOINT + process.env.VUE_APP_APIVERSION + '/' + 'relationships/getAllPendingCanAccept') + .then(res => { + this.friendCount = res.data.count + }).catch(() => { + this.$buefy.snackbar.open({message: this.$t('errors.authFail'), type: 'is-warning'}) + this.loading = false + }) + } } } \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index 96c311a..935cf27 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -178,7 +178,8 @@ "add": "+", "system": "System", "banned": "Banned", - "hidden": "Hidden" + "hidden": "Hidden", + "booster": "Discord Booster" }, "user": { "title": "Loading", diff --git a/src/views/User.vue b/src/views/User.vue index 1aa8064..b287800 100644 --- a/src/views/User.vue +++ b/src/views/User.vue @@ -8,12 +8,12 @@
-

{{user.username}}  

+

{{user.username}} 

-  {{$t('relationships.notFriends')}} +  {{$t('relationships.notFriends')}}  {{$t('relationships.pending')}}  {{$t('relationships.pendingCanAccept')}}  {{$t('relationships.ignore')}} @@ -65,6 +65,7 @@ export default { }, data () { return { + modifyUserModal: true, user: { username: "Loading", description: "Loading",