From eebeee69483a837dcd96f297a5849e8c704b9ed2 Mon Sep 17 00:00:00 2001 From: Milos Holba Date: Thu, 11 Feb 2021 20:14:27 +0100 Subject: [PATCH] scss changes in SetFolderIcon, add translation to sk/cn --- public/mix-manifest.json | 145 +++++++++++++++++- .../js/components/FilesView/FileItemGrid.vue | 6 +- .../js/components/FilesView/FileItemList.vue | 6 +- resources/js/components/Others/Emoji.vue | 20 +-- .../js/components/Others/SetFolderIcon.vue | 86 ++++++----- .../js/components/Others/ThumbnailItem.vue | 6 +- resources/js/helpers.js | 16 ++ resources/js/i18n/lang/cn.json | 9 +- resources/js/i18n/lang/en.json | 6 +- resources/js/i18n/lang/sk.json | 9 +- 10 files changed, 243 insertions(+), 66 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index beb42e85..849e8042 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -29,7 +29,7 @@ "/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-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=30316e46ee9a782d4552", "/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", @@ -74,5 +74,146 @@ "/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" + "/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c", + "/js/main.e9267f5855b7b9bf8a61.hot-update.js": "/js/main.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/admin.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/admin.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/admin-account.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/admin-account.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/app-index.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/app-index.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/app-settings.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/app-settings.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/app-setup.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/app-setup.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/billings-detail.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/billings-detail.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/contact-us.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/contact-us.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/dashboard.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/dashboard.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/database.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/database.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/environment-setup.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/environment-setup.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/files.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/files.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/installation-disclaimer.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/installation-disclaimer.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/landing-page.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/landing-page.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/plan-create.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/plan-create.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/plan-subscribers.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/plan-subscribers.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/profile.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/profile.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/purchase-code.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/purchase-code.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings-create-payment-methods.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings-create-payment-methods.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings-invoices.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings-invoices.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings-payment-methods.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings-payment-methods.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings-subscription.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings-subscription.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/sign-in.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/sign-in.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/sign-up.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/sign-up.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/stripe-credentials.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/stripe-credentials.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/subscription-plans.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/subscription-plans.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/upgrade.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/upgrade.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/upgrade-billing.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/upgrade-billing.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/user-invoices.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/user-invoices.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/user-subscription.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/user-subscription.e9267f5855b7b9bf8a61.hot-update.js", + "/js/main.871f26d57ff984531ed7.hot-update.js": "/js/main.871f26d57ff984531ed7.hot-update.js", + "/chunks/admin.871f26d57ff984531ed7.hot-update.js": "/chunks/admin.871f26d57ff984531ed7.hot-update.js", + "/chunks/admin-account.871f26d57ff984531ed7.hot-update.js": "/chunks/admin-account.871f26d57ff984531ed7.hot-update.js", + "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.871f26d57ff984531ed7.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.871f26d57ff984531ed7.hot-update.js", + "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.871f26d57ff984531ed7.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.871f26d57ff984531ed7.hot-update.js", + "/chunks/app-index.871f26d57ff984531ed7.hot-update.js": "/chunks/app-index.871f26d57ff984531ed7.hot-update.js", + "/chunks/app-settings.871f26d57ff984531ed7.hot-update.js": "/chunks/app-settings.871f26d57ff984531ed7.hot-update.js", + "/chunks/app-setup.871f26d57ff984531ed7.hot-update.js": "/chunks/app-setup.871f26d57ff984531ed7.hot-update.js", + "/chunks/billings-detail.871f26d57ff984531ed7.hot-update.js": "/chunks/billings-detail.871f26d57ff984531ed7.hot-update.js", + "/chunks/contact-us.871f26d57ff984531ed7.hot-update.js": "/chunks/contact-us.871f26d57ff984531ed7.hot-update.js", + "/chunks/dashboard.871f26d57ff984531ed7.hot-update.js": "/chunks/dashboard.871f26d57ff984531ed7.hot-update.js", + "/chunks/database.871f26d57ff984531ed7.hot-update.js": "/chunks/database.871f26d57ff984531ed7.hot-update.js", + "/chunks/environment-setup.871f26d57ff984531ed7.hot-update.js": "/chunks/environment-setup.871f26d57ff984531ed7.hot-update.js", + "/chunks/files.871f26d57ff984531ed7.hot-update.js": "/chunks/files.871f26d57ff984531ed7.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.871f26d57ff984531ed7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.871f26d57ff984531ed7.hot-update.js", + "/chunks/installation-disclaimer.871f26d57ff984531ed7.hot-update.js": "/chunks/installation-disclaimer.871f26d57ff984531ed7.hot-update.js", + "/chunks/landing-page.871f26d57ff984531ed7.hot-update.js": "/chunks/landing-page.871f26d57ff984531ed7.hot-update.js", + "/chunks/plan-create.871f26d57ff984531ed7.hot-update.js": "/chunks/plan-create.871f26d57ff984531ed7.hot-update.js", + "/chunks/plan-subscribers.871f26d57ff984531ed7.hot-update.js": "/chunks/plan-subscribers.871f26d57ff984531ed7.hot-update.js", + "/chunks/profile.871f26d57ff984531ed7.hot-update.js": "/chunks/profile.871f26d57ff984531ed7.hot-update.js", + "/chunks/purchase-code.871f26d57ff984531ed7.hot-update.js": "/chunks/purchase-code.871f26d57ff984531ed7.hot-update.js", + "/chunks/settings.871f26d57ff984531ed7.hot-update.js": "/chunks/settings.871f26d57ff984531ed7.hot-update.js", + "/chunks/settings-create-payment-methods.871f26d57ff984531ed7.hot-update.js": "/chunks/settings-create-payment-methods.871f26d57ff984531ed7.hot-update.js", + "/chunks/settings-invoices.871f26d57ff984531ed7.hot-update.js": "/chunks/settings-invoices.871f26d57ff984531ed7.hot-update.js", + "/chunks/settings-payment-methods.871f26d57ff984531ed7.hot-update.js": "/chunks/settings-payment-methods.871f26d57ff984531ed7.hot-update.js", + "/chunks/settings-subscription.871f26d57ff984531ed7.hot-update.js": "/chunks/settings-subscription.871f26d57ff984531ed7.hot-update.js", + "/chunks/shared-page.871f26d57ff984531ed7.hot-update.js": "/chunks/shared-page.871f26d57ff984531ed7.hot-update.js", + "/chunks/sign-in.871f26d57ff984531ed7.hot-update.js": "/chunks/sign-in.871f26d57ff984531ed7.hot-update.js", + "/chunks/sign-up.871f26d57ff984531ed7.hot-update.js": "/chunks/sign-up.871f26d57ff984531ed7.hot-update.js", + "/chunks/stripe-credentials.871f26d57ff984531ed7.hot-update.js": "/chunks/stripe-credentials.871f26d57ff984531ed7.hot-update.js", + "/chunks/subscription-plans.871f26d57ff984531ed7.hot-update.js": "/chunks/subscription-plans.871f26d57ff984531ed7.hot-update.js", + "/chunks/upgrade.871f26d57ff984531ed7.hot-update.js": "/chunks/upgrade.871f26d57ff984531ed7.hot-update.js", + "/chunks/upgrade-billing.871f26d57ff984531ed7.hot-update.js": "/chunks/upgrade-billing.871f26d57ff984531ed7.hot-update.js", + "/chunks/user-invoices.871f26d57ff984531ed7.hot-update.js": "/chunks/user-invoices.871f26d57ff984531ed7.hot-update.js", + "/chunks/user-subscription.871f26d57ff984531ed7.hot-update.js": "/chunks/user-subscription.871f26d57ff984531ed7.hot-update.js", + "/js/main.c7cbbf3360eac9eeae3b.hot-update.js": "/js/main.c7cbbf3360eac9eeae3b.hot-update.js", + "/js/main.48f0bfae14f4ed46dea5.hot-update.js": "/js/main.48f0bfae14f4ed46dea5.hot-update.js", + "/js/main.1492c66807829942e717.hot-update.js": "/js/main.1492c66807829942e717.hot-update.js", + "/js/main.149679330c73de8257ce.hot-update.js": "/js/main.149679330c73de8257ce.hot-update.js", + "/js/main.cd0935260de5c844fd32.hot-update.js": "/js/main.cd0935260de5c844fd32.hot-update.js", + "/js/main.32716bf68f26a81cfa90.hot-update.js": "/js/main.32716bf68f26a81cfa90.hot-update.js", + "/js/main.d41315820dc6aea7c657.hot-update.js": "/js/main.d41315820dc6aea7c657.hot-update.js", + "/js/main.5066ec5f43b73a31faf2.hot-update.js": "/js/main.5066ec5f43b73a31faf2.hot-update.js", + "/js/main.769c8f8865ecbda96421.hot-update.js": "/js/main.769c8f8865ecbda96421.hot-update.js", + "/js/main.162963d9959ea402ef8b.hot-update.js": "/js/main.162963d9959ea402ef8b.hot-update.js", + "/js/main.91cbbb4409a74966af6a.hot-update.js": "/js/main.91cbbb4409a74966af6a.hot-update.js", + "/js/main.c63ea0fca2b42d76235a.hot-update.js": "/js/main.c63ea0fca2b42d76235a.hot-update.js", + "/js/main.61101ac1662fa9d0232c.hot-update.js": "/js/main.61101ac1662fa9d0232c.hot-update.js", + "/js/main.1242d7225c618db86030.hot-update.js": "/js/main.1242d7225c618db86030.hot-update.js", + "/js/main.66e40767781497dcc735.hot-update.js": "/js/main.66e40767781497dcc735.hot-update.js", + "/js/main.c7f0b6550eda01fd6dae.hot-update.js": "/js/main.c7f0b6550eda01fd6dae.hot-update.js", + "/js/main.0bc82a61de9040aa9539.hot-update.js": "/js/main.0bc82a61de9040aa9539.hot-update.js", + "/js/main.175370b95ce7f9dbcdb9.hot-update.js": "/js/main.175370b95ce7f9dbcdb9.hot-update.js", + "/js/main.fb849b93bd7d0469758b.hot-update.js": "/js/main.fb849b93bd7d0469758b.hot-update.js", + "/js/main.d2432b2c18142aad5a21.hot-update.js": "/js/main.d2432b2c18142aad5a21.hot-update.js", + "/js/main.7a9740b11b92a4ead4fa.hot-update.js": "/js/main.7a9740b11b92a4ead4fa.hot-update.js", + "/js/main.eee8fc565d122b953f31.hot-update.js": "/js/main.eee8fc565d122b953f31.hot-update.js", + "/js/main.ae97dccedd08fa79279d.hot-update.js": "/js/main.ae97dccedd08fa79279d.hot-update.js", + "/js/main.474b6a73e5b579a1e9ed.hot-update.js": "/js/main.474b6a73e5b579a1e9ed.hot-update.js", + "/js/main.6949b1ebc0f5b757365a.hot-update.js": "/js/main.6949b1ebc0f5b757365a.hot-update.js", + "/js/main.5e480bca4e173abfb24f.hot-update.js": "/js/main.5e480bca4e173abfb24f.hot-update.js", + "/js/main.6dbff4f58d8589621e27.hot-update.js": "/js/main.6dbff4f58d8589621e27.hot-update.js", + "/js/main.5cdc498c12306d7764bb.hot-update.js": "/js/main.5cdc498c12306d7764bb.hot-update.js", + "/js/main.79072d9d504649c01f67.hot-update.js": "/js/main.79072d9d504649c01f67.hot-update.js", + "/js/main.cecd5fa1145045127bde.hot-update.js": "/js/main.cecd5fa1145045127bde.hot-update.js", + "/js/main.44249911ef43f623ae5d.hot-update.js": "/js/main.44249911ef43f623ae5d.hot-update.js", + "/js/main.cebf662867612eafd237.hot-update.js": "/js/main.cebf662867612eafd237.hot-update.js", + "/js/main.28765658e4d7c7ed000c.hot-update.js": "/js/main.28765658e4d7c7ed000c.hot-update.js", + "/js/main.dbad4f2ade50b9b98193.hot-update.js": "/js/main.dbad4f2ade50b9b98193.hot-update.js", + "/js/main.fb1d38fcc5c9c2831912.hot-update.js": "/js/main.fb1d38fcc5c9c2831912.hot-update.js", + "/js/main.e4acc136078fb68318d7.hot-update.js": "/js/main.e4acc136078fb68318d7.hot-update.js", + "/js/main.540c863212264a8c42da.hot-update.js": "/js/main.540c863212264a8c42da.hot-update.js", + "/js/main.83a7111596ca49e3bd23.hot-update.js": "/js/main.83a7111596ca49e3bd23.hot-update.js", + "/js/main.31d2eff7bdada6452dbf.hot-update.js": "/js/main.31d2eff7bdada6452dbf.hot-update.js", + "/js/main.f21abaadb891263f7f93.hot-update.js": "/js/main.f21abaadb891263f7f93.hot-update.js", + "/js/main.77884d67732b2ef05146.hot-update.js": "/js/main.77884d67732b2ef05146.hot-update.js", + "/js/main.3a47ec594f1f1b0f9e33.hot-update.js": "/js/main.3a47ec594f1f1b0f9e33.hot-update.js", + "/js/main.8fca0b061990af84b610.hot-update.js": "/js/main.8fca0b061990af84b610.hot-update.js", + "/js/main.fe789446b8915dc37dd0.hot-update.js": "/js/main.fe789446b8915dc37dd0.hot-update.js", + "/js/main.4f8c1af81d1721ffe435.hot-update.js": "/js/main.4f8c1af81d1721ffe435.hot-update.js", + "/js/main.7ecfd103fcf6dd43b21f.hot-update.js": "/js/main.7ecfd103fcf6dd43b21f.hot-update.js", + "/js/main.9b91d9264832912ecc89.hot-update.js": "/js/main.9b91d9264832912ecc89.hot-update.js", + "/js/main.1e35e3f51f8da275c4f6.hot-update.js": "/js/main.1e35e3f51f8da275c4f6.hot-update.js", + "/js/main.42f2295d79b1bb4ec06b.hot-update.js": "/js/main.42f2295d79b1bb4ec06b.hot-update.js", + "/js/main.320cabdf4e5ea516b255.hot-update.js": "/js/main.320cabdf4e5ea516b255.hot-update.js", + "/js/main.00dcef1ff43e011fa18c.hot-update.js": "/js/main.00dcef1ff43e011fa18c.hot-update.js", + "/js/main.18238b039c77a37616e6.hot-update.js": "/js/main.18238b039c77a37616e6.hot-update.js", + "/js/main.29278b44925c9c522edc.hot-update.js": "/js/main.29278b44925c9c522edc.hot-update.js", + "/js/main.1ae48c4c36cfeffcb800.hot-update.js": "/js/main.1ae48c4c36cfeffcb800.hot-update.js", + "/js/main.9277dcd74ffc60466145.hot-update.js": "/js/main.9277dcd74ffc60466145.hot-update.js", + "/js/main.02a18bb60dda8cfe941d.hot-update.js": "/js/main.02a18bb60dda8cfe941d.hot-update.js", + "/js/main.82da70d4ec9cc24f9a2b.hot-update.js": "/js/main.82da70d4ec9cc24f9a2b.hot-update.js", + "/js/main.796b2f1e94940c793e01.hot-update.js": "/js/main.796b2f1e94940c793e01.hot-update.js", + "/js/main.eb83066d5e7c3a1ae75d.hot-update.js": "/js/main.eb83066d5e7c3a1ae75d.hot-update.js", + "/js/main.6c2e67f84646faf9706b.hot-update.js": "/js/main.6c2e67f84646faf9706b.hot-update.js", + "/js/main.a8fb774ab90ddd224242.hot-update.js": "/js/main.a8fb774ab90ddd224242.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.f4f301a3d5be1c275da9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f4f301a3d5be1c275da9.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.d6e83650cef181b768a9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d6e83650cef181b768a9.hot-update.js", + "/js/main.f8a13e30e927d22524fd.hot-update.js": "/js/main.f8a13e30e927d22524fd.hot-update.js", + "/js/main.88b003fcdc776fcec402.hot-update.js": "/js/main.88b003fcdc776fcec402.hot-update.js", + "/js/main.4beb0b0d19a1137453ed.hot-update.js": "/js/main.4beb0b0d19a1137453ed.hot-update.js", + "/js/main.a96076649da6fb28b76f.hot-update.js": "/js/main.a96076649da6fb28b76f.hot-update.js", + "/js/main.a49257e55c71e014158e.hot-update.js": "/js/main.a49257e55c71e014158e.hot-update.js", + "/js/main.1edad3b830f916beac27.hot-update.js": "/js/main.1edad3b830f916beac27.hot-update.js", + "/js/main.c6672597ea7635cf44a0.hot-update.js": "/js/main.c6672597ea7635cf44a0.hot-update.js", + "/js/main.5124895a5f5c73a6e74e.hot-update.js": "/js/main.5124895a5f5c73a6e74e.hot-update.js" } diff --git a/resources/js/components/FilesView/FileItemGrid.vue b/resources/js/components/FilesView/FileItemGrid.vue index 9ed9074e..a0da004f 100644 --- a/resources/js/components/FilesView/FileItemGrid.vue +++ b/resources/js/components/FilesView/FileItemGrid.vue @@ -26,10 +26,10 @@ - + - + @@ -89,7 +89,7 @@ export default { ...mapGetters([ 'FilePreviewType', 'sharedDetail', 'fileInfoDetail' ]), - folderIconHandle(){ + setFolderEmojiOrColor(){ // If folder have set some color if(this.data.icon_color) { diff --git a/resources/js/components/FilesView/FileItemList.vue b/resources/js/components/FilesView/FileItemList.vue index 5a65f138..7d6ecdb8 100644 --- a/resources/js/components/FilesView/FileItemList.vue +++ b/resources/js/components/FilesView/FileItemList.vue @@ -32,10 +32,10 @@ - + - + @@ -95,7 +95,7 @@ export default { computed: { ...mapGetters(['FilePreviewType', 'fileInfoDetail']), ...mapGetters({ allData: 'data' }), - folderIconHandle(){ + setFolderEmojiOrColor(){ // If folder have set some icon color if(this.data.icon_color) { diff --git a/resources/js/components/Others/Emoji.vue b/resources/js/components/Others/Emoji.vue index c8d70567..08aecb83 100644 --- a/resources/js/components/Others/Emoji.vue +++ b/resources/js/components/Others/Emoji.vue @@ -15,15 +15,16 @@ export default { transferEmoji () { // Transfer single emoji to twemoji - return !this.isIos - ? twemoji.parse(this.emoji.char, { + let tweomjiParse = twemoji.parse(this.emoji.char, { folder: 'svg', ext: '.svg', attributes: () => ({ loading: 'lazy', }) }) - : this.emoji.char + + // Check the OS, if is OS not iOS return transfered emoji to twemoji + return !this.isIos ? tweomjiParse : this.emoji.char }, }, data () { @@ -32,18 +33,7 @@ export default { } }, created () { - - const toMatch = [ - /iPhone/i, - /iPad/i, - /iPod/i, - /iOS/i, - /macOS/i, - /Macintosh/i - ] - this.isIos = toMatch.some(toMatchItem => { - return navigator.userAgent.match(toMatchItem) - }) + this.isIos = this.$isIos() } } diff --git a/resources/js/components/Others/SetFolderIcon.vue b/resources/js/components/Others/SetFolderIcon.vue index 94d98040..ccdcf9ab 100644 --- a/resources/js/components/Others/SetFolderIcon.vue +++ b/resources/js/components/Others/SetFolderIcon.vue @@ -6,11 +6,12 @@
- + -
+
+
@@ -19,18 +20,18 @@ {{selectedEmoji.name}}
+
{{$t('popup_rename.set_emoji_input_placeholder')}}
- +
- -
- + +
@@ -74,9 +75,7 @@
-
-
@@ -84,7 +83,7 @@
- +
  • - + - +
@@ -54,7 +54,7 @@ computed: { ...mapGetters(['currentFolder']), - folderIconHandle(){ + setFolderEmojiOrColor(){ // Set icon folder if set folder from rename popup if(this.setFolderIcon){ diff --git a/resources/js/helpers.js b/resources/js/helpers.js index 4d38c13e..eeee98e2 100644 --- a/resources/js/helpers.js +++ b/resources/js/helpers.js @@ -352,6 +352,22 @@ const Helpers = { body.classList.add('windows') } } + Vue.prototype.$isIos = function() { + + const toMatch = [ + /iPhone/i, + /iPad/i, + /iPod/i, + /iOS/i, + /macOS/i, + /Macintosh/i + ] + + // Check if device is iOS + return toMatch.some(toMatchItem => { + return navigator.userAgent.match(toMatchItem) + }) + } } } diff --git a/resources/js/i18n/lang/cn.json b/resources/js/i18n/lang/cn.json index 9f4b2ab9..ea3e2c2d 100644 --- a/resources/js/i18n/lang/cn.json +++ b/resources/js/i18n/lang/cn.json @@ -584,7 +584,14 @@ "popup_rename": { "title": "Rename Your {item}", "label": "Edit Name", - "placeholder": "Type your title" + "placeholder": "Type your title", + "tab_emoji_title": "Emoji as an Icon", + "tab_color_title": "Folder Color", + "select_emoji_label": "Pick Your Emoji Icon", + "color_pick_label": "Pick Your Color", + "set_emoji_input_placeholder": "Emojis List...", + "search_emoji_input_placeholder": "Search your emoji...", + "emoji_list_not_found": "Not Found" }, "popup_set_card": { "message": "您的卡将被设置为默认卡，并且在以后的结算中始终会收取费用。", diff --git a/resources/js/i18n/lang/en.json b/resources/js/i18n/lang/en.json index 04e0ea08..b3466c5b 100644 --- a/resources/js/i18n/lang/en.json +++ b/resources/js/i18n/lang/en.json @@ -583,11 +583,11 @@ "placeholder": "Type your title", "tab_emoji_title": "Emoji as an Icon", "tab_color_title": "Folder Color", + "select_emoji_label": "Pick Your Emoji Icon", + "color_pick_label": "Pick Your Color", "set_emoji_input_placeholder": "Emojis List...", "search_emoji_input_placeholder": "Search your emoji...", - "emoji_list_not_found": "Not Found", - "color_pick_label": "Pick Your Color:" - + "emoji_list_not_found": "Not Found" }, "popup_create_folder": { "folder_default_name": "New Folder", diff --git a/resources/js/i18n/lang/sk.json b/resources/js/i18n/lang/sk.json index bd640e43..5f5852bf 100644 --- a/resources/js/i18n/lang/sk.json +++ b/resources/js/i18n/lang/sk.json @@ -586,7 +586,14 @@ "popup_rename": { "title": "Zmeňte názov {item}", "label": "Zmeniť názov", - "placeholder": "Napíš názov..." + "placeholder": "Napíš názov...", + "tab_emoji_title": "Emodži ako ikona", + "tab_color_title": "Farba priečinka", + "select_emoji_label": "Vyberte emodži ikonu", + "color_pick_label": "Vyberte si farbu", + "set_emoji_input_placeholder": "Emodži zoznam ...", + "search_emoji_input_placeholder": "Vyhľadajte svoje emodži...", + "emoji_list_not_found": "Nenájdené" }, "popup_set_card": { "message": "Vaša karta bude nastavená ako predvolená a bude vám z nej vždy stiahnutá čiastka za nasledujúce obdobie fakturácie.",