Merge branch 'main' into refact-HotSongs

components/LandingPage/LandingPage.tsx

@@ -4,7 +4,7 @@ import HotSongs from "../modules/HotSongs";
 import NewReleases from "../modules/NewReleases";
 
 import PageCard from "../modules/__modules__/Card/PageCard";
-// import FeaturedAlbum from "../modules/FeaturedAlbum";
+import FeaturedAlbum from "../modules/FeaturedAlbum";
 
 const LandingPage = () => {
   const [isTopNav, setIsTopNav] = React.useState(false);
@@ -14,7 +14,8 @@ const LandingPage = () => {
     <PageCard setIsTopNav={setIsTopNav} >
         <NewReleases />
         <TopSongs />
-        {/* <FeaturedAlbum />*/}
+
+        <FeaturedAlbum />
         <HotSongs />
       </PageCard>  
     </div>

pages/album.tsx

@@ -1,8 +1,8 @@
 import React from "react";
-// import AlbumPage from "../components/AlbumPage";
+import AlbumPage from "../components/AlbumPage";
 
 const album = () => {
-  return <>{/* <AlbumPage /> */}</>;
+  return <AlbumPage />;
 };
 
 export default album;

pages/confirm-email.tsx

@@ -1,9 +1,8 @@
 import React from "react";
-// import ConfirmEmail from "../components/Auth/confirmEmail";
+import ConfirmEmail from "../components/Auth/ConfirmEmail";
 
 const ConfirmEmailPage = () => {
-  //   return <ConfirmEmail />;
-  return <></>;
+    return <ConfirmEmail />;
 };
 
 export default ConfirmEmailPage;

pages/latest.tsx

@@ -1,9 +1,8 @@
 import React from "react";
-// import LatestPage from "../components/LatestPage";
+import LatestPage from "../components/LatestPage";
 
 const latest = () => {
-  // return <LatestPage />;
-  return <></>;
+  return <LatestPage />;
 };
 
 export default latest;

pages/login.tsx

@@ -1,12 +1,12 @@
 import React from "react";
-// import LoginPage from "../components/Auth/LoginPage";
+import LoginPage from "../components/Auth/LoginPage";
 
 const Login = () => {
-  // return (
-  //   <div className="auth h-screen">
-  //     <LoginPage />
-  //   </div>
-  // );
+  return (
+    <div className="auth h-screen">
+      <LoginPage />
+    </div>
+  );
 
   return <></>;
 };

pages/maintenance.tsx

@@ -1,14 +1,13 @@
 import React from "react";
-// import Maintenance from "../components/Maintenance/Maintenance";
+import Maintenance from "../components/Maintenance/Maintenance";
 
 const maintenance = () => {
-  // return (
-  //   <div className=" h-screen">
-  //     <Maintenance />
-  //   </div>
-  // );
+  return (
+    <div className=" h-screen">
+      <Maintenance />
+    </div>
+  );
 
-  return <></>;
 };
 
 export default maintenance;

pages/reset-password.tsx

@@ -1,14 +1,14 @@
 import React from "react";
-// import ResetPassword from "../components/Auth/ResetPassword";
+import ResetPassword from "../components/Auth/ResetPassword";
 
 const ResetPasswordPage = () => {
-  //   return (
-  //     <>
-  //       <ResetPassword />
-  //     </>
-  //   );
+    return (
+      <>
+        <ResetPassword />
+      </>
+    );
 
-  return <></>;
+
 };
 
 export default ResetPasswordPage;

pages/signup.tsx

@@ -1,14 +1,12 @@
 import React from "react";
-// import SignupPage from "../components/Auth/SignupPage";
+import SignupPage from "../components/Auth/SignupPage";
 
 const Signup = () => {
-  // return (
-  //   <div className="auth h-screen">
-  //     <SignupPage />
-  //   </div>
-  // );
-
-  return <></>;
+  return (
+    <div className="auth h-screen">
+      <SignupPage />
+    </div>
+  );
 };
 
 export default Signup;