Skip to content

Commit ed450c2

Browse files
Deepthi-ChandDeepthi-Chand
authored
Merge pull request #214 from CivicDataLab/213-update-the-header-and-footer
213 update header and footer
2 parents dbffc5e + 316c639 commit ed450c2

File tree

13 files changed

+6734
-5779
lines changed

13 files changed

+6734
-5779
lines changed

‎app/[locale]/(user)/layout.tsx‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
'use client';
22

3-
import React from 'react';
4-
import Image from 'next/image';
5-
import Link from 'next/link';
63
import { notFound, usePathname } from 'next/navigation';
7-
import { Icon, Text } from 'opub-ui';
4+
import React from 'react';
85

9-
import { Icons } from '@/components/icons';
106
import MainFooter from '../dashboard/components/main-footer';
117
import { MainNav } from '../dashboard/components/main-nav';
128

@@ -25,12 +21,7 @@ export default function Layout({ children }: UserLayoutProps) {
2521

2622
return (
2723
<div className="flex h-full grow flex-col">
28-
<header
29-
className="relative z-2 px-4 py-3 shadow-elementTopNav"
30-
style={{
31-
backgroundColor: 'var( --background-alpha-medium)',
32-
}}
33-
>
24+
<header className="relative z-2 p-6 lg:px-10 lg:py-6 shadow-elementTopNav bg-primaryBlue">
3425
<MainNav hideSearch={hideSearch} />
3526
</header>
3627
<>{children}</>

‎app/[locale]/dashboard/components/main-footer.tsx‎

Lines changed: 44 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,80 +4,64 @@ import Link from 'next/link';
44
import { Icon, Text } from 'opub-ui';
55

66
import { Icons } from '@/components/icons';
7+
import { IconBinary, IconBinaryTree } from '@tabler/icons-react';
78

89
const MainFooter = () => {
910
return (
1011
<>
11-
<div
12-
style={{
13-
backgroundColor: 'var( --background-alpha-medium)',
14-
}}
15-
>
16-
<div className="flex flex-wrap items-center justify-start gap-8 p-10 md:justify-center lg:justify-center lg:gap-32 ">
17-
<div className="flex items-center gap-8 ">
18-
<Link href="/">
19-
<div className="flex items-center gap-2">
20-
<Icon source={Icons.logo} size={24} color="success" />
12+
<div className="bg-primaryBlue">
13+
<div className="flex flex-col gap-8 p-6 lg:px-28 lg:py-10">
14+
<div className="flex flex-wrap justify-between gap-8 ">
15+
{' '}
16+
<div className="flex items-center gap-2">
17+
<Image src={'/logo.png'} width={38} height={38} alt="logo" />
18+
<Text variant="headingXl" className="text-surfaceDefault" as="h1">
19+
CivicDataSpace
20+
</Text>
21+
</div>
22+
<div className=" flex flex-col lg:items-end gap-2">
23+
<div>
24+
{' '}
2125
<Text
22-
variant="headingLg"
23-
className="text-surfaceDefault"
24-
as="h1"
26+
color="highlight"
27+
className=" font-bold text-borderWarningSubdued"
2528
>
26-
CivicDataSpace
29+
Follow Us
2730
</Text>
2831
</div>
29-
</Link>
30-
<div>
31-
<Link href={'https://civicdatalab.in'} target="_blank">
32-
<Image src={'/cdl.svg'} width={96} alt={'cdl'} height={94} />
33-
</Link>{' '}
32+
33+
<div className=" flex gap-3">
34+
<div className=" h-10 w-10 rounded-5 bg-secondaryOrange p-2">
35+
<Icon source={Icons.twitter} size={24} color="onBgDefault" />
36+
</div>
37+
<div className=" h-10 w-10 rounded-5 bg-secondaryOrange p-2">
38+
<Icon source={Icons.linkedin} size={24} color="onBgDefault" />
39+
</div>
40+
<div className=" h-10 w-10 rounded-5 bg-secondaryOrange p-2">
41+
<Icon source={Icons.facebook} size={24} color="onBgDefault" />
42+
</div>
43+
<div className=" h-10 w-10 rounded-5 bg-secondaryOrange p-2">
44+
<Icon source={Icons.github} size={24} color="onBgDefault" />
45+
</div>
46+
</div>
3447
</div>
3548
</div>
36-
<div className=" flex gap-6">
37-
<Link href={'#'} className=" text-baseIndigoSolid2">
38-
About Us
39-
</Link>
40-
<Link href={'#'} className=" text-baseIndigoSolid2">
41-
Sitemap
42-
</Link>
43-
<Link href={'#'} className=" text-baseIndigoSolid2">
44-
Contact Us
45-
</Link>
46-
</div>
47-
<div className=" flex flex-col gap-2">
48-
<Text
49-
color="highlight"
50-
className=" font-bold text-borderWarningSubdued"
51-
>
52-
Follow Us
53-
</Text>
54-
<div className=" flex gap-3">
55-
<div className=" h-10 w-10 rounded-5 bg-baseBlueSolid8 p-2">
56-
<Icon source={Icons.twitter} size={24} color="onBgDefault" />
57-
</div>
58-
<div className=" h-10 w-10 rounded-5 bg-baseBlueSolid8 p-2">
59-
<Icon source={Icons.linkedin} size={24} color="onBgDefault" />
60-
</div>
61-
<div className=" h-10 w-10 rounded-5 bg-baseBlueSolid8 p-2">
62-
<Icon source={Icons.facebook} size={24} color="onBgDefault" />
63-
</div>
64-
<div className=" h-10 w-10 rounded-5 bg-baseBlueSolid8 p-2">
65-
<Icon source={Icons.github} size={24} color="onBgDefault" />
66-
</div>
49+
<div className=" flex justify-between flex-wrap">
50+
<div className=" flex gap-6">
51+
<Link href={'#'}>
52+
<Text color="onBgDefault"> About Us</Text>
53+
</Link>
54+
<Link href={'#'}>
55+
<Text color="onBgDefault"> Sitemap</Text>
56+
</Link>
57+
<Link href={'#'}>
58+
<Text color="onBgDefault"> Contact Us</Text>
59+
</Link>
6760
</div>
61+
6862
</div>
6963
</div>
7064
</div>
71-
<div className=" bg-baseBlueSolid6 p-2">
72-
<div className=" m-auto flex items-center gap-2 md:pl-4 lg:w-5/6 lg:pl-8">
73-
<Icon source={Icons.info} size={24} />
74-
75-
<Text variant="bodyMd">
76-
This Platform is designed, developed and hosted by CivicDataLab for
77-
Data Exchange
78-
</Text>
79-
</div>
80-
</div>
8165
</>
8266
);
8367
};

0 commit comments

Comments
 (0)