merged master

.gitignore

@@ -5,4 +5,3 @@ db/*.db*
 npm-debug.log
 .DS_Store
 .idea
-.vscode

Dockerfile

@@ -31,8 +31,6 @@ RUN mkdir -p /db /conf \
   && ln -s /conf /fredy/conf
 
 EXPOSE 9998
-VOLUME /db
-VOLUME /conf
 
 # Start application using PM2 runtime
 CMD ["pm2-runtime", "index.js"]

README.md

@@ -9,18 +9,10 @@
 </a>
 </p>
 
-<p align="center">
-  <a href="https://fredy.orange-coding.net/" target="_blank">Website</a>&nbsp;&nbsp;|&nbsp;&nbsp;
-  <a href="https://demo-fredy.orange-coding.net/" target="_blank">Demo</a>
-</p>
-
-<p align="center">
-  <img src="https://github.com/orangecoding/fredy/actions/workflows/test.yml/badge.svg" alt="Tests" />
-  <img src="https://github.com/orangecoding/fredy/actions/workflows/docker.yml/badge.svg" alt="Docker" />
-  <img src="https://github.com/orangecoding/fredy/actions/workflows/check_source.yml/badge.svg" alt="Source" />
-  <img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fghcr-badge.elias.eu.org%2Fapi%2Forangecoding%2Ffredy%2Ffredy&query=%24.downloadCount&label=Docker%20Pulls" alt="Docker Pulls" />
-</p>
-
+![Tests](https://github.com/orangecoding/fredy/actions/workflows/test.yml/badge.svg)
+[![Docker](https://github.com/orangecoding/fredy/actions/workflows/docker.yml/badge.svg)](https://github.com/orangecoding/fredy/actions/workflows/docker.yml)
+![Source](https://github.com/orangecoding/fredy/actions/workflows/check_source.yml/badge.svg)
+![Docker Pulls](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fghcr-badge.elias.eu.org%2Fapi%2Forangecoding%2Ffredy%2Ffredy&query=%24.downloadCount&label=Docker%20Pulls)
 
 
 # Fredy 🏡 – Your Self-Hosted Real Estate Finder for Germany
@@ -29,13 +21,15 @@ Finding an apartment or house in Germany can be stressful and
 time-consuming.\
 **Fredy** makes it easier: it automatically scrapes **ImmoScout24,
 Immowelt, Immonet, eBay Kleinanzeigen, and WG-Gesucht** and notifies you
-instantly via **Slack, Telegram, Email, ntfy, discord and more** when new
+instantly via **Slack, Telegram, Email, ntfy, and more** when new
 listings appear.
 
 With a modern architecture, Fredy provides a **clean Web UI**, removes
 duplicates across platforms, and stores results so you never see the
 same listing twice.
 
+
+
 ------------------------------------------------------------------------
 
 ## ✨ Key Features
@@ -43,7 +37,7 @@ same listing twice.
 -   🏠 Scrapes **ImmoScout24, Immowelt, Immonet, eBay Kleinanzeigen,
     WG-Gesucht**
 -   ⚡ Instant notifications: Slack, Telegram, Email (SendGrid,
-    Mailjet), ntfy, discord 
+    Mailjet), ntfy
 -   🔎 Uses the **ImmoScout Mobile API** (reverse engineered)
 -   🌍 Runs anywhere: Docker, Node.js, self-hosted
 -   🖥️ Intuitive **Web UI** to manage searches
@@ -115,9 +109,9 @@ yarn run start:frontend  # in another terminal
 
 ## 📸 Screenshots
 
-| Fredy Main Overview                              | Job Configuration                                                     | Found Listings                                                              |
-|--------------------------------------------------|-----------------------------------------------------------------------|-----------------------------------------------------------------------------|
-| ![Screenshot showing Fredy](doc/screenshot1.png) | ![Screenshot showing job configuration in Fredy](doc/screenshot3.png) | ![Screenshot showing found listings in Fredy](doc/screenshot2.png) |
+| Job Configuration | Job Analytics | Job Overview |
+|-------------------|--------------|--------------|
+| ![Screenshot showing job configuration in Fredy](doc/screenshot1.png) | ![Screenshot showing job analytics in Fredy](doc/screenshot_2.png) | ![Screenshot showing job overview in Fredy](doc/screenshot_3.png) |
 
 ------------------------------------------------------------------------
 
@@ -137,7 +131,7 @@ picks up the newest listings first.
 ### Adapter 📡
 
 An **adapter** is the channel through which Fredy notifies you (Slack,
-Telegram, Email, ntfy, discord ...).\
+Telegram, Email, ntfy, ...).\
 Each adapter has its own configuration (e.g. API keys, webhook URLs).\
 You can use multiple adapters at once --- Fredy will send new listings
 through all of them.

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: ghcr.io/orangecoding/fredy
+    image: fredy/fredy
     # map existing config and database
     volumes:
       - ./conf:/conf

docker-test.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-# Stop and remove old container if it exists
-if [ "$(docker ps -aq -f name=fredy)" ]; then
-  docker stop fredy || true
-  docker rm fredy || true
-fi
-
-# Build image from local Dockerfile
-docker build -t fredy:local .
-
-# Run container with volumes and port mapping
-docker run -d --name fredy \
-  -v fredy_conf:/conf \
-  -v fredy_db:/db \
-  -p 9998:9998 \
-  fredy:local

lib/FredyRuntime.js

@@ -107,7 +107,7 @@ class FredyRuntime {
       }
       return !similar;
     });
-    filteredList.forEach((filter) => this._similarityCache.addCacheEntry(filter.title, filter.address));
+    filteredList.forEach((filter) => this._similarityCache.addCacheEntry(filter.title, listings.address));
     return filteredList;
   }
 

lib/api/api.js

@@ -3,11 +3,11 @@ import { authInterceptor, cookieSession, adminInterceptor } from './security.js'
 import { generalSettingsRouter } from './routes/generalSettingsRoute.js';
 import { analyticsRouter } from './routes/analyticsRouter.js';
 import { providerRouter } from './routes/providerRouter.js';
-import { versionRouter } from './routes/versionRouter.js';
 import { loginRouter } from './routes/loginRoute.js';
+import { config } from '../utils.js';
 import { userRouter } from './routes/userRoute.js';
 import { jobRouter } from './routes/jobRouter.js';
-import { config } from '../utils.js';
+import { versionRouter } from './routes/versionRouter.js';
 import bodyParser from 'body-parser';
 import restana from 'restana';
 import files from 'serve-static';
@@ -15,7 +15,6 @@ import path from 'path';
 import { getDirName } from '../utils.js';
 import { demoRouter } from './routes/demoRouter.js';
 import logger from '../services/logger.js';
-import { listingsRouter } from './routes/listingsRouter.js';
 const service = restana();
 const staticService = files(path.join(getDirName(), '../ui/public'));
 const PORT = config.port || 9998;
@@ -26,8 +25,6 @@ service.use(staticService);
 service.use('/api/admin', authInterceptor());
 service.use('/api/jobs', authInterceptor());
 service.use('/api/version', authInterceptor());
-service.use('/api/listings', authInterceptor());
-
 // /admin can only be accessed when user is having admin permissions
 service.use('/api/admin', adminInterceptor());
 service.use('/api/jobs/notificationAdapter', notificationAdapterRouter);
@@ -38,7 +35,6 @@ service.use('/api/admin/users', userRouter);
 service.use('/api/version', versionRouter);
 service.use('/api/jobs', jobRouter);
 service.use('/api/login', loginRouter);
-service.use('/api/listings', listingsRouter);
 //this route is unsecured intentionally as it is being queried from the login page
 service.use('/api/demo', demoRouter);
 

lib/api/routes/listingsRouter.js

@@ -1,49 +0,0 @@
-import restana from 'restana';
-import * as listingStorage from '../../services/storage/listingsStorage.js';
-import { isAdmin as isAdminFn } from '../security.js';
-import logger from '../../services/logger.js';
-
-const service = restana();
-
-const listingsRouter = service.newRouter();
-
-listingsRouter.get('/table', async (req, res) => {
-  const { page, pageSize = 50, filter, sortfield = null, sortdir = 'asc' } = req.query || {};
-
-  res.body = listingStorage.queryListings({
-    page: page ? parseInt(page, 10) : 1,
-    pageSize: pageSize ? parseInt(pageSize, 10) : 50,
-    filter: filter || undefined,
-    sortField: sortfield || null,
-    sortDir: sortdir === 'desc' ? 'desc' : 'asc',
-    userId: req.session.currentUser,
-    isAdmin: isAdminFn(req),
-  });
-  res.send();
-});
-
-listingsRouter.delete('/job', async (req, res) => {
-  const { jobId } = req.body;
-  try {
-    listingStorage.deleteListingsByJobId(jobId);
-  } catch (error) {
-    res.send(new Error(error));
-    logger.error(error);
-  }
-  res.send();
-});
-
-listingsRouter.delete('/', async (req, res) => {
-  const { ids } = req.body;
-  try {
-    if (Array.isArray(ids) && ids.length > 0) {
-      listingStorage.deleteListingsById(ids);
-    }
-  } catch (error) {
-    res.send(new Error(error));
-    logger.error(error);
-  }
-  res.send();
-});
-
-export { listingsRouter };

lib/api/routes/versionRouter.js

@@ -1,21 +1,13 @@
 import restana from 'restana';
 import fetch from 'node-fetch';
 import { getPackageVersion } from '../../utils.js';
-import semver from 'semver';
 
 const service = restana();
 const versionRouter = service.newRouter();
 
 versionRouter.get('/', async (req, res) => {
   const versionPayload = await getCurrentVersionFromGithub();
-  const localFredyVersion = await getPackageVersion();
-  res.body =
-    versionPayload == null
-      ? {
-          newVersion: false,
-          localFredyVersion,
-        }
-      : versionPayload;
+  res.body = versionPayload == null ? { newVersion: false } : versionPayload;
   res.send();
 });
 
@@ -23,7 +15,7 @@ async function getCurrentVersionFromGithub() {
   const raw = await fetch('https://api.github.com/repos/orangecoding/fredy/releases/latest');
   const data = await raw.json();
   const localFredyVersion = await getPackageVersion();
-  if (data.tag_name == null || semver.gte(localFredyVersion, data.tag_name)) {
+  if (localFredyVersion === data.tag_name) {
     return null;
   }
   return {

lib/api/security.js

@@ -37,7 +37,7 @@ const cookieSession$0 = (userId) => {
     name: 'fredy-admin-session',
     keys: ['fredy', 'super', 'fancy', 'key', nanoid()],
     userId,
-    maxAge: 2 * 60 * 60 * 1000, // 2 hours
+    maxAge: 8 * 60 * 60 * 1000, // 8 hours
   });
 };
 export { cookieSession$0 as cookieSession };

lib/notification/adapter/apprise.js

@@ -8,7 +8,7 @@ export const send = ({ serviceName, newListings, notificationConfig, jobKey }) =
   const jobName = job == null ? jobKey : job.name;
   const promises = newListings.map((newListing) => {
     const title = `${jobName} at ${serviceName}: ${newListing.title}`;
-    const message = `Address: ${newListing.address}\nSize: ${newListing.size}\nPrice: ${newListing.price}\nLink: ${newListing.link}`;
+    const message = `Address: ${newListing.address}\nSize: ${newListing.size}\nPrice: ${newListing.price}\nink: ${newListing.link}`;
     return fetch(server, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },

lib/notification/adapter/discord_webhook.js

@@ -1,130 +0,0 @@
-import fetch from 'node-fetch';
-import { getJob } from '../../services/storage/jobStorage.js';
-import { markdown2Html } from '../../services/markdown.js';
-import { normalizeImageUrl } from '../../utils.js';
-
-/**
- * Generates an idempotent decimal color code. The input string-based color code is
- * generated using the djb2 hash algorithm.
- *
- * @param {string} str - Input string as color code base
- * @returns {number} Generated decimal color code (0 - 16777215)
- */
-const generateColorFromString = (str) => {
-  let hash = 5381; // initial value
-  const input = String(str);
-
-  for (let i = 0; i < input.length; i++) {
-    // hash * 33 + charCode
-    hash = (hash << 5) + hash + input.charCodeAt(i);
-    // Ensure the hash is 32 bit
-    hash |= 0;
-  }
-
-  let positiveHash = hash >>> 0;
-  const maxColorValue = 16777215;
-  const colorDecimal = positiveHash % maxColorValue;
-
-  return colorDecimal;
-};
-
-/**
- * Creates an embed per listing
- * (-> see https://birdie0.github.io/discord-webhooks-guide/structure/embeds.html).
- *
- * @param {string} jobKey - Key of job (used to set embed color)
- * @param {object} listing - Object holding listing details
- * @returns {object} Discord webhook embed
- */
-const buildEmbed = (jobKey, listing) => {
-  const maxTitleLength = 252; // Max embed title length is 256 characters
-  let title = String(listing.title ?? 'N/A');
-  if (title.length > maxTitleLength) {
-    title = title.substring(0, maxTitleLength) + '...';
-  }
-
-  const fields = [
-    {
-      name: 'Price',
-      value: String(listing.price ?? 'n/a'),
-      inline: true,
-    },
-    {
-      name: 'Size',
-      value: listing?.size?.replace(/2m/g, 'm²') ?? 'n/a',
-      inline: true,
-    },
-    {
-      name: 'Address',
-      value: String(listing.address ?? 'n/a'),
-      inline: true,
-    },
-  ];
-
-  const embed = {
-    title: title,
-    color: generateColorFromString(jobKey),
-    url: listing.link,
-    fields: fields,
-  };
-
-  if (listing.image) {
-    embed.image = {
-      url: normalizeImageUrl(listing.image),
-    };
-  }
-
-  return embed;
-};
-
-export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
-  const adapter = notificationConfig.find((adapter) => adapter.id === config.id);
-  const webhookUrl = adapter?.fields?.webhookUrl;
-  if (!webhookUrl || newListings.length === 0) return Promise.resolve([]);
-
-  const job = getJob(jobKey);
-  const jobName = job?.name || jobKey;
-
-  const embeds = newListings.map((listing) => buildEmbed(jobKey, listing));
-
-  const maxEmbedsPerMessage = 10; // Discord only allows up to 10 embeds
-  const webhookPromises = [];
-
-  for (let i = 0; i < embeds.length; i += maxEmbedsPerMessage) {
-    // Send multiple Discord messages with up to 10 embeds per message
-    const embedChunk = embeds.slice(i, i + maxEmbedsPerMessage);
-
-    const content = i === 0 ? `*${jobName}:* ${serviceName} found **${newListings.length}** new listings.` : '';
-    const body = JSON.stringify({
-      content: content,
-      embeds: embedChunk,
-    });
-
-    const fetchPromise = fetch(webhookUrl, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body,
-    }).catch((error) => {
-      console.error(`Error sending Discord webhook for chunk starting at ${i}:`, error);
-      return Promise.reject(new Error(`Webhook failed: ${error.message}`));
-    });
-
-    webhookPromises.push(fetchPromise);
-  }
-
-  return Promise.allSettled(webhookPromises);
-};
-
-export const config = {
-  id: 'discord_webhook',
-  name: 'Discord Webhook',
-  readme: markdown2Html('lib/notification/adapter/discord_webhook.md'),
-  description: 'Fredy will send new listings to the Discord channel of your choice.',
-  fields: {
-    webhookUrl: {
-      type: 'text',
-      label: 'Webhook URL',
-      description: 'The URL of the Discord webhook to send messages to.',
-    },
-  },
-};

lib/notification/adapter/discord_webhook.md

@@ -1,4 +0,0 @@
-### Discord Adapter
-
-To use the [Discord](https://discord.com/) Adapter, you need to create a webhook on the Discord channel of your choice. You can follow the instructions of _Making A Webhook_ on [this support website](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks).
-Once you have created a webhook, copy and paste the webhook URL.

lib/notification/adapter/mattermost.js

@@ -13,10 +13,10 @@ export const send = ({ serviceName, newListings, notificationConfig, jobKey }) =
   return fetch(webhook, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
+    body: {
       channel: channel,
       text: message,
-    }),
+    },
   });
 };
 export const config = {

lib/notification/adapter/ntfy.js

@@ -15,17 +15,11 @@ Size: ${newListing.size == null ? 'N/A' : newListing.size.replace(/2m/g, '$m^2$'
 Price: ${newListing.price}
 Link: ${newListing.link}`;
 
-    const sanitizeHeaderValue = (value) =>
-      String(value ?? '')
-        .replace(/[\r\n]+/g, ' ')
-        .replace(/[^\x20-\x7E]/g, ' ')
-        .trim();
-
     const headers = {
-      Title: sanitizeHeaderValue(newListing.title),
-      Priority: sanitizeHeaderValue(priority),
-      Tags: sanitizeHeaderValue(`${serviceName},${jobName}`),
-      Click: sanitizeHeaderValue(newListing.link),
+      Title: newListing.title,
+      Priority: String(priority),
+      Tags: `${serviceName},${jobName}`,
+      Click: newListing.link,
     };
 
     if (newListing.image && typeof newListing.image === 'string') {

lib/provider/immonet.js

@@ -29,7 +29,6 @@ const config = {
     address: 'div[data-testid="cardmfe-description-box-address"] | trim',
     image: 'div[data-testid="cardmfe-picture-box-test-id"] img@src',
     link: 'button@data-base',
-    description: 'div[data-testid="cardmfe-description-text-test-id"] | trim',
   },
   normalize: normalize,
   filter: applyBlacklist,

lib/provider/immowelt.js

@@ -26,9 +26,8 @@ const config = {
     size: 'div[data-testid="cardmfe-keyfacts-testid"] | removeNewline | trim',
     title: 'div[data-testid="cardmfe-description-box-text-test-id"] > div:nth-of-type(2)',
     link: 'a@href',
-    description: 'div[data-testid="cardmfe-description-text-test-id"] > div:nth-of-type(2) | removeNewline | trim',
     address: 'div[data-testid="cardmfe-description-box-address"] | removeNewline | trim',
-    image: 'div[data-testid="cardmfe-picture-box-opacity-layer-test-id"] img@src',
+    image: 'div[data-testid="cardMfe-card-pictureBox-opacity"] img@src',
   },
   normalize: normalize,
   filter: applyBlacklist,

lib/provider/mcMakler.js

@@ -1,47 +0,0 @@
-import { isOneOf, buildHash } from '../utils.js';
-import checkIfListingIsActive from '../services/listings/listingActiveTester.js';
-let appliedBlackList = [];
-
-function normalize(o) {
-  const originalId = o.id.split('/').pop();
-  const id = buildHash(originalId, o.price);
-  const size = o.size ?? 'N/A m²';
-  const title = o.title || 'No title available';
-  const address = o.address?.replace(' / ', ' ') || null;
-  const link = o.link != null ? `https://www.mcmakler.de${o.link}` : config.url;
-  return Object.assign(o, { id, size, title, link, address });
-}
-function applyBlacklist(o) {
-  const titleNotBlacklisted = !isOneOf(o.title, appliedBlackList);
-  const descNotBlacklisted = !isOneOf(o.description, appliedBlackList);
-  return titleNotBlacklisted && descNotBlacklisted;
-}
-const config = {
-  url: null,
-  crawlContainer: 'article[data-testid="propertyCard"]',
-  sortByDateParam: 'sortBy=DATE&sortOn=DESC',
-  waitForSelector: 'ul[data-testid="listsContainer"]',
-  crawlFields: {
-    id: 'h2 a@href',
-    title: 'h2 a | removeNewline | trim',
-    price: 'footer > p:first-of-type | trim',
-    size: 'footer > p:nth-of-type(2) | trim',
-    address: 'div > h2 + p | removeNewline | trim',
-    image: 'img@src',
-    link: 'h2 a@href',
-  },
-  normalize: normalize,
-  filter: applyBlacklist,
-  activeTester: checkIfListingIsActive,
-};
-export const init = (sourceConfig, blacklist) => {
-  config.enabled = sourceConfig.enabled;
-  config.url = sourceConfig.url;
-  appliedBlackList = blacklist || [];
-};
-export const metaInformation = {
-  name: 'McMakler',
-  baseUrl: 'https://www.mcmakler.de/immobilien/',
-  id: 'mcMakler',
-};
-export { config };

lib/provider/neubauKompass.js

@@ -23,7 +23,7 @@ const config = {
   url: null,
   crawlContainer: '.col-12.mb-4',
   sortByDateParam: 'Sortierung=Id&Richtung=DESC',
-  waitForSelector: 'div[data-live-name-value="SearchList"]',
+  waitForSelector: '.nbk-section',
   crawlFields: {
     id: 'a@href',
     title: 'a@title | removeNewline | trim',

lib/provider/regionalimmobilien24.js

@@ -1,49 +0,0 @@
-import { isOneOf, buildHash } from '../utils.js';
-import checkIfListingIsActive from '../services/listings/listingActiveTester.js';
-let appliedBlackList = [];
-
-function normalize(o) {
-  const id = buildHash(o.id, o.price);
-  const address = o.address?.replace(/^adresse /i, '') ?? null;
-  const title = o.title || 'No title available';
-  const link = o.link != null ? decodeURIComponent(o.link) : config.url;
-
-  var urlReg = new RegExp(/url\((.*?)\)/gim);
-  const image = o.image != null ? urlReg.exec(o.image)[1] : null;
-  return Object.assign(o, { id, address, title, link, image });
-}
-function applyBlacklist(o) {
-  const titleNotBlacklisted = !isOneOf(o.title, appliedBlackList);
-  const descNotBlacklisted = !isOneOf(o.description, appliedBlackList);
-  return titleNotBlacklisted && descNotBlacklisted;
-}
-const config = {
-  url: null,
-  crawlContainer: '.listentry-content',
-  sortByDateParam: null, // sort by date is standard
-  waitForSelector: 'body',
-  crawlFields: {
-    id: '.listentry-iconbar-share@data-sid | trim',
-    title: 'h2 | trim',
-    price: '.listentry-details-price .listentry-details-v | trim',
-    size: '.listentry-details-size .listentry-details-v | trim',
-    address: '.listentry-adress | trim',
-    image: '.listentry-img@style',
-    link: '.shariff@data-url',
-    description: '.listentry-extras | trim',
-  },
-  normalize: normalize,
-  filter: applyBlacklist,
-  activeTester: checkIfListingIsActive,
-};
-export const init = (sourceConfig, blacklist) => {
-  config.enabled = sourceConfig.enabled;
-  config.url = sourceConfig.url;
-  appliedBlackList = blacklist || [];
-};
-export const metaInformation = {
-  name: 'Regionalimmobilien24',
-  baseUrl: 'https://www.regionalimmobilien24.de/',
-  id: 'regionalimmobilien24',
-};
-export { config };

lib/provider/sparkasse.js

@@ -1,46 +0,0 @@
-import { isOneOf, buildHash } from '../utils.js';
-import checkIfListingIsActive from '../services/listings/listingActiveTester.js';
-let appliedBlackList = [];
-
-function normalize(o) {
-  const originalId = o.id.split('/').pop().replace('.html', '');
-  const id = buildHash(originalId, o.price);
-  const size = o.size?.replace(' Wohnfläche', '') ?? null;
-  const title = o.title || 'No title available';
-  const link = o.link != null ? `https://immobilien.sparkasse.de${o.link}` : config.url;
-  return Object.assign(o, { id, size, title, link });
-}
-function applyBlacklist(o) {
-  const titleNotBlacklisted = !isOneOf(o.title, appliedBlackList);
-  const descNotBlacklisted = !isOneOf(o.description, appliedBlackList);
-  return titleNotBlacklisted && descNotBlacklisted;
-}
-const config = {
-  url: null,
-  crawlContainer: '.estate-list-item-row',
-  sortByDateParam: 'sortBy=date_desc',
-  waitForSelector: 'body',
-  crawlFields: {
-    id: 'div[data-testid="estate-link"] a@href',
-    title: 'h3 | trim',
-    price: '.estate-list-price | trim',
-    size: '.estate-mainfact:first-child span | trim',
-    address: 'h6 | trim',
-    image: '.estate-list-item-image-container img@src',
-    link: 'div[data-testid="estate-link"] a@href',
-  },
-  normalize: normalize,
-  filter: applyBlacklist,
-  activeTester: checkIfListingIsActive,
-};
-export const init = (sourceConfig, blacklist) => {
-  config.enabled = sourceConfig.enabled;
-  config.url = sourceConfig.url;
-  appliedBlackList = blacklist || [];
-};
-export const metaInformation = {
-  name: 'Sparkasse Immobilien',
-  baseUrl: 'https://immobilien.sparkasse.de/',
-  id: 'sparkasse',
-};
-export { config };

lib/services/extractor/parser/parser.js

@@ -9,12 +9,12 @@ export function loadParser(text) {
 
 export function parse(crawlContainer, crawlFields, text, url) {
   if (!text) {
-    logger.debug('No content found for ', url);
+    logger.warn('No content found for ', url);
     return null;
   }
 
   if (!crawlContainer || !crawlFields) {
-    logger.debug('Cannot parse, selector was empty for url ', url);
+    logger.warn('Cannot parse, selector was empty for url ', url);
     return null;
   }
 

lib/services/storage/listingsStorage.js

@@ -166,111 +166,3 @@ export const storeListings = (jobId, providerId, listings) => {
     return str.replace(/\s*\([^)]*\)/g, '');
   }
 };
-
-/**
- * Query listings with pagination, filtering and sorting.
- *
- * @param {Object} params
- * @param {number} [params.pageSize=50]
- * @param {number} [params.page=1]
- * @param {string} [params.filter]
- * @param {string|null} [params.sortField=null] - One of: 'created_at','price','size','provider','title'.
- * @param {('asc'|'desc')} [params.sortDir='asc']
- * @param {string} [params.userId] - Current user id used to scope listings (ignored for admins).
- * @param {boolean} [params.isAdmin=false] - When true, returns all listings.
- * @returns {{ totalNumber:number, page:number, result:Object[] }}
- */
-export const queryListings = ({
-  pageSize = 50,
-  page = 1,
-  filter,
-  sortField = null,
-  sortDir = 'asc',
-  userId = null,
-  isAdmin = false,
-} = {}) => {
-  // sanitize inputs
-  const safePageSize = Number.isFinite(pageSize) && pageSize > 0 ? Math.min(500, Math.floor(pageSize)) : 50;
-  const safePage = Number.isFinite(page) && page > 0 ? Math.floor(page) : 1;
-  const offset = (safePage - 1) * safePageSize;
-
-  // build WHERE filter across common text columns
-  const whereParts = [];
-  const params = { limit: safePageSize, offset };
-  // user scoping (non-admin only): restrict to listings whose job belongs to user
-  if (!isAdmin) {
-    params.userId = userId || '__NO_USER__';
-    whereParts.push(`(j.user_id = @userId)`);
-  }
-  if (filter && String(filter).trim().length > 0) {
-    params.filter = `%${String(filter).trim()}%`;
-    whereParts.push(`(title LIKE @filter OR address LIKE @filter OR provider LIKE @filter OR link LIKE @filter)`);
-  }
-  const whereSql = whereParts.length ? `WHERE ${whereParts.join(' AND ')}` : '';
-  const whereSqlWithAlias = whereSql
-    .replace(/\btitle\b/g, 'l.title')
-    .replace(/\bdescription\b/g, 'l.description')
-    .replace(/\baddress\b/g, 'l.address')
-    .replace(/\bprovider\b/g, 'l.provider')
-    .replace(/\blink\b/g, 'l.link')
-    .replace(/\bj\.user_id\b/g, 'j.user_id');
-
-  // whitelist sortable fields to avoid SQL injection
-  const sortable = new Set(['created_at', 'price', 'size', 'provider', 'title', 'job_name', 'is_active']);
-  const safeSortField = sortField && sortable.has(sortField) ? sortField : null;
-  const safeSortDir = String(sortDir).toLowerCase() === 'desc' ? 'DESC' : 'ASC';
-  const orderSql = safeSortField ? `ORDER BY ${safeSortField} ${safeSortDir}` : 'ORDER BY created_at DESC';
-  const orderSqlWithAlias = orderSql
-    .replace(/\bcreated_at\b/g, 'l.created_at')
-    .replace(/\bprice\b/g, 'l.price')
-    .replace(/\bsize\b/g, 'l.size')
-    .replace(/\bprovider\b/g, 'l.provider')
-    .replace(/\btitle\b/g, 'l.title')
-    .replace(/\bjob_name\b/g, 'j.name');
-
-  // count total with same WHERE
-  const countRow = SqliteConnection.query(
-    `SELECT COUNT(1) as cnt
-     FROM listings l
-     LEFT JOIN jobs j ON j.id = l.job_id
-     ${whereSqlWithAlias}`,
-    params,
-  );
-  const totalNumber = countRow?.[0]?.cnt ?? 0;
-
-  // fetch page
-  const rows = SqliteConnection.query(
-    `SELECT l.*, j.name AS job_name
-     FROM listings l
-     LEFT JOIN jobs j ON j.id = l.job_id
-     ${whereSqlWithAlias}
-     ${orderSqlWithAlias}
-     LIMIT @limit OFFSET @offset`,
-    params,
-  );
-
-  return { totalNumber, page: safePage, result: rows };
-};
-
-/**
- * Delete all listings for a given job id.
- *
- * @param {string} jobId - The job identifier whose listings should be removed.
- * @returns {any} The result from SqliteConnection.execute (may contain changes count).
- */
-export const deleteListingsByJobId = (jobId) => {
-  if (!jobId) return;
-  return SqliteConnection.execute(`DELETE FROM listings WHERE job_id = @jobId`, { jobId });
-};
-
-/**
- * Delete listings by a list of listing IDs.
- *
- * @param {string[]} ids - Array of listing IDs to delete.
- * @returns {any} The result from SqliteConnection.execute.
- */
-export const deleteListingsById = (ids) => {
-  if (!Array.isArray(ids) || ids.length === 0) return;
-  const placeholders = ids.map(() => '?').join(',');
-  return SqliteConnection.execute(`DELETE FROM listings WHERE id IN (${placeholders})`, ids);
-};

lib/utils.js

@@ -109,22 +109,11 @@ function timeStringToMs(timeString, now) {
 }
 
 /**
- * Determine whether the given timestamp is within the configured working hours, or return true when the window is not set.
- * - If workingHours is missing or either 'from' or 'to' is empty/null, returns true.
- * - Supports windows that cross midnight (e.g., from '23:00' to '06:00').
- *
- * Time parsing is based on the local timezone of the running process.
- *
- * @param {{workingHours?: {from?: string|null, to?: string|null}}} config - Configuration object containing working hours in 'HH:mm' format.
- * @param {number} now - Epoch milliseconds to evaluate.
- * @returns {boolean} True when execution is allowed at 'now'.
- * @example
- * // Same-day window
- * duringWorkingHoursOrNotSet({ workingHours: { from: '08:00', to: '17:00' } }, someTime);
- * @example
- * // Window crossing midnight
- * // For { from: '05:00', to: '00:30' } → 23:00 => true, 01:00 => false, 06:00 => true
- * duringWorkingHoursOrNotSet({ workingHours: { from: '05:00', to: '00:30' } }, Date.now());
+ * Check whether current time is within configured working hours, or no hours are set.
+ * If working hours are missing or incomplete, returns true.
+ * @param {{workingHours?: {from?: string, to?: string}}} config
+ * @param {number} now - Epoch ms
+ * @returns {boolean}
  */
 function duringWorkingHoursOrNotSet(config, now) {
   const { workingHours } = config;
@@ -133,20 +122,7 @@ function duringWorkingHoursOrNotSet(config, now) {
   }
   const toDate = timeStringToMs(workingHours.to, now);
   const fromDate = timeStringToMs(workingHours.from, now);
-
-  // If parsing fails (e.g., malformed time), be lenient and allow.
-  if (isNaN(toDate) || isNaN(fromDate)) {
-    return true;
-  }
-
-  if (toDate >= fromDate) {
-    // Same-day window (e.g., 08:00 - 17:00)
-    return now >= fromDate && now <= toDate;
-  }
-
-  // Window crosses midnight (e.g., 05:00 -> 00:30 next day)
-  // Accept if we are after 'from' today OR before 'to' today (which represents next day's cutoff).
-  return now >= fromDate || now <= toDate;
+  return fromDate <= now && toDate >= now;
 }
 
 /**
@@ -268,13 +244,13 @@ function sleep(ms) {
 }
 
 /**
- * Return a random integer between min and max (inclusive).
- * @param {number} min - Minimum integer value.
- * @param {number} max - Maximum integer value.
- * @returns {number} A random integer N where min <= N <= max.
+ * returns a random into between start and end
+ * @param a start int
+ * @param b max int
+ * @returns {*}
  */
-function randomBetween(min, max) {
-  return Math.floor(Math.random() * (max - min + 1)) + min;
+function randomBetween(a, b) {
+  return Math.floor(Math.random() * (b - a + 1)) + a;
 }
 
 // Call refreshConfig() from the application entrypoint during startup to populate config.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fredy",
-  "version": "14.0.1",
+  "version": "12.1.6",
   "description": "[F]ind [R]eal [E]states [d]amn eas[y].",
   "scripts": {
     "prepare": "husky",
@@ -62,33 +62,32 @@
     "@visactor/react-vchart": "^2.0.5",
     "@visactor/vchart": "^2.0.5",
     "@visactor/vchart-semi-theme": "^1.12.2",
-    "@vitejs/plugin-react": "5.0.4",
-    "better-sqlite3": "^12.4.1",
+    "@vitejs/plugin-react": "5.0.3",
+    "better-sqlite3": "^12.3.0",
     "body-parser": "2.2.0",
     "cheerio": "^1.1.2",
     "cookie-session": "2.1.1",
     "handlebars": "4.7.8",
     "lodash": "4.17.21",
     "markdown": "^0.5.0",
-    "nanoid": "5.1.6",
+    "nanoid": "5.1.5",
     "node-cron": "^4.2.1",
     "node-fetch": "3.3.2",
     "node-mailjet": "6.0.9",
     "p-throttle": "^8.0.0",
     "package-up": "^5.0.0",
-    "puppeteer": "^24.23.0",
+    "puppeteer": "^24.22.0",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "query-string": "9.3.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router": "7.9.3",
-    "react-router-dom": "7.9.3",
+    "react-router": "7.9.1",
+    "react-router-dom": "7.9.1",
     "restana": "5.1.0",
-    "semver": "^7.7.2",
     "serve-static": "2.2.0",
     "slack": "11.0.2",
-    "vite": "7.1.9",
+    "vite": "7.1.7",
     "x-var": "^3.0.1",
     "zustand": "^5.0.8"
   },
@@ -97,7 +96,7 @@
     "@babel/eslint-parser": "7.28.4",
     "@babel/preset-env": "7.28.3",
     "@babel/preset-react": "7.27.1",
-    "chai": "6.2.0",
+    "chai": "6.0.1",
     "eslint": "9.36.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-react": "7.37.5",
@@ -105,8 +104,8 @@
     "history": "5.3.0",
     "husky": "9.1.7",
     "less": "4.4.1",
-    "lint-staged": "16.2.3",
-    "mocha": "11.7.4",
+    "lint-staged": "16.2.0",
+    "mocha": "11.7.2",
     "nodemon": "^3.1.10",
     "prettier": "3.6.2"
   }

test/FredyRuntime/FredyRuntime.test.js

@@ -1,53 +0,0 @@
-import { expect } from 'chai';
-import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
-import { mockFredy } from '../utils.js';
-
-describe('FredyRuntime', () => {
-  afterEach(() => {
-    similarityCache.invalidateAllForTest();
-  });
-
-  after(() => {
-    similarityCache.stopCacheCleanup();
-  });
-
-  describe('_filterBySimilarListings', () => {
-    let fredyRuntime;
-
-    beforeEach(async () => {
-      const FredyRuntime = await mockFredy();
-      fredyRuntime = new FredyRuntime({}, null, 'dummy-provider', 'dummy-job', similarityCache);
-    });
-
-    it('should filter out listings with similar title and address already in cache', () => {
-      similarityCache.addCacheEntry('Penthouse', 'Mustermann Straße 1');
-
-      const listings = [
-        { id: '1', title: 'Penthouse', address: 'Mustermann Straße 1' },
-        { id: '2', title: 'Nice apartment', address: 'Mustermann Straße 15' },
-      ];
-
-      const result = fredyRuntime._filterBySimilarListings(listings);
-
-      expect(result).to.have.length(1);
-      expect(result[0].id).to.equal('2');
-      expect(result[0].title).to.equal('Nice apartment');
-
-      expect(similarityCache.hasSimilarEntries('Nice apartment', 'Mustermann Straße 15')).to.be.true;
-    });
-
-    it('should handle listings with null or undefined address', () => {
-      const listings = [
-        { id: '1', title: 'Penthouse', address: null },
-        { id: '2', title: 'Nice apartment', address: undefined },
-      ];
-
-      const result = fredyRuntime._filterBySimilarListings(listings);
-
-      expect(result).to.have.length(2);
-
-      expect(similarityCache.hasSimilarEntries('Penthouse', null)).to.be.true;
-      expect(similarityCache.hasSimilarEntries('Nice apartment', undefined)).to.be.true;
-    });
-  });
-});

test/provider/immonet.test.js

@@ -8,30 +8,31 @@ describe('#immonet testsuite()', () => {
   after(() => {
     similarityCache.stopCacheCleanup();
   });
-
+  provider.init(providerConfig.immonet, [], []);
   it('should test immonet provider', async () => {
     const Fredy = await mockFredy();
-    provider.init(providerConfig.immonet, [], []);
+    return await new Promise((resolve) => {
+      const fredy = new Fredy(provider.config, null, provider.metaInformation.id, 'immonet', similarityCache);
+      fredy.execute().then((listing) => {
+        expect(listing).to.be.a('array');
+        const notificationObj = get();
+        expect(notificationObj).to.be.a('object');
+        expect(notificationObj.serviceName).to.equal('immonet');
+        notificationObj.payload.forEach((notify) => {
+          /** check the actual structure **/
+          expect(notify.id).to.be.a('string');
+          expect(notify.price).to.be.a('string');
+          expect(notify.size).to.be.a('string');
+          expect(notify.title).to.be.a('string');
+          expect(notify.link).to.be.a('string');
+          expect(notify.address).to.be.a('string');
 
-    const fredy = new Fredy(provider.config, null, provider.metaInformation.id, 'immonet', similarityCache);
-    const listing = await fredy.execute();
-
-    expect(listing).to.be.a('array');
-    const notificationObj = get();
-    expect(notificationObj).to.be.a('object');
-    expect(notificationObj.serviceName).to.equal('immonet');
-    notificationObj.payload.forEach((notify) => {
-      /** check the actual structure **/
-      expect(notify.id).to.be.a('string');
-      expect(notify.price).to.be.a('string');
-      expect(notify.size).to.be.a('string');
-      expect(notify.title).to.be.a('string');
-      expect(notify.link).to.be.a('string');
-      expect(notify.address).to.be.a('string');
-      /** check the values if possible **/
-      expect(notify.size).that.does.include('m²');
-      expect(notify.title).to.be.not.empty;
-      expect(notify.address).to.be.not.empty;
+          expect(notify.size).that.does.include('m²');
+          expect(notify.title).to.be.not.empty;
+          expect(notify.address).to.be.not.empty;
+        });
+        resolve();
+      });
     });
   });
 });

test/provider/immowelt.test.js

@@ -8,32 +8,33 @@ describe('#immowelt testsuite()', () => {
   after(() => {
     similarityCache.stopCacheCleanup();
   });
-
   it('should test immowelt provider', async () => {
     const Fredy = await mockFredy();
     provider.init(providerConfig.immowelt, [], []);
-
-    const fredy = new Fredy(provider.config, null, provider.metaInformation.id, 'immowelt', similarityCache);
-    const listing = await fredy.execute();
-
-    expect(listing).to.be.a('array');
-    const notificationObj = get();
-    expect(notificationObj).to.be.a('object');
-    expect(notificationObj.serviceName).to.equal('immowelt');
-    notificationObj.payload.forEach((notify) => {
-      /** check the actual structure **/
-      expect(notify.id).to.be.a('string');
-      expect(notify.price).to.be.a('string');
-      expect(notify.title).to.be.a('string');
-      expect(notify.link).to.be.a('string');
-      expect(notify.address).to.be.a('string');
-      /** check the values if possible **/
-      if (notify.size != null && notify.size.trim().toLowerCase() !== 'k.a.') {
-        expect(notify.size).that.does.include('m²');
-      }
-      expect(notify.title).to.be.not.empty;
-      expect(notify.link).that.does.include('https://www.immowelt.de');
-      expect(notify.address).to.be.not.empty;
+    return await new Promise((resolve) => {
+      const fredy = new Fredy(provider.config, null, provider.metaInformation.id, 'immowelt', similarityCache);
+      fredy.execute().then((listing) => {
+        expect(listing).to.be.a('array');
+        const notificationObj = get();
+        expect(notificationObj).to.be.a('object');
+        expect(notificationObj.serviceName).to.equal('immowelt');
+        notificationObj.payload.forEach((notify) => {
+          /** check the actual structure **/
+          expect(notify.id).to.be.a('string');
+          expect(notify.price).to.be.a('string');
+          expect(notify.title).to.be.a('string');
+          expect(notify.link).to.be.a('string');
+          expect(notify.address).to.be.a('string');
+          /** check the values if possible **/
+          if (notify.size != null && notify.size.trim().toLowerCase() !== 'k.a.') {
+            expect(notify.size).that.does.include('m²');
+          }
+          expect(notify.title).to.be.not.empty;
+          expect(notify.link).that.does.include('https://www.immowelt.de');
+          expect(notify.address).to.be.not.empty;
+        });
+        resolve();
+      });
     });
   });
 });

test/provider/mcMakler.test.js

@@ -1,37 +0,0 @@
-import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
-import { get } from '../mocks/mockNotification.js';
-import { mockFredy, providerConfig } from '../utils.js';
-import { expect } from 'chai';
-import * as provider from '../../lib/provider/mcMakler.js';
-
-describe('#mcMakler testsuite()', () => {
-  after(() => {
-    similarityCache.stopCacheCleanup();
-  });
-
-  it('should test mcMakler provider', async () => {
-    const Fredy = await mockFredy();
-    provider.init(providerConfig.mcMakler, []);
-
-    const fredy = new Fredy(provider.config, null, provider.metaInformation.id, 'mcMakler', similarityCache);
-    const listing = await fredy.execute();
-
-    expect(listing).to.be.a('array');
-    const notificationObj = get();
-    expect(notificationObj).to.be.a('object');
-    expect(notificationObj.serviceName).to.equal('mcMakler');
-    notificationObj.payload.forEach((notify) => {
-      /** check the actual structure **/
-      expect(notify.id).to.be.a('string');
-      expect(notify.price).to.be.a('string');
-      expect(notify.size).to.be.a('string');
-      expect(notify.title).to.be.a('string');
-      expect(notify.link).to.be.a('string');
-      expect(notify.address).to.be.a('string');
-      /** check the values if possible **/
-      expect(notify.size).that.does.include('m²');
-      expect(notify.title).to.be.not.empty;
-      expect(notify.address).to.be.not.empty;
-    });
-  });
-});

test/provider/regionalimmobilien24.test.js

@@ -1,43 +0,0 @@
-import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
-import { get } from '../mocks/mockNotification.js';
-import { mockFredy, providerConfig } from '../utils.js';
-import { expect } from 'chai';
-import * as provider from '../../lib/provider/regionalimmobilien24.js';
-
-describe('#regionalimmobilien24 testsuite()', () => {
-  after(() => {
-    similarityCache.stopCacheCleanup();
-  });
-
-  it('should test regionalimmobilien24 provider', async () => {
-    const Fredy = await mockFredy();
-    provider.init(providerConfig.regionalimmobilien24, []);
-
-    const fredy = new Fredy(
-      provider.config,
-      null,
-      provider.metaInformation.id,
-      'regionalimmobilien24',
-      similarityCache,
-    );
-    const listing = await fredy.execute();
-
-    expect(listing).to.be.a('array');
-    const notificationObj = get();
-    expect(notificationObj).to.be.a('object');
-    expect(notificationObj.serviceName).to.equal('regionalimmobilien24');
-    notificationObj.payload.forEach((notify) => {
-      /** check the actual structure **/
-      expect(notify.id).to.be.a('string');
-      expect(notify.price).to.be.a('string');
-      expect(notify.size).to.be.a('string');
-      expect(notify.title).to.be.a('string');
-      expect(notify.link).to.be.a('string');
-      expect(notify.address).to.be.a('string');
-      /** check the values if possible **/
-      expect(notify.size).that.does.include('m²');
-      expect(notify.title).to.be.not.empty;
-      expect(notify.address).to.be.not.empty;
-    });
-  });
-});

test/provider/sparkasse.test.js

@@ -1,37 +0,0 @@
-import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
-import { get } from '../mocks/mockNotification.js';
-import { mockFredy, providerConfig } from '../utils.js';
-import { expect } from 'chai';
-import * as provider from '../../lib/provider/sparkasse.js';
-
-describe('#sparkasse testsuite()', () => {
-  after(() => {
-    similarityCache.stopCacheCleanup();
-  });
-
-  it('should test sparkasse provider', async () => {
-    const Fredy = await mockFredy();
-    provider.init(providerConfig.sparkasse, []);
-
-    const fredy = new Fredy(provider.config, null, provider.metaInformation.id, 'sparkasse', similarityCache);
-    const listing = await fredy.execute();
-
-    expect(listing).to.be.a('array');
-    const notificationObj = get();
-    expect(notificationObj).to.be.a('object');
-    expect(notificationObj.serviceName).to.equal('sparkasse');
-    notificationObj.payload.forEach((notify) => {
-      /** check the actual structure **/
-      expect(notify.id).to.be.a('string');
-      expect(notify.price).to.be.a('string');
-      expect(notify.size).to.be.a('string');
-      expect(notify.title).to.be.a('string');
-      expect(notify.link).to.be.a('string');
-      expect(notify.address).to.be.a('string');
-      /** check the values if possible **/
-      expect(notify.size).that.does.include('m²');
-      expect(notify.title).to.be.not.empty;
-      expect(notify.address).to.be.not.empty;
-    });
-  });
-});

test/provider/testProvider.json

@@ -28,22 +28,10 @@
     "url": "https://www.kleinanzeigen.de/s-immobilien/duesseldorf/anzeige:angebote/wohnung/k0c195l2068r5",
     "enabled": true
   },
-  "mcMakler": {
-    "url": "https://www.mcmakler.de/immobilien/results?placeId=62649&search=Leipzig%252C+Sachsen&propertyTypes=APARTMENT&page=0",
-    "enabled": true
-  },
   "neubauKompass": {
     "url": "https://www.neubaukompass.de/neubau-immobilien/duesseldorf-region/eigentumswohnung/",
     "enabled": true
   },
-  "regionalimmobilien24": {
-    "url": "https://www.regionalimmobilien24.de/rostock/rostock/kaufen/haus/-/-/-/?rd=5",
-    "enabled": true
-  },
-  "sparkasse": {
-    "url": "https://immobilien.sparkasse.de/immobilien/treffer?marketingType=buy&objectType=flat&perimeter=10&usageType=residential&zipCityEstateId=62782__Hamburg",
-    "enabled": true
-  },
   "wgGesucht": {
     "url": "https://www.wg-gesucht.de/wg-zimmer-in-Duesseldorf.30.0.1.0.html",
     "enabled": true

test/provider/utils.test.js

@@ -8,7 +8,6 @@ const fakeWorkingHoursConfig = (from, to) => ({
     from,
   },
 });
-
 describe('utils', () => {
   describe('#isOneOf()', () => {
     it('should be false', () => {
@@ -34,19 +33,5 @@ describe('utils', () => {
     it('should be true if only from is set', () => {
       expect(duringWorkingHoursOrNotSet(fakeWorkingHoursConfig('12:00', null), 1622026740000)).to.be.true;
     });
-    it('should handle working hours that cross midnight (e.g., 05:00 → 00:30)', () => {
-      const cfg = fakeWorkingHoursConfig('05:00', '00:30');
-      const mkTs = (h, m = 0) => {
-        const d = new Date();
-        d.setHours(h);
-        d.setMinutes(m);
-        d.setSeconds(0);
-        d.setMilliseconds(0);
-        return d.getTime();
-      };
-      expect(duringWorkingHoursOrNotSet(cfg, mkTs(23, 0))).to.be.true; // 23:00 => within window
-      expect(duringWorkingHoursOrNotSet(cfg, mkTs(1, 0))).to.be.false; // 01:00 => outside window
-      expect(duringWorkingHoursOrNotSet(cfg, mkTs(6, 0))).to.be.true; // 06:00 => within window
-    });
   });
 });

ui/src/App.jsx

@@ -8,19 +8,17 @@ import UserMutator from './views/user/mutation/UserMutator';
 import JobInsight from './views/jobs/insights/JobInsight.jsx';
 import { useActions, useSelector } from './services/state/store';
 import { Routes, Route, Navigate } from 'react-router-dom';
+import Logout from './components/logout/Logout';
+import Logo from './components/logo/Logo';
+import Menu from './components/menu/Menu';
 import Login from './views/login/Login';
 import Users from './views/user/Users';
 import Jobs from './views/jobs/Jobs';
 
 import './App.less';
 import TrackingModal from './components/tracking/TrackingModal.jsx';
-import { Banner, Divider } from '@douyinfe/semi-ui';
+import { Banner } from '@douyinfe/semi-ui';
 import VersionBanner from './components/version/VersionBanner.jsx';
-import Listings from './views/listings/Listings.jsx';
-import Navigation from './components/navigation/Navigation.jsx';
-import { Layout } from '@douyinfe/semi-ui';
-import FredyFooter from './components/footer/FredyFooter.jsx';
-import ProcessingTimes from './views/jobs/ProcessingTimes.jsx';
 
 export default function FredyApp() {
   const actions = useActions();
@@ -28,7 +26,6 @@ export default function FredyApp() {
   const currentUser = useSelector((state) => state.user.currentUser);
   const versionUpdate = useSelector((state) => state.versionUpdate.versionUpdate);
   const settings = useSelector((state) => state.generalSettings.settings);
-  const processingTimes = useSelector((state) => state.jobs.processingTimes);
 
   useEffect(() => {
     async function init() {
@@ -52,88 +49,80 @@ export default function FredyApp() {
   };
 
   const isAdmin = () => currentUser != null && currentUser.isAdmin;
-  const { Footer, Sider, Content } = Layout;
 
-  return loading ? null : needsLogin() ? (
+  const login = () => (
     <Routes>
       <Route path="/login" element={<Login />} />
       <Route path="*" element={<Navigate to="/login" replace />} />
     </Routes>
+  );
+  return loading ? null : needsLogin() ? (
+    login()
   ) : (
-    <Layout className="app">
-      <Layout className="app">
-        <Sider>
-          <Navigation isAdmin={isAdmin()} />
-        </Sider>
-        <Content>
-          {versionUpdate?.newVersion && <VersionBanner />}
-          {settings.demoMode && (
-            <>
-              <Banner
-                fullMode={true}
-                type="info"
-                bordered
-                closeIcon={null}
-                description="You're currently viewing the demo version of Fredy. Jobs won't scrape websites, and any changes you make will be reverted at midnight."
-              />
-              <br />
-            </>
-          )}
-          {settings.analyticsEnabled === null && !settings.demoMode && <TrackingModal />}
-          {processingTimes != null && <ProcessingTimes processingTimes={processingTimes} />}
-          <Divider />
-          <div className="app__content">
-            <Routes>
-              <Route path="/403" element={<InsufficientPermission />} />
-              <Route path="/jobs/new" element={<JobMutation />} />
-              <Route path="/jobs/edit/:jobId" element={<JobMutation />} />
-              <Route path="/jobs/insights/:jobId" element={<JobInsight />} />
-              <Route path="/jobs" element={<Jobs />} />
-              <Route path="/listings" element={<Listings />} />
+    <div className="app">
+      <div className="app__container">
+        <Logout />
+        <Logo width={190} white />
+        <Menu isAdmin={isAdmin()} />
+        {versionUpdate?.newVersion && <VersionBanner />}
+        {settings.demoMode && (
+          <>
+            <Banner
+              fullMode={true}
+              type="info"
+              bordered
+              closeIcon={null}
+              description="You're currently viewing the demo version of Fredy. Jobs won't scrape websites, and any changes you make will be reverted at midnight."
+            />
+            <br />
+          </>
+        )}
+        {settings.analyticsEnabled === null && !settings.demoMode && <TrackingModal />}
+        <Routes>
+          <Route path="/403" element={<InsufficientPermission />} />
+          <Route path="/jobs/new" element={<JobMutation />} />
+          <Route path="/jobs/edit/:jobId" element={<JobMutation />} />
+          <Route path="/jobs/insights/:jobId" element={<JobInsight />} />
+          <Route path="/jobs" element={<Jobs />} />
 
-              {/* Permission-aware routes */}
-              <Route
-                path="/users/new"
-                element={
-                  <PermissionAwareRoute currentUser={currentUser}>
-                    <UserMutator />
-                  </PermissionAwareRoute>
-                }
-              />
-              <Route
-                path="/users/edit/:userId"
-                element={
-                  <PermissionAwareRoute currentUser={currentUser}>
-                    <UserMutator />
-                  </PermissionAwareRoute>
-                }
-              />
-              <Route
-                path="/users"
-                element={
-                  <PermissionAwareRoute currentUser={currentUser}>
-                    <Users />
-                  </PermissionAwareRoute>
-                }
-              />
-              <Route
-                path="/generalSettings"
-                element={
-                  <PermissionAwareRoute currentUser={currentUser}>
-                    <GeneralSettings />
-                  </PermissionAwareRoute>
-                }
-              />
+          {/* Permission-aware routes */}
+          <Route
+            path="/users/new"
+            element={
+              <PermissionAwareRoute currentUser={currentUser}>
+                <UserMutator />
+              </PermissionAwareRoute>
+            }
+          />
+          <Route
+            path="/users/edit/:userId"
+            element={
+              <PermissionAwareRoute currentUser={currentUser}>
+                <UserMutator />
+              </PermissionAwareRoute>
+            }
+          />
+          <Route
+            path="/users"
+            element={
+              <PermissionAwareRoute currentUser={currentUser}>
+                <Users />
+              </PermissionAwareRoute>
+            }
+          />
+          <Route
+            path="/generalSettings"
+            element={
+              <PermissionAwareRoute currentUser={currentUser}>
+                <GeneralSettings />
+              </PermissionAwareRoute>
+            }
+          />
 
-              <Route path="/" element={<Navigate to="/jobs" replace />} />
-            </Routes>
-          </div>
-        </Content>
-      </Layout>
-      <Footer>
-        <FredyFooter />
-      </Footer>
-    </Layout>
+          <Route path="/" element={<Navigate to="/jobs" replace />} />
+        </Routes>
+      </div>
+    </div>
   );
 }
 

ui/src/App.less

@@ -1,9 +1,12 @@
 .app {
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   width: 100%;
 
-  &__content {
-    margin: 1rem;
+  &__container {
+    padding: 1rem 1rem;
+    color: var(--semi-color-text-0);
+    background-color: #232429;
   }
 }
 

ui/src/components/footer/FredyFooter.jsx

@@ -1,19 +0,0 @@
-import React from 'react';
-import './FredyFooter.less';
-import { useSelector } from '../../services/state/store.js';
-import { Typography } from '@douyinfe/semi-ui';
-
-export default function FredyFooter() {
-  const { Text } = Typography;
-  const version = useSelector((state) => state.versionUpdate.versionUpdate);
-  return (
-    <div className="fredyFooter">
-      <div className="fredyFooter__version">
-        <Text type="tertiary">Fredy V{version?.localFredyVersion || 'N/A'}</Text>
-      </div>
-      <div className="fredyFooter__copyRight">
-        <Text link={{ href: 'https://github.com/orangecoding', target: '_blank' }}>Made with ❤️</Text>
-      </div>
-    </div>
-  );
-}

ui/src/components/footer/FredyFooter.less

@@ -1,18 +0,0 @@
-.fredyFooter {
-  background:rgb(53, 54, 60);
-  color: white;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height: 1.7rem;
-
-  &__version {
-    padding-left: .5rem;
-    font-size: small;
-
-  }
-  &__copyRight {
-    padding-right: 1rem;
-
-  }
-}

ui/src/components/logo/Logo.jsx

@@ -5,5 +5,5 @@ import logoWhite from '../../assets/logo_white.png';
 import './Logo.less';
 
 export default function Logo({ width = 350, white = false } = {}) {
-  return <img src={white ? logoWhite : logo} width={width} className="logo" alt="Fredy Logo" />;
+  return <img src={white ? logoWhite : logo} width={width} className="logo" />;
 }

ui/src/components/logout/Logout.jsx

@@ -2,22 +2,19 @@ import React from 'react';
 import { Button } from '@douyinfe/semi-ui';
 import { xhrPost } from '../../services/xhr';
 import { IconUser } from '@douyinfe/semi-icons';
-
-const Logout = function Logout({ text }) {
+const Logout = function Logout() {
   return (
-    <div>
-      <Button
-        icon={<IconUser />}
-        type="danger"
-        theme="solid"
-        onClick={async () => {
-          await xhrPost('/api/login/logout');
-          location.reload();
-        }}
-      >
-        {text && 'Logout'}
-      </Button>
-    </div>
+    <Button
+      icon={<IconUser />}
+      type="danger"
+      theme="solid"
+      onClick={async () => {
+        await xhrPost('/api/login/logout');
+        location.reload();
+      }}
+    >
+      Logout
+    </Button>
   );
 };
 

ui/src/components/menu/Menu.jsx

@@ -0,0 +1,56 @@
+import React from 'react';
+import { useNavigate } from 'react-router-dom';
+import { Tabs, TabPane } from '@douyinfe/semi-ui';
+
+import { useLocation } from 'react-router-dom';
+import { IconUser, IconTerminal, IconSetting } from '@douyinfe/semi-icons';
+import './Menu.less';
+
+function parsePathName(name) {
+  const split = name.split('/').filter((s) => s.length !== 0);
+  return '/' + split[0];
+}
+
+const TopMenu = function TopMenu({ isAdmin }) {
+  const navigate = useNavigate();
+  const location = useLocation();
+  return (
+    <Tabs className="menu" type="line" activeKey={parsePathName(location.pathname)} onTabClick={(key) => navigate(key)}>
+      <TabPane
+        itemKey="/jobs"
+        tab={
+          <span>
+            <IconTerminal />
+            Jobs
+          </span>
+        }
+      />
+
+      {isAdmin && (
+        <TabPane
+          itemKey="/users"
+          tab={
+            <span>
+              <IconUser />
+              User
+            </span>
+          }
+        />
+      )}
+
+      {isAdmin && (
+        <TabPane
+          itemKey="/generalSettings"
+          tab={
+            <span>
+              <IconSetting />
+              General
+            </span>
+          }
+        />
+      )}
+    </Tabs>
+  );
+};
+
+export default TopMenu;

ui/src/components/menu/Menu.less

@@ -0,0 +1,3 @@
+.menu {
+  margin-top: 3rem;
+}

ui/src/components/navigation/Navigate.less

@@ -1,9 +0,0 @@
-.navigate {
-  &__logout_Button {
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    display: flex;
-
-  }
-}

ui/src/components/navigation/Navigation.jsx

@@ -1,50 +0,0 @@
-import React from 'react';
-import { Nav } from '@douyinfe/semi-ui';
-import { IconUser, IconStar, IconSetting, IconTerminal } from '@douyinfe/semi-icons';
-import logoWhite from '../../assets/logo_white.png';
-import Logout from '../logout/Logout.jsx';
-import { useLocation, useNavigate } from 'react-router-dom';
-
-import './Navigate.less';
-import { useScreenWidth } from '../../hooks/screenWidth.js';
-
-export default function Navigation({ isAdmin }) {
-  const navigate = useNavigate();
-  const location = useLocation();
-
-  const width = useScreenWidth();
-  const collapsed = width <= 850;
-
-  const items = [
-    { itemKey: '/jobs', text: 'Jobs', icon: <IconTerminal /> },
-    { itemKey: '/listings', text: 'Found Listings', icon: <IconStar /> },
-  ];
-
-  if (isAdmin) {
-    items.push({ itemKey: '/users', text: 'User Management', icon: <IconUser /> });
-    items.push({ itemKey: '/generalSettings', text: 'Settings', icon: <IconSetting /> });
-  }
-
-  function parsePathName(name) {
-    const split = name.split('/').filter((s) => s.length !== 0);
-    return '/' + split[0];
-  }
-
-  return (
-    <Nav
-      style={{ height: '100%', width: collapsed ? '' : '13rem' }}
-      items={items}
-      isCollapsed={collapsed}
-      selectedKeys={[parsePathName(location.pathname)]}
-      onSelect={(key) => {
-        navigate(key.itemKey);
-      }}
-      header={<img src={logoWhite} width="180" alt="Fredy Logo" />}
-      footer={
-        <div className="navigate__logout_Button">
-          <Logout text={!collapsed} />
-        </div>
-      }
-    />
-  );
-}

ui/src/components/segment/SegmentPart.jsx

@@ -8,7 +8,6 @@ export const SegmentPart = ({ name, Icon = null, children, helpText }) => {
 
   return (
     <Card
-      className="segmentParts"
       title={
         <Meta title={name} description={helpText} avatar={Icon == null ? null : <Icon size="extra-extra-small" />} />
       }

ui/src/components/segment/SegmentParts.less

@@ -1,7 +1,4 @@
 .segmentParts {
   border: 1px solid #323232 !important;
   border-radius: 5px !important;
-  color: rgba(var(--semi-grey-8), 1);
-  background: rgb(53, 54, 60);
-  margin: 2rem;
 }

ui/src/components/table/JobTable.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { Button, Empty, Table, Switch, Popover } from '@douyinfe/semi-ui';
-import { IconDelete, IconDescend2, IconEdit, IconHistogram } from '@douyinfe/semi-icons';
+import { Button, Empty, Table, Switch } from '@douyinfe/semi-ui';
+import { IconDelete, IconEdit, IconHistogram } from '@douyinfe/semi-icons';
 import { IllustrationNoResult, IllustrationNoResultDark } from '@douyinfe/semi-illustrations';
 
 import './JobTable.less';
@@ -10,20 +10,11 @@ const empty = (
   <Empty
     image={<IllustrationNoResult />}
     darkModeImage={<IllustrationNoResultDark />}
-    description="No jobs available. Why don't you create one? ;)"
+    description={'No jobs available.'}
   />
 );
 
-const getPopoverContent = (text) => <article className="jobPopoverContent">{text}</article>;
-
-export default function JobTable({
-  jobs = {},
-  onJobRemoval,
-  onJobStatusChanged,
-  onJobEdit,
-  onJobInsight,
-  onListingRemoval,
-} = {}) {
+export default function JobTable({ jobs = {}, onJobRemoval, onJobStatusChanged, onJobEdit, onJobInsight } = {}) {
   return (
     <Table
       pagination={false}
@@ -41,7 +32,7 @@ export default function JobTable({
           dataIndex: 'name',
         },
         {
-          title: 'Listings',
+          title: 'Findings',
           dataIndex: 'numberOfFoundListings',
           render: (value) => {
             return value || 0;
@@ -67,18 +58,9 @@ export default function JobTable({
           render: (_, job) => {
             return (
               <div className="interactions">
-                <Popover content={getPopoverContent('Job Insights')}>
-                  <Button type="primary" icon={<IconHistogram />} onClick={() => onJobInsight(job.id)} />
-                </Popover>
-                <Popover content={getPopoverContent('Edit a Job')}>
-                  <Button type="secondary" icon={<IconEdit />} onClick={() => onJobEdit(job.id)} />
-                </Popover>
-                <Popover content={getPopoverContent('Delete all found Listings of this Job')}>
-                  <Button type="danger" icon={<IconDescend2 />} onClick={() => onListingRemoval(job.id)} />
-                </Popover>
-                <Popover content={getPopoverContent('Delete Job')}>
-                  <Button type="danger" icon={<IconDelete />} onClick={() => onJobRemoval(job.id)} />
-                </Popover>
+                <Button type="primary" icon={<IconHistogram />} onClick={() => onJobInsight(job.id)} />
+                <Button type="secondary" icon={<IconEdit />} onClick={() => onJobEdit(job.id)} />
+                <Button type="danger" icon={<IconDelete />} onClick={() => onJobRemoval(job.id)} />
               </div>
             );
           },

ui/src/components/table/JobTable.less

@@ -5,11 +5,6 @@
   gap: 1rem;
 }
 
-.jobPopoverContent {
-  padding: 1rem;
-  color: white;
-}
-
 @media (min-width: 768px) {
   .interactions {
     flex-direction: initial;

ui/src/components/table/ListingsTable.jsx

@@ -1,227 +0,0 @@
-import React, { useState, useEffect, useMemo } from 'react';
-import { Table, Popover, Input, Descriptions, Tag, Image, Empty, Button, Card, Toast } from '@douyinfe/semi-ui';
-import { useActions, useSelector } from '../../services/state/store.js';
-import { IconClose, IconDelete, IconSearch, IconTick } from '@douyinfe/semi-icons';
-import * as timeService from '../../services/time/timeService.js';
-import debounce from 'lodash/debounce';
-import no_image from '../../assets/no_image.jpg';
-
-import './ListingsTable.less';
-import { format } from '../../services/time/timeService.js';
-import { IllustrationNoResult, IllustrationNoResultDark } from '@douyinfe/semi-illustrations';
-import { xhrDelete } from '../../services/xhr.js';
-
-const columns = [
-  {
-    title: '#',
-    dataIndex: 'is_active',
-    width: 58,
-    sorter: true,
-    render: (value) => {
-      return value ? (
-        <div style={{ color: 'rgba(var(--semi-green-6), 1)' }}>
-          <Popover
-            style={{
-              padding: '.4rem',
-              color: 'var(--semi-color-white)',
-            }}
-            content="Listing still online"
-          >
-            <IconTick />
-          </Popover>
-        </div>
-      ) : (
-        <div style={{ color: 'rgba(var(--semi-red-5), 1)' }}>
-          <Popover
-            style={{
-              padding: '.4rem',
-              color: 'var(--semi-color-white)',
-            }}
-            content="Listing not online anymore"
-          >
-            <IconClose />
-          </Popover>
-        </div>
-      );
-    },
-  },
-  {
-    title: 'Job-Name',
-    sorter: true,
-    dataIndex: 'job_name',
-    width: 170,
-  },
-  {
-    title: 'Listing date',
-    width: 130,
-    dataIndex: 'created_at',
-    sorter: true,
-    render: (text) => timeService.format(text),
-  },
-  {
-    title: 'Provider',
-    width: 130,
-    dataIndex: 'provider',
-    sorter: true,
-    render: (text) => text.charAt(0).toUpperCase() + text.slice(1),
-  },
-  {
-    title: 'Price',
-    width: 110,
-    dataIndex: 'price',
-    sorter: true,
-    render: (text) => text + ' €',
-  },
-  {
-    title: 'Address',
-    width: 150,
-    dataIndex: 'address',
-    sorter: true,
-  },
-  {
-    title: 'Title',
-    dataIndex: 'title',
-    sorter: true,
-    ellipsis: true,
-    render: (text, row) => {
-      return (
-        <a href={row.url} target="_blank" rel="noopener noreferrer">
-          {text}
-        </a>
-      );
-    },
-  },
-];
-
-const empty = (
-  <Empty
-    image={<IllustrationNoResult />}
-    darkModeImage={<IllustrationNoResultDark />}
-    description="No listings available."
-  />
-);
-
-export default function ListingsTable() {
-  const tableData = useSelector((state) => state.listingsTable);
-  const actions = useActions();
-  const [page, setPage] = useState(1);
-  const pageSize = 10;
-  const [sortData, setSortData] = useState({});
-  const [filter, setFilter] = useState(null);
-  const [selectedKeys, setSelectedKeys] = useState([]);
-
-  const handlePageChange = (_page) => {
-    setPage(_page);
-  };
-
-  const loadTable = () => {
-    let sortfield = null;
-    let sortdir = null;
-
-    if (sortData != null && Object.keys(sortData).length > 0) {
-      sortfield = sortData.field;
-      sortdir = sortData.direction;
-    }
-    actions.listingsTable.getListingsTable({ page, pageSize, sortfield, sortdir, filter });
-  };
-
-  useEffect(() => {
-    loadTable();
-  }, [page, sortData, filter]);
-
-  const handleFilterChange = useMemo(() => debounce((value) => setFilter(value), 500), []);
-
-  const rowSelection = {
-    onChange: (selectedRowKeys) => {
-      setSelectedKeys(selectedRowKeys);
-    },
-  };
-
-  const expandRowRender = (record) => {
-    return (
-      <div className="listingsTable__expanded">
-        <div>
-          {record.image_url == null ? (
-            <Image height={200} src={no_image} />
-          ) : (
-            <Image height={200} src={record.image_url} />
-          )}
-        </div>
-        <div>
-          <Descriptions align="justify">
-            <Descriptions.Item itemKey="Listing still online">
-              <Tag size="small" shape="circle" color={record.is_active ? 'green' : 'red'}>
-                {record.is_active ? 'Yes' : 'No'}
-              </Tag>
-            </Descriptions.Item>
-            <Descriptions.Item itemKey="Link">
-              <a href={record.link} target="_blank" rel="noreferrer">
-                Link to Listing
-              </a>
-            </Descriptions.Item>
-            <Descriptions.Item itemKey="Listing date">{format(record.created_at)}</Descriptions.Item>
-            <Descriptions.Item itemKey="Price">{record.price} €</Descriptions.Item>
-          </Descriptions>
-          <b>{record.title}</b>
-          <p>{record.description == null ? 'No description available' : record.description}</p>
-        </div>
-      </div>
-    );
-  };
-
-  const onRemoveSelectedListings = async () => {
-    if (selectedKeys != null && selectedKeys.length > 0) {
-      try {
-        await xhrDelete('/api/listings/', { ids: selectedKeys });
-        Toast.success('Listing(s) successfully removed');
-        loadTable();
-      } catch (error) {
-        Toast.error(error);
-      }
-    }
-  };
-
-  return (
-    <div>
-      <Input
-        prefix={<IconSearch />}
-        showClear
-        className="listingsTable__search"
-        placeholder="Search"
-        onChange={handleFilterChange}
-      />
-      {selectedKeys != null && selectedKeys.length > 0 && (
-        <Card className="listingsTable__toolbar">
-          <Button type="danger" icon={<IconDelete />} onClick={() => onRemoveSelectedListings()}>
-            Remove selected Listings
-          </Button>
-        </Card>
-      )}
-      <Table
-        rowKey="id"
-        empty={empty}
-        hideExpandedColumn={false}
-        sticky={{ top: 5 }}
-        columns={columns}
-        rowSelection={rowSelection}
-        expandedRowRender={expandRowRender}
-        dataSource={tableData?.result || []}
-        onChange={(changeSet) => {
-          if (changeSet?.extra?.changeType === 'sorter') {
-            setSortData({
-              field: changeSet.sorter.dataIndex,
-              direction: changeSet.sorter.sortOrder === 'ascend' ? 'asc' : 'desc',
-            });
-          }
-        }}
-        pagination={{
-          currentPage: page,
-          //for now fixed
-          pageSize,
-          total: tableData?.totalNumber || 0,
-          onPageChange: handlePageChange,
-        }}
-      />
-    </div>
-  );
-}

ui/src/components/table/ListingsTable.less

@@ -1,14 +0,0 @@
-.listingsTable {
-  &__search {
-    margin-bottom: 1rem !important;
-  }
-
-  &__expanded {
-    display: flex;
-    gap: 1rem;
-  }
-
-  &__toolbar {
-    margin-bottom: 1rem;
-  }
-}

ui/src/components/version/VersionBanner.jsx

@@ -1,16 +1,18 @@
 import React from 'react';
-import { Collapse, Descriptions } from '@douyinfe/semi-ui';
+import { Banner, Descriptions } from '@douyinfe/semi-ui';
 import { useSelector } from '../../services/state/store.js';
-import { MarkdownRender } from '@douyinfe/semi-ui';
 
 import './VersionBanner.less';
 
 export default function VersionBanner() {
   const versionUpdate = useSelector((state) => state.versionUpdate.versionUpdate);
   return (
-    <Collapse>
-      <Collapse.Panel header="A new version of Fredy is available" itemKey="1" className="versionBanner">
-        <div className="versionBanner__content">
+    <Banner
+      className="versionBanner"
+      type="success"
+      icon={null}
+      description={
+        <div>
           <p>A new version of Fredy is available. Update now to take advantage of the latest features and bug fixes.</p>
           <Descriptions row size="small">
             <Descriptions.Item itemKey="Your Version">{versionUpdate.localFredyVersion}</Descriptions.Item>
@@ -26,9 +28,16 @@ export default function VersionBanner() {
               <small>Release Notes</small>
             </b>
           </p>
-          <MarkdownRender raw={versionUpdate.body} />
+          <pre>{stripFullChangelog(versionUpdate.body)}</pre>
         </div>
-      </Collapse.Panel>
-    </Collapse>
+      }
+    />
   );
+
+  function stripFullChangelog(text) {
+    if (text == null) {
+      return '';
+    }
+    return text.replace(/(?:\r?\n)\*\*Full Changelog\*\*[\s\S]*$/u, '');
+  }
 }

ui/src/components/version/VersionBanner.less

@@ -1,7 +1,3 @@
 .versionBanner {
-  background: rgba(var(--semi-teal-1), 1);
-
-  &__content {
-    overflow: auto;
-  }
+  margin-bottom: 1rem;
 }

ui/src/hooks/screenWidth.js

@@ -1,23 +0,0 @@
-import { useState, useEffect } from 'react';
-
-export function useScreenWidth() {
-  const [width, setWidth] = useState(window.innerWidth);
-
-  useEffect(() => {
-    let timeoutId;
-
-    const handleResize = () => {
-      clearTimeout(timeoutId);
-      timeoutId = setTimeout(() => setWidth(window.innerWidth), 100);
-    };
-
-    window.addEventListener('resize', handleResize);
-
-    return () => {
-      clearTimeout(timeoutId);
-      window.removeEventListener('resize', handleResize);
-    };
-  }, []);
-
-  return width;
-}

ui/src/services/state/store.js

@@ -4,7 +4,6 @@
 import { create } from 'zustand';
 import { shallow } from 'zustand/shallow';
 import { xhrGet } from '../xhr.js';
-import queryString from 'query-string';
 
 const logger = (config) => (set, get, api) =>
   config(
@@ -131,35 +130,11 @@ export const useFredyState = create(
             }
           },
         },
-        listingsTable: {
-          async getListingsTable({ page = 1, pageSize = 20, filter = null, sortfield = null, sortdir = 'asc' }) {
-            try {
-              const qryString = queryString.stringify({
-                page,
-                pageSize,
-                filter,
-                sortfield,
-                sortdir,
-              });
-              const response = await xhrGet(`/api/listings/table?${qryString}`);
-              set((state) => ({
-                listingsTable: { ...state.listingsTable, ...response.json },
-              }));
-            } catch (Exception) {
-              console.error('Error while trying to get resource for api/listings. Error:', Exception);
-            }
-          },
-        },
       };
 
       // Initial state
       const initial = {
         notificationAdapter: [],
-        listingsTable: {
-          totalNumber: 0,
-          page: 1,
-          result: [],
-        },
         generalSettings: { settings: {} },
         demoMode: { demoMode: false },
         versionUpdate: {},
@@ -174,7 +149,6 @@ export const useFredyState = create(
         generalSettings: { ...effects.generalSettings },
         demoMode: { ...effects.demoMode },
         versionUpdate: { ...effects.versionUpdate },
-        listingsTable: { ...effects.listingsTable },
         provider: { ...effects.provider },
         jobs: { ...effects.jobs },
         user: { ...effects.user },

ui/src/views/generalSettings/GeneralSettings.jsx

@@ -4,6 +4,7 @@ import { useActions, useSelector } from '../../services/state/store';
 
 import { Divider, TimePicker, Button, Checkbox, Input } from '@douyinfe/semi-ui';
 import { InputNumber } from '@douyinfe/semi-ui';
+import Headline from '../../components/headline/Headline';
 import { xhrPost } from '../../services/xhr';
 import { SegmentPart } from '../../components/segment/SegmentPart';
 import { Banner, Toast } from '@douyinfe/semi-ui';
@@ -124,6 +125,7 @@ const GeneralSettings = function GeneralSettings() {
     <div>
       {!loading && (
         <React.Fragment>
+          <Headline text="General Settings" />
           <div>
             <SegmentPart
               name="Interval"
@@ -184,7 +186,7 @@ const GeneralSettings = function GeneralSettings() {
             <Divider margin="1rem" />
             <SegmentPart
               name="Working hours"
-              helpText="During these hours, Fredy will search for new apartments. If nothing is configured, Fredy will search around the clock."
+              helpText="During this hours, Fredy will search for new apartments. If nothing is configured, Fredy will search around the clock."
               Icon={IconCalendar}
             >
               <div className="generalSettings__timePickerContainer">

ui/src/views/jobs/Jobs.jsx

@@ -4,29 +4,21 @@ import JobTable from '../../components/table/JobTable';
 import { useSelector, useActions } from '../../services/state/store';
 import { xhrDelete, xhrPut } from '../../services/xhr';
 import { useNavigate } from 'react-router-dom';
+import ProcessingTimes from './ProcessingTimes';
 import { Button, Toast } from '@douyinfe/semi-ui';
 import { IconPlusCircle } from '@douyinfe/semi-icons';
 import './Jobs.less';
 
 export default function Jobs() {
   const jobs = useSelector((state) => state.jobs.jobs);
+  const processingTimes = useSelector((state) => state.jobs.processingTimes);
   const navigate = useNavigate();
   const actions = useActions();
 
   const onJobRemoval = async (jobId) => {
     try {
       await xhrDelete('/api/jobs', { jobId });
-      Toast.success('Job successfully removed');
-      await actions.jobs.getJobs();
-    } catch (error) {
-      Toast.error(error);
-    }
-  };
-
-  const onListingRemoval = async (jobId) => {
-    try {
-      await xhrDelete('/api/listings/job', { jobId });
-      Toast.success('Listings successfully removed');
+      Toast.success('Job successfully remove');
       await actions.jobs.getJobs();
     } catch (error) {
       Toast.error(error);
@@ -46,6 +38,7 @@ export default function Jobs() {
   return (
     <div>
       <div>
+        {processingTimes != null && <ProcessingTimes processingTimes={processingTimes} />}
         <Button
           type="primary"
           icon={<IconPlusCircle />}
@@ -59,7 +52,6 @@ export default function Jobs() {
       <JobTable
         jobs={jobs || []}
         onJobRemoval={onJobRemoval}
-        onListingRemoval={onListingRemoval}
         onJobStatusChanged={onJobStatusChanged}
         onJobInsight={(jobId) => navigate(`/jobs/insights/${jobId}`)}
         onJobEdit={(jobId) => navigate(`/jobs/edit/${jobId}`)}

ui/src/views/jobs/Jobs.less

@@ -1,8 +1,7 @@
 .jobs {
   &__newButton {
     margin-top: 1rem !important;
-    float: left;
+    float: right;
     margin-bottom: 1rem !important;
-    margin-left: 1rem;
   }
 }

ui/src/views/jobs/ProcessingTimes.jsx

@@ -1,56 +1,47 @@
 import React from 'react';
 import { format } from '../../services/time/timeService';
-import { Button, Card, Col, Row, Toast } from '@douyinfe/semi-ui';
+import { Button, Descriptions, Toast } from '@douyinfe/semi-ui';
 import { IconPlayCircle } from '@douyinfe/semi-icons';
 import { xhrPost } from '../../services/xhr.js';
 
-import './ProsessingTimes.less';
-
-function InfoCard({ title, value }) {
-  return (
-    <Card style={{ maxWidth: '13rem', margin: '1rem', background: 'rgb(53, 54, 60)' }} title={title}>
-      {value}
-    </Card>
-  );
-}
-
 export default function ProcessingTimes({ processingTimes = {} }) {
   if (Object.keys(processingTimes).length === 0) {
     return null;
   }
   return (
-    <Row>
-      <Col span={6}>
-        <InfoCard title="Processing Interval" value={`${processingTimes.interval} min`} />
-      </Col>
-      {processingTimes.lastRun && (
-        <>
-          <Col span={6}>
-            <InfoCard title="Last run" value={format(processingTimes.lastRun)} />
-          </Col>
-          <Col span={6}>
-            <InfoCard title="Next run" value={format(processingTimes.lastRun + processingTimes.interval * 60000)} />
-          </Col>
-        </>
-      )}
-      <Col span={6}>
-        <InfoCard
-          title="Find Listings Now"
-          value={
-            <Button
-              size="small"
-              icon={<IconPlayCircle />}
-              aria-label="Start now"
-              onClick={async () => {
-                await xhrPost('/api/jobs/startAll', null);
-                Toast.success('Successfully triggered Fredy search.');
-              }}
-            >
-              Search now
-            </Button>
-          }
-        />
-      </Col>
-    </Row>
+    <>
+      <Descriptions
+        row
+        size="small"
+        style={{
+          backgroundColor: '#35363c',
+          borderRadius: '4px',
+          padding: '10px',
+        }}
+      >
+        <Descriptions.Item itemKey="Processing Interval">{processingTimes.interval} min</Descriptions.Item>
+        {processingTimes.lastRun && (
+          <>
+            <Descriptions.Item itemKey="Last run">{format(processingTimes.lastRun)}</Descriptions.Item>
+            <Descriptions.Item itemKey="Next run">
+              {format(processingTimes.lastRun + processingTimes.interval * 60000)}
+            </Descriptions.Item>
+            <Descriptions.Item itemKey="Find Listings now">
+              <Button
+                size="small"
+                icon={<IconPlayCircle />}
+                aria-label="Start now"
+                onClick={async () => {
+                  await xhrPost('/api/jobs/startAll', null);
+                  Toast.success('Successfully triggered Fredy search.');
+                }}
+              >
+                Search now
+              </Button>
+            </Descriptions.Item>
+          </>
+        )}
+      </Descriptions>
+    </>
   );
 }

ui/src/views/jobs/ProsessingTimes.less

@@ -1,5 +0,0 @@
-.processingTimes {
-  display: flex;
-  gap: 1rem;
-  justify-content: space-between;
-}

ui/src/views/jobs/mutation/JobMutation.jsx

@@ -89,7 +89,7 @@ export default function JobMutator() {
         />
       )}
 
-      <Headline text={jobToBeEdit ? 'Edit Job' : 'Create new Job'} />
+      <Headline text={jobToBeEdit ? 'Edit a Job' : 'Create a new Job'} />
       <form>
         <SegmentPart name="Name">
           <Input

ui/src/views/listings/Listings.jsx

@@ -1,11 +0,0 @@
-import React from 'react';
-
-import ListingsTable from '../../components/table/ListingsTable.jsx';
-
-export default function Listings() {
-  return (
-    <div>
-      <ListingsTable />
-    </div>
-  );
-}

ui/src/views/user/Users.jsx

@@ -52,7 +52,7 @@ const Users = function Users() {
             icon={<IconPlus />}
             onClick={() => navigate('/users/new')}
           >
-            New User
+            Create new User
           </Button>
 
           <UserTable

ui/src/views/user/Users.less

@@ -1,8 +1,7 @@
 .users {
   &__newButton {
     margin-top: 1rem !important;
-    float: left;
+    float: right;
     margin-bottom: 1rem !important;
-    margin-left: 1rem;
   }
 }

yarn.lock

@@ -1428,10 +1428,10 @@
     "@resvg/resvg-js-win32-ia32-msvc" "2.4.1"
     "@resvg/resvg-js-win32-x64-msvc" "2.4.1"
 
-"@rolldown/pluginutils@1.0.0-beta.38":
-  version "1.0.0-beta.38"
-  resolved "https://registry.yarnpkg.com/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.38.tgz#95253608c4629eb2a5f3d656009ac9ba031eb292"
-  integrity sha512-N/ICGKleNhA5nc9XXQG/kkKHJ7S55u0x0XUJbbkmdCnFuoRkM1Il12q9q0eX19+M7KKUEPw/daUPIRnxhcxAIw==
+"@rolldown/pluginutils@1.0.0-beta.35":
+  version "1.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.35.tgz#1a477e7742b154b67519d40e4fc17485de338e7a"
+  integrity sha512-slYrCpoxJUqzFDDNlvrOYRazQUNRvWPjXA17dAOISY3rDMxX6k8K4cj2H+hEYMHF81HO3uNd5rHVigAWRM5dSg==
 
 "@rollup/rollup-android-arm-eabi@4.49.0":
   version "4.49.0"
@@ -1895,15 +1895,15 @@
     "@turf/invariant" "^6.5.0"
     eventemitter3 "^4.0.7"
 
-"@vitejs/plugin-react@5.0.4":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-5.0.4.tgz#d642058e89c5b712655c8cbd13482f5813519602"
-  integrity sha512-La0KD0vGkVkSk6K+piWDKRUyg8Rl5iAIKRMH0vMJI0Eg47bq1eOxmoObAaQG37WMW9MSyk7Cs8EIWwJC1PtzKA==
+"@vitejs/plugin-react@5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-5.0.3.tgz#182ea45406d89e55b4e35c92a4a8c2c8388726c8"
+  integrity sha512-PFVHhosKkofGH0Yzrw1BipSedTH68BFF8ZWy1kfUpCtJcouXXY0+racG8sExw7hw0HoX36813ga5o3LTWZ4FUg==
   dependencies:
     "@babel/core" "^7.28.4"
     "@babel/plugin-transform-react-jsx-self" "^7.27.1"
     "@babel/plugin-transform-react-jsx-source" "^7.27.1"
-    "@rolldown/pluginutils" "1.0.0-beta.38"
+    "@rolldown/pluginutils" "1.0.0-beta.35"
     "@types/babel__core" "^7.20.5"
     react-refresh "^0.17.0"
 
@@ -2197,10 +2197,10 @@ basic-ftp@^5.0.2:
   resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.0.5.tgz#14a474f5fffecca1f4f406f1c26b18f800225ac0"
   integrity sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==
 
-better-sqlite3@^12.4.1:
-  version "12.4.1"
-  resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-12.4.1.tgz#f78df6c80530d1a0b750b538033e6199b7d30d26"
-  integrity sha512-3yVdyZhklTiNrtg+4WqHpJpFDd+WHTg2oM7UcR80GqL05AOV0xEJzc6qNvFYoEtE+hRp1n9MpN6/+4yhlGkDXQ==
+better-sqlite3@^12.3.0:
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-12.3.0.tgz#999817506ed9d985604ae053b5e5fe3c8a052bb1"
+  integrity sha512-FFf+rsghyvXQIPV/6PDUj05EsuZA1b0drGLzNgtrELkXnJKUH6NNM2h7Ce7dkA6vvPOM4SOoUIDGRPy3yRKmqw==
   dependencies:
     bindings "^1.5.0"
     prebuild-install "^7.1.1"
@@ -2362,10 +2362,10 @@ ccount@^2.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
   integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
 
-chai@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-6.2.0.tgz#181bca6a219cddb99c3eeefb82483800ffa550ce"
-  integrity sha512-aUTnJc/JipRzJrNADXVvpVqi6CO0dn3nx4EVPxijri+fj3LUUDyZQOgVeW54Ob3Y1Xh9Iz8f+CgaCl8v0mn9bA==
+chai@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-6.0.1.tgz#88c2b4682fb56050647e222d2cf9d6772f2607b3"
+  integrity sha512-/JOoU2//6p5vCXh00FpNgtlw0LjvhGttaWc+y7wpW9yjBm3ys0dI8tSKZxIOgNruz5J0RleccatSIC3uxEZP0g==
 
 chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.2"
@@ -2451,10 +2451,10 @@ chownr@^1.1.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
-chromium-bidi@9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-9.1.0.tgz#356eaea018eecc7977644305ee9fd27874b2b676"
-  integrity sha512-rlUzQ4WzIAWdIbY/viPShhZU2n21CxDUgazXVbw4Hu1MwaeUSEksSeM6DqPgpRjCLXRk702AVRxJxoOz0dw4OA==
+chromium-bidi@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-8.0.0.tgz#d73c9beed40317adf2bcfeb9a47087003cd467ec"
+  integrity sha512-d1VmE0FD7lxZQHzcDUCKZSNRtRwISXDsdg4HjdTR5+Ll5nQ/vzU12JeNmupD6VWffrPSlrnGhEWlLESKH3VO+g==
   dependencies:
     mitt "^3.0.1"
     zod "^3.24.1"
@@ -2538,16 +2538,16 @@ comma-separated-tokens@^2.0.0:
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
   integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
 
+commander@14.0.1:
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.1.tgz#2f9225c19e6ebd0dc4404dd45821b2caa17ea09b"
+  integrity sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==
+
 commander@2:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^14.0.1:
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.1.tgz#2f9225c19e6ebd0dc4404dd45821b2caa17ea09b"
-  integrity sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==
-
 compute-scroll-into-view@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz#1768b5522d1172754f5d0c9b02de3af6be506a43"
@@ -2863,10 +2863,10 @@ devlop@^1.0.0, devlop@^1.1.0:
   dependencies:
     dequal "^2.0.0"
 
-devtools-protocol@0.0.1508733:
-  version "0.0.1508733"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1508733.tgz#047deb3531470efda2c7bf43c10b3ae9e4b3d51b"
-  integrity sha512-QJ1R5gtck6nDcdM+nlsaJXcelPEI7ZxSMw1ujHpO1c4+9l+Nue5qlebi9xO1Z2MGr92bFOQTW7/rrheh5hHxDg==
+devtools-protocol@0.0.1495869:
+  version "0.0.1495869"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1495869.tgz#f68daef77a48d5dcbcdd55dbfa3265a51989c91b"
+  integrity sha512-i+bkd9UYFis40RcnkW7XrOprCujXRAHg62IVh/Ah3G8MmNXpCGt1m0dTFhSdx/AVs8XEMbdOGRwdkR1Bcta8AA==
 
 diff@^7.0.0:
   version "7.0.0"
@@ -4274,11 +4274,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-path-inside@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
 is-plain-obj@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -4564,20 +4559,20 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-lint-staged@16.2.3:
-  version "16.2.3"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-16.2.3.tgz#790866221d75602510507b5be40b2c7963715960"
-  integrity sha512-1OnJEESB9zZqsp61XHH2fvpS1es3hRCxMplF/AJUDa8Ho8VrscYDIuxGrj3m8KPXbcWZ8fT9XTMUhEQmOVKpKw==
+lint-staged@16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-16.2.0.tgz#ea7157bf007bdb50d2bb0559bc91c8e77d71c84b"
+  integrity sha512-spdYSOCQ2MdZ9CM1/bu/kDmaYGsrpNOeu1InFFV8uhv14x6YIubGxbCpSmGILFoxkiheNQPDXSg5Sbb5ZuVnug==
   dependencies:
-    commander "^14.0.1"
-    listr2 "^9.0.4"
-    micromatch "^4.0.8"
-    nano-spawn "^1.0.3"
-    pidtree "^0.6.0"
-    string-argv "^0.3.2"
-    yaml "^2.8.1"
+    commander "14.0.1"
+    listr2 "9.0.4"
+    micromatch "4.0.8"
+    nano-spawn "1.0.3"
+    pidtree "0.6.0"
+    string-argv "0.3.2"
+    yaml "2.8.1"
 
-listr2@^9.0.4:
+listr2@9.0.4:
   version "9.0.4"
   resolved "https://registry.yarnpkg.com/listr2/-/listr2-9.0.4.tgz#2916e633ae6e09d1a3f981172937ac1c5a8fa64f"
   integrity sha512-1wd/kpAdKRLwv7/3OKC8zZ5U8e/fajCfWMxacUvB79S5nLrYGPtUI/8chMQhn3LQjsRVErTb9i1ECAwW0ZIHnQ==
@@ -5276,7 +5271,7 @@ micromark@^4.0.0:
     micromark-util-symbol "^2.0.0"
     micromark-util-types "^2.0.0"
 
-micromatch@^4.0.8:
+micromatch@4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -5375,10 +5370,10 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mocha@11.7.4:
-  version "11.7.4"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.4.tgz#f161b17aeccb0762484b33bdb3f7ab9410ba5c82"
-  integrity sha512-1jYAaY8x0kAZ0XszLWu14pzsf4KV740Gld4HXkhNTXwcHx4AUEDkPzgEHg9CM5dVcW+zv036tjpsEbLraPJj4w==
+mocha@11.7.2:
+  version "11.7.2"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.2.tgz#3c0079fe5cc2f8ea86d99124debcc42bb1ab22b5"
+  integrity sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==
   dependencies:
     browser-stdout "^1.3.1"
     chokidar "^4.0.1"
@@ -5388,7 +5383,6 @@ mocha@11.7.4:
     find-up "^5.0.0"
     glob "^10.4.5"
     he "^1.2.0"
-    is-path-inside "^3.0.3"
     js-yaml "^4.1.0"
     log-symbols "^4.1.0"
     minimatch "^9.0.5"
@@ -5407,15 +5401,15 @@ ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-nano-spawn@^1.0.3:
+nano-spawn@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/nano-spawn/-/nano-spawn-1.0.3.tgz#ef8d89a275eebc8657e67b95fc312a6527a05b8d"
   integrity sha512-jtpsQDetTnvS2Ts1fiRdci5rx0VYws5jGyC+4IYOTnIQ/wwdf6JdomlHBwqC3bJYOvaKu0C2GSZ1A60anrYpaA==
 
-nanoid@5.1.6:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.1.6.tgz#30363f664797e7d40429f6c16946d6bd7a3f26c9"
-  integrity sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==
+nanoid@5.1.5:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.1.5.tgz#f7597f9d9054eb4da9548cdd53ca70f1790e87de"
+  integrity sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==
 
 nanoid@^3.3.11:
   version "3.3.11"
@@ -5823,7 +5817,7 @@ picomatch@^4.0.3:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
   integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
 
-pidtree@^0.6.0:
+pidtree@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
   integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
@@ -5968,17 +5962,17 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-puppeteer-core@24.23.0:
-  version "24.23.0"
-  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-24.23.0.tgz#1f84abafa480358652ae8df340af984438173a14"
-  integrity sha512-yl25C59gb14sOdIiSnJ08XiPP+O2RjuyZmEG+RjYmCXO7au0jcLf7fRiyii96dXGUBW7Zwei/mVKfxMx/POeFw==
+puppeteer-core@24.22.0:
+  version "24.22.0"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-24.22.0.tgz#4d576b1a2b7699c088d3f0e843c32d81df82c3a6"
+  integrity sha512-oUeWlIg0pMz8YM5pu0uqakM+cCyYyXkHBxx9di9OUELu9X9+AYrNGGRLK9tNME3WfN3JGGqQIH3b4/E9LGek/w==
   dependencies:
     "@puppeteer/browsers" "2.10.10"
-    chromium-bidi "9.1.0"
+    chromium-bidi "8.0.0"
     debug "^4.4.3"
-    devtools-protocol "0.0.1508733"
+    devtools-protocol "0.0.1495869"
     typed-query-selector "^2.12.0"
-    webdriver-bidi-protocol "0.3.6"
+    webdriver-bidi-protocol "0.2.11"
     ws "^8.18.3"
 
 puppeteer-extra-plugin-stealth@^2.11.2:
@@ -6028,16 +6022,16 @@ puppeteer-extra@^3.3.6:
     debug "^4.1.1"
     deepmerge "^4.2.2"
 
-puppeteer@^24.23.0:
-  version "24.23.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-24.23.0.tgz#fa3c1bffc1b40c3d7a59b9463d444ff4be69f5c7"
-  integrity sha512-BVR1Lg8sJGKXY79JARdIssFWK2F6e1j+RyuJP66w4CUmpaXjENicmA3nNpUXA8lcTdDjAndtP+oNdni3T/qQqA==
+puppeteer@^24.22.0:
+  version "24.22.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-24.22.0.tgz#9f6905e9c3d5c316c364adb598903a1dfbfe800f"
+  integrity sha512-QabGIvu7F0hAMiKGHZCIRHMb6UoH0QAJA2OaqxEU2tL5noXPrxUcotg2l3ttOA4p1PFnVIGkr6PXRAWlM2evVQ==
   dependencies:
     "@puppeteer/browsers" "2.10.10"
-    chromium-bidi "9.1.0"
+    chromium-bidi "8.0.0"
     cosmiconfig "^9.0.0"
-    devtools-protocol "0.0.1508733"
-    puppeteer-core "24.23.0"
+    devtools-protocol "0.0.1495869"
+    puppeteer-core "24.22.0"
     typed-query-selector "^2.12.0"
 
 qs@^6.14.0:
@@ -6127,17 +6121,17 @@ react-resizable@^3.0.5:
     prop-types "15.x"
     react-draggable "^4.0.3"
 
-react-router-dom@7.9.3:
-  version "7.9.3"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.9.3.tgz#67ab1655f67b9b6108fe20ed3d4881b53dccf87a"
-  integrity sha512-1QSbA0TGGFKTAc/aWjpfW/zoEukYfU4dc1dLkT/vvf54JoGMkW+fNA+3oyo2gWVW1GM7BxjJVHz5GnPJv40rvg==
+react-router-dom@7.9.1:
+  version "7.9.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.9.1.tgz#48044923701773da6362f9003ec46f308f293f15"
+  integrity sha512-U9WBQssBE9B1vmRjo9qTM7YRzfZ3lUxESIZnsf4VjR/lXYz9MHjvOxHzr/aUm4efpktbVOrF09rL/y4VHa8RMw==
   dependencies:
-    react-router "7.9.3"
+    react-router "7.9.1"
 
-react-router@7.9.3:
-  version "7.9.3"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.9.3.tgz#f2d5ff6181851de3df3acb4e7364fce0dee5fba2"
-  integrity sha512-4o2iWCFIwhI/eYAIL43+cjORXYn/aRQPgtFRRZb3VzoyQ5Uej0Bmqj7437L97N9NJW4wnicSwLOLS+yCXfAPgg==
+react-router@7.9.1:
+  version "7.9.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.9.1.tgz#b227410c31f24dd416c939ca5d0f8d5c8a1404d4"
+  integrity sha512-pfAByjcTpX55mqSDGwGnY9vDCpxqBLASg0BMNAuMmpSGESo/TaOUG6BllhAtAkCGx8Rnohik/XtaqiYUJtgW2g==
   dependencies:
     cookie "^1.0.1"
     set-cookie-parser "^2.6.0"
@@ -6841,7 +6835,7 @@ streamx@^2.15.0, streamx@^2.21.0:
   optionalDependencies:
     bare-events "^2.2.0"
 
-string-argv@^0.3.2:
+string-argv@0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
   integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
@@ -7414,10 +7408,10 @@ vfile@^6.0.0:
     "@types/unist" "^3.0.0"
     vfile-message "^4.0.0"
 
-vite@7.1.9:
-  version "7.1.9"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-7.1.9.tgz#ba844410e5d0c0f2a4eaf17a52af60ebea322cbf"
-  integrity sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg==
+vite@7.1.7:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-7.1.7.tgz#ed3f9f06e21d6574fe1ad425f6b0912d027ffc13"
+  integrity sha512-VbA8ScMvAISJNJVbRDTJdCwqQoAareR/wutevKanhR2/1EkoXVZVkkORaYm/tNVCjP/UDTKtcw3bAkwOUdedmA==
   dependencies:
     esbuild "^0.25.0"
     fdir "^6.5.0"
@@ -7433,10 +7427,10 @@ web-streams-polyfill@^3.0.3:
   resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b"
   integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
 
-webdriver-bidi-protocol@0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.3.6.tgz#55ad4ff9697532e3e04fb0446bb6dd4c158b3ad5"
-  integrity sha512-mlGndEOA9yK9YAbvtxaPTqdi/kaCWYYfwrZvGzcmkr/3lWM+tQj53BxtpVd6qbC6+E5OnHXgCcAhre6AkXzxjA==
+webdriver-bidi-protocol@0.2.11:
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.2.11.tgz#dba18d9b0a33aed33fab272dbd6e42411ac753cc"
+  integrity sha512-Y9E1/oi4XMxcR8AT0ZC4OvYntl34SPgwjmELH+owjBr0korAX4jKgZULBWILGCVGdVCQ0dodTToIETozhG8zvA==
 
 whatwg-encoding@^3.1.1:
   version "3.1.1"
@@ -7589,7 +7583,7 @@ yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yaml@^2.8.1:
+yaml@2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.1.tgz#1870aa02b631f7e8328b93f8bc574fac5d6c4d79"
   integrity sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==