Merge branch 'dev'

This commit is contained in:
ccbikai 2024-06-04 19:38:06 +08:00
commit 245a0ea997
3 changed files with 26 additions and 8 deletions

View file

@ -1,5 +1,5 @@
<script setup> <script setup>
import { Sun, Moon } from 'lucide-vue-next' import { Sun, Moon, Laptop } from 'lucide-vue-next'
const colorMode = useColorMode() const colorMode = useColorMode()
</script> </script>
@ -9,10 +9,10 @@ const colorMode = useColorMode()
<DropdownMenuTrigger as-child> <DropdownMenuTrigger as-child>
<Button variant="ghost"> <Button variant="ghost">
<Sun <Sun
class="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" class="absolute w-5 h-5 transition-all scale-100 dark:scale-0"
/> />
<Moon <Moon
class="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" class="w-5 h-5 transition-all scale-0 dark:scale-100"
/> />
<span class="sr-only">Toggle theme</span> <span class="sr-only">Toggle theme</span>
</Button> </Button>
@ -21,13 +21,25 @@ const colorMode = useColorMode()
align="end" align="end"
class="min-w-min" class="min-w-min"
> >
<DropdownMenuItem @click="colorMode.preference = 'light'"> <DropdownMenuItem
class="cursor-pointer"
@click="colorMode.preference = 'light'"
>
<Sun class="w-4 h-4 mr-1" />
Light Light
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem @click="colorMode.preference = 'dark'"> <DropdownMenuItem
class="cursor-pointer"
@click="colorMode.preference = 'dark'"
>
<Moon class="w-4 h-4 mr-1" />
Dark Dark
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem @click="colorMode.preference = 'system'"> <DropdownMenuItem
class="cursor-pointer"
@click="colorMode.preference = 'system'"
>
<Laptop class="w-4 h-4 mr-1" />
System System
</DropdownMenuItem> </DropdownMenuItem>
</DropdownMenuContent> </DropdownMenuContent>

View file

@ -22,7 +22,7 @@ async function getLinks() {
const { isLoading } = useInfiniteScroll( const { isLoading } = useInfiniteScroll(
document, document,
getLinks, getLinks,
{ distance: 10, interval: 1000, canLoadMore: () => !listComplete }, { distance: 150, interval: 1000, canLoadMore: () => !listComplete },
) )
function updateLinkList(link, type) { function updateLinkList(link, type) {
@ -59,5 +59,11 @@ function updateLinkList(link, type) {
> >
<Loader class="animate-spin" /> <Loader class="animate-spin" />
</div> </div>
<div
v-if="!isLoading && listComplete"
class="flex items-center justify-center text-sm"
>
No more
</div>
</main> </main>
</template> </template>

View file

@ -71,7 +71,7 @@ const showMenu = ref(false)
class="w-5 h-5 mr-1" class="w-5 h-5 mr-1"
/> />
GitHub</a> GitHub</a>
<span class="px-2 py-2"> <span class="ml-1">
<SwitchTheme /> <SwitchTheme />
</span> </span>
</div> </div>