Various minor frontend bug fixes

frontend/components/interface/crud/deleteRecordInterface.vue

@@ -76,8 +76,6 @@ export default {
         })
 
         this.$emit('handleSubmit', data)
-
-        this.close()
       } catch (err) {
         sharedService.handleError(err, this.$root)
       }

frontend/layouts/default.vue

@@ -263,13 +263,13 @@
       <v-spacer></v-spacer>
       <v-icon
         small
-        class="pr-2"
+        class="mr-2"
         @click="openLink('https://discord.gg/zg3GafZF')"
         >mdi-discord</v-icon
       >
       <v-icon
         small
-        class="pr-2"
+        class="mr-2"
         @click="openLink('https://github.com/cubing/CubePB')"
         >mdi-github</v-icon
       >

frontend/models/event.ts

@@ -1,7 +1,7 @@
 import type { RecordInfo } from '~/types'
 import TimeagoColumn from '~/components/table/common/timeagoColumn.vue'
 
-export default <RecordInfo<'event'>>{
+export const Event = <RecordInfo<'event'>>{
   type: 'event',
   name: 'Event',
   pluralName: 'Events',

frontend/models/index.ts

@@ -0,0 +1,5 @@
+export { Event } from './event'
+export { PersonalBest } from './personalBest'
+export { PersonalBestClass } from './personalBestClass'
+export { Product } from './product'
+export { User } from './user'

frontend/models/personalBest.ts

@@ -9,10 +9,11 @@ import TimeElapsedColumn from '~/components/table/common/timeElapsedColumn.vue'
 import CreatedByColumn from '~/components/table/common/createdByColumn.vue'
 import { serializeTime } from '~/services/common'
 
-export default <RecordInfo<'personalBest'>>{
+export const PersonalBest = <RecordInfo<'personalBest'>>{
   type: 'personalBest',
   name: 'Personal Best',
   pluralName: 'Personal Bests',
+  // viewRecordRoute: '/pb',
   icon: 'mdi-timer',
   renderItem: (item) => item.name,
   options: {
@@ -189,9 +190,7 @@ export default <RecordInfo<'personalBest'>>{
     ],
   },
   deleteOptions: {},
-  shareOptions: {
-    route: '/pb',
-  },
+  shareOptions: {},
   headers: [
     {
       field: 'event.name',

frontend/models/personalBestClass.ts

@@ -1,7 +1,7 @@
 import type { RecordInfo } from '~/types'
 import TimeagoColumn from '~/components/table/common/timeagoColumn.vue'
 
-export default <RecordInfo<'personalBestClass'>>{
+export const PersonalBestClass = <RecordInfo<'personalBestClass'>>{
   type: 'personalBestClass',
   name: 'Personal Best Type',
   pluralName: 'Personal Best Types',

frontend/models/product.ts

@@ -1,7 +1,7 @@
 import type { RecordInfo } from '~/types'
 import TimeagoColumn from '~/components/table/common/timeagoColumn.vue'
 
-export default <RecordInfo<'product'>>{
+export const Product = <RecordInfo<'product'>>{
   type: 'product',
   name: 'Product',
   pluralName: 'Products',

frontend/models/special/index.ts

@@ -0,0 +1,3 @@
+export { MyPbs } from './myPbs'
+export { PbPublic } from './pbPublic'
+export { UserPublic } from './userPublic'

frontend/models/special/myPbs.ts

@@ -0,0 +1,6 @@
+import { PersonalBest } from '..'
+
+export const MyPbs = {
+  ...PersonalBest,
+  viewRecordRoute: '/pb',
+}

frontend/models/special/pbPublic.ts

@@ -0,0 +1,8 @@
+import { PersonalBest } from '..'
+
+export const PbPublic = {
+  ...PersonalBest,
+  viewRecordRoute: '/pb',
+  deleteOptions: undefined,
+  addOptions: undefined,
+}

frontend/models/special/userPublic.ts

@@ -1,8 +1,7 @@
-import userRecordInfo from '../user'
-import personalBestRecordInfo from '../personalBest'
+import { User, PersonalBest } from '..'
 
-export default {
-  ...userRecordInfo,
+export const UserPublic = {
+  ...User,
   viewRecordRoute: '/user',
   filters: [],
   editOptions: undefined,
@@ -28,7 +27,7 @@ export default {
   ],
   expandTypes: [
     {
-      recordInfo: personalBestRecordInfo,
+      recordInfo: PersonalBest,
       name: 'PBs',
       excludeFilters: ['created_by.id'],
       excludeHeaders: ['created_by.name+created_by.avatar'],

frontend/models/user.ts

@@ -1,10 +1,10 @@
-import personalBestRecordInfo from './personalBest'
+import { PersonalBest } from '.'
 import type { RecordInfo } from '~/types'
 import TimeagoColumn from '~/components/table/common/timeagoColumn.vue'
 import UserColumn from '~/components/table/common/userColumn.vue'
 import { getBooleanOptions, getUserRoles } from '~/services/dropdown'
 
-export default <RecordInfo<'user'>>{
+export const User = <RecordInfo<'user'>>{
   type: 'user',
   name: 'User',
   pluralName: 'Users',
@@ -127,7 +127,7 @@ export default <RecordInfo<'user'>>{
   ],
   expandTypes: [
     {
-      recordInfo: personalBestRecordInfo,
+      recordInfo: PersonalBest,
       name: 'PBs',
       excludeFilters: ['created_by.id'],
       excludeHeaders: ['created_by.name+created_by.avatar'],

frontend/pages/admin/events.vue

@@ -4,7 +4,7 @@
 
 <script>
 import CrudRecordPage from '~/components/page/crudRecordPage.vue'
-import eventRecordInfo from '~/models/event'
+import { Event } from '~/models'
 
 export default {
   components: {
@@ -13,7 +13,7 @@ export default {
 
   data() {
     return {
-      recordInfo: eventRecordInfo,
+      recordInfo: Event,
     }
   },
 }

frontend/pages/admin/personalBestClasses.vue

@@ -4,7 +4,7 @@
 
 <script>
 import CrudRecordPage from '~/components/page/crudRecordPage.vue'
-import personalBestClassRecordInfo from '~/models/personalBestClass'
+import { PersonalBestClass } from '~/models'
 
 export default {
   components: {
@@ -13,7 +13,7 @@ export default {
 
   data() {
     return {
-      recordInfo: personalBestClassRecordInfo,
+      recordInfo: PersonalBestClass,
     }
   },
 }

frontend/pages/admin/personalBests.vue

@@ -4,7 +4,7 @@
 
 <script>
 import CrudRecordPage from '~/components/page/crudRecordPage.vue'
-import personalBestRecordInfo from '~/models/personalBest'
+import { PersonalBest } from '~/models'
 
 export default {
   components: {
@@ -13,7 +13,7 @@ export default {
 
   data() {
     return {
-      recordInfo: personalBestRecordInfo,
+      recordInfo: PersonalBest,
     }
   },
 }

frontend/pages/admin/products.vue

@@ -4,7 +4,7 @@
 
 <script>
 import CrudRecordPage from '~/components/page/crudRecordPage.vue'
-import productRecordInfo from '~/models/product'
+import { Product } from '~/models'
 
 export default {
   components: {
@@ -13,7 +13,7 @@ export default {
 
   data() {
     return {
-      recordInfo: productRecordInfo,
+      recordInfo: Product,
     }
   },
 }

frontend/pages/admin/users.vue

@@ -4,7 +4,7 @@
 
 <script>
 import CrudRecordPage from '~/components/page/crudRecordPage.vue'
-import userRecordInfo from '~/models/user'
+import { User } from '~/models'
 
 export default {
   components: {
@@ -13,7 +13,7 @@ export default {
 
   data() {
     return {
-      recordInfo: userRecordInfo,
+      recordInfo: User,
     }
   },
 }

frontend/pages/my-pbs.vue

@@ -11,7 +11,7 @@
 
 <script>
 import CrudRecordPage from '~/components/page/crudRecordPage.vue'
-import personalBestRecordInfo from '~/models/personalBest'
+import { MyPbs } from '~/models/special'
 
 export default {
   components: {
@@ -20,7 +20,7 @@ export default {
 
   data() {
     return {
-      recordInfo: personalBestRecordInfo,
+      recordInfo: MyPbs,
       head: {
         title: 'My PBs',
       },

frontend/pages/pb.vue

@@ -4,15 +4,15 @@
 
 <script>
 import ViewRecordPage from '~/components/page/viewRecordPage.vue'
-import personalBestRecordInfo from '~/models/personalBest'
+import { PbPublic } from '~/models/special'
 
 export default {
   components: {
     ViewRecordPage,
   },
   data() {
     return {
-      recordInfo: personalBestRecordInfo,
+      recordInfo: PbPublic,
     }
   },
 }

frontend/pages/public-pbs.vue

@@ -10,7 +10,7 @@
 
 <script>
 import CrudRecordPage from '~/components/page/crudRecordPage.vue'
-import allPbsRecordInfo from '~/models/special/allPbs'
+import { PbPublic } from '~/models/special'
 
 export default {
   components: {
@@ -19,7 +19,7 @@ export default {
 
   data() {
     return {
-      recordInfo: allPbsRecordInfo,
+      recordInfo: PbPublic,
       head: {
         title: 'Public PBs',
       },

frontend/pages/public-users.vue

@@ -9,7 +9,7 @@
 
 <script>
 import CrudRecordPage from '~/components/page/crudRecordPage.vue'
-import userPublicRecordInfo from '~/models/special/userPublic'
+import { UserPublic } from '~/models/special'
 
 export default {
   components: {
@@ -18,7 +18,7 @@ export default {
 
   data() {
     return {
-      recordInfo: userPublicRecordInfo,
+      recordInfo: UserPublic,
       lockedFilters: [
         {
           field: 'is_public',

frontend/pages/user.vue

@@ -4,15 +4,15 @@
 
 <script>
 import ViewRecordPage from '~/components/page/viewRecordPage.vue'
-import userPublicRecordInfo from '~/models/special/userPublic'
+import { UserPublic } from '~/models/special'
 
 export default {
   components: {
     ViewRecordPage,
   },
   data() {
     return {
-      recordInfo: userPublicRecordInfo,
+      recordInfo: UserPublic,
     }
   },
 }

frontend/types/index.ts

@@ -6,7 +6,7 @@ export type RecordInfo<T extends keyof MainTypes> = {
   name: string
   pluralName: string
   // route that shareUrl and enterItem should be based off
-  viewItemRoute?: string
+  viewRecordRoute?: string
   icon?: string
   // how to render the item as a string
   renderItem?: (item) => string