add index page

app/components/ui/tooltip.tsx

@@ -0,0 +1,44 @@
+'use client'
+
+import * as TooltipPrimitive from '@radix-ui/react-tooltip'
+import clsx from 'clsx'
+import { ComponentPropsWithoutRef, ReactNode } from 'react'
+
+type TooltipProps = Omit<
+  ComponentPropsWithoutRef<typeof TooltipPrimitive.Content> &
+    Pick<
+      ComponentPropsWithoutRef<typeof TooltipPrimitive.Root>,
+      'open' | 'defaultOpen' | 'onOpenChange'
+    >,
+  'content'
+> & { content: ReactNode }
+
+const Tooltip = ({
+  children,
+  content,
+  sideOffset = 4,
+  className,
+  open,
+  defaultOpen,
+  onOpenChange,
+  ...props
+}: TooltipProps) => (
+  <TooltipPrimitive.Provider delayDuration={200}>
+    <TooltipPrimitive.Root open={open} defaultOpen={defaultOpen} onOpenChange={onOpenChange}>
+      <TooltipPrimitive.Trigger asChild>{children}</TooltipPrimitive.Trigger>
+      <TooltipPrimitive.Content
+        sideOffset={sideOffset}
+        className={clsx(
+          'z-50 overflow-hidden rounded-md border bg-dark-tremor-background-subtle px-3 py-1.5 text-sm text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+          className
+        )}
+        {...props}
+      >
+        {content}
+        <TooltipPrimitive.Arrow width={11} height={5} />
+      </TooltipPrimitive.Content>
+    </TooltipPrimitive.Root>
+  </TooltipPrimitive.Provider>
+)
+
+export { Tooltip }

app/components/vacancies-chart.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react'
+import { useCallback, useMemo } from 'react'
 import { KeywordsResponse, VacancyData } from '~/services/vacancies/vacancies.types'
 import { AreaChart, MultiSelect, MultiSelectItem, Select, SelectItem } from '@tremor/react'
 import { useSearchParams } from '@remix-run/react'
@@ -10,7 +10,6 @@ type Props = {
 
 export function VacanciesChart({ data, keywords }: Props) {
   const [searchParams, setSearchParams] = useSearchParams()
-  const [preset, setPreset] = useState('None')
 
   const presetsForSelect = useMemo(
     () =>
@@ -29,6 +28,23 @@ export function VacanciesChart({ data, keywords }: Props) {
     [searchParams]
   )
 
+  const preset = useMemo(() => {
+    return searchParams.get('preset') ?? 'None'
+  }, [searchParams])
+
+  const setPreset = useCallback(
+    (value: string | null) => {
+      if (!value || value === 'None') {
+        searchParams.delete('preset')
+      } else {
+        searchParams.set('preset', value)
+      }
+
+      setSearchParams(searchParams)
+    },
+    [searchParams, setSearchParams]
+  )
+
   const categoriesForChart = useMemo(() => {
     return data?.categories.filter(category => selectedCategories.includes(category)) ?? []
   }, [selectedCategories, data?.categories])
@@ -64,14 +80,15 @@ export function VacanciesChart({ data, keywords }: Props) {
       setPreset(value)
       setSelectedCategories(keywords?.presets[value] ?? [])
     },
-    [keywords?.presets, setSelectedCategories]
+    [keywords?.presets, setSelectedCategories, setPreset]
   )
 
   const handleKeywordsChange = useCallback(
     (value: string[]) => {
       setSelectedCategories(value ?? [])
+      setPreset(null)
     },
-    [setSelectedCategories]
+    [setSelectedCategories, setPreset]
   )
 
   const multiSelectItems = useMemo(() => {
@@ -87,7 +104,7 @@ export function VacanciesChart({ data, keywords }: Props) {
   }, [presetsForSelect])
 
   return (
-    <div className={'flex h-full flex-col gap-6 p-8'}>
+    <>
       <div className={'flex gap-4'}>
         <div className="max-w-xl">
           <label
@@ -131,7 +148,8 @@ export function VacanciesChart({ data, keywords }: Props) {
         startEndOnly={false}
         intervalType="preserveStartEnd"
         showAnimation
+        noDataText={'Nothing here, try selecting different categories or preset'}
       />
-    </div>
+    </>
   )
 }

app/root.tsx

@@ -1,5 +1,5 @@
 import { LinksFunction } from '@remix-run/node'
-import { Links, Meta, Outlet, Scripts, ScrollRestoration } from '@remix-run/react'
+import { Link, Links, Meta, Outlet, Scripts, ScrollRestoration } from '@remix-run/react'
 import stylesheet from '~/tailwind.css?url'
 import { PropsWithChildren } from 'react'
 
@@ -15,7 +15,16 @@ export function Layout({ children }: PropsWithChildren) {
         <Links />
       </head>
       <body className={'h-full'}>
-        {children}
+        <header className={'p-4 bg-gray-50 dark:bg-gray-900 fixed w-full z-10'}>
+          <nav>
+            <ul className={'flex gap-4'}>
+              <li>
+                <Link to={'/'}>Home</Link>
+              </li>
+            </ul>
+          </nav>
+        </header>
+        <div className={'h-full p-10 pt-20'}>{children}</div>
         <ScrollRestoration />
         <Scripts />
       </body>

app/routes/_index.tsx

@@ -1,12 +1,12 @@
 import { json, MetaFunction } from '@remix-run/node'
 import { vacanciesService } from '~/services/vacancies/vacancies.service'
-import { useLoaderData } from '@remix-run/react'
-import { VacanciesChart } from '~/components/vacancies-chart'
-import type { ShouldRevalidateFunction } from '@remix-run/react'
+import { Link, ShouldRevalidateFunction, useLoaderData } from '@remix-run/react'
+import { Tooltip } from '~/components/ui/tooltip'
 
 export const shouldRevalidate: ShouldRevalidateFunction = ({ nextParams }) => {
   return !nextParams
 }
+
 export const meta: MetaFunction = () => {
   return [
     { title: 'Vacancies trends' },
@@ -15,15 +15,48 @@ export const meta: MetaFunction = () => {
 }
 
 export const loader = async () => {
-  const promises = [
-    vacanciesService.getAggregateByCreatedAt(),
-    vacanciesService.getKeywords(),
-  ] as const
-  const [vacancies, keywords] = await Promise.all(promises)
-  return json({ vacancies, keywords })
+  const keywords = await vacanciesService.getKeywords()
+  return json({ keywords })
 }
 
 export default function Index() {
-  const { vacancies, keywords } = useLoaderData<typeof loader>()
-  return <VacanciesChart data={vacancies} keywords={keywords} />
+  const { keywords } = useLoaderData<typeof loader>()
+  return (
+    <div>
+      <h1 className={'text-2xl font-semibold mb-6'}>Compare vacancies trends over time</h1>
+      <div className={'flex flex-col gap-2'} role={'list'}>
+        {Object.entries(keywords?.presets ?? {}).map(([label, values]) => {
+          if (values.length === 0) return null
+
+          return (
+            <Tooltip content={<TooltipContent values={values} />} key={label}>
+              <Link
+                role={'listitem'}
+                className={'text-blue-300 hover:underline w-max'}
+                to={{
+                  pathname: '/trends',
+                  search: new URLSearchParams({
+                    preset: label,
+                    categories: values.join(','),
+                  }).toString(),
+                }}
+              >
+                {label}
+              </Link>
+            </Tooltip>
+          )
+        })}
+      </div>
+    </div>
+  )
+}
+
+const TooltipContent = ({ values }: { values: string[] }) => {
+  return (
+    <div>
+      {[...values].sort().map(v => (
+        <div key={v}>{v}</div>
+      ))}
+    </div>
+  )
 }

app/routes/trends/route.tsx

@@ -0,0 +1,40 @@
+import { json, MetaFunction } from '@remix-run/node'
+import { vacanciesService } from '~/services/vacancies/vacancies.service'
+import { useLoaderData, useSearchParams } from '@remix-run/react'
+import { VacanciesChart } from '~/components/vacancies-chart'
+import type { ShouldRevalidateFunction } from '@remix-run/react'
+
+export const shouldRevalidate: ShouldRevalidateFunction = ({ nextParams }) => {
+  return !nextParams
+}
+export const meta: MetaFunction = ({ location }) => {
+  const preset = new URLSearchParams(location.search).get('preset')
+
+  return [
+    { title: preset ? `Vacancies trends for ${preset}` : 'Vacancies trends' },
+    { name: 'description', content: 'See how software vacancies change over time' },
+  ]
+}
+
+export const loader = async () => {
+  const promises = [
+    vacanciesService.getAggregateByCreatedAt(),
+    vacanciesService.getKeywords(),
+  ] as const
+  const [vacancies, keywords] = await Promise.all(promises)
+  return json({ vacancies, keywords })
+}
+
+export default function Trends() {
+  const { vacancies, keywords } = useLoaderData<typeof loader>()
+  const [searchParams] = useSearchParams()
+  const preset = searchParams.get('preset')
+  const heading = preset ? `Trends for ${preset}` : 'Trends'
+
+  return (
+    <div className={'flex h-full flex-col gap-6'}>
+      <h1 className={'text-2xl font-semibold'}>{heading}</h1>
+      <VacanciesChart data={vacancies} keywords={keywords} />
+    </div>
+  )
+}