Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions app/components/overview/filter_bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import * as React from 'react';
import * as ToggleGroupPrimitive from '@radix-ui/react-toggle-group';
import { type VariantProps } from 'class-variance-authority';

import { Vegan, Sprout, MilkOff, WheatOff } from 'lucide-react';
import { Vegan, Sprout, MilkOff, WheatOff, CalendarCheck } from 'lucide-react';
import { useTranslation } from 'react-i18next';

import { ToggleGroup, ToggleGroupItem } from '~/shadcn/components/ui/toggle-group';

export type FilterValue = 'vegan' | 'vegetarian' | 'lactoseFree' | 'glutenFree';
export type FilterValue = 'vegan' | 'vegetarian' | 'lactoseFree' | 'glutenFree' | 'hasMenuToday';

export interface FilterBarProps {
value: FilterValue[];
Expand All @@ -34,6 +34,14 @@ export function FilterBar({ value, onChange }: FilterBarProps) {
<Vegan />
<div className={'hidden osm1:block'}>{t('filters.vegan')}</div>
</ToggleGroupItem>
<ToggleGroupItem
value="hasMenuToday"
aria-label={t('filters.toggleHasMenuToday')}
className="flex-1 data-[state=on]:bg-transparent data-[state=on]:*:[svg]:stroke-jcablue"
>
<CalendarCheck />
<div className={'hidden osm1:block'}>{t('filters.hasMenuToday')}</div>
</ToggleGroupItem>
<ToggleGroupItem
value="vegetarian"
aria-label={t('filters.toggleVegetarian')}
Expand Down
19 changes: 18 additions & 1 deletion app/components/overview/overview_component.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import * as React from 'react';
import { useNavigate } from 'react-router-dom';
import { MapPin, MilkOff, Sprout, UtensilsCrossed, Vegan, WheatOff } from 'lucide-react';
import {
MapPin,
MilkOff,
Sprout,
UtensilsCrossed,
Vegan,
WheatOff,
CalendarX2,
} from 'lucide-react';
import { useTranslation } from 'react-i18next';

import { TopBar } from '~/components/shared/top_bar';
Expand Down Expand Up @@ -197,6 +205,15 @@ export function OverviewComponent() {
{ value: 'vegetarian', label: t('filters.vegetarian'), icon: <Sprout size={16} /> },
{ value: 'lactoseFree', label: t('filters.lactoseFree'), icon: <MilkOff size={16} /> },
{ value: 'glutenFree', label: t('filters.glutenFree'), icon: <WheatOff size={16} /> },
...(mode === 'restaurants'
? [
{
value: 'hasMenuToday' as FilterValue,
label: t('filters.hasMenuToday'),
icon: <CalendarX2 size={16} />,
},
]
: []),
];

const Section = ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ export function useRestaurantItemsWithFilters({
return hasLactoseFreeOption(menu);
case 'glutenFree':
return hasGlutenFreeOption(menu);
case 'hasMenuToday':
return !!menu && !!menu.dishes && menu.dishes.length > 0;
default:
return true;
}
Expand Down
4 changes: 4 additions & 0 deletions app/i18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@ const resources = {
vegetarian: 'Vegetarian',
lactoseFree: 'Lactose-free',
glutenFree: 'Gluten-free',
hasMenuToday: 'Has menu for today',
toggleVegan: 'Toggle vegan',
toggleVegetarian: 'Toggle vegetarian',
toggleLactoseFree: 'Toggle lactose free',
toggleGlutenFree: 'Toggle gluten free',
toggleHasMenuToday: 'Toggle menu for today',
},
menu: {
dishesTitle: '{{name}}',
Expand Down Expand Up @@ -302,10 +304,12 @@ const resources = {
vegetarian: 'Wegetariańskie',
lactoseFree: 'Bez laktozy',
glutenFree: 'Bez glutenu',
hasMenuToday: 'Ma menu na dziś',
toggleVegan: 'Przełącz filtr wegański',
toggleVegetarian: 'Przełącz filtr wegetariański',
toggleLactoseFree: 'Przełącz filtr bez laktozy',
toggleGlutenFree: 'Przełącz filtr bezglutenowy',
toggleHasMenuToday: 'Przełącz ma menu na dziś',
},
menu: {
dishesTitle: '{{name}}',
Expand Down
Loading