Updated links logic, new admin dash

This commit is contained in:
alex 3
2023-11-07 01:13:54 -05:00
parent 48fb8f644f
commit 56af375cc0
15 changed files with 300 additions and 209 deletions
+11
View File
@@ -0,0 +1,11 @@
import Head from 'next/head';
export default function HeadTags() {
return (
<Head>
<title>alexavfrantz</title>
<meta property="og:title" content="alexavfrantz.com" />
<meta property="og:description" content="Welcome to my personal website! See my favorite music, read my reviews on games and more!" />
</Head>
)
}
+19
View File
@@ -0,0 +1,19 @@
type InputOptionProps = {
label: string,
inputName: string,
isTextArea?: boolean
}
export default function InputOption(props: InputOptionProps) {
return (
<div className="pt-2 pb-2">
<label className="font-bold">{props.label}</label><br />
{
props.isTextArea ?
<textarea className="bg-gray-800 rounded-sm text-white resize-none h-32 w-72" name={props.inputName} />
:
<input className="bg-gray-800 rounded-sm text-white" name={props.inputName} />
}
</div>
)
}
+55
View File
@@ -0,0 +1,55 @@
// component imports
import Header from "./header";
import Footer from "./footer";
import Head from "./Head"
// react imports
import React from 'react';
// next modules
import { useSession } from "next-auth/react";
import Router from 'next/router';
type LayoutProps = {
children: React.ReactNode
protectedPage?: boolean
}
export default function RootLayout({ children, protectedPage }: LayoutProps) {
const {status} = useSession()
if (protectedPage) {
if (status === "loading") {
return (
<main className="min-h-screen bg-black">
<Head />
<p>Loading...</p>
</main>
)
}
if (status === "unauthenticated") {
Router.replace("/").catch(() => {
console.error("Failed to reroute user!")
})
} else {
return (
<main className="min-h-screen bg-black">
<Head />
<Header />
{children}
<Footer />
</main>
)
}
} else {
return (
<main className="min-h-screen bg-black">
<Head />
<Header />
{children}
<Footer />
</main>
)
}
}
+7 -1
View File
@@ -1,8 +1,11 @@
import Link from "next/link" import Link from "next/link"
import { Trash } from "grommet-icons"
type SocialCardProps = { type SocialCardProps = {
name: string, name: string,
url: string url: string,
showDelete: boolean,
deleteCallback: () => void
} }
export default function SocialMediaCard(props: SocialCardProps) { export default function SocialMediaCard(props: SocialCardProps) {
@@ -11,6 +14,9 @@ export default function SocialMediaCard(props: SocialCardProps) {
<Link href={props.url}> <Link href={props.url}>
{props.name} {props.name}
</Link> </Link>
{
props.showDelete && <Trash onClick={props.deleteCallback} color="plain" className="pl-2 hover:cursor-pointer" />
}
</div> </div>
) )
} }
+4 -8
View File
@@ -1,4 +1,4 @@
import { Twitter, LinkedinOption, MailOption } from "grommet-icons" import { Twitter, LinkedinOption } from "grommet-icons"
import Link from 'next/link'; import Link from 'next/link';
export default function Footer() { export default function Footer() {
@@ -16,17 +16,13 @@ export default function Footer() {
<p className="text-center"> <p className="text-center">
&copy; Alex Frantz, 2023 &copy; Alex Frantz, 2023
</p> </p>
<p className="text-center"> <p className="text-center space-x-2">
<Link href="https://twitter.com/avvex__" target="_blank" rel="noreferrer"> <Link href="https://twitter.com/avvex__" target="_blank" rel="noreferrer">
<Twitter color='plain' className="pr-2" size="30" /> <Twitter color='plain' size="30" />
</Link> </Link>
<Link href="https://linkedin.com/in/thatalex" target="_blank" rel="noreferrer"> <Link href="https://linkedin.com/in/thatalex" target="_blank" rel="noreferrer">
<LinkedinOption className="pr-2" size="30" /> <LinkedinOption size="30" />
</Link>
<Link href="mailto:alex@alexavfrantz.com" target="_blank" rel="noreferrer">
<MailOption className="pr-2" size="30" />
</Link> </Link>
</p> </p>
</div> </div>
+9 -2
View File
@@ -2,15 +2,22 @@ import {useSession, signIn, signOut} from 'next-auth/react';
import HeaderItem from "./HeaderItem"; import HeaderItem from "./HeaderItem";
export default function Header() { export default function Header() {
const { data: session, status } = useSession() const { status } = useSession()
return ( return (
<> <>
<div className="text-white w-52 pt-2 pb-4 mx-auto"> <div className="text-white max-w-sm pt-2 pb-4 mx-auto">
<p className="text-2xl font-bold">alex</p> <p className="text-2xl font-bold">alex</p>
<div className="inline-block pb-2"> <div className="inline-block pb-2">
<HeaderItem content="home" linkTo="/" /> <HeaderItem content="home" linkTo="/" />
<HeaderItem content="reviews" linkTo="/reviews" /> <HeaderItem content="reviews" linkTo="/reviews" />
<HeaderItem content="links" linkTo="/links" />
{ status === "authenticated" &&
<HeaderItem
content="create"
linkTo="/create"
/>
}
<HeaderItem content={status == "unauthenticated" ? "login" : "logout" } onClick={async () => { <HeaderItem content={status == "unauthenticated" ? "login" : "logout" } onClick={async () => {
if (status == "unauthenticated") { if (status == "unauthenticated") {
await signIn() await signIn()
+118
View File
@@ -0,0 +1,118 @@
// react modules
import {useState} from 'react'
import type {FormEvent} from 'react';
// trpc api
import { api } from "@/utils/api";
// components
import RootLayout from '@/components/RootLayout';
import InputOption from '@/components/InputOption';
export default function CreatePage() {
// ui states
const [message, setMessage] = useState<string | null>(null)
// trpc hooks
const postMutation = api.post.create.useMutation()
const linksMutation = api.links.create.useMutation()
function sanitizeTitleForLink(title: string) {
return title.replaceAll(" ", "-").toLowerCase()
}
function onPostSubmit(event: FormEvent<HTMLFormElement>) {
const form = event.target as HTMLFormElement
const titleElement = form.elements.namedItem('title') as HTMLInputElement;
const reviewElement = form.elements.namedItem('review') as HTMLInputElement;
const imageElement = form.elements.namedItem('image') as HTMLInputElement;
const typeElement = form.elements.namedItem('type') as HTMLInputElement;
if (!titleElement.value || !reviewElement.value || !imageElement.value || !typeElement.value) {
event.preventDefault();
setMessage("One or more values were missing!")
setTimeout(() => setMessage(null), 5000)
} else {
const object = {
name: sanitizeTitleForLink(titleElement.value),
reviewContents: reviewElement.value,
image: imageElement.value,
type: typeElement.value
}
postMutation.mutate(object)
}
}
function onLinkSubmit(event: FormEvent<HTMLFormElement>) {
const form = event.target as HTMLFormElement
const urlRegex = new RegExp("^((https):\/\/)?(www.)?[a-z0-9]+\.[a-z]+(\/[a-zA-Z0-9#]+\/?)*$")
const titleElement = form.elements.namedItem('title') as HTMLInputElement;
const urlElement = form.elements.namedItem('url') as HTMLInputElement;
const urlMatches = urlElement.value.match(urlRegex)
if (!titleElement.value || !urlElement.value) {
event.preventDefault();
setMessage("One or more values were missing!")
setTimeout(() => setMessage(null), 5000)
} else if (urlMatches != null && !urlMatches[1]) {
event.preventDefault();
setMessage("An invalid URL was provided!")
setTimeout(() => setMessage(null), 5000)
} else {
const object = {
name: titleElement.value,
url: urlElement.value
}
linksMutation.mutate(object)
}
}
return (
<RootLayout protectedPage={true}>
<div className="space-y-4">
<div className="w-96 p-2 mx-auto bg-gray-500 text-center">
<h1 className="font-bold text-2xl">Create Review Post</h1>
<div className="pt-2 pb-2">
<hr />
</div>
<form onSubmit={onPostSubmit}>
<InputOption inputName="title" label="Title" />
<InputOption inputName="image" label="Image URL" />
<InputOption inputName="type" label="Content Type (book, movie, tv, game)" />
<InputOption inputName="review" label="Review" isTextArea={true} />
<button className="bg-gray-800 text-white rounded-lg p-2" type="submit">Submit</button>
</form>
<p>{message}</p>
</div>
<div className="w-96 p-2 mx-auto bg-gray-500 text-center">
<h1 className="font-bold text-2xl">Create Link</h1>
<div className="pt-2 pb-2">
<hr />
</div>
<form onSubmit={onLinkSubmit}>
<InputOption inputName="title" label="Title" />
<InputOption inputName="url" label="URL" />
<button className="bg-gray-800 text-white rounded-lg p-2" type="submit">Submit</button>
</form>
<p>{message}</p>
</div>
</div>
</RootLayout>
)
}
+3 -8
View File
@@ -1,22 +1,17 @@
import Header from "@/components/header"; import RootLayout from "@/components/RootLayout";
import Footer from "@/components/footer";
import Dropdown from "@/components/Dropdown"; import Dropdown from "@/components/Dropdown";
import ProjectCard from "@/components/ProjectsCard"; import ProjectCard from "@/components/ProjectsCard";
import Image from 'next/image'; import Image from 'next/image';
export default function Home() { export default function Home() {
return ( return (
<main className="min-h-screen bg-black"> <RootLayout>
<div className="w-1/2 mx-auto text-white"> <div className="w-1/2 mx-auto text-white">
<Header />
<Dropdown content={Music()} name="Music" /> <Dropdown content={Music()} name="Music" />
<Dropdown content={Games()} name="Games" /> <Dropdown content={Games()} name="Games" />
<Dropdown content={Projects()} name="Projects" /> <Dropdown content={Projects()} name="Projects" />
<Footer />
</div> </div>
</main> </RootLayout>
) )
} }
+27 -30
View File
@@ -1,40 +1,37 @@
import Header from "@/components/header";
import Footer from "@/components/footer";
import SocialCard from '@/components/SocialCard' import SocialCard from '@/components/SocialCard'
import Dropdown from "@/components/Dropdown"; import RootLayout from '@/components/RootLayout';
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import React, {useEffect, useState} from 'react'; import { useSession } from 'next-auth/react';
import React from 'react';
export default function Links() { export default function Links() {
const {data: linkData} = api.links.getAll.useQuery() const {status} = useSession();
const [formatted, setFormatted] = useState<React.JSX.Element[] | null>(null)
useEffect(() => { // trpc hooks
if (linkData) { const { data: linkData } = api.links.getAll.useQuery()
setFormatted( const deleteMutation = api.links.delete.useMutation()
linkData.map((v) => {
return <SocialCard url={v.url} name={v.name} key={v.name} />
})
)
}
}, [linkData])
return ( return (
<main className="min-h-screen bg-black"> <RootLayout>
<div className="w-1/2 mx-auto text-white"> <div className="space-y-2">
<Header /> {
linkData && linkData.length > 0 ? linkData.map((v) => {
{formatted} return <SocialCard
url={v.url}
{/* { name={v.name}
formatted ? key={v.name}
<Dropdown content={formatted} name="Social Dropdown" /> showDelete={status === "authenticated"}
: deleteCallback={() => {
<h1>There&apos;s nothing here :(</h1> deleteMutation.mutate(v.id)
} */} }}
/>
<Footer /> }) :
<div className="text-center text-white">
<h1>Uh oh!</h1>
<p>There&apos;s nothing here :(</p>
</div> </div>
</main> }
</div>
</RootLayout>
) )
} }
+3 -8
View File
@@ -1,13 +1,10 @@
import Header from "@/components/header" import RootLayout from "@/components/RootLayout"
import Footer from "@/components/footer"
import Image from "next/image" import Image from "next/image"
import ProjectCard from "@/components/ProjectsCard" import ProjectCard from "@/components/ProjectsCard"
export default function Resume() { export default function Resume() {
return ( return (
<main className="min-h-screen bg-black"> <RootLayout>
<Header />
<div className="text-center mx-auto text-white"> <div className="text-center mx-auto text-white">
<div className="flex flex-wrap justify-center pb-2"> <div className="flex flex-wrap justify-center pb-2">
<Image src="https://storage.thatalex.dev/content/pfp.png" width="130" height="130" alt="PFP" className="rounded-3xl" /> <Image src="https://storage.thatalex.dev/content/pfp.png" width="130" height="130" alt="PFP" className="rounded-3xl" />
@@ -64,8 +61,6 @@ export default function Resume() {
</div> </div>
</div> </div>
</div> </div>
</RootLayout>
<Footer />
</main>
) )
} }
+36 -16
View File
@@ -1,35 +1,56 @@
import {useRouter} from 'next/router'; import RootLayout from '@/components/RootLayout';
import Header from '@/components/header';
import Footer from "@/components/footer"; // next modules
import Image from 'next/image'; import Router, {useRouter} from 'next/router';
import {api} from '@/utils/api'
import Link from 'next/link'; import Link from 'next/link';
import {useSession} from 'next-auth/react';
import Image from 'next/image';
// api
import {api} from '@/utils/api'
// icons
import { Trash } from 'grommet-icons';
export default function ReviewPage() { export default function ReviewPage() {
const router = useRouter() const router = useRouter()
const name = router.query.name as string const name = router.query.name as string
const { status } = useSession()
// trpc stuff
const {data: bookData} = api.post.getOne.useQuery(name) const {data: bookData} = api.post.getOne.useQuery(name)
const deletionMutation = api.post.delete.useMutation()
function deleteItem() {
if (bookData) {
deletionMutation.mutate(bookData.id)
Router.replace("/").catch(() => {
console.error("Failed to reroute user!")
})
}
}
if (bookData) { if (bookData) {
return ( return (
<main className="min-h-screen bg-black text-white"> <RootLayout>
<Header /> <div className="mx-auto w-1/2 text-center flex justify-center">
<div className="mx-auto w-1/2 text-center flex justify-center text-white">
<Image src={bookData.image} width="150" height="150" alt={`${bookData.name} ${bookData.type} cover`} /> <Image src={bookData.image} width="150" height="150" alt={`${bookData.name} ${bookData.type} cover`} />
</div> </div>
<div className="mx-auto w-1/2 text-center"> <div className="mx-auto w-1/2 text-center text-white">
<h1 className="text-2xl font-bold">{bookData.name}</h1> <h1 className="text-2xl font-bold">{bookData.name} { status == "authenticated" ? <Trash onClick={deleteItem} className="hover:cursor-pointer" /> : ""}</h1>
<div className="pt-2 pb-2">
<hr /> <hr />
</div>
{bookData.reviewContents} {bookData.reviewContents}
</div> </div>
<Footer /> </RootLayout>
</main>
) )
} else { } else {
return ( return (
<main className="min-h-screen bg-black text-white flex flex-col justify-center items-centers"> <RootLayout>
<Header />
<div className="text-center text-2xl font-bold"> <div className="text-center text-2xl font-bold">
<p>Well, that&apos;s not good..</p> <p>Well, that&apos;s not good..</p>
</div> </div>
@@ -40,8 +61,7 @@ export default function ReviewPage() {
Head Home Head Home
</Link> </Link>
</div> </div>
<Footer /> </RootLayout>
</main>
) )
} }
} }
-111
View File
@@ -1,111 +0,0 @@
import {useSession} from 'next-auth/react';
import {useState, useEffect} from 'react';
import type {FormEvent} from 'react';
import Header from '@/components/header';
import Footer from "@/components/footer";
import Router from 'next/router';
import { api } from "@/utils/api";
export default function Page() {
const { data: session, status } = useSession()
const postMutation = api.post.create.useMutation()
const linksMutation = api.links.create.useMutation()
const [loading, setLoading] = useState(true)
useEffect(() => {
if (status == "unauthenticated") {
console.log('user is unauthenticated!')
Router.replace('/').catch(() => {
console.error("Failed to reroute user!")
})
} else {
setLoading(false)
}
}, [status])
function sanitizeTitleForLink(title: string) {
return title.replaceAll(" ", "-").toLowerCase()
}
function onPostSubmit(event: FormEvent<HTMLFormElement>) {
event.preventDefault()
const form = event.target as HTMLFormElement
const titleElement = form.elements.namedItem('title') as HTMLInputElement;
const reviewElement = form.elements.namedItem('review') as HTMLInputElement;
const imageElement = form.elements.namedItem('image') as HTMLInputElement;
const typeElement = form.elements.namedItem('type') as HTMLInputElement;
const object = {
name: sanitizeTitleForLink(titleElement.value),
reviewContents: reviewElement.value,
image: imageElement.value,
type: typeElement.value
}
postMutation.mutate(object)
}
function onLinkSubmit(event: FormEvent<HTMLFormElement>) {
event.preventDefault()
const form = event.target as HTMLFormElement
const titleElement = form.elements.namedItem('title') as HTMLInputElement;
const urlElement = form.elements.namedItem('url') as HTMLInputElement;
const object = {
name: sanitizeTitleForLink(titleElement.value),
url: urlElement.value
}
linksMutation.mutate(object)
}
if (!loading) {
return (
<main className="min-h-screen bg-black color-white">
<div className="w-1/2 mx-auto text-white">
<Header />
<form onSubmit={onPostSubmit} className="text-black">
<div className="bg-gray-500 text-center">
<label className="font-bold">Title</label><br />
<input name="title" type="text" /><br />
<label className="font-bold">Image URL</label><br />
<input name="image" type="text" /><br />
<label className="font-bold">Content Type (book, movie, tv, game)</label><br />
<input name="type" type="text" /><br />
<label className="font-bold">Review</label><br />
<textarea name="review" /><br />
<button type="submit">submit</button>
</div>
</form>
<form onSubmit={onLinkSubmit} className="text-black">
<div className="bg-gray-500 text-center">
<label className="font-bold">Title</label><br />
<input name="title" type="text" /><br />
<label className="font-bold">URL</label><br />
<input name="url" type="text" /><br />
<button type="submit">submit</button>
</div>
</form>
<Footer />
</div>
</main>
)
} else {
return (
<main>
<p>
Loading..
</p>
</main>
)
}
}
+4 -21
View File
@@ -1,9 +1,6 @@
import Header from "@/components/header" import RootLayout from "@/components/RootLayout"
import Footer from "@/components/footer";
import ReviewCard from "@/components/ReviewCard" import ReviewCard from "@/components/ReviewCard"
import {useSession} from 'next-auth/react'; import React, {useState, useEffect} from 'react';
import {useState, useEffect} from 'react';
import Link from 'next/link';
import { api } from "@/utils/api"; import { api } from "@/utils/api";
type GenericItemType = { type GenericItemType = {
@@ -12,7 +9,6 @@ type GenericItemType = {
} }
export default function Reviews() { export default function Reviews() {
const { data: sessionData, status } = useSession();
const {data: itemData} = api.post.getAll.useQuery() const {data: itemData} = api.post.getAll.useQuery()
const [list, setList] = useState<null | JSX.Element[]>(null) const [list, setList] = useState<null | JSX.Element[]>(null)
const [type, setType] = useState("Book") const [type, setType] = useState("Book")
@@ -62,20 +58,8 @@ export default function Reviews() {
}, [itemData, type]) }, [itemData, type])
return ( return (
<main className="min-h-screen bg-black color-white"> <RootLayout>
<Header />
<div className="w-1/2 mx-auto text-white"> <div className="w-1/2 mx-auto text-white">
{
status == "authenticated" ?
<p className="text-center font-bold">
<Link href="/reviews/create">
Create
</Link>
</p>
:
""
}
<p className="text-center font-bold text-2xl hover:cursor-pointer hover:underline pb-2" onClick={onCatClick}> <p className="text-center font-bold text-2xl hover:cursor-pointer hover:underline pb-2" onClick={onCatClick}>
{type} {type}
</p> </p>
@@ -90,7 +74,6 @@ export default function Reviews() {
} }
</div> </div>
</div> </div>
<Footer /> </RootLayout>
</main>
) )
} }
+1 -1
View File
@@ -25,7 +25,7 @@ export const linksRouter = createTRPCRouter({
.input( .input(
z.string().min(1) z.string().min(1)
) )
.query(async ({ctx, input}) => { .mutation(async ({ctx, input}) => {
return ctx.db.socialLink.delete({ return ctx.db.socialLink.delete({
where: { where: {
id: input id: input
+1 -1
View File
@@ -32,7 +32,7 @@ export const postRouter = createTRPCRouter({
.input( .input(
z.string().min(1) z.string().min(1)
) )
.query(async ({ctx, input}) => { .mutation(async ({ctx, input}) => {
return ctx.db.post.delete({ return ctx.db.post.delete({
where: { where: {
id: input id: input