refactor: remove MiniFooter from AreaRiservataLayout and update layout usage across pages

apps/infoalloggi/src/components/Layout.tsx

@@ -6,7 +6,7 @@ import {
 	Sidebar,
 } from "~/components/area-riservata/sidebar";
 import { BannerFactory } from "~/components/banners";
-import { Footer, MiniFooter } from "~/components/footer";
+import { Footer } from "~/components/footer";
 import { LoadingPage } from "~/components/loading";
 import { SiteHeader } from "~/components/navbar/site-header";
 import { UserViewProvider } from "~/lib/userViewContext";
@@ -56,7 +56,8 @@ export const Layout = ({
 	);
 };
 
-interface AreaRiservataLayoutProps extends Props {
+interface AreaRiservataLayoutProps
+	extends Omit<Props, "noFooter" | "footerClassName"> {
 	ignoreSessionCheck?: boolean;
 	noSidebar?: boolean;
 }
@@ -64,11 +65,9 @@ interface AreaRiservataLayoutProps extends Props {
 export const AreaRiservataLayout = ({
 	children,
 	noSidebar,
-	noFooter,
 	ignoreSessionCheck,
 	bodyClassName,
 	containerClassName,
-	footerClassName,
 }: AreaRiservataLayoutProps) => {
 	const { data: bannerData } = api.banners.getBannerData.useQuery({
 		area_riservata: true,
@@ -95,7 +94,6 @@ export const AreaRiservataLayout = ({
 							<LoadingPage />
 						</div>
 					</main>
-					{!noFooter && <MiniFooter className={footerClassName} />}
 				</div>
 			);
 		if (session.status !== "success" || !session.user) {
@@ -119,7 +117,6 @@ export const AreaRiservataLayout = ({
 							<LoadingPage />
 						</div>
 					</main>
-					{!noFooter && <MiniFooter className={footerClassName} />}
 				</div>
 			);
 		}
@@ -153,7 +150,6 @@ export const AreaRiservataLayout = ({
 					</EnforcedSessionContext.Provider>
 				</div>
 			</main>
-			{!noFooter && <MiniFooter className={footerClassName} />}
 		</div>
 	);
 };
@@ -201,8 +197,6 @@ export const AreaRiservataLayoutUserView = ({
 					</EnforcedSessionContext.Provider>
 				</UserViewProvider>
 			</main>
-
-			<MiniFooter />
 		</div>
 	);
 };

apps/infoalloggi/src/components/footer.tsx

@@ -78,28 +78,3 @@ export const Footer = ({ className }: FooterProps) => {
 		</div>
 	);
 };
-export const MiniFooter = ({ className }: FooterProps) => {
-	const { t } = useTranslation();
-	return (
-		<div className="mt-auto flex w-full">
-			<footer className={cn("z-40 w-full", className)}>
-				<div className="mx-auto max-w-5xl px-2 py-2 sm:px-6 lg:px-8">
-					<div className="text-center">
-						<Link
-							aria-label="footerLogo"
-							className="font-bold text-2xl tracking-wide antialiased"
-							href="/"
-						>
-							Infoalloggi.it
-						</Link>
-					</div>
-
-					<div className="mt-2 text-center text-xs">
-						<p>{t.footer.endtxt}</p>
-						<p>{t.footer.endtxt2}</p>
-					</div>
-				</div>
-			</footer>
-		</div>
-	);
-};

apps/infoalloggi/src/pages/area-riservata/admin/scheda-annuncio-stampa/[id].tsx

@@ -40,11 +40,7 @@ const SchedaAnnuncioPage: NextPageWithLayout<PageProps> = ({
 };
 
 SchedaAnnuncioPage.getLayout = function getLayout(page) {
-	return (
+	return <AreaRiservataLayout noSidebar>{page}</AreaRiservataLayout>;
-		<AreaRiservataLayout noFooter noSidebar>
-			{page}
-		</AreaRiservataLayout>
-	);
 };
 
 export default SchedaAnnuncioPage;

apps/infoalloggi/src/pages/area-riservata/comunicazioni.tsx

@@ -37,5 +37,5 @@ export async function getServerSideProps() {
 }
 
 Comunicazioni.getLayout = function getLayout(page) {
-	return <AreaRiservataLayout noFooter>{page}</AreaRiservataLayout>;
+	return <AreaRiservataLayout>{page}</AreaRiservataLayout>;
 };

apps/infoalloggi/src/pages/area-riservata/payment-recap/[ordineId].tsx

@@ -34,11 +34,7 @@ const PaymentRecapPage: NextPageWithLayout<PagamentoRecapProps> = ({
 };
 
 PaymentRecapPage.getLayout = function getLayout(page) {
-	return (
+	return <AreaRiservataLayout noSidebar>{page}</AreaRiservataLayout>;
-		<AreaRiservataLayout noFooter noSidebar>
-			{page}
-		</AreaRiservataLayout>
-	);
 };
 
 export default PaymentRecapPage;

apps/infoalloggi/src/pages/servizio/condizioni/[stringaId].tsx

@@ -38,11 +38,7 @@ const CondizioniPage: NextPageWithLayout<CondizioniProps> = ({
 };
 
 CondizioniPage.getLayout = function getLayout(page) {
-	return (
+	return <AreaRiservataLayout noSidebar>{page}</AreaRiservataLayout>;
-		<AreaRiservataLayout noFooter noSidebar>
-			{page}
-		</AreaRiservataLayout>
-	);
 };
 
 export default CondizioniPage;

apps/infoalloggi/src/pages/servizio/conferma-immobile/[...slug].tsx

@@ -165,11 +165,7 @@ const ConfirmSection = ({
 };
 
 ConfermaImmobile.getLayout = function getLayout(page) {
-	return (
+	return <AreaRiservataLayout noSidebar>{page}</AreaRiservataLayout>;
-		<AreaRiservataLayout noFooter noSidebar>
-			{page}
-		</AreaRiservataLayout>
-	);
 };
 
 export default ConfermaImmobile;

apps/infoalloggi/src/pages/servizio/contratto-registrazione/[...slug].tsx

@@ -73,11 +73,7 @@ const FileSection = ({ storageId }: { storageId: string }) => {
 };
 
 ContrattoViewer.getLayout = function getLayout(page) {
-	return (
+	return <AreaRiservataLayout noSidebar>{page}</AreaRiservataLayout>;
-		<AreaRiservataLayout noFooter noSidebar>
-			{page}
-		</AreaRiservataLayout>
-	);
 };
 
 export default ContrattoViewer;

apps/infoalloggi/src/pages/servizio/contratto/[...slug].tsx

@@ -69,11 +69,7 @@ const FileSection = ({ storageId }: { storageId: string }) => {
 };
 
 ContrattoViewer.getLayout = function getLayout(page) {
-	return (
+	return <AreaRiservataLayout noSidebar>{page}</AreaRiservataLayout>;
-		<AreaRiservataLayout noFooter noSidebar>
-			{page}
-		</AreaRiservataLayout>
-	);
 };
 
 export default ContrattoViewer;

apps/infoalloggi/src/pages/servizio/onboard/[servizioId].tsx

@@ -45,11 +45,7 @@ const OnboardServizio: NextPageWithLayout<OnboardServizioProps> = ({
 };
 
 OnboardServizio.getLayout = function getLayout(page) {
-	return (
+	return <AreaRiservataLayout noSidebar>{page}</AreaRiservataLayout>;
-		<AreaRiservataLayout noFooter noSidebar>
-			{page}
-		</AreaRiservataLayout>
-	);
 };
 
 export default OnboardServizio;

apps/infoalloggi/src/pages/servizio/pagamento/[ordineId].tsx

@@ -48,11 +48,7 @@ const ServicePurchasePage: NextPageWithLayout<ServizioPurchaseProps> = ({
 };
 
 ServicePurchasePage.getLayout = function getLayout(page) {
-	return (
+	return <AreaRiservataLayout noSidebar>{page}</AreaRiservataLayout>;
-		<AreaRiservataLayout noFooter noSidebar>
-			{page}
-		</AreaRiservataLayout>
-	);
 };
 
 export default ServicePurchasePage;

apps/infoalloggi/src/pages/servizio/pre-onboard/[servizioId].tsx

@@ -91,7 +91,7 @@ const PreOnboardServizio: NextPageWithLayout<PreOnboardServizioProps> = ({
 
 PreOnboardServizio.getLayout = function getLayout(page) {
 	return (
-		<AreaRiservataLayout ignoreSessionCheck noFooter noSidebar>
+		<AreaRiservataLayout ignoreSessionCheck noSidebar>
 			{page}
 		</AreaRiservataLayout>
 	);

apps/infoalloggi/src/pages/servizio/riapri-conferma/[...slug].tsx

@@ -79,11 +79,7 @@ const RiapriConferma: NextPageWithLayout<RiapriConfermaProps> = ({
 };
 
 RiapriConferma.getLayout = function getLayout(page) {
-	return (
+	return <AreaRiservataLayout noSidebar>{page}</AreaRiservataLayout>;
-		<AreaRiservataLayout noFooter noSidebar>
-			{page}
-		</AreaRiservataLayout>
-	);
 };
 
 export default RiapriConferma;