chore: fix achievements loading

innerfuse · Mar 6, 2024 · 84333fd · 84333fd
1 parent 404612b
commit 84333fd
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 35 deletions.
diff --git a/pkg/org/user.go b/pkg/org/user.go
@@ -27,7 +27,7 @@ type User struct {
 	Avatar string `json:"avatar" bun:",nullzero"`
 
 	NotifyByEmail bool   `json:"notifyByEmail"`
-	AuthToken     string `json:"-"`
+	AuthToken     string `json:"authToken"`
 
 	CreatedAt time.Time `json:"createdAt" bun:",nullzero"`
 	UpdatedAt time.Time `json:"updatedAt" bun:",nullzero"`

diff --git a/vue/src/App.vue b/vue/src/App.vue
@@ -26,6 +26,12 @@
           <v-col v-if="!user.isAuth" cols="auto" class="d-flex align-center">
             <v-btn text :to="{ name: 'Login' }" class="mr-1">Sign in</v-btn>
           </v-col>
+          <v-col v-else cols="auto">
+            <v-btn color="green" dark href="https://app.uptrace.dev/join" target="_blank">
+              <v-icon left>mdi-cloud</v-icon>
+              <span>Try cloud</span>
+            </v-btn>
+          </v-col>
         </v-row>
       </v-container>
     </v-app-bar>

diff --git a/vue/src/org/use-achievements.ts b/vue/src/org/use-achievements.ts
@@ -1,9 +1,7 @@
 import { proxyRefs, computed, ComputedRef } from 'vue'
 
 // Composables
-import { useRouter } from '@/use/router'
 import { useWatchAxios } from '@/use/watch-axios'
-import { injectForceReload } from '@/use/force-reload'
 import { Project } from '@/org/use-projects'
 
 export enum AchievName {
@@ -36,10 +34,7 @@ interface ListItemAttrs {
 
 export type UseAchievements = ReturnType<typeof useAchievements>
 
-export const useAchievements = function (project: ComputedRef<Project | undefined>) {
-  const { route } = useRouter()
-  const forceReload = injectForceReload()
-
+export const useAchievements = function (project: ComputedRef<Project>) {
   const allAchievements = computed((): Achievement[] => {
     const items: Achievement[] = [
       {
@@ -83,10 +78,8 @@ export const useAchievements = function (project: ComputedRef<Project | undefine
   })
 
   const { data, reload } = useWatchAxios(() => {
-    const { projectId } = route.value.params
     return {
-      url: `/internal/v1/projects/${projectId}/achievements`,
-      params: forceReload.params,
+      url: `/internal/v1/projects/${project.value.id}/achievements`,
     }
   })
 

diff --git a/vue/src/org/views/UserProfile.vue b/vue/src/org/views/UserProfile.vue
@@ -15,40 +15,29 @@
             for details.
           </v-col>
         </v-row>
+
         <v-row>
           <v-col cols="6">
-            <v-text-field
-              v-model="user.current.name"
-              disabled
-              label="Name"
-              filled
-              required
-              hide-details="auto"
-            />
-          </v-col>
-        </v-row>
-        <v-row>
-          <v-col cols="6">
-            <v-text-field
-              v-model="user.current.email"
-              disabled
-              label="Email"
-              filled
-              required
-              hide-details="auto"
-            />
-          </v-col>
-        </v-row>
-        <v-row>
-          <v-col>
+            <v-text-field v-model="user.current.name" disabled label="Name" filled required />
+
+            <v-text-field v-model="user.current.email" disabled label="Email" filled required />
+
             <v-checkbox
               v-model="user.current.notifyByEmail"
               disabled
               label="Allow to send alert notifications via email"
               hide-details="auto"
+              class="mt-0"
             />
           </v-col>
         </v-row>
+
+        <v-row v-if="user.current.authToken">
+          <v-col>
+            <div class="text-body-2 text--secondary">Auth token</div>
+            <PrismCode :code="user.current.authToken" />
+          </v-col>
+        </v-row>
       </v-container>
     </div>
   </div>

diff --git a/vue/src/system/GetStartedMenu.vue b/vue/src/system/GetStartedMenu.vue
@@ -50,6 +50,8 @@ import { defineComponent, computed, PropType } from 'vue'
 
 // Composables
 import { useAchievements } from '@/org/use-achievements'
+
+// Misc
 import { Project } from '@/org/use-projects'
 
 export default defineComponent({

diff --git a/vue/src/tracing/TraceTimeline.vue b/vue/src/tracing/TraceTimeline.vue
@@ -51,7 +51,7 @@
               <SpanChips :span="span" trace-mode class="ml-2" />
             </td>
 
-            <td class="text-caption" style="position: relative">
+            <td class="text-body-2" style="position: relative">
               <span :style="span.labelStyle">
                 <span v-show="span.children && trace.isExpanded(span)">
                   <DurationValue :value="span.durationSelf" />