kadet/czydojade
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

50_make_frontend_part_independent #2

Closed
kadet wants to merge 78 commits from 50_make_frontend_part_independent into master
pull from: 50_make_frontend_part_independent
merge into: kadet:master
Conversation 0 Commits 78 Files Changed 405 +14 -7
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8ebf5ac137 - Show all commits

2
resources/components/favourites/save.html
View File

@ -6,7 +6,7 @@
:class="{ 'is-invalid': errors.name.length > 0 }" id="favourite_add_name" :class="{ 'is-invalid': errors.name.length > 0 }" id="favourite_add_name"
v-model="name" v-autofocus/> v-model="name" v-autofocus/>
<button class="btn btn-sm btn-dark" type="submit"> <button class="btn btn-sm btn-dark" type="submit">
<ui-icon class="add" /> <ui-icon icon="add" />
</button> </button>
<div v-if="errors.name.length > 0" class="invalid-feedback"> <div v-if="errors.name.length > 0" class="invalid-feedback">
<p v-for="error in errors.name">{{ error }}</p> <p v-for="error in errors.name">{{ error }}</p>

2
resources/components/ui/icon.html
View File

@ -1,4 +1,4 @@
<fa v-bind="definition" v-if="type === 'simple'"/> <fa v-bind="attrs" v-if="type === 'simple'"/>
<fa-layers v-else-if="type === 'stacked'"> <fa-layers v-else-if="type === 'stacked'">
<fa :icon="props.icon" v-bind="props" v-for="(props, index) in definition.icons" :key="index"/> <fa :icon="props.icon" v-bind="props" v-for="(props, index) in definition.icons" :key="index"/>
</fa-layers> </fa-layers>

17
resources/ts/components/ui/icon.ts
View File

@ -15,7 +15,7 @@ import {
faInfoCircle, faInfoCircle,
faMapMarkerAlt, faMapMarkerAlt,
faMoon, faMoon,
faQuestionCircle, faQuestionCircle, faQuestionSquare,
faSearch, faSearch,
faSign, faSign,
faStar, faStar,
@ -60,6 +60,7 @@ const messageTypeIcons: Dictionary<Icon> = {
const definitions: Dictionary<Icon> = { const definitions: Dictionary<Icon> = {
'favourite': simple(faStar), 'favourite': simple(faStar),
'unknown': simple(faQuestionSquare),
'add': simple(faCheck), 'add': simple(faCheck),
'add-all': simple(faCheckDouble), 'add-all': simple(faCheckDouble),
'remove-stop': simple(faTimes), 'remove-stop': simple(faTimes),
@ -113,14 +114,20 @@ export class UiIcon extends Vue {
validator: value => typeof value === "object" || Object.keys(definitions).includes(value), validator: value => typeof value === "object" || Object.keys(definitions).includes(value),
required: true, required: true,
}) })
icon: keyof typeof definitions; icon: string | IconDefinition;
get definition() { get definition(): Icon {
return {...(typeof this.icon === "string" ? definitions[this.icon] : { icon: this.icon }), ...this.$attrs}; return typeof this.icon === "string"
? definitions[this.icon] || definitions['unknown']
: { icon: this.icon as IconDefinition, type: "simple" };
}
get attrs() {
return { ...this.definition, ...this.$attrs };
} }
get type() { get type() {
return definitions[this.icon].type; return this.definition.type;
} }
} }