Skip to content

Commit 81950f4

Browse files
committed
update home ui
1 parent 173210f commit 81950f4

File tree

8 files changed

+86
-33
lines changed

8 files changed

+86
-33
lines changed
2.25 KB
Loading

prototype/lvis-ui/src/components/map/ValuationMap.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const ValuationMap = () => {
7979
);
8080
};
8181
return (
82-
<div style={{ position: 'relative', height: '100vh' }}>
82+
<div style={{ position: 'relative', height: '75vh' }}>
8383
<MapContainer
8484
zoomControl={false}
8585
bounds={extent}

prototype/lvis-ui/src/components/map/toolbar/Toolbar.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ const Toolbar = ({ baseLayers, overlays, onBaseLayerChange, onOverlayToggle, ext
260260
{ name: 'Measure', content: <MeasureIcon />, impl: <MeasurementControl /> },
261261
{ name: 'Divider', content: null, impl: null },
262262
{ name: 'Extend', content: <ExtendIcon />, impl: <ExtendControl /> },
263-
{ name: 'Scale', content: <AspectRatioOutlinedIcon />, impl: <ScaleTableControl /> },
263+
// { name: 'Scale', content: <AspectRatioOutlinedIcon />, impl: <ScaleTableControl /> },
264264
{ name: 'ZoomIn', content: <ZoomInButton />, impl: null },
265265
{ name: 'Level', content: <ZoomDisplayButton />, impl: null },
266266
{ name: 'ZoomOut', content: <ZoomOutButton />, impl: null },
@@ -278,7 +278,7 @@ const Toolbar = ({ baseLayers, overlays, onBaseLayerChange, onOverlayToggle, ext
278278
const isExtendControl = tool.name === 'Extend' ? true : false;
279279
if (!content && !implement) { // is Divider
280280
return (
281-
<Box m="1.25vh 0 1.25vh 0" key={index}>
281+
<Box m="1vh 0 1vh 0" key={index}>
282282
</Box>
283283
);
284284
}

prototype/lvis-ui/src/components/toolbars/LeftBar.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ export default function LeftBar() {
5959
display: "flex",
6060
position: "absolute",
6161
justifyContent: "flex-start",
62-
height: "100vh",
62+
height: "75vh",
6363
zIndex: "drawer",
6464
}}
6565
>
6666
<div {...getCollapseProps()}>
6767
<div
6868
style={{
69-
height: "100vh",
69+
height: "75vh",
7070
background: theme.palette.background.alt,
7171
}}
7272
>

prototype/lvis-ui/src/scenes/home/index.jsx

+78-26
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,67 @@
11
import {
22
Box,
33
Typography,
4-
IconButton,
5-
InputBase,
64
useTheme,
75
} from "@mui/material";
8-
import {Search} from "@mui/icons-material";
96
import TopBox from "../../components/TopBox";
10-
import FlexBetween from "../../components/FlexBetween";
117
import ChooserWidget from "../widgets/ChooserWidget";
128
import { useTranslation } from "react-i18next";
139

10+
11+
const notifications = [
12+
{ title: '2024 Land Price Valuation Standards Update for Lao PDR', date: '2024-01-02' },
13+
{ title: 'Land Price Information System Maintenance Notice', date: '2024-01-02' },
14+
{ title: 'New Land Registration Feature Now Available', date: '2024-01-02' },
15+
];
16+
17+
const NotificationBox = () => {
18+
return (
19+
<Box
20+
sx={{
21+
mt: '20px',
22+
display: 'flex',
23+
alignItems: 'center',
24+
backgroundColor: '#f5f5f5',
25+
borderRadius: '10px',
26+
padding: '16px',
27+
gap: '50px',
28+
}}
29+
>
30+
{/* Icon on the left side */}
31+
<img
32+
src="/notify_bell.png"
33+
alt="Notification Icon"
34+
style={{ width: '40px', height: '40px' }}
35+
/>
36+
37+
{/* Notifications list */}
38+
<Box sx={{ flex: 1 }}>
39+
{notifications.map((item, index) => (
40+
<Box
41+
key={index}
42+
sx={{
43+
display: 'flex',
44+
justifyContent: 'space-between',
45+
alignItems: 'center',
46+
padding: '5px 0',
47+
//borderBottom: index !== notifications.length - 1 ? '1px solid #e0e0e0' : 'none',
48+
gap: '100px',
49+
}}
50+
>
51+
{/* Notification title */}
52+
<Typography variant="body1">{item.title}</Typography>
53+
54+
{/* Notification date */}
55+
<Typography variant="body2" sx={{ color: '#757575' }}>
56+
{item.date}
57+
</Typography>
58+
</Box>
59+
))}
60+
</Box>
61+
</Box>
62+
);
63+
};
64+
1465
const Middle = () => {
1566
const theme = useTheme();
1667
const { t } = useTranslation();
@@ -25,43 +76,42 @@ const Middle = () => {
2576
<Box
2677
display="flex"
2778
flexDirection="column"
28-
alignItems="flex-start"
79+
justifyContent="center"
80+
alignItems="center"
81+
gap="30px"
2982
sx={{
3083
"& .MuiTypography-root ": {
3184
lineHeight: '1.25',
3285
},
3386
}}
3487
>
35-
<Typography fontSize="18px" fontWeight="bold" color={theme.palette.neutral.medium}>
36-
LVIS(Land Valuation Information System)
88+
<Typography fontSize="28px" fontWeight="bold" color={theme.palette.neutral.medium}>
89+
ລະບົບຂໍ້ມູນລາຄາທີ່ດິນໃນ ສປປ ລາວ
3790
</Typography>
3891
<Typography
3992
sx={{
4093
color: theme.palette.neutral.medium,
41-
fontSize: "72px",
94+
fontSize: "45px",
4295
fontWeight: "bold",
96+
position: 'relative',
97+
paddingBottom: '15px', // Adjust padding to create space for the ::after text
98+
'::after': {
99+
content: '"in Lao PDR"',
100+
position: 'absolute',
101+
right: -25,
102+
bottom: 0,
103+
backgroundColor: 'yellow',
104+
color: 'red',
105+
fontSize: '12px',
106+
padding: '2px 4px',
107+
borderRadius: '4px',
108+
},
43109
}}
44110
>
45-
{t("Land Value Information System")}
111+
{t("Land Price Information System")}
46112
</Typography>
47113
</Box>
48-
<FlexBetween
49-
backgroundColor={theme.palette.background.alt}
50-
borderRadius="30px"
51-
gap="3rem"
52-
p="0.1rem 1.5rem"
53-
width="38%"
54-
height="50px"
55-
border="1px solid #999999"
56-
mt="3rem"
57-
>
58-
<InputBase
59-
fullWidth
60-
placeholder={t("Please enter a search term (region name, town name, code, etc.).")} />
61-
<IconButton>
62-
<Search />
63-
</IconButton>
64-
</FlexBetween>
114+
<NotificationBox />
65115
<Box
66116
sx={{
67117
width: "100%",
@@ -77,6 +127,8 @@ const Middle = () => {
77127
);
78128
};
79129

130+
131+
80132
const HomePage = () => {
81133
const { t } = useTranslation();
82134
return (

prototype/lvis-ui/src/scenes/maps/base/BaseInside.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const BaseInside = () => {
88
<Box display="flex" width="100%" height="100%">
99
<Box flexGrow={1}>
1010
<Box
11-
height="100vh"
11+
height="100%"
1212
position= "relative"
1313
sx={{
1414
display: "grid",

prototype/lvis-ui/src/scenes/maps/valuation/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Valuation = () => {
1111
<Header title="LAND VALUATION DOCUMENTATION" subtitle="Find your land valuation materials." />
1212
<Box
1313
mt="40px"
14-
height="75vh"
14+
height="75.25vh"
1515
border={`1px solid ${theme.palette.secondary[200]}`}
1616
borderRadius="4px"
1717
>

prototype/lvis-ui/src/scenes/widgets/ChooserWidget.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const ChooserWidget = ({ image, title, description, link, width="260px", height=
1515
height = {height}
1616
display="flex"
1717
flexDirection="column"
18+
bgcolor="#f5f5f5"
1819
alignItems="center"
1920
sx={{
2021
minWidth: 260,

0 commit comments

Comments
 (0)