1.4.0

.github/workflows/build-electron-dev.yml

@@ -14,6 +14,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
       - name: Install dependencies
         run: npm ci
       - name: Decrypt keys

.github/workflows/build-electron-production.yml

@@ -14,6 +14,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
       - name: Install dependencies
         run: npm ci
       - name: Decrypt keys

.prettierrc.json

@@ -7,5 +7,7 @@
       }
     }
   ],
-  "singleQuote": true
+  "singleQuote": true,
+  "trailingComma": "none",
+  "printWidth": 80
 }

README.md

@@ -3,7 +3,7 @@
 Der Wohnungsbot ist Teil der Ausstellung *Von einem der auszog eine Wohnung in Berlin zu finden. Ein Automatisierungsdrama in drei Akten — 2. Akt: Das Versprechen des Bots*
 
 ## Info
-[Website](https://wohnung.neopostmodern.com/)  
+[Website](https://wohnungsbot.de/)  
 [Ausstellungsansichten (vorläufig)](https://bericht.neopostmodern.com/portfolio/von-einem-der-auszog-eine-wohnung-in-berlin-zu-finden-2-akt)  
 [Artikel bei *Tagesspiegel Leute*](https://leute.tagesspiegel.de/neukoelln/unter-nachbarn/2019/09/11/95231/)
 

app/Routes.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Switch, Route } from 'react-router';
+import { Routes, Route } from 'react-router-dom';
 import routes from './constants/routes';
 import App from './containers/App';
 import ConfigurationPage from './containers/ConfigurationPage';
@@ -10,12 +10,12 @@ import PlaceholderPage from './containers/PlaceholderPage';
 
 export default () => (
   <App>
-    <Switch>
-      <Route path={routes.SIDEBAR} component={SidebarPage} />
-      <Route path={routes.BOT_OVERLAY} component={BotOverlayPage} />
-      <Route path={routes.CONFIGURATION} component={ConfigurationPage} />
-      <Route path={routes.DEV_MENU} component={DevMenuPage} />
-      <Route path={routes.PLACEHOLDER} component={PlaceholderPage} />
-    </Switch>
+    <Routes>
+      <Route path={routes.SIDEBAR} element={<SidebarPage />} />
+      <Route path={routes.BOT_OVERLAY} element={<BotOverlayPage />} />
+      <Route path={routes.CONFIGURATION} element={<ConfigurationPage />} />
+      <Route path={routes.DEV_MENU} element={<DevMenuPage />} />
+      <Route path={routes.PLACEHOLDER} element={<PlaceholderPage />} />
+    </Routes>
   </App>
 );

app/actions/application.js

@@ -7,7 +7,7 @@ import { markCompleted } from './cache';
 import { sleep, timeout } from '../utils/async';
 import type { Configuration } from '../reducers/configuration';
 import type { dataStateType, OverviewDataEntry } from '../reducers/data';
-import type { electronStateType } from '../reducers/electron';
+import { electronObjects } from '../store/electronObjects';
 import ElectronUtilsRedux from '../utils/electronUtilsRedux';
 import {
   popFlatFromQueue,
@@ -25,62 +25,56 @@ import AbortionSystem, {
   ABORTION_MANUAL
 } from '../utils/abortionSystem';
 
-export const generateApplicationTextAndSubmit = (flatId: string) => async (
-  dispatch: Dispatch,
-  getState: GetState
-) => {
-  const {
-    configuration,
-    data,
-    electron
-  }: {
-    configuration: Configuration,
-    data: dataStateType,
-    electron: electronStateType,
-    cache: cacheStateType
-  } = getState();
+export const generateApplicationTextAndSubmit =
+  (flatId: string) => async (dispatch: Dispatch, getState: GetState) => {
+    const {
+      configuration,
+      data
+    }: {
+      configuration: Configuration,
+      data: dataStateType
+    } = getState();
 
-  const { webContents } = electron.views.puppet.browserView;
-  const electronUtils = new ElectronUtilsRedux(webContents, dispatch);
+    const { webContents } = electronObjects.views.puppet;
+    const electronUtils = new ElectronUtilsRedux(webContents, dispatch);
 
-  const pdfPath = await dispatch(printToPDF('puppet', flatId));
+    const pdfPath = await dispatch(printToPDF('puppet', flatId));
 
-  const { abortableAction: abortablePerformApplication, abort } = abortable(
-    performApplication
-  );
-  AbortionSystem.registerAbort(abort);
-  let success;
-  let reason;
-  try {
-    await timeout(
-      abortablePerformApplication(
-        dispatch,
-        electronUtils,
-        configuration,
-        data.overview[flatId]
-      ),
-      300000
-    );
-    success = true;
-  } catch (error) {
-    // eslint-disable-next-line no-console
-    console.error(`Error in application:
+    const { abortableAction: abortablePerformApplication, abort } =
+      abortable(performApplication);
+    AbortionSystem.registerAbort(abort);
+    let success;
+    let reason;
+    try {
+      await timeout(
+        abortablePerformApplication(
+          dispatch,
+          electronUtils,
+          configuration,
+          data.overview[flatId]
+        ),
+        300000
+      );
+      success = true;
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(`Error in application:
 ${error}`);
-    success = false;
-    AbortionSystem.abort(ABORTION_ERROR);
-    reason = error.message;
-  }
-  if (AbortionSystem.abortionReason !== ABORTION_MANUAL) {
-    await markApplicationCompleted(dispatch, {
-      flatId,
-      success,
-      addressDescription: data.overview[flatId].address.description,
-      reason,
-      pdfPath
-    });
-  }
-  await dispatch(endApplicationProcess());
-};
+      success = false;
+      AbortionSystem.abort(ABORTION_ERROR);
+      reason = error.message;
+    }
+    if (AbortionSystem.abortionReason !== ABORTION_MANUAL) {
+      await markApplicationCompleted(dispatch, {
+        flatId,
+        success,
+        addressDescription: data.overview[flatId].address.description,
+        reason,
+        pdfPath
+      });
+    }
+    await dispatch(endApplicationProcess());
+  };
 
 const markApplicationCompleted = async (
   dispatch: Dispatch,
@@ -108,17 +102,16 @@ export const endApplicationProcess = () => async (dispatch: Dispatch) => {
   dispatch(setShowOverlay(true));
 };
 
-export const discardApplicationProcess = (
-  flatOverview: OverviewDataEntry
-) => async (dispatch: Dispatch) => {
-  dispatch(setBotMessage(`Wohnung ist leider unpassend :(`));
-  await sleep(5000);
-  dispatch(popFlatFromQueue(flatOverview.id));
-  await markApplicationCompleted(dispatch, {
-    flatId: flatOverview.id,
-    success: false,
-    addressDescription: flatOverview.address.description,
-    reason: 'UNSUITABLE' // this won't show up in the sidebar
-  });
-  await dispatch(endApplicationProcess());
-};
+export const discardApplicationProcess =
+  (flatOverview: OverviewDataEntry) => async (dispatch: Dispatch) => {
+    dispatch(setBotMessage(`Wohnung ist leider unpassend :(`));
+    await sleep(5000);
+    dispatch(popFlatFromQueue(flatOverview.id));
+    await markApplicationCompleted(dispatch, {
+      flatId: flatOverview.id,
+      success: false,
+      addressDescription: flatOverview.address.description,
+      reason: 'UNSUITABLE' // this won't show up in the sidebar
+    });
+    await dispatch(endApplicationProcess());
+  };

app/actions/bot.js

@@ -12,15 +12,21 @@ import {
   TASK_FINISHED,
   SCROLL_WHILE_IDLE,
   STOP_SCROLLING_WHILE_IDLE,
-  RESET_BOT
+  RESET_BOT,
+  LOGIN,
+  LOGOUT
 } from '../constants/actionTypes';
+import { electronObjects } from '../store/electronObjects';
 import { sleep } from '../utils/async';
 import { clickAction, scrollIntoViewAction } from './botHelpers';
 import { calculateOverviewBoundingBoxes } from './overlay';
 import ElectronUtils from '../utils/electronUtils';
 import AbortionSystem from '../utils/abortionSystem';
 import { entrySelector, entryTitleSelector } from '../utils/selectors';
 import { electronRouting, setBrowserViewReady } from './electron';
+import type { LoginData } from '../reducers/configuration';
+import { LOGINSTATUS } from '../reducers/configuration';
+import { setConfiguration } from './configuration';
 
 export function queueInvestigateFlat(flatId: string): Action {
   return async (dispatch: Dispatch, getState: GetState) => {
@@ -43,45 +49,37 @@ export function popFlatFromQueue(flatId: string): Action {
   };
 }
 
-export const clickLogin = () => async (dispatch: Dispatch) => {
-  await dispatch(clickAction('#link_loginAccountLink'));
-  await sleep(1000);
-  await dispatch(clickAction('#link_loginLinkInternal'));
-};
-
-export const navigateToFlatPage = (flatId: string) => async (
-  dispatch: Dispatch,
-  getState: GetState
-) => {
-  await sleep(10000);
-  dispatch(setBotIsActing(true));
-  dispatch(setBotMessage(`Wohnung ${flatId} suchen...`));
-  dispatch(setShowOverlay(false));
-  await dispatch(scrollIntoViewAction('puppet', entrySelector(flatId)));
-  dispatch(calculateOverviewBoundingBoxes());
-  dispatch(setShowOverlay(true));
-  await sleep(5000);
-  dispatch(setShowOverlay(false));
-  dispatch(setBotMessage(`Wohnung ${flatId} genauer anschauen!`));
-
-  const puppetView = new ElectronUtils(
-    getState().electron.views.puppet.browserView.webContents
-  );
-
-  const flatTitleSelector = entryTitleSelector(flatId);
-
-  /* eslint-disable no-await-in-loop */
-  while (AbortionSystem.nestedFunctionsMayContinue) {
-    if (!(await puppetView.elementExists(flatTitleSelector))) {
-      return true;
-    }
-    await dispatch(clickAction(flatTitleSelector));
+export const navigateToFlatPage =
+  (flatId: string) => async (dispatch: Dispatch) => {
+    await sleep(10000);
+    dispatch(setBotIsActing(true));
+    dispatch(setBotMessage(`Wohnung ${flatId} suchen...`));
+    dispatch(setShowOverlay(false));
+    await dispatch(scrollIntoViewAction('puppet', entrySelector(flatId)));
+    dispatch(calculateOverviewBoundingBoxes());
+    dispatch(setShowOverlay(true));
     await sleep(5000);
-  }
-  /* eslint-enable no-await-in-loop */
+    dispatch(setShowOverlay(false));
+    dispatch(setBotMessage(`Wohnung ${flatId} genauer anschauen!`));
+
+    const puppetView = new ElectronUtils(
+      electronObjects.views.puppet.webContents
+    );
+
+    const flatTitleSelector = entryTitleSelector(flatId);
+
+    /* eslint-disable no-await-in-loop */
+    while (AbortionSystem.nestedFunctionsMayContinue) {
+      if (!(await puppetView.elementExists(flatTitleSelector))) {
+        return true;
+      }
+      await dispatch(clickAction(flatTitleSelector));
+      await sleep(5000);
+    }
+    /* eslint-enable no-await-in-loop */
 
-  return false;
-};
+    return false;
+  };
 
 export function setBotIsActing(isActing: boolean): Action {
   return {
@@ -153,3 +151,27 @@ export function resetBot(): Action {
     payload: null
   };
 }
+
+export function login(immobilienScout24Data: LoginData): Action {
+  return {
+    type: LOGIN,
+    payload: {
+      immobilienScout24Data
+    }
+  };
+}
+
+export function logout(): Action {
+  return {
+    type: LOGOUT,
+    payload: null
+  };
+}
+
+export function setLoginStatus(loginStatus: LOGINSTATUS): Action {
+  return async (dispatch: Dispatch, getState: GetState) => {
+    const { configuration } = getState();
+    configuration.immobilienScout24.status = loginStatus;
+    dispatch(setConfiguration(configuration));
+  };
+}