From 11eb066f62ce13ce28dbe49a4903ac9613aa1e13 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Thu, 10 Sep 2020 14:48:12 -0400 Subject: [PATCH 1/5] Move system interfaces into _system folder --- .../{ => _system}/display-template/display-template.vue | 0 app/src/interfaces/{ => _system}/display-template/index.ts | 0 app/src/interfaces/{ => _system}/display-template/readme.md | 0 app/src/interfaces/{ => _system}/field/field.vue | 0 app/src/interfaces/{ => _system}/field/index.ts | 0 app/src/interfaces/{ => _system}/interface-options/index.ts | 0 .../{ => _system}/interface-options/interface-options.vue | 0 app/src/interfaces/{ => _system}/interface/index.ts | 0 app/src/interfaces/{ => _system}/interface/interface.vue | 0 app/src/interfaces/{ => _system}/system-language/index.ts | 0 .../interfaces/{ => _system}/system-language/system-language.vue | 0 app/src/interfaces/{ => _system}/tfa-setup/index.ts | 0 app/src/interfaces/{ => _system}/tfa-setup/tfa-setup.vue | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename app/src/interfaces/{ => _system}/display-template/display-template.vue (100%) rename app/src/interfaces/{ => _system}/display-template/index.ts (100%) rename app/src/interfaces/{ => _system}/display-template/readme.md (100%) rename app/src/interfaces/{ => _system}/field/field.vue (100%) rename app/src/interfaces/{ => _system}/field/index.ts (100%) rename app/src/interfaces/{ => _system}/interface-options/index.ts (100%) rename app/src/interfaces/{ => _system}/interface-options/interface-options.vue (100%) rename app/src/interfaces/{ => _system}/interface/index.ts (100%) rename app/src/interfaces/{ => _system}/interface/interface.vue (100%) rename app/src/interfaces/{ => _system}/system-language/index.ts (100%) rename app/src/interfaces/{ => _system}/system-language/system-language.vue (100%) rename app/src/interfaces/{ => _system}/tfa-setup/index.ts (100%) rename app/src/interfaces/{ => _system}/tfa-setup/tfa-setup.vue (100%) diff --git a/app/src/interfaces/display-template/display-template.vue b/app/src/interfaces/_system/display-template/display-template.vue similarity index 100% rename from app/src/interfaces/display-template/display-template.vue rename to app/src/interfaces/_system/display-template/display-template.vue diff --git a/app/src/interfaces/display-template/index.ts b/app/src/interfaces/_system/display-template/index.ts similarity index 100% rename from app/src/interfaces/display-template/index.ts rename to app/src/interfaces/_system/display-template/index.ts diff --git a/app/src/interfaces/display-template/readme.md b/app/src/interfaces/_system/display-template/readme.md similarity index 100% rename from app/src/interfaces/display-template/readme.md rename to app/src/interfaces/_system/display-template/readme.md diff --git a/app/src/interfaces/field/field.vue b/app/src/interfaces/_system/field/field.vue similarity index 100% rename from app/src/interfaces/field/field.vue rename to app/src/interfaces/_system/field/field.vue diff --git a/app/src/interfaces/field/index.ts b/app/src/interfaces/_system/field/index.ts similarity index 100% rename from app/src/interfaces/field/index.ts rename to app/src/interfaces/_system/field/index.ts diff --git a/app/src/interfaces/interface-options/index.ts b/app/src/interfaces/_system/interface-options/index.ts similarity index 100% rename from app/src/interfaces/interface-options/index.ts rename to app/src/interfaces/_system/interface-options/index.ts diff --git a/app/src/interfaces/interface-options/interface-options.vue b/app/src/interfaces/_system/interface-options/interface-options.vue similarity index 100% rename from app/src/interfaces/interface-options/interface-options.vue rename to app/src/interfaces/_system/interface-options/interface-options.vue diff --git a/app/src/interfaces/interface/index.ts b/app/src/interfaces/_system/interface/index.ts similarity index 100% rename from app/src/interfaces/interface/index.ts rename to app/src/interfaces/_system/interface/index.ts diff --git a/app/src/interfaces/interface/interface.vue b/app/src/interfaces/_system/interface/interface.vue similarity index 100% rename from app/src/interfaces/interface/interface.vue rename to app/src/interfaces/_system/interface/interface.vue diff --git a/app/src/interfaces/system-language/index.ts b/app/src/interfaces/_system/system-language/index.ts similarity index 100% rename from app/src/interfaces/system-language/index.ts rename to app/src/interfaces/_system/system-language/index.ts diff --git a/app/src/interfaces/system-language/system-language.vue b/app/src/interfaces/_system/system-language/system-language.vue similarity index 100% rename from app/src/interfaces/system-language/system-language.vue rename to app/src/interfaces/_system/system-language/system-language.vue diff --git a/app/src/interfaces/tfa-setup/index.ts b/app/src/interfaces/_system/tfa-setup/index.ts similarity index 100% rename from app/src/interfaces/tfa-setup/index.ts rename to app/src/interfaces/_system/tfa-setup/index.ts diff --git a/app/src/interfaces/tfa-setup/tfa-setup.vue b/app/src/interfaces/_system/tfa-setup/tfa-setup.vue similarity index 100% rename from app/src/interfaces/tfa-setup/tfa-setup.vue rename to app/src/interfaces/_system/tfa-setup/tfa-setup.vue From 9841d13a8881958cee72be4c43731c48d52beb57 Mon Sep 17 00:00:00 2001 From: Ben Haynes Date: Thu, 10 Sep 2020 14:50:11 -0400 Subject: [PATCH 2/5] Cleaner notifications --- app/src/lang/en-US/index.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/lang/en-US/index.json b/app/src/lang/en-US/index.json index 28c5cc9972..971f18ccb0 100644 --- a/app/src/lang/en-US/index.json +++ b/app/src/lang/en-US/index.json @@ -102,13 +102,13 @@ "show_field_on_detail": "Show Field on Detail", "delete_field": "Delete Field", "fields_and_layout": "Fields & Layout", - "field_create_success": "Field \"{field}\" created", - "field_update_success": "Field \"{field}\" updated", - "field_delete_success": "Field \"{field}\" deleted", + "field_create_success": "Created Field: \"{field}\"", + "field_update_success": "Updated Field: \"{field}\"", + "field_delete_success": "Deleted Field: \"{field}\"", "field_create_failure": "Could not create \"{field}\"", "field_update_failure": "Could not update \"{field}\"", "field_delete_failure": "Could not delete \"{field}\"", - "fields_update_success": "Fields updated", + "fields_update_success": "Fields Updated", "fields_update_failure": "Could not update fields", "duplicate_where_to": "Where would you like to duplicate this field to?", "editing_field": "Editing {field}", @@ -1146,6 +1146,10 @@ "image": "Image", "in_list": "One of these", "info": "Info", + "normal": "Normal", + "success": "Success", + "warning": "Warning", + "danger": "Danger", "initial_schema": "Choose an Initial Schema", "initial_schema_copy": "Choose from existing database architectures or start fresh. You can always extend and tweak this later.", "install": "Install", From d14ea9697311bdd94a928e6067a70416464d3490 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Thu, 10 Sep 2020 14:50:23 -0400 Subject: [PATCH 3/5] Fix define import --- app/src/interfaces/_system/field/index.ts | 2 +- app/src/interfaces/_system/interface-options/index.ts | 2 +- app/src/interfaces/_system/interface/index.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/interfaces/_system/field/index.ts b/app/src/interfaces/_system/field/index.ts index ad29de5eef..43c2772bcf 100644 --- a/app/src/interfaces/_system/field/index.ts +++ b/app/src/interfaces/_system/field/index.ts @@ -1,4 +1,4 @@ -import { defineInterface } from '../define'; +import { defineInterface } from '@/interfaces/define'; import InterfaceField from './field.vue'; export default defineInterface(({ i18n }) => ({ diff --git a/app/src/interfaces/_system/interface-options/index.ts b/app/src/interfaces/_system/interface-options/index.ts index 048267a44b..0cfabaffc5 100644 --- a/app/src/interfaces/_system/interface-options/index.ts +++ b/app/src/interfaces/_system/interface-options/index.ts @@ -1,4 +1,4 @@ -import { defineInterface } from '../define'; +import { defineInterface } from '@/interfaces/define'; import InterfaceOptions from './interface-options.vue'; export default defineInterface(({ i18n }) => ({ diff --git a/app/src/interfaces/_system/interface/index.ts b/app/src/interfaces/_system/interface/index.ts index 8f8198a4f5..80c2786845 100644 --- a/app/src/interfaces/_system/interface/index.ts +++ b/app/src/interfaces/_system/interface/index.ts @@ -1,4 +1,4 @@ -import { defineInterface } from '../define'; +import { defineInterface } from '@/interfaces/define'; import InterfaceInterface from './interface.vue'; export default defineInterface(({ i18n }) => ({ From d90ff5af81bc19bde77171772e2173b5dc8b659d Mon Sep 17 00:00:00 2001 From: Ben Haynes Date: Thu, 10 Sep 2020 14:50:24 -0400 Subject: [PATCH 4/5] Cleaner interface descriptions --- app/src/lang/en-US/interfaces.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/lang/en-US/interfaces.json b/app/src/lang/en-US/interfaces.json index 3850b47549..c17996118c 100644 --- a/app/src/lang/en-US/interfaces.json +++ b/app/src/lang/en-US/interfaces.json @@ -19,7 +19,7 @@ }, "color": { "color": "Color", - "description": "Enter color values", + "description": "Enter or select a color value", "placeholder": "Choose a color...", "preset_colors": "Preset Colors", "preset_colors_placeholder": "Add a new color..." @@ -32,17 +32,17 @@ }, "display-template": { "display-template": "Display Template", - "description": "Mix text with field values", + "description": "Mix static text and dynamic field values", "collection_field": "Collection field", "collection_field_not_setup": "The collection field option is misconfigured", "select_a_collection": "Select a Collection" }, "divider": { "divider": "Divider", - "description": "Divide fields into seperate sections", + "description": "Label and divide fields into sections", "title_placeholder": "Enter a title...", "inline_title": "Inline Title", - "inline_title_label": "Show title inside line." + "inline_title_label": "Show title inside line" }, "dropdown": { "dropdown": "Dropdown", @@ -55,7 +55,7 @@ }, "dropdown-multiselect": { "dropdown-multiselect": "Dropdown (Multiple)", - "description": "Select multiple values of a dropdown" + "description": "Select multiple values from a dropdown" }, "file": { "file": "File", @@ -67,7 +67,7 @@ }, "hash": { "hash": "Hash", - "description": "Enter a hash", + "description": "Enter a value to be hashed", "masked": "Masked", "masked_label": "Hide the true values" }, @@ -90,7 +90,7 @@ }, "many-to-many": { "many-to-many": "Many to Many", - "description": "Select related items" + "description": "Select multiple related junction items" }, "many-to-one": { "many-to-one": "Many to One", @@ -119,7 +119,7 @@ }, "one-to-many": { "one-to-many": "One to Many", - "description": "Select related items", + "description": "Select multiple related items", "readable_fields_copy": "Select the fields that the user can view" }, "radio-buttons": { @@ -128,7 +128,7 @@ }, "repeater": { "repeater": "Repeater", - "description": "Have multiple entires of the same structure", + "description": "Create multiple entries of the same structure", "max_amount": "Maximum Amount", "max_amount_placeholder": "Maximum amount of items...", "edit_fields": "Edit Fields", @@ -161,11 +161,11 @@ }, "textarea": { "textarea": "Textarea", - "description": "Enter multiline text" + "description": "Enter multiline plain-text" }, "toggle": { "toggle": "Toggle", - "description": "Switch between an on and off state", + "description": "Switch between on and off", "label_placeholder": "Enter a label..." }, "user": { @@ -180,7 +180,7 @@ }, "wysiwyg": { "wysiwyg": "WYSIWYG", - "description": "A text editor for writing complex text", + "description": "A rich-text editor writing HTML content", "toolbar": "Toolbar", "custom_formats": "Custom Formats", "options_override": "Options Override" From 6933cb75a97280f71d01a2807d755fb7b7d181f4 Mon Sep 17 00:00:00 2001 From: Ben Haynes Date: Thu, 10 Sep 2020 14:50:35 -0400 Subject: [PATCH 5/5] Less padding on notifications --- .../private/components/notification-item/notification-item.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/views/private/components/notification-item/notification-item.vue b/app/src/views/private/components/notification-item/notification-item.vue index c31238473b..f9188a64a2 100644 --- a/app/src/views/private/components/notification-item/notification-item.vue +++ b/app/src/views/private/components/notification-item/notification-item.vue @@ -84,7 +84,7 @@ export default defineComponent({ align-items: center; justify-content: flex-start; width: 100%; - min-height: 64px; + min-height: 44px; margin-top: 4px; padding: 12px; color: var(--white);