From 19ba9dc16dcd4254ddd98fe3bee0a052ada2fb8e Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 16 Oct 2021 15:31:42 +0100 Subject: [PATCH 01/98] :globe_with_meridians: Remove the word 'Open' from context menu --- src/assets/locales/en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json index ebda9dfa8..10424e019 100644 --- a/src/assets/locales/en.json +++ b/src/assets/locales/en.json @@ -164,9 +164,9 @@ "restore-success-msg": "Config Restored Successfully" }, "menu": { - "sametab": "Open in Current Tab", - "newtab": "Open in New Tab", - "modal": "Open in Pop-Up Modal", - "workspace": "Open in Workspace View" + "sametab": "Current Tab", + "newtab": "New Tab", + "modal": "Pop-Up Modal", + "workspace": "Workspace View" } } \ No newline at end of file From b9b9c3071312424c6bb52331b87178481a549192 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 16 Oct 2021 15:32:18 +0100 Subject: [PATCH 02/98] :construction: Lays ground-work for the Edit Item modal form --- src/components/InteractiveEditor/EditItem.vue | 44 +++++++++++++++++++ .../InteractiveEditor/EditSection.vue | 23 ++++++++++ src/components/LinkItems/ContextMenu.vue | 37 +++++++++++----- src/components/LinkItems/Item.vue | 19 ++++++-- src/utils/defaults.js | 3 +- 5 files changed, 111 insertions(+), 15 deletions(-) create mode 100644 src/components/InteractiveEditor/EditItem.vue create mode 100644 src/components/InteractiveEditor/EditSection.vue diff --git a/src/components/InteractiveEditor/EditItem.vue b/src/components/InteractiveEditor/EditItem.vue new file mode 100644 index 000000000..5849a1f40 --- /dev/null +++ b/src/components/InteractiveEditor/EditItem.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/components/InteractiveEditor/EditSection.vue b/src/components/InteractiveEditor/EditSection.vue new file mode 100644 index 000000000..30eeb917a --- /dev/null +++ b/src/components/InteractiveEditor/EditSection.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/components/LinkItems/ContextMenu.vue b/src/components/LinkItems/ContextMenu.vue index 4d66e2e31..09356a93a 100644 --- a/src/components/LinkItems/ContextMenu.vue +++ b/src/components/LinkItems/ContextMenu.vue @@ -1,8 +1,9 @@ - diff --git a/src/components/LinkItems/Item.vue b/src/components/LinkItems/Item.vue index d2c903094..e499ac49a 100644 --- a/src/components/LinkItems/Item.vue +++ b/src/components/LinkItems/Item.vue @@ -40,7 +40,7 @@ @launchItem="launchItem" @openItemSettings="openItemSettings" /> - + @@ -226,6 +226,10 @@ export default { this.$modal.show(modalNames.EDIT_ITEM); this.$store.commit(StoreKeys.SET_MODAL_OPEN, true); }, + /* Ensure conditional is updated, once menu closed */ + closeEditMenu() { + this.editMenuOpen = false; + }, /* Used for smart-sort when sorting items by most used apps */ incrementMostUsedCount(itemId) { const mostUsed = JSON.parse(localStorage.getItem(localStorageKeys.MOST_USED) || '{}'); @@ -298,7 +302,7 @@ export default { /* Text in tile */ .tile-title { white-space: nowrap; - overflow: hidden; + // overflow: hidden; text-overflow: ellipsis; min-width: 120px; height: 30px; From f1fc013457cfdae844dea825e403e1bd8c8d6e7b Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 16 Oct 2021 21:03:26 +0100 Subject: [PATCH 08/98] :construction: You can now save items to VueX store, neat! --- src/components/InteractiveEditor/EditItem.vue | 24 ++++++++++++++----- src/store.js | 19 ++++++++++++++- src/utils/StoreMutations.js | 1 + 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/components/InteractiveEditor/EditItem.vue b/src/components/InteractiveEditor/EditItem.vue index a35b0ff9b..d248aee99 100644 --- a/src/components/InteractiveEditor/EditItem.vue +++ b/src/components/InteractiveEditor/EditItem.vue @@ -7,22 +7,22 @@ classes="dashy-modal edit-item" @closed="modalClosed" > -

Edit Item

-
-
+

Edit Item

+
- + + + + + From 3a3a26c3c54cc558ddefe7cec3f79d28fd8c4de3 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sun, 17 Oct 2021 18:54:54 +0100 Subject: [PATCH 15/98] :green_heart: Remove duplicate style --- src/components/FormElements/Select.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/FormElements/Select.vue b/src/components/FormElements/Select.vue index 53a1623f1..3ad72abaf 100644 --- a/src/components/FormElements/Select.vue +++ b/src/components/FormElements/Select.vue @@ -66,14 +66,13 @@ div.select-container { } .form-dropdown { flex-grow: 2; - min-width: 10rem; + min-width: 12rem; margin: 0.5rem auto; font-size: 1.2rem; box-sizing: border-box; color: var(--primary); background: var(--background);; border-radius: var(--curve-factor); - min-width: 12rem; &:focus { box-shadow: 1px 1px 6px var(--config-settings-color); outline: none; From 71a019461219f424d690f69418680acbea4e110f Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sun, 17 Oct 2021 18:55:17 +0100 Subject: [PATCH 16/98] :sparkles: Made a radio-button component --- src/components/FormElements/Radio.vue | 106 ++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 src/components/FormElements/Radio.vue diff --git a/src/components/FormElements/Radio.vue b/src/components/FormElements/Radio.vue new file mode 100644 index 000000000..cfc0e0ff7 --- /dev/null +++ b/src/components/FormElements/Radio.vue @@ -0,0 +1,106 @@ + + + + + From 5aefbb272fec58ce70371832695a2a00bcabf4f8 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sun, 17 Oct 2021 18:55:54 +0100 Subject: [PATCH 17/98] :construction: Now displays different input fields, dependeing on data type --- src/components/InteractiveEditor/EditItem.vue | 110 +++++++++++++----- 1 file changed, 84 insertions(+), 26 deletions(-) diff --git a/src/components/InteractiveEditor/EditItem.vue b/src/components/InteractiveEditor/EditItem.vue index a4a27844c..ec1487b2b 100644 --- a/src/components/InteractiveEditor/EditItem.vue +++ b/src/components/InteractiveEditor/EditItem.vue @@ -3,7 +3,7 @@ :name="modalName" :resizable="true" width="50%" - height="85%" + height="80%" classes="dashy-modal edit-item" @closed="modalClosed" > @@ -15,13 +15,33 @@

- + + + + -