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.

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

Improve UX/UI #127

Merged
merged 35 commits into from
Jul 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a643e88
improved UX/UI for landing page
Alexandra-Haynes May 18, 2023
974d75b
Address PR review feedback
Alexandra-Haynes May 19, 2023
d4e8f1e
detele unused video
Alexandra-Haynes May 19, 2023
c0ae195
replace unsupported characters
Alexandra-Haynes May 19, 2023
b8fa4c1
adjust layout responsiveness
Alexandra-Haynes May 19, 2023
64e3d66
fix unsupported character
Alexandra-Haynes May 19, 2023
663683a
Merge remote-tracking branch 'origin/main' into uxui-polish
Alexandra-Haynes May 19, 2023
de857d0
fix responsiveness issues
Alexandra-Haynes May 23, 2023
a502ba9
add slide-in animation
Alexandra-Haynes May 23, 2023
0680bab
Merge branch 'main' into uxui-polish
Alexandra-Haynes Jun 13, 2023
77cf3a0
update What is HIERR textbox and add About this engagement and Why cr…
Alexandra-Haynes Jun 14, 2023
f0ab617
fix unsupported character
Alexandra-Haynes Jun 14, 2023
b215d53
Fixing okinas in Hawaii
avenmia Jun 14, 2023
1441bac
add consistant page styling and improve UX
Alexandra-Haynes Jun 15, 2023
4b95698
Updating portal information
avenmia Jun 18, 2023
5fbd44e
Updating cursor types on info links
avenmia Jun 18, 2023
8de9979
temporarily commenting out sign in page to keep email sign in functio…
avenmia Jun 19, 2023
4d50c32
improve hover effect for info links
Alexandra-Haynes Jun 20, 2023
005cc7a
improve UX for map interaction
Alexandra-Haynes Jun 20, 2023
4f35a12
add cohesive styling across pages
Alexandra-Haynes Jun 20, 2023
7289fd1
polis survey page title margin
Alexandra-Haynes Jun 20, 2023
e3f59d9
add progress bar on each step
Alexandra-Haynes Jun 20, 2023
c541541
Fixing local responsive issues
avenmia Jun 23, 2023
14ffaac
Removing sign in page to fix deployment
avenmia Jun 23, 2023
b8f749f
Fixing merge conflicts
avenmia Jun 23, 2023
579d42c
Removing background gradient for now
avenmia Jun 24, 2023
bf0a270
Updating progress bar to be 100% on the last step
avenmia Jun 24, 2023
042d865
Refactoring to use info popup component
avenmia Jun 24, 2023
950f13c
Putting census map info in an info popup
avenmia Jun 24, 2023
26bb074
Fixing okinas
avenmia Jun 24, 2023
8a1a9f9
Fixing info popup z-index
avenmia Jul 1, 2023
75c7dfd
Moving what do we use this data for to the top
avenmia Jul 1, 2023
b2bfe34
migrating progress bar to TypeScript
avenmia Jul 1, 2023
dfd88c0
Merge branch 'main' into uxui-polish
avenmia Jul 14, 2023
bfbf46f
change checkbox's color for consistency
Alexandra-Haynes Jul 14, 2023
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
61 changes: 38 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"react-dom": "18.2.0",
"react-esri-leaflet": "^2.0.1",
"react-hook-form": "^7.43.7",
"react-icons": "^4.8.0",
"react-leaflet": "^4.2.0",
"superjson": "1.9.1",
"zod": "^3.20.2"
Expand Down
51 changes: 45 additions & 6 deletions src/UI/NextPageButtonLink.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,67 @@
import Link from "next/link";
import { TiInputChecked } from "react-icons/ti";

interface NextPageButtonLinkProps {
pageName: string;
msg: string;
disabled?: boolean;
query?: { [key: string]: string };
text: string;
successMessage: boolean;
whiteDesignButton: boolean;
}

export const NextPageButtonLink = ({
pageName,
msg,
disabled,
query,
text,
successMessage,
whiteDesignButton,
}: NextPageButtonLinkProps) => {
const href = { pathname: `./${pageName}`, query: query };
return (
<div>
<Link href={href}>
<button
disabled={disabled}
className="rounded-full bg-white/90 px-10 py-3 text-blue-default no-underline transition hover:bg-white hover:text-blue-darker"
{successMessage ? (
<p
className=" mx-auto w-[80%] -translate-y-8
border border-dashed border-white p-2 text-center text-sm xl:w-1/2 2xl:text-lg"
>
{" "}
<span>
<TiInputChecked className="mx-auto text-4xl text-yellowGreen" />
</span>{" "}
{text}
</p>
) : (
<p
className=" mx-auto w-[80%] -translate-y-8
p-2 text-center text-sm xl:w-1/2 2xl:text-lg"
>
{msg}
</button>
{text}
</p>
)}
<Link href={href}>
{whiteDesignButton ? (
<button
disabled={disabled}
className="mb-1 rounded-full bg-white/80 px-6
py-2 text-lg text-blue-darker no-underline shadow-xl transition ease-in-out
hover:translate-y-1 hover:bg-white "
>
{msg}
</button>
) : (
<button
disabled={disabled}
className="mb-1 rounded-full border-2 border-dashed border-lightGreen bg-yellowGreen px-6
py-1 text-lg text-blue-darker no-underline shadow-xl transition ease-in-out
hover:translate-y-1 hover:bg-lightGreen "
>
{msg}
</button>
)}
</Link>
</div>
);
Expand Down
30 changes: 30 additions & 0 deletions src/components/AboutThisEngagement.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from "react";

const AboutThisEngagementPortal = () => {
return (
<>
<h3 className="text-md p-4 pl-2 text-center font-semibold 2xl:text-xl">
About this Engagement Portal
</h3>
<p className="mb-2 mt-4 pb-4 2xl:text-lg">
This engagement portal is designed to help our project team understand:{" "}
</p>

<ol className="ml-4 mb-2 list-decimal pb-4 2xl:text-lg">
<li className="md:mb-2">
Demographic information of those who participate in the project.
</li>
<li className="md:mb-2">
What Hawai&#699;i residents value and envision for our State&apos;s
economic future.
</li>
<li className="md:mb-2">
Hardships faced by residents during the COVID-19 pandemic and economic
shutdown.
</li>
</ol>
</>
);
};

export default AboutThisEngagementPortal;
21 changes: 21 additions & 0 deletions src/components/CensusMapInfo.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React from "react";

export default function CensusMapInfo() {
return (
<>
<h3 className="text-md pb-2 pl-2 text-center font-semibold 2xl:text-xl">
What do we use this information for?
</h3>
<p
className="mx-auto mt-4 w-[90%] p-1
text-center text-sm md:m-4 2xl:text-lg"
>
We use this information to report on the diverse representation of
people in our community. By collecting and analyzing demographic data,
we aim to include perspectives from a wide range of individuals. This
helps us ensure that our processes are inclusive and reflect the voices
of our community as much as possible.
</p>
</>
);
}
62 changes: 62 additions & 0 deletions src/components/InfoPopup.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import React, { useState } from "react";
import { BsChevronDown } from "react-icons/bs";
import { IoCloseSharp } from "react-icons/io5";

interface InfoPopupProps {
title: string;
PopupInfo: React.FC;
}

const InfoPopup = ({ title, PopupInfo }: InfoPopupProps) => {
const [showMore, setShowMore] = useState(false);

const toggleMoreInformation = () => {
setShowMore(!showMore);
};
return (
<>
<div
className="flex cursor-pointer flex-row items-center justify-center gap-2
hover:scale-[102%]
"
onClick={toggleMoreInformation}
>
<p
className="text-md border-white py-1 text-white underline-offset-4
hover:text-yellowGreen 2xl:text-xl"
>
{title}
</p>
{!showMore && (
<div className="text-lg text-white">
<BsChevronDown />
</div>
)}
</div>

{showMore && (
<div
className="md:bottom-22 lg:bottom-18 fixed bottom-2 z-[1500] w-[98%]
animate-slide-in rounded-md
bg-white/90 p-1 text-sm
shadow-xl
backdrop-blur-md ease-in-out sm:bottom-8
sm:w-[94%] sm:p-2
md:p-8 lg:w-[84%]
xl:bottom-12 xl:w-[80%]
2xl:bottom-20 2xl:w-[60%]"
>
<button
onClick={toggleMoreInformation}
className="absolute top-4 right-4 text-2xl lg:text-4xl"
>
<IoCloseSharp />
</button>
<PopupInfo />
</div>
)}
</>
);
};

export default InfoPopup;
23 changes: 23 additions & 0 deletions src/components/ProgressBar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React from "react";

interface ProgressBarProps {
completed: number;
}

const ProgressBar = ({ completed }: ProgressBarProps) => {
const fillerStyles = {
height: "100%",
width: `${completed}%`,
backgroundColor: "yellowGreen",
borderRadius: "inherit",
transition: "width 1s ease-in-out",
};

return (
<div className="border-radius-10 m-2 h-2 w-[400px] bg-white opacity-70">
<div style={fillerStyles}></div>
</div>
);
};

export default ProgressBar;
Loading
Loading