Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/src/views/electron/ServerSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ const validUrl = (value) => {
const url = new URL(value.startsWith('http') ? value : `http://${value}`);
return url.protocol === 'http:' || url.protocol === 'https:';
} catch {
// Invalid URL syntax - return false for validation
return false;
}
};
Expand Down
56 changes: 36 additions & 20 deletions client/src/views/show/config/ConfigCast.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,35 @@
@ok="onSubmitNew"
>
<b-form ref="new-cast-form" @submit.stop.prevent="onSubmitNew">
<b-form-group id="first-name-input-group" label="First Name" label-for="first-name-input">
<b-form-group
id="new-first-name-input-group"
label="First Name"
label-for="new-first-name-input"
>
<b-form-input
id="first-name-input"
id="new-first-name-input"
v-model="$v.newFormState.firstName.$model"
name="first-name-input"
name="new-first-name-input"
:state="validateNewState('firstName')"
aria-describedby="name-feedback"
aria-describedby="new-first-name-feedback"
/>
<b-form-invalid-feedback id="first-name-feedback">
<b-form-invalid-feedback id="new-first-name-feedback">
This is a required field.
</b-form-invalid-feedback>
</b-form-group>
<b-form-group id="last-name-input-group" label="Last Name" label-for="last-name-input">
<b-form-group
id="new-last-name-input-group"
label="Last Name"
label-for="new-last-name-input"
>
<b-form-input
id="last-name-input"
id="new-last-name-input"
v-model="$v.newFormState.lastName.$model"
name="last-name-input"
name="new-last-name-input"
:state="validateNewState('lastName')"
aria-describedby="name-feedback"
aria-describedby="new-last-name-feedback"
/>
<b-form-invalid-feedback id="last-name-feedback">
<b-form-invalid-feedback id="new-last-name-feedback">
This is a required field.
</b-form-invalid-feedback>
</b-form-group>
Expand All @@ -98,27 +106,35 @@
@ok="onSubmitEdit"
>
<b-form ref="edit-cast-form" @submit.stop.prevent="onSubmitEdit">
<b-form-group id="first-name-input-group" label="First Name" label-for="first-name-input">
<b-form-group
id="edit-first-name-input-group"
label="First Name"
label-for="edit-first-name-input"
>
<b-form-input
id="first-name-input"
id="edit-first-name-input"
v-model="$v.editFormState.firstName.$model"
name="first-name-input"
name="edit-first-name-input"
:state="validateEditState('firstName')"
aria-describedby="name-feedback"
aria-describedby="edit-first-name-feedback"
/>
<b-form-invalid-feedback id="first-name-feedback">
<b-form-invalid-feedback id="edit-first-name-feedback">
This is a required field.
</b-form-invalid-feedback>
</b-form-group>
<b-form-group id="last-name-input-group" label="Last Name" label-for="last-name-input">
<b-form-group
id="edit-last-name-input-group"
label="Last Name"
label-for="edit-last-name-input"
>
<b-form-input
id="last-name-input"
id="edit-last-name-input"
v-model="$v.editFormState.lastName.$model"
name="last-name-input"
name="edit-last-name-input"
:state="validateEditState('lastName')"
aria-describedby="name-feedback"
aria-describedby="edit-last-name-feedback"
/>
<b-form-invalid-feedback id="last-name-feedback">
<b-form-invalid-feedback id="edit-last-name-feedback">
This is a required field.
</b-form-invalid-feedback>
</b-form-group>
Expand Down
50 changes: 30 additions & 20 deletions client/src/views/show/config/ConfigCharacters.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,32 +73,37 @@
@ok="onSubmitNew"
>
<b-form ref="new-character-form" @submit.stop.prevent="onSubmitNew">
<b-form-group id="name-input-group" label="Name" label-for="name-input">
<b-form-group id="new-name-input-group" label="Name" label-for="new-name-input">
<b-form-input
id="name-input"
id="new-name-input"
v-model="$v.newFormState.name.$model"
name="name-input"
name="new-name-input"
:state="validateNewState('name')"
aria-describedby="name-feedback"
aria-describedby="new-name-feedback"
/>
<b-form-invalid-feedback id="name-feedback">
<b-form-invalid-feedback id="new-name-feedback">
This is a required field.
</b-form-invalid-feedback>
</b-form-group>
<b-form-group
id="description-input-group"
id="new-description-input-group"
label="Description"
label-for="description-input"
label-for="new-description-input"
>
<b-form-input
id="description-input"
id="new-description-input"
v-model="$v.newFormState.description.$model"
name="description-input"
name="new-description-input"
:state="validateNewState('description')"
/>
</b-form-group>
<b-form-group id="played-by-input-group" label="Played By" label-for="played-by-input">
<b-form-group
id="new-played-by-input-group"
label="Played By"
label-for="new-played-by-input"
>
<b-form-select
id="new-played-by-input"
v-model="$v.newFormState.played_by.$model"
:options="castOptions"
:state="validateNewState('played_by')"
Expand All @@ -116,32 +121,37 @@
@ok="onSubmitEdit"
>
<b-form ref="edit-character-form" @submit.stop.prevent="onSubmitEdit">
<b-form-group id="name-input-group" label="Name" label-for="name-input">
<b-form-group id="edit-name-input-group" label="Name" label-for="edit-name-input">
<b-form-input
id="name-input"
id="edit-name-input"
v-model="$v.editFormState.name.$model"
name="name-input"
name="edit-name-input"
:state="validateEditState('name')"
aria-describedby="name-feedback"
aria-describedby="edit-name-feedback"
/>
<b-form-invalid-feedback id="name-feedback">
<b-form-invalid-feedback id="edit-name-feedback">
This is a required field.
</b-form-invalid-feedback>
</b-form-group>
<b-form-group
id="description-input-group"
id="edit-description-input-group"
label="Description"
label-for="description-input"
label-for="edit-description-input"
>
<b-form-input
id="description-input"
id="edit-description-input"
v-model="$v.editFormState.description.$model"
name="description-input"
name="edit-description-input"
:state="validateEditState('description')"
/>
</b-form-group>
<b-form-group id="played-by-input-group" label="Played By" label-for="played-by-input">
<b-form-group
id="edit-played-by-input-group"
label="Played By"
label-for="edit-played-by-input"
>
<b-form-select
id="edit-played-by-input"
v-model="$v.editFormState.played_by.$model"
:options="castOptions"
:state="validateEditState('played_by')"
Expand Down
64 changes: 32 additions & 32 deletions client/src/views/show/config/ConfigCues.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,44 +70,44 @@
@ok="onSubmitNewCueType"
>
<b-form ref="new-cue-type-form" @submit.stop.prevent="onSubmitNewCueType">
<b-form-group id="prefix-input-group" label="Prefix" label-for="prefix-input">
<b-form-group id="new-prefix-input-group" label="Prefix" label-for="new-prefix-input">
<b-form-input
id="prefix-input"
id="new-prefix-input"
v-model="$v.newCueTypeForm.prefix.$model"
name="prefix-input"
name="new-prefix-input"
:state="validateNewCueTypeState('prefix')"
aria-describedby="prefix-feedback"
aria-describedby="new-prefix-feedback"
/>
<b-form-invalid-feedback id="prefix-feedback">
<b-form-invalid-feedback id="new-prefix-feedback">
This is a required field and must be 5 characters or less.
</b-form-invalid-feedback>
</b-form-group>
<b-form-group
id="description-input-group"
id="new-description-input-group"
label="Description"
label-for="description-input"
label-for="new-description-input"
>
<b-form-input
id="description-input"
id="new-description-input"
v-model="$v.newCueTypeForm.description.$model"
name="description-input"
name="new-description-input"
:state="validateNewCueTypeState('description')"
aria-describedby="description-feedback"
aria-describedby="new-description-feedback"
/>
<b-form-invalid-feedback id="description-feedback">
<b-form-invalid-feedback id="new-description-feedback">
This is a required field and must be 100 characters or less.
</b-form-invalid-feedback>
</b-form-group>
<b-form-group id="colour-input-group" label="Colour" label-for="colour-input">
<b-form-group id="new-colour-input-group" label="Colour" label-for="new-colour-input">
<b-form-input
id="colour-input"
id="new-colour-input"
v-model="$v.newCueTypeForm.colour.$model"
name="colour-input"
name="new-colour-input"
type="color"
:state="validateNewCueTypeState('colour')"
aria-describedby="colour-feedback"
aria-describedby="new-colour-feedback"
/>
<b-form-invalid-feedback id="colour-feedback">
<b-form-invalid-feedback id="new-colour-feedback">
This is a required field.
</b-form-invalid-feedback>
</b-form-group>
Expand All @@ -123,44 +123,44 @@
@ok="onSubmitEditCueType"
>
<b-form ref="edit-cue-type-form" @submit.stop.prevent="onSubmitEditCueType">
<b-form-group id="prefix-input-group" label="Prefix" label-for="prefix-input">
<b-form-group id="edit-prefix-input-group" label="Prefix" label-for="edit-prefix-input">
<b-form-input
id="prefix-input"
id="edit-prefix-input"
v-model="$v.editCueTypeFormState.prefix.$model"
name="prefix-input"
name="edit-prefix-input"
:state="validateEditCueTypeState('prefix')"
aria-describedby="prefix-feedback"
aria-describedby="edit-prefix-feedback"
/>
<b-form-invalid-feedback id="prefix-feedback">
<b-form-invalid-feedback id="edit-prefix-feedback">
This is a required field and must be 5 characters or less.
</b-form-invalid-feedback>
</b-form-group>
<b-form-group
id="description-input-group"
id="edit-description-input-group"
label="Description"
label-for="description-input"
label-for="edit-description-input"
>
<b-form-input
id="description-input"
id="edit-description-input"
v-model="$v.editCueTypeFormState.description.$model"
name="description-input"
name="edit-description-input"
:state="validateEditCueTypeState('description')"
aria-describedby="description-feedback"
aria-describedby="edit-description-feedback"
/>
<b-form-invalid-feedback id="description-feedback">
<b-form-invalid-feedback id="edit-description-feedback">
This is a required field and must be 100 characters or less.
</b-form-invalid-feedback>
</b-form-group>
<b-form-group id="colour-input-group" label="Colour" label-for="colour-input">
<b-form-group id="edit-colour-input-group" label="Colour" label-for="edit-colour-input">
<b-form-input
id="colour-input"
id="edit-colour-input"
v-model="$v.editCueTypeFormState.colour.$model"
name="colour-input"
name="edit-colour-input"
type="color"
:state="validateEditCueTypeState('colour')"
aria-describedby="colour-feedback"
aria-describedby="edit-colour-feedback"
/>
<b-form-invalid-feedback id="colour-feedback">
<b-form-invalid-feedback id="edit-colour-feedback">
This is a required field.
</b-form-invalid-feedback>
</b-form-group>
Expand Down
Loading
Loading