fixes and refactor

This commit is contained in:
Liyas Thomas
2021-05-14 05:50:17 +00:00
committed by GitHub
parent 2b8cda40a2
commit 8f09c82763
13 changed files with 107 additions and 87 deletions

View File

@@ -165,6 +165,7 @@
<script>
import * as team_utils from "~/helpers/teams/utils"
import cloneDeep from "lodash/cloneDeep"
import TeamMemberAdapter from "~/helpers/teams/TeamMemberAdapter"
export default {
props: {
@@ -177,21 +178,19 @@ export default {
rename: null,
doneButton: '<i class="material-icons">done</i>',
members: [],
membersSubject: null,
membersSubscription: null,
newMembers: [],
membersAdapter: new TeamMemberAdapter(null),
}
},
mounted() {
this.membersAdapter.members$.subscribe((list) => {
console.log(list)
this.members = cloneDeep(list)
})
},
watch: {
editingteamID(teamID) {
team_utils.getLiveTeamMembersList(this.$apollo, teamID).then((subject) => {
this.membersSubject = subject
this.membersSubscription = this.membersSubject.subscribe((memberList) => {
console.log(memberList)
this.members = cloneDeep(memberList)
})
})
this.membersAdapter.changeTeamID(teamID)
},
},
computed: {

View File

@@ -32,13 +32,12 @@
class="icon"
@click="exitTeam"
v-close-popover
:disabled="!(team.myRole === 'OWNER' && team.ownersCount == 1)"
:disabled="team.myRole === 'OWNER' && team.ownersCount == 1"
>
<i class="material-icons">remove</i>
<div
v-tooltip.left="{
content:
team.myRole === 'OWNER' && team.ownersCount == 1 ? null : $t('disable_exit'),
content: team.myRole === 'OWNER' && team.ownersCount == 1 ? $t('disable_exit') : '',
}"
>
<span>{{ $t("exit") }}</span>

View File

@@ -1,5 +1,16 @@
<template>
<AppSection class="green" icon="history" :label="$t('teams')" ref="teams" no-legend>
<div class="flex flex-col">
<label>{{ $t("teams") }}</label>
<div v-if="fb.currentUser"></div>
<div v-else>
<label>{{ $t("login_with") }}</label>
<p>
<FirebaseLogin />
</p>
</div>
</div>
<TeamsAdd :show="showModalAdd" @hide-modal="displayModalAdd(false)" />
<TeamsEdit
:team="myTeams[0]"
@@ -53,6 +64,7 @@ ul {
<script>
import gql from "graphql-tag"
import { fb } from "~/helpers/fb"
export default {
data() {
@@ -64,6 +76,7 @@ export default {
editingteamID: "",
me: {},
myTeams: [],
fb,
}
},
apollo: {