Remove unused config options, fix buttons in gallery header (#3439)

Author: ildyria

app/Http/Resources/GalleryConfigs/RootConfig.php

@@ -27,7 +27,6 @@ class RootConfig extends Data
 	public AspectRatioCSSType $album_thumb_css_aspect_ratio;
 
 	// for now we keep it here. Maybe we should move it to a separate class
-	public string $login_button_position; // left/right
 	public bool $back_button_enabled;
 	public string $back_button_text;
 	public string $back_button_url;
@@ -46,7 +45,6 @@ public function __construct()
 
 		$this->album_thumb_css_aspect_ratio = Configs::getValueAsEnum('default_album_thumb_aspect_ratio', AspectRatioType::class)->css();
 		$this->show_keybinding_help_button = Configs::getValueAsBool('show_keybinding_help_button');
-		$this->login_button_position = Configs::getValueAsString('login_button_position');
 		$this->back_button_enabled = Configs::getValueAsBool('back_button_enabled');
 		$this->back_button_text = Configs::getValueAsString('back_button_text');
 		$this->back_button_url = Configs::getValueAsString('back_button_url');

database/migrations/2025_06_12_115312_remove_unused_config.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class() extends Migration {
+	public const CONFIG = 'config';
+	public const ENUM = 'left|right';
+
+	/**
+	 * Run the migrations.
+	 */
+	public function up(): void
+	{
+		DB::table('configs')->where('key', 'login_button_position')->delete();
+		DB::table('configs')->where('key', 'force_32bit_ids')->delete();
+	}
+
+	/**
+	 * Reverse the migrations.
+	 */
+	public function down(): void
+	{
+		DB::table('configs')->insert([
+			[
+				'key' => 'login_button_position',
+				'value' => 'left',
+				'cat' => self::CONFIG,
+				'type_range' => self::ENUM,
+				'description' => 'Position of the login button',
+				'order' => 32767,
+				'is_secret' => false,
+				'level' => 0,
+			],
+			[
+				'key' => 'force_32bit_ids',
+				'value' => '0',
+				'cat' => 'Admin',
+				'type_range' => 'bool',
+				'description' => 'Force 32 bit legacy identifiers in the database',
+				'order' => 5,
+				'is_secret' => false,
+				'level' => 0,
+			],
+		]);
+	}
+};

resources/js/components/headers/AlbumsHeader.vue

@@ -11,10 +11,10 @@
 		</template>
 
 		<template #center>
-			<span class="sm:hidden font-bold">
+			<span class="lg:hidden font-bold">
 				{{ $t("gallery.albums") }}
 			</span>
-			<span class="hidden sm:block font-bold text-sm lg:text-base text-center w-full" @click="is_metrics_open = !is_metrics_open">{{
+			<span class="hidden lg:block font-bold text-sm lg:text-base text-center w-full" @click="is_metrics_open = !is_metrics_open">{{
 				props.title
 			}}</span>
 		</template>
@@ -27,7 +27,7 @@
 					severity="secondary"
 					text
 					:class="{
-						'py-2 px-4 rounded-xl hidden md:block': true,
+						'py-2 px-4 rounded-xl hidden xl:block': true,
 						'dark:hover:text-surface-100': true,
 						'hover:text-surface-800': true,
 					}"
@@ -41,7 +41,7 @@
 					severity="secondary"
 					text
 					:class="{
-						'py-2 px-4 rounded-xl hidden md:block': true,
+						'py-2 px-4 rounded-xl mr-12 block lg:mr-0': true,
 						'dark:hover:text-surface-100 dark:border-surface-400 dark:hover:border-surface-100': true,
 						'hover:text-surface-800 border-surface-500 hover:border-surface-800': true,
 					}"
@@ -50,7 +50,7 @@
 				</Button>
 			</template>
 			<!-- Maybe logged in. -->
-			<div :class="menu.length > 1 ? 'hidden sm:block' : ''">
+			<div class="hidden lg:block">
 				<template v-for="item in menu">
 					<template v-if="item.type === 'link'">
 						<!-- @vue-ignore -->
@@ -61,13 +61,12 @@
 					</template>
 				</template>
 				<!-- Not logged in. -->
-				<BackLinkButton v-if="props.user.id === null && isLoginLeft" :config="props.config" />
+				<BackLinkButton v-if="props.user.id === null" :config="props.config" />
 			</div>
 			<SpeedDial
 				:model="menu"
-				v-if="menu.length > 1"
 				direction="down"
-				class="top-0 mr-4 absolute right-0 sm:hidden"
+				class="top-0 mr-4 absolute right-0 lg:hidden"
 				:buttonProps="{ severity: 'help', rounded: true }"
 			>
 				<template #button="{ toggleCallback }">
@@ -129,7 +128,6 @@ const props = defineProps<{
 		back_button_enabled: boolean;
 		back_button_text: string;
 		back_button_url: string;
-		login_button_position: string;
 	};
 	hasHidden: boolean;
 }>();
@@ -171,7 +169,6 @@ const { addmenu, addMenu } = useContextMenuAlbumsAdd(
 );
 
 const canUpload = computed(() => props.user.id !== null);
-const isLoginLeft = computed(() => props.config.login_button_position === "left");
 
 function openAddMenu(event: Event) {
 	addmenu.value.show(event);
@@ -242,7 +239,7 @@ const menu = computed(() =>
 			to: { name: "favourites" },
 			type: "link",
 			icon: "pi pi-heart",
-			if: is_favourite_enabled.value && (favourites.photos?.length ?? 0) > 0,
+			if: props.user.id !== null && is_favourite_enabled.value && (favourites.photos?.length ?? 0) > 0,
 			key: "favourites",
 		},
 		{
@@ -266,13 +263,6 @@ const menu = computed(() =>
 			if: is_se_preview_enabled.value && props.rights.can_see_live_metrics,
 			key: "se_preview",
 		},
-		{
-			icon: "pi pi-sign-in",
-			type: "fn",
-			callback: togglableStore.toggleLogin,
-			if: props.user.id === null && !isLoginLeft.value,
-			key: "login",
-		},
 		{
 			icon: "pi pi-question-circle",
 			type: "fn",

resources/js/lychee.d.ts

@@ -306,7 +306,6 @@ declare namespace App.Http.Resources.GalleryConfigs {
 		is_search_accessible: boolean;
 		show_keybinding_help_button: boolean;
 		album_thumb_css_aspect_ratio: App.Enum.AspectRatioType;
-		login_button_position: string;
 		back_button_enabled: boolean;
 		back_button_text: string;
 		back_button_url: string;

resources/js/views/RegisterPage.vue

@@ -16,6 +16,11 @@
 				{{ title }}
 			</h1>
 		</div>
+		<div class="w-full max-w-md px-9 text-right">
+			<router-link :to="{ name: 'login' }" class="hover:text-primary-emphasis">
+				{{ $t("left-menu.login") }} <i class="pi pi-angle-double-right ml-1" />
+			</router-link>
+		</div>
 		<Message v-if="errorMessage" severity="error" class="mb-4 text-center">{{ errorMessage }}</Message>
 		<form v-focustrap class="flex flex-col gap-4 relative max-w-md w-full text-sm rounded-md pt-9">
 			<div class="inline-flex flex-col gap-4 px-9">