feat(fields): improved error messages, switched to placeholder

This commit is contained in:
git_girl 2023-09-12 16:05:00 +02:00
parent dd9c9c442c
commit b6424cac9c
6 changed files with 14 additions and 9 deletions

View File

@ -33,8 +33,10 @@ Requirements:
1. Create a PostgreSQL user and database (the user should own the database). 1. Create a PostgreSQL user and database (the user should own the database).
For example: `create user pronouns with password 'password'; create database pronouns with owner pronouns;` For example: `create user pronouns with password 'password'; create database pronouns with owner pronouns;`
2. Copy `.env.example` in the repository root to a new file named `.env` and fill out the required options. 2. Copy `.env.example` in the repository root to a new file named `.env` and fill out the required options.
3. Run `go run -v . database migrate` to initialize the database, then optionally `go run -v . database seed` to insert a test user. 3. Copy `./frontend/.env.example` to `./frontend/env` and fill out the required options (`PUBLIC_BASE_URL`),
4. Run `pnpm dev`. Alternatively, if you don't want the backend to live reload, run `go run -v . web`, instead of using `localhost` use `127.0.0.1`.
4. Run `go run -v . database migrate` to initialize the database, then optionally `go run -v . database seed` to insert a test user.
5. Run `pnpm dev`. Alternatively, if you don't want the backend to live reload, run `go run -v . web`,
then change to the `frontend/` directory and run `pnpm dev`. then change to the `frontend/` directory and run `pnpm dev`.
See [`docs/production.md`](/docs/production.md#configuration) for more information about keys in the backend and frontend `.env` files. See [`docs/production.md`](/docs/production.md#configuration) for more information about keys in the backend and frontend `.env` files.

View File

@ -43,7 +43,10 @@ func (f Field) Validate(custom CustomPreferences) string {
} }
if !entry.Status.Valid(custom) { if !entry.Status.Valid(custom) {
return fmt.Sprintf("entries.%d: status is invalid", i) if entry.Status == "missing" {
return fmt.Sprintf("didn't select a status for entries.%d. make sure to select it to the right of the field", i)
}
return fmt.Sprintf("entries.%d status: '%s' is invalid", i, entry.Status)
} }
} }

View File

@ -69,7 +69,7 @@ export interface Settings {
} }
export interface Field { export interface Field {
name: string; name: string | null;
entries: FieldEntry[]; entries: FieldEntry[];
} }

View File

@ -36,7 +36,7 @@
</script> </script>
<div class="p-3"> <div class="p-3">
<h5>{field.name}</h5> <h5>{field.name ? field.name : "New Field"}</h5>
<InputGroup class="m-1"> <InputGroup class="m-1">
<IconButton <IconButton
color="secondary" color="secondary"
@ -50,7 +50,7 @@
tooltip="Move field right" tooltip="Move field right"
click={() => moveField(false)} click={() => moveField(false)}
/> />
<Input bind:value={field.name} /> <Input placeholder="New Field" bind:value={field.name} />
<Button color="danger" on:click={() => deleteField()}>Delete field</Button> <Button color="danger" on:click={() => deleteField()}>Delete field</Button>
</InputGroup> </InputGroup>
<hr /> <hr />
@ -65,7 +65,7 @@
/> />
{/each} {/each}
<form class="input-group m-1" on:submit={addEntry}> <form class="m-1 input-group" on:submit={addEntry}>
<input type="text" class="form-control" placeholder="New entry" bind:value={newEntry} /> <input type="text" class="form-control" placeholder="New entry" bind:value={newEntry} />
<IconButton color="success" icon="plus" tooltip="Add entry" /> <IconButton color="success" icon="plus" tooltip="Add entry" />
</form> </form>

View File

@ -46,7 +46,7 @@
</div> </div>
<div> <div>
<Button <Button
on:click={() => ($member.fields = [...$member.fields, { name: "New field", entries: [] }])} on:click={() => ($member.fields = [...$member.fields, { name: null, entries: [] }])}
> >
<Icon name="plus" aria-hidden /> Add new field <Icon name="plus" aria-hidden /> Add new field
</Button> </Button>

View File

@ -45,7 +45,7 @@
</div> </div>
</div> </div>
<div> <div>
<Button on:click={() => ($user.fields = [...$user.fields, { name: "New field", entries: [] }])}> <Button on:click={() => ($user.fields = [...$user.fields, { name: null, entries: [] }])}>
<Icon name="plus" aria-hidden /> Add new field <Icon name="plus" aria-hidden /> Add new field
</Button> </Button>
</div> </div>