A continuation of HomeBox the inventory and organization system built for the Home User
fix: ui/ux issues (#34)
Haydena6e3989aeedc
diff --git a/Taskfile.yml b/Taskfile.ymlindex 88146c30..0b8049e7 100644--- a/Taskfile.yml+++ b/Taskfile.yml@@ -23,7 +23,8 @@ tasks:python3 ./scripts/process-types.py ./frontend/lib/api/types/data-contracts.tssources:- "./backend/app/api/**/*"- - "./backend/app/internal/types/**/*"+ - "./backend/internal/repo/**/*"+ - "./backend/internal/services/**/*"- "./scripts/process-types.py"generates:- "./frontend/lib/api/types/data-contracts.ts"diff --git a/backend/app/api/docs/docs.go b/backend/app/api/docs/docs.goindex 156d845a..784c5912 100644--- a/backend/app/api/docs/docs.go+++ b/backend/app/api/docs/docs.go@@ -1531,9 +1531,6 @@ const docTemplate = `{"email": {"type": "string"},- "groupName": {- "type": "string"- },"name": {"type": "string"},diff --git a/backend/app/api/docs/swagger.json b/backend/app/api/docs/swagger.jsonindex cec1d740..2e6dea62 100644--- a/backend/app/api/docs/swagger.json+++ b/backend/app/api/docs/swagger.json@@ -1523,9 +1523,6 @@"email": {"type": "string"},- "groupName": {- "type": "string"- },"name": {"type": "string"},diff --git a/backend/app/api/docs/swagger.yaml b/backend/app/api/docs/swagger.yamlindex ea65a284..ae460a6a 100644--- a/backend/app/api/docs/swagger.yaml+++ b/backend/app/api/docs/swagger.yaml@@ -322,8 +322,6 @@ definitions:properties:email:type: string- groupName:- type: stringname:type: stringpassword:diff --git a/backend/internal/services/service_user.go b/backend/internal/services/service_user.goindex 93008c87..688821a6 100644--- a/backend/internal/services/service_user.go+++ b/backend/internal/services/service_user.go@@ -28,7 +28,6 @@ type (Name string `json:"name"`Email string `json:"email"`Password string `json:"password"`- GroupName string `json:"groupName"`}UserAuthTokenDetail struct {Raw string `json:"raw"`@@ -46,7 +45,6 @@ func (svc *UserService) RegisterUser(ctx context.Context, data UserRegistration)log.Debug().Str("name", data.Name).Str("email", data.Email).- Str("groupName", data.GroupName).Str("groupToken", data.GroupToken).Msg("Registering new user")@@ -57,7 +55,7 @@ func (svc *UserService) RegisterUser(ctx context.Context, data UserRegistration))if data.GroupToken == "" {- group, err = svc.repos.Groups.GroupCreate(ctx, data.GroupName)+ group, err = svc.repos.Groups.GroupCreate(ctx, "Home")if err != nil {log.Err(err).Msg("Failed to create group")return repo.UserOut{}, errdiff --git a/frontend/components/App/Header.vue b/frontend/components/App/Header.vueindex 176aa04c..9c6b5522 100644--- a/frontend/components/App/Header.vue+++ b/frontend/components/App/Header.vue@@ -68,11 +68,13 @@<BaseContainer cmp="header" class="py-6 max-w-none"><BaseContainer>- <h2 class="mt-1 text-4xl font-bold tracking-tight text-neutral-content sm:text-5xl lg:text-6xl flex">- HomeB- <AppLogo class="w-12 -mb-4" />- x- </h2>+ <NuxtLink to="/home">+ <h2 class="mt-1 text-4xl font-bold tracking-tight text-neutral-content sm:text-5xl lg:text-6xl flex">+ HomeB+ <AppLogo class="w-12 -mb-4" />+ x+ </h2>+ </NuxtLink><div class="ml-1 mt-2 text-lg text-neutral-content/75 space-x-2"><template v-for="link in links"><NuxtLinkdiff --git a/frontend/components/Item/CreateModal.vue b/frontend/components/Item/CreateModal.vueindex ffc192a6..e5b115d9 100644--- a/frontend/components/Item/CreateModal.vue+++ b/frontend/components/Item/CreateModal.vue@@ -37,13 +37,22 @@},});+ const api = useUserApi();+ const toast = useNotifier();++ const locationsStore = useLocationStore();+ const locations = computed(() => locationsStore.locations);++ const labelStore = useLabelStore();+ const labels = computed(() => labelStore.labels);+const submitBtn = ref(null);const modal = useVModel(props, "modelValue");const loading = ref(false);const focused = ref(false);const form = reactive({- location: {} as LocationOut,+ location: locations.value && locations.value.length > 0 ? locations.value[0] : ({} as LocationOut),name: "",description: "",color: "", // Future!@@ -65,14 +74,6 @@focused.value = true;});- const api = useUserApi();- const toast = useNotifier();-- const locationsStore = useLocationStore();- const locations = computed(() => locationsStore.locations);-- const labelStore = useLabelStore();- const labels = computed(() => labelStore.labels);async function create() {if (!form.location) {@@ -88,7 +89,7 @@const { error } = await api.items.create(out);if (error) {- toast.error("Couldn't create label");+ toast.error("Couldn't create item");return;}diff --git a/frontend/components/global/DateTime.vue b/frontend/components/global/DateTime.vueindex 52defcfa..bc57accb 100644--- a/frontend/components/global/DateTime.vue+++ b/frontend/components/global/DateTime.vue@@ -19,7 +19,7 @@return "";}- if (nullDate(dt)) {+ if (!validDate(dt)) {return "";}@@ -35,10 +35,6 @@}});- function nullDate(dt: Date) {- return dt.getFullYear() === 1;- }-const props = defineProps({date: {type: [Date, String],diff --git a/frontend/lib/api/__test__/public.test.ts b/frontend/lib/api/__test__/public.test.tsindex cb3a9c3e..4b071659 100644--- a/frontend/lib/api/__test__/public.test.ts+++ b/frontend/lib/api/__test__/public.test.ts@@ -8,7 +8,6 @@ function userFactory(): UserRegistration {email: faker.internet.email(),password: faker.internet.password(),name: faker.name.firstName(),- groupName: faker.animal.cat(),token: "",};}diff --git a/frontend/lib/api/__test__/test-utils.ts b/frontend/lib/api/__test__/test-utils.tsindex cab9b9a6..2cef4a3b 100644--- a/frontend/lib/api/__test__/test-utils.ts+++ b/frontend/lib/api/__test__/test-utils.ts@@ -30,10 +30,10 @@ export async function sharedUserClient(): Promise<UserClient> {return userClient(cache.token);}const testUser = {- groupName: "test-group",email: "__test__@__test__.com",name: "__test__",password: "__test__",+ token: "",};const api = client();diff --git a/frontend/lib/api/types/data-contracts.ts b/frontend/lib/api/types/data-contracts.tsindex daa08a01..bd15e833 100644--- a/frontend/lib/api/types/data-contracts.ts+++ b/frontend/lib/api/types/data-contracts.ts@@ -219,7 +219,6 @@ export interface ServerValidationError {export interface UserRegistration {email: string;- groupName: string;name: string;password: string;token: string;diff --git a/frontend/pages/index.vue b/frontend/pages/index.vueindex 51941982..eab6f4e1 100644--- a/frontend/pages/index.vue+++ b/frontend/pages/index.vue@@ -21,7 +21,6 @@const username = ref("");const email = ref("");- const groupName = ref("");const password = ref("");const canRegister = ref(false);@@ -50,7 +49,6 @@name: username.value,email: email.value,password: password.value,- groupName: groupName.value,token: groupToken.value,});@@ -152,8 +150,7 @@</h2><FormTextField v-model="email" label="Set your email?" /><FormTextField v-model="username" label="What's your name?" />- <FormTextField v-if="groupToken == ''" v-model="groupName" label="Name your group" />- <div v-else class="pt-4 pb-1 text-center">+ <div v-if="!(groupToken == '')" class="pt-4 pb-1 text-center"><p>You're Joining an Existing Group!</p><button type="button" class="text-xs underline" @click="groupToken = ''">Don't Want To Join a Group?diff --git a/frontend/pages/item/[id]/index.vue b/frontend/pages/item/[id]/index.vueindex ccbc9437..5028cf0b 100644--- a/frontend/pages/item/[id]/index.vue+++ b/frontend/pages/item/[id]/index.vue@@ -177,14 +177,14 @@if (preferences.value.showEmpty) {return true;}- return item.value?.purchaseFrom || item.value?.purchasePrice;+ return item.value?.purchaseFrom || item.value?.purchasePrice !== "0";});- const purchaseDetails = computed<(Detail | DateDetail)[]>(() => {+ const purchaseDetails = computed<Array<Detail | DateDetail>>(() => {return [{name: "Purchase From",- label: item.value?.purchaseFrom || "",+ text: item.value?.purchaseFrom || "",},{name: "Purchase Price",@@ -193,18 +193,19 @@{name: "Purchase Date",text: item.value.purchaseTime,+ type: "date",},- ] as (Detail | DateDetail)[];+ ];});const showSold = computed(() => {if (preferences.value.showEmpty) {return true;}- return item.value?.soldTo || item.value?.soldPrice;+ return item.value?.soldTo || item.value?.soldPrice !== "0";});- const soldDetails = computed<Array<Detail>>(() => {+ const soldDetails = computed<Array<Detail | DateDetail>>(() => {return [{name: "Sold To",@@ -217,8 +218,9 @@{name: "Sold At",text: item.value?.soldTime || "",+ type: "date",},- ] as Detail[];+ ];});const confirm = useConfirm();