nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-06 02:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

add set language as default, Fix console error in SharedPage

Browse Source
This commit is contained in:
Milos Holba
2021-03-10 12:28:50 +01:00
parent 33fa77cd73
commit 8be86183fa
8 changed files with 119 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/General/SetupWizardController.php
View File

@@ -390,6 +390,10 @@ class SetupWizardController extends Controller
'name' => 'storage_default',
'value' => $request->defaultStorage ? $request->defaultStorage : 5,
],
[
'name' => 'language',
'value' => 'en'
]
]);
// Store options
@@ -490,7 +494,7 @@ class SetupWizardController extends Controller
$strings = $language_strings->map(function ($value , $key) use($language) {
return [
return [
'language_id' => $language->id,
'key' => $key,
'lang' => $language->locale,

18
app/Http/Controllers/Language/LanguageController.php
View File

@@ -2,11 +2,12 @@
namespace App\Http\Controllers\Language;
use App\Setting;
use App\Language;
use App\LanguageString;
use App\Http\Tools\Demo;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
@@ -31,22 +32,23 @@ class LanguageController extends Controller
* Get all language strings
*
* @param Language $language
* @return string
* @return Collection
*/
public function get_language_strings(Language $language)
{
// $lang = Language::whereId($language->id);
$language_setting = Setting::whereName('language')->first()->value;
$strings = $language->with('languageStrings')->first();
$lang = Language::whereId($language->id);
// dd($strings);
$strings = $lang->with('languageStrings')->first();
// dd($language);
$license = get_setting('license') === 'Extended' ? 'extended' : 'regular';
$default_strings = collect(config('language_strings.' . $license));
return collect(['translated_strings' => $strings, 'default_strings' => $default_strings]);
return collect(['language_setting' => $language_setting, 'translated_strings' => $strings, 'default_strings' => $default_strings]);
}
/**

2
app/Language.php
View File

@@ -39,7 +39,7 @@ class Language extends Model
$language_strings = collect(config('language_strings.' . $license));
$strings = $language_strings->map(function ($value , $key) use($language) {
$strings = $language_strings->map(function ($value , $key) use($language) {
return [
'language_id' => $language->id,

46
public/mix-manifest.json
View File

@@ -13,7 +13,7 @@
"/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-language.js": "/chunks/app-language.js?id=9203f328c3fc4f8bf0f4",
"/chunks/app-language.js": "/chunks/app-language.js?id=8cbeb2840d79d778eb3e",
"/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",
@@ -57,7 +57,7 @@
"/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=4c5675bec1cb07152692",
"/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/shared-page.js": "/chunks/shared-page.js?id=074f7946e1c99ceadf48",
"/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=402e3abd247572676394",
@@ -76,15 +76,35 @@
"/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=10b3a108059d62d206c8",
"/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c",
"/chunks/app-language.75a8d0f493b84cc978b0.hot-update.js": "/chunks/app-language.75a8d0f493b84cc978b0.hot-update.js",
"/chunks/app-language.11f2328701d7d1eca870.hot-update.js": "/chunks/app-language.11f2328701d7d1eca870.hot-update.js",
"/chunks/app-language.777221bd2497f08011d9.hot-update.js": "/chunks/app-language.777221bd2497f08011d9.hot-update.js",
"/chunks/app-language.bc81b9e7ca698d87c551.hot-update.js": "/chunks/app-language.bc81b9e7ca698d87c551.hot-update.js",
"/chunks/app-language.a4ed495733086633616b.hot-update.js": "/chunks/app-language.a4ed495733086633616b.hot-update.js",
"/chunks/app-language.621d2d3bfd5b566ca6fd.hot-update.js": "/chunks/app-language.621d2d3bfd5b566ca6fd.hot-update.js",
"/chunks/app-language.d798bdfce2bf9e140bac.hot-update.js": "/chunks/app-language.d798bdfce2bf9e140bac.hot-update.js",
"/chunks/app-language.24a27e086d82daca8ee6.hot-update.js": "/chunks/app-language.24a27e086d82daca8ee6.hot-update.js",
"/chunks/app-language.51bb5abc36798fbf4971.hot-update.js": "/chunks/app-language.51bb5abc36798fbf4971.hot-update.js",
"/chunks/app-language.c1e9e509fd5d55e2364a.hot-update.js": "/chunks/app-language.c1e9e509fd5d55e2364a.hot-update.js",
"/chunks/app-language.089db7aa0e313057463e.hot-update.js": "/chunks/app-language.089db7aa0e313057463e.hot-update.js"
"/chunks/app-language.398318a7e6c1fd968a89.hot-update.js": "/chunks/app-language.398318a7e6c1fd968a89.hot-update.js",
"/chunks/app-language.cb7758b5e05d4049f3d1.hot-update.js": "/chunks/app-language.cb7758b5e05d4049f3d1.hot-update.js",
"/chunks/app-language.821d4be4c1f1c888a902.hot-update.js": "/chunks/app-language.821d4be4c1f1c888a902.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.ee121eb97a695a19b50e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ee121eb97a695a19b50e.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.05ef932426101fb70b4b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.05ef932426101fb70b4b.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.f03df136eb103deb738e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f03df136eb103deb738e.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.2d241fca7776306cf38d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2d241fca7776306cf38d.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.3e2cb05135e0d70e89d3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3e2cb05135e0d70e89d3.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.e9977500a095b48707a0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e9977500a095b48707a0.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.ff8f45e0996df95e6b98.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ff8f45e0996df95e6b98.hot-update.js",
"/chunks/shared-page.e82a11390fdf887d31f0.hot-update.js": "/chunks/shared-page.e82a11390fdf887d31f0.hot-update.js",
"/chunks/shared-page.5c44748a89b00f5780b6.hot-update.js": "/chunks/shared-page.5c44748a89b00f5780b6.hot-update.js",
"/chunks/shared-page.96c94eaf93d40c4fc656.hot-update.js": "/chunks/shared-page.96c94eaf93d40c4fc656.hot-update.js",
"/chunks/shared-page.886ee6617c4e8bfb33f6.hot-update.js": "/chunks/shared-page.886ee6617c4e8bfb33f6.hot-update.js",
"/chunks/shared-page.b0fc16cea98b11d16ea2.hot-update.js": "/chunks/shared-page.b0fc16cea98b11d16ea2.hot-update.js",
"/chunks/shared-page.b55c620852f16c053615.hot-update.js": "/chunks/shared-page.b55c620852f16c053615.hot-update.js",
"/chunks/shared-page.de8ecf3cd5a83f2b21ec.hot-update.js": "/chunks/shared-page.de8ecf3cd5a83f2b21ec.hot-update.js",
"/chunks/shared-page.f2de09a840bc5e2796a7.hot-update.js": "/chunks/shared-page.f2de09a840bc5e2796a7.hot-update.js",
"/chunks/shared-page.bca8d95a9a291739e570.hot-update.js": "/chunks/shared-page.bca8d95a9a291739e570.hot-update.js",
"/chunks/shared-page.550416407556b21352a9.hot-update.js": "/chunks/shared-page.550416407556b21352a9.hot-update.js",
"/chunks/shared-page.ba3382ed8e662565e928.hot-update.js": "/chunks/shared-page.ba3382ed8e662565e928.hot-update.js",
"/chunks/shared-page.767f42237e27b3e750bd.hot-update.js": "/chunks/shared-page.767f42237e27b3e750bd.hot-update.js",
"/chunks/shared-page.3308679e755e73ded38e.hot-update.js": "/chunks/shared-page.3308679e755e73ded38e.hot-update.js",
"/chunks/shared-page.2eca81dc50119aa702d2.hot-update.js": "/chunks/shared-page.2eca81dc50119aa702d2.hot-update.js",
"/chunks/shared-page.8fe102c2f0f2e1eb0982.hot-update.js": "/chunks/shared-page.8fe102c2f0f2e1eb0982.hot-update.js",
"/chunks/shared-page.37473bb834611b5f1ed4.hot-update.js": "/chunks/shared-page.37473bb834611b5f1ed4.hot-update.js",
"/chunks/shared-page.a37a7e3969ee0670a3a5.hot-update.js": "/chunks/shared-page.a37a7e3969ee0670a3a5.hot-update.js",
"/chunks/shared-page.78149b028d75ced4a25a.hot-update.js": "/chunks/shared-page.78149b028d75ced4a25a.hot-update.js",
"/chunks/app-language.310b9d5247c9aeb0df42.hot-update.js": "/chunks/app-language.310b9d5247c9aeb0df42.hot-update.js",
"/chunks/app-language.15fe991f0d7066dae7b0.hot-update.js": "/chunks/app-language.15fe991f0d7066dae7b0.hot-update.js",
"/chunks/app-language.df40578c7c2d43fc1559.hot-update.js": "/chunks/app-language.df40578c7c2d43fc1559.hot-update.js"
}

2
resources/js/store/modules/app.js vendored
View File

@@ -966,7 +966,7 @@ const defaultState = {
value: "12.0",
label: "(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka"
}
],
]
}
const actions = {
getEmojisList: ({commit}) => {

31
resources/js/views/Admin/Languages/Language.vue
View File

@@ -8,7 +8,7 @@
<div v-if="loadedLanguages" class="side-content">
<PageHeader :can-back="true" :title="$router.currentRoute.meta.title"/>
<div class="languages-wrapper">
<div class="languages-wrapper page-tab from-fixed-width">
<div class="language-label-wrapper">
<label class="language-label">Languages</label>
</div>
@@ -22,12 +22,9 @@
</div>
</div>
<ButtonBase
@click.native="createLanguage"
class="button-add-language">
<plus-icon class="icon" size="14"/>
<MobileActionButton @click.native="createLanguage" icon="plus" class="button-add-language">
Add Language
</ButtonBase>
</MobileActionButton>
</div>
<Spinner v-if="! loadedStrings"/>
@@ -41,6 +38,7 @@
import LanguageStrings from '@/views/Admin/Languages/LanguageStrings'
import MobileHeader from '@/components/Mobile/MobileHeader'
import ButtonBase from '@/components/FilesView/ButtonBase'
import MobileActionButton from '@/components/FilesView/MobileActionButton'
import PageHeader from '@/components/Others/PageHeader'
import Spinner from '@/components/FilesView/Spinner'
import { PlusIcon, XIcon } from 'vue-feather-icons'
@@ -50,6 +48,7 @@ import { events } from '@/bus'
export default {
name: 'Language',
components: {
MobileActionButton,
LanguageStrings,
MobileHeader,
ButtonBase,
@@ -228,15 +227,15 @@ export default {
}
}
@media only screen and (max-width: 1024px) {
.side-content {
flex: 0 0 205px;
}
}
// @media only screen and (max-width: 1024px) {
// .side-content {
// flex: 0 0 205px;
// }
// }
@media only screen and (max-width: 690px) {
.side-content {
display: none;
}
}
// @media only screen and (max-width: 690px) {
// .side-content {
// display: none;
// }
// }
</style>

70
resources/js/views/Admin/Languages/LanguageStrings.vue
View File

@@ -2,24 +2,24 @@
<div v-if="strings" class="language-strings-wrapper">
<div class="search-bar-wrapper">
<div class="search-bar">
<div class="icon" >
<div v-if="!searchInput" class="icon" >
<search-icon size="19"></search-icon>
</div>
<!-- <div class="icon">
<div @click="resetInput" v-if="searchInput" class="icon">
<x-icon class="pointer" size="19"></x-icon>
</div> -->
</div>
<input
v-model="searchInput"
@input="searchStrings"
class="query"
type="text"
name="query"
:placeholder="$t('inputs.placeholder_search_files')"
v-model="searchInput"
@input="searchStrings"
class="query"
type="text"
name="searchInput"
placeholder="Search Language Strings"
/>
</div>
</div>
<div class="form block-form">
<div class="form block-form">
<FormLabel class="mt-70" icon="settings">Language Settings</FormLabel>
<div class="block-wrapper">
<div class="input-wrapper">
@@ -30,7 +30,10 @@
</label>
</div>
<SwitchInput
@input="updateLanguageSetting"
class="switch"
:class="{'disable-switch': languageSettingHandle }"
:state="languageSettingHandle"
/>
</div>
</div>
@@ -39,7 +42,7 @@
<div v-if="language.name" class="block-wrapper">
<label> Language Name:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Language Name" rules="required" v-slot="{ errors }">
<input type="text"
<input type="text"
v-model="language.name"
@input="updateName"
:class="{'is-error': errors[0]}"
@@ -55,7 +58,7 @@
<div class="block-wrapper" v-for="(string,index) in filteredStrings" :key="index">
<label> {{string.value}}:</label>
<ValidationProvider tag="div" class="input-wrapper" name="Language string" rules="required" v-slot="{ errors }">
<input type="text"
<input type="text"
:class="{'is-error': errors[0]}"
@input="updateString(string.key)"
v-model="strings[getIndex(string.key)].value"
@@ -92,6 +95,11 @@ export default {
Spinner,
XIcon,
},
computed: {
languageSettingHandle() {
return this.language.locale == this.languageSetting ? true : false
}
},
data () {
return {
defaultStrings: [],
@@ -100,20 +108,36 @@ export default {
strings: undefined,
language: undefined,
searchInput: '',
languageSetting: undefined
}
},
methods: {
updateLanguageSetting() {
this.$updateText('/settings', 'language', this.language.locale)
this.languageSetting = this.language.locale
},
resetInput(){
this.searchInput = ''
this.searchStrings()
},
getIndex(key){
if(this.strings)
return _.findIndex(this.strings, function(string) { return string.key === key })
},
updateName() {
this.$updateText(`/languages/${this.language.id}`, 'name', this.language.name)
events.$emit('language-name:update', this.language)
},
updateString (key) {
updateString (key) {
// Return if the input is empty
if(! this.strings[this.getIndex(key)].value) return
this.$updateText(
@@ -151,12 +175,15 @@ export default {
})
}
this.filterStrings()
this.language = {
'id': this.languageStrings.translated_strings.id,
'name': this.languageStrings.translated_strings.name
'name': this.languageStrings.translated_strings.name,
'locale': this.languageStrings.translated_strings.locale,
}
this.languageSetting = this.languageStrings.language_setting
this.filterStrings()
}
}
}
@@ -168,15 +195,22 @@ export default {
@import '@assets/vue-file-manager/_mixins';
@import '@assets/vue-file-manager/_forms';
.disable-switch {
cursor: not-allowed;
/deep/.text-right {
pointer-events: none;
}
}
.language-strings-wrapper {
width: 100%;
width: 700px;
height: 100%;
margin: 0 auto;
display: flex;
flex-direction: column;
.block-form{
min-width: 100%;
overflow-y: scroll;
overflow-x: hidden;
}

4
resources/js/views/Shared/SharedPage.vue
View File

@@ -60,7 +60,7 @@
</div>
<!--Single file page-->
<div v-if="sharedDetail.type === 'file' && isPageFiles" id="single-file">
<div v-if="sharedDetail && sharedDetail.type === 'file' && isPageFiles" id="single-file">
<div class="single-file-wrapper">
<FileItemGrid v-if="sharedFile" :data="sharedFile" :context-menu="false"/>
@@ -71,7 +71,7 @@
</div>
<!--Multiple items view page-->
<div v-if="sharedDetail.type === 'folder' && isPageFiles"
<div v-if="sharedDetail && sharedDetail.type === 'folder' && isPageFiles"
@contextmenu.prevent.capture="contextMenu($event, undefined)"
id="viewport">