file filter icon change

This commit is contained in:
Čarodej
2021-11-02 08:29:59 +01:00
parent 54167ae366
commit b232701783
10 changed files with 74 additions and 18 deletions

View File

@@ -22,7 +22,7 @@
"/chunks/app-index.js": "/chunks/app-index.js?id=3e3d528f6a9fa346fefb",
"/chunks/app-language.js": "/chunks/app-language.js?id=297deffad92ad1ac528f",
"/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js?id=38b2085e829a84df0e5f",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js?id=88ceef47c78e9b772c4f",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js?id=3cbb19b80e635b3524e5",
"/chunks/app-others.js": "/chunks/app-others.js?id=d2057faf065ae86c70db",
"/chunks/app-payments.js": "/chunks/app-payments.js?id=a2a7f44b6ff01a365ebb",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=ad0a2e908255f2220282",
@@ -38,7 +38,7 @@
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6c86916c6c6f679fa86b",
"/chunks/email-verified.js": "/chunks/email-verified.js?id=253ce639751cc8799458",
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=ead3443a6472510c2ea7",
"/chunks/files.js": "/chunks/files.js?id=babd50e0bfd6fd3d3b2d",
"/chunks/files.js": "/chunks/files.js?id=dacb4d69f02dd1039c46",
"/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=d0a2e05e3e243b2e2c4e",
"/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=f89157279e973d299fc7",
"/chunks/files~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js": "/chunks/files~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js?id=4b8864f9265f55f61cf7",
@@ -47,7 +47,7 @@
"/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=6aabb3cc76af40dbc2bc",
"/chunks/invitation.js": "/chunks/invitation.js?id=c9cd3541ee362ae8d5f7",
"/chunks/invoices.js": "/chunks/invoices.js?id=fe45319300d75d185b81",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=b5019f50502b5a94c9cb",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=ea129760157c8e44f324",
"/chunks/not-found.js": "/chunks/not-found.js?id=034287ee0ecb036320d3",
"/chunks/page-edit.js": "/chunks/page-edit.js?id=436e329c2ec932cd6873",
"/chunks/pages.js": "/chunks/pages.js?id=5cb4242dcd91c0968ced",
@@ -63,7 +63,7 @@
"/chunks/profile.js": "/chunks/profile.js?id=0638997b77c6f1246062",
"/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=58edfb3a35062e1ba4e0",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=f8b2619e393a5823bf29",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=d4c0b1ead0d791a97c8e",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=22f629caf127051898e9",
"/chunks/settings.js": "/chunks/settings.js?id=f6974b79daefb66bc566",
"/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=d1eee7192b4d8bc1748c",
"/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=cd6a74b233390ba79ddb",
@@ -74,7 +74,7 @@
"/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=e67e12955133c57194d1",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5",
"/chunks/shared.js": "/chunks/shared.js?id=6230d050545cd1bd9b87",
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=3b074f09cd19bdc1d25b",
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=96b63d8e80c82dda1f9a",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=8b9ac9ed9afd8dd15229",
"/chunks/shared/files.js": "/chunks/shared/files.js?id=8ed7578e7f74e385da95",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=f2fb680ebf4873ff4436",
@@ -84,8 +84,8 @@
"/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=e07a08dda6b0dbcf46d1",
"/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=f547337882cef162f320",
"/chunks/subscription-service.js": "/chunks/subscription-service.js?id=8ac19b3fcfd57d79e5b1",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=13f7152cdac0629033ce",
"/chunks/trash.js": "/chunks/trash.js?id=f5cff0ed4dd114e41af4",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=0e8376e1e1873c78181b",
"/chunks/trash.js": "/chunks/trash.js?id=5fe84aadd8729e68849e",
"/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=f0b33c0540fd6c6ef8d6",
"/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=f59d97c1cbf6649b7057",
"/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=0a574f2dec3a8227f0ff",
@@ -151,7 +151,7 @@
"/chunks/platform~chunks/shared.14dc81101df7c92867a0.hot-update.js": "/chunks/platform~chunks/shared.14dc81101df7c92867a0.hot-update.js",
"/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js": "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js?id=7d983dfdc91de607d737",
"/chunks/shared-with-me.14dc81101df7c92867a0.hot-update.js": "/chunks/shared-with-me.14dc81101df7c92867a0.hot-update.js",
"/chunks/shared-with-me~chunks/team-folders.js": "/chunks/shared-with-me~chunks/team-folders.js?id=d7b10f9477dab32aec18",
"/chunks/shared-with-me~chunks/team-folders.js": "/chunks/shared-with-me~chunks/team-folders.js?id=c8a127225521735d5da0",
"/chunks/team-folders.14dc81101df7c92867a0.hot-update.js": "/chunks/team-folders.14dc81101df7c92867a0.hot-update.js",
"/chunks/shared-with-me.442c062f6b19d34001e9.hot-update.js": "/chunks/shared-with-me.442c062f6b19d34001e9.hot-update.js",
"/chunks/files.7325ba22911d0ccf7905.hot-update.js": "/chunks/files.7325ba22911d0ccf7905.hot-update.js",
@@ -1002,5 +1002,33 @@
"/chunks/platform~chunks/shared.8aee55b07466fc3f18e0.hot-update.js": "/chunks/platform~chunks/shared.8aee55b07466fc3f18e0.hot-update.js",
"/chunks/platform~chunks/shared.d23e9f624849fa650d4b.hot-update.js": "/chunks/platform~chunks/shared.d23e9f624849fa650d4b.hot-update.js",
"/chunks/platform~chunks/shared.05ce076e0c252e01ee7d.hot-update.js": "/chunks/platform~chunks/shared.05ce076e0c252e01ee7d.hot-update.js",
"/chunks/platform~chunks/shared.37a6ff3baa418af5e457.hot-update.js": "/chunks/platform~chunks/shared.37a6ff3baa418af5e457.hot-update.js"
"/chunks/platform~chunks/shared.37a6ff3baa418af5e457.hot-update.js": "/chunks/platform~chunks/shared.37a6ff3baa418af5e457.hot-update.js",
"/js/main.dd165353e93089bd9f03.hot-update.js": "/js/main.dd165353e93089bd9f03.hot-update.js",
"/js/main.20494f15f72aad4e0280.hot-update.js": "/js/main.20494f15f72aad4e0280.hot-update.js",
"/chunks/files.8eba9f297d86c3d98813.hot-update.js": "/chunks/files.8eba9f297d86c3d98813.hot-update.js",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.70d276f1e9fd763e702f.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.70d276f1e9fd763e702f.hot-update.js",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.9a82f056849099295841.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.9a82f056849099295841.hot-update.js",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.80b243c11b2785f234a1.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.80b243c11b2785f234a1.hot-update.js",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.d5267cdac51838ffa641.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.d5267cdac51838ffa641.hot-update.js",
"/js/main.f96f64aeb04d2a7e8878.hot-update.js": "/js/main.f96f64aeb04d2a7e8878.hot-update.js",
"/chunks/files.ba6fc48307e2f30f765f.hot-update.js": "/chunks/files.ba6fc48307e2f30f765f.hot-update.js",
"/chunks/files.36aa3051739c7849cd31.hot-update.js": "/chunks/files.36aa3051739c7849cd31.hot-update.js",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.fbc0daad9046dd2011ab.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.fbc0daad9046dd2011ab.hot-update.js",
"/js/main.9c738dce03667414d727.hot-update.js": "/js/main.9c738dce03667414d727.hot-update.js",
"/js/main.900946f27f71b06d6abc.hot-update.js": "/js/main.900946f27f71b06d6abc.hot-update.js",
"/chunks/trash.0f4370da9b3888692fef.hot-update.js": "/chunks/trash.0f4370da9b3888692fef.hot-update.js",
"/chunks/my-shared-items.c59f9134f2c235ada136.hot-update.js": "/chunks/my-shared-items.c59f9134f2c235ada136.hot-update.js",
"/chunks/recent-uploads.c59f9134f2c235ada136.hot-update.js": "/chunks/recent-uploads.c59f9134f2c235ada136.hot-update.js",
"/chunks/shared-with-me.c59f9134f2c235ada136.hot-update.js": "/chunks/shared-with-me.c59f9134f2c235ada136.hot-update.js",
"/chunks/team-folders.c59f9134f2c235ada136.hot-update.js": "/chunks/team-folders.c59f9134f2c235ada136.hot-update.js",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.89cd1014354c442ff318.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.89cd1014354c442ff318.hot-update.js",
"/js/main.59e9a9f709bce5bb0e3f.hot-update.js": "/js/main.59e9a9f709bce5bb0e3f.hot-update.js",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.7ccfca887a9e09b2cdd2.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.7ccfca887a9e09b2cdd2.hot-update.js",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.38930080df260b2073a9.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.38930080df260b2073a9.hot-update.js",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.7a4dded10c1259d410d9.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.7a4dded10c1259d410d9.hot-update.js",
"/chunks/files.fe34e4af5b88b9c2bf29.hot-update.js": "/chunks/files.fe34e4af5b88b9c2bf29.hot-update.js",
"/chunks/my-shared-items.fe34e4af5b88b9c2bf29.hot-update.js": "/chunks/my-shared-items.fe34e4af5b88b9c2bf29.hot-update.js",
"/chunks/recent-uploads.fe34e4af5b88b9c2bf29.hot-update.js": "/chunks/recent-uploads.fe34e4af5b88b9c2bf29.hot-update.js",
"/chunks/shared-with-me~chunks/team-folders.fe34e4af5b88b9c2bf29.hot-update.js": "/chunks/shared-with-me~chunks/team-folders.fe34e4af5b88b9c2bf29.hot-update.js",
"/chunks/trash.fe34e4af5b88b9c2bf29.hot-update.js": "/chunks/trash.fe34e4af5b88b9c2bf29.hot-update.js"
}

View File

@@ -1,7 +1,14 @@
<template>
<button class="mobile-action-button">
<div class="flex">
<search-icon v-if="icon === 'search'" size="15" class="icon dark-text-theme" />
<hard-drive-icon v-if="icon === 'hard-drive'" size="15" class="icon dark-text-theme" />
<upload-cloud-icon v-if="icon === 'upload-cloud'" size="15" class="icon dark-text-theme" />
<link-icon v-if="icon === 'share'" size="15" class="icon dark-text-theme" />
<trash2-icon v-if="icon === 'trash2'" size="15" class="icon dark-text-theme" />
<users-icon v-if="icon === 'users'" size="15" class="icon dark-text-theme" />
<user-check-icon v-if="icon === 'user-check'" size="15" class="icon dark-text-theme" />
<search-icon v-if="icon === 'search'" size="15" class="icon dark-text-theme" />
<refresh-cw-icon v-if="icon === 'refresh'" size="15" class="icon dark-text-theme" />
<download-icon v-if="icon === 'download'" size="15" class="icon dark-text-theme" />
<copy-icon v-if="icon === 'copy'" size="15" class="icon dark-text-theme" />
@@ -27,7 +34,7 @@
</template>
<script>
import { SearchIcon, RefreshCwIcon, DownloadIcon, CopyIcon, FilterIcon, DollarSignIcon, CheckIcon, XSquareIcon, CheckSquareIcon, FolderPlusIcon, ListIcon, GridIcon, TrashIcon, UserPlusIcon, PlusIcon, CreditCardIcon } from 'vue-feather-icons'
import { UserCheckIcon, HardDriveIcon, UploadCloudIcon, LinkIcon, Trash2Icon, UsersIcon, SearchIcon, RefreshCwIcon, DownloadIcon, CopyIcon, FilterIcon, DollarSignIcon, CheckIcon, XSquareIcon, CheckSquareIcon, FolderPlusIcon, ListIcon, GridIcon, TrashIcon, UserPlusIcon, PlusIcon, CreditCardIcon } from 'vue-feather-icons'
import CloudPlusIcon from '/resources/js/components/FilesView/Icons/CloudPlusIcon'
import SortingIcon from '/resources/js/components/FilesView/Icons/SortingIcon'
@@ -37,6 +44,12 @@
'icon'
],
components: {
UserCheckIcon,
HardDriveIcon,
UploadCloudIcon,
LinkIcon,
Trash2Icon,
UsersIcon,
CheckSquareIcon,
DollarSignIcon,
CreditCardIcon,

View File

@@ -1,7 +1,7 @@
<template>
<button class="mobile-action-button">
<div class="flex">
<upload-cloud-icon class="icon dark-text-theme" size="15" />
<cloud-plus-icon class="icon dark-text-theme" size="15" />
<label label="file" class="label button file-input button-base">
<slot></slot>
<input
@@ -19,10 +19,12 @@
<script>
import { UploadCloudIcon } from 'vue-feather-icons'
import CloudPlusIcon from "./Icons/CloudPlusIcon";
export default {
name: 'MobileActionButtonUpload',
components: {
CloudPlusIcon,
UploadCloudIcon,
},
methods: {

View File

@@ -229,6 +229,19 @@ const FunctionHelpers = {
}[this.$route.name]
}
Vue.prototype.$getCurrentSectionIcon = function () {
return {
'RecentUploads': 'upload-cloud',
'MySharedItems': 'share',
'Trash': 'trash2',
'Public': 'hard-drive',
'Files': 'hard-drive',
'TeamFolders': 'users',
'SharedWithMe': 'user-check',
}[this.$router.currentRoute.name]
}
Vue.prototype.$getDataByLocation = function () {
let routes = {

View File

@@ -83,7 +83,7 @@
<MobileActionButton @click.native="$openSpotlight" icon="search">
{{ $t('Spotlight') }}
</MobileActionButton>
<MobileActionButton @click.native="$showMobileMenu('file-filter')" icon="filter">
<MobileActionButton @click.native="$showMobileMenu('file-filter')" :icon="$getCurrentSectionIcon()">
{{ $getCurrentSectionName() }}
</MobileActionButton>
<MobileActionButton @click.native="$showMobileMenu('create-list')" v-if="$checkPermission(['master', 'editor'])" icon="cloud-plus">

View File

@@ -52,7 +52,7 @@
<MobileActionButton @click.native="$openSpotlight" icon="search">
{{ $t('Spotlight')}}
</MobileActionButton>
<MobileActionButton @click.native="$showMobileMenu('file-filter')" icon="filter">
<MobileActionButton @click.native="$showMobileMenu('file-filter')" :icon="$getCurrentSectionIcon()">
{{ $getCurrentSectionName() }}
</MobileActionButton>
<MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">

View File

@@ -43,7 +43,7 @@
<MobileActionButton @click.native="$openSpotlight" icon="search">
{{ $t('Spotlight') }}
</MobileActionButton>
<MobileActionButton @click.native="$showMobileMenu('file-filter')" icon="filter">
<MobileActionButton @click.native="$showMobileMenu('file-filter')" :icon="$getCurrentSectionIcon()">
{{ $getCurrentSectionName() }}
</MobileActionButton>
<MobileActionButtonUpload>

View File

@@ -67,7 +67,7 @@
<MobileActionButton @click.native="$openSpotlight" icon="search">
{{ $t('Spotlight') }}
</MobileActionButton>
<MobileActionButton @click.native="$showMobileMenu('file-filter')" icon="filter">
<MobileActionButton @click.native="$showMobileMenu('file-filter')" :icon="$getCurrentSectionIcon()">
{{ $getCurrentSectionName() }}
</MobileActionButton>
<MobileActionButton v-if="canEdit" @click.native="$showMobileMenu('create-list')" icon="cloud-plus">

View File

@@ -91,7 +91,7 @@
<MobileActionButton @click.native="$openSpotlight" icon="search">
{{ $t('Spotlight') }}
</MobileActionButton>
<MobileActionButton @click.native="$showMobileMenu('file-filter')" icon="filter">
<MobileActionButton @click.native="$showMobileMenu('file-filter')" :icon="$getCurrentSectionIcon()">
{{ $getCurrentSectionName() }}
</MobileActionButton>
<MobileActionButton @click.native="$showMobileMenu('create-list')" v-if="$checkPermission(['master', 'editor'])" icon="cloud-plus">

View File

@@ -46,7 +46,7 @@
<MobileActionButton @click.native="$openSpotlight" icon="search">
{{ $t('Spotlight')}}
</MobileActionButton>
<MobileActionButton @click.native="$showMobileMenu('file-filter')" icon="filter">
<MobileActionButton @click.native="$showMobileMenu('file-filter')" :icon="$getCurrentSectionIcon()">
{{ $getCurrentSectionName() }}
</MobileActionButton>
<MobileActionButton @click.native="$emptyTrash" icon="trash">