Merge pull request #77 from Tria-plc/alpha

Refactor layout components to use Tailwind CSS for font styling and u…
This commit is contained in:
Stephanos A.
2026-06-02 23:24:07 +03:00
committed by GitHub
4 changed files with 28 additions and 17 deletions

View File

@@ -1,14 +1,7 @@
import type { Metadata } from 'next'; import type { Metadata } from 'next';
import { Inter } from 'next/font/google';
import '@/styles/globals.css'; import '@/styles/globals.css';
import Providers from './providers'; import Providers from './providers';
// Load Inter font with fallback - will not fail build if fonts.googleapis.com is unreachable
const inter = Inter({
subsets: ['latin'],
fallback: ['system-ui', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'sans-serif']
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: 'EDR Passenger Back-office', title: 'EDR Passenger Back-office',
description: 'Ethio-Djibouti Railway Passenger Back-office', description: 'Ethio-Djibouti Railway Passenger Back-office',
@@ -36,7 +29,7 @@ export default function RootLayout({
}} }}
/> />
</head> </head>
<body className={inter.className}> <body className="font-sans antialiased">
<Providers>{children}</Providers> <Providers>{children}</Providers>
</body> </body>
</html> </html>

View File

@@ -8,6 +8,20 @@ module.exports = {
darkMode: 'class', darkMode: 'class',
theme: { theme: {
extend: { extend: {
fontFamily: {
sans: [
'-apple-system',
'BlinkMacSystemFont',
'"Segoe UI"',
'Roboto',
'"Helvetica Neue"',
'Arial',
'sans-serif',
'"Apple Color Emoji"',
'"Segoe UI Emoji"',
'"Segoe UI Symbol"',
],
},
colors: { colors: {
background: 'hsl(var(--background))', background: 'hsl(var(--background))',
foreground: 'hsl(var(--foreground))', foreground: 'hsl(var(--foreground))',

View File

@@ -1,15 +1,8 @@
import type { Metadata } from 'next'; import type { Metadata } from 'next';
import { Inter } from 'next/font/google';
import './globals.css'; import './globals.css';
import { Providers } from './providers'; import { Providers } from './providers';
import AppHeader from '@/components/AppHeader'; import AppHeader from '@/components/AppHeader';
// Load Inter font with fallback - will not fail build if fonts.googleapis.com is unreachable
const inter = Inter({
subsets: ['latin'],
fallback: ['system-ui', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'sans-serif']
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: 'EDR Passenger Portal - Book Your Train Journey', title: 'EDR Passenger Portal - Book Your Train Journey',
description: 'Book train tickets on the Ethio-Djibouti Railway', description: 'Book train tickets on the Ethio-Djibouti Railway',
@@ -22,7 +15,7 @@ export default function RootLayout({
}) { }) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<body className={inter.className}> <body className="font-sans antialiased">
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: ` __html: `

View File

@@ -24,7 +24,18 @@ export default {
}, },
}, },
fontFamily: { fontFamily: {
sans: ['Inter', 'system-ui', 'sans-serif'], sans: [
'-apple-system',
'BlinkMacSystemFont',
'"Segoe UI"',
'Roboto',
'"Helvetica Neue"',
'Arial',
'sans-serif',
'"Apple Color Emoji"',
'"Segoe UI Emoji"',
'"Segoe UI Symbol"',
],
}, },
boxShadow: { boxShadow: {
'soft': '0 2px 15px -3px rgba(0, 0, 0, 0.07), 0 10px 20px -2px rgba(0, 0, 0, 0.04)', 'soft': '0 2px 15px -3px rgba(0, 0, 0, 0.07), 0 10px 20px -2px rgba(0, 0, 0, 0.04)',