feat: use correct user model attributes

kleister · Jun 20, 2024 · c945bc5 · c945bc5
1 parent 21e30e2
commit c945bc5
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 57 deletions.
diff --git a/src/pages/teams/Create.vue b/src/pages/teams/Create.vue
@@ -59,7 +59,7 @@ import { useTeamStore } from "../../store/teams";
 
 import { useI18n } from "vue-i18n";
 
-import type { general_error } from "../../client/models/general_error";
+import type { notification } from "../../client/models/notification";
 import type { team } from "../../client/models/team";
 
 const router = useRouter();
@@ -72,7 +72,7 @@ const { t } = useI18n({
 async function submit(data: team) {
   return store
     .createTeam(data)
-    .then((resp: void | general_error | team) => {
+    .then((resp: void | notification | team) => {
       const val = <team>resp;
       reset("create");
       router.push({ name: "showTeam", params: { teamId: val.slug } });

diff --git a/src/pages/teams/Update.vue b/src/pages/teams/Update.vue
@@ -74,7 +74,7 @@ import { useTeamStore } from "../../store/teams";
 
 import { useI18n } from "vue-i18n";
 
-import type { general_error } from "../../client/models/general_error";
+import type { notification } from "../../client/models/notification";
 import type { team } from "../../client/models/team";
 
 const store = useTeamStore();
@@ -92,7 +92,7 @@ const record = computed(() => {
 function submit(data: team) {
   return store
     .updateTeam(<string>record.value.slug, data)
-    .then((resp: void | general_error | team) => {
+    .then((resp: void | notification | team) => {
       const val = <team>resp;
       reset("update", val);
       router.push({ name: "showTeam", params: { teamId: val.slug } });

diff --git a/src/pages/users/Create.vue b/src/pages/users/Create.vue
@@ -23,14 +23,6 @@
 
   <div class="m-5">
     <FormKit id="create" type="form" submit-label="Create" @submit="submit">
-      <FormKit
-        id="slug"
-        type="text"
-        name="slug"
-        validation="length:3,64"
-        label="Slug"
-        help="Slug of your user"
-      />
       <FormKit
         id="username"
         type="text"
@@ -39,6 +31,14 @@
         label="Username"
         help="Username of your user"
       />
+      <FormKit
+        id="password"
+        type="text"
+        name="password"
+        validation="required|length:3,64"
+        label="Password"
+        help="Password of your user"
+      />
       <FormKit
         id="email"
         type="text"
@@ -47,6 +47,14 @@
         label="Email"
         help="Email of your user"
       />
+      <FormKit
+        id="fullname"
+        type="text"
+        name="fullname"
+        validation=""
+        label="Fullname"
+        help="Fullname of your user"
+      />
       <FormKit
         id="admin"
         type="checkbox"
@@ -77,7 +85,7 @@ import { useUserStore } from "../../store/users";
 
 import { useI18n } from "vue-i18n";
 
-import type { general_error } from "../../client/models/general_error";
+import type { notification } from "../../client/models/notification";
 import type { user } from "../../client/models/user";
 
 const router = useRouter();
@@ -90,10 +98,10 @@ const { t } = useI18n({
 async function submit(data: user) {
   return store
     .createUser(data)
-    .then((resp: void | general_error | user) => {
+    .then((resp: void | notification | user) => {
       const val = <user>resp;
       reset("create");
-      router.push({ name: "showUser", params: { userId: val.slug } });
+      router.push({ name: "showUser", params: { userId: val.username } });
     })
     .catch((e) => {
       console.log(e);

diff --git a/src/pages/users/Index.vue b/src/pages/users/Index.vue
@@ -18,9 +18,9 @@
 
   <fwb-table v-if="getUsers.length > 0" class="m-5" hoverable>
     <fwb-table-head>
-      <fwb-table-head-cell>{{ t("common.slug") }}</fwb-table-head-cell>
       <fwb-table-head-cell>{{ t("users.username") }}</fwb-table-head-cell>
       <fwb-table-head-cell>{{ t("users.email") }}</fwb-table-head-cell>
+      <fwb-table-head-cell>{{ t("users.fullname") }}</fwb-table-head-cell>
       <fwb-table-head-cell>{{ t("users.admin") }}</fwb-table-head-cell>
       <fwb-table-head-cell>{{ t("users.active") }}</fwb-table-head-cell>
       <fwb-table-head-cell class="w-80"
@@ -31,22 +31,22 @@
     </fwb-table-head>
     <fwb-table-body>
       <fwb-table-row v-for="row in getUsers" :key="row.id">
-        <fwb-table-cell>{{ row.slug }}</fwb-table-cell>
         <fwb-table-cell>{{ row.username }}</fwb-table-cell>
         <fwb-table-cell>{{ row.email }}</fwb-table-cell>
+        <fwb-table-cell>{{ row.fullname }}</fwb-table-cell>
         <fwb-table-cell>{{ row.admin }}</fwb-table-cell>
         <fwb-table-cell>{{ row.active }}</fwb-table-cell>
         <fwb-table-cell>
           <ShowAction
-            :to="{ name: 'showUser', params: { userId: row.slug } }"
+            :to="{ name: 'showUser', params: { userId: row.username } }"
             tag="link"
           />
           <UpdateAction
-            :to="{ name: 'updateUser', params: { userId: row.slug } }"
+            :to="{ name: 'updateUser', params: { userId: row.username } }"
             tag="link"
           />
           <DeleteAction
-            :handler="deleteRecord(<string>row.slug)"
+            :handler="deleteRecord(<string>row.username)"
             :element="<string>row.username"
             tag="link"
           />
@@ -114,10 +114,10 @@ const getUsers = computed(() => {
   return store.users as user[];
 });
 
-function deleteRecord(slug: string) {
+function deleteRecord(username: string) {
   return () => {
     store
-      .deleteUser(slug)
+      .deleteUser(username)
       .then(() => {
         store.fetchUsers();
       })

diff --git a/src/pages/users/Show.vue b/src/pages/users/Show.vue
@@ -12,7 +12,7 @@
     </router-link>
     <router-link
       v-slot="{ href }"
-      :to="{ name: 'showUser', params: { userId: record.slug } }"
+      :to="{ name: 'showUser', params: { userId: record.username } }"
       custom
     >
       <fwb-breadcrumb-item :href="href">
@@ -23,10 +23,10 @@
 
   <ContentHeader :title="t('users.title.show', [record.username])">
     <UpdateAction
-      :to="{ name: 'updateUser', params: { userId: record.slug } }"
+      :to="{ name: 'updateUser', params: { userId: record.username } }"
     />
     <DeleteAction
-      :handler="deleteRecord(<string>record.slug)"
+      :handler="deleteRecord(<string>record.username)"
       :element="<string>record.username"
     />
   </ContentHeader>
@@ -39,12 +39,6 @@
         }}</fwb-table-head-cell>
         <fwb-table-cell>{{ record.id }}</fwb-table-cell>
       </fwb-table-row>
-      <fwb-table-row>
-        <fwb-table-head-cell class="text-right">{{
-          t("common.slug")
-        }}</fwb-table-head-cell>
-        <fwb-table-cell>{{ record.slug }}</fwb-table-cell>
-      </fwb-table-row>
       <fwb-table-row>
         <fwb-table-head-cell class="text-right">{{
           t("users.username")
@@ -57,6 +51,12 @@
         }}</fwb-table-head-cell>
         <fwb-table-cell>{{ record.email }}</fwb-table-cell>
       </fwb-table-row>
+      <fwb-table-row>
+        <fwb-table-head-cell class="text-right">{{
+          t("users.fullname")
+        }}</fwb-table-head-cell>
+        <fwb-table-cell>{{ record.fullname }}</fwb-table-cell>
+      </fwb-table-row>
       <fwb-table-row>
         <fwb-table-head-cell class="text-right">{{
           t("users.admin")
@@ -104,10 +104,10 @@ const record = computed(() => {
   return store.currentUser;
 });
 
-function deleteRecord(slug: string) {
+function deleteRecord(username: string) {
   return () => {
     store
-      .deleteUser(slug)
+      .deleteUser(username)
       .then(() => {
         router.push({ name: "users" });
       })

diff --git a/src/pages/users/Update.vue b/src/pages/users/Update.vue
@@ -12,7 +12,7 @@
     </router-link>
     <router-link
       v-slot="{ href }"
-      :to="{ name: 'showUser', params: { userId: record.slug } }"
+      :to="{ name: 'showUser', params: { userId: record.username } }"
       custom
     >
       <fwb-breadcrumb-item :href="href">
@@ -21,7 +21,7 @@
     </router-link>
     <router-link
       v-slot="{ href }"
-      :to="{ name: 'updateUser', params: { userId: record.slug } }"
+      :to="{ name: 'updateUser', params: { userId: record.username } }"
       custom
     >
       <fwb-breadcrumb-item :href="href">{{
@@ -42,14 +42,6 @@
       name="updateUser"
       @submit="submit"
     >
-      <FormKit
-        id="slug"
-        type="text"
-        name="slug"
-        validation="length:3,64"
-        label="Slug"
-        help="Slug of your user"
-      />
       <FormKit
         id="username"
         type="text"
@@ -58,6 +50,14 @@
         label="Username"
         help="Username of your user"
       />
+      <FormKit
+        id="password"
+        type="text"
+        name="password"
+        validation=""
+        label="Password"
+        help="Password of your user"
+      />
       <FormKit
         id="email"
         type="text"
@@ -66,6 +66,14 @@
         label="Email"
         help="Email of your user"
       />
+      <FormKit
+        id="fullname"
+        type="text"
+        name="fullname"
+        validation=""
+        label="Fullname"
+        help="Fullname of your user"
+      />
       <FormKit
         id="admin"
         type="checkbox"
@@ -98,7 +106,7 @@ import { useUserStore } from "../../store/users";
 
 import { useI18n } from "vue-i18n";
 
-import type { general_error } from "../../client/models/general_error";
+import type { notification } from "../../client/models/notification";
 import type { user } from "../../client/models/user";
 
 const store = useUserStore();
@@ -115,11 +123,11 @@ const record = computed(() => {
 
 function submit(data: user) {
   return store
-    .updateUser(<string>record.value.slug, data)
-    .then((resp: void | general_error | user) => {
+    .updateUser(<string>record.value.username, data)
+    .then((resp: void | notification | user) => {
       const val = <user>resp;
       reset("update", val);
-      router.push({ name: "showUser", params: { userId: val.slug } });
+      router.push({ name: "showUser", params: { userId: val.username } });
     })
     .catch((e) => {
       console.log(e);

diff --git a/src/store/teams.ts b/src/store/teams.ts
@@ -3,7 +3,7 @@ import { defineStore } from "pinia";
 import { pick } from "./helpers";
 import { Kleister } from "../client";
 
-import type { general_error } from "../client/models/general_error";
+import type { notification } from "../client/models/notification";
 import type { teams } from "../client/models/teams";
 import type { team } from "../client/models/team";
 
@@ -20,7 +20,7 @@ export const useTeamStore = defineStore("team", {
     async fetchTeams() {
       return client.team
         .listTeams()
-        .then((resp: general_error | teams) => {
+        .then((resp: notification | teams) => {
           const val = <teams>resp;
           this.teams = <team[]>val.teams;
         })
@@ -31,7 +31,7 @@ export const useTeamStore = defineStore("team", {
     async fetchTeam(teamId: string) {
       return client.team
         .showTeam(teamId)
-        .then((resp: general_error | team) => {
+        .then((resp: notification | team) => {
           const val = <team>resp;
           this.currentTeam = val;
         })

diff --git a/src/store/users.ts b/src/store/users.ts
@@ -3,7 +3,7 @@ import { defineStore } from "pinia";
 import { pick } from "./helpers";
 import { Kleister } from "../client";
 
-import type { general_error } from "../client/models/general_error";
+import type { notification } from "../client/models/notification";
 import type { users } from "../client/models/users";
 import type { user } from "../client/models/user";
 
@@ -20,7 +20,7 @@ export const useUserStore = defineStore("user", {
     async fetchUsers() {
       return client.user
         .listUsers()
-        .then((resp: general_error | users) => {
+        .then((resp: notification | users) => {
           const val = <users>resp;
           this.users = <user[]>val.users;
         })
@@ -31,7 +31,7 @@ export const useUserStore = defineStore("user", {
     async fetchUser(userId: string) {
       return client.user
         .showUser(userId)
-        .then((resp: general_error | user) => {
+        .then((resp: notification | user) => {
           const val = <user>resp;
           this.currentUser = val;
         })
@@ -49,10 +49,9 @@ export const useUserStore = defineStore("user", {
         .createUser(
           pick(
             data,
-            "slug",
-            "email",
             "username",
             "password",
+            "email",
             "fullname",
             "admin",
             "active",
@@ -68,10 +67,9 @@ export const useUserStore = defineStore("user", {
           userId,
           pick(
             data,
-            "slug",
-            "email",
             "username",
             "password",
+            "email",
             "fullname",
             "admin",
             "active",