diff --git a/src/app/[locale]/about/page.tsx b/src/app/[locale]/about/page.tsx index 51d8ed0..767f2bf 100644 --- a/src/app/[locale]/about/page.tsx +++ b/src/app/[locale]/about/page.tsx @@ -1,7 +1,6 @@ -// ngc/src/app/[locale]/about/page.tsx import { unstable_setRequestLocale } from "next-intl/server"; import { getTranslations } from "next-intl/server"; -import Image from "next/image"; +// import Image from "next/image"; type Props = { params: { locale: string }; @@ -12,7 +11,7 @@ export default async function AboutPage({ params: { locale } }: Props) { const t = await getTranslations("about"); return ( -
+

@@ -26,7 +25,7 @@ export default async function AboutPage({ params: { locale } }: Props) {

-
+
{[1, 2, 3].map((index) => (
@@ -62,35 +61,6 @@ export default async function AboutPage({ params: { locale } }: Props) { ))}
- -
-

- {t("teamTitle")} -

-
- {[1, 2, 3, 4].map((index) => ( -
-
- {t(`team.${index}.name`)} -
-
-

- {t(`team.${index}.name`)} -

-

- {t(`team.${index}.role`)} -

-
-
- ))} -
-
); diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx index 25a8015..67bbbb0 100644 --- a/src/app/[locale]/layout.tsx +++ b/src/app/[locale]/layout.tsx @@ -5,6 +5,7 @@ import { locales } from "@/i18n/config"; import { ThemeProvider } from "@/components/theme-provider"; import { Navbar } from "@/components/navbar"; import { unstable_setRequestLocale } from "next-intl/server"; +import { Footer } from "@/components/footer"; const inter = Inter({ subsets: ["latin"], @@ -40,8 +41,9 @@ export default async function LocaleLayout({ -
+
{children} +
diff --git a/src/app/[locale]/page.tsx b/src/app/[locale]/page.tsx index f1c76d3..aba7055 100644 --- a/src/app/[locale]/page.tsx +++ b/src/app/[locale]/page.tsx @@ -7,6 +7,7 @@ type Props = { export default async function Home({ params: { locale } }: Props) { unstable_setRequestLocale(locale); + // const t = await getTranslations(locale); return ( <> diff --git a/src/components/footer.tsx b/src/components/footer.tsx new file mode 100644 index 0000000..ee7160d --- /dev/null +++ b/src/components/footer.tsx @@ -0,0 +1,73 @@ +export async function Footer() { + return ( + + ); +} diff --git a/src/components/hero.tsx b/src/components/hero.tsx index c3630b0..92ca719 100644 --- a/src/components/hero.tsx +++ b/src/components/hero.tsx @@ -62,7 +62,7 @@ export async function Hero() {
-
+ {/*
-
+
*/}
); diff --git a/src/i18n/config.ts b/src/i18n/config.ts index 503603e..53873db 100644 --- a/src/i18n/config.ts +++ b/src/i18n/config.ts @@ -1,3 +1,3 @@ -export const defaultLocale = "en"; +export const defaultLocale = "mk"; export const locales = ["en", "mk", "sr"] as const; export type Locale = (typeof locales)[number]; diff --git a/src/middleware.ts b/src/middleware.ts index ad4d0f6..743b196 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -2,24 +2,11 @@ import createMiddleware from "next-intl/middleware"; import { locales, defaultLocale } from "./i18n/config"; export default createMiddleware({ - // A list of all locales that are supported locales, - // Used when no locale matches defaultLocale, - // If this locale is matched, pathnames work without a prefix (e.g. `/about`) localePrefix: "always", }); -// Apply middleware to all routes except static files and api routes export const config = { - matcher: [ - // Enable a redirect to a matching locale at the root - "/", - // Set a cookie to remember the previous locale for - // all requests that have a locale prefix - "/(mk|en|sr)/:path*", - // Enable redirects that add missing locales - // (e.g. `/pathnames` -> `/en/pathnames`) - "/((?!api|_next|_vercel|.*\\..*).*)", - ], + matcher: ["/", "/(mk|en|sr)/:path*", "/((?!api|_next|_vercel|.*\\..*).*)"], };