mirror of
https://github.com/Drop-OSS/drop.git
synced 2025-11-10 04:22:09 +10:00
Merge branch 'develop' into auth-overhaul
This commit is contained in:
@ -39,7 +39,11 @@
|
||||
</NuxtLink>
|
||||
<div class="h-0.5 rounded-full w-full bg-zinc-800" />
|
||||
<div class="flex flex-col">
|
||||
<MenuItem v-for="(nav, navIdx) in navigation" v-slot="{ active, close }">
|
||||
<MenuItem
|
||||
v-for="(nav, navIdx) in navigation"
|
||||
v-slot="{ active, close }"
|
||||
hydrate-on-visible
|
||||
>
|
||||
<button
|
||||
:href="nav.route"
|
||||
@click="() => navigateTo(nav.route, close)"
|
||||
@ -48,8 +52,8 @@
|
||||
'text-left transition block px-4 py-2 text-sm',
|
||||
]"
|
||||
>
|
||||
{{ nav.label }}</button
|
||||
>
|
||||
{{ nav.label }}
|
||||
</button>
|
||||
</MenuItem>
|
||||
</div>
|
||||
</PanelWidget>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<div v-if="!noWrapper" class="flex flex-col w-full min-h-screen bg-zinc-900">
|
||||
<UserHeader class="z-50" />
|
||||
<UserHeader class="z-50" hydrate-on-idle />
|
||||
<div class="grow flex">
|
||||
<NuxtPage />
|
||||
</div>
|
||||
<UserFooter class="z-50" hydrate-on-visible />
|
||||
<UserFooter class="z-50" hydrate-on-interaction />
|
||||
</div>
|
||||
<div class="flex w-full min-h-screen bg-zinc-900" v-else>
|
||||
<NuxtPage />
|
||||
|
||||
@ -9,6 +9,10 @@ export default defineNuxtConfig({
|
||||
devtools: { enabled: false },
|
||||
css: ["~/assets/tailwindcss.css", "~/assets/core.scss"],
|
||||
|
||||
experimental: {
|
||||
buildCache: true,
|
||||
},
|
||||
|
||||
vite: {
|
||||
plugins: [tailwindcss()],
|
||||
},
|
||||
@ -19,7 +23,16 @@ export default defineNuxtConfig({
|
||||
},
|
||||
},
|
||||
|
||||
routeRules: {
|
||||
"/signin": { prerender: true },
|
||||
"/signout": { prerender: true },
|
||||
|
||||
"/api/**": { cors: true },
|
||||
},
|
||||
|
||||
nitro: {
|
||||
minify: true,
|
||||
|
||||
experimental: {
|
||||
websocket: true,
|
||||
tasks: true,
|
||||
@ -28,12 +41,26 @@ export default defineNuxtConfig({
|
||||
scheduledTasks: {
|
||||
"0 * * * *": ["cleanup:invitations"],
|
||||
},
|
||||
|
||||
compressPublicAssets: true,
|
||||
publicAssets: [
|
||||
{
|
||||
baseURL: "wallpapers",
|
||||
dir: "public/wallpapers",
|
||||
maxAge: 31536000, // 1 year
|
||||
},
|
||||
{
|
||||
baseURL: "fonts",
|
||||
dir: "public/fonts",
|
||||
maxAge: 31536000, // 1 year
|
||||
},
|
||||
],
|
||||
},
|
||||
|
||||
extends: ["./drop-base"],
|
||||
|
||||
// Module config from here down
|
||||
modules: ["vue3-carousel-nuxt", "nuxt-security", "@nuxt/image"],
|
||||
modules: ["vue3-carousel-nuxt", "nuxt-security", "@nuxt/image", "@nuxt/fonts"],
|
||||
|
||||
carousel: {
|
||||
prefix: "Vue",
|
||||
|
||||
12
package.json
12
package.json
@ -14,6 +14,7 @@
|
||||
"@drop/droplet": "^0.7.0",
|
||||
"@headlessui/vue": "^1.7.23",
|
||||
"@heroicons/vue": "^2.1.5",
|
||||
"@nuxt/fonts": "^0.11.0",
|
||||
"@nuxt/image": "1.9.0",
|
||||
"@nuxtjs/tailwindcss": "^6.12.2",
|
||||
"@prisma/client": "^6.1.0",
|
||||
@ -39,7 +40,7 @@
|
||||
"uuid": "^10.0.0",
|
||||
"vue": "latest",
|
||||
"vue-router": "latest",
|
||||
"vue3-carousel-nuxt": "^1.1.3",
|
||||
"vue3-carousel-nuxt": "^1.1.5",
|
||||
"vuedraggable": "^4.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
@ -50,7 +51,7 @@
|
||||
"@types/uuid": "^10.0.0",
|
||||
"autoprefixer": "^10.4.20",
|
||||
"h3": "^1.13.0",
|
||||
"nitropack": "^2.9.7",
|
||||
"nitropack": "2.11.6",
|
||||
"postcss": "^8.4.47",
|
||||
"sass": "^1.79.4",
|
||||
"tailwindcss": "^4.0.0"
|
||||
@ -61,5 +62,10 @@
|
||||
"@drop/droplet-linux-x64-gnu": "^0.7.0",
|
||||
"@drop/droplet-win32-x64-msvc": "^0.7.0"
|
||||
},
|
||||
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
|
||||
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
|
||||
"overrides": {
|
||||
"vue3-carousel-nuxt": {
|
||||
"vue3-carousel": "^0.15.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
</div>
|
||||
|
||||
<!-- recently updated -->
|
||||
<div class="px-4 sm:px-12 py-4">
|
||||
<div class="px-4 sm:px-12 py-4" hydrate-on-visible>
|
||||
<h1 class="text-zinc-100 text-2xl font-bold font-display">
|
||||
Recently updated
|
||||
</h1>
|
||||
|
||||
@ -1,15 +1,11 @@
|
||||
import { Platform } from "@prisma/client";
|
||||
|
||||
export function parsePlatform(platform: string) {
|
||||
switch (platform) {
|
||||
switch (platform.toLowerCase()) {
|
||||
case "linux":
|
||||
case "Linux":
|
||||
return Platform.Linux;
|
||||
case "windows":
|
||||
case "Windows":
|
||||
return Platform.Windows;
|
||||
case "macOS":
|
||||
case "MacOS":
|
||||
case "mac":
|
||||
case "macos":
|
||||
return Platform.macOS;
|
||||
|
||||
Reference in New Issue
Block a user