Merge pull request #12 from Kubiverse/staging-1.0.7

Upgrade to v1.0.7

components/dialog/misc/editRoomSettingsDialog.vue

@@ -109,7 +109,7 @@ export default {
 
       scrambleVisualizationOptions: [
         { text: '2D', value: '2D' },
-        { text: '3D (Not available on all puzzles)', value: '3D' },
+        { text: '3D (Select Puzzles Only)', value: '3D' },
       ],
     }
   },

components/interface/viewCuberRoomsInterface.vue

@@ -272,7 +272,7 @@ export default {
       }
     },
     async loadData() {
-      this.loading.loadData = true
+      //this.loading.loadData = true
       try {
         let { data } = await this.$apollo.query({
           query: CUBER_ROOMS_QUERY,
@@ -294,11 +294,11 @@ export default {
       } catch (err) {
         sharedService.handleError(err, this.$root)
       }
-      this.loading.loadData = false
+      //this.loading.loadData = false
     },
 
     reset(initialLoad = false) {
-      if (!this.status) return
+      if (!this.status || !this.cuber) return
       if (initialLoad) this.options.initialLoad = true
 
       this.loadData()

components/interface/viewCuberSolvesInterface.vue

@@ -18,6 +18,14 @@
         <span :class="{ 'winner-text': item.is_winner }">{{
           generateSolveString(item)
         }}</span>
+        <v-icon
+          v-if="hasEditPermissions"
+          small
+          title="Toggle Track"
+          :color="item.is_tracked ? null : 'error'"
+          @click.stop="toggleSolveTracked(item)"
+          >{{ item.is_tracked ? 'mdi-alarm' : 'mdi-alarm-off' }}</v-icon
+        >
       </template>
       <template v-slot:item.created_at="{ item }">
         {{ generateMomentString(item.created_at) }}
@@ -52,6 +60,7 @@
 <script>
 import sharedService from '~/services/shared.js'
 import { SOLVES_QUERY } from '~/gql/query/solve.js'
+import { UPDATE_SOLVE_MUTATION } from '~/gql/mutation/room.js'
 import ViewRoundInterface from '~/components/interface/viewRoundInterface.vue'
 import EventLabel from '~/components/shared/eventLabel.vue'
 
@@ -138,11 +147,17 @@ export default {
       footerOptions: {
         'items-per-page-options': [5, 10, 25, 50],
       },
+
+      loading: {
+        updateSolve: false,
+      },
     }
   },
   computed: {
     hasEditPermissions() {
-      return this.$store.getters['auth/user']?.id === this.cuber.id
+      return (
+        this.cuber && this.$store.getters['auth/user']?.id === this.cuber?.id
+      )
     },
   },
 
@@ -204,6 +219,30 @@ export default {
       }
     },
 
+    async toggleSolveTracked(solve) {
+      this.loading.updateSolve = true
+      try {
+        let { data } = await this.$apollo.mutate({
+          mutation: UPDATE_SOLVE_MUTATION,
+          variables: {
+            solve_id: solve.id,
+            is_tracked: !solve.is_tracked,
+          },
+        })
+
+        solve.is_tracked = data.updateSolve.is_tracked;
+
+        sharedService.generateSnackbar(
+          this.$root,
+          'Solve ' + (solve.is_tracked ? 'Re' : 'Un') + '-tracked',
+          'success',
+        )
+      } catch (err) {
+        sharedService.handleError(err, this.$root)
+      }
+      this.loading.updateSolve = false
+    },
+
     reloadData() {
       this.$apollo.queries.solves.refresh()
     },

components/popover/previewCuberPopover.vue

@@ -6,7 +6,14 @@
     offset-x
   >
     <template v-slot:activator="{ on }">
-      <a v-if="selectedItem" v-on="on">
+      <v-chip v-if="chip && selectedItem" v-on="on">
+        <v-avatar left>
+          <v-img v-if="selectedItem.avatar" :src="selectedItem.avatar" />
+          <v-icon v-else>mdi-account</v-icon>
+        </v-avatar>
+        {{ selectedItem.name }}
+      </v-chip>
+      <a v-else-if="selectedItem" v-on="on">
         <v-avatar size="24" class="mr-1">
           <v-img v-if="selectedItem.avatar" :src="selectedItem.avatar" />
           <v-icon v-else>mdi-account</v-icon>
@@ -91,6 +98,10 @@ import {
 export default {
   props: {
     selectedItem: {},
+    chip: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {

gql/fragments.js

@@ -93,5 +93,6 @@ export const solveFragment = gql`
     is_dnf
     time
     is_winner
+    is_tracked
   }
 `

gql/mutation/room.js

@@ -53,8 +53,16 @@ export const DELETE_ROOM_MUTATION = gql`
 `
 
 export const JOIN_ROOM_MUTATION = gql`
-  mutation joinRoom($room_id: ID!, $secret: String) {
-    joinRoom(id: $room_id, secret: $secret) {
+  mutation joinRoom(
+    $room_id: ID!
+    $secret: String
+    $participationType: CuberRoomRelationTypeEnum
+  ) {
+    joinRoom(
+      id: $room_id
+      secret: $secret
+      participationType: $participationType
+    ) {
       id
     }
   }
@@ -158,10 +166,11 @@ export const INVITE_CUBER_MUTATION = gql`
 export const UPDATE_SOLVE_MUTATION = gql`
   mutation updateSolve(
     $solve_id: ID!
-    $state: SolveState!
+    $state: SolveState
     $time: Milliseconds
     $penalties: Milliseconds
     $is_dnf: Boolean
+    $is_tracked: Boolean
   ) {
     updateSolve(
       input: {
@@ -170,6 +179,7 @@ export const UPDATE_SOLVE_MUTATION = gql`
         time: $time
         penalties: $penalties
         is_dnf: $is_dnf
+        is_tracked: $is_tracked
       }
     ) {
       ...Solve
@@ -181,3 +191,14 @@ export const UPDATE_SOLVE_MUTATION = gql`
   ${solveFragment}
   ${cuberBasicFragment}
 `
+
+export const CHANGE_ROOM_STATUS_MUTATION = gql`
+  mutation changeRoomStatus(
+    $room_id: ID!
+    $participationType: CuberRoomRelationTypeEnum
+  ) {
+    changeRoomStatus(room_id: $room_id, participationType: $participationType) {
+      id
+    }
+  }
+`

gql/query/room.js

@@ -19,6 +19,17 @@ export const ROOM_QUERY = gql`
         ...CuberBasic
       }
       active_cubers(first: 10) {
+        data {
+          ...CuberBasic
+          pivot {
+            type
+          }
+        }
+      }
+      spectating_cubers(first: 10) {
+        paginatorInfo {
+          total
+        }
         data {
           ...CuberBasic
         }

gql/query/round.js

@@ -62,6 +62,9 @@ export const ROUNDS_QUERY = gql`
           ...Solve
           cuber {
             ...CuberBasic
+            pivot {
+              type
+            }
           }
         }
         accumulated_results {

gql/schema.graphql

@@ -337,6 +337,7 @@ type Cuber {
     first: Int!
     page: Int
   ): CuberPaginator
+  pivot: CuberRoomPivot
   created_at: DateTime!
   updated_at: DateTime
 }
@@ -355,6 +356,20 @@ type CuberRoom {
   room: Room!
 }
 
+type CuberRoomPivot {
+  type: CuberRoomRelationTypeEnum!
+  last_activity_at: DateTime!
+  cuber: Cuber!
+  room: Room!
+}
+
+enum CuberRoomRelationTypeEnum {
+  VISITED
+  PARTICIPATING
+  IDLING
+  SPECTATING
+}
+
 scalar Date
 
 scalar DateTime
@@ -418,13 +433,20 @@ scalar Milliseconds
 type Mutation {
   sendRoomChatMessage(room_id: ID!, message: String!): RoomChatMessage!
   updateCuber(input: UpdateCuberInput): Cuber!
-  idle: Cuber
   followCuber(id: ID): Cuber
   unfollowCuber(id: ID): Cuber
   inviteCuber(room_id: ID!, cuber_id: ID!): CuberRoom!
   createRoom(input: CreateRoomInput!): Room!
   updateRoom(input: UpdateRoomInput!): Room!
-  joinRoom(id: ID!, secret: String): Room!
+  joinRoom(
+    id: ID!
+    secret: String
+    participationType: CuberRoomRelationTypeEnum
+  ): Room!
+  changeRoomStatus(
+    room_id: ID!
+    participationType: CuberRoomRelationTypeEnum
+  ): Room!
   leaveRoom(id: ID!): Room!
   deleteRoom(id: ID!): Room!
   untrackSolvesFromRoom(room_id: ID!): [Solve!]
@@ -573,6 +595,18 @@ type Room {
     first: Int!
     page: Int
   ): CuberPaginator
+  participating_cubers(
+    first: Int!
+    page: Int
+  ): CuberPaginator
+  idling_cubers(
+    first: Int!
+    page: Int
+  ): CuberPaginator
+  spectating_cubers(
+    first: Int!
+    page: Int
+  ): CuberPaginator
   active_cubers(
     first: Int!
     page: Int
@@ -592,6 +626,7 @@ type Room {
   is_full: Boolean!
   creator: Cuber!
   accumulators: [Accumulator!]
+  pivot: CuberRoomPivot
   manager: Cuber
   created_at: DateTime!
   updated_at: DateTime
@@ -720,6 +755,7 @@ type Subscription {
   roomChatMessageReceived(room_id: ID!): RoomChatMessage
   cuberNotificationReceived: CuberNotification
   roomMembersUpdated(room_id: ID!): [Cuber!]
+  roomMemberStatusUpdated(room_id: ID!): CuberRoomPivot
   roomUpdated(room_id: ID!): Room
   roundStarted(room_id: ID!): Round
   roundFinished(room_id: ID!): Round
@@ -750,7 +786,7 @@ input UpdateRoomInput {
 
 input UpdateSolveInput {
   id: ID!
-  state: SolveState!
+  state: SolveState
   time: Milliseconds
   penalties: Milliseconds
   is_dnf: Boolean

gql/subscription/room.js

@@ -13,6 +13,10 @@ export const ROOM_MEMBERS_UPDATED_SUBSCRIPTION = gql`
   subscription roomMembersUpdated($room_id: ID!) {
     roomMembersUpdated(room_id: $room_id) {
       ...CuberBasic
+      pivot {
+        type
+        last_activity_at
+      }
     }
   }
   ${cuberBasicFragment}
@@ -57,6 +61,10 @@ export const ROUND_STARTED_SUBSCRIPTION = gql`
         ...Solve
         cuber {
           ...CuberBasic
+          pivot {
+            type
+            last_activity_at
+          }
         }
       }
       accumulated_results {
@@ -101,3 +109,17 @@ export const SOLVE_UPDATED_SUBSCRIPTION = gql`
   ${solveFragment}
   ${cuberBasicFragment}
 `
+
+//not real subscription
+export const ROOM_MEMBER_STATUS_UPDATED_SUBSCRIPTION = gql`
+  subscription roomMemberStatusUpdated($room_id: ID!) {
+    roomMemberStatusUpdated(room_id: $room_id) {
+      type
+      last_activity_at
+      cuber {
+        ...CuberBasic
+      }
+    }
+  }
+  ${cuberBasicFragment}
+`

package.json

@@ -28,6 +28,7 @@
     "randomstring": "^1.1.5",
     "scramble-display": "^0.1.0",
     "stackmat": "^1.0.0",
+    "stackmat-signal-processor": "^0.1.0",
     "vue-tour": "^1.3.0"
   },
   "devDependencies": {