diff --git a/.env.example b/.env.example index d8e546b7..1bf4d360 100644 --- a/.env.example +++ b/.env.example @@ -1,10 +1,9 @@ APP_NAME=VueFileManager -APP_ENV=production -APP_KEY=base64:sB1YuKsbWv7MdWugb9ZsYBqv2QZJ+QOuHZHEddOsUuo= +APP_ENV=local +APP_KEY=base64:sC1YuKsbWv7MdWugb9ZsYBqv2QZJ+QOuHZHEddOsAao= APP_DEBUG=true APP_URL=http://localhost APP_DEMO=false -IS_SETUP_WIZARD_DEMO=false LOG_CHANNEL=daily @@ -86,3 +85,5 @@ RECAPTCHA_CLIENT_SECRET= SANCTUM_STATEFUL_DOMAINS=localhost,localhost:8000,127.0.0.1,127.0.0.1:8000,::1 IS_ADMIN_VUEFILEMANAGER_BAR=true +IS_SETUP_WIZARD_DEMO=false +IS_SETUP_WIZARD_DEBUG=false \ No newline at end of file diff --git a/config/app.php b/config/app.php index 59a08217..f52005d9 100644 --- a/config/app.php +++ b/config/app.php @@ -232,8 +232,6 @@ return [ 'Socialite' => Laravel\Socialite\Facades\Socialite::class, ], - 'deploy_secret' => env('APP_DEPLOY_SECRET'), - 'deploy_branch' => env('APP_DEPLOY_BRANCH'), 'debug_blacklist' => [ '_ENV' => [ 'APP_KEY', diff --git a/config/content.php b/config/content.php index 7900fbf3..97f0e2ad 100644 --- a/config/content.php +++ b/config/content.php @@ -91,10 +91,6 @@ return [ 'name' => 'allow_homepage', 'value' => 1, ], - [ - 'name' => 'app_color', - 'value' => '#00BC7E', - ], [ 'name' => 'allowed_adsense', 'value' => 0, @@ -177,10 +173,6 @@ return [ 'name' => 'footer_content', 'value' => '© 2021 Simple & Powerful Personal Cloud Storage. Developed by Hi5Ve.Digital', ], - [ - 'name' => 'app_color', - 'value' => '#00BC7E', - ], [ 'name' => 'allowed_adsense', 'value' => 0, diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 206101d4..db6c374c 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -4,16 +4,11 @@ "/js/chunks/status-check.js": "/js/chunks/status-check.js", "/js/chunks/purchase-code.js": "/js/chunks/purchase-code.js", "/js/chunks/database.js": "/js/chunks/database.js", - "/js/chunks/installation-disclaimer.js": "/js/chunks/installation-disclaimer.js", - "/js/chunks/subscription-service.js": "/js/chunks/subscription-service.js", - "/js/chunks/stripe-credentials.js": "/js/chunks/stripe-credentials.js", - "/js/chunks/billings-detail.js": "/js/chunks/billings-detail.js", - "/js/chunks/subscription-plans.js": "/js/chunks/subscription-plans.js", "/js/chunks/environment-setup.js": "/js/chunks/environment-setup.js", "/js/chunks/app-setup.js": "/js/chunks/app-setup.js", "/js/chunks/admin-account.js": "/js/chunks/admin-account.js", "/js/chunks/shared.js": "/js/chunks/shared.js", - "/js/chunks/shared/files.js": "/js/chunks/shared/files.js", + "/js/chunks/shared/browser.js": "/js/chunks/shared/browser.js", "/js/chunks/shared/single-file.js": "/js/chunks/shared/single-file.js", "/js/chunks/shared/authenticate.js": "/js/chunks/shared/authenticate.js", "/js/chunks/not-found.js": "/js/chunks/not-found.js", @@ -48,6 +43,7 @@ "/js/chunks/app-email.js": "/js/chunks/app-email.js", "/js/chunks/app-others.js": "/js/chunks/app-others.js", "/js/chunks/app-sign-in-out.js": "/js/chunks/app-sign-in-out.js", + "/js/chunks/app-adsense.js": "/js/chunks/app-adsense.js", "/js/chunks/app-language.js": "/js/chunks/app-language.js", "/js/chunks/homepage.js": "/js/chunks/homepage.js", "/js/chunks/dynamic-page.js": "/js/chunks/dynamic-page.js", @@ -71,7 +67,5 @@ "/js/chunks/shared-with-me.js": "/js/chunks/shared-with-me.js", "/js/chunks/invitation.js": "/js/chunks/invitation.js", "/css/tailwind.css": "/css/tailwind.css", - "/css/app.css": "/css/app.css", - "/js/chunks/app-adsense.js": "/js/chunks/app-adsense.js", - "/js/chunks/shared/browser.js": "/js/chunks/shared/browser.js" + "/css/app.css": "/css/app.css" } diff --git a/resources/js/App.vue b/resources/js/App.vue index 1b72c677..2463adf8 100644 --- a/resources/js/App.vue +++ b/resources/js/App.vue @@ -5,16 +5,16 @@ - + - + - + - + @@ -26,92 +26,94 @@ import Spinner from './components/FilesView/Spinner' import Vignette from './components/Others/Vignette' import Alert from './components/FilesView/Alert' import RestrictionWarningBar from './components/Subscription/RestrictionWarningBar' -import { mapGetters } from 'vuex' -import { events } from './bus' +import {mapGetters} from 'vuex' +import {events} from './bus' export default { - name: 'App', - components: { - RestrictionWarningBar, - CookieDisclaimer, - ToasterWrapper, - Vignette, - Spinner, - Alert, - }, - data() { - return { - isLoaded: false, - } - }, - computed: { - ...mapGetters(['config', 'user']), - }, - watch: { - 'config.defaultThemeMode': function () { - this.handleDarkMode() - }, - }, - methods: { - spotlightListener(e) { - if (e.key === 'k' && e.metaKey) { - events.$emit('spotlight:show') - } - }, - handleDarkMode() { - const app = document.getElementsByTagName('html')[0] - const prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)') + name: 'App', + components: { + RestrictionWarningBar, + CookieDisclaimer, + ToasterWrapper, + Vignette, + Spinner, + Alert, + }, + data() { + return { + isLoaded: false, + } + }, + computed: { + ...mapGetters(['config', 'user']), + }, + watch: { + 'config.defaultThemeMode': function () { + this.handleDarkMode() + }, + }, + methods: { + spotlightListener(e) { + if (e.key === 'k' && e.metaKey) { + events.$emit('spotlight:show') + } + }, + handleDarkMode() { + const app = document.getElementsByTagName('html')[0] + const prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)') - if (this.config.defaultThemeMode === 'dark') { - app.classList.add('dark') - this.$store.commit('UPDATE_DARK_MODE_STATUS', true) - } else if (this.config.defaultThemeMode === 'light') { - app.classList.remove('dark') - this.$store.commit('UPDATE_DARK_MODE_STATUS', false) - } else if (this.config.defaultThemeMode === 'system' && prefersDarkScheme.matches) { - app.classList.add('dark') - this.$store.commit('UPDATE_DARK_MODE_STATUS', true) - } else if (this.config.defaultThemeMode === 'system' && !prefersDarkScheme.matches) { - app.classList.remove('dark') - this.$store.commit('UPDATE_DARK_MODE_STATUS', false) - } - }, - }, - beforeMount() { - window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { - this.handleDarkMode() - }) + if (this.config.defaultThemeMode === 'dark') { + app.classList.add('dark') + this.$store.commit('UPDATE_DARK_MODE_STATUS', true) + } else if (this.config.defaultThemeMode === 'light') { + app.classList.remove('dark') + this.$store.commit('UPDATE_DARK_MODE_STATUS', false) + } else if (this.config.defaultThemeMode === 'system' && prefersDarkScheme.matches) { + app.classList.add('dark') + this.$store.commit('UPDATE_DARK_MODE_STATUS', true) + } else if (this.config.defaultThemeMode === 'system' && !prefersDarkScheme.matches) { + app.classList.remove('dark') + this.$store.commit('UPDATE_DARK_MODE_STATUS', false) + } + }, + }, + beforeMount() { + window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { + this.handleDarkMode() + }) - // Get installation state - let installation = this.$root.$data.config.installation + // Commit config + this.$store.commit('INIT', { + config: this.$root.$data.config, + }) - if (['setup-disclaimer', 'setup-database'].includes(installation)) + // Get installation state + let installation = this.$root.$data.config.installation + + // Redirect to setup wizard + if (installation === 'installation-needed') { this.isLoaded = true - // Redirect to database verify code - //if (installation === 'setup-database') - //this.$router.push({ name: 'StatusCheck' }) + if (window.location.pathname.split('/')[1] !== 'setup-wizard') { + this.$router.push({name: 'StatusCheck'}) + } + } else { + this.$store.dispatch('getLanguageTranslations', this.$root.$data.config.locale) + .then(() => { + this.isLoaded = true + }) + } + }, + created() { + if (this.$isWindows()) { + document.body.classList.add('windows') + } - if (installation === 'setup-done') - this.$store.dispatch('getLanguageTranslations', this.$root.$data.config.locale).then(() => { - this.isLoaded = true - - // Store config to vuex - this.$store.commit('INIT', { - config: this.$root.$data.config, - }) - }) - }, - mounted() { - if (this.$isWindows()) { - document.body.classList.add('windows') - } - - window.addEventListener('keydown', this.spotlightListener) - }, - destroyed() { - window.removeEventListener('keydown', this.spotlightListener) - }, + window.addEventListener('keydown', this.spotlightListener) + }, + destroyed() { + window.removeEventListener('keydown', this.spotlightListener) + }, } @@ -121,59 +123,54 @@ export default { @import '../sass/vuefilemanager/mixins'; input:-webkit-autofill { - transition-delay: 999999999999s; + transition-delay: 999999999999s; } [v-cloak], [v-cloak] > * { - display: none; + display: none; } * { - outline: 0; - margin: 0; - padding: 0; - font-family: 'Nunito', sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - box-sizing: border-box; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); - font-size: 16px; - text-decoration: none; - color: $text; + outline: 0; + margin: 0; + padding: 0; + font-family: 'Nunito', sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + box-sizing: border-box; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + font-size: 16px; + text-decoration: none; + color: $text; } .vue-feather { - path, - circle, - line, - rect, - polyline, - ellipse, - polygon { - color: inherit; - } + path, + circle, + line, + rect, + polyline, + ellipse, + polygon { + color: inherit; + } } -#auth { - width: 100%; - height: 100%; -} - -// Dark mode support +// Dark mode .dark { - * { - color: $dark_mode_text_primary; - } + * { + color: $dark_mode_text_primary; + } - body, - html { - background: $dark_mode_background; - color: $dark_mode_text_primary; + body, + html { + background: $dark_mode_background; + color: $dark_mode_text_primary; - img { - opacity: 0.95; - } - } + img { + opacity: 0.95; + } + } } diff --git a/resources/js/components/FilesView/EmptyFilePage.vue b/resources/js/components/FilesView/EmptyFilePage.vue index 898b3549..fe434b7c 100644 --- a/resources/js/components/FilesView/EmptyFilePage.vue +++ b/resources/js/components/FilesView/EmptyFilePage.vue @@ -1,5 +1,5 @@