Merge pull request #3 from ProjectIxian/jaka/feat/pp+styles

Added PrivacyPolicy page + other fixes
ProjectIxian · Nov 9, 2024 · 6386feb · 6386feb
2 parents 1912806 + 4f060d0
commit 6386feb
Show file tree

Hide file tree

Showing 42 changed files with 1,013 additions and 127 deletions.
diff --git a/messages/en.json b/messages/en.json
@@ -125,6 +125,7 @@
   "Footer": {
     "title": "Pioneering Decentralised Technologies",
     "copyright": "© {year} IXI Labs. All rights reserved.",
+    "privacyPolicy": "Privacy Policy",
     "contact": {
       "slo": {
         "company": "IXI Labs d.o.o.",

diff --git a/src/app/Components/Navbar/Navbar.tsx b/src/app/Components/Navbar/Navbar.tsx
diff --git a/src/app/fonts/Poppins-Regular.ttf b/src/app/fonts/Poppins-Regular.ttf
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,15 +1,14 @@
 import type { Metadata } from 'next';
-import localFont from 'next/font/local';
-import './globals.scss';
+import '../globals.scss';
 import { NextIntlClientProvider } from 'next-intl';
 import { getLocale, getMessages } from 'next-intl/server';
-import Navbar from '@/app/Components/Navbar/Navbar';
-import Footer from '@/app/Components/Footer/Footer';
+import Navbar from '@/components/Navbar/Navbar';
+import Footer from '@/components/Footer/Footer';
+import { Poppins } from 'next/font/google';
 
-const getPoppinsRegular = localFont({
-  src: './fonts/Poppins-Regular.ttf',
-  variable: '--font-poppins-regular',
-  weight: '100 900',
+const poppins = Poppins({
+  subsets: ['latin'],
+  weight: ['400', '500', '600', '700'],
 });
 
 export const metadata: Metadata = {
@@ -38,7 +37,7 @@ export default async function RootLayout({
       <head>
         <link rel="icon" type="image/png" sizes="32x32" href="/favicon.svg" />
       </head>
-      <body className={`${getPoppinsRegular.variable} `}>
+      <body className={poppins.className}>
         <NextIntlClientProvider messages={messages}>
           <Navbar />
           {children}

diff --git a/src/app/page.module.scss b/src/app/page.module.scss
@@ -0,0 +1,4 @@
+.main {
+  width: 100%;
+  height: 100%;
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,11 +1,11 @@
 import styles from './page.module.scss';
-import HeroSection from '@/app/Components/HeroSection/HeroSection';
-import OurMissionSection from '@/app/Components/OurMissionSection/OurMissionSection';
-import SolvingTheProblemSection from '@/app/Components/SolvingTheProblemSection/SolvingTheProblemSection';
-import CuttingEdgeSection from '@/app/Components/CuttingEdgeSection/CuttingEdgeSection';
-import UseCases from '@/app/Components/UseCases/UseCases';
-import LatestProjects from '@/app/Components/LatestProjects/LatestProjects';
-import OurServicesSection from '@/app/Components/OurServicesSection/OurServicesSection';
+import HeroSection from '@/components/HeroSection/HeroSection';
+import OurMissionSection from '@/components/OurMissionSection/OurMissionSection';
+import SolvingTheProblemSection from '@/components/SolvingTheProblemSection/SolvingTheProblemSection';
+import OurServicesSection from '@/components/OurServicesSection/OurServicesSection';
+import CuttingEdgeSection from '@/components/CuttingEdgeSection/CuttingEdgeSection';
+import UseCases from '@/components/UseCases/UseCases';
+import LatestProjects from '@/components/LatestProjects/LatestProjects';
 
 export default function Home() {
   return (