diff --git a/app/Http/Tools/Editor.php b/app/Http/Tools/Editor.php
index 1784be8b..33f2bc89 100644
--- a/app/Http/Tools/Editor.php
+++ b/app/Http/Tools/Editor.php
@@ -41,6 +41,12 @@ class Editor
$folder = FileManagerFolder::where('user_id', $user_id)
->where('unique_id', $unique_id)
->first();
+
+ // Set default folder icon
+ if($folder_icon === 'default') {
+ $folder->icon_emoji = null;
+ $folder->icon_color = null;
+ }
// If request have emoji set folder icon emoji
if(isset($folder_icon['emoji'])) {
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 0d8d6ff4..36d8d43b 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,65 +1,97 @@
{
- "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=42d1881aa3cd2b5a0e21",
- "/js/main.js": "/js/main.js?id=86eb60282c3151df7fa7",
- "/css/app.css": "/css/app.css?id=dfd52fc997b919cd3686",
- "/chunks/admin.js": "/chunks/admin.js?id=7672646537b5813becf0",
- "/chunks/admin-account.js": "/chunks/admin-account.js?id=3f5a34aa8341af8d2b4c",
- "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=9ec9a42482cb302a05f6",
- "/chunks/app-billings.js": "/chunks/app-billings.js?id=92903bd1d316b3db1dfa",
- "/chunks/app-email.js": "/chunks/app-email.js?id=9d646578982ba61813b6",
- "/chunks/app-index.js": "/chunks/app-index.js?id=4623bd961647897a5b81",
- "/chunks/app-others.js": "/chunks/app-others.js?id=b19a701cdfa06e4817ff",
- "/chunks/app-payments.js": "/chunks/app-payments.js?id=11c86d822269f1a1577e",
- "/chunks/app-settings.js": "/chunks/app-settings.js?id=6784314933372fb1adf0",
- "/chunks/app-setup.js": "/chunks/app-setup.js?id=d304bcf7d4157e81f3e2",
- "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=b73a5b6f7d2a448cc5ab",
- "/chunks/contact-us.js": "/chunks/contact-us.js?id=81906d205ba0107c5105",
- "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=004908727045abd0852e",
- "/chunks/dashboard.js": "/chunks/dashboard.js?id=08e4f7d923ce9e49dcc3",
- "/chunks/database.js": "/chunks/database.js?id=b8d8269f77c52f78c784",
- "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2e3af103d13536c50757",
- "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=106f81cefe76c62d476e",
- "/chunks/files.js": "/chunks/files.js?id=b213d4fe15c2a9933f32",
- "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=95ce5e5685dc9315f515",
- "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=6db12008aa646ad5fb6f",
- "/chunks/invoices.js": "/chunks/invoices.js?id=83389adf0760820af6f5",
- "/chunks/landing-page.js": "/chunks/landing-page.js?id=546ed735edf0d80c8a7e",
- "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=848666d6c49c613f7f99",
- "/chunks/page-edit.js": "/chunks/page-edit.js?id=bd41ae13951c2a5025c3",
- "/chunks/pages.js": "/chunks/pages.js?id=df7245abef9e3b77a218",
- "/chunks/plan.js": "/chunks/plan.js?id=cfd7b4ee7e21639a837d",
- "/chunks/plan-create.js": "/chunks/plan-create.js?id=9bb62af36193ee9648d3",
- "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=7b7601f044e0ef47720b",
- "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=8d3e75ff9adb22a25d57",
- "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=3b4a29497fc878f503db",
- "/chunks/plans.js": "/chunks/plans.js?id=feb924949bffcdf3d9fb",
- "/chunks/profile.js": "/chunks/profile.js?id=f990697f8d4ff45df434",
- "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=5d7406ecd84c676db8fb",
- "/chunks/settings.js": "/chunks/settings.js?id=d16d9e2cda6aa3a3f6dc",
- "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=b05e24dd8be60f62ee27",
- "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=72d317b39264987e6ed0",
- "/chunks/settings-password.js": "/chunks/settings-password.js?id=014597c63c94d3ac9f60",
- "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=2a0ea9cf661deba6fc13",
- "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=b3f25de02dd4ef072df0",
- "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=aa3d963f578d7bc5ff88",
- "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=47090233afc7b0cdf855",
- "/chunks/shared-files.js": "/chunks/shared-files.js?id=ba10fd3f52a7b62d3092",
- "/chunks/shared-page.js": "/chunks/shared-page.js?id=4489cb4cfa33fb249bea",
- "/chunks/sign-in.js": "/chunks/sign-in.js?id=c52ce81c3dad56d7a7d8",
- "/chunks/sign-up.js": "/chunks/sign-up.js?id=2f12850d320b2413cf54",
- "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=6622381f1d96e8319999",
- "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=f1b093a3bcfebd5bc8a5",
- "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=e0e2f821aac16b32da34",
- "/chunks/upgrade.js": "/chunks/upgrade.js?id=0c8d40bed72e86359529",
- "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=a8db2246f9326e5c5957",
- "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=f050f10627424b730dc2",
- "/chunks/user.js": "/chunks/user.js?id=6f2ab796211a3ac8670f",
- "/chunks/user-create.js": "/chunks/user-create.js?id=0d630acda4552c315417",
- "/chunks/user-delete.js": "/chunks/user-delete.js?id=db041eae3aef3e45197a",
- "/chunks/user-detail.js": "/chunks/user-detail.js?id=8cf2fe554e8d67ac8677",
- "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=a0613909cb0c21817804",
- "/chunks/user-password.js": "/chunks/user-password.js?id=653bba3eb8d117c3a043",
- "/chunks/user-storage.js": "/chunks/user-storage.js?id=630b0ff649e16d3627af",
- "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=0b4226ba77f10b83de4a",
- "/chunks/users.js": "/chunks/users.js?id=04ca09662595fae56488"
+ "/js/main.js": "/js/main.js",
+ "/css/app.css": "/css/app.css",
+ "/chunks/admin.js": "/chunks/admin.js?id=03478fff46fc7903ecc4",
+ "/chunks/admin-account.js": "/chunks/admin-account.js?id=d687d4a3e71881044040",
+ "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=07b0ad73181498d46930",
+ "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js?id=6cb8c3f7a9aed769ec61",
+ "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=ff7684a6d7dbd9518d8b",
+ "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=b99a5c881b7f15a7e8c5",
+ "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=9e50edacd8630aa6fc22",
+ "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=2e6c6594ea5506c30ba4",
+ "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=d066e2c40f4c0ca68bf1",
+ "/chunks/app-billings.js": "/chunks/app-billings.js?id=aac5bd51067578358164",
+ "/chunks/app-email.js": "/chunks/app-email.js?id=9d1631b19f6492b8cae4",
+ "/chunks/app-index.js": "/chunks/app-index.js?id=2dcbe307133d780b6472",
+ "/chunks/app-others.js": "/chunks/app-others.js?id=44efcfb317747ff3b508",
+ "/chunks/app-payments.js": "/chunks/app-payments.js?id=187ecc16f9f7fbc4ccac",
+ "/chunks/app-settings.js": "/chunks/app-settings.js?id=b6b0eba13665133c0a19",
+ "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js?id=52e8a931f975c4e03a3c",
+ "/chunks/app-setup.js": "/chunks/app-setup.js?id=65857e375e79bbaca9c8",
+ "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=e84968ddf7a1a0e0381d",
+ "/chunks/contact-us.js": "/chunks/contact-us.js?id=cc28795de7e668d5919b",
+ "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=a4b8a7017c82de28296b",
+ "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=108dcc4b5af4c973be56",
+ "/chunks/dashboard.js": "/chunks/dashboard.js?id=993552e5f134268cfc44",
+ "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=cc1b4cbd4aa7f70151f7",
+ "/chunks/database.js": "/chunks/database.js?id=1fc78cfeb3befbd92423",
+ "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=f7ff36abf37571173944",
+ "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a2eed5073e52410cab54",
+ "/chunks/files.js": "/chunks/files.js?id=b738eb9054e663cc32b7",
+ "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=b646ec02fb9d6a497e74",
+ "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=c67671eceb9026755852",
+ "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=47ade53389e84dd64310",
+ "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=d5e39543eeb619cb5513",
+ "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=be9304e6ba2c61b6cab3",
+ "/chunks/invoices.js": "/chunks/invoices.js?id=0dddc007dba47ac5785e",
+ "/chunks/landing-page.js": "/chunks/landing-page.js?id=6c1137fd4f4d6e03b685",
+ "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=8c8ee101f3445e086040",
+ "/chunks/page-edit.js": "/chunks/page-edit.js?id=0952cc3fb3aa4797a679",
+ "/chunks/pages.js": "/chunks/pages.js?id=313adabcad5dafb0f932",
+ "/chunks/plan.js": "/chunks/plan.js?id=41d7a74e57ac07ce3619",
+ "/chunks/plan-create.js": "/chunks/plan-create.js?id=75b5346c75513e821097",
+ "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=4da54a76628aef67ea3e",
+ "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=e608674e1719be65fe6f",
+ "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=26fbcc2472b65a745366",
+ "/chunks/plans.js": "/chunks/plans.js?id=d6d92de642403caa999b",
+ "/chunks/profile.js": "/chunks/profile.js?id=015a2fcbaf2946f7eb11",
+ "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=f9e2ea1515204b5c63b6",
+ "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=9c4a9daae2237285f35b",
+ "/chunks/settings.js": "/chunks/settings.js?id=2638798e697164161f7c",
+ "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=4b2742e154eba9a7022a",
+ "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=ed9e52bea6e3a1f892ad",
+ "/chunks/settings-password.js": "/chunks/settings-password.js?id=0229d51aca95ffc75902",
+ "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=2841bc16a6028d8d315c",
+ "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=0ec77e47b2622ee5e253",
+ "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=3fde45b386de89651a24",
+ "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=b671f4f3198119b48449",
+ "/chunks/shared-files.js": "/chunks/shared-files.js?id=b13068f12911fbf79f74",
+ "/chunks/shared-page.js": "/chunks/shared-page.js?id=67672752eb26f92e2973",
+ "/chunks/sign-in.js": "/chunks/sign-in.js?id=7b6565f5df2060b45bc0",
+ "/chunks/sign-up.js": "/chunks/sign-up.js?id=39de7293c26fb3cef1a3",
+ "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=57235ac99a66b55fbf7c",
+ "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=51a2856dd0631053b42e",
+ "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=7176521fbf0047110ae1",
+ "/chunks/upgrade.js": "/chunks/upgrade.js?id=ee2f061bc040513f1d0d",
+ "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=ce929dd655322c11151c",
+ "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=a589c99d29f03bc71487",
+ "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=8bf12e8b93c7eaee4171",
+ "/chunks/user.js": "/chunks/user.js?id=bdb8a51693952859f5e1",
+ "/chunks/user-create.js": "/chunks/user-create.js?id=d0056a5db2089bc05508",
+ "/chunks/user-delete.js": "/chunks/user-delete.js?id=91d17d44835dd32ec36f",
+ "/chunks/user-detail.js": "/chunks/user-detail.js?id=b5b474dd8fea7b99c766",
+ "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=04b8c39ed83dc89f739a",
+ "/chunks/user-password.js": "/chunks/user-password.js?id=ac51d17a4aa7ae50bc88",
+ "/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2",
+ "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=c001bef2d6d5171cb359",
+ "/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c",
+ "/js/main.60d1d989661d26750e26.hot-update.js": "/js/main.60d1d989661d26750e26.hot-update.js",
+ "/js/main.8d335347b3e7d6ef8783.hot-update.js": "/js/main.8d335347b3e7d6ef8783.hot-update.js",
+ "/js/main.2b3920a40cb688148dc4.hot-update.js": "/js/main.2b3920a40cb688148dc4.hot-update.js",
+ "/js/main.22d19abef25f78e88a66.hot-update.js": "/js/main.22d19abef25f78e88a66.hot-update.js",
+ "/js/main.af5f73620bcd76070657.hot-update.js": "/js/main.af5f73620bcd76070657.hot-update.js",
+ "/js/main.352ea86804e961411687.hot-update.js": "/js/main.352ea86804e961411687.hot-update.js",
+ "/js/main.270446ffdfc7473b28c1.hot-update.js": "/js/main.270446ffdfc7473b28c1.hot-update.js",
+ "/js/main.fd8705319d9cff551b83.hot-update.js": "/js/main.fd8705319d9cff551b83.hot-update.js",
+ "/js/main.a9c8ab99f4e2bc06d05e.hot-update.js": "/js/main.a9c8ab99f4e2bc06d05e.hot-update.js",
+ "/js/main.c081dfe00c78b447d506.hot-update.js": "/js/main.c081dfe00c78b447d506.hot-update.js",
+ "/js/main.6f4f1b89bf0b908118c4.hot-update.js": "/js/main.6f4f1b89bf0b908118c4.hot-update.js",
+ "/js/main.af32be5c81c362624d74.hot-update.js": "/js/main.af32be5c81c362624d74.hot-update.js",
+ "/js/main.50bb9606a4277f0d0237.hot-update.js": "/js/main.50bb9606a4277f0d0237.hot-update.js",
+ "/js/main.affcc1bb8306fccfdd21.hot-update.js": "/js/main.affcc1bb8306fccfdd21.hot-update.js",
+ "/js/main.667981b8d91747493be1.hot-update.js": "/js/main.667981b8d91747493be1.hot-update.js",
+ "/js/main.dc9ba17ce5da9b701f8a.hot-update.js": "/js/main.dc9ba17ce5da9b701f8a.hot-update.js",
+ "/js/main.9d60c2035bab29787b96.hot-update.js": "/js/main.9d60c2035bab29787b96.hot-update.js",
+ "/js/main.af66b8349281697e9e6d.hot-update.js": "/js/main.af66b8349281697e9e6d.hot-update.js",
+ "/js/main.ff7d5e392a71c78199bc.hot-update.js": "/js/main.ff7d5e392a71c78199bc.hot-update.js"
}
diff --git a/resources/js/components/Others/RenameItem.vue b/resources/js/components/Others/RenameItem.vue
index 88fb0426..0678110e 100644
--- a/resources/js/components/Others/RenameItem.vue
+++ b/resources/js/components/Others/RenameItem.vue
@@ -24,9 +24,9 @@
{{ errors[0] }}
-
+
-
+ {{ moreOptionsTitle }}
@@ -92,8 +92,6 @@ export default {
methods: {
moreOptions() {
this.isMoreOptions = !this.isMoreOptions
-
- this.setFolderIcon = undefined
},
changeName() {
if (this.pickedItem.name && this.pickedItem.name !== '') {
@@ -135,7 +133,7 @@ export default {
})
events.$on('setFolderIcon', (icon) => {
- this.setFolderIcon = !icon ? undefined : icon.value
+ this.setFolderIcon = icon.value
})
}
}
diff --git a/resources/js/components/Others/SetFolderIcon.vue b/resources/js/components/Others/SetFolderIcon.vue
index 102c0381..7e1bdfa3 100644
--- a/resources/js/components/Others/SetFolderIcon.vue
+++ b/resources/js/components/Others/SetFolderIcon.vue
@@ -12,6 +12,9 @@
-
+
-
-
-
+
@@ -174,7 +175,7 @@ export default {
this.selectedEmoji = undefined
}
- events.$emit('setFolderIcon', { 'value':value, 'unique_id':this.unique_id })
+ events.$emit('setFolderIcon', { 'value':value })
this.selectOpen = false
},
@@ -182,13 +183,19 @@ export default {
this.selectedEmoji = undefined
- events.$emit('setFolderIcon', undefined)
+ events.$emit('setFolderIcon', { 'value': 'default' })
}
},
mounted () {
this.selectOpen = false
+ // If folder have already set some emoji push him to selected emoji input
+ this.folderData.icon_emoji ? this.selectedEmoji = this.folderData.icon_emoji : ''
+
+ // If folder have already set some color set this color to selected color
+ this.folderData.icon_color ? this.selectedColor = this.folderData.icon_color : ''
+
events.$on('unClick', () => {
this.selectOpen = false
})
@@ -365,28 +372,9 @@ export default {
justify-content: space-between;
align-items: center;
- .select-input-icon-wrapper {
- width: 22px;
- height: 22px;
- border-radius: 6px;
- display: flex;
- justify-content: center;
- align-items: center;
- &:hover {
- background: $light_background !important;
-
- .select-input-icon {
- line {
- stroke: $theme;
- }
- }
- }
-
- .select-input-icon {
- line {
- stroke: $text;
- }
- }
+ .active-menu {
+ @include transition(150ms);
+ transform: rotate(180deg);
}
.select-input {
@@ -398,6 +386,31 @@ export default {
.emoji-preview {
margin-right: 10px;
+ margin-left: 6px;
+ }
+
+ .select-input-icon-wrapper {
+ width: 22px;
+ height: 22px;
+ border-radius: 6px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ &:hover {
+
+ .select-input-icon {
+ line {
+ stroke: $theme;
+ }
+ }
+ }
+
+ .select-input-icon {
+ line {
+ stroke: $text;
+ }
+ }
}
}
@@ -479,7 +492,6 @@ export default {
}
.select-input-icon-wrapper {
&:hover {
- background: rgba($theme, 0.1) !important;
.select-input-icon {
line {
stroke: $theme !important;