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
4 changes: 2 additions & 2 deletions app/components/aggregation-filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ export function AggregationFilter() {
>
<SelectPrimitive.Trigger
className={
'flex h-10 items-center justify-between bg-transparent px-3 py-2 text-sm placeholder:text-slate-500 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:placeholder:text-slate-400'
'flex h-10 items-center justify-between bg-transparent px-3 py-2 text-sm placeholder:text-slate-500 focus:outline-hidden disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:placeholder:text-slate-400'
}
>
<div className="inline-flex h-8 items-center justify-center whitespace-nowrap rounded-md border border-slate-200 bg-white text-sm font-medium ring-offset-white transition-colors hover:bg-slate-100 hover:text-slate-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-slate-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 dark:border-slate-800 dark:bg-slate-950 dark:ring-offset-slate-950 dark:hover:bg-slate-800 dark:hover:text-slate-50 dark:focus-visible:ring-slate-300">
<div className="inline-flex h-8 items-center justify-center whitespace-nowrap rounded-md border border-slate-200 bg-white text-sm font-medium ring-offset-white transition-colors hover:bg-slate-100 hover:text-slate-900 focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-slate-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 dark:border-slate-800 dark:bg-slate-950 dark:ring-offset-slate-950 dark:hover:bg-slate-800 dark:hover:text-slate-50 dark:focus-visible:ring-slate-300">
<Filter className="mr-2 h-4 w-4" />
Aggregation
<>
Expand Down
2 changes: 1 addition & 1 deletion app/components/color-picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function ColorPicker({
<Input
id="custom"
value={colorPickerState.color}
className="flex-grow"
className="grow"
onChange={(e) => {
handleColorChange(e.target.value, colorPickerState.index)
setColorPickerState({ ...colorPickerState, color: e.target.value })
Expand Down
2 changes: 1 addition & 1 deletion app/components/daterange-filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export function DateRangeFilter() {
</div>
<div className="flex w-full items-center justify-evenly py-2 dark:bg-zinc-800 dark:text-zinc-200 dark:opacity-95">
<PopoverClose
className="inline-flex h-10 items-center justify-center rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground ring-offset-background transition-colors hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50"
className="inline-flex h-10 items-center justify-center rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground ring-offset-background transition-colors hover:bg-primary/90 focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50"
onClick={() => {
void submit(searchParams)
}}
Expand Down
8 changes: 4 additions & 4 deletions app/components/device-detail/device-detail-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ export default function DeviceDetailBox() {
<div
id="deviceDetailBox"
className={
'shadow-zinc-800/5 ring-zinc-900/5 relative float-left flex h-full max-h-[calc(100vh-4rem)] w-auto flex-col gap-4 rounded-xl bg-white px-4 py-2 text-sm font-medium text-zinc-800 shadow-lg ring-1 dark:bg-zinc-800 dark:text-zinc-200 dark:opacity-95 dark:ring-white dark:backdrop-blur-sm md:max-h-[calc(100vh-8rem)]'
'shadow-zinc-800/5 ring-zinc-900/5 relative float-left flex h-full max-h-[calc(100vh-4rem)] w-auto flex-col gap-4 rounded-xl bg-white px-4 py-2 text-sm font-medium text-zinc-800 shadow-lg ring-1 dark:bg-zinc-800 dark:text-zinc-200 dark:opacity-95 dark:ring-white dark:backdrop-blur-xs md:max-h-[calc(100vh-8rem)]'
}
>
{navigation.state === 'loading' && (
<div className="bg-white/30 dark:bg-zinc-800/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-sm">
<div className="bg-white/30 dark:bg-zinc-800/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-xs">
<Spinner />
</div>
)}
Expand Down Expand Up @@ -507,7 +507,7 @@ export default function DeviceDetailBox() {
className="ml-2 h-4 w-4 shrink-0 text-muted-foreground"
/>
</CardHeader>
<CardContent className="flex-grow">
<CardContent className="grow">
<div className="flex flex-row items-center space-x-2">
<div className="text-2xl font-bold">
{sensor.lastMeasurement?.value ??
Expand Down Expand Up @@ -584,7 +584,7 @@ export default function DeviceDetailBox() {
className="ml-2 h-4 w-4 shrink-0 text-muted-foreground"
/>
</CardHeader>
<CardContent className="flex-grow">
<CardContent className="grow">
<div className="flex flex-row items-center space-x-2">
<div className="text-2xl font-bold">
{sensor.lastMeasurement?.value ??
Expand Down
8 changes: 4 additions & 4 deletions app/components/device-detail/entry-logs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function EntryLogs({
<div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-full border-4 border-muted-foreground text-muted-foreground">
<Activity className="h-5 w-5" />
</div>
<div className="flex-grow">
<div className="grow">
<p className="mb-2 text-sm font-medium">
{entryLogs[entryLogs.length - 1].content}
</p>
Expand Down Expand Up @@ -99,7 +99,7 @@ export default function EntryLogs({
<div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-full bg-primary">
<Activity className="h-5 w-5 text-primary-foreground" />
</div>
<div className="flex-grow">
<div className="grow">
<p className="mb-2 text-sm font-medium">{entryLogs[0].content}</p>
<div className="flex items-center text-xs text-muted-foreground">
<Clock className="mr-1 h-3 w-3" />
Expand Down Expand Up @@ -144,7 +144,7 @@ function LogList({ entryLogs = [] }: { entryLogs: LogEntry[] }) {
<div className="z-10 flex h-10 w-10 shrink-0 items-center justify-center rounded-full bg-primary">
<Activity className="h-5 w-5 text-primary-foreground" />
</div>
<div className="flex-grow">
<div className="grow">
<Card className="p-4 shadow-lg transition-all duration-300 hover:-translate-y-1 hover:shadow-xl">
<p className="mb-2 text-sm font-medium">{log.content}</p>
<div className="flex items-center text-xs text-muted-foreground">
Expand All @@ -155,7 +155,7 @@ function LogList({ entryLogs = [] }: { entryLogs: LogEntry[] }) {
</div>
{index < entryLogs.length - 1 && (
<div
className="absolute bottom-0 left-5 top-10 w-[1px] bg-border"
className="absolute bottom-0 left-5 top-10 w-px bg-border"
aria-hidden="true"
/>
)}
Expand Down
4 changes: 2 additions & 2 deletions app/components/device-detail/graph.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ export default function Graph({
>
<div
ref={nodeRef}
className="shadow-zinc-800/5 ring-zinc-900/5 absolute bottom-6 left-4 right-4 top-14 z-40 flex flex-col gap-2 rounded-xl bg-white px-4 pt-2 text-sm font-medium text-zinc-800 shadow-lg ring-1 dark:bg-zinc-800 dark:text-zinc-200 dark:opacity-95 dark:ring-white dark:backdrop-blur-sm md:bottom-[30px] md:left-auto md:right-4 md:top-auto md:h-[35%] md:max-h-[35%] md:w-[60vw]"
className="shadow-zinc-800/5 ring-zinc-900/5 absolute bottom-6 left-4 right-4 top-14 z-40 flex flex-col gap-2 rounded-xl bg-white px-4 pt-2 text-sm font-medium text-zinc-800 shadow-lg ring-1 dark:bg-zinc-800 dark:text-zinc-200 dark:opacity-95 dark:ring-white dark:backdrop-blur-xs md:bottom-[30px] md:left-auto md:right-4 md:top-auto md:h-[35%] md:max-h-[35%] md:w-[60vw]"
>
{navigation.state === 'loading' && (
<div className="bg-gray-100/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-[1.5px]">
Expand All @@ -545,7 +545,7 @@ export default function Graph({
className="flex cursor-move flex-wrap items-center justify-between gap-2 px-2 pt-2"
id="graphTop"
>
<div className="flex flex-grow flex-wrap items-center gap-2">
<div className="flex grow flex-wrap items-center gap-2">
<DateRangeFilter />
<AggregationFilter />
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/components/device-detail/share-link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default function ShareLink() {
<div className="mt-4 flex items-center justify-between gap-2 py-2">
<Link className="mr-2 h-5 w-5" />
<Input
className="w-full bg-transparent outline-none"
className="w-full bg-transparent outline-hidden"
type="text"
disabled={true}
defaultValue={window.location.href}
Expand All @@ -88,7 +88,7 @@ export default function ShareLink() {
description: 'Go ahead and share your link! 🎉',
})
}}
className="inline-flex h-9 transform items-center justify-center rounded-md bg-primary px-2 py-2 text-sm font-medium text-primary-foreground shadow transition-transform active:scale-75"
className="inline-flex h-9 transform items-center justify-center rounded-md bg-primary px-2 py-2 text-sm font-medium text-primary-foreground shadow-sm transition-transform active:scale-75"
>
<Copy className="mr-2 h-5 w-5" />
Copy
Expand Down
2 changes: 1 addition & 1 deletion app/components/device/new/device-info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export function DeviceSelectionStep() {
<X className="h-4 w-4" />
</Button>
)}
<h3 className="break-words text-lg font-semibold">
<h3 className="wrap-break-word text-lg font-semibold">
{device.name}
</h3>
{device.name === 'senseBox:Home' &&
Expand Down
4 changes: 2 additions & 2 deletions app/components/device/new/general-info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export function GeneralInfoStep() {
</TooltipProvider>
</div>
{temporaryExpirationDate && (
<div className="flex flex-grow items-center space-x-2">
<div className="flex grow items-center space-x-2">
<Label
htmlFor="temporaryExpirationDate"
className="whitespace-nowrap text-sm font-medium"
Expand All @@ -199,7 +199,7 @@ export function GeneralInfoStep() {
onChange={(e) => handleExpirationDateChange(e.target.value)}
min={new Date().toISOString().split('T')[0]}
max={maxExpirationDate.toISOString().split('T')[0]}
className="flex-grow rounded-md border p-2"
className="grow rounded-md border p-2"
/>
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion app/components/device/new/location-info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export function LocationStep() {

return (
<div className="flex h-full w-full flex-col">
<div className="flex-grow">
<div className="grow">
<Map
ref={mapRef}
initialViewState={{
Expand Down
4 changes: 2 additions & 2 deletions app/components/device/new/summary-info.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { MapPin, Tag, Smartphone, Cpu, Cog } from 'lucide-react'
import { useFormContext } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { Badge } from '@/components/ui/badge'

Check warning on line 4 in app/components/device/new/summary-info.tsx

View workflow job for this annotation

GitHub Actions / ⬣ Lint

'Badge' is defined but never used. Allowed unused vars must match /^ignored/u
import { Card, CardContent } from '@/components/ui/card'


Expand Down Expand Up @@ -63,10 +63,10 @@
<div className="space-y-6">
<div className="grid grid-cols-1 gap-6 md:grid-cols-2">
{sections.map((section, index) => (
<Card key={index} className="overflow-hidden border border-border bg-card shadow-sm">
<Card key={index} className="overflow-hidden border border-border bg-card shadow-xs">
<CardContent className="p-0">
<div className="flex items-center gap-3 border-b bg-muted/40 px-4 py-3">
<div className="flex h-9 w-9 items-center justify-center rounded-md bg-background text-muted-foreground shadow-sm">
<div className="flex h-9 w-9 items-center justify-center rounded-md bg-background text-muted-foreground shadow-xs">
{section.icon}
</div>
<h4 className="text-sm font-semibold tracking-tight text-foreground">
Expand Down
2 changes: 1 addition & 1 deletion app/components/error-message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default function ErrorMessage() {
return (
<div className="flex min-h-[400px] w-full items-center justify-center p-4">
<Card
className={`w-full max-w-md bg-gradient-to-br ${getGradient()} shadow-2xl border-2 border-white/60 dark:border-zinc-700/80 backdrop-blur-sm ring-1 ring-black/10`}
className={`w-full max-w-md bg-linear-to-br ${getGradient()} shadow-2xl border-2 border-white/60 dark:border-zinc-700/80 backdrop-blur-xs ring-1 ring-black/10`}
>
<CardHeader className="text-center">
<div className="mx-auto mb-4 flex h-20 w-20 items-center justify-center rounded-full bg-white shadow-md dark:bg-zinc-800">
Expand Down
6 changes: 3 additions & 3 deletions app/components/header/menu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Globe,
LogIn,
LogOut,
Puzzle,

Check warning on line 5 in app/components/header/menu/index.tsx

View workflow job for this annotation

GitHub Actions / ⬣ Lint

'Puzzle' is defined but never used. Allowed unused vars must match /^ignored/u
Menu as MenuIcon,
FileLock2,
Coins,
Expand Down Expand Up @@ -96,7 +96,7 @@
{user && (
<DropdownMenuGroup>
{navigation.state === 'loading' && (
<div className="bg-white/30 dark:bg-zinc-800/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-sm">
<div className="bg-white/30 dark:bg-zinc-800/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-xs">
<Spinner />
</div>
)}
Expand Down Expand Up @@ -196,7 +196,7 @@
onClick={() => setOpen(false)}
className="w-full cursor-pointer"
>
<button className="relative flex w-full select-none items-center rounded-sm text-sm outline-none transition-colors hover:bg-accent focus:bg-accent focus:text-accent-foreground">
<button className="relative flex w-full select-none items-center rounded-sm text-sm outline-hidden transition-colors hover:bg-accent focus:bg-accent focus:text-accent-foreground">
<LogIn className="mr-2 h-5 w-5" />
<span className="text-light-green">{t('login_label')}</span>
</button>
Expand All @@ -216,7 +216,7 @@
<input type="hidden" name="redirectTo" value={redirectTo} />
<button
type="submit"
className="relative flex w-full select-none items-center rounded-sm text-sm outline-none transition-colors hover:bg-accent focus:bg-accent focus:text-accent-foreground"
className="relative flex w-full select-none items-center rounded-sm text-sm outline-hidden transition-colors hover:bg-accent focus:bg-accent focus:text-accent-foreground"
disabled={isLoggingOut}
>
<LogOut className="mr-2 h-5 w-5" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default function FilterOptions() {
return (
<div className="flex h-full flex-1 flex-col justify-around gap-2 dark:text-zinc-200">
{navigation.state === 'loading' && (
<div className="bg-white/30 dark:bg-zinc-800/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-sm">
<div className="bg-white/30 dark:bg-zinc-800/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-xs">
<Spinner />
</div>
)}
Expand Down Expand Up @@ -151,15 +151,15 @@ export default function FilterOptions() {
<div className="flex justify-end gap-4 align-bottom">
<Button
variant="outline"
className="rounded-[5px] border-[1px] border-[#e2e8f0] px-2 py-[1px] text-base"
className="rounded-[5px] border border-slate-200 px-2 py-px text-base"
onClick={handleResetFilters}
>
<span className="flex items-center">
<X className="m-0 inline h-3.5 w-3.5 p-0 align-sub" /> Reset
</span>
</Button>
<Button
className="rounded-[5px] px-2 py-[1px] text-base"
className="rounded-[5px] px-2 py-px text-base"
onClick={handleApplyChanges}
disabled={!isChanged}
>
Expand Down
6 changes: 3 additions & 3 deletions app/components/header/nav-bar/filter-options/filter-tags.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default function FilterTags() {
return (
<div className="flex h-full flex-1 flex-col justify-around gap-2 dark:text-zinc-200">
{navigation.state === 'loading' && (
<div className="bg-white/30 dark:bg-zinc-800/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-sm">
<div className="bg-white/30 dark:bg-zinc-800/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-xs">
<Spinner />
</div>
)}
Expand Down Expand Up @@ -108,15 +108,15 @@ export default function FilterTags() {
<div className="flex justify-end gap-4 align-bottom">
<Button
variant="outline"
className="rounded-[5px] border-[1px] border-[#e2e8f0] px-2 py-[1px] text-base"
className="rounded-[5px] border border-slate-200 px-2 py-px text-base"
onClick={handleResetFilters}
>
<span className="flex items-center">
<X className="m-0 inline h-3.5 w-3.5 p-0 align-sub" /> Reset
</span>
</Button>
<Button
className="rounded-[5px] px-2 py-[1px] text-base"
className="rounded-[5px] px-2 py-px text-base"
onClick={handleApplyChanges}
disabled={!isChanged}
>
Expand Down
4 changes: 2 additions & 2 deletions app/components/header/nav-bar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ export default function NavBar(props: NavBarProps) {
return (
<div className="pointer-events-auto relative w-full md:w-1/2">
<div className="absolute left-0 top-0 flex w-full flex-col gap-2">
<div className="w-full rounded-2xl border border-gray-100 bg-white px-2 py-2 shadow-xl dark:bg-zinc-800 dark:text-zinc-200 dark:opacity-90 dark:ring-white dark:backdrop-blur-sm md:px-4">
<div className="w-full rounded-2xl border border-gray-100 bg-white px-2 py-2 shadow-xl dark:bg-zinc-800 dark:text-zinc-200 dark:opacity-90 dark:ring-white dark:backdrop-blur-xs md:px-4">
<div className="flex w-full items-center gap-2 px-2 text-black dark:text-zinc-200 md:gap-4">
<SearchIcon className="aspect-square h-6 dark:text-zinc-200" />
<input
ref={inputRef}
placeholder={t('placeholder') || undefined}
onFocus={() => setOpen(true)}
onChange={(e) => setSearchString(e.target.value)}
className="h-fit w-full flex-1 border-none bg-white focus:border-none focus:outline-none focus:ring-0 dark:bg-zinc-800 dark:text-zinc-200"
className="h-fit w-full flex-1 border-none bg-white focus:border-none focus:outline-hidden focus:ring-0 dark:bg-zinc-800 dark:text-zinc-200"
value={searchString}
/>
{!open && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ export function PhenomenonSelect() {
</div>
</ScrollArea>
<div className="flex justify-between py-1">
<Label className="rounded-[5px] border-[1px] border-[#e2e8f0] px-2 py-[1px] text-base leading-[2.2]">
<Label className="rounded-[5px] border border-slate-200 px-2 py-px text-base leading-[2.2]">
Results {data.filteredDevices.features.length}
</Label>
<Button
variant="outline"
className=" px-2 py-[1px] text-base rounded-[5px] border-[1px] border-[#e2e8f0]"
className=" px-2 py-px text-base rounded-[5px] border border-slate-200"
onClick={() => {
searchParams.delete("exposure");
searchParams.delete("status");
Expand Down
8 changes: 4 additions & 4 deletions app/components/header/nav-bar/time-filter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ export function TimeFilter(props: TimeFilterProps) {
<div className="flex h-16 justify-center p-1">
<span className="w-10/12">{t('pointintime_description')}</span>
</div>
<div className="mx-auto min-h-[2.5rem] w-2/3 items-center justify-center rounded-t-lg border border-b-0 border-gray-100 p-2">
<div className="mx-auto min-h-10 w-2/3 items-center justify-center rounded-t-lg border border-b-0 border-gray-100 p-2">
{props.singleDate === undefined ? (
<div className="flex min-h-[2.5rem] items-center justify-center p-1">
<div className="flex min-h-10 items-center justify-center p-1">
{t('date_picker_label')}
</div>
) : (
Expand Down Expand Up @@ -264,10 +264,10 @@ export function TimeFilter(props: TimeFilterProps) {
<div className="flex h-16 justify-center p-1">
<span className="w-10/12">{t('timeperiod_description')}</span>
</div>
<div className="mx-auto min-h-[2.5rem] w-2/3 items-center justify-center rounded-t-lg border border-b-0 border-gray-100 p-2">
<div className="mx-auto min-h-10 w-2/3 items-center justify-center rounded-t-lg border border-b-0 border-gray-100 p-2">
{props.dateRange === undefined ||
props.dateRange.from === undefined ? (
<div className="flex min-h-[2.5rem] items-center justify-center p-1">
<div className="flex min-h-10 items-center justify-center p-1">
{t('date_range_picker_label')}
</div>
) : (
Expand Down
Loading
Loading