Skip to content

add classnames to flags #321

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

Closed
wants to merge 2 commits into from
Closed

add classnames to flags #321

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
dab1198
add classnames to flags for #320
joshreisner Jul 27, 2023
8c00bf5
fix tests
joshreisner Jul 27, 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
2 changes: 1 addition & 1 deletion public/app.js
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions public/tests/flags.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="description" content="React JS recovery meeting finder demo" />
<link rel="icon" type="image/svg+xml" href="/logo.svg" />
<title>Meetings</title>
<style type="text/css">
#tsml-ui small.flag-c {
font-weight: bold;
color: tomato !important;
text-decoration: underline;
}
</style>
</head>

<body>
<div
id="tsml-ui"
data-src="https://sheets.code4recovery.org/storage/12Ga8uwMG4WJ8pZ_SEU7vNETp_aQZ-2yNVsYDFqIwHyE.json"
data-mapbox="pk.eyJ1Ijoiam9zaHJlaXNuZXIiLCJhIjoiY2tvYXA0YnZxMGRldDJxbzdta25uNGphdiJ9.eay-UKgIT99ALmdw08xBPw"
data-google="AIzaSyCS9M8Dqk5cMFqA7xvUrQEzT1u5IvcbT7c"
data-timezone="America/Los_Angeles"
></div>
<script src="/app.js" async></script>
<script>
var tsml_react_config = {
flags: ['M', 'W', 'O', 'C'],
};
</script>
</body>
</html>
38 changes: 19 additions & 19 deletions src/components/Link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,10 @@ type LinkProps = {
export default function Link({ meeting, setState, state }: LinkProps) {
const { settings, strings } = useSettings();

const flags =
settings.flags
?.filter(flag => meeting.types?.includes(flag))
.map(flag => strings.types[flag])
.sort()
.join(', ') ?? [];

if (!state || !setState) {
return !flags.length ? (
const name =
!state || !setState ? (
<>{meeting.name}</>
) : (
<>
<span>{meeting.name}</span>
<small className="ms-2 text-muted">{flags}</small>
</>
);
}

return (
<>
<a
href={formatUrl({ ...state.input, meeting: meeting.slug }, settings)}
onClick={e => {
Expand All @@ -46,7 +30,23 @@ export default function Link({ meeting, setState, state }: LinkProps) {
>
{meeting.name}
</a>
{flags && <small className="ms-2 text-muted">{flags}</small>}
);

const flags = settings.flags
?.filter(flag => meeting.types?.includes(flag))
.map(flag => (
<small
key={flag}
className={`flag-${flag.toLowerCase()} ms-2 text-muted`}
>
{strings.types[flag]}
</small>
));

return (
<>
{name}
{!!flags && flags}
</>
);
}
2 changes: 1 addition & 1 deletion src/components/__tests__/Link.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('<Link />', () => {
</SettingsContext.Provider>
);

expect(screen.getByText(/men/i)).toBeInTheDocument();
expect(screen.getAllByText(/men/i)).toHaveLength(2);
});

it('works with setState', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/__tests__/settings.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('settings', () => {
});

it('should import flags', () => {
const flags: MeetingType[] = ['O', 'C'];
const flags: MeetingType[] = ['C', 'O'];
const { settings } = mergeSettings({ flags });
expect(settings.flags).toEqual(flags);
});
Expand Down
5 changes: 5 additions & 0 deletions src/helpers/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ export function mergeSettings(userSettings?: Partial<TSMLReactConfig>) {

Settings.defaultLocale = navigator.language;

// sort flags alphabetically (more performant to do it here than in render)
settings.flags = settings.flags.sort((a, b) =>
strings.types[a].localeCompare(strings.types[b])
);

return { settings, strings };
}

Expand Down