Skip to content

Commit

Permalink
🥕 v0.16.0-a.6 🌱 ThreeD Garden: Cleanup Time
Browse files Browse the repository at this point in the history
  • Loading branch information
marty-mcgee committed May 14, 2024
1 parent 2a05b10 commit 7732851
Show file tree
Hide file tree
Showing 20 changed files with 30 additions and 29 deletions.
2 changes: 1 addition & 1 deletion app/LayoutWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { useRef } from 'react'
import dynamic from 'next/dynamic'
// const Scene = dynamic(() => import('@/components/canvas/Scene'), { ssr: false })
// const Scene = dynamic(() => import('#/components/canvas/Scene'), { ssr: false })

const LayoutWrapper = ({ children }: { children: any}) => {
const id: string = 'HEYHEYHEY'
Expand Down
2 changes: 1 addition & 1 deletion app/api-example/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use client"
import CustomLink from "@/components/custom-link"
import CustomLink from "#/components/custom-link"
import { useEffect, useState } from "react"

export default function Page() {
Expand Down
2 changes: 1 addition & 1 deletion app/client-example/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { auth } from "~/app/auth"
import ClientExample from "@/components/client-example"
import ClientExample from "#/components/client-example"
import { SessionProvider } from "next-auth/react"

export default async function ClientPage() {
Expand Down
8 changes: 4 additions & 4 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ import '~/app/_styles.css' // additional global basic css
// ** LAYOUT Components (Head, Main, Foot)
import LayoutWrapper from '~/app/LayoutWrapper'
// // import { LayoutWrapper } from '~/app/LayoutWrapper'
// import Header from '@/components/header'
// import Footer from '@/components/footer'
// // const Header = dynamic(() => import('@/components/header').then((mod) => mod), { ssr: false })
// // const Footer = dynamic(() => import('@/components/footer').then((mod) => mod), { ssr: false })
// import Header from '#/components/header'
// import Footer from '#/components/footer'
// // const Header = dynamic(() => import('#/components/header').then((mod) => mod), { ssr: false })
// // const Footer = dynamic(() => import('#/components/footer').then((mod) => mod), { ssr: false })

// ** FONTS ??
// import { Inter } from 'next/font/google' // Roboto?
Expand Down
2 changes: 1 addition & 1 deletion app/middleware-example/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import CustomLink from "@/components/custom-link"
import CustomLink from "#/components/custom-link"

export default function Page() {
return (
Expand Down
4 changes: 2 additions & 2 deletions app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// ==============================================================
// RESOURCES (to import)

import CustomLink from "@/components/custom-link"
import SessionData from "@/components/session-data"
import CustomLink from "#/components/custom-link"
import SessionData from "#/components/session-data"
import { auth } from "~/app/auth"

// ** Next
Expand Down
4 changes: 2 additions & 2 deletions app/server-example/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import CustomLink from "@/components/custom-link"
import SessionData from "@/components/session-data"
import CustomLink from "#/components/custom-link"
import SessionData from "#/components/session-data"
import { auth } from "~/app/auth"

export default async function Page() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/custom-link.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { cn } from "@/lib/utils/utils"
import { cn } from "#/lib/utils/utils"
import { ExternalLink } from "lucide-react"
import Link from "next/link"

Expand Down
2 changes: 1 addition & 1 deletion src/components/main-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import Image from 'next/image'

import { cn } from '@/lib/utils/utils'
import { cn } from '#/lib/utils/utils'
import CustomLink from './custom-link'
import {
NavigationMenu,
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as React from "react"
import * as AvatarPrimitive from "@radix-ui/react-avatar"

import { cn } from "@/lib/utils/utils"
import { cn } from "#/lib/utils/utils"

const Avatar = React.forwardRef<
React.ElementRef<typeof AvatarPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion src/components/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/utils/utils"
import { cn } from "#/lib/utils/utils"

const buttonVariants = cva(
"inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/dropdown-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as React from "react"
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
import { Check, ChevronRight, Circle } from "lucide-react"

import { cn } from "@/lib/utils/utils"
import { cn } from "#/lib/utils/utils"

const DropdownMenu = DropdownMenuPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion src/components/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/utils/utils"
import { cn } from "#/lib/utils/utils"

export interface InputProps
extends React.InputHTMLAttributes<HTMLInputElement> {}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/navigation-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu"
import { cva } from "class-variance-authority"
import { ChevronDown } from "lucide-react"

import { cn } from "@/lib/utils/utils"
import { cn } from "#/lib/utils/utils"

const NavigationMenu = React.forwardRef<
React.ElementRef<typeof NavigationMenuPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/threed/components/canvas/Canvas.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// RESOURCES

// import ThreeDExperience from '#/lib/threed/components/canvas/Experience'
import { threedIO } from '@/lib/threed/threedio/threedIO' // ThreeDExperience ExperienceViewer Experience
import { threedIO } from '#/lib/threed/threedio/threedIO' // ThreeDExperience ExperienceViewer Experience



Expand Down
4 changes: 2 additions & 2 deletions src/lib/threed/components/canvas/Experience.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import Steps from '#/lib/threed/components/examples/Steps'
import Slopes from '#/lib/threed/components/examples/Slopes'
import RoughPlane from '#/lib/threed/components/examples/RoughPlane'
import RigidObjects from '#/lib/threed/components/examples/RigidObjects'
import FloatingPlatforms from '@/lib/threed/components/examples/threed/FloatingPlatforms'
import DynamicPlatforms from '@/lib/threed/components/examples/DynamicPlatforms'
import FloatingPlatforms from '#/lib/threed/components/examples/FloatingPlatforms'
import DynamicPlatforms from '#/lib/threed/components/examples/DynamicPlatforms'
import ShotCube from '#/lib/threed/components/examples/ShotCube'
import Map from '#/lib/threed/components/examples/Map'

Expand Down
2 changes: 1 addition & 1 deletion src/lib/threed/components/canvas/ExperienceViewer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { forwardRef, Suspense, useImperativeHandle, useRef } from 'react'
import { OrbitControls, PerspectiveCamera, View as ThreeDViewer } from '@react-three/drei'
import { ThreedIO } from '@/lib/threed/helpers/components/ThreedIO'
import { ThreedIO } from '#/lib/threed/helpers/components/ThreedIO'

// export const Common = ({ color }) => (
// <Suspense fallback={null}>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/threed/components/dom/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { useRef } from 'react'
import dynamic from 'next/dynamic'
const Scene = dynamic(() => import('@/lib/threed/components/canvas/Scene'), { ssr: false })
const Scene = dynamic(() => import('#/lib/threed/components/canvas/Scene'), { ssr: false })

const Layout = ({ children }) => {
const ref = useRef()
Expand Down
4 changes: 2 additions & 2 deletions src/lib/threed/threedio/components/ThreedIO.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

// import { tunnelratIO } from '@/lib/threed/helpers/threedIO'
import { threedIO } from '@/lib/threed/helpers/threedIO'
// import { tunnelratIO } from '#/lib/threed/helpers/threedIO'
import { threedIO } from '#/lib/threed/helpers/threedIO'

export const ThreedIO = ({ children }) => {
return <threedIO.In>{children}</threedIO.In>
Expand Down
7 changes: 4 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
"baseUrl": ".",
"paths": {
"auth": ["app/auth"], // next-auth
"@/*": ["src/*"], // next-auth
"#/*": ["src/*"], // preferable (next-14)
"~/*": ["*"], // preferable (next, nuxt)
"@/*": ["app/*"], // threed (next-14)
"#/*": ["src/*"], // threed (next-14)
"~/*": ["*"], // global
"~~/*": ["src/*"], // global src
},
"typeRoots": ["node_modules/@types", "src/lib/types"],
// plugins
Expand Down

1 comment on commit 7732851

@vercel
Copy link

@vercel vercel bot commented on 7732851 May 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.