Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#1000] Update dashboard link #1001

Merged
merged 2 commits into from
Jan 19, 2024
Merged

[#1000] Update dashboard link #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb240ea
[#1000] Update dashboard link
navins94 Jan 19, 2024
2141cd1
[#1000] Modify header test, remove unused button in landing page
dedenbangkit Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions frontend/src/components/layout/Banner.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ const Banner = () => {
};
const DashboardMenu = (
<Menu>
{window?.dashboard?.map((d) => (
{window?.powerBIDashboard?.map((d) => (
<Menu.Item
key={`${d.name}`}
style={{ fontSize: 16, fontStyle: "italic", padding: 10 }}
>
<Link to={`/${d.page}/${d.form_id}`}>{d.name}</Link>
<Link to={`/${d.page}/${d.path}`}>{d.name}</Link>
</Menu.Item>
))}
</Menu>
Expand All @@ -114,6 +114,7 @@ const Banner = () => {
<Countdown date="2025-12-31T09:00:00" renderer={renderer} />
</div>
<Row>
{/*
<Button
type="primary"
onClick={() => scrollToView()}
Expand All @@ -122,6 +123,7 @@ const Banner = () => {
>
{text?.welcomeCta}
</Button>
*/}
<Dropdown overlay={DashboardMenu}>
<Button
shape="round"
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/lib/__test__/__snapshots__/ui-text.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,15 +591,15 @@ Object {
"valPhone": "Phone number is required",
"valRole": "Please select a Role",
"welcome": <React.Fragment>
RUSH Real Time Monitoring
Rural and Urban Sanitation and Hygiene (RUSH)
<br />
Information System
Real-Time Monitoring and Information System (RTMIS)
</React.Fragment>,
"welcomeCta": "Explore National Data",
"welcomeDesc": <React.Fragment>
RUSH Real Time Monitoring
Rural and Urban Sanitation and Hygiene (RUSH)
<br />
Information System
Real-Time Monitoring and Information System (RTMIS)
</React.Fragment>,
"welcomeShort": "Welcome to RUSH",
"year": "Year",
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/lib/ui-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ const uiText = {
// Home page
welcome: (
<Fragment>
RUSH Real Time Monitoring
Rural and Urban Sanitation and Hygiene (RUSH)
<br />
Information System
Real-Time Monitoring and Information System (RTMIS)
</Fragment>
),
welcomeDesc: (
<Fragment>
RUSH Real Time Monitoring
Rural and Urban Sanitation and Hygiene (RUSH)
<br />
Information System
Real-Time Monitoring and Information System (RTMIS)
</Fragment>
),
countdownTitle: "Time remaining to achieve national RUSH targets:",
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/pages/home/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,9 @@ const Home = () => {
</Col>
<Col span={14}>
<p>{text.aboutText}</p>
{/*
<Button type="link">{text.learnMoreButton}</Button>
{/* <h1>Partners</h1>
<h1>Partners</h1>
<Row align="middle" justify="center" style={{ marginTop: "24px" }}>
<Space size={50} align="center">
{partners.map((p) => (
Expand Down Expand Up @@ -122,9 +123,11 @@ const Home = () => {
<span>{text.reportText}</span>
</li>
</ul>
{/*
<Button type="primary" shape="round">
{text.welcomeCta}
</Button>
*/}
</div>
</Col>
<Col lg={14}>
Expand Down
Loading