diff --git a/components/Content/Inventory/UserOwnedItems.tsx b/components/Content/Inventory/UserOwnedItems.tsx index 5829bec5..3291e2dd 100644 --- a/components/Content/Inventory/UserOwnedItems.tsx +++ b/components/Content/Inventory/UserOwnedItems.tsx @@ -50,17 +50,17 @@ const OwnedItemsList: React.FC = () => { // Function to calculate the position of each item around the circle const calculatePosition = (index: number, totalItems: number) => { const angle = (index / totalItems) * 360; - const radius = 125; // Adjust as needed - const centerX = 175; // Adjust as needed + const radius = 15; // Adjust as needed + const centerX = 15; // Adjust as needed const centerY = 175; // Adjust as needed const x = centerX + radius * Math.cos(angle); const y = centerY + radius * Math.sin(angle); return { x, y }; }; - const radius = 150; + const radius = 100; return ( -
+
{itemDetails.map((item, index) => { const angle = (index / itemDetails.length) * 2 * Math.PI; const x = Math.cos(angle) * radius; diff --git a/components/Overlays/1-Feed.tsx b/components/Overlays/1-Feed.tsx new file mode 100644 index 00000000..e840a295 --- /dev/null +++ b/components/Overlays/1-Feed.tsx @@ -0,0 +1,24 @@ +import React from 'react'; +import { GardenDashboard } from '../../@/components/garden-dashboard'; + +interface FeedOverlayProps { + onClose: () => void; +} + +const FeedOverlay: React.FC = ({ onClose }) => { + return ( +
+
+
+

Feed Overlay

+ + +
+
+
+ ); +}; + +export default FeedOverlay; diff --git a/components/Section/Layout.tsx b/components/Section/Layout.tsx index cefffa58..aac91e0a 100644 --- a/components/Section/Layout.tsx +++ b/components/Section/Layout.tsx @@ -44,39 +44,6 @@ const Layout: React.FC = ({ children }) => { export default Layout; -export const LandingLayout: React.FC = ({ children }) => { - const [isMobile, setIsMobile] = useState(false); - - useEffect(() => { // Check if window is defined before accessing it - if (typeof window !== "undefined") { - const checkIsMobile = () => { - setIsMobile(window.innerWidth <= 768); - }; - checkIsMobile(); - window.addEventListener("resize", checkIsMobile); - return () => { - window.removeEventListener("resize", checkIsMobile); - }; - } - }, []); - - return ( - <> -
-
- {children} -
-
- {isMobile && ( -
-
{children}
- {/* */} -
- )} - - ); -}; - export const InventoryLayout: React.FC = ({ children }) => { const [isMobile, setIsMobile] = useState(false); const [activeTab, setActiveTab] = useState('consumables') @@ -133,11 +100,11 @@ export const LayoutNoNav: React.FC = ({ children }) => {
{children}
- {isMobile && ( + {/* {isMobile && (
- )} + )} */}
); }; \ No newline at end of file diff --git a/pages/index.tsx b/pages/index.tsx index 3a15af75..a007541e 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,22 +1,18 @@ import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react"; import React, { useEffect, useState } from "react"; -import Layout, { LandingLayout } from "../components/Section/Layout"; -import CardForum from "../components/Content/DiscussCard"; +import Layout, { LayoutNoNav } from "../components/Section/Layout"; import { useRouter } from "next/router"; -import Login from "./login"; -import styles from '../styles/Landing.module.css'; import { Metadata } from "next"; -import { Auth, ThemeSupa } from '@supabase/auth-ui-react'; // Imports for new landing (public-facing) import { Dialog } from "@headlessui/react"; import { AiFillCloseCircle } from 'react-icons/ai'; import { HiBars3 } from 'react-icons/hi2'; -import { BiLogIn } from 'react-icons/bi'; import { footerNavigation, modules, navigation } from "../components/Public/LandingContent"; import { UserDropdownMenu, UserMenuItems } from "../components/Section/Navbar"; import { GardenDashboard } from "../@/components/garden-dashboard"; +import FeedOverlay from "../components/Overlays/1-Feed"; export const metadata: Metadata = { title: "Star Sailors" @@ -30,11 +26,46 @@ export function PublicLanding () { const session = useSession(); + // Component context + const [showFeedOverlay, setShowFeedOverlay] = useState(false); + const handleOpenFeedOverlay = () => { + setShowFeedOverlay(true); + }; + if (session) { return ( - - - + +
+ + +
+ {showFeedOverlay && + <> +
+ setShowFeedOverlay(false)} /> +
+ + } +
+
+
); }; @@ -447,24 +478,6 @@ export default function Home() { const userId = session?.user?.id; - // useEffect(() => { - // if (session) { - // router.push('/feed'); - // } - // }, [session, router]); - - // if (session) { - // return ( - // - // {/* {userId} */} - //
- // - //
- //
- // // - // ) - // } - return ( ); diff --git a/public/assets/Inventory/Planets/Europa.png b/public/assets/Inventory/Planets/Europa.png new file mode 100644 index 00000000..2fba5d86 Binary files /dev/null and b/public/assets/Inventory/Planets/Europa.png differ