update fredy version

Demo Mode (#117 )
* Adding Demo Mode to Fredy
2026-06-16 12:31:07 +00:00 · 2024-11-22 09:11:43 +01:00 · 2024-11-22 09:11:10 +01:00 · 2024-11-20 22:23:05 +01:00 · 2024-11-20 22:22:16 +01:00 · 2024-11-20 08:19:16 +01:00
77 changed files with 6041 additions and 3580 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -44,3 +44,4 @@ jobs:
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64, linux/arm64
--- a/.github/workflows/stales.yml
+++ b/.github/workflows/stales.yml
@@ -0,0 +1,21 @@
+name: "Close stale issues and PRs"
+
+on:
+  schedule:
+    - cron: '0 0 * * *'  # Daily
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v7
+        with:
+          days-before-stale: 30
+          days-before-close: 7
+          stale-issue-message: "This issue has been automatically marked as stale due to inactivity."
+          stale-pr-message: "This PR has been automatically marked as stale due to inactivity."
+          close-issue-message: "Closing this issue due to prolonged inactivity."
+          close-pr-message: "Closing this PR due to prolonged inactivity."
+          exempt-issue-labels: "keep-open"
+          exempt-pr-labels: "keep-open"
+          only: "pulls"
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
      - name: Setup node
        uses: actions/setup-node@v2.5.1
        with:
-          node-version: 16
+          node-version: 20
          cache: 'yarn'
      - run: yarn install
      - run: yarn run test
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -0,0 +1 @@
+npx lint-staged
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +0,0 @@
-sudo: false
-language: node_js
--- a/22
+++ b/22
@@ -1,18 +1,20 @@
-# syntax=docker/dockerfile:1.3
-FROM node:16-alpine AS builder
-COPY --chown=1000:1000 . /fredy
+FROM node:20
+
 WORKDIR  /fredy
-USER 1000
+
+COPY . /fredy
+
 RUN yarn install
+
+RUN yarn global add pm2
+
 RUN yarn run prod

-FROM node:16-alpine
-COPY --from=builder --chown=1000:1000 /fredy /fredy
 RUN mkdir /db /conf && \
  chown 1000:1000 /db /conf && \
+  chmod 777 -R /db/ && \
  ln -s /db /fredy/db && ln -s /conf /fredy/conf
+
 EXPOSE 9998
-USER 1000
-VOLUME [ "/conf", "/db" ]
-WORKDIR  /fredy
-CMD node index.js --no-daemon
+
+CMD pm2-runtime index.js
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2021 Christian Kellner
+Copyright (c) 2024 Christian Kellner

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ _Fredy_ is supported by JetBrains under Open Source Support Program

 ## Usage  

- Make sure to use Node.js 16 or above
+- Make sure to use Node.js 20 or above
 - Run the following commands:
 ```ssh
 yarn (or npm install)
@@ -33,9 +33,6 @@ _Fredy_ will start with the default port, set to `9998`. You can access _Fredy_
 &nbsp; &nbsp; &nbsp; &nbsp;  
  <img alt="Job Overview" width="30%" src="https://github.com/orangecoding/fredy/blob/master/doc/screenshot_3.png">
 </p>
-<p align="center">
-
-</p>

 ## Understanding the fundamentals
 There are 3 important parts in Fredy, that you need to understand to leverage the full power of _Fredy_.
@@ -81,17 +78,20 @@ yarn run test
 # Architecture
 ![Architecture](/doc/architecture.jpg "Architecture")

-### Immoscout
-I have added **experimental** support for Immoscout. Immoscout is somewhat special, because they have decided to secure their service from bots using Re-Capture. Finding a way around this is barely possible. For _Fredy_ to be able to bypass this check, I'm using a service called [ScrapingAnt](https://scrapingant.com/). The trick is to use a headless browser, rotating proxies and (once successfully validated) to re-send the cookies each time.
+### Immoscout / Immonet / NeubauKompass
+I have added **experimental** support for Immoscout, Immonet and NeubauKompass. They all are somewhat special, because they have decided to secure their service from bots using Re-Capture. Finding a way around this is barely possible. For _Fredy_ to be able to bypass this check, I'm using a service called [ScrapingAnt](https://scrapingant.com/). The trick is to use a headless browser, rotating proxies and (once successfully validated) to re-send the cookies each time.

-To be able to use Immoscout, you need to create an account at ScrapingAnt. Configure the API key in the "General Settings" tab (visible when logged in as administrator).
+To be able to use Immoscout / Immonet, you need to create an account at ScrapingAnt. Configure the API key in the "General Settings" tab (visible when logged in as administrator).
 The rest will be handled by _Fredy_. Keep in mind, the support is experimental. There might be bugs and you might not always pass the re-capture check, but most of the time it works rather well :)

 If you need more than the 1000 API calls allowed per month, I'd suggest opting for a paid account... ScrapingAnt loves OpenSource, therefore they have decided to give all _Fredy_ users a 10% discount by using the code **FREDY10** (Disclaimer: I do not earn any money for recommending their service).

-### Contribution guidelines  
-
-See [Contributing](https://github.com/orangecoding/fredy/blob/master/CONTRIBUTING.md)
+# Analytics
+Fredy is completely free (and will always remain free). However, it would be a huge help if you’d allow me to collect some analytical data. 
+Before you freak out, let me explain...         
+If you agree, Fredy will send a ping to my Mixpanel project each time it runs.   
+The data includes: names of active adapters/providers, OS, architecture, Node version, and language. The information is entirely anonymous and helps me understand which adapters/providers are most frequently used.</p>
+**Thanks**🤘

 # Docker   
 Use the Dockerfile in this repository to build an image.  
@@ -112,6 +112,15 @@ Put your config.json into a path of your choice, such as `/path/to/your/conf/`.

 Example: `docker create --name fredy -v /path/to/your/conf/:/conf -p 9998:9998 fredy/fredy`

+### 👐 Contributing
+Thanks to all the people who already contributed!
+
+<a href="https://github.com/orangecoding/fredy/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=orangecoding/fredy" />
+</a>
+
+See [Contributing](https://github.com/orangecoding/fredy/blob/master/CONTRIBUTING.md)
+
 ## Logs  

 You can browse the logs with  `docker logs fredy -f`.
--- a/conf/config.json
+++ b/conf/config.json
@@ -1 +1 @@
-{"interval":"60","port":9998,"scrapingAnt":{"apiKey":"","proxy":"datacenter"},"workingHours":{"from":"","to":""}}
+{"interval":"60","port":9998,"scrapingAnt":{"apiKey":"d","proxy":"datacenter"},"workingHours":{"from":"","to":""},"demoMode":false,"analyticsEnabled":null}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: '3.8'
 services:
  fredy:
    container_name: fredy
@@ -13,3 +13,4 @@ services:
      - ./db:/db
    ports:
        - 9998:9998
+    restart: unless-stopped
--- a/index.js
+++ b/index.js
@@ -1,11 +1,14 @@
 import fs from 'fs';
-import { config } from './lib/utils.js';
+import {config} from './lib/utils.js';
 import * as similarityCache from './lib/services/similarity-check/similarityCache.js';
 import { setLastJobExecution } from './lib/services/storage/listingsStorage.js';
 import * as jobStorage from './lib/services/storage/jobStorage.js';
 import FredyRuntime from './lib/FredyRuntime.js';
 import { duringWorkingHoursOrNotSet } from './lib/utils.js';
 import './lib/api/api.js';
+import {track} from './lib/services/tracking/Tracker.js';
+import {handleDemoUser} from './lib/services/storage/userStorage.js';
+import {cleanupDemoAtMidnight} from './lib/services/demoCleanup.js';
 //if db folder does not exist, ensure to create it before loading anything else
 if (!fs.existsSync('./db')) {
  fs.mkdirSync('./db');
@@ -16,34 +19,43 @@ const provider = fs.readdirSync(path).filter((file) => file.endsWith('.js'));
 const INTERVAL = config.interval * 60 * 1000;
 /* eslint-disable no-console */
 console.log(`Started Fredy successfully. Ui can be accessed via http://localhost:${config.port}`);
+if(config.demoMode){
+    console.info('Running in demo mode');
+    cleanupDemoAtMidnight();
+}
 /* eslint-enable no-console */
 const fetchedProvider = await Promise.all(
  provider.filter((provider) => provider.endsWith('.js')).map(async (pro) => import(`${path}/${pro}`))
 );

+handleDemoUser();
+
 setInterval(
  (function exec() {
    const isDuringWorkingHoursOrNotSet = duringWorkingHoursOrNotSet(config, Date.now());
-    if (isDuringWorkingHoursOrNotSet) {
-      config.lastRun = Date.now();
-      jobStorage
-        .getJobs()
-        .filter((job) => job.enabled)
-        .forEach((job) => {
-          job.provider
-            .filter((p) => fetchedProvider.find((fp) => fp.metaInformation.id === p.id) != null)
-            .forEach(async (prov) => {
-              const pro = fetchedProvider.find((fp) => fp.metaInformation.id === prov.id);
-              pro.init(prov, job.blacklist);
-              await new FredyRuntime(pro.config, job.notificationAdapter, prov.id, job.id, similarityCache).execute();
-              setLastJobExecution(job.id);
-            });
-        });
-    } else {
-      /* eslint-disable no-console */
-      console.debug('Working hours set. Skipping as outside of working hours.');
-      /* eslint-enable no-console */
-    }
+        if(!config.demoMode) {
+            if (isDuringWorkingHoursOrNotSet) {
+                track();
+                config.lastRun = Date.now();
+                jobStorage
+                    .getJobs()
+                    .filter((job) => job.enabled)
+                    .forEach((job) => {
+                        job.provider
+                            .filter((p) => fetchedProvider.find((fp) => fp.metaInformation.id === p.id) != null)
+                            .forEach(async (prov) => {
+                                const pro = fetchedProvider.find((fp) => fp.metaInformation.id === prov.id);
+                                pro.init(prov, job.blacklist);
+                                await new FredyRuntime(pro.config, job.notificationAdapter, prov.id, job.id, similarityCache).execute();
+                                setLastJobExecution(job.id);
+                            });
+                    });
+            } else {
+                /* eslint-disable no-console */
+                console.debug('Working hours set. Skipping as outside of working hours.');
+                /* eslint-enable no-console */
+            }
+        }
    return exec;
  })(),
  INTERVAL
--- a/lib/FredyRuntime.js
+++ b/lib/FredyRuntime.js
@@ -45,15 +45,15 @@ class FredyRuntime {
  _getListings(url) {
    return new Promise((resolve, reject) => {
      const id = this._providerId;
-      if (scrapingAnt.isImmoscout(id) && !scrapingAnt.isScrapingAntApiKeySet()) {
-        const error = 'Immoscout can only be used with if you have set an apikey for scrapingAnt.';
+      if (scrapingAnt.needScrapingAnt(id) && !scrapingAnt.isScrapingAntApiKeySet()) {
+        const error = 'Immoscout or Immonet can only be used with if you have set an apikey for scrapingAnt.';
        /* eslint-disable no-console */
        console.log(error);
        /* eslint-enable no-console */
        reject(error);
        return;
      }
-      const u = scrapingAnt.isImmoscout(id) ? scrapingAnt.transformUrlForScrapingAnt(url, id) : url;
+      const u = scrapingAnt.needScrapingAnt(id) ? scrapingAnt.transformUrlForScrapingAnt(url, id) : url;
      try {
        if (this._providerConfig.paginate != null) {
          xray(u, this._providerConfig.crawlContainer, [this._providerConfig.crawlFields])
@@ -87,7 +87,10 @@ class FredyRuntime {
    return listings.map(this._providerConfig.normalize);
  }
  _filter(listings) {
-    return listings.filter(this._providerConfig.filter);
+    //only return those where all the fields have been found
+    const keys = Object.keys(this._providerConfig.crawlFields);
+    const filteredListings = listings.filter((item) => keys.every((key) => key in item));
+    return filteredListings.filter(this._providerConfig.filter);
  }
  _findNew(listings) {
    const newListings = listings.filter((o) => getKnownListings(this._jobKey, this._providerId)[o.id] == null);
--- a/lib/api/api.js
+++ b/lib/api/api.js
@@ -12,8 +12,9 @@ import restana from 'restana';
 import files from 'serve-static';
 import path from 'path';
 import { getDirName } from '../utils.js';
+import {demoRouter} from './routes/demoRouter.js';
 const service = restana();
-const staticService = files(path.join(getDirName(), '../../ui/public'));
+const staticService = files(path.join(getDirName(), '../ui/public'));
 const PORT = config.port || 9998;

 service.use(bodyParser.json());
@@ -30,6 +31,9 @@ service.use('/api/jobs/insights', analyticsRouter);
 service.use('/api/admin/users', userRouter);
 service.use('/api/jobs', jobRouter);
 service.use('/api/login', loginRouter);
+//this route is unsecured intentionally as it is being queried from the login page
+service.use('/api/demo', demoRouter);
+
 /* eslint-disable no-console */
 service.start(PORT).then(() => {
  console.info(`Started API service on port ${PORT}`);
--- a/lib/api/routes/demoRouter.js
+++ b/lib/api/routes/demoRouter.js
@@ -0,0 +1,11 @@
+import restana from 'restana';
+import {config} from '../../utils.js';
+const service = restana();
+const demoRouter = service.newRouter();
+
+demoRouter.get('/', async (req, res) => {
+  res.body = Object.assign({}, {demoMode: config.demoMode});
+  res.send();
+});
+
+export { demoRouter };
--- a/lib/api/routes/generalSettingsRoute.js
+++ b/lib/api/routes/generalSettingsRoute.js
@@ -1,6 +1,7 @@
 import restana from 'restana';
-import { config, getDirName } from '../../utils.js';
+import {config, getDirName, readConfigFromStorage, refreshConfig} from '../../utils.js';
 import fs from 'fs';
+import {handleDemoUser} from '../../services/storage/userStorage.js';
 const service = restana();
 const generalSettingsRouter = service.newRouter();
 generalSettingsRouter.get('/', async (req, res) => {
@@ -10,7 +11,14 @@ generalSettingsRouter.get('/', async (req, res) => {
 generalSettingsRouter.post('/', async (req, res) => {
  const settings = req.body;
  try {
-    fs.writeFileSync(`${getDirName()}/../conf/config.json`, JSON.stringify(settings));
+    if(config.demoMode){
+      res.send(new Error('In demo mode, it is not allowed to change these settings.'));
+      return;
+    }
+    const currentConfig = await readConfigFromStorage();
+    fs.writeFileSync(`${getDirName()}/../conf/config.json`, JSON.stringify({...currentConfig, ...settings}));
+    await refreshConfig();
+    handleDemoUser();
  } catch (err) {
    console.error(err);
    res.send(new Error('Error while trying to write settings.'));
--- a/lib/api/routes/jobRouter.js
+++ b/lib/api/routes/jobRouter.js
@@ -5,6 +5,8 @@ import * as userStorage from '../../services/storage/userStorage.js';
 import * as immoscoutProvider from '../../provider/immoscout.js';
 import { config } from '../../utils.js';
 import { isAdmin } from '../security.js';
+import {isScrapingAntApiKeySet} from '../../services/scrapingAnt.js';
+import {trackDemoJobCreated} from '../../services/tracking/Tracker.js';
 const service = restana();
 const jobRouter = service.newRouter();
 function doesJobBelongsToUser(job, req) {
@@ -25,10 +27,10 @@ jobRouter.get('/', async (req, res) => {
  res.send();
 });
 jobRouter.get('/processingTimes', async (req, res) => {
-  let scrapingAntData = null;
-  if (config.scrapingAnt.apiKey != null && config.scrapingAnt.apiKey.length > 0) {
+  let scrapingAntData = {};
+  if (isScrapingAntApiKeySet()) {
    try {
-      const response = await fetch(`https://api.scrapingant.com/v1/usage?x-api-key=${config.scrapingAnt.apiKey}`);
+      const response = await fetch(`https://api.scrapingant.com/v2/usage?x-api-key=${config.scrapingAnt.apiKey}`);
      scrapingAntData = await response.json();
    } catch (Exception) {
      console.error('Could not query plan data from scraping ant.', Exception);
@@ -38,6 +40,7 @@ jobRouter.get('/processingTimes', async (req, res) => {
    interval: config.interval,
    lastRun: config.lastRun || null,
    scrapingAntData,
+    error: scrapingAntData?.detail == null ? null : scrapingAntData?.detail
  };
  res.send();
 });
@@ -66,6 +69,11 @@ jobRouter.post('/', async (req, res) => {
    res.send(new Error(error));
    console.error(error);
  }
+  trackDemoJobCreated({
+    name,
+    provider,
+    adapter: notificationAdapter
+  });
  res.send();
 });
 jobRouter.delete('', async (req, res) => {
--- a/lib/api/routes/loginRoute.js
+++ b/lib/api/routes/loginRoute.js
@@ -1,6 +1,8 @@
 import restana from 'restana';
 import * as userStorage from '../../services/storage/userStorage.js';
 import * as hasher from '../../services/security/hash.js';
+import {config} from '../../utils.js';
+import {trackDemoAccessed} from '../../services/tracking/Tracker.js';
 const service = restana();
 const loginRouter = service.newRouter();
 loginRouter.get('/user', async (req, res) => {
@@ -24,6 +26,11 @@ loginRouter.post('/', async (req, res) => {
    return;
  }
  if (user.password === hasher.hash(password)) {
+
+    if(config.demoMode){
+      trackDemoAccessed();
+    }
+
    req.session.currentUser = user.id;
    userStorage.setLastLoginToNow({ userId: user.id });
    res.send(200);
--- a/lib/api/routes/userRoute.js
+++ b/lib/api/routes/userRoute.js
@@ -1,6 +1,7 @@
 import restana from 'restana';
 import * as userStorage from '../../services/storage/userStorage.js';
 import * as jobStorage from '../../services/storage/jobStorage.js';
+import {config} from '../../utils.js';
 const service = restana();
 const userRouter = service.newRouter();
 function checkIfAnyAdminAfterRemovingUser(userIdToBeRemoved, allUser) {
@@ -20,6 +21,11 @@ userRouter.get('/:userId', async (req, res) => {
  res.send();
 });
 userRouter.delete('/', async (req, res) => {
+  if(config.demoMode){
+    res.send(new Error('In demo mode, it is not allowed to remove user.'));
+    return;
+  }
+
  const { userId } = req.body;
  const allUser = userStorage.getUsers(false);
  if (!checkIfAnyAdminAfterRemovingUser(userId, allUser)) {
@@ -36,6 +42,12 @@ userRouter.delete('/', async (req, res) => {
  res.send();
 });
 userRouter.post('/', async (req, res) => {
+
+  if(config.demoMode){
+      res.send(new Error('In demo mode, it is not allowed to change or add user.'));
+      return;
+  }
+
  const { username, password, password2, isAdmin, userId } = req.body;
  if (password !== password2) {
    res.send(new Error('Passwords does not match'));
--- a/lib/defaultConfig.js
+++ b/lib/defaultConfig.js
@@ -0,0 +1,8 @@
+export const DEFAULT_CONFIG = {
+            'interval': '60',
+            'port': 9998,
+            'scrapingAnt': {'apiKey': '', 'proxy': 'datacenter'},
+            'workingHours': {'from': '', 'to': ''},
+            'demoMode': false,
+            'analyticsEnabled': null
+    };
--- a/lib/notification/adapter/apprise.js
+++ b/lib/notification/adapter/apprise.js
@@ -0,0 +1,36 @@
+import { markdown2Html } from '../../services/markdown.js';
+import { getJob } from '../../services/storage/jobStorage.js';
+import fetch from 'node-fetch';
+
+export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
+  const { server } = notificationConfig.find((adapter) => adapter.id === config.id).fields;
+  const job = getJob(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}\nink: ${newListing.link}`;
+    return fetch(server, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        body: message,
+        title: title,
+      }),
+    });
+  });
+
+  return Promise.all(promises);
+};
+export const config = {
+  id: 'apprise',
+  name: 'Apprise',
+  readme: markdown2Html('lib/notification/adapter/apprise.md'),
+  description: 'Fredy will send new listings to your Apprise instance.',
+  fields: {
+    server: {
+      type: 'text',
+      label: 'Server',
+      description: 'The server URL to send the notification to.',
+    },
+  },
+};
--- a/lib/notification/adapter/apprise.md
+++ b/lib/notification/adapter/apprise.md
@@ -0,0 +1,3 @@
+### Apprise Adapter
+
+Refer to the [instructions](https://github.com/caronc/apprise-api#installation) on how to set up an Apprise instance and how to configure your preferred notification service.
--- a/lib/notification/adapter/mailJet.js
+++ b/lib/notification/adapter/mailJet.js
@@ -9,7 +9,7 @@ const template = fs.readFileSync(path.resolve(__dirname + '/notification/emailTe
 const emailTemplate = Handlebars.compile(template);
 export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
  const { apiPublicKey, apiPrivateKey, receiver, from } = notificationConfig.find(
-    (adapter) => adapter.id === 'mailJet'
+    (adapter) => adapter.id === config.id,
  ).fields;
  const to = receiver
    .trim()
@@ -18,7 +18,7 @@ export const send = ({ serviceName, newListings, notificationConfig, jobKey }) =
      Email: r.trim(),
    }));
  return mailjet
-    .connect(apiPublicKey, apiPrivateKey)
+    .apiConnect(apiPublicKey, apiPrivateKey)
    .post('send', { version: 'v3.1' })
    .request({
      Messages: [
--- a/lib/notification/adapter/mattermost.js
+++ b/lib/notification/adapter/mattermost.js
@@ -2,13 +2,13 @@ import { markdown2Html } from '../../services/markdown.js';
 import { getJob } from '../../services/storage/jobStorage.js';
 import fetch from 'node-fetch';
 export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
-  const { webhook, channel } = notificationConfig.find((adapter) => adapter.id === 'mattermost').fields;
+  const { webhook, channel } = notificationConfig.find((adapter) => adapter.id === config.id).fields;
  const job = getJob(jobKey);
  const jobName = job == null ? jobKey : job.name;
  let message = `### *${jobName}* (${serviceName}) found **${newListings.length}** new listings:\n\n`;
  message += `| Title | Address | Size | Price |\n|:----|:----|:----|:----|\n`;
  message += newListings.map(
-    (o) => `| [${o.title}](${o.link}) | ` + [o.address, o.size.replace(/2m/g, '$m^2$'), o.price].join(' | ') + ' |\n'
+    (o) => `| [${o.title}](${o.link}) | ` + [o.address, o.size.replace(/2m/g, '$m^2$'), o.price].join(' | ') + ' |\n',
  );
  return fetch(webhook, {
    method: 'POST',
--- a/lib/notification/adapter/ntfy.js
+++ b/lib/notification/adapter/ntfy.js
@@ -0,0 +1,51 @@
+import { markdown2Html } from '../../services/markdown.js';
+import { getJob } from '../../services/storage/jobStorage.js';
+import fetch from 'node-fetch';
+
+export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
+  const { priority, server, topic } = notificationConfig.find((adapter) => adapter.id === config.id).fields;
+  const job = getJob(jobKey);
+  const jobName = job == null ? jobKey : job.name;
+  const promises = newListings.map((newListing) => {
+    const message = `Address: ${newListing.address} Size: ${newListing.size.replace(/2m/g, '$m^2$')} Price: ${
+      newListing.price
+    }`;
+    return fetch(server, {
+      method: 'POST',
+      body: JSON.stringify({
+        topic: topic,
+        message: message,
+        title: newListing.title,
+        tags: [serviceName, jobName],
+        priority: parseInt(priority),
+        click: newListing.link,
+      }),
+    });
+  });
+
+  return Promise.all(promises);
+};
+export const config = {
+  id: 'ntfy',
+  name: 'ntfy',
+  readme: markdown2Html('lib/notification/adapter/ntfy.md'),
+  description: 'Fredy will send new listings to your ntfy.',
+  fields: {
+    priority: {
+      type: 'number',
+      label: 'Priority',
+      description: 'The priority of the send notification.',
+    },
+    server: {
+      type: 'text',
+      label: 'Server-URL',
+      description: 'The server url to the send the notification to.',
+    },
+    topic: {
+      type: 'text',
+      label: 'topic',
+      description:
+        'The topic where fredy should send notifications to. The topic is a secret, only known to you, make sure it is something not generic.',
+    },
+  },
+};
--- a/lib/notification/adapter/ntfy.md
+++ b/lib/notification/adapter/ntfy.md
@@ -0,0 +1,5 @@
+### ntfy Adapter
+
+For ntfy, you need to create a topic on your preferred ntfy instance. This is pretty easy. Please visit the steps in the  [docs](https://docs.ntfy.sh/publish/) and follow the instructions.
+
+As a result, you get the URL for configuration in fredy. In addition, the priority must be defined.
--- a/lib/notification/adapter/pushover.js
+++ b/lib/notification/adapter/pushover.js
@@ -0,0 +1,50 @@
+import { markdown2Html } from '../../services/markdown.js';
+import { getJob } from '../../services/storage/jobStorage.js';
+import fetch from 'node-fetch';
+
+export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
+  const { token, user, device } = notificationConfig.find((adapter) => adapter.id === config.id).fields;
+  const job = getJob(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}`;
+    return fetch('https://api.pushover.net/1/messages.json', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        token: token,
+        user: user,
+        message: message,
+        device: device,
+        title: title,
+      }),
+    });
+  });
+
+  return Promise.all(promises);
+};
+
+export const config = {
+  id: 'pushover',
+  name: 'Pushover',
+  readme: markdown2Html('lib/notification/adapter/pushover.md'),
+  description: 'Fredy will send new listings to your mobile using Pushover.',
+  fields: {
+    token: {
+      type: 'text',
+      label: 'API token',
+      description: 'Your application\'s API token.',
+    },
+    user: {
+      type: 'text',
+      label: 'User key',
+      description: 'Your user/group key.',
+    },
+    device: {
+      type: 'text',
+      label: 'Device name',
+      description: 'The device name to send your notification to. Messages may be addressed to multiple specific devices by joining them with a comma.',
+    },
+  },
+};
--- a/lib/notification/adapter/pushover.md
+++ b/lib/notification/adapter/pushover.md
@@ -0,0 +1,5 @@
+### Pushover Adapter
+
+Refer to the [instructions](https://support.pushover.net/i7-what-is-pushover-and-how-do-i-use-it) to set up your Pushover application.
+
+After setting up the application, please enter both your newly created User key and API token.
--- a/lib/notification/adapter/sendGrid.js
+++ b/lib/notification/adapter/sendGrid.js
@@ -1,7 +1,7 @@
 import sgMail from '@sendgrid/mail';
 import { markdown2Html } from '../../services/markdown.js';
 export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
-  const { apiKey, receiver, from, templateId } = notificationConfig.find((adapter) => adapter.id === 'sendGrid').fields;
+  const { apiKey, receiver, from, templateId } = notificationConfig.find((adapter) => adapter.id === config.id).fields;
  sgMail.setApiKey(apiKey);
  const msg = {
    templateId,
--- a/lib/notification/adapter/slack.js
+++ b/lib/notification/adapter/slack.js
@@ -2,7 +2,7 @@ import Slack from 'slack';
 import { markdown2Html } from '../../services/markdown.js';
 const msg = Slack.chat.postMessage;
 export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
-  const { token, channel } = notificationConfig.find((adapter) => adapter.id === 'slack').fields;
+  const { token, channel } = notificationConfig.find((adapter) => adapter.id === config.id).fields;
  return newListings.map((payload) =>
    msg({
      token,
@@ -35,7 +35,7 @@ export const send = ({ serviceName, newListings, notificationConfig, jobKey }) =
          ts: new Date().getTime() / 1000,
        },
      ],
-    })
+    }),
  );
 };
 export const config = {
--- a/lib/notification/adapter/sqlite.md
+++ b/lib/notification/adapter/sqlite.md
@@ -1,3 +1,7 @@
 ### Sqlite Adapter
+This adapter stores search results in a sqlite database located in db/listings.db. This file can be used for further analysis later on.   

-This adapter stores search results in an sqlite database in db/listings.db
+Fields are:
+```
+['serviceName', 'jobKey', 'id', 'size', 'rooms', 'price', 'address', 'title', 'link', 'description']
+```
--- a/lib/notification/adapter/telegram.js
+++ b/lib/notification/adapter/telegram.js
@@ -19,7 +19,7 @@ function shorten(str, len = 30) {
  return str.length > len ? str.substring(0, len) + '...' : str;
 }
 export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
-  const { token, chatId } = notificationConfig.find((adapter) => adapter.id === 'telegram').fields;
+  const { token, chatId } = notificationConfig.find((adapter) => adapter.id === config.id).fields;
  const job = getJob(jobKey);
  const jobName = job == null ? jobKey : job.name;
  //we have to split messages into chunk, because otherwise messages are going to become too big and will fail
@@ -30,7 +30,7 @@ export const send = ({ serviceName, newListings, notificationConfig, jobKey }) =
      (o) =>
        `<a href='${o.link}'><b>${shorten(o.title.replace(/\*/g, ''), 45).trim()}</b></a>\n` +
        [o.address, o.price, o.size].join(' | ') +
-        '\n\n'
+        '\n\n',
    );
    /**
     * This is to not break the rate limit. It is to only send 1 message per second
--- a/lib/provider/einsAImmobilien.js
+++ b/lib/provider/einsAImmobilien.js
@@ -1,18 +1,40 @@
-import utils from '../utils.js';
+import utils, { buildHash } from '../utils.js';
 let appliedBlackList = [];
+
 function normalize(o) {
  let size = `${o.size.replace(' Wohnfläche ', '').trim()}`;
  if (o.rooms != null) {
    size += ` / / ${o.rooms.trim()}`;
  }
  const link = `https://www.1a-immobilienmarkt.de/expose/${o.id}.html`;
-  return Object.assign(o, { size, link });
+  const price = normalizePrice(o.price);
+  const id = buildHash(o.id, price);
+  return Object.assign(o, { id, price, size, link });
+}
+
+/**
+ * einsAImmobilien sometimes use a weird pricing label such as `775.700,00 EUR Kaufpreis ab 2.475 € mtl`.
+ * Make sure to extract only the actual price out of the string.
+ * @param price
+ * @returns {*}
+ */
+function normalizePrice(price) {
+  if (price == null) {
+    return null;
+  }
+  const regex = /(\d{1,3}(?:\.\d{3})*,\d{2})\s?(EUR|€)/g;
+  const result = price.match(regex);
+  if (result == null || result.length === 0) {
+    return price;
+  }
+  return result[0];
 }
 function applyBlacklist(o) {
  const titleNotBlacklisted = !utils.isOneOf(o.title, appliedBlackList);
  const descNotBlacklisted = !utils.isOneOf(o.description, appliedBlackList);
  return titleNotBlacklisted && descNotBlacklisted;
 }
+
 const config = {
  url: null,
  crawlContainer: '.tabelle',
@@ -23,7 +45,6 @@ const config = {
    size: '.tabelle .inner_object_data .data_boxes div:nth-child(1)',
    rooms: '.tabelle .inner_object_data .data_boxes div:nth-child(2)',
    title: '.tabelle .inner_object_data .tabelle_inhalt_titel_black | removeNewline | trim',
-    description: '.tabelle .inner_object_data .objekt_beschreibung | removeNewline | trim',
  },
  normalize: normalize,
  filter: applyBlacklist,
--- a/lib/provider/immobilienDe.js
+++ b/lib/provider/immobilienDe.js
@@ -1,4 +1,4 @@
-import utils from '../utils.js';
+import utils, {buildHash} from '../utils.js';
 let appliedBlackList = [];
 function shortenLink(link) {
  return link.substring(0, link.indexOf('?'));
@@ -7,12 +7,12 @@ function parseId(shortenedLink) {
  return shortenedLink.substring(shortenedLink.lastIndexOf('/') + 1);
 }
 function normalize(o) {
-  const id = parseId(shortenLink(o.link));
  const size = o.size || 'N/A m²';
  const price = o.price || 'N/A €';
  const title = o.title || 'No title available';
  const address = o.address || 'No address available';
  const link = shortenLink(o.link);
+  const id = buildHash(parseId(shortenLink(o.link)), o.price);
  return Object.assign(o, { id, price, size, title, address, link });
 }
 function applyBlacklist(o) {
--- a/lib/provider/immonet.js
+++ b/lib/provider/immonet.js
@@ -1,14 +1,12 @@
-import utils from '../utils.js';
+import utils, {buildHash} from '../utils.js';
 let appliedBlackList = [];
 function normalize(o) {
-  const id = parseInt(o.id.substring(o.id.indexOf('_') + 1, o.id.length));
  const size = o.size != null ? o.size.replace('Wohnfläche ', '') : 'N/A m²';
  const price = o.price.replace('Kaufpreis ', '');
  const address = o.address.split(' • ')[o.address.split(' • ').length - 1];
  const title = o.title || 'No title available';
-  //normally we would just read the link from the source, but immonet decided to trick user by adding a click listener instead of
-  //a href to do some weird reporting. (Very user friendly for handicaped ppl... not)
-  const link = `https://www.immonet.de/angebot/${id}`;
+  const link = o.id;
+  const id = buildHash(o.id.substring(o.id.lastIndexOf('/') + 1, o.id.length), price);
  return Object.assign(o, { id, address, price, size, title, link });
 }
 function applyBlacklist(o) {
@@ -18,14 +16,14 @@ function applyBlacklist(o) {
 }
 const config = {
  url: null,
-  crawlContainer: '#result-list-stage .item',
+  crawlContainer: '.content-wrapper-tiles .ng-star-inserted',
  sortByDateParam: 'sortby=19',
  crawlFields: {
-    id: '@id',
-    price: 'div[id*="selPrice_"] | trim',
-    size: 'div[id*="selArea_"] | trim',
-    title: '.item a img@title',
-    address: '.item .box-25 .ellipsis .text-100 | removeNewline | trim',
+    id: '.card a@href',
+    title: '.card h3 |trim',
+    price: '.card .has-font-300 .is-bold | trim',
+    size: '.card .has-font-300 .ml-100 | trim',
+    address: '.card span:nth-child(2) | trim',
  },
  paginate: '#idResultList .margin-bottom-6.margin-bottom-sm-12 .panel a.pull-right@href',
  normalize: normalize,
--- a/lib/provider/immoscout.js
+++ b/lib/provider/immoscout.js
@@ -1,4 +1,4 @@
-import utils from '../utils.js';
+import utils, {buildHash} from '../utils.js';
 let appliedBlackList = [];
 function nullOrEmpty(val) {
  return val == null || val.length === 0;
@@ -6,8 +6,9 @@ function nullOrEmpty(val) {
 function normalize(o) {
  const title = nullOrEmpty(o.title) ? 'NO TITLE FOUND' : o.title.replace('NEU', '');
  const address = nullOrEmpty(o.address) ? 'NO ADDRESS FOUND' : (o.address || '').replace(/\(.*\),.*$/, '').trim();
-  const link = `https://www.immobilienscout24.de${o.link.substring(o.link.indexOf('/expose'))}`;
-  return Object.assign(o, { title, address, link });
+  const link = nullOrEmpty(o.link) ? 'NO LINK' : `https://www.immobilienscout24.de${o.link.substring(o.link.indexOf('/expose'))}`;
+  const id = buildHash(o.id, o.price);
+  return Object.assign(o, { id, title, address, link });
 }
 function applyBlacklist(o) {
  return !utils.isOneOf(o.title, appliedBlackList);
@@ -20,7 +21,7 @@ const config = {
    id: '.result-list-entry@data-obid | int',
    price: '.result-list-entry .result-list-entry__criteria .grid-item:first-child dd | removeNewline | trim',
    size: '.result-list-entry .result-list-entry__criteria .grid-item:nth-child(2) dd | removeNewline | trim',
-    title: '.result-list-entry .result-list-entry__brand-title-container h5 | removeNewline | trim',
+    title: '.result-list-entry .result-list-entry__brand-title-container h2 | removeNewline | trim',
    link: '.result-list-entry .result-list-entry__brand-title-container@href',
    address: '.result-list-entry .result-list-entry__map-link',
  },
--- a/lib/provider/immoswp.js
+++ b/lib/provider/immoswp.js
@@ -1,44 +1,48 @@
-import utils from '../utils.js';
+import utils, {buildHash} from '../utils.js';
+
 let appliedBlackList = [];
+
 function normalize(o) {
-  const id = o.id.substring(o.id.indexOf('-') + 1, o.id.length);
-  const size = o.size || 'N/A m²';
-  const price = (o.price || '--- €').replace('Preis auf Anfrage', '--- €');
-  const address = o.address || 'No address available';
-  const title = o.title || 'No title available';
-  const link = `https://immo.swp.de/immobilien/${id}`;
-  const description = o.description;
-  return Object.assign(o, { id, address, price, size, title, link, description });
+    const size = o.size || 'N/A m²';
+    const price = (o.price || '--- €').replace('Preis auf Anfrage', '--- €');
+    const title = o.title || 'No title available';
+    const immoId = o.id.substring(o.id.indexOf('-') + 1, o.id.length);
+    const link = `https://immo.swp.de/immobilien/${immoId}`;
+    const description = o.description;
+    const id = buildHash(immoId, price);
+    return Object.assign(o, {id, price, size, title, link, description});
 }
+
 function applyBlacklist(o) {
-  const titleNotBlacklisted = !utils.isOneOf(o.title, appliedBlackList);
-  const descNotBlacklisted = !utils.isOneOf(o.description, appliedBlackList);
-  return titleNotBlacklisted && descNotBlacklisted;
+    const titleNotBlacklisted = !utils.isOneOf(o.title, appliedBlackList);
+    const descNotBlacklisted = !utils.isOneOf(o.description, appliedBlackList);
+    return titleNotBlacklisted && descNotBlacklisted;
 }
+
 const config = {
-  url: null,
-  crawlContainer: '.js-serp-item',
-  sortByDateParam: 's=most_recently_updated_first',
-  crawlFields: {
-    id: '@id',
-    price: 'div.item__spec.item-spec-price | trim',
-    size: 'div.item__spec.item-spec-area | trim',
-    title: 'a.js-item-title-link@title',
-    address: 'div.item__locality | removeNewline | trim',
-    description: 'div.item__main-info-points.clearfix p small | removeNewline | trim',
-  },
-  paginate: 'li.page-item.pagination__item a.page-link@href',
-  normalize: normalize,
-  filter: applyBlacklist,
+    url: null,
+    crawlContainer: '.js-serp-item',
+    sortByDateParam: 's=most_recently_updated_first',
+    crawlFields: {
+        id: '.js-bookmark-btn@data-id',
+        price: 'div.align-items-start div:first-child | trim',
+        size: 'div.align-items-start div:nth-child(3) | trim',
+        title: '.card-title h2 | trim',
+        link: '.ci-search-result__link@href',
+        description: '.js-show-more-item-sm | removeNewline | trim',
+    },
+    paginate: 'li.page-item.pagination__item a.page-link@href',
+    normalize: normalize,
+    filter: applyBlacklist,
 };
 export const init = (sourceConfig, blacklist) => {
-  config.enabled = sourceConfig.enabled;
-  config.url = sourceConfig.url;
-  appliedBlackList = blacklist || [];
+    config.enabled = sourceConfig.enabled;
+    config.url = sourceConfig.url;
+    appliedBlackList = blacklist || [];
 };
 export const metaInformation = {
-  name: 'Immo Südwest Presse',
-  baseUrl: 'https://immo.swp.de/',
-  id: 'immoswp',
+    name: 'Immo Südwest Presse',
+    baseUrl: 'https://immo.swp.de/',
+    id: 'immoswp',
 };
-export { config };
+export {config};
--- a/lib/provider/immowelt.js
+++ b/lib/provider/immowelt.js
@@ -1,24 +1,30 @@
-import utils from '../utils.js';
+import utils, { buildHash } from '../utils.js';
+
 let appliedBlackList = [];
+
 function normalize(o) {
-  return o;
+  const id = buildHash(o.id, o.price);
+  return Object.assign(o, { id });
 }
+
 function applyBlacklist(o) {
  const titleNotBlacklisted = !utils.isOneOf(o.title, appliedBlackList);
  const descNotBlacklisted = !utils.isOneOf(o.description, appliedBlackList);
  return titleNotBlacklisted && descNotBlacklisted;
 }
+
 const config = {
  url: null,
-  crawlContainer: "div[class^='EstateItem-']",
-  sortByDateParam: 'sd=DESC&sf=TIMESTAMP',
+  crawlContainer:
+    'div[data-testid="serp-card-testid"]:not(div[data-testid="serp-enlargementlist-testid"] div[data-testid="serp-card-testid"])',
+  sortByDateParam: 'order=DateDesc',
  crawlFields: {
    id: 'a@id',
-    price: "div[class^='KeyFacts-'] [data-test='price'] | removeNewline | trim",
-    size: "div[class^='KeyFacts-'] [data-test='area'] | removeNewline | trim",
-    title: "div[class^='FactsMain-'] h2",
+    price: 'div[data-testid="cardmfe-price-testid"] | removeNewline | trim',
+    size: 'div[data-testid="cardmfe-keyfacts-testid"] | removeNewline | trim',
+    title: '.css-1cbj9xw',
    link: 'a@href',
-    address: "div[class^='estateFacts-'] span | removeNewline | trim",
+    address: 'div[data-testid="cardmfe-description-box-address"] | removeNewline | trim',
  },
  paginate: '#pnlPaging #nlbPlus@href',
  normalize: normalize,
--- a/lib/provider/kleinanzeigen.js
+++ b/lib/provider/kleinanzeigen.js
@@ -1,44 +1,49 @@
-import utils from '../utils.js';
+import utils, {buildHash} from '../utils.js';
+
 let appliedBlackList = [];
 let appliedBlacklistedDistricts = [];
+
 function normalize(o) {
-  const size = o.size || '--- m²';
-  return Object.assign(o, { size });
+    const size = o.size || '--- m²';
+    const id = buildHash(o.id, o.price);
+    return Object.assign(o, {id, size});
 }
+
 function applyBlacklist(o) {
-  const titleNotBlacklisted = !utils.isOneOf(o.title, appliedBlackList);
-  const descNotBlacklisted = !utils.isOneOf(o.description, appliedBlackList);
-  const isBlacklistedDistrict =
-    appliedBlacklistedDistricts.length === 0 ? false : utils.isOneOf(o.description, appliedBlacklistedDistricts);
-  return !isBlacklistedDistrict && titleNotBlacklisted && descNotBlacklisted;
+    const titleNotBlacklisted = !utils.isOneOf(o.title, appliedBlackList);
+    const descNotBlacklisted = !utils.isOneOf(o.description, appliedBlackList);
+    const isBlacklistedDistrict =
+        appliedBlacklistedDistricts.length === 0 ? false : utils.isOneOf(o.description, appliedBlacklistedDistricts);
+    return !isBlacklistedDistrict && titleNotBlacklisted && descNotBlacklisted;
 }
+
 const config = {
-  url: null,
-  crawlContainer: '#srchrslt-adtable .ad-listitem ',
-  //sort by date is standard oO
-  sortByDateParam: null,
-  crawlFields: {
-    id: '.aditem@data-adid | int',
-    price: '.aditem-main--middle--price | removeNewline | trim',
-    size: '.aditem-main .text-module-end span:nth-child(2) | removeNewline | trim',
-    title: '.aditem-main .text-module-begin a | removeNewline | trim',
-    link: '.aditem-main .text-module-begin a@href | removeNewline | trim',
-    description: '.aditem-main p:not(.text-module-end) | removeNewline | trim',
-    address: '.aditem-main--top--left | trim | removeNewline',
-  },
-  paginate: '#srchrslt-pagination .pagination-next@href',
-  normalize: normalize,
-  filter: applyBlacklist,
+    url: null,
+    crawlContainer: '#srchrslt-adtable .ad-listitem ',
+    //sort by date is standard oO
+    sortByDateParam: null,
+    crawlFields: {
+        id: '.aditem@data-adid | int',
+        price: '.aditem-main--middle--price-shipping--price | removeNewline | trim',
+        size: '.aditem-main .text-module-end span:nth-child(2) | removeNewline | trim',
+        title: '.aditem-main .text-module-begin a | removeNewline | trim',
+        link: '.aditem-main .text-module-begin a@href | removeNewline | trim',
+        description: '.aditem-main p:not(.text-module-end) | removeNewline | trim',
+        address: '.aditem-main--top--left | trim | removeNewline',
+    },
+    paginate: '#srchrslt-pagination .pagination-next@href',
+    normalize: normalize,
+    filter: applyBlacklist,
 };
 export const metaInformation = {
-  name: 'Ebay Kleinanzeigen',
-  baseUrl: 'https://www.ebay-kleinanzeigen.de/',
-  id: 'kleinanzeigen',
+    name: 'Ebay Kleinanzeigen',
+    baseUrl: 'https://www.kleinanzeigen.de/',
+    id: 'kleinanzeigen',
 };
 export const init = (sourceConfig, blacklist, blacklistedDistricts) => {
-  config.enabled = sourceConfig.enabled;
-  config.url = sourceConfig.url;
-  appliedBlacklistedDistricts = blacklistedDistricts || [];
-  appliedBlackList = blacklist || [];
+    config.enabled = sourceConfig.enabled;
+    config.url = sourceConfig.url;
+    appliedBlacklistedDistricts = blacklistedDistricts || [];
+    appliedBlackList = blacklist || [];
 };
-export { config };
+export {config};
--- a/lib/provider/neubauKompass.js
+++ b/lib/provider/neubauKompass.js
@@ -1,34 +1,44 @@
-import utils from '../utils.js';
+import utils, {buildHash} from '../utils.js';
+
 let appliedBlackList = [];
+
+function nullOrEmpty(val) {
+    return val == null || val.length === 0;
+}
+
 function normalize(o) {
-  return o;
+    const link = nullOrEmpty(o.link) ? 'NO LINK' : `https://www.neubaukompass.de${o.link.substring(o.link.indexOf('/neubau'))}`;
+    const id = buildHash(o.id, o.price);
+    return Object.assign(o, {id, link});
 }
+
 function applyBlacklist(o) {
-  return !utils.isOneOf(o.title, appliedBlackList);
+    return !utils.isOneOf(o.title, appliedBlackList);
 }
+
 const config = {
-  url: null,
-  crawlContainer: '.nbk-container >div article',
-  sortByDateParam: 'Sortierung=Id&Richtung=DESC',
-  crawlFields: {
-    id: '@id',
-    title: 'a.nbk-truncate@title | removeNewline | trim',
-    link: 'a.nbk-truncate@href',
-    address: 'p.nbk-truncate | removeNewline | trim',
-    price: 'p.nbk-mb-0 | removeNewline | trim',
-  },
-  paginate: '.numbered-pager__bottom .numbered-pager--info li:nth-child(2) a@href',
-  normalize: normalize,
-  filter: applyBlacklist,
+    url: null,
+    crawlContainer: '.nbk-container >div article',
+    sortByDateParam: 'Sortierung=Id&Richtung=DESC',
+    crawlFields: {
+        id: '@id',
+        title: 'a.nbk-truncate@title | removeNewline | trim',
+        link: 'a.nbk-truncate@href',
+        address: 'p.nbk-truncate | removeNewline | trim',
+        price: 'p.nbk-mb-0 | removeNewline | trim',
+    },
+    paginate: '.numbered-pager__bottom .numbered-pager--info li:nth-child(2) a@href',
+    normalize: normalize,
+    filter: applyBlacklist,
 };
 export const init = (sourceConfig, blacklist) => {
-  config.enabled = sourceConfig.enabled;
-  config.url = sourceConfig.url;
-  appliedBlackList = blacklist || [];
+    config.enabled = sourceConfig.enabled;
+    config.url = sourceConfig.url;
+    appliedBlackList = blacklist || [];
 };
 export const metaInformation = {
-  name: 'Neubau Kompass',
-  baseUrl: 'https://www.neubaukompass.de/',
-  id: 'neubauKompass',
+    name: 'Neubau Kompass',
+    baseUrl: 'https://www.neubaukompass.de/',
+    id: 'neubauKompass',
 };
-export { config };
+export {config};
--- a/lib/provider/wgGesucht.js
+++ b/lib/provider/wgGesucht.js
@@ -1,36 +1,41 @@
-import utils from '../utils.js';
+import utils, {buildHash} from '../utils.js';
+
 let appliedBlackList = [];
+
 function normalize(o) {
-  return o;
+    const id = buildHash(o.id, o.price);
+    return Object.assign(o, {id});
 }
+
 function applyBlacklist(o) {
-  const titleNotBlacklisted = !utils.isOneOf(o.title, appliedBlackList);
-  const descNotBlacklisted = !utils.isOneOf(o.description, appliedBlackList);
-  return o.id != null && titleNotBlacklisted && descNotBlacklisted;
+    const titleNotBlacklisted = !utils.isOneOf(o.title, appliedBlackList);
+    const descNotBlacklisted = !utils.isOneOf(o.description, appliedBlackList);
+    return o.id != null && titleNotBlacklisted && descNotBlacklisted;
 }
+
 const config = {
-  url: null,
-  crawlContainer: '#main_column .wgg_card',
-  sortByDateParam: 'sort_column=0&sort_order=0',
-  crawlFields: {
-    id: '@data-id',
-    details: '.row .noprint .col-xs-11 |removeNewline |trim',
-    price: '.middle .col-xs-3 |removeNewline |trim',
-    size: '.middle .text-right |removeNewline |trim',
-    title: '.truncate_title a |removeNewline |trim',
-    link: '.truncate_title a@href',
-  },
-  normalize: normalize,
-  filter: applyBlacklist,
+    url: null,
+    crawlContainer: '#main_column .wgg_card',
+    sortByDateParam: 'sort_column=0&sort_order=0',
+    crawlFields: {
+        id: '@data-id',
+        details: '.row .noprint .col-xs-11 |removeNewline |trim',
+        price: '.middle .col-xs-3 |removeNewline |trim',
+        size: '.middle .text-right |removeNewline |trim',
+        title: '.truncate_title a |removeNewline |trim',
+        link: '.truncate_title a@href',
+    },
+    normalize: normalize,
+    filter: applyBlacklist,
 };
 export const init = (sourceConfig, blacklist) => {
-  config.enabled = sourceConfig.enabled;
-  config.url = sourceConfig.url;
-  appliedBlackList = blacklist || [];
+    config.enabled = sourceConfig.enabled;
+    config.url = sourceConfig.url;
+    appliedBlackList = blacklist || [];
 };
 export const metaInformation = {
-  name: 'Wg gesucht',
-  baseUrl: 'https://www.wg-gesucht.de/',
-  id: 'wgGesucht',
+    name: 'Wg gesucht',
+    baseUrl: 'https://www.wg-gesucht.de/',
+    id: 'wgGesucht',
 };
-export { config };
+export {config};
--- a/lib/services/demoCleanup.js
+++ b/lib/services/demoCleanup.js
@@ -0,0 +1,29 @@
+import { setInterval } from 'node:timers';
+import {removeJobsByUserName} from './storage/jobStorage.js';
+import {config} from '../utils.js';
+
+/**
+ * if we are running in demo environment, we have to cleanup the db files (specifically the jobs table)
+ */
+export function cleanupDemoAtMidnight() {
+    const now = new Date();
+    const millisUntilMidnightUTC = (24 - now.getUTCHours()) * 60 * 60 * 1000
+        - now.getUTCMinutes() * 60 * 1000
+        - now.getUTCSeconds() * 1000
+        - now.getUTCMilliseconds();
+
+    setTimeout(() => {
+        cleanup();
+
+        setInterval(() => {
+            cleanup();
+        }, 24 * 60 * 60 * 1000);
+
+    }, millisUntilMidnightUTC);
+}
+
+function cleanup(){
+    if(config.demoMode){
+        removeJobsByUserName('demo');
+    }
+}
--- a/lib/services/requestDriver.js
+++ b/lib/services/requestDriver.js
@@ -1,11 +1,16 @@
 import fetch from 'node-fetch';
 import { config } from '../utils.js';
 import { makeUrlResidential } from './scrapingAnt.js';
+import https from 'https';
 //if ScrapingAnt got blocked, this http status is returned
 const BLOCKED_HTTP_STATUS = 423;
 const NOT_FOUND_HTTP_STATUS = 404;
 const MAX_RETRIES_SCRAPING_ANT = 10;
 const EXPECTED_STATUS_CODES = [BLOCKED_HTTP_STATUS, NOT_FOUND_HTTP_STATUS];
+const agent = new https.Agent({
+  rejectUnauthorized: false,
+});
+
 function makeDriver(headers = {}) {
  let cookies = '';
  async function scrapingAntDriver(context, callback, retryCounter = 0) {
@@ -19,13 +24,16 @@ function makeDriver(headers = {}) {
        },
      });
      const result = await response.text();
+      if (EXPECTED_STATUS_CODES.includes(response.status)) {
+        throw new Error(`${response.status}`);
+      }
      if (cookies.length === 0) {
        cookies = response.headers.raw()['set-cookie'] || [];
      }
      callback(null, result);
    } catch (exception) {
      /* eslint-disable no-console */
-      if (!EXPECTED_STATUS_CODES.includes(exception.response?.status)) {
+      if (!EXPECTED_STATUS_CODES.includes(exception.response?.status) && !EXPECTED_STATUS_CODES.includes(Number(exception.message))) {
        console.error(`Error while trying to scrape data from scraping ant. Received error: ${exception.message}`);
        callback(null, []);
        return;
@@ -41,9 +49,10 @@ function makeDriver(headers = {}) {
      /* eslint-enable no-console */
    }
  }
+
  /**
   * The regular request driver is taking care of everyting, that doesn't need to be scraped by ScrapingAnt (which is
-   * everything != Immoscout as of writing this)
+   * everything != Immoscout & Immonet as of writing this)
   */
  return async function driver(context, callback) {
    if (context.url.toLowerCase().indexOf('scrapingant') !== -1) {
@@ -55,6 +64,7 @@ function makeDriver(headers = {}) {
          ...headers,
          Cookie: cookies,
        },
+        agent,
      });
      const result = await response.text();
      callback(null, result);
--- a/lib/services/scrapingAnt.js
+++ b/lib/services/scrapingAnt.js
@@ -1,19 +1,30 @@
-import { metaInformation } from '../provider/immoscout.js';
+import { metaInformation as immoScoutInfo } from '../provider/immoscout.js';
+import { metaInformation as immoNetInfo } from '../provider/immonet.js';
+import { metaInformation as neuBauCompassInfo } from '../provider/neubauKompass.js';
 import { config } from '../utils.js';
-const isImmoscout = (id) => {
-  return id.toLowerCase() === metaInformation.id;
+
+const additionalImmonetUrlParams = `&wait_for_selector=.content-wrapper-tiles&js_snippet=${Buffer.from(
+  'window.scrollTo(0,document.body.scrollHeight);'
+).toString('base64')}`;
+
+const needScrapingAnt = (id) => {
+  return id.toLowerCase() === immoScoutInfo.id || id.toLowerCase() === immoNetInfo.id || id.toLowerCase() === neuBauCompassInfo.id.toLowerCase();
 };
 export const transformUrlForScrapingAnt = (url, id) => {
-  if (isImmoscout(id)) {
-    //only do calls to scrapingAnt when dealing with Immoscout
-    url = `https://api.scrapingant.com/v1/general?url=${encodeURIComponent(url)}&proxy_type=datacenter`;
+  let urlParams = '';
+  if (needScrapingAnt(id)) {
+    if (id.toLowerCase() === immoNetInfo.id) {
+      urlParams = additionalImmonetUrlParams;
+    }
+    //only do calls to scrapingAnt when dealing with Immoscout/Immonet
+    url = `https://api.scrapingant.com/v2/general?url=${encodeURIComponent(url)}&proxy_type=datacenter${urlParams}`;
  }
  return url;
 };
 export const isScrapingAntApiKeySet = () => {
-  return config.scrapingAnt != null && config.scrapingAnt.apiKey != null && config.scrapingAnt.apiKey.length > 0;
+  return config.scrapingAnt != null && config.scrapingAnt.apiKey != null && config.scrapingAnt.apiKey.length > 8;
 };
 export const makeUrlResidential = (url) => {
  return url.replace('datacenter', 'residential');
 };
-export { isImmoscout };
+export { needScrapingAnt };
--- a/lib/services/storage/LowDashAdapter.js
+++ b/lib/services/storage/LowDashAdapter.js
@@ -1,8 +1,8 @@
 import lodash from 'lodash';
 import { LowSync } from 'lowdb';
 export default class LowdashAdapter extends LowSync {
-  constructor(adapter) {
-    super(adapter);
+  constructor(adapter, defaultData = {}) {
+    super(adapter, defaultData);
    this.chain = lodash.chain(this).get('data');
  }
 }
--- a/lib/services/storage/jobStorage.js
+++ b/lib/services/storage/jobStorage.js
@@ -7,11 +7,10 @@ import LowdashAdapter from './LowDashAdapter.js';

 const file = path.join(getDirName(), '../', 'db/jobs.json');
 const adapter = new JSONFileSync(file);
-const db = new LowdashAdapter(adapter);
+const db = new LowdashAdapter(adapter, { jobs: [] });

 db.read();

-db.data ||= { jobs: [] };

 export const upsertJob = ({ jobId, name, blacklist = [], enabled = true, provider, notificationAdapter, userId }) => {
  const currentJob =
@@ -78,6 +77,17 @@ export const removeJobsByUserId = (userId) => {
    .value();
  db.write();
 };
+export const removeJobsByUserName = (userName) => {
+  db.chain
+      .get('jobs')
+      .filter((job) => job.username === userName)
+      .forEach((job) => listingStorage.removeListings(job.id));
+  db.chain
+      .get('jobs')
+      .remove((job) => job.username === userName)
+      .value();
+  db.write();
+};
 export const getJobs = () => {
  return db.chain
    .get('jobs')
--- a/lib/services/storage/listingsStorage.js
+++ b/lib/services/storage/listingsStorage.js
@@ -5,12 +5,10 @@ import LowdashAdapter from './LowDashAdapter.js';

 const file = path.join(getDirName(), '../', 'db/jobListingData.json');
 const adapter = new JSONFileSync(file);
-const db = new LowdashAdapter(adapter);
+const db = new LowdashAdapter(adapter, {});

 db.read();

-db.data ||= {};
-
 const buildKey = (jobKey, providerId, endpoint) => {
  let key = `${jobKey}`;
  if (jobKey == null && endpoint == null) {
--- a/lib/services/storage/userStorage.js
+++ b/lib/services/storage/userStorage.js
@@ -1,29 +1,36 @@
 import { JSONFileSync } from 'lowdb/node';
-import { getDirName } from '../../utils.js';
+import {config, getDirName} from '../../utils.js';
 import * as hasher from '../security/hash.js';
 import { nanoid } from 'nanoid';
 import * as jobStorage from './jobStorage.js';
 import path from 'path';
 import LowdashAdapter from './LowDashAdapter.js';

+const defaultData = {
+    user: [
+        //you probably want to change the default password ;)
+        {
+            id: nanoid(),
+            lastLogin: Date.now(),
+            username: 'admin',
+            password: hasher.hash('admin'),
+            isAdmin: true,
+        },
+        {
+            id: nanoid(),
+            lastLogin: Date.now(),
+            username: 'demo',
+            password: hasher.hash('demo'),
+            isAdmin: true,
+        },
+    ],
+};
+
 const file = path.join(getDirName(), '../', 'db/users.json');
 const adapter = new JSONFileSync(file);
-const db = new LowdashAdapter(adapter);
+const db = new LowdashAdapter(adapter, defaultData);

 db.read();
-db.data ||= {
-  user: [
-    //you probably want to change the default password ;)
-    {
-      id: nanoid(),
-      lastLogin: Date.now(),
-      username: 'admin',
-      password: hasher.hash('admin'),
-      isAdmin: true,
-      isDemo: false,
-    },
-  ],
-};

 export const getUsers = (withPassword) => {
  const jobs = jobStorage.getJobs();
@@ -84,3 +91,29 @@ export const removeUser = (userId) => {
    .value();
  db.write();
 };
+
+export const handleDemoUser = () => {
+    if(!config.demoMode){
+        const user = db.chain.get('user').value();
+        db.chain.get('user').value();
+        db.chain.set('user', user.filter((u) => u.username !== 'demo')).value();
+        db.write();
+    }else {
+        const demoUser = db.chain
+            .get('user')
+            .filter((u) => u.username === 'demo')
+            .value();
+        if (demoUser == null || demoUser.length === 0) {
+            db.chain.get('user')
+                .value()
+                .push({
+                    id: nanoid(),
+                    username: 'demo',
+                    password: hasher.hash('demo'),
+                    isAdmin: true,
+                });
+            db.write();
+        }
+    }
+};
+
--- a/lib/services/tracking/Tracker.js
+++ b/lib/services/tracking/Tracker.js
@@ -0,0 +1,68 @@
+import Mixpanel from 'mixpanel';
+import {getJobs} from '../storage/jobStorage.js';
+
+import {config, inDevMode} from '../../utils.js';
+
+const mixpanelTracker = Mixpanel.init('718670ef1c58c0208256c1e408a3d75e');
+
+export const track = function () {
+    //only send tracking information if the user allowed to do so.
+    if (config.analyticsEnabled && !inDevMode()) {
+
+        const activeProvider = new Set();
+        const activeAdapter = new Set();
+
+        const jobs = getJobs();
+
+        if (jobs != null && jobs.length > 0) {
+            jobs.forEach(job => {
+                job.provider.forEach(provider => {
+                    activeProvider.add(provider.id);
+                });
+                job.notificationAdapter.forEach(adapter => {
+                    activeAdapter.add(adapter.id);
+                });
+            });
+
+            mixpanelTracker.track('fredy_tracking', enrichTrackingObject({
+                adapter: Array.from(activeAdapter),
+                provider: Array.from(activeProvider),
+            }));
+        }
+    }
+};
+
+/**
+ * Note, this will only be used when Fredy runs in demo mode
+ */
+export function trackDemoJobCreated(jobData) {
+    if (config.analyticsEnabled && !inDevMode() && config.demoMode) {
+        mixpanelTracker.track('demoJobCreated', enrichTrackingObject(jobData));
+    }
+}
+
+/**
+ * Note, this will only be used when Fredy runs in demo mode
+ */
+export function trackDemoAccessed() {
+    if (config.analyticsEnabled && !inDevMode() && config.demoMode) {
+        mixpanelTracker.track('demoAccessed', enrichTrackingObject({}));
+    }
+}
+
+
+function enrichTrackingObject(trackingObject) {
+    const platform = process.platform;
+    const arch = process.arch;
+    const language = process.env.LANG || 'en';
+    const nodeVersion = process.version || 'N/A';
+
+    return {
+        ...trackingObject,
+        isDemo: config.demoMode,
+        platform,
+        arch,
+        nodeVersion,
+        language
+    };
+}
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,51 +1,91 @@
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { readFile } from 'fs/promises';
+import {dirname} from 'node:path';
+import {fileURLToPath} from 'node:url';
+import {readFile} from 'fs/promises';
+import {createHash} from 'crypto';
+import {DEFAULT_CONFIG} from './defaultConfig.js';
+
+function inDevMode(){
+    return process.env.NODE_ENV == null || process.env.NODE_ENV !== 'production';
+}

 function isOneOf(word, arr) {
-  if (arr == null || arr.length === 0) {
-    return false;
-  }
-  const expression = String.raw`\b(${arr.join('|')})\b`;
-  const blacklist = new RegExp(expression, 'ig');
-  return blacklist.test(word);
+    if (arr == null || arr.length === 0) {
+        return false;
+    }
+    const expression = String.raw`\b(${arr.join('|')})\b`;
+    const blacklist = new RegExp(expression, 'ig');
+    return blacklist.test(word);
 }
+
 function nullOrEmpty(val) {
-  return val == null || val.length === 0;
+    return val == null || val.length === 0;
 }
+
 function timeStringToMs(timeString, now) {
-  const d = new Date(now);
-  const parts = timeString.split(':');
-  d.setHours(parts[0]);
-  d.setMinutes(parts[1]);
-  d.setSeconds(0);
-  return d.getTime();
+    const d = new Date(now);
+    const parts = timeString.split(':');
+    d.setHours(parts[0]);
+    d.setMinutes(parts[1]);
+    d.setSeconds(0);
+    return d.getTime();
 }
+
 function duringWorkingHoursOrNotSet(config, now) {
-  const { workingHours } = config;
-  if (workingHours == null || nullOrEmpty(workingHours.from) || nullOrEmpty(workingHours.to)) {
-    return true;
-  }
-  const toDate = timeStringToMs(workingHours.to, now);
-  const fromDate = timeStringToMs(workingHours.from, now);
-  return fromDate <= now && toDate >= now;
+    const {workingHours} = config;
+    if (workingHours == null || nullOrEmpty(workingHours.from) || nullOrEmpty(workingHours.to)) {
+        return true;
+    }
+    const toDate = timeStringToMs(workingHours.to, now);
+    const fromDate = timeStringToMs(workingHours.from, now);
+    return fromDate <= now && toDate >= now;
 }

 function getDirName() {
-  return dirname(fileURLToPath(import.meta.url));
+    return dirname(fileURLToPath(import.meta.url));
 }

-const config = JSON.parse(await readFile(new URL('../conf/config.json', import.meta.url)));
+function buildHash(...inputs) {
+    if (inputs == null) {
+        return null;
+    }
+    const cleaned = inputs.filter(i => i != null && i.length > 0);
+    if (cleaned.length === 0) {
+        return null;
+    }
+    return createHash('sha256')
+        .update(cleaned.join(','))
+        .digest('hex');
+}

-export { isOneOf };
-export { nullOrEmpty };
-export { duringWorkingHoursOrNotSet };
-export { getDirName };
-export { config };
+let config = {};
+export async function readConfigFromStorage(){
+    return JSON.parse(await readFile(new URL('../conf/config.json', import.meta.url)));
+}
+
+export async function refreshConfig(){
+    try {
+        config = await readConfigFromStorage();
+        //backwards compatability...
+        config.analyticsEnabled ??= null;
+        config.demoMode ??= false;
+    } catch (error) {
+        config = {...DEFAULT_CONFIG};
+        console.error('Error reading config file', error);
+    }
+}
+await refreshConfig();
+
+export {isOneOf};
+export {inDevMode};
+export {nullOrEmpty};
+export {duringWorkingHoursOrNotSet};
+export {getDirName};
+export {config};
+export {buildHash};
 export default {
-  isOneOf,
-  nullOrEmpty,
-  duringWorkingHoursOrNotSet,
-  getDirName,
-  config,
+    isOneOf,
+    nullOrEmpty,
+    duringWorkingHoursOrNotSet,
+    getDirName,
+    config,
 };
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
  "name": "fredy",
-  "version": "7.1.0",
+  "version": "10.4.0",
  "description": "[F]ind [R]eal [E]states [d]amn eas[y].",
  "scripts": {
-    "start": "node index.js",
+    "start": "node prod.js",
    "dev": "yarn && rm -rf ./ui/public/* && vite",
    "ui": "rm -rf ./ui/public/* && vite",
    "prod": "yarn && vite build --emptyOutDir",
@@ -11,11 +11,6 @@
    "test": "mocha --loader=esmock --timeout 3000000 test/**/*.test.js",
    "lint": "eslint ./index.js ./lib/**/*.js ./test/**/*.js ./ui/src/**/*.jsx"
  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
  "type": "module",
  "lint-staged": {
    "*.js": [
@@ -45,7 +40,7 @@
  },
  "license": "MIT",
  "engines": {
-    "node": ">=16.0.0",
+    "node": ">=20.0.0",
    "npm": ">=7.0.0"
  },
  "browserslist": [
@@ -55,54 +50,55 @@
    "Firefox ESR"
  ],
  "dependencies": {
-    "@douyinfe/semi-ui": "2.31.0",
+    "@douyinfe/semi-ui": "2.69.2",
    "@rematch/core": "2.2.0",
    "@rematch/loading": "2.1.2",
-    "@sendgrid/mail": "7.7.0",
-    "@vitejs/plugin-react": "3.1.0",
-    "better-sqlite3": "8.2.0",
-    "body-parser": "1.20.2",
-    "cookie-session": "2.0.0",
-    "handlebars": "4.7.7",
-    "highcharts": "10.3.3",
-    "highcharts-react-official": "3.2.0",
+    "@sendgrid/mail": "8.1.4",
+    "@vitejs/plugin-react": "4.3.3",
+    "better-sqlite3": "^11.5.0",
+    "body-parser": "1.20.3",
+    "cookie-session": "2.1.0",
+    "handlebars": "4.7.8",
+    "highcharts": "11.4.8",
+    "highcharts-react-official": "3.2.1",
    "lodash": "4.17.21",
-    "lowdb": "5.1.0",
+    "lowdb": "6.0.1",
    "markdown": "^0.5.0",
-    "nanoid": "4.0.1",
-    "node-fetch": "3.3.1",
-    "node-mailjet": "6.0.2",
-    "query-string": "8.1.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "react-redux": "8.0.5",
+    "mixpanel": "^0.18.0",
+    "nanoid": "5.0.8",
+    "node-fetch": "3.3.2",
+    "node-mailjet": "6.0.6",
+    "query-string": "9.1.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-redux": "9.1.2",
    "react-router": "5.2.1",
    "react-router-dom": "5.3.0",
-    "redux": "4.2.1",
-    "redux-thunk": "2.4.2",
-    "restana": "4.9.7",
-    "serve-static": "1.15.0",
+    "redux": "5.0.1",
+    "redux-thunk": "3.1.0",
+    "restana": "4.9.9",
+    "serve-static": "1.16.2",
    "slack": "11.0.2",
    "string-similarity": "^4.0.4",
-    "vite": "4.2.0",
+    "vite": "5.4.11",
    "x-ray": "2.3.4"
  },
  "devDependencies": {
-    "@babel/core": "7.21.3",
-    "@babel/eslint-parser": "7.21.3",
-    "@babel/preset-env": "7.20.2",
-    "@babel/preset-react": "7.18.6",
-    "chai": "4.3.7",
-    "eslint": "8.36.0",
-    "eslint-config-prettier": "8.7.0",
-    "eslint-plugin-react": "7.32.2",
-    "esmock": "2.1.0",
+    "@babel/core": "7.26.0",
+    "@babel/eslint-parser": "7.25.9",
+    "@babel/preset-env": "7.26.0",
+    "@babel/preset-react": "7.25.9",
+    "chai": "5.1.2",
+    "eslint": "8.56.0",
+    "eslint-config-prettier": "8.8.0",
+    "eslint-plugin-react": "7.37.2",
+    "esmock": "2.6.9",
    "history": "5.3.0",
-    "husky": "4.3.8",
-    "less": "4.1.3",
-    "lint-staged": "13.2.0",
-    "mocha": "10.2.0",
-    "prettier": "2.8.5",
+    "husky": "9.1.7",
+    "less": "4.2.0",
+    "lint-staged": "15.2.10",
+    "mocha": "10.8.2",
+    "prettier": "3.3.3",
    "redux-logger": "3.0.6"
  }
 }
--- a/prod.js
+++ b/prod.js
@@ -0,0 +1,2 @@
+process.env.NODE_ENV = 'production';
+import('./index.js');
--- a/test/provider/einsAImmobilien.test.js
+++ b/test/provider/einsAImmobilien.test.js
@@ -1,11 +1,9 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
 import { get } from '../mocks/mockNotification.js';
 import { providerConfig, mockFredy } from '../utils.js';
-import chai from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/einsAImmobilien.js';

-const expect = chai.expect;
-
 describe('#einsAImmobilien testsuite()', () => {
  after(() => {
    similarityCache.stopCacheCleanup();
@@ -22,7 +20,7 @@ describe('#einsAImmobilien testsuite()', () => {
        expect(notificationObj.serviceName).to.equal('einsAImmobilien');
        notificationObj.payload.forEach((notify) => {
          /** check the actual structure **/
-          expect(notify.id).to.be.a('number');
+          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');
--- a/test/provider/immobilienDe.test.js
+++ b/test/provider/immobilienDe.test.js
@@ -1,9 +1,9 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
 import { get } from '../mocks/mockNotification.js';
 import { providerConfig, mockFredy } from '../utils.js';
-import chai from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/immobilienDe.js';
-const expect = chai.expect;
+
 describe('#immobilien.de testsuite()', () => {
  after(() => {
    similarityCache.stopCacheCleanup();
--- a/test/provider/immonet.test.js
+++ b/test/provider/immonet.test.js
@@ -1,9 +1,10 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
 import { get } from '../mocks/mockNotification.js';
 import { mockFredy, providerConfig } from '../utils.js';
-import chai from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/immonet.js';
-const expect = chai.expect;
+import * as scrapingAnt from '../../lib/services/scrapingAnt.js';
+
 describe('#immonet testsuite()', () => {
  after(() => {
    similarityCache.stopCacheCleanup();
@@ -12,6 +13,13 @@ describe('#immonet testsuite()', () => {
  it('should test immonet provider', async () => {
    const Fredy = await mockFredy();
    return await new Promise((resolve) => {
+      if (!scrapingAnt.isScrapingAntApiKeySet()) {
+        /* eslint-disable no-console */
+        console.info('Skipping Immonet test as ScrapingAnt Api Key is not set.');
+        /* eslint-enable no-console */
+        resolve();
+        return;
+      }
      const fredy = new Fredy(provider.config, null, provider.metaInformation.id, 'immonet', similarityCache);
      fredy.execute().then((listing) => {
        expect(listing).to.be.a('array');
@@ -20,17 +28,17 @@ describe('#immonet testsuite()', () => {
        expect(notificationObj.serviceName).to.equal('immonet');
        notificationObj.payload.forEach((notify) => {
          /** check the actual structure **/
-          expect(notify.id).to.be.a('number');
+          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.price).that.does.include('€');
          expect(notify.size).that.does.include('m²');
          expect(notify.title).to.be.not.empty;
-          expect(notify.link).that.does.include('https://www.immonet.de');
          expect(notify.address).to.be.not.empty;
        });
        resolve();
--- a/test/provider/immoscout.test.js
+++ b/test/provider/immoscout.test.js
@@ -1,10 +1,10 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
 import { get } from '../mocks/mockNotification.js';
 import { mockFredy, providerConfig } from '../utils.js';
-import chai from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/immoscout.js';
 import * as scrapingAnt from '../../lib/services/scrapingAnt.js';
-const expect = chai.expect;
+
 describe('#immoscout testsuite()', () => {
  after(() => {
    similarityCache.stopCacheCleanup();
--- a/test/provider/immoswp.test.js
+++ b/test/provider/immoswp.test.js
@@ -1,9 +1,9 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
 import { get } from '../mocks/mockNotification.js';
 import { mockFredy, providerConfig } from '../utils.js';
-import chai from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/immoswp.js';
-const expect = chai.expect;
+
 describe('#immoswp testsuite()', () => {
  after(() => {
    similarityCache.stopCacheCleanup();
@@ -25,12 +25,10 @@ describe('#immoswp testsuite()', () => {
          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.price).that.does.include('€');
          expect(notify.title).to.be.not.empty;
          expect(notify.link).that.does.include('https://immo.swp.de');
-          expect(notify.address).to.be.not.empty;
        });
        resolve();
      });
--- a/test/provider/immowelt.test.js
+++ b/test/provider/immowelt.test.js
@@ -1,9 +1,9 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
 import { get } from '../mocks/mockNotification.js';
 import { mockFredy, providerConfig } from '../utils.js';
-import chai from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/immowelt.js';
-const expect = chai.expect;
+
 describe('#immowelt testsuite()', () => {
  after(() => {
    similarityCache.stopCacheCleanup();
--- a/test/provider/kleinanzeigen.test.js
+++ b/test/provider/kleinanzeigen.test.js
@@ -1,9 +1,9 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
 import { get } from '../mocks/mockNotification.js';
 import { mockFredy, providerConfig } from '../utils.js';
-import chai from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/kleinanzeigen.js';
-const expect = chai.expect;
+
 describe('#kleinanzeigen testsuite()', () => {
  after(() => {
    similarityCache.stopCacheCleanup();
@@ -20,13 +20,13 @@ describe('#kleinanzeigen testsuite()', () => {
        expect(notificationObj.serviceName).to.equal('kleinanzeigen');
        notificationObj.payload.forEach((notify) => {
          /** check the actual structure **/
-          expect(notify.id).to.be.a('number');
+          expect(notify.id).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.title).to.be.not.empty;
-          expect(notify.link).that.does.include('https://www.ebay-kleinanzeigen.de');
+          expect(notify.link).that.does.include('https://www.kleinanzeigen.de');
          expect(notify.address).to.be.not.empty;
        });
        resolve();
--- a/test/provider/neubauKompass.test.js
+++ b/test/provider/neubauKompass.test.js
@@ -1,36 +1,44 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
-import { get } from '../mocks/mockNotification.js';
-import { mockFredy, providerConfig } from '../utils.js';
-import chai from 'chai';
+import {get} from '../mocks/mockNotification.js';
+import {mockFredy, providerConfig} from '../utils.js';
+import {expect} from 'chai';
 import * as provider from '../../lib/provider/neubauKompass.js';
-const expect = chai.expect;
+import * as scrapingAnt from '../../lib/services/scrapingAnt.js';
+
 describe('#neubauKompass testsuite()', () => {
-  after(() => {
-    similarityCache.stopCacheCleanup();
-  });
-  provider.init(providerConfig.neubauKompass, [], []);
-  it('should test neubauKompass provider', async () => {
-    const Fredy = await mockFredy();
-    return await new Promise((resolve) => {
-      const fredy = new Fredy(provider.config, null, provider.metaInformation.id, 'neubauKompass', similarityCache);
-      fredy.execute().then((listing) => {
-        expect(listing).to.be.a('array');
-        const notificationObj = get();
-        expect(notificationObj.serviceName).to.equal('neubauKompass');
-        notificationObj.payload.forEach((notify) => {
-          expect(notify).to.be.a('object');
-          /** check the actual structure **/
-          expect(notify.id).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.title).to.be.not.empty;
-          expect(notify.link).that.does.include('https://www.neubaukompass.de');
-          expect(notify.address).to.be.not.empty;
-        });
-        resolve();
-      });
+    after(() => {
+        similarityCache.stopCacheCleanup();
+    });
+    provider.init(providerConfig.neubauKompass, [], []);
+    it('should test neubauKompass provider', async () => {
+        const Fredy = await mockFredy();
+        return await new Promise((resolve) => {
+            if (!scrapingAnt.isScrapingAntApiKeySet()) {
+                /* eslint-disable no-console */
+                console.info('Skipping Neubaukompass test as ScrapingAnt Api Key is not set.');
+                /* eslint-enable no-console */
+                resolve();
+                return;
+            }
+            const fredy = new Fredy(provider.config, null, provider.metaInformation.id, 'neubauKompass', similarityCache);
+            fredy.execute().then((listing) => {
+                expect(listing).to.be.a('array');
+                const notificationObj = get();
+                expect(notificationObj.serviceName).to.equal('neubauKompass');
+                notificationObj.payload.forEach((notify) => {
+                    expect(notify).to.be.a('object');
+                    /** check the actual structure **/
+                    expect(notify.id).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.title).to.be.not.empty;
+                    expect(notify.link).that.does.include('https://www.neubaukompass.de');
+                    expect(notify.address).to.be.not.empty;
+                });
+                resolve();
+            });
+        });
    });
-  });
 });
--- a/test/provider/testProvider.json
+++ b/test/provider/testProvider.json
@@ -9,11 +9,11 @@
    "enabled": true
  },
  "immonet": {
-    "url": "https://www.immonet.de/immobiliensuche/sel.do?pageoffset=1&listsize=100&objecttype=1&locationname=Düsseldorf&acid=&actype=&district=8717&district=8718&district=8719&district=8720&district=8721&district=8723&district=8724&district=8725&district=8727&district=8728&district=8729&district=8730&district=8731&district=8732&district=8733&district=8737&district=8738&district=8741&district=8745&district=8747&district=8750&district=8752&district=8754&district=8755&district=8756&district=8759&district=8760&district=8761&district=8763&district=8764&district=8765&ajaxIsRadiusActive=false&sortby=19&suchart=1&radius=0&pcatmtypes=1_1&pCatMTypeStoragefield=&parentcat=1&marketingtype=1&fromprice=&toprice=420000&fromarea=90&toarea=&fromplotarea=&toplotarea=&fromrooms=3&torooms=&objectcat=225&objectcat=18&objectcat=17&objectcat=12&objectcat=16&objectcat=181&objectcat=14&objectcat=15&objectcat=226&objectcat=13&wbs=-1&fromyear=&toyear=",
+    "url": "https://www.immonet.de/immobiliensuche/beta?pageoffset=1&listsize=100&objecttype=1&locationname=D%C3%BCsseldorf&acid=&actype=&district=8717&district=8718&district=8719&district=8720&district=8721&district=8723&district=8724&district=8725&district=8727&district=8728&district=8729&district=8730&district=8731&district=8732&district=8733&district=8737&district=8738&district=8741&district=8745&district=8747&district=8750&district=8752&district=8754&district=8755&district=8756&district=8759&district=8760&district=8761&district=8763&district=8764&district=8765&ajaxIsRadiusActive=false&sortby=19&suchart=1&radius=0&pcatmtypes=1_1&pCatMTypeStoragefield=&parentcat=1&marketingtype=1&fromprice=&toprice=420000&fromarea=90&toarea=&fromplotarea=&toplotarea=&fromrooms=3&torooms=&objectcat=225&objectcat=18&objectcat=17&objectcat=12&objectcat=16&objectcat=181&objectcat=14&objectcat=15&objectcat=226&objectcat=13&wbs=-1&fromyear=&toyear=",
    "enabled": true
  },
  "immowelt": {
-    "url": "https://www.immowelt.de/liste/duesseldorf/wohnungen/kaufen?d=true&rmi=3&sd=DESC&sf=TIMESTAMP&sp=1",
+    "url": "https://www.immowelt.de/classified-search?distributionTypes=Buy,Buy_Auction,Compulsory_Auction&estateTypes=House,Apartment&locations=AD08DE2350",
    "enabled": true
  },
  "immoscout": {
@@ -29,7 +29,7 @@
    "enabled": true
  },
  "kleinanzeigen": {
-    "url": "https://www.ebay-kleinanzeigen.de/s-immobilien/duesseldorf/anzeige:angebote/wohnung/k0c195l2068r5",
+    "url": "https://www.kleinanzeigen.de/s-immobilien/duesseldorf/anzeige:angebote/wohnung/k0c195l2068r5",
    "enabled": true
  },
  "neubauKompass": {
--- a/test/provider/utils.test.js
+++ b/test/provider/utils.test.js
@@ -1,7 +1,7 @@
 import utils from '../../lib/utils.js';
 import assert from 'assert';
-import chai from 'chai';
-const expect = chai.expect;
+import { expect } from 'chai';
+
 const fakeWorkingHoursConfig = (from, to) => ({
  workingHours: {
    to,
--- a/test/provider/wgGesucht.test.js
+++ b/test/provider/wgGesucht.test.js
@@ -1,9 +1,9 @@
 import * as similarityCache from '../../lib/services/similarity-check/similarityCache.js';
 import { get } from '../mocks/mockNotification.js';
 import { mockFredy, providerConfig } from '../utils.js';
-import chai from 'chai';
+import { expect } from 'chai';
 import * as provider from '../../lib/provider/wgGesucht.js';
-const expect = chai.expect;
+
 describe('#wgGesucht testsuite()', () => {
  after(() => {
    similarityCache.stopCacheCleanup();
@@ -23,7 +23,6 @@ describe('#wgGesucht testsuite()', () => {
          expect(notify.id).to.be.a('string');
          expect(notify.title).to.be.a('string');
          expect(notify.details).to.be.a('string');
-          expect(notify.size).to.be.a('string');
          expect(notify.price).to.be.a('string');
          expect(notify.link).to.be.a('string');
        });
--- a/test/queryStringMutator/queryStringMutator.test.js
+++ b/test/queryStringMutator/queryStringMutator.test.js
@@ -1,16 +1,15 @@
 import fs from 'fs';
-import chai from 'chai';
+import { expect } from 'chai';
 import { readFile } from 'fs/promises';
 import mutator from '../../lib/services/queryStringMutator.js';
 import queryString from 'query-string';
-const expect = chai.expect;

 const data = await readFile(new URL('./testData.json', import.meta.url));

 const testData = JSON.parse(data);

 let _provider = await Promise.all(
-  fs.readdirSync('./lib/provider/').map(async (integPath) => await import(`../../lib/provider/${integPath}`))
+  fs.readdirSync('./lib/provider/').map(async (integPath) => await import(`../../lib/provider/${integPath}`)),
 );

 /**
--- a/test/queryStringMutator/testData.json
+++ b/test/queryStringMutator/testData.json
@@ -1,7 +1,7 @@
 [
  {
-    "url": "https://www.immowelt.de/liste/40589/wohnungen/mieten?d=true&sd=DESC&sf=PRIMARY_PRICE_AMOUNT&sp=1",
-    "shouldBecome": "https://www.immowelt.de/liste/40589/wohnungen/mieten?d=true&sd=DESC&sf=TIMESTAMP&sp=1",
+    "url": "https://www.immowelt.de/classified-search?distributionTypes=Buy,Buy_Auction,Compulsory_Auction&estateTypes=House,Apartment&locations=AD08DE2350",
+    "shouldBecome": "https://www.immowelt.de/classified-search?distributionTypes=Buy,Buy_Auction,Compulsory_Auction&estateTypes=House,Apartment&locations=AD08DE2350&order=DateDesc",
    "id": "immowelt"
  },
  {
--- a/test/similarity/similarity.test.js
+++ b/test/similarity/similarity.test.js
@@ -1,6 +1,6 @@
 import SimilarityCacheEntry from '../../lib/services/similarity-check/SimilarityCacheEntry.js';
-import chai from 'chai';
-const expect = chai.expect;
+import { expect } from 'chai';
+
 describe('similarityCheck', () => {
  describe('#similarityCheck()', () => {
    it('should be false', () => {
@@ -29,10 +29,10 @@ describe('similarityCheck', () => {
    it('should be false', () => {
      const check = new SimilarityCacheEntry(0);
      check.setCacheEntry(
-        'The index is known by several other names, especially Sørensen–Dice index,[3] Sørensen index and Dice\'s coefficient. Other variations include the "similarity coefficient" or "index", such as Dice similarity coefficient (DSC). Common alternate spellings for Sørensen are Sorenson, Soerenson and Sörenson, and all three can also be seen with the –sen ending.'
+        'The index is known by several other names, especially Sørensen–Dice index,[3] Sørensen index and Dice\'s coefficient. Other variations include the "similarity coefficient" or "index", such as Dice similarity coefficient (DSC). Common alternate spellings for Sørensen are Sorenson, Soerenson and Sörenson, and all three can also be seen with the –sen ending.',
      );
      check.setCacheEntry(
-        'where |X| and |Y| are the cardinalities of the two sets (i.e. the number of elements in each set). The Sørensen index equals twice the number of elements common to both sets divided by the sum of the number of elements in each set.'
+        'where |X| and |Y| are the cardinalities of the two sets (i.e. the number of elements in each set). The Sørensen index equals twice the number of elements common to both sets divided by the sum of the number of elements in each set.',
      );
    });
  });
--- a/test/utils/utils.test.js
+++ b/test/utils/utils.test.js
@@ -0,0 +1,16 @@
+import { expect } from 'chai';
+import {buildHash} from '../../lib/utils.js';
+
+describe('utilsCheck', () => {
+  describe('#utilsCheck()', () => {
+      it('should be null when null input', () => {
+          expect(buildHash(null)).to.be.null;
+      });
+      it('should be null when null empty', () => {
+          expect(buildHash('')).to.be.null;
+      });
+      it('should return a value', () => {
+          expect(buildHash('bla', '', null)).to.be.a.string;
+      });
+  });
+});
--- a/ui/src/App.jsx
+++ b/ui/src/App.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, {useEffect} from 'react';

 import InsufficientPermission from './components/permission/InsufficientPermission';
 import PermissionAwareRoute from './components/permission/PermissionAwareRoute';
@@ -6,90 +6,106 @@ import GeneralSettings from './views/generalSettings/GeneralSettings';
 import JobMutation from './views/jobs/mutation/JobMutation';
 import UserMutator from './views/user/mutation/UserMutator';
 import JobInsight from './views/jobs/insights/JobInsight.jsx';
-import { useDispatch, useSelector } from 'react-redux';
-import { Switch, Redirect } from 'react-router-dom';
+import {useDispatch, useSelector} from 'react-redux';
+import {Switch, Redirect} 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 { Route } from 'react-router';
+import {Route} from 'react-router';

 import './App.less';
+import TrackingModal from './components/tracking/TrackingModal.jsx';
+import {Banner} from '@douyinfe/semi-ui';

 export default function FredyApp() {
-  const dispatch = useDispatch();
-  const [loading, setLoading] = React.useState(true);
-  const currentUser = useSelector((state) => state.user.currentUser);
+    const dispatch = useDispatch();
+    const [loading, setLoading] = React.useState(true);
+    const currentUser = useSelector((state) => state.user.currentUser);
+    const settings = useSelector((state) => state.generalSettings.settings);

-  useEffect(() => {
-    async function init() {
-      await dispatch.user.getCurrentUser();
-      if (!needsLogin()) {
-        await dispatch.provider.getProvider();
-        await dispatch.jobs.getJobs();
-        await dispatch.jobs.getProcessingTimes();
-        await dispatch.notificationAdapter.getAdapter();
-      }
-      setLoading(false);
-    }
+    useEffect(() => {
+        async function init() {
+            await dispatch.user.getCurrentUser();
+            if (!needsLogin()) {
+                await dispatch.provider.getProvider();
+                await dispatch.jobs.getJobs();
+                await dispatch.jobs.getProcessingTimes();
+                await dispatch.notificationAdapter.getAdapter();
+                await dispatch.generalSettings.getGeneralSettings();
+            }
+            setLoading(false);
+        }

-    init();
-  }, [currentUser?.userId]);
+        init();
+    }, [currentUser?.userId]);

-  const needsLogin = () => {
-    return currentUser == null || Object.keys(currentUser).length === 0;
-  };
+    const needsLogin = () => {
+        return currentUser == null || Object.keys(currentUser).length === 0;
+    };

-  const isAdmin = () => currentUser != null && currentUser.isAdmin;
+    const isAdmin = () => currentUser != null && currentUser.isAdmin;

-  const login = () => (
-    <Switch>
-      <Route name="Login" path={'/login'} component={Login} />
-      <Redirect from="*" to={'/login'} />
-    </Switch>
-  );
-
-  return loading ? null : needsLogin() ? (
-    login()
-  ) : (
-    <div className="app">
-      <div className="app__container">
-        <Logout />
-        <Logo width={190} white />
-        <Menu isAdmin={isAdmin()} />
+    const login = () => (
        <Switch>
-          <Route name="Insufficient Permission" path={'/403'} component={InsufficientPermission} />
-          <Route name="Create new Job" path={'/jobs/new'} component={JobMutation} />
-          <Route name="Edit a Job" path={'/jobs/edit/:jobId'} component={JobMutation} />
-          <Route name="Insights into a Job" path={'/jobs/insights/:jobId'} component={JobInsight} />
-          <Route name="Job overview" path={'/jobs'} component={Jobs} />
-          <PermissionAwareRoute
-            name="Create new User"
-            path="/users/new"
-            component={<UserMutator />}
-            currentUser={currentUser}
-          />
-          <PermissionAwareRoute
-            name="Edit a user"
-            path="/users/edit/:userId"
-            component={<UserMutator />}
-            currentUser={currentUser}
-          />
-          <PermissionAwareRoute name="Users" path="/users" component={<Users />} currentUser={currentUser} />
-          <PermissionAwareRoute
-            name="General Settings"
-            path="/generalSettings"
-            component={<GeneralSettings />}
-            currentUser={currentUser}
-          />
-
-          <Redirect from="/" to={'/jobs'} />
+            <Route name="Login" path={'/login'} component={Login}/>
+            <Redirect from="*" to={'/login'}/>
        </Switch>
-      </div>
-    </div>
-  );
+    );
+
+    return loading ? null : needsLogin() ? (
+        login()
+    ) : (
+        <div className="app">
+            <div className="app__container">
+                <Logout/>
+                <Logo width={190} white/>
+                <Menu isAdmin={isAdmin()}/>
+
+                {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/>}
+                <Switch>
+                    <Route name="Insufficient Permission" path={'/403'} component={InsufficientPermission}/>
+                    <Route name="Create new Job" path={'/jobs/new'} component={JobMutation}/>
+                    <Route name="Edit a Job" path={'/jobs/edit/:jobId'} component={JobMutation}/>
+                    <Route name="Insights into a Job" path={'/jobs/insights/:jobId'} component={JobInsight}/>
+                    <Route name="Job overview" path={'/jobs'} component={Jobs}/>
+                    <PermissionAwareRoute
+                        name="Create new User"
+                        path="/users/new"
+                        component={<UserMutator/>}
+                        currentUser={currentUser}
+                    />
+                    <PermissionAwareRoute
+                        name="Edit a user"
+                        path="/users/edit/:userId"
+                        component={<UserMutator/>}
+                        currentUser={currentUser}
+                    />
+                    <PermissionAwareRoute name="Users" path="/users" component={<Users/>} currentUser={currentUser}/>
+                    <PermissionAwareRoute
+                        name="General Settings"
+                        path="/generalSettings"
+                        component={<GeneralSettings/>}
+                        currentUser={currentUser}
+                    />
+
+                    <Redirect from="/" to={'/jobs'}/>
+                </Switch>
+            </div>
+        </div>
+    );
 }

 FredyApp.displayName = 'FredyApp';
--- a/ui/src/components/tracking/TrackingModal.jsx
+++ b/ui/src/components/tracking/TrackingModal.jsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import {Modal} from '@douyinfe/semi-ui';
+import Logo from '../logo/Logo.jsx';
+import {xhrPost} from '../../services/xhr.js';
+
+import './TrackingModal.less';
+
+const saveResponse = async (analyticsEnabled) => {
+    await xhrPost('/api/admin/generalSettings', {
+        analyticsEnabled
+    });
+};
+
+export default function TrackingModal() {
+
+    return <Modal
+        visible={true}
+        onOk={async () => {
+            await saveResponse(true);
+            location.reload();
+        }}
+        onCancel={async () => {
+            await saveResponse(false);
+            location.reload();
+        }}
+        maskClosable={false}
+        closable={false}
+        okText="Yes! I want to help"
+        cancelText="No, thanks"
+    >
+        <Logo white/>
+        <div className="trackingModal__description">
+            <p>Hey 👋</p>
+            <p>Fed up with popups? Yeah, me too. But this one’s important, and I promise it will only appear once ;)</p>
+            <p>Fredy is completely free (and will always remain free). If you’d like, you can support me by donating
+                through my GitHub, but there’s absolutely no obligation to do so.</p>
+            <p>However, it would be a huge
+                help if you’d allow me to collect some analytical data. Wait, before you click "no", let me explain. If
+                you
+                agree, Fredy will send a ping to my Mixpanel project each time it runs.</p>
+            <p>The data includes: names of
+                active adapters/providers, OS, architecture, Node version, and language. The information is entirely
+                anonymous and helps me understand which adapters/providers are most frequently used.</p>
+            <p>Thanks🤘</p>
+        </div>
+    </Modal>;
+
+}
--- a/ui/src/components/tracking/TrackingModal.less
+++ b/ui/src/components/tracking/TrackingModal.less
@@ -0,0 +1,5 @@
+.trackingModal {
+  &__description {
+    margin-top:10rem;
+  }
+}
--- a/ui/src/services/rematch/models/demoMode.js
+++ b/ui/src/services/rematch/models/demoMode.js
@@ -0,0 +1,24 @@
+import { xhrGet } from '../../xhr';
+export const demoMode = {
+  state: {
+    demoMode: false,
+  },
+  reducers: {
+    setDemoMode: (state, payload) => {
+      return {
+        ...state,
+        demoMode: payload.demoMode,
+      };
+    },
+  },
+  effects: {
+    async getDemoMode() {
+      try {
+        const response = await xhrGet('/api/demo');
+        this.setDemoMode(response.json);
+      } catch (Exception) {
+        console.error('Error while trying to get resource for api/demo. Error:', Exception);
+      }
+    },
+  },
+};
--- a/ui/src/services/rematch/store.js
+++ b/ui/src/services/rematch/store.js
@@ -5,6 +5,7 @@ import { provider } from './models/provider';
 import { createLogger } from 'redux-logger';
 import { jobs } from './models/jobs';
 import { user } from './models/user';
+import { demoMode } from './models/demoMode.js';
 import { init } from '@rematch/core';
 const middleware = [];
 if (process.env.NODE_ENV === 'development') {
@@ -16,6 +17,7 @@ const store = init({
  models: {
    notificationAdapter,
    generalSettings,
+    demoMode,
    provider,
    jobs,
    user,
--- a/ui/src/views/generalSettings/GeneralSettings.jsx
+++ b/ui/src/views/generalSettings/GeneralSettings.jsx
@@ -1,246 +1,331 @@
 import React from 'react';

-import { useDispatch, useSelector } from 'react-redux';
+import {useDispatch, useSelector} from 'react-redux';

-import { Divider, Input, Radio, TimePicker, Button, RadioGroup } from '@douyinfe/semi-ui';
-import { InputNumber } from '@douyinfe/semi-ui';
+import {Divider, Input, Radio, TimePicker, Button, RadioGroup, Checkbox} 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';
-import { IconSave, IconCalendar, IconKey, IconRefresh, IconSignal } from '@douyinfe/semi-icons';
+import {xhrPost} from '../../services/xhr';
+import {SegmentPart} from '../../components/segment/SegmentPart';
+import {Banner, Toast} from '@douyinfe/semi-ui';
+import {IconSave, IconCalendar, IconKey, IconRefresh, IconSignal, IconLineChartStroked, IconSearch} from '@douyinfe/semi-icons';
 import './GeneralSettings.less';

 function formatFromTimestamp(ts) {
-  const date = new Date(ts);
-  return `${date.getHours()}:${date.getMinutes() > 9 ? date.getMinutes() : '0' + date.getMinutes()}`;
+    const date = new Date(ts);
+    return `${date.getHours()}:${date.getMinutes() > 9 ? date.getMinutes() : '0' + date.getMinutes()}`;
 }

 function formatFromTBackend(time) {
-  if (time == null || time.length === 0) {
-    return null;
-  }
-  const date = new Date();
-  const split = time.split(':');
-  date.setHours(split[0]);
-  date.setMinutes(split[1]);
-  return date.getTime();
+    if (time == null || time.length === 0) {
+        return null;
+    }
+    const date = new Date();
+    const split = time.split(':');
+    date.setHours(split[0]);
+    date.setMinutes(split[1]);
+    return date.getTime();
 }

 const GeneralSettings = function GeneralSettings() {
-  const dispatch = useDispatch();
-  const [loading, setLoading] = React.useState(true);
+    const dispatch = useDispatch();
+    const [loading, setLoading] = React.useState(true);

-  const settings = useSelector((state) => state.generalSettings.settings);
+    const settings = useSelector((state) => state.generalSettings.settings);

-  const [interval, setInterval] = React.useState('');
-  const [port, setPort] = React.useState('');
-  const [scrapingAntApiKey, setScrapingAntApiKey] = React.useState('');
-  const [scrapingAntProxy, setScrapingAntProxy] = React.useState('');
-  const [workingHourFrom, setWorkingHourFrom] = React.useState(null);
-  const [workingHourTo, setWorkingHourTo] = React.useState(null);
-  React.useEffect(() => {
-    async function init() {
-      await dispatch.generalSettings.getGeneralSettings();
-      setLoading(false);
-    }
+    const [interval, setInterval] = React.useState('');
+    const [port, setPort] = React.useState('');
+    const [scrapingAntApiKey, setScrapingAntApiKey] = React.useState('');
+    const [scrapingAntProxy, setScrapingAntProxy] = React.useState('');
+    const [workingHourFrom, setWorkingHourFrom] = React.useState(null);
+    const [workingHourTo, setWorkingHourTo] = React.useState(null);
+    const [demoMode, setDemoMode] = React.useState(null);
+    const [analyticsEnabled, setAnalyticsEnabled] = React.useState(null);

-    init();
-  }, []);
+    React.useEffect(() => {
+        async function init() {
+            await dispatch.generalSettings.getGeneralSettings();
+            setLoading(false);
+        }

-  React.useEffect(() => {
-    async function init() {
-      setInterval(settings?.interval);
-      setPort(settings?.port);
-      setScrapingAntApiKey(settings?.scrapingAnt?.apiKey);
-      setWorkingHourFrom(settings?.workingHours?.from);
-      setWorkingHourTo(settings?.workingHours?.to);
-      setScrapingAntProxy(settings?.scrapingAnt?.proxy || 'datacenter');
-    }
+        init();
+    }, []);

-    init();
-  }, [settings]);
+    React.useEffect(() => {
+        async function init() {
+            setInterval(settings?.interval);
+            setPort(settings?.port);
+            setScrapingAntApiKey(settings?.scrapingAnt?.apiKey);
+            setWorkingHourFrom(settings?.workingHours?.from);
+            setWorkingHourTo(settings?.workingHours?.to);
+            setScrapingAntProxy(settings?.scrapingAnt?.proxy || 'datacenter');
+            setAnalyticsEnabled(settings?.analytics || false);
+            setDemoMode(settings?.demoMode || false);
+        }

-  const nullOrEmpty = (val) => val == null || val.length === 0;
+        init();
+    }, [settings]);

-  const throwMessage = (message, type) => {
-    if (type === 'error') {
-      Toast.error(message);
-    } else {
-      Toast.success(message);
-    }
-  };
+    const nullOrEmpty = (val) => val == null || val.length === 0;

-  const onStore = async () => {
-    if (nullOrEmpty(interval)) {
-      throwMessage('Interval may not be empty.', 'error');
-      return;
-    }
-    if (nullOrEmpty(port)) {
-      throwMessage('Port may not be empty.', 'error');
-      return;
-    }
-    if (
-      (!nullOrEmpty(workingHourFrom) && nullOrEmpty(workingHourTo)) ||
-      (nullOrEmpty(workingHourFrom) && !nullOrEmpty(workingHourTo))
-    ) {
-      throwMessage('Working hours to and from must be set if either to or from has been set before.', 'error');
-      return;
-    }
-    try {
-      await xhrPost('/api/admin/generalSettings', {
-        interval,
-        port,
-        scrapingAnt: {
-          apiKey: scrapingAntApiKey,
-          proxy: scrapingAntProxy,
-        },
-        workingHours: {
-          from: workingHourFrom,
-          to: workingHourTo,
-        },
-      });
-    } catch (exception) {
-      console.error(exception);
-      throwMessage('Error while trying to store settings.', 'error');
-      return;
-    }
-    throwMessage('Settings stored successfully. You MUST restart Fredy.', 'success');
-  };
+    const throwMessage = (message, type) => {
+        if (type === 'error') {
+            Toast.error(message);
+        } else {
+            Toast.success(message);
+        }
+    };

-  return (
-    <div>
-      {!loading && (
-        <React.Fragment>
-          <Headline text="General Settings" />
-          <Banner
-            fullMode={false}
-            type="info"
-            closeIcon={null}
-            title={<div style={{ fontWeight: 600, fontSize: '14px', lineHeight: '20px' }}>Info</div>}
-            style={{ marginBottom: '1rem' }}
-            description="If you change any settings, you must restart Fredy afterwards."
-          />
-          <div>
-            <SegmentPart
-              name="Interval"
-              helpText="Interval in minutes for running queries against the configured services."
-              Icon={IconRefresh}
-            >
-              <InputNumber
-                min={0}
-                max={1440}
-                placeholder="Interval in minutes"
-                value={interval}
-                formatter={(value) => `${value}`.replace(/\D/g, '')}
-                onChange={(value) => setInterval(value)}
-                suffix={'minutes'}
-              />
-            </SegmentPart>
-            <Divider margin="1rem" />
-            <SegmentPart name="Port" helpText="Port on which Fredy is running." Icon={IconSignal}>
-              <InputNumber
-                min={0}
-                max={99999}
-                placeholder="Port"
-                value={port}
-                formatter={(value) => `${value}`.replace(/\D/g, '')}
-                onChange={(value) => setPort(value)}
-              />
-            </SegmentPart>
-            <Divider margin="1rem" />
-            <SegmentPart
-              name="ScrapingAnt Api Key"
-              helpText="The api key for ScrapingAnt is used to be able to scrape Immoscout."
-              Icon={IconKey}
-            >
-              <Input
-                type="text"
-                placeholder="ScrapingAnt Api Key"
-                value={scrapingAntApiKey}
-                onChange={(val) => setScrapingAntApiKey(val)}
-              />
-            </SegmentPart>
-            <Divider margin="1rem" />
-            <SegmentPart
-              name="ScrapingAnt proxy settings"
-              helpText="Scraping ant provides different proxies."
-              Icon={IconKey}
-            >
-              <Banner
-                fullMode={false}
-                type="info"
-                closeIcon={null}
-                title={
-                  <div style={{ fontWeight: 600, fontSize: '14px', lineHeight: '20px' }}>
-                    ScrapingAnt is needed to scrape Immoscout. ScrapingAnt itself is using 2 different types of proxies
-                  </div>
-                }
-                style={{ marginBottom: '1rem' }}
-                description={
-                  <div>
-                    <h4>Datacenter-Proxy</h4>
-                    Proxy server located in one of the datacenters across the world. Datacenter proxies are slower and
-                    more likely to fail, but they are cheaper. A call with a datacenter proxy cost 10 credits.
-                    <h4>Residential-Proxy</h4>
-                    High-quality proxy server located in one of the real people houses across the world. Datacenter
-                    proxies are faster and more likely to success, but they are more expensive. A call with a datacenter
-                    proxy cost 250 credits.
-                    <br />
-                    <br />
-                    <b>
-                      On the free tier, you have 10.000 credits, so chose your option wisely. Keep in mind, only
-                      successful calls will be charged.
-                    </b>
-                  </div>
-                }
-              />
+    const onStore = async () => {
+        if (nullOrEmpty(interval)) {
+            throwMessage('Interval may not be empty.', 'error');
+            return;
+        }
+        if (nullOrEmpty(port)) {
+            throwMessage('Port may not be empty.', 'error');
+            return;
+        }
+        if (
+            (!nullOrEmpty(workingHourFrom) && nullOrEmpty(workingHourTo)) ||
+            (nullOrEmpty(workingHourFrom) && !nullOrEmpty(workingHourTo))
+        ) {
+            throwMessage('Working hours to and from must be set if either to or from has been set before.', 'error');
+            return;
+        }
+        try {
+            await xhrPost('/api/admin/generalSettings', {
+                interval,
+                port,
+                scrapingAnt: {
+                    apiKey: scrapingAntApiKey,
+                    proxy: scrapingAntProxy,
+                },
+                workingHours: {
+                    from: workingHourFrom,
+                    to: workingHourTo,
+                },
+                demoMode,
+                analyticsEnabled
+            });
+        } catch (exception) {
+            console.error(exception);
+            if(exception?.json?.message != null){
+                throwMessage(exception.json.message, 'error');
+            }else {
+                throwMessage('Error while trying to store settings.', 'error');
+            }
+            return;
+        }
+        throwMessage('Settings stored successfully. We will reload your browser in 3 seconds.', 'success');
+        setTimeout(()=>{
+            location.reload();
+        }, 3000);
+    };

-              <RadioGroup value={scrapingAntProxy} onChange={(e) => setScrapingAntProxy(e.target.value)}>
-                <Radio name="datacenter" value="datacenter" checked={scrapingAntProxy === 'datacenter'}>
-                  Datacenter proxy
-                </Radio>
-                <Radio name="residential" value="residential" checked={scrapingAntProxy === 'residential'}>
-                  Residential proxy
-                </Radio>
-              </RadioGroup>
-            </SegmentPart>
-            <Divider margin="1rem" />
-            <SegmentPart
-              name="Working hours"
-              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">
-                <TimePicker
-                  format={'HH:mm'}
-                  insetLabel="From"
-                  value={formatFromTBackend(workingHourFrom)}
-                  placeholder=""
-                  onChange={(val) => {
-                    setWorkingHourFrom(val == null ? null : formatFromTimestamp(val));
-                  }}
-                />
-                <TimePicker
-                  format={'HH:mm'}
-                  insetLabel="Until"
-                  value={formatFromTBackend(workingHourTo)}
-                  placeholder=""
-                  onChange={(val) => {
-                    setWorkingHourTo(val == null ? null : formatFromTimestamp(val));
-                  }}
-                />
-              </div>
-            </SegmentPart>
-            <Divider margin="1rem" />
-            <Button type="primary" theme="solid" onClick={onStore} icon={<IconSave />}>
-              Save
-            </Button>
-          </div>
-        </React.Fragment>
-      )}
-    </div>
-  );
+    return (
+        <div>
+            {!loading && (
+                <React.Fragment>
+                    <Headline text="General Settings"/>
+                    <div>
+                        <SegmentPart
+                            name="Interval"
+                            helpText="Interval in minutes for running queries against the configured services."
+                            Icon={IconRefresh}
+                        >
+                            <InputNumber
+                                min={0}
+                                max={1440}
+                                placeholder="Interval in minutes"
+                                value={interval}
+                                formatter={(value) => `${value}`.replace(/\D/g, '')}
+                                onChange={(value) => setInterval(value)}
+                                suffix={'minutes'}
+                            />
+                        </SegmentPart>
+                        <Divider margin="1rem"/>
+                        <SegmentPart name="Port" helpText="Port on which Fredy is running." Icon={IconSignal}>
+                            <InputNumber
+                                min={0}
+                                max={99999}
+                                placeholder="Port"
+                                value={port}
+                                formatter={(value) => `${value}`.replace(/\D/g, '')}
+                                onChange={(value) => setPort(value)}
+                            />
+                        </SegmentPart>
+                        <Divider margin="1rem"/>
+                        <SegmentPart
+                            name="ScrapingAnt Api Key"
+                            helpText="The api key for ScrapingAnt is used to be able to scrape Immoscout."
+                            Icon={IconKey}
+                        >
+                            <Input
+                                type="text"
+                                placeholder="ScrapingAnt Api Key"
+                                value={scrapingAntApiKey}
+                                onChange={(val) => setScrapingAntApiKey(val)}
+                            />
+                        </SegmentPart>
+                        <Divider margin="1rem"/>
+                        <SegmentPart
+                            name="ScrapingAnt proxy settings"
+                            helpText="Scraping ant provides different proxies."
+                            Icon={IconKey}
+                        >
+                            <Banner
+                                fullMode={false}
+                                type="info"
+                                closeIcon={null}
+                                title={
+                                    <div style={{fontWeight: 600, fontSize: '14px', lineHeight: '20px'}}>
+                                        ScrapingAnt is needed to scrape Immoscout. ScrapingAnt itself is using 2
+                                        different types of proxies
+                                    </div>
+                                }
+                                style={{marginBottom: '1rem'}}
+                                description={
+                                    <div>
+                                        <h4>Datacenter-Proxy</h4>
+                                        Proxy server located in one of the datacenters across the world. Datacenter
+                                        proxies are slower and
+                                        more likely to fail, but they are cheaper. A call with a datacenter proxy cost
+                                        10 credits.
+                                        <h4>Residential-Proxy</h4>
+                                        High-quality proxy server located in one of the real people houses across the
+                                        world. Datacenter
+                                        proxies are faster and more likely to success, but they are more expensive.
+                                        <br/>
+                                        <br/>
+                                        <b>
+                                            On the free tier, you have 10.000 credits, so chose your option wisely. Keep
+                                            in mind, only
+                                            successful calls will be charged.
+                                        </b>
+                                    </div>
+                                }
+                            />
+
+                            <RadioGroup value={scrapingAntProxy} onChange={(e) => setScrapingAntProxy(e.target.value)}>
+                                <Radio name="datacenter" value="datacenter" checked={scrapingAntProxy === 'datacenter'}>
+                                    Datacenter proxy
+                                </Radio>
+                                <Radio name="residential" value="residential"
+                                       checked={scrapingAntProxy === 'residential'}>
+                                    Residential proxy
+                                </Radio>
+                            </RadioGroup>
+                        </SegmentPart>
+                        <Divider margin="1rem"/>
+                        <SegmentPart
+                            name="Working hours"
+                            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">
+                                <TimePicker
+                                    format={'HH:mm'}
+                                    insetLabel="From"
+                                    value={formatFromTBackend(workingHourFrom)}
+                                    placeholder=""
+                                    onChange={(val) => {
+                                        setWorkingHourFrom(val == null ? null : formatFromTimestamp(val));
+                                    }}
+                                />
+                                <TimePicker
+                                    format={'HH:mm'}
+                                    insetLabel="Until"
+                                    value={formatFromTBackend(workingHourTo)}
+                                    placeholder=""
+                                    onChange={(val) => {
+                                        setWorkingHourTo(val == null ? null : formatFromTimestamp(val));
+                                    }}
+                                />
+                            </div>
+                        </SegmentPart>
+                        <Divider margin="1rem"/>
+
+                        <SegmentPart
+                            name="Analytics"
+                            helpText="Insights into the usage of Fredy."
+                            Icon={IconLineChartStroked}
+                        >
+                            <Banner
+                                fullMode={false}
+                                type="info"
+                                closeIcon={null}
+                                title={
+                                    <div style={{fontWeight: 600, fontSize: '14px', lineHeight: '20px'}}>
+                                        Explanation
+                                    </div>
+                                }
+                                style={{marginBottom: '1rem'}}
+                                description={
+                                    <div>
+                                        Analytics are disabled by default. If you choose to enable them, we will begin tracking the following:<br/>
+                                        <ul>
+                                            <li>Name of active provider (e.g. Immoscout)</li>
+                                            <li>Name of active adapter (e.g. Console)</li>
+                                            <li>language</li>
+                                            <li>os</li>
+                                            <li>node version</li>
+                                            <li>arch</li>
+                                        </ul>
+                                        The data is sent anonymously and helps me understand which providers or adapters are being used the most. In the end it helps me to improve fredy.
+                                    </div>
+                                }
+                            />
+
+                            <Checkbox
+                                checked={analyticsEnabled}
+                                onChange={(e) => setAnalyticsEnabled(e.target.checked)}
+                            > Enabled
+                            </Checkbox>
+
+                        </SegmentPart>
+
+                        <Divider margin="1rem"/>
+
+                        <SegmentPart
+                            name="Demo Mode"
+                            helpText="If enabled, Fredy runs in demo mode."
+                            Icon={IconSearch}
+                        >
+                            <Banner
+                                fullMode={false}
+                                type="info"
+                                closeIcon={null}
+                                title={
+                                    <div style={{fontWeight: 600, fontSize: '14px', lineHeight: '20px'}}>
+                                        Explanation
+                                    </div>
+                                }
+                                style={{marginBottom: '1rem'}}
+                                description={
+                                    <div>
+                                        In demo mode, Fredy will not (really) search for any real estates. Fredy is in a lockdown mode. Also
+                                        all database files will be set back to the default values at midnight.
+                                    </div>
+                                }
+                            />
+
+                            <Checkbox
+                                checked={demoMode}
+                                onChange={(e) => setDemoMode(e.target.checked)}
+                            > Enabled
+                            </Checkbox>
+
+                        </SegmentPart>
+
+                        <Divider margin="1rem"/>
+                        <Button type="primary" theme="solid" onClick={onStore} icon={<IconSave/>}>
+                            Save
+                        </Button>
+                    </div>
+                </React.Fragment>
+            )}
+        </div>
+    );
 };

 export default GeneralSettings;
--- a/ui/src/views/jobs/ProcessingTimes.jsx
+++ b/ui/src/views/jobs/ProcessingTimes.jsx
@@ -1,63 +1,86 @@
 import React from 'react';
-import { format } from '../../services/time/timeService';
-import { Card, Descriptions, Divider } from '@douyinfe/semi-ui';
-import { IconBolt } from '@douyinfe/semi-icons';
-export default function ProcessingTimes({ processingTimes }) {
-  const { Meta } = Card;
-  return (
-    <>
-      <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>
+import {format} from '../../services/time/timeService';
+import {Banner, Card, Descriptions, Divider} from '@douyinfe/semi-ui';
+import {IconBolt} from '@douyinfe/semi-icons';

-      {processingTimes.scrapingAntData != null && (
-        <>
-          <Divider margin="1rem" />
-          <Card
-            style={{ backgroundColor: '#35363c' }}
+export default function ProcessingTimes({processingTimes = {}}) {
+    const {Meta} = Card;
+    if (Object.keys(processingTimes).length === 0) {
+        return null;
+    }
+    if (processingTimes.error != null) {
+        return <Banner
+            fullMode={false}
+            type="danger"
+            closeIcon={null}
            title={
-              <Meta
-                title="Remaining ScrapingAnt calls"
-                description="Information about your Scraping Ant Plan"
-                avatar={<IconBolt />}
-              />
+                <div style={{fontWeight: 600, fontSize: '14px', lineHeight: '20px'}}>
+                    Scraping Ant Error
+                </div>
            }
-          >
-            <p>Plan: {processingTimes.scrapingAntData.plan_name}</p>
-            <p>
-              Duration: {format(new Date(processingTimes.scrapingAntData.start_date))} -{' '}
-              {format(new Date(processingTimes.scrapingAntData.end_date))}
-              <br />
-              Credits: {processingTimes.scrapingAntData.remained_credits}/
-              {processingTimes.scrapingAntData.plan_total_credits} (250 credits per call)
-            </p>
-            If you want to scrape Immoscout more often, you have to purchase a premium account of{' '}
-            <a href="https://scrapingant.com/" target="_blank" rel="noreferrer">
-              ScrapingAnt
-            </a>
-            . You can use the code <b>FREDY10</b> to get 10% off. (No affiliation, we are <b>not</b> getting paid to
-            recommend ScrapingAnt.)
-          </Card>
+            style={{marginBottom: '1rem'}}
+            description={
+                <div>
+                    {processingTimes.error}
+                </div>
+            }
+        />;
+    }
+    return (
+        <>
+            <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>
+
+            {(processingTimes.scrapingAntData != null && Object.keys(processingTimes.scrapingAntData).length > 0) &&(
+                <>
+                    <Divider margin="1rem"/>
+                    <Card
+                        style={{backgroundColor: '#35363c'}}
+                        title={
+                            <Meta
+                                title="Remaining ScrapingAnt calls"
+                                description="Information about your Scraping Ant Plan"
+                                avatar={<IconBolt/>}
+                            />
+                        }
+                    >
+                        <p>Plan: {processingTimes.scrapingAntData.plan_name}</p>
+                        <p>
+                            Duration: {format(new Date(processingTimes.scrapingAntData.start_date))} -{' '}
+                            {format(new Date(processingTimes.scrapingAntData.end_date))}
+                            <br/>
+                            Credits: {processingTimes.scrapingAntData.remained_credits}/
+                            {processingTimes.scrapingAntData.plan_total_credits}
+                        </p>
+                        If you want to scrape Immoscout or Immonet more often, you have to purchase a premium account
+                        of{' '}
+                        <a href="https://scrapingant.com/" target="_blank" rel="noreferrer">
+                            ScrapingAnt
+                        </a>
+                        . You can use the code <b>FREDY10</b> to get 10% off. (No affiliation, we are <b>not</b> getting
+                        paid by ScrapingAnt.)
+                    </Card>
+                </>
+            )}
        </>
-      )}
-    </>
-  );
+    );
 }

 /*
--- a/ui/src/views/jobs/mutation/components/notificationAdapter/NotificationAdapterMutator.jsx
+++ b/ui/src/views/jobs/mutation/components/notificationAdapter/NotificationAdapterMutator.jsx
@@ -25,9 +25,12 @@ const validate = (selectedAdapter) => {
      results.push('All fields are mandatory and must be set.');
      continue;
    }
-    if (uiElement.type === 'number' && (typeof uiElement.value !== 'number' || uiElement.value < 0)) {
-      results.push('A number field cannot contain anything else and must be > 0.');
-      continue;
+    if (uiElement.type === 'number') {
+      const numberValue = parseFloat(uiElement.value);
+      if(isNaN(numberValue) || numberValue < 0) {
+        results.push('A number field cannot contain anything else and must be > 0.');
+        continue;
+      }
    }
    if (uiElement.type === 'boolean' && typeof uiElement.value !== 'boolean') {
      results.push('A boolean field cannot be of a different type.');
--- a/ui/src/views/jobs/mutation/components/provider/ProviderMutator.jsx
+++ b/ui/src/views/jobs/mutation/components/provider/ProviderMutator.jsx
@@ -101,7 +101,7 @@ export default function ProviderMutator({ onVisibilityChanged, visible = false,
        description={
          <div>
            <p>
-              If you chose Immoscout as a provider, make sure to also add the scrapingAnt apiKey to the config.json.
+              If you chose Immoscout, Immonet or NeubauKompass as a provider, make sure to also add the scrapingAnt apiKey to the config.json.
              (See readme)
            </p>
            <p>
--- a/ui/src/views/login/Login.jsx
+++ b/ui/src/views/login/Login.jsx
@@ -1,88 +1,102 @@
-import React from 'react';
+import React, {useEffect} from 'react';

 import cityBackground from '../../assets/city_background.jpg';
 import Logo from '../../components/logo/Logo';
-import { xhrPost } from '../../services/xhr';
-import { useHistory } from 'react-router';
-import { useDispatch } from 'react-redux';
-import { Input, Button, Banner } from '@douyinfe/semi-ui';
+import {xhrPost} from '../../services/xhr';
+import {useHistory} from 'react-router';
+import {useDispatch, useSelector} from 'react-redux';
+import {Input, Button, Banner} from '@douyinfe/semi-ui';

 import './login.less';
-import { IconUser, IconLock } from '@douyinfe/semi-icons';
+import {IconUser, IconLock} from '@douyinfe/semi-icons';

 export default function Login() {
-  const dispatch = useDispatch();
+    const dispatch = useDispatch();
+    const [username, setUserName] = React.useState('');
+    const [password, setPassword] = React.useState('');
+    const [error, setError] = React.useState(null);
+    const demoMode = useSelector((state) => state.demoMode.demoMode || false);
+    const history = useHistory();

-  const [username, setUserName] = React.useState('');
-  const [password, setPassword] = React.useState('');
-  const [error, setError] = React.useState(null);
+    useEffect(() => {
+        async function init() {
+            await dispatch.demoMode.getDemoMode();
+        }

-  const history = useHistory();
+        init();
+    }, []);

-  const tryLogin = async () => {
-    if (username.length === 0 || password.length === 0) {
-      setError('Username and password are mandatory.');
-      return;
-    }
-    try {
-      await xhrPost('/api/login', {
-        username,
-        password,
-      });
-      setError(null);
-    } catch (Exception) {
-      setError('Login not successful...');
-      return;
-    }
-    await dispatch.user.getCurrentUser();
-    history.push('/jobs');
-  };
+    const tryLogin = async () => {
+        if (username.length === 0 || password.length === 0) {
+            setError('Username and password are mandatory.');
+            return;
+        }
+        try {
+            await xhrPost('/api/login', {
+                username,
+                password,
+            });
+            setError(null);
+        } catch (Exception) {
+            setError('Login not successful...');
+            return;
+        }
+        await dispatch.user.getCurrentUser();
+        history.push('/jobs');
+    };

-  return (
-    <div className="login">
-      <div className="login__bgImage" style={{ background: `url("${cityBackground}")` }} />
-      <Logo />
-      <form>
-        <div className="login__loginWrapper">
-          {error && <Banner type="danger" closeIcon={null} description={error} />}
-          <Input
-            size="large"
-            prefix={<IconUser />}
-            placeholder="Username"
-            value={username}
-            showClear
-            style={{ marginTop: error ? '1rem' : '4rem' }}
-            autofocus
-            onChange={(value) => setUserName(value)}
-            onKeyPress={async (e) => {
-              if (e.key === 'Enter') {
-                await tryLogin();
-              }
-            }}
-          />
+    return (
+        <div className="login">
+            <div className="login__bgImage" style={{background: `url("${cityBackground}")`}}/>
+            <Logo/>
+            <form>
+                <div className="login__loginWrapper">
+                    {error && <Banner type="danger" closeIcon={null} description={error}/>}
+                    <Input
+                        size="large"
+                        prefix={<IconUser/>}
+                        placeholder="Username"
+                        value={username}
+                        showClear
+                        style={{marginTop: error ? '1rem' : '4rem'}}
+                        autoFocus
+                        onChange={(value) => setUserName(value)}
+                        onKeyPress={async (e) => {
+                            if (e.key === 'Enter') {
+                                await tryLogin();
+                            }
+                        }}
+                    />

-          <Input
-            size="large"
-            mode="password"
-            prefix={<IconLock />}
-            value={password}
-            placeholder="Password"
-            style={{ marginTop: '2rem' }}
-            onChange={(value) => setPassword(value)}
-            onKeyPress={async (e) => {
-              if (e.key === 'Enter') {
-                await tryLogin();
-              }
-            }}
-          />
+                    <Input
+                        size="large"
+                        mode="password"
+                        prefix={<IconLock/>}
+                        value={password}
+                        placeholder="Password"
+                        style={{marginTop: '2rem'}}
+                        onChange={(value) => setPassword(value)}
+                        onKeyPress={async (e) => {
+                            if (e.key === 'Enter') {
+                                await tryLogin();
+                            }
+                        }}
+                    />

-          <Button type="primary" onClick={tryLogin} theme="solid" style={{ marginTop: '3rem' }}>
-            Login
-          </Button>
+                    <Button type="primary" onClick={tryLogin} theme="solid" style={{marginTop: '3rem'}}>
+                        Login
+                    </Button>
+                    <br/>
+                    {demoMode && <Banner fullMode={true}
+                                         type="info"
+                                         bordered
+                                         closeIcon={null}
+                                         description="This is the demo version of Fredy. Use 'demo' as both the username and password to log in."
+                    />}
+                </div>
+            </form>
        </div>
-      </form>
-    </div>
-  );
+    );
 }

 Login.displayName = 'Login';
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
weakmap@gmail.com	d17ef9ef1e	update fredy version	2024-11-22 09:11:43 +01:00
Christian Kellner	337ee922a6	Demo Mode (#117 ) * Adding Demo Mode to Fredy	2024-11-22 09:11:10 +01:00
Christian Kellner	b3ae5f640c	Update README.md	2024-11-20 22:23:05 +01:00
Christian Kellner	8f91267b5d	sending tracking information (#116 ) * Ability to send tracking information	2024-11-20 22:22:16 +01:00
Christian Kellner	3d59c0096d	reverting config changes. accidentally pushed	2024-11-20 08:19:16 +01:00
Christian Kellner	dab6e4edf3	upgrading husky	2024-11-19 13:45:07 +01:00
Christian Kellner	e1c45f18e0	adding action for stale pr's	2024-11-06 16:16:16 +01:00
weakmap@gmail.com	5cceae11cc	upgrading dependencies \| adding sqlite for later analysis	2024-11-01 17:03:43 +01:00
weakmap@gmail.com	a4c5bfcbf7	fixing tests	2024-10-03 16:09:19 +02:00
weakmap@gmail.com	6d2ab5f958	making sure immowelt does not include suggested ranges	2024-10-03 16:03:47 +02:00
weakmap@gmail.com	d3cb3a5881	regex for einsAImmobilien price normalization \| filter listings that does not have all required keys	2024-09-29 16:58:01 +02:00
Christian Kellner	111ef8be43	fixing kleinanzeigen test	2024-09-05 13:36:02 +02:00
Christian Kellner	35feb772d7	upgrading dependencies, fixing immowelt, using hash of price and id as unique identifier for listings	2024-09-05 13:34:14 +02:00
Christian Kellner	1bf012f13e	next fredy version	2024-07-24 09:44:13 +02:00
Christian Kellner	933dc3fc64	using node 20 in tests as well	2024-07-24 09:43:11 +02:00
Christian Kellner	42c48fdceb	using only 64 bit	2024-07-24 09:41:34 +02:00
Christian Kellner	f07aa0a06d	using node 20	2024-07-24 09:39:27 +02:00
Christian Kellner	92db8219b4	building multi platform docker images (#101 ) * building multi platform docker images * upgrading dependencies \| using scraping ant for neubaukompass	2024-07-24 09:32:21 +02:00
Christian Kellner	8ba3a53779	Upgrade version	2024-07-22 10:42:16 +02:00
Vladislav	e7db4e23f5	update error handling (#100 )	2024-07-22 10:41:30 +02:00
Christian Kellner	06c4ebb975	fixing immoswp	2024-06-12 14:15:21 +02:00
Christian Kellner	b075e09ac2	upgrading dependencies \| fixing confusing descriptions	2024-06-12 13:52:28 +02:00
Ali Sharafi	f215ab53db	Add pm2 in dockerfile & restart docker ps on error (#97 )	2024-04-22 16:14:27 +02:00
Christian Kellner	4ed92b246f	Update package.json	2024-03-27 11:19:48 +01:00
pomeloy	4a9b60633a	Remove unnecessary Apprise adapter config field (#95 )	2024-03-27 11:19:14 +01:00
Christian Kellner	2123c1024b	Update README.md	2024-03-25 21:10:09 +01:00
Christian Kellner	35767e6774	Update README.md	2024-03-25 21:09:31 +01:00
Christian Kellner	bf77ba2667	Update package.json	2024-03-17 08:02:39 +01:00
pomeloy	827c7e7321	Fix Apprise/Pushover notification title (#94 )	2024-03-17 08:02:02 +01:00
Christian Kellner	7b63dc72cb	Next release version	2024-03-13 15:05:56 +01:00
pomeloy	fd42b57010	Add Apprise notification adapter (#92 )	2024-03-13 15:05:12 +01:00
pomeloy	f5917af8f3	Add Pushover notification adapter (#91 ) * Add Pushover notification adapter	2024-03-13 15:04:22 +01:00
Christian Kellner	a85400d570	fixing immoscout	2024-02-08 10:36:47 +01:00
weakmap@gmail.com	8ce6668c78	upgrading dependencies	2024-01-26 19:51:45 +01:00
weakmap@gmail.com	2d8121a708	Merge branch 'master' of https://github.com/orangecoding/fredy	2024-01-26 19:36:43 +01:00
weakmap@gmail.com	172c039c79	fixing permission issue with docker	2024-01-26 19:36:35 +01:00
Farasath Ahamed	4ab1fd9294	Update immoscout.js (#88 ) Fixes https://github.com/orangecoding/fredy/issues/87	2024-01-26 19:33:45 +01:00
weakmap@gmail.com	50b3fde075	using node 18 in github test setup	2024-01-01 16:24:39 +01:00
weakmap@gmail.com	1a3fc6f94d	Merge branch 'master' of https://github.com/orangecoding/fredy	2024-01-01 16:24:31 +01:00
Christian Kellner	26ed42230a	Using node v18 for github tests	2024-01-01 16:21:25 +01:00
weakmap@gmail.com	6f4defdc1b	using node 18 in github test setup	2024-01-01 16:20:25 +01:00
weakmap@gmail.com	f798aed342	merged dev	2024-01-01 16:17:39 +01:00
weakmap@gmail.com	27e098c244	upgrading dependencies, dropping support for node < 18. Happy new Year	2024-01-01 16:14:25 +01:00
Christian Kellner	37948be0d3	next build version	2023-10-26 12:47:14 +02:00
Christian Kellner	cc7bbb77c4	removing sqlite as it only generates build errors	2023-10-26 12:46:42 +02:00
Christian Kellner	96da0b7892	Update LICENSE	2023-10-05 18:39:16 +02:00
jstnw	72993312c7	fix: kleinanzeigen price (#82 )	2023-10-05 18:33:55 +02:00
weakmap@gmail.com	17b4bad2e4	fixing notification provider	2023-09-27 17:45:38 +02:00
weakmap@gmail.com	fbad4456d7	upgrading dependencies	2023-09-07 20:52:27 +02:00
weakmap@gmail.com	deec626feb	Merge branch 'master' of https://github.com/orangecoding/fredy	2023-09-07 20:40:15 +02:00
weakmap@gmail.com	88c6641485	fixing wgGesucht test	2023-09-07 20:40:07 +02:00
Christian Kellner	f4eedda658	moving back to sqllite v8.2.0	2023-05-11 12:17:26 +02:00
Christian Kellner	d2b80561f8	moving back to sqllite v8.2.0	2023-05-11 12:16:28 +02:00
Christian Kellner	3bda88a075	upgrade dependencies	2023-05-11 11:51:23 +02:00
Christian Kellner	86465e0076	next release version	2023-05-08 09:33:20 +02:00
Christian Kellner	d947dad488	fixing ebay kleinanzeigen, now becoming kleinanzeigen	2023-05-08 09:32:07 +02:00
weakmap@gmail.com	23ef434fe1	next release version	2023-04-15 18:25:31 +02:00
weakmap@gmail.com	5e6d92c5be	Merge branch 'master' of https://github.com/orangecoding/fredy	2023-04-15 18:24:57 +02:00
weakmap@gmail.com	4ba098e0b6	bringing back immonet by using scrapingant	2023-04-15 18:24:51 +02:00
Janek Bettinger	2d1a9a0452	fix Mailjet adapter (#76 )	2023-04-15 16:27:27 +02:00
weakmap@gmail.com	6fbee3e7c6	Merge branch 'master' of https://github.com/orangecoding/fredy	2023-04-14 21:36:53 +02:00
Daniel Linsenmeyer	46775c3662	Fix validation and add ntfy as notification adapter (#75 )	2023-04-14 17:16:08 +02:00
weakmap@gmail.com	1feb5bfda1	running all tests	2023-04-07 19:45:24 +02:00
weakmap@gmail.com	3ec9ed3b2a	ignoring expired ssl certificate o0	2023-04-07 19:44:59 +02:00
Christian Kellner	75a536d5ab	fixing ui not being shown	2023-03-20 15:08:06 +01:00