diff --git a/app/package.json b/app/package.json
index 267d219d8e3868e62fb89f5f91f0591b8e47e542..ff9f176419faf10609ff3b1e68f6d841e0106c4c 100644
--- a/app/package.json
+++ b/app/package.json
@@ -22,12 +22,10 @@
"material-design-icons": "^3.0.1",
"pinia": "^2.1.3",
"pinia-plugin-persistedstate": "^3.1.0",
- "prettier-plugin-tailwindcss": "^0.3.0",
"readline-sync": "^1.4.10",
"register-service-worker": "^1.6.2",
"sass": "^1.54.4",
"sweetalert2": "^11.7.5",
- "tailwind-scrollbar": "^3.0.4",
"vee-validate": "^4.5.4",
"vue": "^3.3.1",
"vue-i18n": "^9.2.0-beta.15",
diff --git a/app/src/components/date-range-pickr.vue b/app/src/components/date-range-pickr.vue
index 612ca87e8fab34bed4ef5777913c155ed1666c3e..c8bc7aaee98dd77073c9a33ac16b668412ae61d2 100644
--- a/app/src/components/date-range-pickr.vue
+++ b/app/src/components/date-range-pickr.vue
@@ -6,15 +6,18 @@
context: Object,
})
function handleInput(e) {
- //console.log("props", e)
- props.context.node.input(e)
+ if (e !== null && e[0] !== null && e[1] !== null) {
+ props.context.node.input(e)
+ }
}
const selectedDate = [new Date(), new Date(new Date().getTime() + 9 * 24 * 60 * 60 * 1000)]
const date = ref()
onMounted(() => {
const startDate = new Date()
const endDate = new Date(new Date().setDate(startDate.getDate() + 7))
- date.value = [startDate, endDate]
+ if (startDate !== null || endDate !== null) {
+ date.value = [startDate, endDate]
+ }
})
</script>
diff --git a/app/src/components/download-manager/downloadFile.vue b/app/src/components/download-manager/downloadFile.vue
index 167e6458e6b0847c059831592e357baff0a703d5..1fbc6b6a1c7b6a6d086afcb74f37660c37c6b817 100644
--- a/app/src/components/download-manager/downloadFile.vue
+++ b/app/src/components/download-manager/downloadFile.vue
@@ -56,7 +56,7 @@
<div class="divider divider-slate-100"></div>
<li>
Download File URL
- <div>
+ <div class="w-90 break-all ">
server/sls/ProjectConfigBackup/1Mg6VkbM1MQhhKh8z2qGSa42HIY/02_04_2021/1Mg6VkbM1MQhhKh8z2qGSa42HIY_1617343458.json
</div>
</li>
diff --git a/app/src/components/upload-manager/uploadFile.vue b/app/src/components/upload-manager/uploadFile.vue
index 2d30a71529511ef317878cb36247048c5356ffea..9638cb72888c6cf74cefff9e699da7c54bc414b9 100644
--- a/app/src/components/upload-manager/uploadFile.vue
+++ b/app/src/components/upload-manager/uploadFile.vue
@@ -1,13 +1,13 @@
<template>
- <div id="uploadFile" class="box-wrapper">
- <h2 class="mb-8 flex flex-row items-center text-xl font-semibold">
- <i class="isax isax-bold-arrow-left-2 me-2" @click="$router.go(-1)"></i>
- Upload File
- </h2>
- <div class="flex flex-row justify-between">
- <div class="w-1/2">
- <div class="card p-8">
- <!-- <div class="p-card p-component">
+ <div id="uploadFile" class="box-wrapper">
+ <h2 class="mb-8 flex flex-row items-center text-xl font-semibold">
+ <i class="isax isax-bold-arrow-left-2 me-2" @click="$router.go(-1)"></i>
+ Upload File
+ </h2>
+ <div class="flex flex-row justify-between">
+ <div class="w-1/2">
+ <div class="card p-8">
+ <!-- <div class="p-card p-component">
<div class="field">
<div class="p-float-label">
<input type="text" v-model="upload.cdnBaseUrl" class="p-inputtext p-component w-100"
@@ -40,140 +40,134 @@
<json-viewer :value="uploadResult" boxed :expanded="true"></json-viewer>
</div>
</div> -->
- <FormKit
- type="form"
- id="registration-example"
- :form-class="submitted ? 'hide' : 'show'"
- submit-label="Upload"
- @submit="uploadFile"
- :actions="false"
- #default="{ value }"
- >
- <FormKit
- type="text"
- name="sessionName"
- label="CDN Base Url"
- v-model="upload.cdnBaseUrl"
- placeholder="CDN Base Url"
- help="Enter CDN Base Url"
- validation="required"
- :wrapper-class="{ $reset: true, 'w-full': true }"
- outer-class="$reset mx-auto"
- />
- <FormKit
- type="text"
- name="sessionName"
- label="File Upload Url"
- v-model="upload.uploadFileUrl"
- placeholder="File Upload Url"
- help="Enter File Upload Url"
- validation="required"
- :wrapper-class="{ $reset: true, 'w-full': true, ' mt-4': true }"
- outer-class="$reset mx-auto"
- />
- <FormKit
- type="text"
- name="sessionName"
- label="Destination File Url"
- v-model="upload.destinationFileUrl"
- placeholder="Destination File Url"
- help="Enter Destination File Url"
- validation="required"
- :wrapper-class="{ $reset: true, 'w-full': true, ' mt-4': true }"
- outer-class="$reset mx-auto"
- />
- <FormKit
- type="submit"
- label="Upload File"
- outer-class="$reset"
- :wrapper-class="{ $reset: true }"
- :classes="{
- input: {
- $reset: true,
- 'btn btn-neutral': true,
- 'px-8': true,
- 'py-2': true,
- 'rounded-lg': true,
- 'text-white': true,
- 'font-semibold': true,
- 'mt-4': true,
- },
- }"
- />
- </FormKit>
- <h3 class="text-med font-semibold mt-8">Result</h3>
- <json-viewer
- :value="uploadResult"
- boxed
- :expanded="true"
- ></json-viewer>
- </div>
- </div>
- <div class="w-1/2 ms-8 border border-slate-300 px-8 py-0 rounded-lg">
- <div class="box-login">
- <h4 class="text-med font-semibold">
- Please start the multipart server before uploading files testing
- </h4>
- <ul class="list-none">
- <li class="text-med font-normal">
- cdnBaseUrl:
- <div>"https://cstest.mkcl.org/uploadFile/uploadsinglefile"</div>
- </li>
- <div class="divider divide-slate-100"></div>
- <li class="text-med font-normal">
- uploadFileUrl:
- <div>
- "/app/CoreSLS/ProjectConfigBackup/1JFfwe3g8vHuNOtxk2BsH09pBA5/05_06_2021/1JFfwe3g8vHuNOtxk2BsH09pBA5_1622894824.json"
- </div>
- </li>
- <div class="divider divide-slate-100"></div>
- <li class="text-med font-normal">destinationFileUrl: ""</li>
- </ul>
- </div>
- </div>
- </div>
- </div>
+ <FormKit
+ type="form"
+ id="registration-example"
+ :form-class="submitted ? 'hide' : 'show'"
+ submit-label="Upload"
+ @submit="uploadFile"
+ :actions="false"
+ #default="{ value }"
+ >
+ <FormKit
+ type="text"
+ name="sessionName"
+ label="CDN Base Url"
+ v-model="upload.cdnBaseUrl"
+ placeholder="CDN Base Url"
+ help="Enter CDN Base Url"
+ validation="required"
+ :wrapper-class="{ $reset: true, 'w-full': true }"
+ outer-class="$reset mx-auto"
+ />
+ <FormKit
+ type="text"
+ name="sessionName"
+ label="File Upload Url"
+ v-model="upload.uploadFileUrl"
+ placeholder="File Upload Url"
+ help="Enter File Upload Url"
+ validation="required"
+ :wrapper-class="{ $reset: true, 'w-full': true, ' mt-4': true }"
+ outer-class="$reset mx-auto"
+ />
+ <FormKit
+ type="text"
+ name="sessionName"
+ label="Destination File Url"
+ v-model="upload.destinationFileUrl"
+ placeholder="Destination File Url"
+ help="Enter Destination File Url"
+ validation="required"
+ :wrapper-class="{ $reset: true, 'w-full': true, ' mt-4': true }"
+ outer-class="$reset mx-auto"
+ />
+ <FormKit
+ type="submit"
+ label="Upload File"
+ outer-class="$reset"
+ :wrapper-class="{ $reset: true }"
+ :classes="{
+ input: {
+ $reset: true,
+ 'btn btn-neutral': true,
+ 'px-8': true,
+ 'py-2': true,
+ 'rounded-lg': true,
+ 'text-white': true,
+ 'font-semibold': true,
+ 'mt-4': true,
+ },
+ }"
+ />
+ </FormKit>
+ <h3 class="text-med mt-8 font-semibold">Result</h3>
+ <json-viewer :value="uploadResult" boxed :expanded="true"></json-viewer>
+ </div>
+ </div>
+ <div class="border border-slate-300 ms-8 w-1/2 p-8 rounded-lg">
+ <div class="box-login">
+ <h4 class="text-med font-semibold">Please start the multipart server before uploading files testing</h4>
+ <ul class="list-none">
+ <li class="text-med font-normal">
+ cdnBaseUrl:
+ <div>"https://cstest.mkcl.org/uploadFile/uploadsinglefile"</div>
+ </li>
+ <div class="divider divide-slate-100"></div>
+ <li class="text-med font-normal">
+ uploadFileUrl:
+ <div class="w-90 break-all ">
+ "/app/CoreSLS/ProjectConfigBackup/1JFfwe3g8vHuNOtxk2BsH09pBA5/05_06_2021/1JFfwe3g8vHuNOtxk2BsH09pBA5_1622894824.json"
+ </div>
+ </li>
+ <div class="divider divide-slate-100"></div>
+ <li class="text-med font-normal">destinationFileUrl: ""</li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
</template>
<script>
-import MQL from "@/plugins/mql.js";
-import jsonViewer from "vue-json-viewer";
-export default {
- data() {
- return {
- upload: {},
- uploadId: "",
- uploadResult: "",
- };
- },
- components: {
- jsonViewer,
- },
- methods: {
- uploadFile() {
- // var a = []
- // a.push(this.upload.uploadFileUrl)
- // this.upload.uploadFileUrl = a
- var a = {
- cdnBaseUrl: [this.upload.cdnBaseUrl],
- uploadFileUrl: [this.upload.uploadFileUrl],
- destinationFileUrl: [this.upload.destinationFileUrl],
- };
- new MQL()
- .setActivity("o.[UploadFileUsingUM]")
- .setData(a)
- .fetch()
- .then((rs) => {
- let res = rs.getActivity("UploadFileUsingUM", true);
- if (rs.isValid("UploadFileUsingUM")) {
- this.upload = {};
- this.uploadResult = res.result;
- this.$toast.success("Upload Success");
- } else {
- rs.showErrorToast("UploadFileUsingUM");
- }
- });
- },
- },
-};
+ import MQL from "@/plugins/mql.js"
+ import jsonViewer from "vue-json-viewer"
+ export default {
+ data() {
+ return {
+ upload: {},
+ uploadId: "",
+ uploadResult: "",
+ }
+ },
+ components: {
+ jsonViewer,
+ },
+ methods: {
+ uploadFile() {
+ // var a = []
+ // a.push(this.upload.uploadFileUrl)
+ // this.upload.uploadFileUrl = a
+ var a = {
+ cdnBaseUrl: [this.upload.cdnBaseUrl],
+ uploadFileUrl: [this.upload.uploadFileUrl],
+ destinationFileUrl: [this.upload.destinationFileUrl],
+ }
+ new MQL()
+ .setActivity("o.[UploadFileUsingUM]")
+ .setData(a)
+ .fetch()
+ .then((rs) => {
+ let res = rs.getActivity("UploadFileUsingUM", true)
+ if (rs.isValid("UploadFileUsingUM")) {
+ this.upload = {}
+ this.uploadResult = res.result
+ this.$toast.success("Upload Success")
+ } else {
+ rs.showErrorToast("UploadFileUsingUM")
+ }
+ })
+ },
+ },
+ }
</script>
diff --git a/app/src/main.js b/app/src/main.js
index ed0d7ed9a6e38ffcd97119d00e0447f72f3a30d7..b78bff807b225b031c66a3a1c41834769ee7561d 100644
--- a/app/src/main.js
+++ b/app/src/main.js
@@ -40,7 +40,10 @@ vm.use(mqlOptions, {
cdnConfig: [],
})
-vm.use(VueClipboard)
+vm.use(VueClipboard, {
+ autoSetContainer: true,
+ appendToBody: true,
+})
// axios.defaults.baseURL = baseURL
// TODO: set axios header on login to session storage
diff --git a/app/src/views/DownloadManager.vue b/app/src/views/DownloadManager.vue
index 4c44cc678a26fa02f1e5af347e6c5c5cbdaeb580..2c7db9cbb5fb3d9141c4b033b8add58afde5870e 100644
--- a/app/src/views/DownloadManager.vue
+++ b/app/src/views/DownloadManager.vue
@@ -4,7 +4,7 @@
<i class="isax isax-bold-arrow-left-2 me-2" @click="$router.go(-1)"></i>
Download Manager
</h2>
- <div class="row justify-content-center">
+ <div class="flex flex-row items-center">
<div class="w-1/2">
<div class="card p-8" @click.prevent="downloadFilePush">
<div class="icon-holder">
@@ -15,7 +15,7 @@
</div>
</div>
</div>
- <div class="w-1/2">
+ <div class="w-1/2 ms-8">
<div class="card p-8" @click.prevent="downloadProgressPush">
<div class="icon-holder">
<i class="isax isax-bold-document-cloud"></i>
diff --git a/app/tailwind.config.js b/app/tailwind.config.js
index ea61f3fe58dc23307eb364a69f90bacfd9cb9fbf..89c5112536083aa0812e2c6190966f78f8199d26 100644
--- a/app/tailwind.config.js
+++ b/app/tailwind.config.js
@@ -8,7 +8,7 @@ export default {
}
},
},
- plugins: [require("daisyui"),require('tailwind-scrollbar'),require('prettier-plugin-tailwindcss')],
+ plugins: [require("daisyui")],
daisyui: {
themes: ["light", "dark", "cupcake"],
base: true,