diff --git a/Readme.md b/Readme.md index 190e477..ab6421b 100644 --- a/Readme.md +++ b/Readme.md @@ -37,7 +37,7 @@ This project is a real-time communication application offering various communica 1. Clone the repository to your local machine. ``` -https://github.com/amitamrutiya2210/MeetnChat +https://github.com/amitamrutiya/MeetnChat ``` 2. Navigate to the project directory. diff --git a/frontend/package.json b/frontend/package.json index 83ee6dd..ace3cdf 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -40,7 +40,6 @@ "moment": "^2.30.1", "next": "14.1.3", "next-auth": "^5.0.0-beta.17", - "next-themes": "^0.2.1", "npx": "^10.2.2", "react": "^18", "react-dom": "^18", diff --git a/frontend/src/app/context/ThemeProvider.tsx b/frontend/src/app/context/ThemeProvider.tsx deleted file mode 100644 index b0ff266..0000000 --- a/frontend/src/app/context/ThemeProvider.tsx +++ /dev/null @@ -1,9 +0,0 @@ -"use client"; - -import * as React from "react"; -import { ThemeProvider as NextThemesProvider } from "next-themes"; -import { type ThemeProviderProps } from "next-themes/dist/types"; - -export function ThemeProvider({ children, ...props }: ThemeProviderProps) { - return {children}; -} diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css index 31910a1..5b55832 100644 --- a/frontend/src/app/globals.css +++ b/frontend/src/app/globals.css @@ -4,28 +4,27 @@ @layer base { :root { - --background: 0 0% 100%; - --foreground: 240 10% 3.9%; - --card: 0 0% 100%; - --card-foreground: 240 10% 3.9%; - --popover: 0 0% 100%; - --popover-foreground: 240 10% 3.9%; - --primary: 142.1 76.2% 36.3%; - --primary-foreground: 355.7 100% 97.3%; - --secondary: 240 4.8% 95.9%; - --secondary-foreground: 240 5.9% 10%; - --muted: 240 4.8% 95.9%; - --muted-foreground: 240 3.8% 46.1%; - --accent: 240 4.8% 95.9%; - --accent-foreground: 240 5.9% 10%; - --destructive: 0 84.2% 60.2%; - --destructive-foreground: 0 0% 98%; - --border: 240 5.9% 90%; - --input: 240 5.9% 90%; - --ring: 142.1 76.2% 36.3%; - --radius: 0.5rem; - --warning: 36 100% 40%; - --hover: 201 90% 27%; + --background: 20 14.3% 4.1%; + --foreground: 0 0% 95%; + --card: 24 9.8% 10%; /* blck */ + --card-foreground: 0 0% 95%; /*gray*/ + --popover: 0 0% 9%; + --popover-foreground: 0 0% 95%; + --primary: 142.1 70.6% 45.3%; /* green */ + --primary-foreground: 144.9 80.4% 10%; /*dark green */ + --secondary: 240 3.7% 15.9%; + --secondary-foreground: 0 0% 98%; + --muted: 0 0% 15%; + --muted-foreground: 240 5% 64.9%; + --accent: 12 6.5% 15.1%; + --accent-foreground: 0 0% 98%; + --destructive: 0 62.8% 30.6%; /* red */ + --destructive-foreground: 0 85.7% 97.3%; /* light red */ + --border: 240 3.7% 15.9%; + --input: 240 3.7% 15.9%; + --ring: 142.4 71.8% 29.2%; + --warning: 36 100% 55%; + --hover: 200 98% 39%; } .dark { diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx index 2cb9606..805fd87 100644 --- a/frontend/src/app/layout.tsx +++ b/frontend/src/app/layout.tsx @@ -1,7 +1,6 @@ import { MediaStreamProvider } from "@/app/context/MediaStream"; import { MediaScreenStreamProvider } from "@/app/context/ScreenStream"; import { SocketProvider } from "@/app/context/SocketContext"; -import { ThemeProvider } from "@/app/context/ThemeProvider"; import { Toaster } from "@/components/ui/toaster"; import type { Metadata } from "next"; import { Inter } from "next/font/google"; @@ -45,15 +44,8 @@ export default function RootLayout({ - - {children} - - + {children} + diff --git a/frontend/src/components/Globe.tsx b/frontend/src/components/Globe.tsx index 8316588..548e0be 100644 --- a/frontend/src/components/Globe.tsx +++ b/frontend/src/components/Globe.tsx @@ -25,7 +25,7 @@ function GlobeSection() { }} className="div" > -

+

Best way to connect with people

diff --git a/frontend/src/components/Icon-card-button.tsx b/frontend/src/components/Icon-card-button.tsx index fe63b95..01f48d6 100644 --- a/frontend/src/components/Icon-card-button.tsx +++ b/frontend/src/components/Icon-card-button.tsx @@ -15,7 +15,7 @@ const IconCardButton = () => {

- +
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index 78c2299..eb38c7a 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -5,7 +5,6 @@ import { AudioLines, ArrowLeftRightIcon } from "lucide-react"; import { User } from "@/type"; import UserAvatar from "./UserAvatar"; import { useSession } from "next-auth/react"; -import { ModeToggle } from "./ui/mode-toggle"; import LogoutButton from "./LogoutButton"; export interface NavbarProps { @@ -60,7 +59,6 @@ const Navbar: React.FC = (props) => { )} -
); diff --git a/frontend/src/components/SignInForm.tsx b/frontend/src/components/SignInForm.tsx index 14f7ecf..a8518d2 100644 --- a/frontend/src/components/SignInForm.tsx +++ b/frontend/src/components/SignInForm.tsx @@ -49,10 +49,14 @@ function SignInForm() { duration={7} borderWidth={4} > -
+
-

Please Login to Use

-

Sign in to start your anonymous adventure

+

+ Please Login to Use +

+

+ Sign in to start your anonymous adventure +

( - Email/Username + + Email/Username + diff --git a/frontend/src/components/SignupForm.tsx b/frontend/src/components/SignupForm.tsx index 1a5180e..03dc887 100644 --- a/frontend/src/components/SignupForm.tsx +++ b/frontend/src/components/SignupForm.tsx @@ -145,10 +145,12 @@ function SignupForm() {
-

+

Please SignUp to Use

-

Sign up to start your anonymous adventure

+

+ Sign up to start your anonymous adventure +

= FieldPath > = { - name: TName -} + name: TName; +}; const FormFieldContext = React.createContext( {} as FormFieldContextValue -) +); const FormField = < TFieldValues extends FieldValues = FieldValues, @@ -36,21 +36,21 @@ const FormField = < - ) -} + ); +}; const useFormField = () => { - const fieldContext = React.useContext(FormFieldContext) - const itemContext = React.useContext(FormItemContext) - const { getFieldState, formState } = useFormContext() + const fieldContext = React.useContext(FormFieldContext); + const itemContext = React.useContext(FormItemContext); + const { getFieldState, formState } = useFormContext(); - const fieldState = getFieldState(fieldContext.name, formState) + const fieldState = getFieldState(fieldContext.name, formState); if (!fieldContext) { - throw new Error("useFormField should be used within ") + throw new Error("useFormField should be used within "); } - const { id } = itemContext + const { id } = itemContext; return { id, @@ -59,53 +59,54 @@ const useFormField = () => { formDescriptionId: `${id}-form-item-description`, formMessageId: `${id}-form-item-message`, ...fieldState, - } -} + }; +}; type FormItemContextValue = { - id: string -} + id: string; +}; const FormItemContext = React.createContext( {} as FormItemContextValue -) +); const FormItem = React.forwardRef< HTMLDivElement, React.HTMLAttributes >(({ className, ...props }, ref) => { - const id = React.useId() + const id = React.useId(); return (
- ) -}) -FormItem.displayName = "FormItem" + ); +}); +FormItem.displayName = "FormItem"; const FormLabel = React.forwardRef< React.ElementRef, React.ComponentPropsWithoutRef >(({ className, ...props }, ref) => { - const { error, formItemId } = useFormField() + const { error, formItemId } = useFormField(); return (