updated share page ui and table types
This commit is contained in:
@ -1,7 +1,8 @@
|
|||||||
import { getAuth } from "@/auth/queries/getauth";
|
import { getAuth } from "@/auth/queries/getauth";
|
||||||
import { generatePlaylogId, getSongsWithTitles } from "@/lib/api";
|
import { generatePlaylogId, getSongsWithTitles } from "@/lib/api";
|
||||||
import { shareScore } from "../token";
|
import { shareScore } from "../token";
|
||||||
import { getDifficultyClass, getDifficultyText } from "@/lib/helpers";
|
import { getDifficultyClass, getDifficultyText, getGrade } from "@/lib/helpers";
|
||||||
|
import { type chuni_score_playlog } from "@/prisma/schemas/artemis/generated/artemis";
|
||||||
|
|
||||||
export default async function Share({
|
export default async function Share({
|
||||||
params,
|
params,
|
||||||
@ -30,32 +31,81 @@ export default async function Share({
|
|||||||
const playlogIds = await generatePlaylogId(playlogId);
|
const playlogIds = await generatePlaylogId(playlogId);
|
||||||
|
|
||||||
// Filter songsData to match the playlogIds
|
// Filter songsData to match the playlogIds
|
||||||
const matchedSongs = songsData.filter((song) => playlogIds.includes(song.id));
|
const matchedSongs: chuni_score_playlog[] = songsData.filter((song) =>
|
||||||
|
playlogIds.includes(song.id)
|
||||||
|
);
|
||||||
return (
|
return (
|
||||||
<div className=" h-screen grid w-full gap-4 bg-red-200 grid-cols-8 grid-rows-9 rounded-lg shadow-md">
|
<div className="h-screen grid w-full gap-4 bg-red-200 grid-cols-8 grid-rows-9 rounded-lg shadow-md">
|
||||||
<div className="col-span-2 row-span-1 row-start-2 col-start-2 bg-pink-200 rounded-lg shadow-md flex items-center justify-center">
|
<div className="col-span-2 row-span-1 row-start-2 col-start-2 bg-white rounded-lg shadow-md flex items-center justify-center">
|
||||||
{matchedSongs.map((song) => (
|
{matchedSongs.map((song) => (
|
||||||
<div key={song.id} className=" flex justify-center items-center">
|
<div
|
||||||
<div className="text-white text-lg">
|
key={song.id}
|
||||||
<p>Score: {song.score}</p>
|
className="flex justify-center items-center w-full"
|
||||||
|
>
|
||||||
|
<div className=" w-full p-4">
|
||||||
|
<div className="bg-[#FE176E] rounded-xl w-full text-center uppercase font-medium ">
|
||||||
|
<span className=" text-white font-bold text-xl ">
|
||||||
|
{song.isNewRecord && "NEW RECORD!!"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<p className="text-center p-5 font-bold text-4xl">
|
||||||
|
{" "}
|
||||||
|
{song.score?.toLocaleString()}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-span-4 row-span-4 row-start-2 bg-lime-200 rounded-lg shadow-md flex items-center justify-center">
|
<div className="col-span-4 row-span-4 row-start-2 bg-white rounded-lg shadow-md flex flex-col justify-start items-center p-4">
|
||||||
<p>Broccoli</p>
|
{matchedSongs.map((song) => (
|
||||||
|
<div key={song.id} className="w-full">
|
||||||
|
<div className="bg-[#FE176E] rounded-xl w-full text-center uppercase font-medium">
|
||||||
|
<span className="text-white font-bold text-xl">
|
||||||
|
{song.isNewRecord && "NEW!!"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className=" flex items-center justify-center">
|
||||||
|
<span className=" text-black text-center p-5 font-bold text-8xl">
|
||||||
|
{getGrade(song.score ?? 0)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-span-2 col-start-2 row-span-3 row-start-3 bg-yellow-200 rounded-lg shadow-md flex items-center justify-center">
|
<div className="col-span-1 col-start-3 row-span-1 row-start-3 bg-white rounded-lg shadow-md flex items-center justify-center">
|
||||||
<p>Tamago</p>
|
{matchedSongs.map((song) => (
|
||||||
|
<div key={song.id} className="w-full">
|
||||||
|
<div className=" flex flex-col items-center justify-center">
|
||||||
|
<span className=" text-black text-center p-5 font-bold text-xl">
|
||||||
|
{song.isFullCombo && "FULL COMBO"}
|
||||||
|
</span>
|
||||||
|
<span className=" text-black text-center font-medium text-xl">
|
||||||
|
Max combo: {song.maxCombo}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-span-2 col-start-2 row-span-2 bg-yellow-200 rounded-lg shadow-md flex items-center justify-center">
|
|
||||||
<p>Pork</p>
|
|
||||||
</div>
|
</div>
|
||||||
|
))}
|
||||||
<div className="col-span-4 col-start-4 row-span-1 bg-green-200 rounded-lg shadow-md flex items-center justify-center">
|
</div>
|
||||||
|
<div className="col-span-1 col-start-3 row-span-3 bg-white rounded-lg shadow-md flex items-center justify-center">
|
||||||
|
{matchedSongs.map((song) => (
|
||||||
|
<div key={song.id} className="w-full p-5">
|
||||||
|
<div className=" flex flex-col items-center justify-center ">
|
||||||
|
<span className="text-white rounded-md shadow-[inset_0px_3px_6px_0px_#1a202c] bg-[#58329F] w-full text-center p-2 font-bold text-md ">
|
||||||
|
Judge Justice: {song.judgeJustice}
|
||||||
|
</span>
|
||||||
|
<span className="text-white rounded-md shadow-[inset_0px_3px_6px_0px_#1a202c] bg-[#58329F] w-full text-center p-2 font-bold text-md m-5">
|
||||||
|
Judge Attack: {song.judgeAttack}
|
||||||
|
</span>
|
||||||
|
<span className="text-white rounded-md shadow-[inset_0px_3px_6px_0px_#1a202c] bg-[#58329F] w-full text-center p-2 font-bold text-md">
|
||||||
|
Miss: {song.judgeGuilty}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="col-span-4 col-start-4 row-span-1 bg-white rounded-lg shadow-md flex items-center justify-center">
|
||||||
<p>Edamame</p>
|
<p>Edamame</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -16,23 +16,17 @@ import { Badge } from "@/components/ui/badge";
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useRouter } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import { generateShareToken } from "@/app/(sharing)/[token]/token";
|
import { generateShareToken } from "@/app/(sharing)/[token]/token";
|
||||||
export type Song = {
|
|
||||||
title: string;
|
|
||||||
artist: string;
|
|
||||||
score?: number | null;
|
|
||||||
userPlayDate: string | null;
|
|
||||||
isFullCombo: boolean | null;
|
|
||||||
isAllJustice: boolean | null;
|
|
||||||
id: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const columns: ColumnDef<Song>[] = [
|
import { chuni_score_playlog } from "@/prisma/schemas/artemis/generated/artemis";
|
||||||
|
import { chuni_static_music } from "@/prisma/schemas/artemis/generated/artemis";
|
||||||
|
|
||||||
|
export const columns: ColumnDef<chuni_score_playlog & chuni_static_music>[] = [
|
||||||
{
|
{
|
||||||
accessorKey: "title",
|
accessorKey: "title",
|
||||||
header: "Title",
|
header: "Title",
|
||||||
cell: ({ row }) => (
|
cell: ({ row }) => (
|
||||||
<div>
|
<div>
|
||||||
<div className="font-medium ">
|
<div className="font-medium">
|
||||||
{row.original.title}
|
{row.original.title}
|
||||||
<span className="space-x-2 pl-2">
|
<span className="space-x-2 pl-2">
|
||||||
{row.original.isFullCombo && (
|
{row.original.isFullCombo && (
|
||||||
@ -43,10 +37,12 @@ export const columns: ColumnDef<Song>[] = [
|
|||||||
All Justice
|
All Justice
|
||||||
</Badge>
|
</Badge>
|
||||||
)}
|
)}
|
||||||
|
{row.original.isNewRecord && (
|
||||||
|
<Badge className="rounded-sm bg-pink-400 text-white">New!!</Badge>
|
||||||
|
)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="text-sm text-muted-foreground truncate inline-block w-[200px]">
|
||||||
<div className="text-sm text-muted-foreground truncate inline-block w-[200px] ">
|
|
||||||
{row.original.artist}
|
{row.original.artist}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -69,13 +65,12 @@ export const columns: ColumnDef<Song>[] = [
|
|||||||
const [error, setError] = useState<string>("");
|
const [error, setError] = useState<string>("");
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
|
|
||||||
const handleGenerateShareToken = async () => {
|
const handleGenerateShareToken = async () => {
|
||||||
const { token, error } = await generateShareToken(row.original.id);
|
const { token, error } = await generateShareToken(row.original.id);
|
||||||
if (error) {
|
if (error) {
|
||||||
setError(error);
|
setError(error);
|
||||||
} else {
|
} else {
|
||||||
const newTab = window.open(`/${token}/${row.original.id}`, '_blank');
|
const newTab = window.open(`/${token}/${row.original.id}`, "_blank");
|
||||||
if (newTab) {
|
if (newTab) {
|
||||||
newTab.focus();
|
newTab.focus();
|
||||||
} else {
|
} else {
|
||||||
@ -96,7 +91,9 @@ export const columns: ColumnDef<Song>[] = [
|
|||||||
<DropdownMenuContent align="end">
|
<DropdownMenuContent align="end">
|
||||||
<DropdownMenuLabel>Actions</DropdownMenuLabel>
|
<DropdownMenuLabel>Actions</DropdownMenuLabel>
|
||||||
<DropdownMenuItem
|
<DropdownMenuItem
|
||||||
onClick={() => navigator.clipboard.writeText(song.title)}
|
onClick={() =>
|
||||||
|
song.title && navigator.clipboard.writeText(song.title)
|
||||||
|
}
|
||||||
>
|
>
|
||||||
Copy song title
|
Copy song title
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
|
Reference in New Issue
Block a user