Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 6 #2504

Merged
merged 343 commits into from
Oct 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
343 commits
Select commit Hold shift + click to select a range
4314e47
more
ildyria Aug 24, 2024
a090f08
import link
ildyria Aug 24, 2024
9acbb19
phpstan complaints
ildyria Aug 24, 2024
358dd8c
more progress on editing photo + download modal
ildyria Aug 24, 2024
2431018
progress
ildyria Aug 25, 2024
d6f8e2f
editing photo should now be done
ildyria Aug 27, 2024
8530788
fix edit + misc
ildyria Aug 28, 2024
15846d4
WIP move photo
ildyria Aug 28, 2024
28bc37a
more WIP on delete photo
ildyria Aug 28, 2024
aadfa65
progress
ildyria Aug 29, 2024
3d81275
more work
ildyria Aug 31, 2024
f8281aa
fix tests
ildyria Aug 31, 2024
2414efa
more help
ildyria Aug 31, 2024
d8c5461
overlay on picture
ildyria Aug 31, 2024
44946fc
updates
ildyria Sep 8, 2024
d46095f
remove legacy in CICD
ildyria Sep 14, 2024
48f675d
fixes
ildyria Sep 14, 2024
c7b5e29
more
ildyria Sep 14, 2024
6009548
improved settings
ildyria Sep 14, 2024
2bdc4fd
fix dark mode selector
ildyria Sep 14, 2024
a3acda8
formatting
ildyria Sep 14, 2024
69b4050
improved settings
ildyria Sep 14, 2024
f77ff15
more stuff
ildyria Sep 14, 2024
cc36526
add helper to delete legacy stuff
ildyria Sep 14, 2024
b0aa632
more deleting
ildyria Sep 14, 2024
8c772eb
more deleting
ildyria Sep 14, 2024
7cc2068
fix legacy dependency
ildyria Sep 14, 2024
a056905
simplify
ildyria Sep 14, 2024
784c1f1
create types
ildyria Sep 14, 2024
3990ad5
more fixes
ildyria Sep 14, 2024
2e0ebd7
fix phpstan on no-legacy
ildyria Sep 14, 2024
b954fe8
more fixes
ildyria Sep 14, 2024
7411df7
import fixes
ildyria Sep 14, 2024
2469772
fixes
ildyria Sep 14, 2024
7579ef0
fix snq complaints
ildyria Sep 14, 2024
ba05aa0
fixes errors
ildyria Sep 14, 2024
2d50584
fix v6
ildyria Sep 14, 2024
87c55f9
photo add
ildyria Sep 14, 2024
e988da2
more coverage
ildyria Sep 14, 2024
d7728b0
wrap in exception
ildyria Sep 14, 2024
277fa7a
fix tests
ildyria Sep 14, 2024
500b5d1
tests
ildyria Sep 15, 2024
2f15082
more coverage
ildyria Sep 15, 2024
29ce79b
npm update
ildyria Sep 15, 2024
97feca5
fix phpstan
ildyria Sep 15, 2024
ae634f0
refactoring for composables
ildyria Sep 15, 2024
6c6244e
work on menus
ildyria Sep 15, 2024
57b1507
formatting
ildyria Sep 15, 2024
8e1bce9
button refactoring
ildyria Sep 16, 2024
687b4c5
uniform style
ildyria Sep 16, 2024
017418b
formatting
ildyria Sep 16, 2024
61acfdb
add setters for headers and cover
ildyria Sep 17, 2024
6399d65
Fix + set cover & headeR
ildyria Sep 17, 2024
49445c4
refactoring
ildyria Sep 17, 2024
cb9030a
refactoring
ildyria Sep 17, 2024
b2dfa08
cleaning
ildyria Sep 17, 2024
f19f8e7
WIP on context menus
ildyria Sep 18, 2024
5781602
context menus on both
ildyria Sep 18, 2024
151b638
move should be working for both photo and albums
ildyria Sep 18, 2024
d46828f
cosmetic fixes
ildyria Sep 19, 2024
ed23df2
remove comment
ildyria Sep 19, 2024
aea09a2
more tailwind
ildyria Sep 19, 2024
ee38e61
merge dialog for albums
ildyria Sep 19, 2024
dc41f3e
icons + more dialogs stuff
ildyria Sep 22, 2024
c07697d
fix tests
ildyria Sep 22, 2024
96550f2
more JS stuff
ildyria Sep 22, 2024
24963d3
renaming works
ildyria Sep 22, 2024
574a1e7
formatting
ildyria Sep 22, 2024
207fb02
fix tests
ildyria Sep 22, 2024
36b77e2
add tags endpoint
ildyria Sep 22, 2024
e6b73f7
tags modals
ildyria Sep 22, 2024
1ab3f7c
full screen support
ildyria Sep 22, 2024
380762c
fix broken image
ildyria Sep 22, 2024
a8a9ea8
fix phpstan
ildyria Sep 22, 2024
fff1a08
WebAuthnWorking
ildyria Sep 23, 2024
1febb26
formatting
ildyria Sep 23, 2024
2624cd4
fix left menu and about modal
ildyria Sep 23, 2024
6bff02a
fix tests
ildyria Sep 23, 2024
1610d95
fix webauthn phpstan
ildyria Sep 23, 2024
6d9cd9a
support of Oauth
ildyria Sep 24, 2024
0684d1b
Formatting
ildyria Sep 24, 2024
d206b13
use fingerprint instead of key for webauthn
ildyria Sep 24, 2024
b570989
sharing page is done
ildyria Sep 24, 2024
3f66f83
add frame mod
ildyria Sep 24, 2024
fb79546
add map support (no link yet)
ildyria Sep 25, 2024
f344807
cosmetic fixes
ildyria Sep 25, 2024
f870764
fix tests
ildyria Sep 25, 2024
cafd9d5
add search endpoint
ildyria Sep 26, 2024
74d7f1e
WIP on search
ildyria Sep 26, 2024
ca024f3
use global state instead
ildyria Sep 26, 2024
c67b266
composer update
ildyria Sep 27, 2024
5448366
fix
ildyria Sep 27, 2024
e562e1a
add buttons in headers
ildyria Sep 27, 2024
8709fb4
more fixes
ildyria Sep 27, 2024
802472b
fix justify (finally)
ildyria Sep 27, 2024
f4a6712
bye livewire
ildyria Sep 27, 2024
7bb664b
fix phpstan
ildyria Sep 27, 2024
a82746e
no longer needed
ildyria Sep 27, 2024
26b5c15
fix tests
ildyria Sep 27, 2024
cf02ba9
fix phpstan
ildyria Sep 27, 2024
41176ee
less useless files
ildyria Sep 27, 2024
449b826
less noise
ildyria Sep 27, 2024
92dfcd2
fix install
ildyria Sep 27, 2024
bd97620
more work on basic settings page
ildyria Sep 27, 2024
d9948d0
wip
ildyria Sep 27, 2024
a8029bd
also have markdown on description of albums... duh
ildyria Sep 27, 2024
9c8513e
try to make settings better on phone
ildyria Sep 28, 2024
625d215
fix FixTree
ildyria Sep 28, 2024
89f0063
improve coverage
ildyria Sep 28, 2024
83a74cb
improve coverage
ildyria Sep 28, 2024
f2d222e
temporarily disable mariadb & pgsql & php 8.2 on tests
ildyria Sep 28, 2024
3129ecc
more tests
ildyria Sep 28, 2024
a0a5f6a
add Oauth tests
ildyria Sep 28, 2024
d7b4559
fix src
ildyria Sep 28, 2024
e9627cd
add more tests
ildyria Sep 28, 2024
c9be771
pagination in search (up to 1000 results)
ildyria Sep 28, 2024
7a13da7
more work on menus: conditionnal display is on (can probably be optim…
ildyria Sep 28, 2024
d794ec7
remove dead code
ildyria Sep 28, 2024
86c8cb9
just some stupid coverage
ildyria Sep 28, 2024
2667259
more menu work
ildyria Sep 28, 2024
f1b4122
more work
ildyria Sep 29, 2024
756f9a2
formatting
ildyria Sep 29, 2024
c18516f
progress
ildyria Sep 29, 2024
74e6978
fix icon when locked
ildyria Sep 29, 2024
8ec5658
add more failsafe
ildyria Sep 29, 2024
5d6d618
fix naming
ildyria Sep 29, 2024
1e8a214
fix tests
ildyria Sep 29, 2024
fca119a
fancier
ildyria Sep 29, 2024
ae73b1c
hide warning
ildyria Sep 29, 2024
569f982
progress
ildyria Sep 29, 2024
a4a5822
unlock completed
ildyria Sep 29, 2024
6d2fdfe
fix some setting
ildyria Sep 29, 2024
f516f67
formatting
ildyria Sep 29, 2024
6b244d0
make css better?
ildyria Sep 30, 2024
dfefb62
add local tmp folder to file system
ildyria Sep 30, 2024
2237e6d
fix tests
ildyria Sep 30, 2024
ac186a2
improved header on first gallery page
ildyria Sep 30, 2024
966c3f1
add endpoint to set and delete track
ildyria Oct 2, 2024
e7cb73b
add service function
ildyria Oct 2, 2024
1548e71
handle access of password locked albums when logged in
ildyria Oct 2, 2024
2ab6e6e
support tracks
ildyria Oct 2, 2024
16d2e2d
support upload from dropbox
ildyria Oct 4, 2024
f3ce5e7
fix setting for smart album
ildyria Oct 5, 2024
beab4d7
fix Unsorted Album being empty when public. Note that nobody owns pic…
ildyria Oct 5, 2024
a628778
misc
ildyria Oct 5, 2024
2fa598d
fix set-header + add compact header support
ildyria Oct 5, 2024
2e66b1c
updates
ildyria Oct 5, 2024
6e08a36
fix settings tags
ildyria Oct 5, 2024
65fd96e
fix photo can be null
ildyria Oct 5, 2024
f186bc8
fix tests
ildyria Oct 5, 2024
c2cbf98
fix cache issue
ildyria Oct 5, 2024
1717026
new syntax for emits + slideshow @hhanzo1
ildyria Oct 5, 2024
e4a9b56
add meta data
ildyria Oct 5, 2024
1eec8d0
fix phpstan complaints
ildyria Oct 5, 2024
2763072
allow users to customize their css & js
ildyria Oct 5, 2024
d898619
formatting
ildyria Oct 5, 2024
c402b40
fix tests
ildyria Oct 5, 2024
ed2b0e6
fix filesize breaking
ildyria Oct 5, 2024
0399669
allow to set dropbox key
ildyria Oct 5, 2024
9c0a209
fix migration
ildyria Oct 5, 2024
2b8c558
add Coming soon
ildyria Oct 5, 2024
8bdbde2
avoid flash
ildyria Oct 5, 2024
ba9fa66
fix check
ildyria Oct 5, 2024
781d5bf
improve keybindings
ildyria Oct 5, 2024
72860ca
bump to version 6
ildyria Oct 5, 2024
20d3ffd
bump to version 6 renamed
ildyria Oct 5, 2024
8c76db4
fix bug where updating settings would remove the header image
ildyria Oct 7, 2024
3dddf90
add menu to register
ildyria Oct 7, 2024
c07f247
WIP on statistics
ildyria Oct 7, 2024
53ba59e
WIP
ildyria Oct 8, 2024
1fb66fe
fix the CTRL key of mac + work on stats
ildyria Oct 8, 2024
169205e
formatting
ildyria Oct 8, 2024
ec89cd6
Add statistics page
ildyria Oct 9, 2024
361d310
formatting
ildyria Oct 9, 2024
ab2d193
improve visual feedback when uploading multiple files
ildyria Oct 9, 2024
2b21b75
add CTRL + A back + support of Apple Cmd + A
ildyria Oct 9, 2024
e2e614d
fix check
ildyria Oct 9, 2024
8db0dce
keep original option + some fixes for Tino already
ildyria Oct 9, 2024
a01d84a
fix phpstan
ildyria Oct 9, 2024
ee0c478
more parts
ildyria Oct 9, 2024
67f5e7c
fix statistic page being a bit optimistic in the number of pictures
ildyria Oct 10, 2024
d7c5628
add progress bar (and more less visual update lag) to upload modal
ildyria Oct 10, 2024
092fb22
Dropbox collapsed by default
ildyria Oct 10, 2024
ef64113
more fixes
ildyria Oct 10, 2024
3c21a28
more front-end fixes
ildyria Oct 10, 2024
9f7b8ab
Add wheel event on photo page to switch to next/previous
ildyria Oct 10, 2024
a6e1d6f
more coverage
ildyria Oct 10, 2024
8a8ac75
add group by on username for pgsql ?
ildyria Oct 10, 2024
8f1ddc3
fix oversight in install + pgsql once for all
ildyria Oct 10, 2024
1846088
more coverage
ildyria Oct 10, 2024
029a75b
swipe integrated in photo view: left previous, right next
ildyria Oct 10, 2024
5291a6a
fix the constant loading + improved token UX
ildyria Oct 10, 2024
942986e
formatting
ildyria Oct 10, 2024
1c541fd
git ignore stuff
ildyria Oct 10, 2024
fb34c2d
more keybindings + checks
ildyria Oct 10, 2024
4ebdf8a
styling on editing photo page
ildyria Oct 10, 2024
62b56a7
make Statistics also available to users
ildyria Oct 11, 2024
398d1c6
fix map on info bar feedback
ildyria Oct 11, 2024
6b2456c
fix upload not reloading album
ildyria Oct 11, 2024
aa64164
dead code?
ildyria Oct 11, 2024
838dcd8
improve coverage
ildyria Oct 11, 2024
d3071dd
improve coverage
ildyria Oct 11, 2024
0f090fa
improve UI for creating user
ildyria Oct 11, 2024
50a02f5
Improve UI on users page, missing editing functionalities though...
ildyria Oct 13, 2024
5bb7306
fix user + add meter bar to see the space used per user
ildyria Oct 13, 2024
2d23cbd
fix button
ildyria Oct 13, 2024
a36c063
Fix tests
ildyria Oct 13, 2024
089f8eb
fix?
ildyria Oct 13, 2024
ad04988
updates
ildyria Oct 13, 2024
3cd58f1
move things that are legacy
ildyria Oct 13, 2024
d9c2281
improve coverage
ildyria Oct 14, 2024
067358e
fix sidebar photo in light mode
ildyria Oct 14, 2024
811be2e
fix icons not showing (hopefully) + fix toggle between dark and light…
ildyria Oct 14, 2024
c25af86
disable scroll to view on upload
ildyria Oct 14, 2024
3b01b84
fix Info as Git + refresh once upload is complete
ildyria Oct 14, 2024
5ac766a
Improved search
ildyria Oct 14, 2024
2326c00
fix counts in stats
ildyria Oct 14, 2024
e340d14
formatting
ildyria Oct 14, 2024
7ab0175
add api/v2/Photo::random endpoint for @haivala
ildyria Oct 14, 2024
d38ac55
fix phpstan
ildyria Oct 14, 2024
65ce9b7
fix tests
ildyria Oct 14, 2024
db93e22
more fixes
ildyria Oct 14, 2024
8304178
should work when user is also not logged in.
ildyria Oct 14, 2024
e5dd868
add missing arguments
ildyria Oct 14, 2024
1bb0b73
button when album is empty
ildyria Oct 14, 2024
0decc1c
only show if user has upload rights...
ildyria Oct 14, 2024
36d96e6
rename config
ildyria Oct 14, 2024
6b4a2e1
fixing case where no albums where available for copy/merge/move...
ildyria Oct 14, 2024
df291de
fix tests ?
ildyria Oct 14, 2024
79fdf55
fix image rotation
ildyria Oct 14, 2024
54155f0
fix drag & drop & paste
ildyria Oct 15, 2024
d44b085
fix no errors on Users
ildyria Oct 15, 2024
095f68f
formatting
ildyria Oct 15, 2024
d100322
Add new rule
ildyria Oct 15, 2024
0880e95
more work on quota
ildyria Oct 15, 2024
b18918b
quota & admin notes
ildyria Oct 15, 2024
3100929
fix prose on light mode
ildyria Oct 15, 2024
91a3de2
fix tests
ildyria Oct 15, 2024
254a22c
improve coverage
ildyria Oct 15, 2024
6de2d0b
hotfix
ildyria Oct 15, 2024
fc5486d
Lychee SE in easy settings
ildyria Oct 16, 2024
eabce4f
fix warning?
ildyria Oct 16, 2024
2c6bf0d
format
ildyria Oct 16, 2024
a293683
revert package-lock.json
ildyria Oct 16, 2024
223dcc9
Update app/Enum/DateOrderingType.php
ildyria Oct 24, 2024
31a24a0
Update database/migrations/2024_07_29_172018_fix_settings.php
ildyria Oct 24, 2024
e879864
Update resources/js/views/gallery-panels/Map.vue
ildyria Oct 24, 2024
47ee596
took care of all the commit suggestion
ildyria Oct 24, 2024
a47bcc9
fix button dock
ildyria Oct 24, 2024
cbac39b
Stacked 1 : Fix admin being visible in left menu while empty (#2563)
ildyria Oct 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
improved settings
ildyria committed Oct 16, 2024
commit 6009548a2233dd62161a2ca95149b70cf4236697
31 changes: 0 additions & 31 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
@@ -11,10 +11,6 @@
use App\Factories\AlbumFactory;
use App\Image\SizeVariantDefaultFactory;
use App\Image\StreamStatFilter;
use App\Livewire\Synth\AlbumFlagsSynth;
use App\Livewire\Synth\AlbumSynth;
use App\Livewire\Synth\PhotoSynth;
use App\Livewire\Synth\SessionFlagsSynth;
use App\Metadata\Json\CommitsRequest;
use App\Metadata\Json\UpdateRequest;
use App\Metadata\Versions\FileVersion;
@@ -34,11 +30,9 @@
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\URL;
use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Str;
use Livewire\Livewire;
use Opcodes\LogViewer\Facades\LogViewer;
use Safe\Exceptions\StreamException;
use function Safe\stream_filter_register;
@@ -86,15 +80,6 @@ class AppServiceProvider extends ServiceProvider
GitTags::class => GitTags::class,
];

/** @var array<int,class-string> */
private array $livewireSynth =
[
AlbumSynth::class,
PhotoSynth::class,
SessionFlagsSynth::class,
AlbumFlagsSynth::class,
];

/**
* Bootstrap any application services.
*
@@ -167,22 +152,6 @@ public function boot()
// return true to allow viewing the Log Viewer.
return Auth::authenticate() !== null && Gate::check(SettingsPolicy::CAN_SEE_LOGS, Configs::class);
});

foreach ($this->livewireSynth as $synth) {
Livewire::propertySynthesizer($synth);
}

$dir_url = config('app.dir_url') === '' ? '' : (config('app.dir_url') . '/');

Livewire::setScriptRoute(function ($handle) use ($dir_url) {
return config('app.debug') === true
? Route::get($dir_url . 'livewire/livewire.js', $handle)
: Route::get($dir_url . 'livewire/livewire.min.js', $handle);
});

Livewire::setUpdateRoute(function ($handle) use ($dir_url) {
return Route::post($dir_url . 'livewire/update', $handle)->middleware('web-livewire');
});
}

/**
2 changes: 1 addition & 1 deletion resources/js/app.ts
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ app.use(PrimeVue, {
name: "primevue",
order: "tailwind-base, primevue, tailwind-utilities",
},
darkModeSelector: ".lychee-dark",
darkModeSelector: ".dark",
},
},
});
10 changes: 6 additions & 4 deletions resources/js/components/forms/settings/BoolField.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<template>
<div class="flex gap-4">
<!-- <IconField> -->
<ToggleSwitch v-model="val" @update:modelValue="update" :input-id="props.config.key" class="text-sm translate-y-1"></ToggleSwitch>
<div class="flex gap-4 justify-between">
<!-- </IconField> -->
<label :for="props.config.key">{{ props.config.documentation }}</label>
<ResetField v-if="changed" @click="reset" />
<!-- <IconField> -->
<span class="flex gap-4">
<ResetField v-if="changed" @click="reset" />
<ToggleSwitch v-model="val" @update:modelValue="update" :input-id="props.config.key" class="text-sm translate-y-1"></ToggleSwitch>
</span>
</div>
</template>
<script setup lang="ts">
31 changes: 17 additions & 14 deletions resources/js/components/forms/settings/NumberField.vue
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
<template>
<div class="flex items-center gap-4">
<InputNumber
v-model="val"
:inputId="props.config.key"
:min="props.min"
:max="props?.max ?? undefined"
showButtons
mode="decimal"
:useGrouping="false"
fluid
class="w-28"
@update:modelValue="update"
/>
<div class="flex items-center gap-4 justify-between">
<div>{{ props.config.documentation }}</div>
<ResetField v-if="changed" @click="reset" />
<div class="flex gap-4 items-center">
<ResetField v-if="changed" @click="reset" />
<InputNumber
v-model="val"
:inputId="props.config.key"
:min="props.min"
:max="props?.max ?? undefined"
showButtons
mode="decimal"
:useGrouping="false"
inputClass="text-right pr-10"
fluid
class="w-28"
@update:modelValue="update"
/>
</div>
</div>
</template>
<script setup lang="ts">
13 changes: 6 additions & 7 deletions resources/js/components/forms/settings/SelectField.vue
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<template>
<div class="py-1">
<FloatLabel class="w-full flex-grow">
<Select :id="props.config.key" class="w-96 border-none" v-model="val" :options="options" showClear @update:modelValue="update" />
<label :for="props.config.key">{{ props.config.documentation }}</label>
</FloatLabel>
<ResetField v-if="changed" @click="reset" />
<div class="py-1 flex gap-4 items-center justify-between">
<label :for="props.config.key" class="w-full">{{ props.config.documentation }}</label>
<div class="flex gap-4 items-center">
<ResetField v-if="changed" @click="reset" />
<Select :id="props.config.key" class="border-none" v-model="val" :options="options" showClear @update:modelValue="update" />
</div>
</div>
</template>

<script setup lang="ts" generic="T extends string">
import { computed, ref, watch } from "vue";
import Select from "primevue/select";
import FloatLabel from "primevue/floatlabel";
import ResetField from "@/components/forms/settings/ResetField.vue";

type Props = {
13 changes: 6 additions & 7 deletions resources/js/components/forms/settings/SelectLang.vue
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<template>
<div class="py-1">
<FloatLabel class="w-full flex-grow">
<Select :id="props.config.key" class="w-96 border-none" v-model="val" :options="options" showClear @update:modelValue="update" />
<label :for="props.config.key">{{ props.config.documentation }}</label>
</FloatLabel>
<ResetField v-if="changed" @click="reset" />
<div class="py-1 flex gap-4 justify-between items-center">
<label class="w-full" :for="props.config.key">{{ props.config.documentation }}</label>
<div class="flex gap-4 items-center">
<ResetField v-if="changed" @click="reset" />
<Select :id="props.config.key" class="border-none" v-model="val" :options="options" @update:modelValue="update" />
</div>
</div>
</template>

<script setup lang="ts" generic="T extends string">
import { computed, ref, watch } from "vue";
import Select from "primevue/select";
import FloatLabel from "primevue/floatlabel";
import ResetField from "@/components/forms/settings/ResetField.vue";
import SettingsService from "@/services/settings-service";

20 changes: 6 additions & 14 deletions resources/js/components/forms/settings/SelectOptionsField.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
<template>
<div class="py-1 flex">
<FloatLabel class="w-full flex-grow">
<Select
:id="props.config.key"
class="w-96 border-none"
v-model="val"
optionLabel="label"
:options="props.options"
showClear
@update:modelValue="update"
>
<div class="py-1 flex justify-between items-center gap-4">
<label class="w-full" :for="props.config.key">{{ props.config.documentation }}</label>
<div class="flex gap-4 items-center">
<ResetField v-if="changed" @click="reset" />
<Select :id="props.config.key" class="border-none" v-model="val" optionLabel="label" :options="props.options" @update:modelValue="update">
<template #value="slotProps">
<div v-if="slotProps.value" class="flex items-center">
<div>{{ $t(slotProps.value.label) }}</div>
@@ -21,9 +15,7 @@
</div>
</template>
</Select>
<label :for="props.config.key">{{ props.config.documentation }}</label>
</FloatLabel>
<ResetField v-if="changed" @click="reset" />
</div>
</div>
</template>

4 changes: 2 additions & 2 deletions resources/js/components/forms/settings/SliderField.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="flex items-center gap-4">
<SelectButton class="border-none" v-model="val" :options="options" aria-labelledby="basic" @update:modelValue="update" />
<div class="flex items-center justify-between gap-4">
<div>{{ props.config.documentation }}</div>
<SelectButton class="border-none" v-model="val" :options="options" aria-labelledby="basic" @update:modelValue="update" />
</div>
</template>

4 changes: 2 additions & 2 deletions resources/js/components/forms/settings/StringField.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<div class="py-1">
<div class="py-1 flex items-center justify-between gap-4">
<label class="w-full" :for="props.config.key">{{ props.config.documentation }}</label>
<FloatLabel class="w-full flex-grow">
<IconField>
<InputText :id="props.config.key" type="text" class="!py-1" v-model="val" @update:modelValue="update" />
@@ -10,7 +11,6 @@
v-tooltip="'Click me to reset!'"
/>
</IconField>
<label :for="props.config.key">{{ props.config.documentation }}</label>
</FloatLabel>
</div>
</template>
2 changes: 1 addition & 1 deletion resources/js/components/forms/settings/VersionField.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="flex">
<div class="flex justify-between gap-4">
<span class="mr-4">{{ props.config.documentation }}:</span>
<Inplace style="--p-inplace-padding: 0">
<template #display>{{ computedVersion }}</template>
2 changes: 1 addition & 1 deletion resources/js/components/forms/settings/ZipSliderField.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="flex items-center flex-wrap my-4">
<div class="flex items-center flex-wrap my-4 gap-4">
<SelectButton
id="albumSortingColumn"
class="border-none"
4 changes: 2 additions & 2 deletions resources/js/components/settings/AllSettings.vue
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
<ToggleSwitch v-model="oldStyle" class="text-sm translate-y-1" input-id="oldStyleToggle"></ToggleSwitch>
<label for="oldStyleToggle" class="text-muted-color">Old settings style</label>
</div>
<div v-if="modified.length" class="flex h-11">
<div v-if="modified.length" class="sticky z-30 w-full top-0 flex bg-white dark:bg-surface-800 h-11">
<Message severity="warn" class="w-full" v-if="modified.length">Some settings changed.</Message>
<Button @click="save" class="bg-danger-800 border-none text-white font-bold px-8 hover:bg-danger-700">Save</Button>
</div>
<div class="flex relative items-start flex-row-reverse justify-between">
<Menu :model="sections" class="sticky top-0 border-none" id="navMain">
<Menu :model="sections" class="sticky top-11 border-none" id="navMain">
<template #item="{ item, props }">
<a
:href="item.link"
2 changes: 1 addition & 1 deletion resources/js/views/App.vue
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ import Error from "@/views/Error.vue";
body {
background-color: var(--p-surface-0);

&.lychee-dark {
&.dark {
background-color: var(--p-surface-900);
}
}
2 changes: 1 addition & 1 deletion resources/js/views/Settings.vue
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
<Tab value="0">Basic</Tab>
<Tab value="1">{{ $t("lychee.MORE") }}</Tab>
</TabList>
<TabPanels>
<TabPanels :pt:root:class="'px-0'">
<TabPanel value="0">
<EasySettings />
</TabPanel>
6 changes: 3 additions & 3 deletions resources/sass/app.scss
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@

// @layer base {

body {
background-color: var(--p-panel-background);
}
// body {
// // background-color: var(--p-panel-background);
// }

// @layer base {
:root {
2 changes: 1 addition & 1 deletion resources/views/vueapp.blade.php
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
{!! "<script>window.assets_url = '" . URL::asset('') . "'; console.log('" . URL::asset('') . "')</script>" !!}
</head>
@if((Configs::get()['dark_mode_enabled'] ?? '1') == '1')
<body class="antialiased lychee-dark">
<body class="antialiased dark">
@else
<body class="antialiased">
@endif