@@ -73,24 +67,28 @@
import { debounce, delay } from "lodash";
import {
swiftCopyContainer,
- taginputConfirmKeys,
updateContainerMeta,
} from "@/common/api";
-import { modifyBrowserPageStyles } from "@/common/globalFunctions";
+import {
+ addNewTag,
+ deleteTag,
+ modifyBrowserPageStyles,
+} from "@/common/globalFunctions";
import escapeRegExp from "lodash/escapeRegExp";
import { useObservable } from "@vueuse/rxjs";
import { liveQuery } from "dexie";
+import TagInput from "@/components/TagInput.vue";
export default {
name: "CopyFolderModal",
+ components: { TagInput },
data() {
return {
folderExists: false,
folderName: "",
loadingFoldername: true,
tags: [],
- taginputConfirmKeys,
folders: [],
};
},
@@ -256,6 +254,12 @@ export default {
);
});
},
+ addingTag: function (e, onBlur) {
+ this.tags = addNewTag(e, this.tags, onBlur);
+ },
+ deletingTag: function (e, tag) {
+ this.tags = deleteTag(e, tag, this.tags);
+ },
},
};
@@ -303,4 +307,4 @@ c-card-actions {
c-card-actions > c-button {
margin: 0;
}
-
+
\ No newline at end of file
diff --git a/swift_browser_ui_frontend/src/components/CreateFolderModal.vue b/swift_browser_ui_frontend/src/components/CreateFolderModal.vue
index e136212a3..6f65dd451 100644
--- a/swift_browser_ui_frontend/src/components/CreateFolderModal.vue
+++ b/swift_browser_ui_frontend/src/components/CreateFolderModal.vue
@@ -24,26 +24,19 @@
data-testid="folder-name"
/>
-
-
-
+ {{ $t('message.tagName') }}
+
+
{{ $t("message.container_ops.createdFolder") }}
{{ active.name }}.
@@ -82,22 +75,24 @@
@@ -174,7 +175,7 @@ export default {
}
}
-@media screen and (max-height: 580px) and (max-width: 773px),
+@media screen and (max-height: 580px) and (max-width: 773px),
(max-width: 533px) {
.add-folder {
top: -9rem;
diff --git a/swift_browser_ui_frontend/src/components/EditTagsModal.vue b/swift_browser_ui_frontend/src/components/EditTagsModal.vue
index cdecfa267..9cc3444dc 100644
--- a/swift_browser_ui_frontend/src/components/EditTagsModal.vue
+++ b/swift_browser_ui_frontend/src/components/EditTagsModal.vue
@@ -4,23 +4,11 @@
{{ $t('message.editTags') }}
-
-
-
+
@@ -204,6 +204,7 @@ export default {
max-height: 75vh;
}
+h2 { margin: 0 !important; }
c-card-content {
color: var(--csc-dark-grey);
@@ -214,4 +215,5 @@ c-card-actions {
padding: 0;
}
+
diff --git a/swift_browser_ui_frontend/src/components/ShareModal.vue b/swift_browser_ui_frontend/src/components/ShareModal.vue
index d0c70b37e..4ed7c2349 100644
--- a/swift_browser_ui_frontend/src/components/ShareModal.vue
+++ b/swift_browser_ui_frontend/src/components/ShareModal.vue
@@ -64,17 +64,13 @@
{{ $t("message.share.share_guide_step2") }}
-
-
-
+
@@ -423,17 +430,13 @@ export default {
}
c-select {
- color: var(--csc-dark-grey);
+ color: $csc-dark-grey;
}
c-link > span {
font-size: 0.875rem;
}
- .field {
- margin: 2rem 0 0 0;
- }
-
c-flex, .shared-notification {
display: flex;
flex-direction: row;
@@ -461,6 +464,4 @@ export default {
margin-bottom: 1.5rem;
box-shadow: 2px 4px 4px 0px var(--csc-light-grey);
}
-
-
diff --git a/swift_browser_ui_frontend/src/components/TagInput.vue b/swift_browser_ui_frontend/src/components/TagInput.vue
new file mode 100644
index 000000000..ee5ecaad6
--- /dev/null
+++ b/swift_browser_ui_frontend/src/components/TagInput.vue
@@ -0,0 +1,84 @@
+
+
+
+ {{ tag }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/swift_browser_ui_frontend/src/components/UploadModal.vue b/swift_browser_ui_frontend/src/components/UploadModal.vue
index f5bd502cc..c8cf77a8a 100644
--- a/swift_browser_ui_frontend/src/components/UploadModal.vue
+++ b/swift_browser_ui_frontend/src/components/UploadModal.vue
@@ -73,7 +73,7 @@
:value="$t('message.encrypt.advancedOptions')"
>
-
@@ -96,7 +96,7 @@
-
@@ -157,7 +157,6 @@ import EncryptedUploadSession from "@/common/upload";
import { getUploadEndpoint } from "@/common/api";
import {
getHumanReadableSize,
- taginputConfirmKeys,
truncate,
computeSHA256,
} from "@/common/conv";
@@ -178,7 +177,6 @@ export default {
return {
inputFolder: "",
selectedFolder: null,
- taginputConfirmKeys,
filteredItems: [],
tooLarge: false,
ownPrivateKey: false,
diff --git a/swift_browser_ui_frontend/src/pages/BrowserPage.vue b/swift_browser_ui_frontend/src/pages/BrowserPage.vue
index 889e4861d..4f27f9458 100644
--- a/swift_browser_ui_frontend/src/pages/BrowserPage.vue
+++ b/swift_browser_ui_frontend/src/pages/BrowserPage.vue
@@ -267,4 +267,8 @@ c-modal {
padding: 1rem;
}
+.taginput-label {
+ font-weight: bold;
+ margin-bottom: -2rem;
+}
diff --git a/swift_browser_ui_frontend/src/views/DirectShare.vue b/swift_browser_ui_frontend/src/views/DirectShare.vue
index 31e76e0de..c66b8f0db 100644
--- a/swift_browser_ui_frontend/src/views/DirectShare.vue
+++ b/swift_browser_ui_frontend/src/views/DirectShare.vue
@@ -40,22 +40,21 @@
-
-
-
-
-
+