Move the .tsx files in /components/layout and /components/modal folde…

…rs into /_component folders within /app

ui/src/components/layout/navbar/Navbar.tsx → ui/src/app/_components/layout/navbar/Navbar.tsx

@@ -5,7 +5,7 @@ import { getCurrentUser } from '@/access/AuthenticationService';
 import MobileNavbar from './MobileNavbar';
 import { NavLinks } from './NavLinks';
 import Role from '@/access/Role';
-import TimeoutModal from '@/components/modal/TimeoutModal';
+import TimeoutModal from '@/app/_components/layout/modal/TimeoutModal';
 
 const Navbar = async () => {
     const currentUser = await getCurrentUser();

ui/src/app/layout.tsx

@@ -1,8 +1,8 @@
 import './globals.css';
 import { Source_Sans_3 } from 'next/font/google';
-import Footer from '@/components/layout/footer/Footer';
+import Footer from '@/app/_components/layout/footer/Footer';
 import type { Metadata } from 'next';
-import Navbar from '@/components/layout/navbar/Navbar';
+import Navbar from '@/app/_components/layout/navbar/Navbar';
 
 const sourceSans3 = Source_Sans_3({
     subsets: ['latin'],

ui/tests/components/layout/footer/Footer.test.tsx → ui/tests/app/_components/layout/footer/Footer.test.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import Footer from '@/components/layout/footer/Footer';
+import Footer from '@/app/_components/layout/footer/Footer';
 
 describe ('Footer', () => {
 

ui/tests/components/modal/TimeoutModal.test.tsx → ui/tests/app/_components/layout/modal/TimeoutModal.test.tsx

@@ -1,6 +1,6 @@
 import Role from '@/access/Role';
 import User from '@/access/User';
-import TimeoutModal from '@/components/modal/TimeoutModal';
+import TimeoutModal from '@/app/_components/layout/modal/TimeoutModal';
 import { act, fireEvent, render, screen } from '@testing-library/react';
 import * as AuthenticationService from '@/access/AuthenticationService';
 

ui/tests/components/layout/navbar/LoginButton.test.tsx → ui/tests/app/_components/layout/navbar/LoginButton.test.tsx

@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import Login from '@/components/layout/navbar/LoginButton';
+import Login from '@/app/_components/layout/navbar/LoginButton';
 import { redirect } from 'next/navigation';
 import User, { AnonymousUser } from '@/access/User';
 import Role from '@/access/Role';

ui/tests/components/layout/navbar/MobileNavbar.test.tsx → ui/tests/app/_components/layout/navbar/MobileNavbar.test.tsx

@@ -1,6 +1,6 @@
 import Role from '@/access/Role';
 import User, { AnonymousUser } from '@/access/User';
-import MobileNavbar from '@/components/layout/navbar/MobileNavbar';
+import MobileNavbar from '@/app/_components/layout/navbar/MobileNavbar';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 

ui/tests/components/layout/navbar/Navbar.test.tsx → ui/tests/app/_components/layout/navbar/Navbar.test.tsx

@@ -1,7 +1,7 @@
 import User, { AnonymousUser } from '@/access/User';
 import * as AuthenticationService from '@/access/AuthenticationService';
 import { render, screen } from '@testing-library/react';
-import Navbar from '@/components/layout/navbar/Navbar';
+import Navbar from '@/app/_components/layout/navbar/Navbar';
 import Role from '@/access/Role';
 
 const testUser: User = JSON.parse(process.env.TEST_USER_A as string);