Skip to content

Commit

Permalink
🏦🍭 ↝ Moving files around
Browse files Browse the repository at this point in the history
  • Loading branch information
Gizmotronn committed Mar 17, 2024
1 parent 3ca370d commit 0443756
Show file tree
Hide file tree
Showing 37 changed files with 44 additions and 135 deletions.
2 changes: 1 addition & 1 deletion components/Authentication/LoginModal.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReactNode, useEffect } from 'react';
// import { useHistory } from 'react-router-dom';
import Link from 'next/link';
import Layout from '../../components/Section/Layout';
import Layout from '../Core/Section/Layout';
import { Auth, ThemeSupa } from '@supabase/auth-ui-react';
import { useSession, useSupabaseClient } from '@supabase/auth-helpers-react';
import { useRouter } from 'next/router';
Expand Down
2 changes: 1 addition & 1 deletion components/Content/Archive/ArchivedInventory.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
import Layout from "../../Section/Layout";
import Layout from "../../Core/Section/Layout";
import OwnedPlanetsList from "./UserOwnedPlanets"; // Potentially this should be in a lists component dir
import OwnedItemsList from "../Inventory/UserOwnedItems";
import MySpaceships from "../Inventory/Vehicles/MySpaceships";
Expand Down
12 changes: 6 additions & 6 deletions components/Content/CreatePostForm.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
import { Button } from "../ui/Button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../ui/Card";
import { Form, FormControl, FormField, FormItem, FormMessage } from "../ui/Form";
import { Textarea } from "../ui/TextArea";
import { useToast } from "../ui/use-toast";
import { Button } from "../Core/ui/Button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../Core/ui/Card";
import { Form, FormControl, FormField, FormItem, FormMessage } from "../Core/ui/Form";
import { Textarea } from "../Core/ui/TextArea";
import { useToast } from "../Core/ui/use-toast";
import { zodResolver } from "@hookform/resolvers/zod";
import { VenetianMask } from "lucide-react";
import React, { useContext, useEffect, useState} from "react";
import { useForm } from "react-hook-form";
import { UserContext } from "../../context/UserContext";
import { useRouter } from "next/router";
import { Avatar, AvatarFallback } from "../ui/Avatar";
import { Avatar, AvatarFallback } from "../Core/ui/Avatar";
import { AvatarImage } from "@radix-ui/react-avatar";

// -----------
Expand Down
6 changes: 3 additions & 3 deletions components/Content/DiscussCard.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { AvatarFallback, Avatar, AvatarImage } from "../ui/Avatar";
import { Button } from "../ui/Button";
import { AvatarFallback, Avatar, AvatarImage } from "../Core/ui/Avatar";
import { Button } from "../Core/ui/Button";
import { Card, CardContent, CardFooter, CardTitle } from "./PostCard";
import { Separator } from "@radix-ui/react-separator";
import { useToast } from "../ui/use-toast";
import { useToast } from "../Core/ui/use-toast";
import { getMetaData } from "../../lib/helper/str.helper";
import { Megaphone, MessagesSquare, Share2 } from "lucide-react";
import Link from "next/link";
Expand Down
2 changes: 1 addition & 1 deletion components/Content/Planets/Base/BasePlanetAllSectors.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from "react";
import { useRouter } from "next/router";
import { useSupabaseClient, useSession } from "@supabase/auth-helpers-react";
import Card from "../../../Card";
import Card from "../../../Core/Card";

export default function BasePlanetSectors({ planetId }: { planetId: string }) {
const router = useRouter();
Expand Down
2 changes: 1 addition & 1 deletion components/Content/Planets/PlanetData/RandomRoverImage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
import axios from "axios";
import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
import Card from "../../../Card";
import Card from "../../../Core/Card";
import { RoverContentPostForm } from "../../CreatePostForm";

interface RoverImageCardProps {
Expand Down
8 changes: 4 additions & 4 deletions components/Content/RoverData/RoverExplore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { useRouter } from "next/router";
import React, { useEffect, useState } from "react";

// UI elements
import { Button } from "../../ui/Button";
import { Checkbox } from "../../ui/checkbox";
import { Button } from "../../Core/ui/Button";
import { Checkbox } from "../../Core/ui/checkbox";
// import { ResponsiveLine } from "@nivo/line";
import { Input } from "../../ui/input";
import { Textarea } from "../../ui/TextArea";
import { Input } from "../../Core/ui/input";
import { Textarea } from "../../Core/ui/TextArea";

export default function RoverExploreDesktop({ id }: { id: string }) {
const supabase = useSupabaseClient();
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Navbar from "./Navbar";
import React, { ReactNode, useEffect, useState } from "react";
import Bottombar from "../Core/BottomBar";
import Bottombar from "../BottomBar";
import { useMediaQuery } from "react-responsive";
import FeedOverlay from "../Overlays/1-Feed";
import FeedOverlay from "../../Overlays/1-Feed";

interface DashboardLayoutProps {
children: ReactNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { LucideIcon } from "lucide-react";
import Link from "next/link";
import { usePathname, useSearchParams } from "next/navigation";
import React from "react";
import { checkCurrentActiveUrl } from "../../lib/helper/str.helper";
import { checkCurrentActiveUrl } from "../../../lib/helper/str.helper";

type TProps = {
url: string;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion components/ui/Avatar.tsx → components/Core/ui/Avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from "react";
import * as AvatarPrimitive from '@radix-ui/react-avatar';

import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";

const Avatar = React.forwardRef<
React.ElementRef<typeof AvatarPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion components/ui/Button.tsx → components/Core/ui/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from "react";
import { Slot } from "@radix-ui/react-slot";
import { cva, type VariantProps } from "class-variance-authority";

import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";

const buttonVariants = cva(
"inline-flex items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
Expand Down
2 changes: 1 addition & 1 deletion components/ui/Card.tsx → components/Core/ui/Card.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";

const Card = React.forwardRef<
HTMLDivElement,
Expand Down
2 changes: 1 addition & 1 deletion components/ui/Form.tsx → components/Core/ui/Form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from "react";
import * as LabelPrimitive from "@radix-ui/react-label";
import { Slot } from "@radix-ui/react-slot";
import { Controller, ControllerProps, FieldPath, FieldValues, FormProvider, useFormContext } from "react-hook-form";
import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";
import { Label } from "./Label";

const Form = FormProvider;
Expand Down
2 changes: 1 addition & 1 deletion components/ui/Label.tsx → components/Core/ui/Label.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from "react";
import * as LabelPrimitive from "@radix-ui/react-label";
import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";

const labelVariants = cva(
"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as React from "react";
import * as SeparatorPrimitive from "@radix-ui/react-separator";

import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";

const Separator = React.forwardRef<
React.ElementRef<typeof SeparatorPrimitive.Root>,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";

import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";

export interface TextareaProps
extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from "react"
import { Slot } from "@radix-ui/react-slot"
import { cva, type VariantProps } from "class-variance-authority"

import { cn } from "../../../lib/uitls";
import { cn } from "../../../../lib/uitls";

const buttonVariants = cva(
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react"

import { cn } from "../../../lib/uitls";
import { cn } from "../../../../lib/uitls";

const Card = React.forwardRef<
HTMLDivElement,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
DotFilledIcon,
} from "@radix-ui/react-icons"

import { cn } from "../../../lib/uitls";
import { cn } from "../../../../lib/uitls";

const DropdownMenu = DropdownMenuPrimitive.Root

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as React from "react"
import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
import { CheckIcon } from "@radix-ui/react-icons"

import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";

const Checkbox = React.forwardRef<
React.ElementRef<typeof CheckboxPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion components/ui/input.tsx → components/Core/ui/input.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react"

import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";

export interface InputProps
extends React.InputHTMLAttributes<HTMLInputElement> {}
Expand Down
2 changes: 1 addition & 1 deletion components/ui/toast.tsx → components/Core/ui/toast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Cross2Icon } from "@radix-ui/react-icons";
import * as ToastPrimitives from "@radix-ui/react-toast";
import { cva, type VariantProps } from "class-variance-authority";

import { cn } from "../../lib/uitls";
import { cn } from "../../../lib/uitls";

const ToastProvider = ToastPrimitives.Provider;

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion components/Gameplay/FactionHomebase.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import Card from "../Card";
import Card from "../Core/Card";
import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
import { FactionPostForm } from "../Content/CreatePostForm";
import { FactionFeed } from "../Content/ClassificationFeed";
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion components/Modals/UponSignup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @see https://v0.dev/t/bOg9oEOPYfV
* Documentation: https://v0.dev/docs#integrating-generated-code-into-your-nextjs-app
*/
import { Button } from "../ui/Button"
import { Button } from "../Core/ui/Button"

export default function UponSignupModal() {
return (
Expand Down
8 changes: 4 additions & 4 deletions components/Modals/rover-interface.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Button } from "../ui/Button";
import { Checkbox } from "../ui/checkbox";
import { Button } from "../Core/ui/Button";
import { Checkbox } from "../Core/ui/checkbox";
// import { ResponsiveLine } from "@nivo/line";
import { Input } from "../ui/input";
import { Input } from "../Core/ui/input";

import { Textarea } from "../ui/TextArea";
import { Textarea } from "../Core/ui/TextArea";

export function RoverInterface() {
return (
Expand Down
4 changes: 2 additions & 2 deletions components/Modals/rover-mobile-test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button } from "../ui/Button";
import { Checkbox } from "../ui/checkbox";
import { Button } from "../Core/ui/Button";
import { Checkbox } from "../Core/ui/checkbox";
import { Line } from "react-chartjs-2";

export function RoverMobileTest() {
Expand Down
2 changes: 1 addition & 1 deletion components/Overlays/1-Feed.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import { GardenDashboard } from '../garden-dashboard';
import { Button } from '../ui/addons/button';
import { Button } from '../Core/ui/addons/button';
import { useMediaQuery } from 'react-responsive';
import Link from 'next/link';

Expand Down
2 changes: 1 addition & 1 deletion components/dashboard-logs.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ShoppingBagIcon } from "@heroicons/react/24/outline";
import { CardTitle, CardHeader, CardContent, Card } from "./ui/addons/card";
import { CardTitle, CardHeader, CardContent, Card } from "./Core/ui/addons/card";
import OwnedItemsList from "./Content/Inventory/UserOwnedItems";

export function InventoryBlock() {
Expand Down
3 changes: 1 addition & 2 deletions components/garden-dashboard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Link from "next/link"
import { Button } from "./ui/addons/button"
import { Button } from "./Core/ui/addons/button"
import { DashboardLogs, InventoryBlock } from "./dashboard-logs";
import { useState } from "react";
import { Garden } from "./Content/Planets/GalleryList";
Expand All @@ -15,7 +15,6 @@ export function GardenDashboard() {
<div className="flex-1 flex flex-col items-center justify-center text-center">
<div className="grid gap-4 p-4">
</div>
{/* <QuickLook /> */}
{/* <DashboardLogs /> */}
<InventoryBlock />
<Button onClick={handleOpenGalaxy} className="mt-4 px-4 py-2 rounded">
Expand Down
90 changes: 0 additions & 90 deletions components/quick-look.tsx

This file was deleted.

0 comments on commit 0443756

Please sign in to comment.