Merge pull request #267 from Michelle031/fix-263

fixed issue 263
CLOSES #267

frontend/app/(auth)/change-password/page.jsx

@@ -1,6 +1,6 @@
 'use client';
 
-import PasswordChangeForm from '../../../components/ChangePassword';
+import PasswordChangeForm from '@/components/ChangePassword';
 
 
 export default function SignInPage() {

frontend/app/(auth)/otp-verification/page.jsx

@@ -1,4 +1,4 @@
-import OtpVerification from "../../../components/OtpVerification";
+import OtpVerification from "@/components/OtpVerification";
 
 import React from "react";
 

frontend/app/(auth)/signin/page.jsx

@@ -1,5 +1,5 @@
 import SignInWithGoogle from '@/components/sigInWithGoogle';
-import SignInForm from '../../../components/SignInForm';
+import SignInForm from '@/components/SignInForm';
 
 export default function SignInPage() {
   return (

frontend/app/(auth)/signup/page.jsx

@@ -1,4 +1,4 @@
-import SignUpForm from "../../../components/SignUpForm";
+import SignUpForm from "@/components/SignUpForm";
 
 export default function SignUpPage() {
   return <SignUpForm />;

frontend/app/(root)/achievements/page.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Achievements from "../../../components/Achievements";
+import Achievements from "@/components/Achievements";
 
 const page = () => {
   return (

frontend/app/(root)/admin-signin/page.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import AdminSignin from "../../../components/AdminSignin";
+import AdminSignin from "@/components/AdminSignin";
 
 const page = () => {
   return (

frontend/app/(root)/coming-soon/page.jsx

@@ -1,4 +1,4 @@
-import ComingSoon from '../../../components/ComingSoon'
+import ComingSoon from '@/components/ComingSoon'
 import React from 'react'
 
 const page = () => {

frontend/app/(root)/daily-challenge/page.jsx

@@ -1,4 +1,4 @@
-import DailyChallenge from "../../../components/DailyChallenge";
+import DailyChallenge from "@/components/DailyChallenge";
 
 import React from "react";
 

frontend/app/(root)/edit-profile/page.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import EditProfile from "../../../components/EditProfile";
+import EditProfile from "@/components/EditProfile";
 
 const page = () => {
   return (

frontend/app/(root)/forgot-password/page.tsx

@@ -1,6 +1,6 @@
 "use client";
 import React from "react";
-import ForgotPassword from "../../../components/ForgotPassword";
+import ForgotPassword from "@/components/ForgotPassword";
 
 const page = () => {
   return (

frontend/app/(root)/game/page.tsx

@@ -1,5 +1,5 @@
-import Keyboard from "../../../components/Keyboard";
-import WordGrid from "../../../components/WordGrid.jsx";
+import Keyboard from "@/components/Keyboard";
+import WordGrid from "@/components/WordGrid.jsx";
 
 export default function page() {
   return (

frontend/app/(root)/interactive-how-to-play/page.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import InteractiveHowToPlay from "../../../components/InteractiveHowToPlay";
+import InteractiveHowToPlay from "@/components/InteractiveHowToPlay";
 
 const page = () => {
   return (

frontend/app/(root)/layout.js

@@ -1,7 +1,7 @@
 'use client'
 import { usePathname } from "next/navigation";
-import Navbar from "../../components/Navbar";
-import { AppProvider } from "../../context/AppContext";
+import Navbar from "@/components/Navbar";
+import { AppProvider } from "@/context/AppContext";
 
 const Layout = ({ children }) => {
   const pathname = usePathname();

frontend/app/(root)/page.jsx

@@ -1,4 +1,4 @@
-import LandingPage from "../../components/LandingPage";
+import LandingPage from "@/components/LandingPage";
 
 export default function Page() {
   return (

frontend/app/(root)/profile/page.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Profile from "../../../components/Profile";
+import Profile from "@/components/Profile";
 
 const page = () => {
   return (

frontend/app/(root)/stats/page.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Leaderboard from "../../../components/Leaderboard";
+import Leaderboard from "@/components/Leaderboard";
 
 const page = () => {
   return (

frontend/components.json

@@ -12,10 +12,12 @@
   },
   "aliases": {
     "components": "@/components",
-    "utils": "@/lib/utils",
+    "context": "@/context",
+    "utils": "@/utils",
     "ui": "@/components/ui",
     "lib": "@/lib",
-    "hooks": "@/hooks"
+    "hooks": "@/hooks",
+    "assets": "@/assets"
   },
   "iconLibrary": "lucide"
 }

frontend/components/ForgotPassword.jsx

@@ -2,7 +2,7 @@
 import { useState } from 'react';
 import Link from 'next/link';
 import { Formik, Form, Field } from 'formik';
-import { ForgotPasswordSchema } from '../utils/schema/forgotPasswordSchema';
+import { ForgotPasswordSchema } from '@/utils/schema/forgotPasswordSchema';
 
 
 function ForgotPassword() {

frontend/components/HelpGuide.jsx

@@ -1,28 +1,28 @@
 "use client";
 
 import React from "react";
-import { Button } from "../components/ui/button";
+import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
   DialogHeader,
   DialogTitle,
-} from "../components/ui/dialog";
+} from "@/components/ui/dialog";
 import {
   Tabs,
   TabsContent,
   TabsList,
   TabsTrigger,
-} from "../components/ui/tabs";
+} from "@/components/ui/tabs";
 import {
   Accordion,
   AccordionContent,
   AccordionItem,
   AccordionTrigger,
-} from "../components/ui/accordion";
+} from "@/components/ui/accordion";
 import { BookOpen, Settings, Gamepad2 } from "lucide-react";
 import Link from "next/link";
-import { helpContent } from "../utils/helpContent";
+import { helpContent } from "@/utils/helpContent";
 
 // Component for rendering individual letter tiles
 function LetterTile({ letter, state = "absent" }) {

frontend/components/Keyboard.jsx

@@ -1,7 +1,7 @@
 "use client";
 import React, { useContext, useEffect, useCallback, useState } from "react";
 import { Delete } from "lucide-react";
-import { AppContext } from "../context/AppContext";
+import { AppContext } from "@/context/AppContext";
 import gsap from "gsap";
 
 const Keyboard = () => {

frontend/components/LeaderBoardModal.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import Image from "next/image";
-import share from "../assets/share.png";
-import avatar from "../assets/avatar.png";
+import share from "@/assets/share.png";
+import avatar from "@/assets/avatar.png";
 
 const LeaderBoardModal = ({ isOpen, onClose }) => {
   if (!isOpen) return null;

frontend/components/Leaderboard.jsx

@@ -1,6 +1,6 @@
 import Image from "next/image";
-import profile1 from "../assets/profile1.png";
-import profile2 from "../assets/profile2.png";
+import profile1 from "@/assets/profile1.png";
+import profile2 from "@/assets/profile2.png";
 
 const Leaderboard = () => {
   const date = "17 Feb 2025 ";

frontend/components/Navbar.jsx

@@ -2,7 +2,7 @@
 
 import React, { useState } from "react";
 import Image from "next/image";
-import DewordleIcon from "../assets/dewordleIcon.svg";
+import DewordleIcon from "@/assets/dewordleIcon.svg";
 import {
   BarChartIcon as ChartNoAxesColumn,
   Settings,

frontend/components/NavbarLandingPage.jsx

@@ -2,7 +2,7 @@
 
 import React, { useState, useEffect, useRef } from "react";
 import Image from "next/image";
-import DewordleIcon from "../assets/dewordleIcon.svg";
+import DewordleIcon from "@/assets/dewordleIcon.svg";
 import { ChevronDown, Menu, X } from "lucide-react";
 import HowToPlayModal from "./HowToPlayModal";
 import Link from "next/link";

frontend/components/Settings.jsx

@@ -4,7 +4,7 @@ import React, { useState } from "react";
 import { X } from "lucide-react";
 import { Switch } from "@headlessui/react";
 import Copywrite from "./Copywrite";
-import { useTheme } from "../context/ThemeContext";
+import { useTheme } from "@/context/ThemeContext";
 
 export const Setting = ({ isOpen, onClose }) => {
   if (!isOpen) return null;

frontend/components/SignInForm.jsx

@@ -4,7 +4,7 @@ import { useState } from 'react';
 import Link from 'next/link';
 import { Eye, EyeOff } from 'lucide-react';
 import { Formik, Form, Field } from 'formik';
-import { signInSchema } from '../utils/authValidationSchema';
+import { signInSchema } from '@/utils/authValidationSchema';
 
 const SignInForm = () => {
   const [showPassword, setShowPassword] = useState(false);

frontend/components/SignUpForm.jsx

@@ -8,7 +8,7 @@ import { Formik, Form, Field } from 'formik';
 import { FcGoogle } from 'react-icons/fc';
 import { FaApple } from 'react-icons/fa';
 import * as Yup from 'yup';
-import { signUpSchema } from '../utils/authValidationSchema';
+import { signUpSchema } from '@/utils/authValidationSchema';
 
 const SignUpForm = () => {
   const router = useRouter();

frontend/components/WordGrid.jsx

@@ -1,6 +1,6 @@
 "use client";
 import React, { useContext } from "react";
-import { AppContext } from "../context/AppContext";
+import { AppContext } from "@/context/AppContext";
 
 function WordGrid() {
   const { gridData } = useContext(AppContext);

frontend/components/ui/accordion.jsx

@@ -4,7 +4,7 @@ import * as React from "react";
 import * as AccordionPrimitive from "@radix-ui/react-accordion";
 import { ChevronDown } from "lucide-react";
 
-import { cn } from "../../lib/utils";
+import { cn } from "@/lib/utils";
 
 const Accordion = AccordionPrimitive.Root;
 

frontend/components/ui/button.jsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { Slot } from "@radix-ui/react-slot";
 import { cva } from "class-variance-authority";
 
-import { cn } from "../../lib/utils";
+import { cn } from "@/lib/utils";
 
 const buttonVariants = cva(
   "inline-flex items-center justify-center gap-2 whitespace-nowrap 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 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",

frontend/components/ui/dialog.jsx

@@ -4,7 +4,7 @@ import * as React from "react";
 import * as DialogPrimitive from "@radix-ui/react-dialog";
 import { X } from "lucide-react";
 
-import { cn } from "../../lib/utils";
+import { cn } from "@/lib/utils";
 
 const Dialog = DialogPrimitive.Root;
 

frontend/components/ui/tabs.jsx

@@ -3,7 +3,7 @@
 import * as React from "react";
 import * as TabsPrimitive from "@radix-ui/react-tabs";
 
-import { cn } from "../../lib/utils";
+import { cn } from "@/lib/utils";
 
 const Tabs = TabsPrimitive.Root;