mirror of
https://github.com/xCyanGrizzly/DragonsStash.git
synced 2026-05-11 06:11:15 +00:00
Compare commits
7 Commits
copilot/fi
...
copilot/fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0c0c9c7f23 | ||
|
|
82d5fc1812 | ||
|
|
9120f0fb5d | ||
|
|
5d88f9beb3 | ||
|
|
3704708970 | ||
|
|
0c789eabd6 | ||
|
|
9a88914f11 |
@@ -21,21 +21,27 @@ export async function registerUser(input: unknown): Promise<ActionResult<{ id: s
|
|||||||
|
|
||||||
const hashedPassword = await bcrypt.hash(parsed.data.password, 10);
|
const hashedPassword = await bcrypt.hash(parsed.data.password, 10);
|
||||||
|
|
||||||
const user = await prisma.user.create({
|
// First user to register becomes ADMIN (self-hosted owner)
|
||||||
data: {
|
const user = await prisma.$transaction(async (tx) => {
|
||||||
name: parsed.data.name,
|
const userCount = await tx.user.count();
|
||||||
email: parsed.data.email,
|
const role = userCount === 0 ? "ADMIN" : "USER";
|
||||||
hashedPassword,
|
|
||||||
role: "USER",
|
return tx.user.create({
|
||||||
settings: {
|
data: {
|
||||||
create: {
|
name: parsed.data.name,
|
||||||
lowStockThreshold: 10,
|
email: parsed.data.email,
|
||||||
currency: "USD",
|
hashedPassword,
|
||||||
theme: "dark",
|
role,
|
||||||
units: "metric",
|
settings: {
|
||||||
|
create: {
|
||||||
|
lowStockThreshold: 10,
|
||||||
|
currency: "USD",
|
||||||
|
theme: "dark",
|
||||||
|
units: "metric",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
return { success: true, data: { id: user.id } };
|
return { success: true, data: { id: user.id } };
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { usePathname } from "next/navigation";
|
import { usePathname } from "next/navigation";
|
||||||
|
import { useSession } from "next-auth/react";
|
||||||
import {
|
import {
|
||||||
LayoutDashboard,
|
LayoutDashboard,
|
||||||
Cylinder,
|
Cylinder,
|
||||||
@@ -17,27 +18,17 @@ import {
|
|||||||
Flame,
|
Flame,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { APP_NAME } from "@/lib/constants";
|
import { APP_NAME, NAV_ITEMS } from "@/lib/constants";
|
||||||
import { SheetHeader, SheetTitle } from "@/components/ui/sheet";
|
import { SheetHeader, SheetTitle } from "@/components/ui/sheet";
|
||||||
|
|
||||||
const icons = { LayoutDashboard, Cylinder, Droplets, Paintbrush, Gem, FileBox, Send, ClipboardList, Building2, MapPin, Settings };
|
const icons = { LayoutDashboard, Cylinder, Droplets, Paintbrush, Gem, FileBox, Send, ClipboardList, Building2, MapPin, Settings };
|
||||||
|
|
||||||
const navItems = [
|
|
||||||
{ label: "Dashboard", href: "/dashboard", icon: "LayoutDashboard" as const },
|
|
||||||
{ label: "Filaments", href: "/filaments", icon: "Cylinder" as const },
|
|
||||||
{ label: "Resins", href: "/resins", icon: "Droplets" as const },
|
|
||||||
{ label: "Paints", href: "/paints", icon: "Paintbrush" as const },
|
|
||||||
{ label: "Supplies", href: "/supplies", icon: "Gem" as const },
|
|
||||||
{ label: "STL Files", href: "/stls", icon: "FileBox" as const },
|
|
||||||
{ label: "Telegram", href: "/telegram", icon: "Send" as const },
|
|
||||||
{ label: "Usage", href: "/usage", icon: "ClipboardList" as const },
|
|
||||||
{ label: "Vendors", href: "/vendors", icon: "Building2" as const },
|
|
||||||
{ label: "Locations", href: "/locations", icon: "MapPin" as const },
|
|
||||||
{ label: "Settings", href: "/settings", icon: "Settings" as const },
|
|
||||||
];
|
|
||||||
|
|
||||||
export function MobileSidebar() {
|
export function MobileSidebar() {
|
||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
|
const { data: session } = useSession();
|
||||||
|
const isAdmin = session?.user?.role === "ADMIN";
|
||||||
|
|
||||||
|
const visibleItems = NAV_ITEMS.filter((item) => !item.adminOnly || isAdmin);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-full flex-col">
|
<div className="flex h-full flex-col">
|
||||||
@@ -48,7 +39,7 @@ export function MobileSidebar() {
|
|||||||
</SheetTitle>
|
</SheetTitle>
|
||||||
</SheetHeader>
|
</SheetHeader>
|
||||||
<nav className="flex-1 space-y-1 p-2">
|
<nav className="flex-1 space-y-1 p-2">
|
||||||
{navItems.map((item) => {
|
{visibleItems.map((item) => {
|
||||||
const Icon = icons[item.icon];
|
const Icon = icons[item.icon];
|
||||||
const isActive = pathname.startsWith(item.href);
|
const isActive = pathname.startsWith(item.href);
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { usePathname } from "next/navigation";
|
import { usePathname } from "next/navigation";
|
||||||
|
import { useSession } from "next-auth/react";
|
||||||
import {
|
import {
|
||||||
LayoutDashboard,
|
LayoutDashboard,
|
||||||
Cylinder,
|
Cylinder,
|
||||||
@@ -20,7 +21,7 @@ import {
|
|||||||
PanelLeft,
|
PanelLeft,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { APP_NAME } from "@/lib/constants";
|
import { APP_NAME, NAV_ITEMS } from "@/lib/constants";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||||
|
|
||||||
@@ -38,23 +39,13 @@ const icons = {
|
|||||||
Settings,
|
Settings,
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
const navItems = [
|
|
||||||
{ label: "Dashboard", href: "/dashboard", icon: "LayoutDashboard" as const },
|
|
||||||
{ label: "Filaments", href: "/filaments", icon: "Cylinder" as const },
|
|
||||||
{ label: "Resins", href: "/resins", icon: "Droplets" as const },
|
|
||||||
{ label: "Paints", href: "/paints", icon: "Paintbrush" as const },
|
|
||||||
{ label: "Supplies", href: "/supplies", icon: "Gem" as const },
|
|
||||||
{ label: "STL Files", href: "/stls", icon: "FileBox" as const },
|
|
||||||
{ label: "Telegram", href: "/telegram", icon: "Send" as const },
|
|
||||||
{ label: "Usage", href: "/usage", icon: "ClipboardList" as const },
|
|
||||||
{ label: "Vendors", href: "/vendors", icon: "Building2" as const },
|
|
||||||
{ label: "Locations", href: "/locations", icon: "MapPin" as const },
|
|
||||||
{ label: "Settings", href: "/settings", icon: "Settings" as const },
|
|
||||||
];
|
|
||||||
|
|
||||||
export function Sidebar() {
|
export function Sidebar() {
|
||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
const [collapsed, setCollapsed] = useState(false);
|
const [collapsed, setCollapsed] = useState(false);
|
||||||
|
const { data: session } = useSession();
|
||||||
|
const isAdmin = session?.user?.role === "ADMIN";
|
||||||
|
|
||||||
|
const visibleItems = NAV_ITEMS.filter((item) => !item.adminOnly || isAdmin);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<aside
|
<aside
|
||||||
@@ -73,7 +64,7 @@ export function Sidebar() {
|
|||||||
|
|
||||||
{/* Navigation */}
|
{/* Navigation */}
|
||||||
<nav className="flex-1 space-y-1 p-2">
|
<nav className="flex-1 space-y-1 p-2">
|
||||||
{navItems.map((item) => {
|
{visibleItems.map((item) => {
|
||||||
const Icon = icons[item.icon];
|
const Icon = icons[item.icon];
|
||||||
const isActive = pathname.startsWith(item.href);
|
const isActive = pathname.startsWith(item.href);
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,12 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
|
|||||||
async jwt({ token, user }) {
|
async jwt({ token, user }) {
|
||||||
if (user) {
|
if (user) {
|
||||||
token.id = user.id!;
|
token.id = user.id!;
|
||||||
token.role = user.role ?? "USER";
|
// Fetch the role from the database to pick up first-user ADMIN promotion
|
||||||
|
const dbUser = await prisma.user.findUnique({
|
||||||
|
where: { id: user.id! },
|
||||||
|
select: { role: true },
|
||||||
|
});
|
||||||
|
token.role = dbUser?.role ?? user.role ?? "USER";
|
||||||
}
|
}
|
||||||
return token;
|
return token;
|
||||||
},
|
},
|
||||||
@@ -33,6 +38,18 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
|
|||||||
events: {
|
events: {
|
||||||
async createUser({ user }) {
|
async createUser({ user }) {
|
||||||
if (user.id) {
|
if (user.id) {
|
||||||
|
// First user to register becomes ADMIN (self-hosted owner)
|
||||||
|
const adminExists = await prisma.user.findFirst({
|
||||||
|
where: { role: "ADMIN" },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!adminExists) {
|
||||||
|
await prisma.user.update({
|
||||||
|
where: { id: user.id },
|
||||||
|
data: { role: "ADMIN" },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
await prisma.userSettings.upsert({
|
await prisma.userSettings.upsert({
|
||||||
where: { userId: user.id },
|
where: { userId: user.id },
|
||||||
update: {},
|
update: {},
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
export const APP_NAME = "Dragon's Stash";
|
export const APP_NAME = "Dragon's Stash";
|
||||||
|
|
||||||
export const NAV_ITEMS = [
|
export const NAV_ITEMS = [
|
||||||
{ label: "Dashboard", href: "/dashboard", icon: "LayoutDashboard" },
|
{ label: "Dashboard", href: "/dashboard", icon: "LayoutDashboard", adminOnly: false },
|
||||||
{ label: "Filaments", href: "/filaments", icon: "Cylinder" },
|
{ label: "Filaments", href: "/filaments", icon: "Cylinder", adminOnly: false },
|
||||||
{ label: "Resins", href: "/resins", icon: "Droplets" },
|
{ label: "Resins", href: "/resins", icon: "Droplets", adminOnly: false },
|
||||||
{ label: "Paints", href: "/paints", icon: "Paintbrush" },
|
{ label: "Paints", href: "/paints", icon: "Paintbrush", adminOnly: false },
|
||||||
{ label: "Supplies", href: "/supplies", icon: "Gem" },
|
{ label: "Supplies", href: "/supplies", icon: "Gem", adminOnly: false },
|
||||||
{ label: "STL Files", href: "/stls", icon: "FileBox" },
|
{ label: "STL Files", href: "/stls", icon: "FileBox", adminOnly: false },
|
||||||
{ label: "Telegram", href: "/telegram", icon: "Send" },
|
{ label: "Telegram", href: "/telegram", icon: "Send", adminOnly: true },
|
||||||
{ label: "Usage", href: "/usage", icon: "ClipboardList" },
|
{ label: "Usage", href: "/usage", icon: "ClipboardList", adminOnly: false },
|
||||||
{ label: "Vendors", href: "/vendors", icon: "Building2" },
|
{ label: "Vendors", href: "/vendors", icon: "Building2", adminOnly: false },
|
||||||
{ label: "Locations", href: "/locations", icon: "MapPin" },
|
{ label: "Locations", href: "/locations", icon: "MapPin", adminOnly: false },
|
||||||
{ label: "Settings", href: "/settings", icon: "Settings" },
|
{ label: "Settings", href: "/settings", icon: "Settings", adminOnly: false },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export const MATERIALS = [
|
export const MATERIALS = [
|
||||||
|
|||||||
Reference in New Issue
Block a user