mirror of
https://github.com/myfatemi04/wheelshare-frontend.git
synced 2025-04-09 22:00:16 -04:00
add captions to act as ui helpers
This commit is contained in:
parent
87a49190eb
commit
510ce220c9
|
@ -55,7 +55,7 @@ export default function EventCarpoolCreateButton() {
|
|||
</span>
|
||||
) : (
|
||||
<>
|
||||
<span>Available to drive?</span>
|
||||
<span style={{ fontSize: '0.875em' }}>Available to drive?</span>
|
||||
<UIButton
|
||||
onClick={createCarpoolCallback}
|
||||
style={{ backgroundColor: lightgrey }}
|
||||
|
|
|
@ -141,6 +141,10 @@ export default function Carpools() {
|
|||
return (
|
||||
<div style={{ display: 'flex', flexDirection: 'column' }}>
|
||||
<h3 style={{ marginBottom: '0' }}>Carpools</h3>
|
||||
<span style={{ fontSize: '0.875rem' }}>
|
||||
Click <EmojiPeopleIcon style={{ fontSize: '0.875rem' }} /> to request to
|
||||
join a carpool.
|
||||
</span>
|
||||
{event.carpools.map((carpool) => (
|
||||
<CarpoolRow
|
||||
carpool={carpool}
|
||||
|
|
|
@ -65,6 +65,7 @@ export default function EventInterestForm() {
|
|||
|
||||
return (
|
||||
<>
|
||||
<span style={{ fontSize: '0.875em' }}>Click to toggle your interest</span>
|
||||
<UIButton
|
||||
onClick={
|
||||
interested
|
||||
|
@ -84,6 +85,9 @@ export default function EventInterestForm() {
|
|||
</UIButton>
|
||||
{interested && (
|
||||
<>
|
||||
<span style={{ fontSize: '0.875em' }}>
|
||||
Click to toggle your driving availability
|
||||
</span>
|
||||
<UIButton
|
||||
onClick={() => {
|
||||
canDriveRef.current = !canDriveRef.current;
|
||||
|
|
|
@ -83,6 +83,7 @@ export default function EventSignups() {
|
|||
const { event } = useContext(EventContext);
|
||||
const signups = event.signups;
|
||||
const carpools = event.carpools;
|
||||
const me = useMe();
|
||||
|
||||
const signupsWithoutCarpool = useMemo(() => {
|
||||
// A list of users not in any carpool
|
||||
|
@ -94,10 +95,24 @@ export default function EventSignups() {
|
|||
.map((id) => signups[id]);
|
||||
}, [signups, carpools]);
|
||||
|
||||
const hasCarpool = useMemo(
|
||||
() =>
|
||||
event.carpools.some((carpool) =>
|
||||
carpool.members.some((member) => member.id === me?.id)
|
||||
),
|
||||
[event.carpools, me?.id]
|
||||
);
|
||||
|
||||
return (
|
||||
<div style={{ display: 'flex', flexDirection: 'column' }}>
|
||||
<h3 style={{ marginBlockEnd: '0' }}>People without a carpool</h3>
|
||||
<EventCarpoolCreateButton />
|
||||
{!hasCarpool && (
|
||||
<span style={{ fontSize: '0.875em' }}>
|
||||
Click <PersonAddIcon style={{ fontSize: '0.875rem' }} /> to add
|
||||
someone to the temporary invite list
|
||||
</span>
|
||||
)}
|
||||
{signupsWithoutCarpool.map((signup) => (
|
||||
<EventSignup key={signup.user.id} signup={signup} />
|
||||
))}
|
||||
|
|
|
@ -1,30 +1,39 @@
|
|||
import { IGroup } from '../types';
|
||||
import UILink from '../UI/UILink';
|
||||
import UISecondaryBox from '../UI/UISecondaryBox';
|
||||
|
||||
function GroupListItem({ group }: { group: IGroup }) {
|
||||
return (
|
||||
<UISecondaryBox>
|
||||
<h2
|
||||
<div style={{ display: 'flex', alignItems: 'center' }}>
|
||||
<span
|
||||
style={{
|
||||
textAlign: 'center',
|
||||
cursor: 'pointer',
|
||||
}}
|
||||
onClick={() => {
|
||||
window.location.href = `/groups/${group.id}`;
|
||||
fontSize: '1.5rem',
|
||||
fontWeight: 'bold',
|
||||
display: 'block',
|
||||
marginTop: '1rem',
|
||||
marginBottom: '1rem',
|
||||
marginRight: '2rem',
|
||||
}}
|
||||
>
|
||||
{group.name}
|
||||
</h2>
|
||||
</UISecondaryBox>
|
||||
</span>
|
||||
<UILink href={`/groups/${group.id}`}>View group</UILink>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default function GroupList({ groups }: { groups: IGroup[] }) {
|
||||
return (
|
||||
<div style={{ display: 'flex', flexDirection: 'column', width: '100%' }}>
|
||||
<UISecondaryBox
|
||||
style={{
|
||||
width: '100%',
|
||||
boxSizing: 'border-box',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
{groups.map((group) => (
|
||||
<GroupListItem group={group} key={group.id} />
|
||||
))}
|
||||
</div>
|
||||
</UISecondaryBox>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -5,7 +5,8 @@ const baseStyle: CSSProperties = {
|
|||
borderRadius: '0.5em',
|
||||
textTransform: 'uppercase',
|
||||
fontWeight: 500,
|
||||
margin: '0.5em',
|
||||
marginTop: '0.5rem',
|
||||
marginBottom: '0.5rem',
|
||||
cursor: 'pointer',
|
||||
userSelect: 'none',
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue
Block a user