Skip to content

Commit

Permalink
Merge pull request #266 from BigBen-7/main
Browse files Browse the repository at this point in the history
fix: clean up code, link routes, resize grid, and update global text …
CLOSES #266
  • Loading branch information
BigBen-7 authored Mar 3, 2025
2 parents a03550a + fdfdf8f commit b7f3d87
Show file tree
Hide file tree
Showing 23 changed files with 347 additions and 405 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"cSpell.words": ["Dewordle", "landingpage"]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import OtpVerification from "../../../components/OtpVerification";

function ForgotPassword() {
import React from "react";

const page = () => {
return <OtpVerification />;
}
};

export default ForgotPassword;
export default page;
13 changes: 11 additions & 2 deletions frontend/app/(root)/achievements/page.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
import Achievements from "../../../components/Achievements"
import React from "react";
import Achievements from "../../../components/Achievements";

<Achievements/>
const page = () => {
return (
<div>
<Achievements />
</div>
);
};

export default page;
2 changes: 1 addition & 1 deletion frontend/app/(root)/admin-signin/page.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import AdminSignin from "../../../components/AdminSignin";
import React from "react";
import AdminSignin from "../../../components/AdminSignin";

const page = () => {
return (
Expand Down
12 changes: 0 additions & 12 deletions frontend/app/(root)/change-password/page.jsx

This file was deleted.

14 changes: 12 additions & 2 deletions frontend/app/(root)/daily-challenge/page.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
import DailyChallenge from "../../../components/DailyChallenge"
import DailyChallenge from "../../../components/DailyChallenge";

<DailyChallenge />
import React from "react";

const page = () => {
return (
<div>
<DailyChallenge />
</div>
);
};

export default page;
13 changes: 6 additions & 7 deletions frontend/app/(root)/edit-profile/page.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import EditProfile from '../../../components/EditProfile'
import React from 'react'
// import EditProfile from '../../components/EditProfile'
import React from "react";
import EditProfile from "../../../components/EditProfile";

const page = () => {
return (
<div>
<EditProfile />
<EditProfile />
</div>
)
}
);
};

export default page
export default page;
12 changes: 6 additions & 6 deletions frontend/app/(root)/forgot-password/page.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
"use client"
import React from 'react'
import ForgotPassword from "../../../components/ForgotPassword"
"use client";
import React from "react";
import ForgotPassword from "../../../components/ForgotPassword";

const page = () => {
return (
<div>
<ForgotPassword />
</div>
)
}
);
};

export default page
export default page;
14 changes: 12 additions & 2 deletions frontend/app/(root)/interactive-how-to-play/page.jsx
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
import InteractiveHowToPlay from "../../../components/InteractiveHowToPlay"
<InteractiveHowToPlay />
import React from "react";
import InteractiveHowToPlay from "../../../components/InteractiveHowToPlay";

const page = () => {
return (
<div>
<InteractiveHowToPlay />
</div>
);
};

export default page;
6 changes: 5 additions & 1 deletion frontend/app/(root)/layout.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
'use client'
import { usePathname } from "next/navigation";
import Navbar from "../../components/Navbar";
import { AppProvider } from "../../context/AppContext";

const Layout = ({ children }) => {
const pathname = usePathname();
const hideNavbar = pathname === "/";
return (
<main>
<AppProvider>
<Navbar />
{!hideNavbar && <Navbar />}
{children}
</AppProvider>
</main>
Expand Down
1 change: 0 additions & 1 deletion frontend/app/(root)/multiplayer/page.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";
import React from "react";

import DewordleMultiplayer from "@/components/Multiplayer";

export default function page() {
Expand Down
7 changes: 0 additions & 7 deletions frontend/app/(root)/otp/page.jsx

This file was deleted.

2 changes: 1 addition & 1 deletion frontend/app/(root)/page.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import LandingPage from "../../components/LandingPage";
export default function Page() {
return (
<div className="bg-[#ffffff]">
<LandingPage />
<LandingPage />
</div>
);
}
Loading

0 comments on commit b7f3d87

Please sign in to comment.