Skip to content

Commit

Permalink
v1.12.2
Browse files Browse the repository at this point in the history
Add tab index to login dialog popup
Fix comment count not increasing total after leaving a comment
Change NSFW chip to just text
Change accent color from yellow to purple
  • Loading branch information
DispatchCommit committed Apr 12, 2020
1 parent 3ed6291 commit 21c04b4
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 18 deletions.
8 changes: 7 additions & 1 deletion components/LoginDialog/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
clearable
:loading="loading"
:disabled="loading"
tabindex="1"
/>

<v-text-field
Expand All @@ -67,6 +68,7 @@
clearable
:loading="loading"
:disabled="loading"
tabindex="2"
/>

<v-text-field
Expand All @@ -88,6 +90,7 @@
:loading="loading"
:disabled="loading"
@click:append="showPassword = !showPassword"
tabindex="3"
/>

<v-checkbox
Expand All @@ -97,6 +100,7 @@
class="pt-0 mt-0 mb-3"
:rules="[ val => val || 'You must be 18 to use this site!' ]"
:disabled="loading"
tabindex="4"
/>

<v-btn
Expand All @@ -107,6 +111,7 @@
:loading="loading"
type="submit"
@click="signIn(user.email, user.password)"
tabindex="5"
>
Login
</v-btn>
Expand All @@ -119,6 +124,7 @@
:loading="loading"
type="submit"
@click="createUser(user.username, user.email, user.password)"
tabindex="5"
>
Register
</v-btn>
Expand Down Expand Up @@ -153,7 +159,7 @@
<v-btn
href="#"
text
color="primary"
color="accent"
@click="resetPassword(user.email)"
>Forgot Password?</v-btn>
<v-spacer/>
Expand Down
3 changes: 2 additions & 1 deletion components/Replay/ReplayComments/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,15 @@
if ( data.success ) {
this.$toast.success( `Successfully posted comment!`, { icon: 'done', duration: 5000, position: 'top-center' } );
// Add new comment to page without re-retching data
// Add new comment to page without re-retching data, also increase comment count total
this.comments = [
{
id: data.data.id,
...data.data,
},
...this.comments,
];
this.commentCount += 1;
} else {
this.$toast.error( data, { icon: 'error', duration: 5000, position: 'top-center' } );
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bitwave.tv",
"version": "1.12.1",
"version": "1.12.2",
"description": "An open platform live streaming service for creators to freely express themselves.",
"author": "Dispatch",
"scripts": {
Expand Down
11 changes: 4 additions & 7 deletions pages/_watch/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@
<div class="mx-2">{{ name }}</div>
</div>
<div class="d-flex align-center">
<v-chip
v-show="nsfw"
color="red"
class="mr-2"
small
outlined
>NSFW</v-chip>
<template v-if="nsfw">
<div class="font-weight-bold red--text body-2">NSFW</div>
<v-divider vertical class="mx-2"/>
</template>
<KickStreamButton
v-if="isAdmin"
:streamer="name"
Expand Down
11 changes: 4 additions & 7 deletions pages/_watch/replay/_replay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@
<div class="mx-2">{{ name }}</div>
</div>
<div class="d-flex align-center">
<v-chip
v-show="nsfw"
color="red"
class="mr-2"
small
outlined
>NSFW</v-chip>
<template v-if="nsfw">
<div class="font-weight-bold red--text body-2">NSFW</div>
<v-divider vertical class="mx-2"/>
</template>
<KickStreamButton
v-if="isAdmin"
:streamer="name"
Expand Down
3 changes: 2 additions & 1 deletion vuetify.options.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ export default {
primary: '#13a9fe', // colors.yellow.base // #ffeb3b
anchor: '#13a9fe',
secondary: '#ff4b66', // colors.grey.darken3 // #424242
accent: '#ffeb3b', // colors.yellow.accent1, // #82B1FF
accent: '#ac4efe', // colors.yellow.accent1, // #82B1FF
// accent: '#ffeb3b', // colors.yellow.accent1, // #82B1FF
error: colors.red.accent2, // #FF5252
info: colors.blue.base, // #2196F3
success: colors.green.base, // #4CAF50
Expand Down

0 comments on commit 21c04b4

Please sign in to comment.