Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/app/auth/callback/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ export async function GET(request: Request) {
id: "n/a",
username: (data.user.user_metadata as { name?: string }).name ?? null,
email: data.user.email,
imageUrl:
(data.user.user_metadata as { image_url?: string }).image_url ??
null,
// imageUrl:
// (data.user.user_metadata as { image_url?: string }).image_url ??
// null,
});
next = `/${user.id}`;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { buttonVariants } from "@/components/ui/button";
import { cn } from "@/lib/utils";
import InfiniteBanner from "@/components/infinite-banner";

export default async function Home() {
export default function Home() {
return (
<div className="flex w-full flex-col gap-20 bg-[#F8FFFA] p-4">
{/* This includes the story examples because they both need access to tab state */}
Expand Down
3 changes: 1 addition & 2 deletions src/components/footer.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import Link from "next/link";
import Image from "next/image";
import WordwareLogo from "public/brand/wordware-black.svg";

export default function Footer() {
return (
<footer className="flex flex-col gap-8 bg-black p-8 text-white">
<div className="flex items-center">
<Image
src={WordwareLogo}
src="/brand/wordware-black.svg"
alt="Wordware Logo"
width={120}
height={30}
Expand Down
1 change: 1 addition & 0 deletions src/components/spotify/home-cards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export default function HomeCards() {
key={card.content}
className={cn("w-full sm:max-w-xs", card.bgColor)}
hideHashtag
hideShare
>
<div className="z-10 text-white">{card.content}</div>
</WordwareCard>
Expand Down
3 changes: 3 additions & 0 deletions src/components/spotify/side-cards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export function SideCards() {
<WordwareCard
wide
hideHashtag
hideShare
show={!!results.short_summary}
className="h-1/3 w-full rounded-xl bg-[#1A1A1A]"
>
Expand All @@ -19,6 +20,7 @@ export function SideCards() {
<div className="flex w-full flex-col gap-4 rounded-xl md:h-2/3 md:flex-row">
<WordwareCard
hideHashtag
hideShare
show={!!results.music_taste_analysis_1}
className="h-full w-full rounded-xl bg-[#1A1A1A]"
>
Expand All @@ -41,6 +43,7 @@ export function SideCards() {
<div className="flex h-full w-full flex-col gap-4">
<WordwareCard
hideHashtag
hideShare
show={!!results.music_taste_analysis_2}
className="h-2/3 w-full rounded-xl bg-[#1A1A1A]"
>
Expand Down
22 changes: 12 additions & 10 deletions src/components/spotify/wordware-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ export default function WordwareCard({
show = true,
wide = false,
hideHashtag = false,
hideShare = false,
}: {
children: ReactNode;
fillColor?: string;
className: string;
show?: boolean;
wide?: boolean;
hideHashtag?: boolean;
hideShare?: boolean;
}) {
return (
show && (
Expand Down Expand Up @@ -55,16 +57,16 @@ export default function WordwareCard({
</div>
<div className="z-10">{children}</div>


<div
className="absolute bottom-8 left-1/2 -translate-x-1/2 flex items-center"
onClick={(e) => e.stopPropagation()}
>

<ShareButton className="text-white hover:text-white/80">
Share
</ShareButton>
</div>
{!hideShare && (
<div
className="absolute bottom-8 left-1/2 flex -translate-x-1/2 items-center"
onClick={(e) => e.stopPropagation()}
>
<ShareButton className="text-white hover:text-white/80">
Share
</ShareButton>
</div>
)}
</div>
)
);
Expand Down