diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index b84a5e9..fccc05e 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -1,18 +1,18 @@
"use client";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import TeamCardTwo from '@/components/sections/team/TeamCardTwo';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
+import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import Link from "next/link";
export default function AboutPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Features", id: "/features" },
- { name: "Contact", id: "/contact" },
+ { name: "Admin", id: "/admin" },
{ name: "Dashboard", id: "https://dashboard.vkms.local" },
];
@@ -38,84 +38,71 @@ export default function AboutPage() {
/>
-
+
-
-
+
+
+
+
+
-
+
-
-
+
@@ -144,4 +100,4 @@ export default function FeaturesPage() {
);
-}
\ No newline at end of file
+}
diff --git a/src/app/globals.css b/src/app/globals.css
index f624db2..e05baab 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -1,5 +1,121 @@
-@import "tailwindcss";
-@import "./styles/variables.css";
-@import "./styles/theme.css";
-@import "./styles/utilities.css";
-@import "./styles/base.css";
+@layer base {
+ html {
+ scroll-behavior: smooth;
+ }
+}
+
+@supports (height: 100dvh) {
+ html,
+ body {
+ height: 100dvh;
+ }
+}
+
+body {
+ background-color: var(--background);
+ color: var(--foreground);
+ position: relative;
+ width: 100%;
+}
+
+body {
+ margin: 0;
+ padding: 0;
+ font-feature-settings: "rlig" 1, "calt" 1;
+}
+
+html,
+body {
+ max-width: 100vw;
+ overflow-x: hidden;
+}
+
+input[type="text"],
+input[type="email"],
+input[type="tel"],
+input[type="password"],
+input[type="number"],
+input[type="date"],
+input[type="time"],
+input[type="datetime-local"],
+input[type="month"],
+input[type="week"],
+input[type="url"],
+input[type="search"],
+textarea,
+select {
+ font-size: 16px;
+ font-family: inherit;
+}
+
+a {
+ color: inherit;
+ text-decoration: none;
+}
+
+* {
+ box-sizing: border-box;
+}
+
+*::placeholder {
+ opacity: 0.75;
+}
+
+button {
+ border: none;
+ margin: 0;
+ padding: 0;
+ width: auto;
+ overflow: visible;
+ background: transparent;
+ color: inherit;
+ font: inherit;
+ line-height: normal;
+ cursor: pointer;
+ -webkit-font-smoothing: inherit;
+ -moz-osx-font-smoothing: inherit;
+}
+
+button::-moz-focus-inner {
+ border: 0;
+ padding: 0;
+}
+
+dl,
+dt,
+dd {
+ margin: 0;
+}
+
+ol,
+ul {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+}
+
+img,
+svg,
+video,
+canvas,
+audio,
+iframe,
+embed,
+object {
+ display: block;
+}
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+hr {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+
+quote {
+ margin: 0;
+}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 7b38cd0..49b835c 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,73 +1,21 @@
import type { Metadata } from "next";
-import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
-import { Montserrat } from "next/font/google";
+import "./styles/variables.css";
import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
-const halant = Halant({
- variable: "--font-halant",
- subsets: ["latin"],
- weight: ["300", "400", "500", "600", "700"],
-});
-
-const inter = Inter({
- variable: "--font-inter",
- subsets: ["latin"],
-});
-
-const montserrat = Montserrat({
- variable: "--font-montserrat",
- subsets: ["latin"],
-});
+const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
- title: "VKMS Smart Office - Digital Santha Collection Management",
- description: "Transform your community's Santha collection with VKMS Smart Office. Member management, AI assistant, automated reports, and secure data tracking for Vishwakarma Munetra Sangam.",
- keywords: "Santha collection, member management, community organization, digital office, collection tracking, AI assistant, reports generation",
- metadataBase: new URL("https://vkms.org"),
- alternates: {
- canonical: "https://vkms.org",
- },
- openGraph: {
- title: "VKMS Smart Office - Digital Collection Management System",
- description: "Digitize your Santha collection, manage members, generate instant reports, and use AI assistance for your community organization.",
- siteName: "VKMS Vishwakarma Munetra Sangam",
- type: "website",
- images: [
- {
- url: "http://img.b2bpic.net/free-photo/luxurious-boardroom-space-within-multinational-company-used-meetings_482257-124520.jpg",
- alt: "VKMS Smart Office Dashboard",
- },
- ],
- },
- twitter: {
- card: "summary_large_image",
- title: "VKMS Smart Office - Digital Santha Management",
- description: "Smart collection tracking and member management for your community.",
- images: ["http://img.b2bpic.net/free-photo/luxurious-boardroom-space-within-multinational-company-used-meetings_482257-124520.jpg"],
- },
- robots: {
- index: true,
- follow: true,
- },
-};
+ title: "VKMS - Smart Office Management System", description: "Vishwakarma Munetra Sangam - Digital office management system for member management, santha collection tracking, automated reports, and AI assistance."};
export default function RootLayout({
children,
-}: Readonly<{
+}: {
children: React.ReactNode;
-}>) {
+}) {
return (
-
-
-
-
- {children}
-
+
+ {children}
-
);
-}
\ No newline at end of file
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 01bcb23..fef0981 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -17,7 +17,7 @@ export default function HomePage() {
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Features", id: "/features" },
- { name: "Contact", id: "/contact" },
+ { name: "Admin", id: "/admin" },
{ name: "Dashboard", id: "https://dashboard.vkms.local" },
];
@@ -74,7 +74,8 @@ export default function HomePage() {
);
-}
\ No newline at end of file
+}
diff --git a/src/app/styles/base.css b/src/app/styles/base.css
index aa7fd03..e8c873b 100644
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -1,28 +1,7 @@
-* {
- scrollbar-width: thin;
- scrollbar-color: rgba(255, 255, 255, 1) rgba(255, 255, 255, 0);
-}
-
-html {
- overscroll-behavior: none;
- overscroll-behavior-y: none;
-}
-
-body {
- background-color: var(--background);
- color: var(--foreground);
- font-family: var(--font-montserrat), sans-serif;
- position: relative;
- min-height: 100vh;
- overscroll-behavior: none;
- overscroll-behavior-y: none;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
- font-family: var(--font-montserrat), sans-serif;
+@layer base {
+ @supports (font-variation-settings: normal) {
+ html {
+ font-family: var(--font-inter), sans-serif;
+ }
+ }
}