Add home redirection (#3437)

Author: ildyria

app/Http/Resources/GalleryConfigs/InitConfig.php

@@ -92,6 +92,9 @@ class InitConfig extends Data
 	// User registration enabled
 	public bool $is_registration_enabled;
 
+	// Homepage
+	public string $default_homepage;
+
 	public function __construct()
 	{
 		// Debug mode
@@ -148,6 +151,9 @@ public function __construct()
 		// User registration enabled
 		$this->is_registration_enabled = Configs::getValueAsBool('user_registration_enabled');
 
+		// Homepage
+		$this->default_homepage = Configs::getValueAsString('home_page_default');
+
 		$this->set_supporter_properties();
 	}
 

config/honeypot.php

@@ -48,7 +48,6 @@
 		'bc',
 		'bk',
 		'blog',
-		'home',
 		'main',
 		'new',
 		'newsite',

database/migrations/2025_06_13_102340_home_page.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+use App\Models\Extensions\BaseConfigMigration;
+
+return new class() extends BaseConfigMigration {
+	public const TIMELINE = 'Mod Timeline';
+	public const CONFIG = 'config';
+	public const STRING_REQ = 'string_required';
+
+	public function getConfigs(): array
+	{
+		return [
+			[
+				'key' => 'home_page_default',
+				'value' => 'gallery',
+				'cat' => self::CONFIG,
+				'type_range' => 'gallery', // We will change the type_range later when adding for functionalities.
+				'description' => 'Default home page after landing',
+				'details' => '',
+				'is_secret' => false,
+				'level' => 0,
+				'order' => 4,
+			],
+		];
+	}
+};

resources/js/components/settings/ConfigGroup.vue

@@ -118,7 +118,9 @@
 					<NumberField v-else-if="config.type === 'int'" :config="config" :min="0" @filled="filled" @reset="reset" />
 					<NumberField v-else-if="config.type === 'positive'" :config="config" :min="1" @filled="filled" @reset="reset" />
 					<SliderField v-else-if="config.type.includes('|')" :config="config" @filled="filled" @reset="reset" />
-					<p v-else class="bg-red-500">{{ config.key }} -- {{ config.value }} -- {{ config.documentation }} -- {{ config.type }}</p>
+					<p v-else-if="is_debug_enabled" class="bg-red-500">
+						{{ config.key }} -- {{ config.value }} -- {{ config.documentation }} -- {{ config.type }}
+					</p>
 				</div>
 			</div>
 		</template>
@@ -151,7 +153,7 @@ import { useLycheeStateStore } from "@/stores/LycheeState";
 import { storeToRefs } from "pinia";
 
 const lycheeStore = useLycheeStateStore();
-const { is_old_style, is_expert_mode } = storeToRefs(lycheeStore);
+const { is_old_style, is_expert_mode, is_debug_enabled } = storeToRefs(lycheeStore);
 
 const props = defineProps<{
 	configs: App.Http.Resources.Models.ConfigResource[];

resources/js/lychee.d.ts

@@ -276,6 +276,7 @@ declare namespace App.Http.Resources.GalleryConfigs {
 		is_se_info_hidden: boolean;
 		is_live_metrics_enabled: boolean;
 		is_registration_enabled: boolean;
+		default_homepage: string;
 	};
 	export type LandingPageResource = {
 		landing_page_enable: boolean;
@@ -408,8 +409,8 @@ declare namespace App.Http.Resources.Models {
 		visitor_id: string;
 		action: App.Enum.MetricsAction;
 		photo_id: string | null;
-		album_id: string | null;
-		title: string | null;
+		album_id: string;
+		title: string;
 		url: string | null;
 	};
 	export type PhotoResource = {

resources/js/menus/LeftMenu.vue

@@ -112,7 +112,6 @@ import AlbumService from "@/services/album-service";
 import SETag from "@/components/icons/SETag.vue";
 import Constants from "@/services/constants";
 import { useRoute } from "vue-router";
-import { useTogglablesStateStore } from "@/stores/ModalsState";
 import Button from "primevue/button";
 import PiMiniIcon from "@/components/icons/PiMiniIcon.vue";
 import { useLeftMenuStateStore } from "@/stores/LeftMenuState";
@@ -124,7 +123,6 @@ const leftMenuState = useLeftMenuStateStore();
 const route = useRoute();
 const authStore = useAuthStore();
 const lycheeStore = useLycheeStateStore();
-const togglableStore = useTogglablesStateStore();
 const favouritesStore = useFavouriteStore();
 
 const { user, left_menu_open, initData, openLycheeAbout, canSeeAdmin, load, items, profileItems } = useLeftMenu(
@@ -140,7 +138,7 @@ function logout() {
 		initData.value = undefined;
 		authStore.setUser(null);
 		AlbumService.clearCache();
-		window.location.href = Constants.BASE_URL + "/gallery";
+		window.location.href = Constants.BASE_URL + "/home";
 	});
 }
 

resources/js/router/routes.ts

@@ -3,6 +3,7 @@ import Albums from "@/views/gallery-panels/Albums.vue";
 
 const Landing = () => import("@/views/Landing.vue");
 const Favourites = () => import("@/views/gallery-panels/Favourites.vue");
+const Home = () => import("@/views/Home.vue");
 const Frame = () => import("@/views/gallery-panels/Frame.vue");
 const Search = () => import("@/views/gallery-panels/Search.vue");
 const MapView = () => import("@/views/gallery-panels/Map.vue");
@@ -39,6 +40,11 @@ const routes_ = [
 		component: Album,
 		props: true,
 	},
+	{
+		name: "home",
+		path: "/home",
+		component: Home,
+	},
 	{
 		name: "gallery",
 		path: "/gallery",

resources/js/stores/LycheeState.ts

@@ -61,6 +61,7 @@ export const useLycheeStateStore = defineStore("lychee-store", {
 		// Site title & Dropbox API key
 		title: "gallery.title",
 		dropbox_api_key: "disabled",
+		default_homepage: "gallery",
 
 		// Lychee Supporter Edition
 		is_se_enabled: false,
@@ -77,22 +78,22 @@ export const useLycheeStateStore = defineStore("lychee-store", {
 		is_registration_enabled: false,
 	}),
 	actions: {
-		init() {
+		init(): Promise<void> {
 			// Check if already initialized
 			if (this.is_init) {
-				return;
+				return Promise.resolve();
 			}
-			this.load();
+			return this.load();
 		},
 
-		load() {
+		load(): Promise<void> {
 			// semaphore to avoid multiple calls
 			if (this.is_loading) {
-				return;
+				return Promise.resolve();
 			}
 			this.is_loading = true;
 
-			InitService.fetchInitData()
+			return InitService.fetchInitData()
 				.then((response) => {
 					this.is_init = true;
 					this.is_loading = false;
@@ -146,6 +147,8 @@ export const useLycheeStateStore = defineStore("lychee-store", {
 					this.photo_previous_next_size = data.photo_previous_next_size;
 
 					this.is_registration_enabled = data.is_registration_enabled;
+
+					this.default_homepage = data.default_homepage;
 				})
 				.catch((error) => {
 					// In this specific case, even though it has been possibly disabled, we really need to see the error.

resources/js/views/Home.vue

@@ -0,0 +1,20 @@
+<template>
+	<!-- Nothing to see here is is more of a redirection component -->
+</template>
+<script setup lang="ts">
+import { useLycheeStateStore } from "@/stores/LycheeState";
+import { useRouter } from "vue-router";
+
+const router = useRouter();
+const lycheeStore = useLycheeStateStore();
+lycheeStore.init().then(() => {
+	// Now that we loaded the stuff, we can redirect to the correct page
+	if (lycheeStore.default_homepage === "gallery") {
+		router.push({ name: "gallery" });
+		// Insert other pages here later (feed or others...)
+	} else {
+		// Default
+		router.push({ name: "gallery" });
+	}
+});
+</script>

resources/js/views/Landing.vue

@@ -15,7 +15,10 @@
 			<div id="menu" class="w-full animate-landingAnimateDown">
 				<ul class="menu list-none">
 					<li class="menu-item relative block float-right pt-6 pb-5 px-3">
-						<RouterLink to="/gallery" class="cursor-pointer block text-xs uppercase font-normal text-surface-0 hover:text-muted-color">
+						<RouterLink
+							:to="{ name: 'home' }"
+							class="cursor-pointer block text-xs uppercase font-normal text-surface-0 hover:text-muted-color"
+						>
 							{{ $t("landing.gallery") }}
 						</RouterLink>
 					</li>
@@ -62,7 +65,7 @@
 			</div>
 			<div class="flex w-full h-1/2 absolute top-1/3 md:top-1/2 left-0 items-center justify-center animate-landingEnterPopIn opacity-0">
 				<RouterLink
-					to="/gallery"
+					:to="{ name: 'home' }"
 					class="cursor-pointer block text-2xl uppercase text-surface-0 hover:scale-125 transition-all duration-300 p-10 filter-shadow text-center"
 				>
 					{{ $t("landing.access_gallery") }}<br class="md:hidden" />
@@ -88,7 +91,7 @@ const router = useRouter();
 
 InitService.fetchLandingData().then((data) => {
 	if (data.data.landing_page_enable === false) {
-		router.push("/gallery");
+		router.push({ name: "home" });
 	} else {
 		initdata.value = data.data;
 		setTimeout(() => (introVisible.value = false), 4000);