diff --git a/mirror-2/.env.example b/mirror-2/.env.example index 9dc553d7..07783698 100644 --- a/mirror-2/.env.example +++ b/mirror-2/.env.example @@ -4,5 +4,5 @@ NEXT_PUBLIC_SUPABASE_URL=http://127.0.0.1:54321 NEXT_PUBLIC_SUPABASE_ANON_KEY=SUPABASE_CLIENT_API_KEY NEXT_PUBLIC_APP_NAME="The Mirror" # only use The Mirror or Reflekt NEXT_PUBLIC_DISCORD_INVITE_URL=https://themirror.space/discord -NEXT_PUBLIC_GA_KEY_GAME_PUBLIC= -NEXT_PUBLIC_GA_KEY_SECRET= # I asked about this to GA support; why secret public?? Using throwaway keys for now +NEXT_PUBLIC_VERSION_NAME="JavaScript" +NEXT_PUBLIC_AMPLITUDE_PUBLIC_KEY= diff --git a/mirror-2/.prettierignore b/mirror-2/.prettierignore new file mode 100644 index 00000000..a10c0d6c --- /dev/null +++ b/mirror-2/.prettierignore @@ -0,0 +1,6 @@ +# Ignore artifacts: +build +coverage +dist +# ignore JS for now because of vanilla JS file imports might mess up some text replacement. Can revisit in the future but not high priority +*.js diff --git a/mirror-2/.prettierrc b/mirror-2/.prettierrc new file mode 100644 index 00000000..ffca9292 --- /dev/null +++ b/mirror-2/.prettierrc @@ -0,0 +1,6 @@ +{ + "singleQuote": true, + "trailingComma": "none", + "semi": false, + "endOfLine": "auto" +} diff --git a/mirror-2/.vscode/extensions.json b/mirror-2/.vscode/extensions.json deleted file mode 100644 index 74baffcc..00000000 --- a/mirror-2/.vscode/extensions.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "recommendations": ["denoland.vscode-deno"] -} diff --git a/mirror-2/.vscode/launch.json b/mirror-2/.vscode/launch.json new file mode 100644 index 00000000..d184594a --- /dev/null +++ b/mirror-2/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Next.js: debug full stack", + "type": "node-terminal", + "request": "launch", + "command": "yarn dev", + "serverReadyAction": { + "pattern": "- Local:.+(https?://.+)", + "uriFormat": "%s", + "action": "debugWithChrome" + } + } + ] +} diff --git a/mirror-2/.vscode/settings.json b/mirror-2/.vscode/settings.json index 3ecdef9d..68adb827 100644 --- a/mirror-2/.vscode/settings.json +++ b/mirror-2/.vscode/settings.json @@ -17,7 +17,7 @@ "net" ], "[typescript]": { - "editor.defaultFormatter": "denoland.vscode-deno" + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "typescript.tsdk": "node_modules/typescript/lib" } diff --git a/mirror-2/LICENSE.txt b/mirror-2/LICENSE.txt index 5c4c3c82..f3078b4f 100644 --- a/mirror-2/LICENSE.txt +++ b/mirror-2/LICENSE.txt @@ -1,4 +1,4 @@ -RevShare/ChainShare: A Source Available License +RevShare: A Source Available License Copyright (c) 2024-Present The Mirror Megaverse Inc. @@ -11,7 +11,7 @@ If any revenue is generated through the use of the Software, including but not l If revenue is generated in fiat currency (e.g., USD, EUR), the user agrees to remit payments to the Company based on the fee structure listed on the Company’s website. Failure to comply with these payment terms will result in the revocation of the license. 3. Payment in Cryptocurrency and Royalties for Non-Fungible Tokens -Cryptocurrency integrations are exclusive to the Reflekt version of the Software, a separate brand of The Mirror. In contrast, The Mirror version of the Software does not support cryptocurrency usage. This structure is designed to give developers the flexibility to choose between traditional web2 approaches and blockchain-integrated games. +Cryptocurrency integrations are exclusive to the Reflekt version of the Software, a separate fork of The Mirror. In contrast, The Mirror version of the Software does not support cryptocurrency usage. This structure is designed to give developers the flexibility to choose between traditional web2 approaches and blockchain-integrated games. Direct Cryptocurrency Transactions: If revenue is generated directly through the Software in the form of cryptocurrency (e.g., in-game transactions, purchases, or other forms of monetization), the user agrees to pay a 10% fee on all such transactions. Payments must be made to the Company’s wallet address as specified on its website. Users are responsible for ensuring accurate and timely payments to the listed address. @@ -21,3 +21,26 @@ Non-Fungible Token Royalties: If the Software is used to issue or mint Non-Fungi THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. By using the Software, you agree to the terms outlined above. These terms are subject to change due to early versions of the Software and the team is open to feedback! + +--- +The below copyright notice and MIT license is included for compliance with the MIT license of the PlayCanvas Engine: https://github.com/playcanvas/engine + +Copyright (c) 2011-2024 PlayCanvas Ltd. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/mirror-2/actions/auth.ts b/mirror-2/actions/auth.ts index 70613771..0d416682 100644 --- a/mirror-2/actions/auth.ts +++ b/mirror-2/actions/auth.ts @@ -1,150 +1,150 @@ -"use server"; +'use server' -import { createServerClient } from "@/utils/supabase/server"; -import { encodedRedirect } from "@/utils/utils"; -import { headers } from "next/headers"; -import { redirect } from "next/navigation"; +import { createServerClient } from '@/utils/supabase/server' +import { encodedRedirect } from '@/utils/utils' +import { headers } from 'next/headers' +import { redirect } from 'next/navigation' export const createAccountAction = async (formData: FormData) => { - const email = formData.get("email")?.toString(); - const password = formData.get("password")?.toString(); - const supabase = createServerClient(); - const origin = headers().get("origin"); + const email = formData.get('email')?.toString() + const password = formData.get('password')?.toString() + const supabase = createServerClient() + const origin = headers().get('origin') if (!email || !password) { - return { error: "Email and password are required" }; + return { error: 'Email and password are required' } } const { error } = await supabase.auth.signUp({ email, password, options: { - emailRedirectTo: `${origin}/auth/callback`, - }, - }); + emailRedirectTo: `${origin}/auth/callback` + } + }) if (error) { - console.error(error.code + " " + error.message); - return encodedRedirect("error", "/create-account", error.message); + console.error(error.code + ' ' + error.message) + return encodedRedirect('error', '/create-account', error.message) } else { return encodedRedirect( - "success", - "/create-account", - "Thanks for signing up! Please check your email for a verification link." - ); + 'success', + '/create-account', + 'Thanks for signing up! Please check your email for a verification link.' + ) } -}; +} export const loginAction = async (formData: FormData) => { - const email = formData.get("email") as string; - const password = formData.get("password") as string; - const supabase = createServerClient(); + const email = formData.get('email') as string + const password = formData.get('password') as string + const supabase = createServerClient() const { error } = await supabase.auth.signInWithPassword({ email, - password, - }); + password + }) if (error) { - return encodedRedirect("error", "/login", error.message); + return encodedRedirect('error', '/login', error.message) } - return redirect("/home"); -}; + return redirect('/home') +} export const forgotPasswordAction = async (formData: FormData) => { - const email = formData.get("email")?.toString(); - const supabase = createServerClient(); - const origin = headers().get("origin"); - const callbackUrl = formData.get("callbackUrl")?.toString(); + const email = formData.get('email')?.toString() + const supabase = createServerClient() + const origin = headers().get('origin') + const callbackUrl = formData.get('callbackUrl')?.toString() if (!email) { - return encodedRedirect("error", "/forgot-password", "Email is required"); + return encodedRedirect('error', '/forgot-password', 'Email is required') } const { error } = await supabase.auth.resetPasswordForEmail(email, { - redirectTo: `${origin}/auth/callback?redirect_to=/protected/reset-password`, - }); + redirectTo: `${origin}/auth/callback?redirect_to=/protected/reset-password` + }) if (error) { - console.error(error.message); + console.error(error.message) return encodedRedirect( - "error", - "/forgot-password", - "Could not reset password" - ); + 'error', + '/forgot-password', + 'Could not reset password' + ) } if (callbackUrl) { - return redirect(callbackUrl); + return redirect(callbackUrl) } return encodedRedirect( - "success", - "/forgot-password", - "Check your email for a link to reset your password." - ); -}; + 'success', + '/forgot-password', + 'Check your email for a link to reset your password.' + ) +} export const resetPasswordAction = async (formData: FormData) => { - const supabase = createServerClient(); + const supabase = createServerClient() - const password = formData.get("password") as string; - const confirmPassword = formData.get("confirmPassword") as string; + const password = formData.get('password') as string + const confirmPassword = formData.get('confirmPassword') as string if (!password || !confirmPassword) { encodedRedirect( - "error", - "/protected/reset-password", - "Password and confirm password are required" - ); + 'error', + '/protected/reset-password', + 'Password and confirm password are required' + ) } if (password !== confirmPassword) { encodedRedirect( - "error", - "/protected/reset-password", - "Passwords do not match" - ); + 'error', + '/protected/reset-password', + 'Passwords do not match' + ) } const { error } = await supabase.auth.updateUser({ - password: password, - }); + password: password + }) if (error) { encodedRedirect( - "error", - "/protected/reset-password", - "Password update failed" - ); + 'error', + '/protected/reset-password', + 'Password update failed' + ) } - encodedRedirect("success", "/protected/reset-password", "Password updated"); -}; + encodedRedirect('success', '/protected/reset-password', 'Password updated') +} export const resetEmailAction = async (formData: FormData) => { - const supabase = createServerClient(); + const supabase = createServerClient() - const email = formData.get("email") as string; - const password = formData.get("password") as string; + const email = formData.get('email') as string + const password = formData.get('password') as string if (!email || !password) { encodedRedirect( - "error", - "/protected/reset-password", - "Email and password are required" - ); + 'error', + '/protected/reset-password', + 'Email and password are required' + ) } //NOTE: Need to match current password with entered password before updating the user's email. const { error } = await supabase.auth.updateUser({ - email, - }); + email + }) if (error) { - encodedRedirect("error", "/protected/reset-email", "Email update failed"); + encodedRedirect('error', '/protected/reset-email', 'Email update failed') } - encodedRedirect("success", "/protected/reset-email", "Email updated"); -}; + encodedRedirect('success', '/protected/reset-email', 'Email updated') +} diff --git a/mirror-2/actions/name-generator.ts b/mirror-2/actions/name-generator.ts index ee88cff9..fe7dcb61 100644 --- a/mirror-2/actions/name-generator.ts +++ b/mirror-2/actions/name-generator.ts @@ -1,11 +1,15 @@ -"use server" -import { uniqueNamesGenerator, Config, adjectives, colors, animals } from 'unique-names-generator'; - +'use server' +import { + uniqueNamesGenerator, + Config, + adjectives, + colors, + animals +} from 'unique-names-generator' const randomName: string = uniqueNamesGenerator({ dictionaries: [adjectives, animals] -}); - +}) export async function generateSpaceName() { const customConfig: Config = { @@ -13,11 +17,10 @@ export async function generateSpaceName() { separator: ' ', length: 2, style: 'capital' - }; - -return uniqueNamesGenerator(customConfig); -} + } + return uniqueNamesGenerator(customConfig) +} export async function generateSceneName() { const customConfig: Config = { @@ -25,8 +28,7 @@ export async function generateSceneName() { separator: ' ', length: 1, style: 'capital' - }; - - return uniqueNamesGenerator(customConfig); } - \ No newline at end of file + + return uniqueNamesGenerator(customConfig) +} diff --git a/mirror-2/ampli.json b/mirror-2/ampli.json new file mode 100644 index 00000000..f1cce44f --- /dev/null +++ b/mirror-2/ampli.json @@ -0,0 +1,14 @@ +{ + "Zone": "us", + "OrgId": "308710", + "WorkspaceId": "a2da908b-27c1-4013-b214-f7ce5531bbe7", + "SourceId": "b077387d-b743-4f18-bd57-94effffd3ad1", + "Runtime": "browser:typescript-ampli-v2", + "Platform": "Browser", + "Language": "TypeScript", + "SDK": "@amplitude/analytics-browser@^1.0", + "Branch": "main", + "Version": "1.0.0", + "VersionId": "84e8930d-d0e7-4c92-b6c6-629ff838c9a6", + "Path": "./src/ampli" +} \ No newline at end of file diff --git a/mirror-2/app/(auth-pages)/create-account/page.tsx b/mirror-2/app/(auth-pages)/create-account/page.tsx index ee1f8a9b..ad893381 100644 --- a/mirror-2/app/(auth-pages)/create-account/page.tsx +++ b/mirror-2/app/(auth-pages)/create-account/page.tsx @@ -1,26 +1,26 @@ -"use client"; -import { createAccountAction, loginAction } from "@/actions/auth"; -import { FormMessage, Message } from "@/components/form-message"; -import { SubmitButton } from "@/components/submit-button"; +'use client' +import { createAccountAction, loginAction } from '@/actions/auth' +import { FormMessage, Message } from '@/components/form-message' +import { SubmitButton } from '@/components/submit-button' import { Card, CardHeader, CardTitle, CardContent, - CardFooter, -} from "@/components/ui/card"; -import { Input } from "@/components/ui/input"; -import { Label } from "@/components/ui/label"; -import { useRedirectToHomeIfSignedIn } from "@/hooks/auth"; -import { AppLogoImageMedium } from "@/lib/theme-service"; -import Link from "next/link"; + CardFooter +} from '@/components/ui/card' +import { Input } from '@/components/ui/input' +import { Label } from '@/components/ui/label' +import { useRedirectToHomeIfSignedIn } from '@/hooks/auth' +import { AppLogoImageMedium } from '@/lib/theme-service' +import Link from 'next/link' export default function CreateAccount({ - searchParams, + searchParams }: { - searchParams: Message; + searchParams: Message }) { - useRedirectToHomeIfSignedIn(); + useRedirectToHomeIfSignedIn() return (
@@ -58,7 +58,7 @@ export default function CreateAccount({

- Already have an account?{" "} + Already have an account?{' '}

- ); + ) } diff --git a/mirror-2/app/(auth-pages)/forgot-password/page.tsx b/mirror-2/app/(auth-pages)/forgot-password/page.tsx index c94ce608..09938fff 100644 --- a/mirror-2/app/(auth-pages)/forgot-password/page.tsx +++ b/mirror-2/app/(auth-pages)/forgot-password/page.tsx @@ -1,15 +1,15 @@ -import { forgotPasswordAction } from "@/actions/auth"; -import { FormMessage, Message } from "@/components/form-message"; -import { SubmitButton } from "@/components/submit-button"; -import { Input } from "@/components/ui/input"; -import { Label } from "@/components/ui/label"; -import Link from "next/link"; -import { SmtpMessage } from "../smtp-message"; +import { forgotPasswordAction } from '@/actions/auth' +import { FormMessage, Message } from '@/components/form-message' +import { SubmitButton } from '@/components/submit-button' +import { Input } from '@/components/ui/input' +import { Label } from '@/components/ui/label' +import Link from 'next/link' +import { SmtpMessage } from '../smtp-message' export default function ForgotPassword({ - searchParams, + searchParams }: { - searchParams: Message; + searchParams: Message }) { return ( <> @@ -17,7 +17,7 @@ export default function ForgotPassword({

Reset Password

- Already have an account?{" "} + Already have an account?{' '} Login @@ -34,5 +34,5 @@ export default function ForgotPassword({ - ); + ) } diff --git a/mirror-2/app/(auth-pages)/layout.tsx b/mirror-2/app/(auth-pages)/layout.tsx index 1be031e6..74e01480 100644 --- a/mirror-2/app/(auth-pages)/layout.tsx +++ b/mirror-2/app/(auth-pages)/layout.tsx @@ -1,13 +1,11 @@ - export default async function Layout({ - children, + children }: { - children: React.ReactNode; + children: React.ReactNode }) { return (

{children}
- ); - + ) } diff --git a/mirror-2/app/(auth-pages)/login/page.tsx b/mirror-2/app/(auth-pages)/login/page.tsx index 411fb1d2..c7014e02 100644 --- a/mirror-2/app/(auth-pages)/login/page.tsx +++ b/mirror-2/app/(auth-pages)/login/page.tsx @@ -1,41 +1,41 @@ -"use client"; -import { loginAction } from "@/actions/auth"; -import { FormMessage, Message } from "@/components/form-message"; -import { SubmitButton } from "@/components/submit-button"; +'use client' +import { loginAction } from '@/actions/auth' +import { FormMessage, Message } from '@/components/form-message' +import { SubmitButton } from '@/components/submit-button' import { Card, CardHeader, CardTitle, CardContent, - CardFooter, -} from "@/components/ui/card"; -import { Input } from "@/components/ui/input"; -import { Label } from "@/components/ui/label"; -import { useRedirectToHomeIfSignedIn } from "@/hooks/auth"; -import { AppLogoImageMedium } from "@/lib/theme-service"; -import Link from "next/link"; -import { useRef } from "react"; + CardFooter +} from '@/components/ui/card' +import { Input } from '@/components/ui/input' +import { Label } from '@/components/ui/label' +import { useRedirectToHomeIfSignedIn } from '@/hooks/auth' +import { AppLogoImageMedium } from '@/lib/theme-service' +import Link from 'next/link' +import { useRef } from 'react' -export default function Login({ searchParams }: { searchParams: Message }) { - useRedirectToHomeIfSignedIn(); +const isDevelopment = process.env.NODE_ENV === 'development' - const isDevelopment = process.env.NODE_ENV === "development"; +export default function Login({ searchParams }: { searchParams: Message }) { + useRedirectToHomeIfSignedIn() // References for email and password fields - const emailRef = useRef(null); - const passwordRef = useRef(null); + const emailRef = useRef(null) + const passwordRef = useRef(null) // Function to simulate login with specific user const handleDevLoginWithUser = (userEmail: string) => { if (emailRef.current && passwordRef.current) { - emailRef.current.value = userEmail; - passwordRef.current.value = "password"; // Default password for all dev users + emailRef.current.value = userEmail + passwordRef.current.value = 'password' // Default password for all dev users } // Simulate form submission by calling formAction // Since the SubmitButton uses formAction, this will trigger loginAction - (document.getElementById("login-form") as HTMLFormElement)?.requestSubmit(); - }; + ;(document.getElementById('login-form') as HTMLFormElement)?.requestSubmit() + } return (
@@ -81,7 +81,7 @@ export default function Login({ searchParams }: { searchParams: Message }) {

- Don't have an account?{" "} + Don't have an account?{' '} handleDevLoginWithUser("user1@example.com")} + onClick={() => handleDevLoginWithUser('user1@example.com')} > Dev Login with User 1 @@ -119,5 +119,5 @@ export default function Login({ searchParams }: { searchParams: Message }) {

- ); + ) } diff --git a/mirror-2/app/(auth-pages)/smtp-message.tsx b/mirror-2/app/(auth-pages)/smtp-message.tsx index 84c21fce..f5f46633 100644 --- a/mirror-2/app/(auth-pages)/smtp-message.tsx +++ b/mirror-2/app/(auth-pages)/smtp-message.tsx @@ -1,5 +1,5 @@ -import { ArrowUpRight, InfoIcon } from "lucide-react"; -import Link from "next/link"; +import { ArrowUpRight, InfoIcon } from 'lucide-react' +import Link from 'next/link' export function SmtpMessage() { return ( @@ -21,5 +21,5 @@ export function SmtpMessage() {
- ); + ) } diff --git a/mirror-2/app/auth/callback/route.ts b/mirror-2/app/auth/callback/route.ts index 4cbb31c9..db2dcd7d 100644 --- a/mirror-2/app/auth/callback/route.ts +++ b/mirror-2/app/auth/callback/route.ts @@ -1,24 +1,24 @@ -import { createServerClient } from "@/utils/supabase/server"; -import { NextResponse } from "next/server"; +import { createServerClient } from '@/utils/supabase/server' +import { NextResponse } from 'next/server' export async function GET(request: Request) { // The `/auth/callback` route is required for the server-side auth flow implemented // by the SSR package. It exchanges an auth code for the user's session. // https://supabase.com/docs/guides/auth/server-side/nextjs - const requestUrl = new URL(request.url); - const code = requestUrl.searchParams.get("code"); - const origin = requestUrl.origin; - const redirectTo = requestUrl.searchParams.get("redirect_to")?.toString(); + const requestUrl = new URL(request.url) + const code = requestUrl.searchParams.get('code') + const origin = requestUrl.origin + const redirectTo = requestUrl.searchParams.get('redirect_to')?.toString() if (code) { - const supabase = createServerClient(); - await supabase.auth.exchangeCodeForSession(code); + const supabase = createServerClient() + await supabase.auth.exchangeCodeForSession(code) } if (redirectTo) { - return NextResponse.redirect(`${origin}${redirectTo}`); + return NextResponse.redirect(`${origin}${redirectTo}`) } // URL to redirect to after sign up process completes - return NextResponse.redirect(`${origin}/protected`); + return NextResponse.redirect(`${origin}/protected`) } diff --git a/mirror-2/app/globals.css b/mirror-2/app/globals.css index 913dc9a9..94158222 100644 --- a/mirror-2/app/globals.css +++ b/mirror-2/app/globals.css @@ -85,9 +85,10 @@ canvas:focus { outline: none; } +/* leaving here bc will probably need to tweak */ .ant-tree-switcher_close { - margin-top: 0.5rem !important; + /* margin-top: 0.5rem !important; */ } .ant-tree-switcher_open { - margin-top: 0.5rem !important; + /* margin-top: 0.5rem !important; */ } diff --git a/mirror-2/app/home/components/album-artwork.tsx b/mirror-2/app/home/components/album-artwork.tsx index b4ffd6af..efccc20b 100644 --- a/mirror-2/app/home/components/album-artwork.tsx +++ b/mirror-2/app/home/components/album-artwork.tsx @@ -1,9 +1,9 @@ -import Image from "next/image"; +import Image from 'next/image' -import { cn } from "@/lib/utils"; +import { cn } from '@/lib/utils' -import { Album } from "../data/albums"; -import { playlists } from "../data/playlists"; +import { Album } from '../data/albums' +import { playlists } from '../data/playlists' import { ContextMenu, ContextMenuTrigger, @@ -12,27 +12,27 @@ import { ContextMenuSub, ContextMenuSubTrigger, ContextMenuSubContent, - ContextMenuSeparator, -} from "@/components/ui/context-menu"; -import { PlusCircleIcon } from "lucide-react"; + ContextMenuSeparator +} from '@/components/ui/context-menu' +import { PlusCircleIcon } from 'lucide-react' interface AlbumArtworkProps extends React.HTMLAttributes { - album: Album; - aspectRatio?: "portrait" | "square"; - width?: number; - height?: number; + album: Album + aspectRatio?: 'portrait' | 'square' + width?: number + height?: number } export function AlbumArtwork({ album, - aspectRatio = "portrait", + aspectRatio = 'portrait', width, height, className, ...props }: AlbumArtworkProps) { return ( -
+
@@ -42,8 +42,8 @@ export function AlbumArtwork({ width={width} height={height} className={cn( - "h-auto w-auto object-cover transition-all hover:scale-105", - aspectRatio === "portrait" ? "aspect-[3/4]" : "aspect-square" + 'h-auto w-auto object-cover transition-all hover:scale-105', + aspectRatio === 'portrait' ? 'aspect-[3/4]' : 'aspect-square' )} />
@@ -91,5 +91,5 @@ export function AlbumArtwork({

{album.artist}

- ); + ) } diff --git a/mirror-2/app/home/components/menu.tsx b/mirror-2/app/home/components/menu.tsx index 6b7ba7bf..06f79afb 100644 --- a/mirror-2/app/home/components/menu.tsx +++ b/mirror-2/app/home/components/menu.tsx @@ -1,5 +1,19 @@ -import { Menubar, MenubarMenu, MenubarTrigger, MenubarContent, MenubarItem, MenubarSeparator, MenubarShortcut, MenubarSub, MenubarSubTrigger, MenubarSubContent, MenubarCheckboxItem, MenubarLabel, MenubarRadioGroup, MenubarRadioItem } from "@/components/ui/menubar"; - +import { + Menubar, + MenubarMenu, + MenubarTrigger, + MenubarContent, + MenubarItem, + MenubarSeparator, + MenubarShortcut, + MenubarSub, + MenubarSubTrigger, + MenubarSubContent, + MenubarCheckboxItem, + MenubarLabel, + MenubarRadioGroup, + MenubarRadioItem +} from '@/components/ui/menubar' export function Menu() { return ( @@ -74,7 +88,7 @@ export function Menu() { Burn Playlist to Disc... - Show in Finder ⇧⌘R{" "} + Show in Finder ⇧⌘R{' '} Convert @@ -112,7 +126,7 @@ export function Menu() { - Smart Dictation...{" "} + Smart Dictation...{' '} - Emoji & Symbols{" "} + Emoji & Symbols{' '} { - playlists: Playlist[]; + playlists: Playlist[] } export function Sidebar({ className, playlists, style }: SidebarProps) { return ( -
+

@@ -64,7 +64,7 @@ export function Sidebar({ className, playlists, style }: SidebarProps) { href={process.env.NEXT_PUBLIC_DISCORD_INVITE_URL} target="_blank" > - {" "} + {' '} Chat on Discord @@ -80,5 +80,5 @@ export function Sidebar({ className, playlists, style }: SidebarProps) {

- ); + ) } diff --git a/mirror-2/app/home/data/albums.ts b/mirror-2/app/home/data/albums.ts index 07bd95b2..73b11b5f 100644 --- a/mirror-2/app/home/data/albums.ts +++ b/mirror-2/app/home/data/albums.ts @@ -6,66 +6,66 @@ export interface Album { export const listenNowAlbums: Album[] = [ { - name: "React Rendezvous", - artist: "Ethan Byte", + name: 'React Rendezvous', + artist: 'Ethan Byte', cover: - "https://images.unsplash.com/photo-1611348586804-61bf6c080437?w=300&dpr=2&q=80", + 'https://images.unsplash.com/photo-1611348586804-61bf6c080437?w=300&dpr=2&q=80' }, { - name: "Async Awakenings", - artist: "Nina Netcode", + name: 'Async Awakenings', + artist: 'Nina Netcode', cover: - "https://images.unsplash.com/photo-1468817814611-b7edf94b5d60?w=300&dpr=2&q=80", + 'https://images.unsplash.com/photo-1468817814611-b7edf94b5d60?w=300&dpr=2&q=80' }, { - name: "The Art of Reusability", - artist: "Lena Logic", + name: 'The Art of Reusability', + artist: 'Lena Logic', cover: - "https://images.unsplash.com/photo-1528143358888-6d3c7f67bd5d?w=300&dpr=2&q=80", + 'https://images.unsplash.com/photo-1528143358888-6d3c7f67bd5d?w=300&dpr=2&q=80' }, { - name: "Stateful Symphony", - artist: "Beth Binary", + name: 'Stateful Symphony', + artist: 'Beth Binary', cover: - "https://images.unsplash.com/photo-1490300472339-79e4adc6be4a?w=300&dpr=2&q=80", - }, + 'https://images.unsplash.com/photo-1490300472339-79e4adc6be4a?w=300&dpr=2&q=80' + } ] export const madeForYouAlbums: Album[] = [ { - name: "Thinking Components", - artist: "Lena Logic", + name: 'Thinking Components', + artist: 'Lena Logic', cover: - "https://images.unsplash.com/photo-1615247001958-f4bc92fa6a4a?w=300&dpr=2&q=80", + 'https://images.unsplash.com/photo-1615247001958-f4bc92fa6a4a?w=300&dpr=2&q=80' }, { - name: "Functional Fury", - artist: "Beth Binary", + name: 'Functional Fury', + artist: 'Beth Binary', cover: - "https://images.unsplash.com/photo-1513745405825-efaf9a49315f?w=300&dpr=2&q=80", + 'https://images.unsplash.com/photo-1513745405825-efaf9a49315f?w=300&dpr=2&q=80' }, { - name: "React Rendezvous", - artist: "Ethan Byte", + name: 'React Rendezvous', + artist: 'Ethan Byte', cover: - "https://images.unsplash.com/photo-1614113489855-66422ad300a4?w=300&dpr=2&q=80", + 'https://images.unsplash.com/photo-1614113489855-66422ad300a4?w=300&dpr=2&q=80' }, { - name: "Stateful Symphony", - artist: "Beth Binary", + name: 'Stateful Symphony', + artist: 'Beth Binary', cover: - "https://images.unsplash.com/photo-1446185250204-f94591f7d702?w=300&dpr=2&q=80", + 'https://images.unsplash.com/photo-1446185250204-f94591f7d702?w=300&dpr=2&q=80' }, { - name: "Async Awakenings", - artist: "Nina Netcode", + name: 'Async Awakenings', + artist: 'Nina Netcode', cover: - "https://images.unsplash.com/photo-1468817814611-b7edf94b5d60?w=300&dpr=2&q=80", + 'https://images.unsplash.com/photo-1468817814611-b7edf94b5d60?w=300&dpr=2&q=80' }, { - name: "The Art of Reusability", - artist: "Lena Logic", + name: 'The Art of Reusability', + artist: 'Lena Logic', cover: - "https://images.unsplash.com/photo-1490300472339-79e4adc6be4a?w=300&dpr=2&q=80", - }, + 'https://images.unsplash.com/photo-1490300472339-79e4adc6be4a?w=300&dpr=2&q=80' + } ] diff --git a/mirror-2/app/home/data/playlists.ts b/mirror-2/app/home/data/playlists.ts index 5c0ed5f7..afa7678e 100644 --- a/mirror-2/app/home/data/playlists.ts +++ b/mirror-2/app/home/data/playlists.ts @@ -1,16 +1,16 @@ export type Playlist = (typeof playlists)[number] export const playlists = [ - "Recently Added", - "Recently Played", - "Top Songs", - "Top Albums", - "Top Artists", - "Logic Discography", - "Bedtime Beats", - "Feeling Happy", - "I miss Y2K Pop", - "Runtober", - "Mellow Days", - "Eminem Essentials", + 'Recently Added', + 'Recently Played', + 'Top Songs', + 'Top Albums', + 'Top Artists', + 'Logic Discography', + 'Bedtime Beats', + 'Feeling Happy', + 'I miss Y2K Pop', + 'Runtober', + 'Mellow Days', + 'Eminem Essentials' ] diff --git a/mirror-2/app/home/page.tsx b/mirror-2/app/home/page.tsx index 7c62e040..82d3ed59 100644 --- a/mirror-2/app/home/page.tsx +++ b/mirror-2/app/home/page.tsx @@ -1,19 +1,19 @@ -"use client"; -import Image from "next/image"; -import { Sidebar } from "./components/sidebar"; -import { listenNowAlbums, madeForYouAlbums } from "./data/albums"; -import { playlists } from "./data/playlists"; -import { Separator } from "@/components/ui/separator"; -import { appDescription, appName } from "@/lib/theme-service"; -import AccountDropdownMenu from "@/components/ui/account-dropdown-menu"; -import { Card, CardContent, CardFooter } from "@/components/ui/card"; -import { useGetSpacesByUserIdQuery } from "@/state/spaces"; +'use client' +import Image from 'next/image' +import { Sidebar } from './components/sidebar' +import { listenNowAlbums, madeForYouAlbums } from './data/albums' +import { playlists } from './data/playlists' +import { Separator } from '@/components/ui/separator' +import { appDescription, appName } from '@/lib/theme-service' +import AccountDropdownMenu from '@/components/ui/account-dropdown-menu' +import { Card, CardContent, CardFooter } from '@/components/ui/card' +import { useGetSpacesByUserIdQuery } from '@/state/spaces' const dummyImg = - "https://images.unsplash.com/photo-1513745405825-efaf9a49315f?w=300&dpr=2&q=80"; + 'https://images.unsplash.com/photo-1513745405825-efaf9a49315f?w=300&dpr=2&q=80' export default function Home() { - const { data: spaces, error } = useGetSpacesByUserIdQuery(""); + const { data: spaces, error } = useGetSpacesByUserIdQuery('') return ( <> @@ -38,7 +38,7 @@ export default function Home() { playlists={playlists} className="hidden lg:block w " style={{ - width: "25%", + width: '25%' }} />
@@ -60,8 +60,8 @@ export default function Home() { @@ -71,8 +71,8 @@ export default function Home() { height={250} alt={album?.name} style={{ - height: "250px", - width: "100%", + height: '250px', + width: '100%' }} /> @@ -105,8 +105,8 @@ export default function Home() { @@ -116,8 +116,8 @@ export default function Home() { height={250} alt={space?.name} style={{ - height: "250px", - width: "100%", + height: '250px', + width: '100%' }} /> @@ -127,7 +127,7 @@ export default function Home() { {space?.name}

- Created At {space?.created_at.split("T")[0]} + Created At {space?.created_at.split('T')[0]}

@@ -141,5 +141,5 @@ export default function Home() {
- ); + ) } diff --git a/mirror-2/app/layout.client.tsx b/mirror-2/app/layout.client.tsx index 8f6e55d8..46ec8b74 100644 --- a/mirror-2/app/layout.client.tsx +++ b/mirror-2/app/layout.client.tsx @@ -1,8 +1,8 @@ -"use client" -import { store } from "@/state/store"; +'use client' +import { store } from '@/state/store' import { Provider } from 'react-redux' -import { ThemeProvider } from "next-themes"; -import { useSetupAuthEvents } from "@/hooks/auth"; +import { ThemeProvider } from 'next-themes' +import { useSetupAuthEvents } from '@/hooks/auth' export default function ClientLayout({ children }) { return ( @@ -22,10 +22,5 @@ export default function ClientLayout({ children }) { // separate component here because auth setup needs to be within the store export function AuthLayout({ children }) { useSetupAuthEvents() - return ( -
- {children} -
- - ) + return
{children}
} diff --git a/mirror-2/app/layout.tsx b/mirror-2/app/layout.tsx index 2dbb172e..2bf8eef5 100644 --- a/mirror-2/app/layout.tsx +++ b/mirror-2/app/layout.tsx @@ -1,32 +1,28 @@ -import ClientLayout from "@/app/layout.client"; +import ClientLayout from '@/app/layout.client' import { Montserrat } from 'next/font/google' -import "./globals.css"; -import { Metadata } from "next"; -import { appName, appDescription, faviconPath } from "@/lib/theme-service"; -import Analytics from "@/utils/analytics/analytics"; +import './globals.css' +import { Metadata } from 'next' +import { appName, appDescription, faviconPath } from '@/lib/theme-service' +import '@/utils/analytics/analytics' + export const metadata: Metadata = { title: appName(), - description: appDescription(), + description: appDescription() } const montserrat = Montserrat({ subsets: ['latin'], - display: 'swap', + display: 'swap' }) -export default function RootLayout({ - children, -}) { +export default function RootLayout({ children }) { return ( - - - {children} - + {children} - + ) } diff --git a/mirror-2/app/opengraph-image.png b/mirror-2/app/opengraph-image.png deleted file mode 100644 index 57595e66..00000000 Binary files a/mirror-2/app/opengraph-image.png and /dev/null differ diff --git a/mirror-2/app/page.tsx b/mirror-2/app/page.tsx index 7e2e91af..9b2d3e15 100644 --- a/mirror-2/app/page.tsx +++ b/mirror-2/app/page.tsx @@ -1,16 +1,6 @@ -import Hero from "@/components/hero"; -import ConnectSupabaseSteps from "@/components/tutorial/connect-supabase-steps"; -import SignUpUserSteps from "@/components/tutorial/sign-up-user-steps"; -import { hasEnvVars } from "@/utils/supabase/check-env-vars"; +import Hero from '@/components/hero' +import { hasEnvVars } from '@/utils/supabase/check-env-vars' export default async function Index() { - return ( - <> - -
-

Next steps

- {hasEnvVars ? : } -
- - ); + return <>Temp, should be deleted } diff --git a/mirror-2/app/protected/blank-redirect.tsx b/mirror-2/app/protected/blank-redirect.tsx index c269bb00..0c43113f 100644 --- a/mirror-2/app/protected/blank-redirect.tsx +++ b/mirror-2/app/protected/blank-redirect.tsx @@ -1,8 +1,8 @@ -"use client"; +'use client' -import { useRedirectToHomeIfSignedIn } from "@/hooks/auth"; +import { useRedirectToHomeIfSignedIn } from '@/hooks/auth' export function BlankRedirect() { - useRedirectToHomeIfSignedIn(); - return <> ; + useRedirectToHomeIfSignedIn() + return <> } diff --git a/mirror-2/app/protected/page.tsx b/mirror-2/app/protected/page.tsx index 9fd4fa88..a5b4c418 100644 --- a/mirror-2/app/protected/page.tsx +++ b/mirror-2/app/protected/page.tsx @@ -1,19 +1,20 @@ -import { BlankRedirect } from "@/app/protected/blank-redirect"; -import { createServerClient } from "@/utils/supabase/server"; -import { redirect } from "next/navigation"; +import { BlankRedirect } from '@/app/protected/blank-redirect' +import { createServerClient } from '@/utils/supabase/server' +import { redirect } from 'next/navigation' export default async function ProtectedPage() { - const supabase = createServerClient(); + const supabase = createServerClient() + const { - data: { user }, - } = await supabase.auth.getUser(); + data: { user } + } = await supabase.auth.getUser() if (!user) { - return redirect("/login"); + return redirect('/login') } return ( // delete this page eventually. it's here from boilerplate auth that users server side - ); + ) } diff --git a/mirror-2/app/protected/reset-password/page.tsx b/mirror-2/app/protected/reset-password/page.tsx index 1b2938e2..bd32e745 100644 --- a/mirror-2/app/protected/reset-password/page.tsx +++ b/mirror-2/app/protected/reset-password/page.tsx @@ -1,13 +1,13 @@ -import { resetPasswordAction } from "@/actions/auth"; -import { FormMessage, Message } from "@/components/form-message"; -import { SubmitButton } from "@/components/submit-button"; -import { Input } from "@/components/ui/input"; -import { Label } from "@/components/ui/label"; +import { resetPasswordAction } from '@/actions/auth' +import { FormMessage, Message } from '@/components/form-message' +import { SubmitButton } from '@/components/submit-button' +import { Input } from '@/components/ui/input' +import { Label } from '@/components/ui/label' export default async function ResetPassword({ - searchParams, + searchParams }: { - searchParams: Message; + searchParams: Message }) { return (
@@ -36,5 +36,5 @@ export default async function ResetPassword({ - ); + ) } diff --git a/mirror-2/app/space/[spaceId]/build/controlBar/assets.tsx b/mirror-2/app/space/[spaceId]/build/controlBar/assets.tsx index 71c44677..79dfef5a 100644 --- a/mirror-2/app/space/[spaceId]/build/controlBar/assets.tsx +++ b/mirror-2/app/space/[spaceId]/build/controlBar/assets.tsx @@ -5,7 +5,7 @@ import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger } import AssetUploadButton from '@/components/ui/custom-buttons/asset-upload.button'; import { Form, FormControl, FormField, FormItem, FormMessage, FormSuccessMessage } from '@/components/ui/form'; import { Input } from '@/components/ui/input'; -import { useLazySearchAssetsQuery, useLazyGetUserMostRecentlyUpdatedAssetsQuery, useLazyDownloadAssetQuery } from '@/state/assets'; +import { useLazySearchAssetsQuery, useLazyGetUserMostRecentlyUpdatedAssetsQuery, useLazyDownloadAssetQuery } from '@/state/api/assets'; import downloadFile from '@/utils/download-file'; import { createSupabaseBrowserClient } from '@/utils/supabase/client'; diff --git a/mirror-2/app/space/[spaceId]/build/controlBar/control-bar.tsx b/mirror-2/app/space/[spaceId]/build/controlBar/control-bar.tsx index 2c4b09f0..bff5540b 100644 --- a/mirror-2/app/space/[spaceId]/build/controlBar/control-bar.tsx +++ b/mirror-2/app/space/[spaceId]/build/controlBar/control-bar.tsx @@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button"; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; import { useUiHoverSoundEffect } from "@/components/ui/ui-sounds"; import { useAppDispatch, useAppSelector } from "@/hooks/hooks"; -import { ControlBarView, selectControlBarCurrentView, selectUiSoundsCanPlay, setControlBarCurrentView, turnOffUiSounds, turnOnUiSounds } from "@/state/local"; +import { ControlBarView, selectControlBarCurrentView, selectUiSoundsCanPlay, setControlBarCurrentView, turnOffUiSounds, turnOnUiSounds } from "@/state/local.slice"; import { Box, Clapperboard, Code2, Database, GitBranch, ListTree, Settings, Volume2, VolumeOff } from "lucide-react"; export default function ControlBar() { @@ -28,7 +28,7 @@ export default function ControlBar() { return ( -