layout (#12)

layout update
kir-dev · Oct 11, 2024 · fe38de0 · fe38de0
1 parent 547063a
commit fe38de0
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 40 deletions.
diff --git a/apps/frontend/src/app/afterlogin/page.tsx → ...src/app/(with-layout)/afterlogin/page.tsx b/apps/frontend/src/app/afterlogin/page.tsx → ...src/app/(with-layout)/afterlogin/page.tsx
@@ -1,4 +1,4 @@
-import AfterLogin from '../../components/AfterLogin';
+import AfterLogin from '../../../components/AfterLogin';
 
 export default function Home() {
   return (

diff --git a/apps/frontend/src/app/currentjobs/page.tsx → ...rc/app/(with-layout)/currentjobs/page.tsx b/apps/frontend/src/app/currentjobs/page.tsx → ...rc/app/(with-layout)/currentjobs/page.tsx
@@ -1,4 +1,4 @@
-import CurrentJobs from '../../components/CurrentJobs';
+import CurrentJobs from '../../../components/CurrentJobs';
 
 export default function Home() {
   return (

diff --git a/apps/frontend/src/app/(with-layout)/layout.tsx b/apps/frontend/src/app/(with-layout)/layout.tsx
@@ -0,0 +1,16 @@
+import { Footer } from '../../components/Footer';
+import Navbar from '../../components/Navbar';
+
+export default function Layout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <div className='flex flex-col min-h-screen'>
+      <Navbar />
+      {children}
+      <Footer />
+    </div>
+  );
+}
diff --git a/apps/frontend/src/app/newproject/page.tsx → ...src/app/(with-layout)/newproject/page.tsx b/apps/frontend/src/app/newproject/page.tsx → ...src/app/(with-layout)/newproject/page.tsx
@@ -1,4 +1,4 @@
-import SprintLogin from '../../components/NewProject';
+import SprintLogin from '../../../components/NewProject';
 
 export default function Home() {
   return (

diff --git a/...frontend/src/app/reportingperiod/page.tsx → ...pp/(with-layout)/reportingperiod/page.tsx b/...frontend/src/app/reportingperiod/page.tsx → ...pp/(with-layout)/reportingperiod/page.tsx
@@ -1,4 +1,4 @@
-import { ReportingPeriod } from '../../components/ReportingPeriod';
+import { ReportingPeriod } from '../../../components/ReportingPeriod';
 
 export default function Home() {
   return (

diff --git a/apps/frontend/src/components/AfterLogin.tsx b/apps/frontend/src/components/AfterLogin.tsx
@@ -1,5 +1,3 @@
-import { Footer } from './Footer';
-
 export default function GreetingsPage() {
   return (
     <div className='flex flex-col min-h-screen'>
@@ -56,9 +54,7 @@ export default function GreetingsPage() {
             </p>
           </a>
         </div>
-        <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer'>
-          <Footer />
-        </a>
+        <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer' />
       </div>
     </div>
   );

diff --git a/apps/frontend/src/components/CurrentJobs.tsx b/apps/frontend/src/components/CurrentJobs.tsx
@@ -1,9 +1,6 @@
-import Navbar from './Navbar';
-
 export default function CurrentJobs() {
   return (
     <div className='flex flex-col min-h-screen w-1/2'>
-      <Navbar />
       <div className='text-center pt-8'>
         <h1 className='text-xl font-bold leading-tight tracking-tight text-text-color-h1 md:text-4xl dark:text-bg-color2'>
           Munkák

diff --git a/apps/frontend/src/components/HomePage.tsx b/apps/frontend/src/components/HomePage.tsx
@@ -1,5 +1,3 @@
-import { Footer } from './Footer';
-
 export default function HomePage() {
   return (
     <div className='flex flex-col items-center justify-center px-8 py-8 mx-auto md:h-screen lg:py-0 text-text-color text-center'>
@@ -22,9 +20,7 @@ export default function HomePage() {
             &nbsp;to get started
           </p>
       </div>
-      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer'>
-        <Footer />
-      </a>
+      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer' />
     </div>
   );
 }
diff --git a/apps/frontend/src/components/Navbar.tsx b/apps/frontend/src/components/Navbar.tsx
@@ -1,6 +1,6 @@
 export default function Navbar() {
   return (
-    <header className='flex flex-col items-center justify-between px-8 py-5'>
+    <header className='flex flex-col items-center justify-between px-8 py-5 bg-page-bg-color'>
       <nav className='text-text-color space-x-5 rounded py-5'>
         <a
           href='/afterlogin'

diff --git a/apps/frontend/src/components/NewProject.tsx b/apps/frontend/src/components/NewProject.tsx
@@ -2,8 +2,6 @@
 import { FormEvent, useState } from 'react';
 
 import api from '../lib/axiosConfig';
-import { Footer } from './Footer';
-import Navbar from './Navbar';
 
 export default function NewProject() {
   const [formData, setFormData] = useState({
@@ -39,7 +37,6 @@ export default function NewProject() {
 
   return (
     <div className='w-3/5 flex flex-col justify-center px-8 py-8 mx-auto md:h-screen lg:py-0'>
-      <Navbar />
       <div className='p-6 space-y-4 md:space-y-6 sm:p-8 w-full'>
         <h1 className='text-xl font-bold leading-tight tracking-tight text-text-color-h1 md:text-4xl dark:text-bg-color2 w-full text-center'>
           Új Projekt Létrehozása
@@ -76,9 +73,7 @@ export default function NewProject() {
           </div>
         </form>
       </div>
-      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer'>
-        <Footer />
-      </a>
+      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer' />
     </div>
   );
 }
diff --git a/apps/frontend/src/components/ReportingPeriod.tsx b/apps/frontend/src/components/ReportingPeriod.tsx
@@ -1,10 +1,6 @@
-import { Footer } from './Footer';
-import Navbar from './Navbar';
-
 export function ReportingPeriod() {
   return (
     <div className='flex flex-col min-h-screen w-1/2'>
-      <Navbar />
       <div className='text-center pt-8'>
         <h1 className='text-xl font-bold leading-tight tracking-tight text-text-color-h1 md:text-4xl dark:text-bg-color2'>
           Beszámolási időszakok
@@ -47,9 +43,7 @@ export function ReportingPeriod() {
           </table>
         </div>
       </div>
-      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer'>
-        <Footer />
-      </a>
+      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer' />
     </div>
   );
 }
diff --git a/apps/frontend/src/components/SprintLogin.tsx b/apps/frontend/src/components/SprintLogin.tsx
@@ -3,8 +3,6 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { Footer } from './Footer';
-
 export default function SprintLogin() {
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
   async function IsUserRegistrated(event: React.FormEvent<HTMLFormElement>) {
@@ -139,9 +137,7 @@ export default function SprintLogin() {
           </form>
         </div>
       </div>
-      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer'>
-        <Footer />
-      </a>
+      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer' />
     </div>
   );
 }
diff --git a/apps/frontend/src/components/SprintRegistration.tsx b/apps/frontend/src/components/SprintRegistration.tsx
@@ -2,7 +2,6 @@
 import { useState } from 'react';
 
 import api from '../lib/axiosConfig';
-import { Footer } from './Footer';
 
 export default function RegistrationForm() {
   const [formData, setFormData] = useState({
@@ -134,9 +133,7 @@ export default function RegistrationForm() {
           </form>
         </div>
       </div>
-      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer'>
-        <Footer />
-      </a>
+      <a href='https://github.com/kir-dev/sprint-review-app' target='_blank' rel='noreferrer' />
     </div>
   );
 }