Merge pull request #159 from acelaya-forks/feature/fix-docker-image-reload

Added nginx congif which ensures client-side paths are served as the …
Added nginx congif which ensures client-side paths are served as the index.html
2026-02-25 11:16:36 +00:00 · 2019-09-22 12:02:18 +02:00 · 2019-09-22 11:55:21 +02:00 · 2019-09-22 11:44:54 +02:00 · 2019-09-22 11:35:52 +02:00 · 2019-09-22 11:16:16 +02:00
187 changed files with 25412 additions and 12055 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,6 @@
+./.github
 ./build
+./coverage
 ./dist
 ./node_modules
 ./test
--- a/.eslintrc
+++ b/.eslintrc
@@ -26,6 +26,7 @@
    "no-console": "warn",
    "template-curly-spacing": ["error", "never"],
    "no-warning-comments": "off",
+    "no-magic-numbers": "off",
    "no-undefined": "off",
    "indent": ["error", 2, {
      "SwitchCase": 1
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,6 @@
+<!--
+Before opening an issue, just take into account that this is a completely free of charge open source project.
+I'm always happy to help and provide support, but some understanding will be required.
+I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
+Try to be polite, and understand it is impossible for a project to cover all use cases.
+-->
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,16 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # dependencies
 /node_modules
-package-lock.json

 # testing
 /coverage
+/.stryker-tmp
+/reports

 # production
 /build

-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*

 docker-compose.override.yml
+home
+public/servers.json*
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,5 +1,6 @@
 build:
  environment:
-    node: v10.4.1
+    node: v10.15.3
 tools:
-  external_code_coverage: true
+  external_code_coverage:
+    timeout: 1200
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,40 @@
 language: node_js

 node_js:
-  - "stable"
+  - "10.16.3"

 cache:
-  yarn: true
  directories:
    - node_modules

+services:
+  - docker
+
 install:
-  - yarn install
+  - npm ci
+
+before_script:
+  - echo "Building commit range ${TRAVIS_COMMIT_RANGE}"
+  - export MUTATION_FILES=$(git diff ${TRAVIS_COMMIT_RANGE:-origin/master} --name-only | grep -E 'src\/(.*).(js|ts|jsx|tsx)' | paste -sd ",")

 script:
-  - yarn lint
-  - yarn test:ci
-  - yarn build # Make sure the app can be built without errors
+  - npm run lint
+  - npm run test:ci
+  - if [[ -z $TRAVIS_TAG ]]; then docker build -t shlink-web-client:test . ; fi
+  - if [[ -z $TRAVIS_TAG ]]; then npm run mutate:ci ; fi

-after_script:
-  - yarn ocular coverage/clover.xml
+after_success:
+  - node_modules/.bin/ocular coverage/clover.xml

-sudo: false
+# Before deploying, build dist file for current travis tag
+before_deploy:
+  - npm run build ${TRAVIS_TAG#?}
+
+deploy:
+  provider: releases
+  api_key:
+    secure: jBvPwC7EAbViaNR83rwMSt5XQDK0Iu9rgvEMa7GoyShbHcvUCCPd73Tu9quNpKi6NKsDY3INHgtch3vgonjGNGDGJ+yDyIBzXcvsAX2x3UcHpRbgY12uiINVmQxBI1+OVQB016Nm+cKC/i5Z36K4EmDbYfo+MrKndngM6AjcQFTwI8EwniIMaQgg4gNes//K8NhP5u0c3gwG+Q6jEGnq6uH3kcRgh6/epIZYpQyxjqWqKwF77sgcYj+X2Nf6XxtB5neuCi301UKLoLx8G0skh/Lm6KAIO4s9iIhIFa3UpoF21Ka0TxLpd2JxalLryCnFGlWWE6lxC9Htmc0TeRowJQlGdJXCskJ37xT9MljKY0fwNMu06VS/FUgykuCv+jP3zQu51pKu7Ew7+WeNPjautoOTu54VkdGyHcf2ThBNEyJQuiEwAQe4u7yAxY6R5ovEdvHBSIg4w1E5/Mxy5SMTCUlIAv6H7QQ1X9Z/zJm9HH5KeKz5tsHvQ/RIdSpgHXq/tC8o4Yup/LCFucXfrgvy/8pJoO1UpOlmvm62974NFfo0EG5YWwv6brUqz3QXpMjb8sWqgjltYMYJX3J7WZ34rIc+zt4NAmfhqgczaOC4pUGCiJ8jX3rMWIaQRn1AJ+5V337jL9fNDpTHny4phQjHrMJ1e0HZuNp0Xb5Q8wgqDPM=
+  file: "./dist/shlink-web-client_${TRAVIS_TAG#?}_dist.zip"
+  skip_cleanup: true
+  on:
+    tags: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,237 @@
 # CHANGELOG

+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).
+
+## 2.1.1 - 2019-09-22
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#142](https://github.com/shlinkio/shlink-web-client/issues/142) Updated to newer versions of base docker images for dev and production.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#151](https://github.com/shlinkio/shlink-web-client/issues/151) Fixed "order by" indicator (caret) still indicate ASC on column header when no order is specified.
+* [#157](https://github.com/shlinkio/shlink-web-client/issues/157) Fixed pagination control on graphs expanding too much when lots of pages need to be rendered.
+* [#155](https://github.com/shlinkio/shlink-web-client/issues/155) Fixed client-side paths resolve to 404 when served from nginx in docker image instead of falling back to `index.html`.
+
+
+## 2.1.0 - 2019-05-19
+
+#### Added
+
+* [#101](https://github.com/shlinkio/shlink-web-client/issues/101) Added checkbox to short URL creation form that allows to determine the value of the `findIfExists` flag introduced in Shlink v1.16.0.
+* [#105](https://github.com/shlinkio/shlink-web-client/issues/105) Added support to pre-configure servers. See [how to pre-configure servers](README.md#pre-configuring-servers) to get more details on how to do it.
+
+#### Changed
+
+* [#125](https://github.com/shlinkio/shlink-web-client/issues/125) Refactored reducers to replace `switch` statements by `handleActions` from [redux-actions](https://github.com/redux-utilities/redux-actions).
+* [#116](https://github.com/shlinkio/shlink-web-client/issues/116) Removed sinon in favor of jest mocks.
+* [#72](https://github.com/shlinkio/shlink-web-client/issues/72) Increased code coverage up to 80%.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
+
+## 2.0.3 - 2019-03-16
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#120](https://github.com/shlinkio/shlink-web-client/issues/120) Fixed crash when visits page is loaded and there are no visits with known cities.
+* [#113](https://github.com/shlinkio/shlink-web-client/issues/113) Ensured visits loading is cancelled when the visits page is unmounted. Requests on flight will still finish.
+* [#118](https://github.com/shlinkio/shlink-web-client/issues/118) Fixed chart crashing when trying to render lots of bars by adding pagination.
+
+
+## 2.0.2 - 2019-03-04
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#103](https://github.com/shlinkio/shlink-web-client/issues/103) Fixed visits page getting freezed when loading large amounts of visits.
+* [#111](https://github.com/shlinkio/shlink-web-client/issues/111) Fixed crash when trying to load a map modal with only one location.
+* [#115](https://github.com/shlinkio/shlink-web-client/issues/115) Created `ErrorHandler` component which will prevent crashes in app to make it unusable.
+
+
+## 2.0.1 - 2019-03-03
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#106](https://github.com/shlinkio/shlink-web-client/issues/106) Reduced size of docker image by using a multi-stage build Dockerfile.
+* [#95](https://github.com/shlinkio/shlink-web-client/issues/95) Tested docker image build during travis executions.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#104](https://github.com/shlinkio/shlink-web-client/issues/104) Fixed blank page being showed when not-found paths are loaded.
+* [#94](https://github.com/shlinkio/shlink-web-client/issues/94) Fixed initial zoom and center on maps.
+* [#93](https://github.com/shlinkio/shlink-web-client/issues/93) Prevented side menu to be swipeable while a modal window is displayed.
+
+
+## 2.0.0 - 2019-01-13
+
+#### Added
+
+* [#54](https://github.com/shlinkio/shlink-web-client/issues/54) Added stats by city graphic in visits page.
+* [#55](https://github.com/shlinkio/shlink-web-client/issues/55) Added map in visits page locating cities from which visits have occurred.
+
+#### Changed
+
+* [#87](https://github.com/shlinkio/shlink-web-client/issues/87) and [#89](https://github.com/shlinkio/shlink-web-client/issues/89) Updated all dependencies to latest major versions.
+* [#96](https://github.com/shlinkio/shlink-web-client/issues/96) Updated visits page to load visits in multiple paginated requests of `5000` visits when used shlink server supports it. This will prevent shlink to hang when trying to load big amounts of visits.
+* [#71](https://github.com/shlinkio/shlink-web-client/issues/71) Improved tests and increased code coverage.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* [#59](https://github.com/shlinkio/shlink-web-client/issues/59) Dropped support for old browsers. Internet explorer and dead browsers are no longer supported.
+* [#97](https://github.com/shlinkio/shlink-web-client/issues/97) Dropped support for authentication via `Authorization` header with Bearer type and JWT, which will make this version no longer work with shlink earlier than v1.13.0.
+
+#### Fixed
+
+* *Nothing*
+
+
+## 1.2.1 - 2018-12-21
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#80](https://github.com/shlinkio/shlink-web-client/issues/80) Deeply refactored app to do true dependency injection with an IoC container.
+* [#79](https://github.com/shlinkio/shlink-web-client/issues/79) Updated to nginx 1.15.7 as the base docker image.
+* [#75](https://github.com/shlinkio/shlink-web-client/issues/75) Prevented duplicated `yarn build` in travis when a tag exists.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#77](https://github.com/shlinkio/shlink-web-client/issues/77) Sortable graphs ordering is now case insensitive.
+
+
+## 1.2.0 - 2018-11-01
+
+#### Added
+
+* [#65](https://github.com/shlinkio/shlink-web-client/issues/65) Added sorting to both countries and referrers stats graphs.
+* [#14](https://github.com/shlinkio/shlink-web-client/issues/14) Documented how to build the project so that it can be served from a subpath.
+
+#### Changed
+
+* [#50](https://github.com/shlinkio/shlink-web-client/issues/50) Improved tests and increased code coverage.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#66](https://github.com/shlinkio/shlink-web-client/issues/66) Fixed tooltips in graphs with too small bars not being displayed.
+
+
+## 1.1.1 - 2018-10-20
+
+#### Added
+
+* [#57](https://github.com/shlinkio/shlink-web-client/issues/57) Automated release generation in travis build.
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#63](https://github.com/shlinkio/shlink-web-client/issues/63) Improved how bar charts are rendered in stats page, making them try to calculate a bigger height for big data sets.
+* [#56](https://github.com/shlinkio/shlink-web-client/issues/56) Ensured `ColorGenerator` matches keys in a case insensitive way.
+* [#53](https://github.com/shlinkio/shlink-web-client/issues/53) Fixed missing margin between date fields in visits page for mobile devices.
+
+
 ## 1.1.0 - 2018-09-16

 #### Added
--- a/28
+++ b/28
@@ -1,21 +1,9 @@
-FROM nginx:1.15.2-alpine
-MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
+FROM node:10.16.3-alpine as node
+COPY . /shlink-web-client
+RUN cd /shlink-web-client && npm install && npm run build

-# Install node and yarn
-RUN apk add --no-cache --virtual nodejs && apk add --no-cache --virtual yarn
-
-ADD . ./shlink-web-client
-
-# Install dependencies and build project
-RUN cd ./shlink-web-client && \
-    yarn install && \
-    yarn build && \
-
-    # Move build contents to document root
-    cd .. && \
-    rm -r /usr/share/nginx/html/* && \
-    mv ./shlink-web-client/build/* /usr/share/nginx/html && \
-    rm -r ./shlink-web-client && \
-
-    # Delete and uninstall build tools
-    yarn cache clean && apk del yarn && apk del nodejs
+FROM nginx:1.17.3-alpine
+LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
+RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf
+COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=node /shlink-web-client/build /usr/share/nginx/html
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2018 shlinkio
+Copyright (c) 2018-2019 shlinkio

 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
@@ -1,7 +1,8 @@
 # shlink-web-client

 [![Build Status](https://img.shields.io/travis/shlinkio/shlink-web-client.svg?style=flat-square)](https://travis-ci.org/shlinkio/shlink-web-client)
-[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/shlinkio/shlink-web-client.svg?style=flat-square)](https://scrutinizer-ci.com/gshlinkio/shlink-web-client/?branch=master)
+[![Docker build status](https://img.shields.io/docker/cloud/build/shlinkio/shlink-web-client.svg?style=flat-square)](https://hub.docker.com/r/shlinkio/shlink-web-client/)
+[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/shlinkio/shlink-web-client.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink-web-client/?branch=master)
 [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/shlinkio/shlink-web-client.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink-web-client/?branch=master)
 [![GitHub release](https://img.shields.io/github/release/shlinkio/shlink-web-client.svg?style=flat-square)](https://github.com/shlinkio/shlink-web-client/releases/latest)
 [![GitHub license](https://img.shields.io/github/license/shlinkio/shlink-web-client.svg?style=flat-square)](https://github.com/shlinkio/shlink-web-client/blob/master/LICENSE)
@@ -13,18 +14,70 @@ A ReactJS-based progressive web application for [Shlink](https://shlink.io).

 There are three ways in which you can use this application.

-* The easiest way to use shlink-web-client is by just going to https://app.shlink.io.
+* The easiest way to use shlink-web-client is by just going to <https://app.shlink.io>.

-    The application runs 100% in the browser, so you can use that instance and access any shlink instance from it.
+    The application runs 100% in the browser, so you can safely access any shlink instance from there.

 * Self hosting the application yourself.

    Get the [latest release](https://github.com/shlinkio/shlink-web-client/releases/latest) and download the distributable zip file attached to it (`shlink-web-client_X.X.X_dist.zip`).

-    The package contains static files only, so just put it in a folder and serve it with the web server of your choice (just take into account that all the files are served using absolute paths, so you have to serve it from the root of your domain, not from a subpath).
+    The package contains static files only, so just put it in a folder and serve it with the web server of your choice.

-* Use the official [docker image](https://hub.docker.com/r/shlinkio/shlink-web-client/)
+    Provided dist files are configured to be served from the root of your domain. If you need to serve shlink-web-client from a subpath, you will have to build it yourself following [these steps](#serve-shlink-in-subpath).

-    If you want to deploy shlink-web-client in a container-based cluster (docker swarm, kubernetes, etc), just pick the image and do it.
+* Using the official [docker image](https://hub.docker.com/r/shlinkio/shlink-web-client/)

-    It's a lightweight [nginx:alpine image](https://hub.docker.com/r/library/nginx/) serving the assets on port 80.
+    If you want to deploy shlink-web-client in a container-based cluster (kubernetes, docker swarm, etc), just pick the `shlinkio/shlink-web-client` image and do it.
+
+    It's a lightweight [nginx:alpine](https://hub.docker.com/r/library/nginx/) image serving the static app on port 80.
+
+## Pre-configuring servers
+
+The first time you access shlink-web-client from a browser, you will have to configure the list of shlink servers you want to manage, and they will be saved in the local storage.
+
+Those servers can be exported and imported in other browsers, but if for some reason you need some servers to be there from the beginning, starting with shlink-web-client 2.1.0, you can provide a `servers.json` file in the project root folder (the same containing the `index.html`, `favicon.ico`, etc) with a structure like this:
+
+```json
+[
+  {
+    "name": "Main server",
+    "url": "https://doma.in",
+    "apiKey": "09c972b7-506b-49f1-a19a-d729e22e599c"
+  },
+  {
+    "name": "Local",
+    "url": "http://localhost:8080",
+    "apiKey": "580d0b42-4dea-419a-96bf-6c876b901451"
+  }
+]
+```
+
+> The list can contain as many servers as you need.
+
+If you are using the shlink-web-client docker image, you can mount the `servers.json` file in a volume inside `/usr/share/nginx/html`, which is the app's document root inside the container.
+
+    docker run --name shlink-web-client -p 8000:80 -v ${PWD}/servers.json:/usr/share/nginx/html/servers.json shlinkio/shlink-web-client
+
+## Serve project in subpath
+
+Official distributable files have been built so that they are served from the root of a domain.
+
+If you need to host shlink-web-client yourself and serve it from a subpath, follow these steps:
+
+* Download shlink-web-client source code for the version you want to build.
+    * For example, if you want to build `v1.0.1`, use this link https://github.com/shlinkio/shlink-web-client/archive/v1.0.1.zip
+    * Replace the `v1.0.1` part in the link with the one of the version you want to build.
+* Decompress the file and `cd` into the resulting folder.
+* Open the `package.json` file in the root of the project, locate the `homepage` property and replace the value (which should be an empty string) by the path from which you want to serve shlink-web-client.
+    * For example: `"homepage": "/my-projects/shlink-web-client",`.
+* Build the project:
+    * For classic hosting:
+        * Download [node](https://nodejs.org/en/download/package-manager/) 10.15 or later.
+        * Install project dependencies by running `npm install`.
+        * Build the project by running `npm run build`.
+        * Once the command finishes, you will have a `build` folder with all the static assets you need to run shlink-web-client. Just place them wherever you want them to be served from.
+    * For docker image:
+        * Download [docker](https://docs.docker.com/install/).
+        * Build the docker image by running `docker build . -t shlink-web-client`.
+        * Once the command finishes, you will have an image with the name `shlink-web-client`.
--- a/config/docker/nginx.conf
+++ b/config/docker/nginx.conf
@@ -0,0 +1,17 @@
+server {
+    listen 80 default_server;
+    charset utf-8;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # When requesting static paths with extension, try them, and return a 404 if not found
+    location ~ .+\.(css|js|html|png|jpg|jpeg|gif|bmp|ico|csv|otf|eot|svg|svgz|ttf|woff|woff2|ijmap|pdf|tif|map) {
+        try_files $uri $uri/ =404;
+    }
+
+    # When requesting a path without extension, try it, and return the index if not found
+    # This allows HTML5 history paths to be handled by the client application
+    location / {
+        try_files $uri $uri/ /index.html$is_args$args;
+    }
+}
--- a/config/env.js
+++ b/config/env.js
@@ -43,12 +43,12 @@ dotenvFiles.forEach((dotenvFile) => {

 // We support resolving modules according to `NODE_PATH`.
 // This lets you use absolute paths in imports inside large monorepos:
-// https://github.com/facebookincubator/create-react-app/issues/253.
+// https://github.com/facebook/create-react-app/issues/253.
 // It works similar to `NODE_PATH` in Node itself:
 // https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
 // Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
 // Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
-// https://github.com/facebookincubator/create-react-app/issues/1023#issuecomment-265344421
+// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
 // We also resolve them to make sure all tools using them work consistently.
 const appDirectory = fs.realpathSync(process.cwd());

--- a/config/jest/fileTransform.js
+++ b/config/jest/fileTransform.js
@@ -6,6 +6,24 @@ const path = require('path');

 module.exports = {
  process(src, filename) {
-    return `module.exports = ${JSON.stringify(path.basename(filename))};`;
+    const assetFilename = JSON.stringify(path.basename(filename));
+
+    if (filename.match(/\.svg$/)) {
+      return `module.exports = {
+        __esModule: true,
+        default: ${assetFilename},
+        ReactComponent: (props) => ({
+          $$typeof: Symbol.for('react.element'),
+          type: 'svg',
+          ref: null,
+          key: null,
+          props: Object.assign({}, props, {
+            children: ${assetFilename}
+          })
+        }),
+      };`;
+    }
+
+    return `module.exports = ${assetFilename};`;
  },
 };
--- a/config/paths.js
+++ b/config/paths.js
@@ -4,22 +4,22 @@ const fs = require('fs');
 const url = require('url');

 // Make sure any symlinks in the project folder are resolved:
-// https://github.com/facebookincubator/create-react-app/issues/637
+// https://github.com/facebook/create-react-app/issues/637
 const appDirectory = fs.realpathSync(process.cwd());
 const resolveApp = (relativePath) => path.resolve(appDirectory, relativePath);

 const envPublicUrl = process.env.PUBLIC_URL;

-function ensureSlash(path, needsSlash) {
-  const hasSlash = path.endsWith('/');
+function ensureSlash(inputPath, needsSlash) {
+  const hasSlash = inputPath.endsWith('/');

  if (hasSlash && !needsSlash) {
-    return path.substr(path, path.length - 1);
+    return inputPath.substr(0, inputPath.length - 1);
  } else if (!hasSlash && needsSlash) {
-    return `${path}/`;
+    return `${inputPath}/`;
  }

-  return path;
+  return inputPath;
 }

 const getPublicUrl = (appPackageJson) =>
@@ -33,23 +33,55 @@ const getPublicUrl = (appPackageJson) =>
 // like /todos/42/static/js/bundle.7289d.js. We have to know the root.
 function getServedPath(appPackageJson) {
  const publicUrl = getPublicUrl(appPackageJson);
-  const servedUrl = envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
+  const servedUrl =
+    envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');

  return ensureSlash(servedUrl, true);
 }

+const moduleFileExtensions = [
+  'web.mjs',
+  'mjs',
+  'web.js',
+  'js',
+  'web.ts',
+  'ts',
+  'web.tsx',
+  'tsx',
+  'json',
+  'web.jsx',
+  'jsx',
+];
+
+// Resolve file paths in the same order as webpack
+const resolveModule = (resolveFn, filePath) => {
+  const extension = moduleFileExtensions.find((extension) =>
+    fs.existsSync(resolveFn(`${filePath}.${extension}`)));
+
+  if (extension) {
+    return resolveFn(`${filePath}.${extension}`);
+  }
+
+  return resolveFn(`${filePath}.js`);
+};
+
 // config after eject: we're in ./config/
 module.exports = {
  dotenv: resolveApp('.env'),
+  appPath: resolveApp('.'),
  appBuild: resolveApp('build'),
  appPublic: resolveApp('public'),
  appHtml: resolveApp('public/index.html'),
-  appIndexJs: resolveApp('src/index.js'),
+  appIndexJs: resolveModule(resolveApp, 'src/index'),
  appPackageJson: resolveApp('package.json'),
  appSrc: resolveApp('src'),
+  appTsConfig: resolveApp('tsconfig.json'),
  yarnLockFile: resolveApp('yarn.lock'),
-  testsSetup: resolveApp('src/setupTests.js'),
+  testsSetup: resolveModule(resolveApp, 'src/setupTests'),
+  proxySetup: resolveApp('src/setupProxy.js'),
  appNodeModules: resolveApp('node_modules'),
  publicUrl: getPublicUrl(resolveApp('package.json')),
  servedPath: getServedPath(resolveApp('package.json')),
 };
+
+module.exports.moduleFileExtensions = moduleFileExtensions;
--- a/config/polyfills.js
+++ b/config/polyfills.js
@@ -1,21 +0,0 @@
-
-if (typeof Promise === 'undefined') {
-  // Rejection tracking prevents a common issue where React gets into an
-  // inconsistent state due to an error, but it gets swallowed by a Promise,
-  // and the user has no idea what causes React's erratic future behavior.
-  require('promise/lib/rejection-tracking').enable();
-  window.Promise = require('promise/lib/es6-extensions.js');
-}
-
-// fetch() polyfill for making API calls.
-require('whatwg-fetch');
-
-// Object.assign() is commonly used with React.
-// It will use the native implementation if it's present and isn't buggy.
-Object.assign = require('object-assign');
-
-// In tests, polyfill requestAnimationFrame since jsdom doesn't provide it yet.
-// We don't polyfill it in the browser--this is user's responsibility.
-if (process.env.NODE_ENV === 'test') {
-  require('raf').polyfill(global);
-}
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -1,308 +0,0 @@
-
-const path = require('path');
-const autoprefixer = require('autoprefixer');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
-const eslintFormatter = require('react-dev-utils/eslintFormatter');
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const getClientEnvironment = require('./env');
-const paths = require('./paths');
-
-// Webpack uses `publicPath` to determine where the app is being served from.
-// In development, we always serve from the root. This makes config easier.
-const publicPath = '/';
-
-// `publicUrl` is just like `publicPath`, but we will provide it to our app
-// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-// Omit trailing slash as %PUBLIC_PATH%/xyz looks better than %PUBLIC_PATH%xyz.
-const publicUrl = '';
-
-// Get environment variables to inject into our app.
-const env = getClientEnvironment(publicUrl);
-
-const postCssLoader = {
-  loader: require.resolve('postcss-loader'),
-  options: {
-
-    // Necessary for external CSS imports to work
-    // https://github.com/facebookincubator/create-react-app/issues/2677
-    ident: 'postcss',
-    plugins: () => [
-      require('postcss-flexbugs-fixes'),
-      autoprefixer({
-        browsers: [
-          '>1%',
-          'last 4 versions',
-          'Firefox ESR',
-          'not ie < 9',
-        ],
-        flexbox: 'no-2009',
-      }),
-    ],
-  },
-};
-
-// This is the development configuration.
-// It is focused on developer experience and fast rebuilds.
-// The production configuration is different and lives in a separate file.
-module.exports = {
-
-  // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
-  // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.
-  devtool: 'cheap-module-source-map',
-
-  // These are the "entry points" to our application.
-  // This means they will be the "root" imports that are included in JS bundle.
-  // The first two entry points enable "hot" CSS and auto-refreshes for JS.
-  entry: [
-
-    // We ship a few polyfills by default:
-    require.resolve('./polyfills'),
-
-    // Include an alternative client for WebpackDevServer. A client's job is to
-    // connect to WebpackDevServer by a socket and get notified about changes.
-    // When you save a file, the client will either apply hot updates (in case
-    // of CSS changes), or refresh the page (in case of JS changes). When you
-    // make a syntax error, this client will display a syntax error overlay.
-    // Note: instead of the default WebpackDevServer client, we use a custom one
-    // to bring better experience for Create React App users. You can replace
-    // the line below with these two lines if you prefer the stock client:
-    // require.resolve('webpack-dev-server/client') + '?/',
-    // require.resolve('webpack/hot/dev-server'),
-    require.resolve('react-dev-utils/webpackHotDevClient'),
-
-    // Finally, this is your app's code:
-    paths.appIndexJs,
-
-    // We include the app code last so that if there is a runtime error during
-    // initialization, it doesn't blow up the WebpackDevServer client, and
-    // changing JS code would still trigger a refresh.
-  ],
-  output: {
-
-    // Add /* filename */ comments to generated require()s in the output.
-    pathinfo: true,
-
-    // This does not produce a real file. It's just the virtual path that is
-    // served by WebpackDevServer in development. This is the JS bundle
-    // containing code from all our entry points, and the Webpack runtime.
-    filename: 'static/js/bundle.js',
-
-    // There are also additional JS chunk files if you use code splitting.
-    chunkFilename: 'static/js/[name].chunk.js',
-
-    // This is the URL that app is served from. We use "/" in development.
-    publicPath,
-
-    // Point sourcemap entries to original disk location (format as URL on Windows)
-    devtoolModuleFilenameTemplate: (info) =>
-      path.resolve(info.absoluteResourcePath).replace(/\\/g, '/'),
-  },
-  resolve: {
-
-    // This allows you to set a fallback for where Webpack should look for modules.
-    // We placed these paths second because we want `node_modules` to "win"
-    // if there are any conflicts. This matches Node resolution mechanism.
-    // https://github.com/facebookincubator/create-react-app/issues/253
-    modules: [ 'node_modules', paths.appNodeModules ].concat(
-
-      // It is guaranteed to exist because we tweak it in `env.js`
-      process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
-    ),
-
-    // These are the reasonable defaults supported by the Node ecosystem.
-    // We also include JSX as a common component filename extension to support
-    // some tools, although we do not recommend using it, see:
-    // https://github.com/facebookincubator/create-react-app/issues/290
-    // `web` extension prefixes have been added for better support
-    // for React Native Web.
-    extensions: [ '.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx' ],
-    alias: {
-
-      // Support React Native Web
-      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
-    },
-    plugins: [
-
-      // Prevents users from importing files from outside of src/ (or node_modules/).
-      // This often causes confusion because we only process files within src/ with babel.
-      // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
-      // please link the files into your node_modules/ and let module-resolution kick in.
-      // Make sure your source files are compiled, as they will not be processed in any way.
-      new ModuleScopePlugin(paths.appSrc, [ paths.appPackageJson ]),
-    ],
-  },
-  module: {
-    strictExportPresence: true,
-    rules: [
-
-      // TODO: Disable require.ensure as it's not a standard language feature.
-      // We are waiting for https://github.com/facebookincubator/create-react-app/issues/2176.
-      // { parser: { requireEnsure: false } },
-
-      // First, run the linter.
-      // It's important to do this before Babel processes the JS.
-      {
-        test: /\.(js|jsx|mjs)$/,
-        enforce: 'pre',
-        use: [
-          {
-            options: {
-              formatter: eslintFormatter,
-              eslintPath: require.resolve('eslint'),
-
-            },
-            loader: require.resolve('eslint-loader'),
-          },
-        ],
-        include: paths.appSrc,
-      },
-      {
-
-        // "oneOf" will traverse all following loaders until one will
-        // match the requirements. When no loader matches it will fall
-        // back to the "file" loader at the end of the loader list.
-        oneOf: [
-
-          // "url" loader works like "file" loader except that it embeds assets
-          // smaller than specified limit in bytes as data URLs to avoid requests.
-          // A missing `test` is equivalent to a match.
-          {
-            test: [ /\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/ ],
-            loader: require.resolve('url-loader'),
-            options: {
-              limit: 10000,
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
-
-          // Process JS with Babel.
-          {
-            test: /\.(js|jsx|mjs)$/,
-            include: paths.appSrc,
-            loader: require.resolve('babel-loader'),
-            options: {
-
-              // This is a feature of `babel-loader` for webpack (not Babel itself).
-              // It enables caching results in ./node_modules/.cache/babel-loader/
-              // directory for faster rebuilds.
-              cacheDirectory: true,
-            },
-          },
-
-          // "postcss" loader applies autoprefixer to our CSS.
-          // "css" loader resolves paths in CSS and adds assets as dependencies.
-          // "style" loader turns CSS into JS modules that inject <style> tags.
-          // In production, we use a plugin to extract that CSS to a file, but
-          // in development "style" loader enables hot editing of CSS.
-          {
-            test: /\.css$/,
-            use: [
-              require.resolve('style-loader'),
-              {
-                loader: require.resolve('css-loader'),
-                options: {
-                  importLoaders: 1,
-                },
-              },
-              postCssLoader,
-            ],
-          },
-          {
-            test: /\.scss$/,
-            use: ExtractTextPlugin.extract({
-              fallback: 'style-loader',
-              use: [ 'css-loader', 'sass-loader', postCssLoader ],
-            }),
-          },
-
-          // "file" loader makes sure those assets get served by WebpackDevServer.
-          // When you `import` an asset, you get its (virtual) filename.
-          // In production, they would get copied to the `build` folder.
-          // This loader doesn't use a "test" so it will catch all modules
-          // that fall through the other loaders.
-          {
-
-            // Exclude `js` files to keep "css" loader working as it injects
-            // its runtime that would otherwise processed through "file" loader.
-            // Also exclude `html` and `json` extensions so they get processed
-            // by webpacks internal loaders.
-            exclude: [ /\.(js|jsx|mjs)$/, /\.html$/, /\.json$/ ],
-            loader: require.resolve('file-loader'),
-            options: {
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
-        ],
-      },
-
-      // ** STOP ** Are you adding a new loader?
-      // Make sure to add the new loader(s) before the "file" loader.
-    ],
-  },
-  plugins: [
-
-    // Makes some environment variables available in index.html.
-    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
-    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-    // In development, this will be an empty string.
-    new InterpolateHtmlPlugin(env.raw),
-
-    // Generates an `index.html` file with the <script> injected.
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: paths.appHtml,
-    }),
-
-    // Add module names to factory functions so they appear in browser profiler.
-    new webpack.NamedModulesPlugin(),
-
-    // Makes some environment variables available to the JS code, for example:
-    // if (process.env.NODE_ENV === 'development') { ... }. See `./env.js`.
-    new webpack.DefinePlugin(env.stringified),
-
-    // This is necessary to emit hot updates (currently CSS only):
-    new webpack.HotModuleReplacementPlugin(),
-
-    // Watcher doesn't work well if you mistype casing in a path so we use
-    // a plugin that prints an error when you attempt to do this.
-    // See https://github.com/facebookincubator/create-react-app/issues/240
-    new CaseSensitivePathsPlugin(),
-
-    // If you require a missing module and then `npm install` it, you still have
-    // to restart the development server for Webpack to discover it. This plugin
-    // makes the discovery automatic so you don't have to restart.
-    // See https://github.com/facebookincubator/create-react-app/issues/186
-    new WatchMissingNodeModulesPlugin(paths.appNodeModules),
-
-    // Moment.js is an extremely popular library that bundles large locale files
-    // by default due to how Webpack interprets its code. This is a practical
-    // solution that requires the user to opt into importing specific locales.
-    // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
-    // You can remove this if you don't use Moment.js:
-    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-    new ExtractTextPlugin('main.css'),
-  ],
-
-  // Some libraries import Node modules but don't use them in the browser.
-  // Tell Webpack to provide empty mocks for them so importing them works.
-  node: {
-    dgram: 'empty',
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty',
-  },
-
-  // Turn off performance hints during development because we don't do any
-  // splitting or minification in interest of speed. These warnings become
-  // cumbersome.
-  performance: {
-    hints: false,
-  },
-};
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -0,0 +1,678 @@
+
+const fs = require('fs');
+const path = require('path');
+const webpack = require('webpack');
+const resolve = require('resolve');
+const PnpWebpackPlugin = require('pnp-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
+const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin');
+const TerserPlugin = require('terser-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const safePostCssParser = require('postcss-safe-parser');
+const ManifestPlugin = require('webpack-manifest-plugin');
+const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
+const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
+const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
+const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
+const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin-alt');
+const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
+const getClientEnvironment = require('./env');
+const paths = require('./paths');
+
+// Source maps are resource heavy and can cause out of memory issue for large source files.
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
+
+// Some apps do not need the benefits of saving a web request, so not inlining the chunk
+// makes for a smoother build process.
+const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
+
+// Check if TypeScript is setup
+const useTypeScript = fs.existsSync(paths.appTsConfig);
+
+// style files regexes
+const cssRegex = /\.css$/;
+const cssModuleRegex = /\.module\.css$/;
+const sassRegex = /\.(scss|sass)$/;
+const sassModuleRegex = /\.module\.(scss|sass)$/;
+
+// This is the production and development configuration.
+// It is focused on developer experience, fast rebuilds, and a minimal bundle.
+/* eslint-disable complexity */
+module.exports = (webpackEnv) => {
+  const isEnvDevelopment = webpackEnv === 'development';
+  const isEnvProduction = webpackEnv === 'production';
+
+  // Webpack uses `publicPath` to determine where the app is being served from.
+  // It requires a trailing slash, or the file assets will get an incorrect path.
+  // In development, we always serve from the root. This makes config easier.
+  const publicPath = isEnvProduction
+    ? paths.servedPath
+    : isEnvDevelopment && '/';
+
+  // Some apps do not use client-side routing with pushState.
+  // For these, "homepage" can be set to "." to enable relative asset paths.
+  const shouldUseRelativeAssetPaths = publicPath === './';
+
+  // `publicUrl` is just like `publicPath`, but we will provide it to our app
+  // as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
+  // Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
+  const publicUrl = isEnvProduction
+    ? publicPath.slice(0, -1)
+    : isEnvDevelopment && '';
+
+  // Get environment variables to inject into our app.
+  const env = getClientEnvironment(publicUrl);
+
+  // common function to get style loaders
+  const getStyleLoaders = (cssOptions, preProcessor) => {
+    const loaders = [
+      isEnvDevelopment && require.resolve('style-loader'),
+      isEnvProduction && {
+        loader: MiniCssExtractPlugin.loader,
+        options: Object.assign(
+          {},
+          shouldUseRelativeAssetPaths ? { publicPath: '../../' } : undefined
+        ),
+      },
+      {
+        loader: require.resolve('css-loader'),
+        options: cssOptions,
+      },
+      {
+
+        // Options for PostCSS as we reference these options twice
+        // Adds vendor prefixing based on your specified browser support in
+        // package.json
+        loader: require.resolve('postcss-loader'),
+        options: {
+
+          // Necessary for external CSS imports to work
+          // https://github.com/facebook/create-react-app/issues/2677
+          ident: 'postcss',
+          plugins: () => [
+            require('postcss-flexbugs-fixes'),
+            require('postcss-preset-env')({
+              autoprefixer: {
+                flexbox: 'no-2009',
+              },
+              stage: 3,
+            }),
+          ],
+          sourceMap: isEnvProduction && shouldUseSourceMap,
+        },
+      },
+    ].filter(Boolean);
+
+    if (preProcessor) {
+      loaders.push({
+        loader: require.resolve(preProcessor),
+        options: {
+          sourceMap: isEnvProduction && shouldUseSourceMap,
+        },
+      });
+    }
+
+    return loaders;
+  };
+
+  return {
+    mode: isEnvProduction ? 'production' : isEnvDevelopment && 'development',
+
+    // Stop compilation early in production
+    bail: isEnvProduction,
+    devtool: isEnvProduction
+      ? shouldUseSourceMap
+        ? 'source-map'
+        : false
+      : isEnvDevelopment && 'cheap-module-source-map',
+
+    // These are the "entry points" to our application.
+    // This means they will be the "root" imports that are included in JS bundle.
+    entry: [
+
+      // Include an alternative client for WebpackDevServer. A client's job is to
+      // connect to WebpackDevServer by a socket and get notified about changes.
+      // When you save a file, the client will either apply hot updates (in case
+      // of CSS changes), or refresh the page (in case of JS changes). When you
+      // make a syntax error, this client will display a syntax error overlay.
+      // Note: instead of the default WebpackDevServer client, we use a custom one
+      // to bring better experience for Create React App users. You can replace
+      // the line below with these two lines if you prefer the stock client:
+      // require.resolve('webpack-dev-server/client') + '?/',
+      // require.resolve('webpack/hot/dev-server'),
+      isEnvDevelopment &&
+        require.resolve('react-dev-utils/webpackHotDevClient'),
+
+      // Finally, this is your app's code:
+      paths.appIndexJs,
+
+      // We include the app code last so that if there is a runtime error during
+      // initialization, it doesn't blow up the WebpackDevServer client, and
+      // changing JS code would still trigger a refresh.
+    ].filter(Boolean),
+    output: {
+
+      // The build folder.
+      path: isEnvProduction ? paths.appBuild : undefined,
+
+      // Add /* filename */ comments to generated require()s in the output.
+      pathinfo: isEnvDevelopment,
+
+      // There will be one main bundle, and one file per asynchronous chunk.
+      // In development, it does not produce real files.
+      filename: isEnvProduction
+        ? 'static/js/[name].[chunkhash:8].js'
+        : isEnvDevelopment && 'static/js/bundle.js',
+
+      // There are also additional JS chunk files if you use code splitting.
+      chunkFilename: isEnvProduction
+        ? 'static/js/[name].[chunkhash:8].chunk.js'
+        : isEnvDevelopment && 'static/js/[name].chunk.js',
+
+      // We inferred the "public path" (such as / or /my-project) from homepage.
+      // We use "/" in development.
+      publicPath,
+
+      // Point sourcemap entries to original disk location (format as URL on Windows)
+      devtoolModuleFilenameTemplate: isEnvProduction
+        ? (info) =>
+          path
+            .relative(paths.appSrc, info.absoluteResourcePath)
+            .replace(/\\/g, '/')
+        : isEnvDevelopment &&
+          ((info) => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
+    },
+    optimization: {
+      minimize: isEnvProduction,
+      minimizer: [
+
+        // This is only used in production mode
+        new TerserPlugin({
+          terserOptions: {
+            parse: {
+
+              // we want terser to parse ecma 8 code. However, we don't want it
+              // to apply any minfication steps that turns valid ecma 5 code
+              // into invalid ecma 5 code. This is why the 'compress' and 'output'
+              // sections only apply transformations that are ecma 5 safe
+              // https://github.com/facebook/create-react-app/pull/4234
+              ecma: 8,
+            },
+            compress: {
+              ecma: 5,
+              warnings: false,
+
+              // Disabled because of an issue with Uglify breaking seemingly valid code:
+              // https://github.com/facebook/create-react-app/issues/2376
+              // Pending further investigation:
+              // https://github.com/mishoo/UglifyJS2/issues/2011
+              comparisons: false,
+
+              // Disabled because of an issue with Terser breaking valid code:
+              // https://github.com/facebook/create-react-app/issues/5250
+              // Pending futher investigation:
+              // https://github.com/terser-js/terser/issues/120
+              inline: 2,
+            },
+            mangle: {
+              safari10: true,
+            },
+            output: {
+              ecma: 5,
+              comments: false,
+
+              // Turned on because emoji and regex is not minified properly using default
+              // https://github.com/facebook/create-react-app/issues/2488
+              ascii_only: true,
+            },
+          },
+
+          // Use multi-process parallel running to improve the build speed
+          // Default number of concurrent runs: os.cpus().length - 1
+          parallel: true,
+
+          // Enable file caching
+          cache: true,
+          sourceMap: shouldUseSourceMap,
+        }),
+
+        // This is only used in production mode
+        new OptimizeCSSAssetsPlugin({
+          cssProcessorOptions: {
+            parser: safePostCssParser,
+            map: shouldUseSourceMap
+              ? {
+
+                // `inline: false` forces the sourcemap to be output into a
+                // separate file
+                inline: false,
+
+                // `annotation: true` appends the sourceMappingURL to the end of
+                // the css file, helping the browser find the sourcemap
+                annotation: true,
+              }
+              : false,
+          },
+        }),
+      ],
+
+      // Automatically split vendor and commons
+      // https://twitter.com/wSokra/status/969633336732905474
+      // https://medium.com/webpack/webpack-4-code-splitting-chunk-graph-and-the-splitchunks-optimization-be739a861366
+      splitChunks: {
+        chunks: 'all',
+        name: false,
+      },
+
+      // Keep the runtime chunk separated to enable long term caching
+      // https://twitter.com/wSokra/status/969679223278505985
+      runtimeChunk: true,
+    },
+    resolve: {
+
+      // This allows you to set a fallback for where Webpack should look for modules.
+      // We placed these paths second because we want `node_modules` to "win"
+      // if there are any conflicts. This matches Node resolution mechanism.
+      // https://github.com/facebook/create-react-app/issues/253
+      modules: [ 'node_modules' ].concat(
+
+        // It is guaranteed to exist because we tweak it in `env.js`
+        process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
+      ),
+
+      // These are the reasonable defaults supported by the Node ecosystem.
+      // We also include JSX as a common component filename extension to support
+      // some tools, although we do not recommend using it, see:
+      // https://github.com/facebook/create-react-app/issues/290
+      // `web` extension prefixes have been added for better support
+      // for React Native Web.
+      extensions: paths.moduleFileExtensions
+        .map((ext) => `.${ext}`)
+        .filter((ext) => useTypeScript || !ext.includes('ts')),
+      alias: {
+
+        // Support React Native Web
+        // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
+        'react-native': 'react-native-web',
+      },
+      plugins: [
+
+        // Adds support for installing with Plug'n'Play, leading to faster installs and adding
+        // guards against forgotten dependencies and such.
+        PnpWebpackPlugin,
+
+        // Prevents users from importing files from outside of src/ (or node_modules/).
+        // This often causes confusion because we only process files within src/ with babel.
+        // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
+        // please link the files into your node_modules/ and let module-resolution kick in.
+        // Make sure your source files are compiled, as they will not be processed in any way.
+        new ModuleScopePlugin(paths.appSrc, [ paths.appPackageJson ]),
+      ],
+    },
+    resolveLoader: {
+      plugins: [
+
+        // Also related to Plug'n'Play, but this time it tells Webpack to load its loaders
+        // from the current package.
+        PnpWebpackPlugin.moduleLoader(module),
+      ],
+    },
+    module: {
+      strictExportPresence: true,
+      rules: [
+
+        // Disable require.ensure as it's not a standard language feature.
+        { parser: { requireEnsure: false } },
+
+        // First, run the linter.
+        // It's important to do this before Babel processes the JS.
+        {
+          test: /\.(js|mjs|jsx)$/,
+          enforce: 'pre',
+          use: [
+            {
+              options: {
+                formatter: require.resolve('react-dev-utils/eslintFormatter'),
+                eslintPath: require.resolve('eslint'),
+
+              },
+              loader: require.resolve('eslint-loader'),
+            },
+          ],
+          include: paths.appSrc,
+        },
+        {
+
+          // "oneOf" will traverse all following loaders until one will
+          // match the requirements. When no loader matches it will fall
+          // back to the "file" loader at the end of the loader list.
+          oneOf: [
+
+            // "url" loader works like "file" loader except that it embeds assets
+            // smaller than specified limit in bytes as data URLs to avoid requests.
+            // A missing `test` is equivalent to a match.
+            {
+              test: [ /\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/ ],
+              loader: require.resolve('url-loader'),
+              options: {
+                limit: 10000,
+                name: 'static/media/[name].[hash:8].[ext]',
+              },
+            },
+
+            // Process application JS with Babel.
+            // The preset includes JSX, Flow, TypeScript, and some ESnext features.
+            {
+              test: /\.(js|mjs|jsx|ts|tsx)$/,
+              include: paths.appSrc,
+              loader: require.resolve('babel-loader'),
+              options: {
+                customize: require.resolve(
+                  'babel-preset-react-app/webpack-overrides'
+                ),
+
+                plugins: [
+                  [
+                    require.resolve('babel-plugin-named-asset-import'),
+                    {
+                      loaderMap: {
+                        svg: {
+                          ReactComponent:
+                            '@svgr/webpack?-prettier,-svgo![path]',
+                        },
+                      },
+                    },
+                  ],
+                ],
+
+                // This is a feature of `babel-loader` for webpack (not Babel itself).
+                // It enables caching results in ./node_modules/.cache/babel-loader/
+                // directory for faster rebuilds.
+                cacheDirectory: true,
+                cacheCompression: isEnvProduction,
+                compact: isEnvProduction,
+              },
+            },
+
+            // Process any JS outside of the app with Babel.
+            // Unlike the application JS, we only compile the standard ES features.
+            {
+              test: /\.(js|mjs)$/,
+              exclude: /@babel(?:\/|\\{1,2})runtime/,
+              loader: require.resolve('babel-loader'),
+              options: {
+                babelrc: false,
+                configFile: false,
+                compact: false,
+                presets: [
+                  [
+                    require.resolve('babel-preset-react-app/dependencies'),
+                    { helpers: true },
+                  ],
+                ],
+                cacheDirectory: true,
+                cacheCompression: isEnvProduction,
+
+                // If an error happens in a package, it's possible to be
+                // because it was compiled. Thus, we don't want the browser
+                // debugger to show the original code. Instead, the code
+                // being evaluated would be much more helpful.
+                sourceMaps: false,
+              },
+            },
+
+            // "postcss" loader applies autoprefixer to our CSS.
+            // "css" loader resolves paths in CSS and adds assets as dependencies.
+            // "style" loader turns CSS into JS modules that inject <style> tags.
+            // In production, we use MiniCSSExtractPlugin to extract that CSS
+            // to a file, but in development "style" loader enables hot editing
+            // of CSS.
+            // By default we support CSS Modules with the extension .module.css
+            {
+              test: cssRegex,
+              exclude: cssModuleRegex,
+              use: getStyleLoaders({
+                importLoaders: 1,
+                sourceMap: isEnvProduction && shouldUseSourceMap,
+              }),
+
+              // Don't consider CSS imports dead code even if the
+              // containing package claims to have no side effects.
+              // Remove this when webpack adds a warning or an error for this.
+              // See https://github.com/webpack/webpack/issues/6571
+              sideEffects: true,
+            },
+
+            // Adds support for CSS Modules (https://github.com/css-modules/css-modules)
+            // using the extension .module.css
+            {
+              test: cssModuleRegex,
+              use: getStyleLoaders({
+                importLoaders: 1,
+                sourceMap: isEnvProduction && shouldUseSourceMap,
+                modules: true,
+                getLocalIdent: getCSSModuleLocalIdent,
+              }),
+            },
+
+            // Opt-in support for SASS (using .scss or .sass extensions).
+            // By default we support SASS Modules with the
+            // extensions .module.scss or .module.sass
+            {
+              test: sassRegex,
+              exclude: sassModuleRegex,
+              use: getStyleLoaders(
+                {
+                  importLoaders: 2,
+                  sourceMap: isEnvProduction && shouldUseSourceMap,
+                },
+                'sass-loader'
+              ),
+
+              // Don't consider CSS imports dead code even if the
+              // containing package claims to have no side effects.
+              // Remove this when webpack adds a warning or an error for this.
+              // See https://github.com/webpack/webpack/issues/6571
+              sideEffects: true,
+            },
+
+            // Adds support for CSS Modules, but using SASS
+            // using the extension .module.scss or .module.sass
+            {
+              test: sassModuleRegex,
+              use: getStyleLoaders(
+                {
+                  importLoaders: 2,
+                  sourceMap: isEnvProduction && shouldUseSourceMap,
+                  modules: true,
+                  getLocalIdent: getCSSModuleLocalIdent,
+                },
+                'sass-loader'
+              ),
+            },
+
+            // "file" loader makes sure those assets get served by WebpackDevServer.
+            // When you `import` an asset, you get its (virtual) filename.
+            // In production, they would get copied to the `build` folder.
+            // This loader doesn't use a "test" so it will catch all modules
+            // that fall through the other loaders.
+            {
+              loader: require.resolve('file-loader'),
+
+              // Exclude `js` files to keep "css" loader working as it injects
+              // its runtime that would otherwise be processed through "file" loader.
+              // Also exclude `html` and `json` extensions so they get processed
+              // by webpacks internal loaders.
+              exclude: [ /\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/ ],
+              options: {
+                name: 'static/media/[name].[hash:8].[ext]',
+              },
+            },
+
+            // ** STOP ** Are you adding a new loader?
+            // Make sure to add the new loader(s) before the "file" loader.
+          ],
+        },
+      ],
+    },
+    plugins: [
+
+      // Generates an `index.html` file with the <script> injected.
+      new HtmlWebpackPlugin(
+        Object.assign(
+          {},
+          {
+            inject: true,
+            template: paths.appHtml,
+          },
+          isEnvProduction
+            ? {
+              minify: {
+                removeComments: true,
+                collapseWhitespace: true,
+                removeRedundantAttributes: true,
+                useShortDoctype: true,
+                removeEmptyAttributes: true,
+                removeStyleLinkTypeAttributes: true,
+                keepClosingSlash: true,
+                minifyJS: true,
+                minifyCSS: true,
+                minifyURLs: true,
+              },
+            }
+            : undefined
+        )
+      ),
+
+      // Inlines the webpack runtime script. This script is too small to warrant
+      // a network request.
+      isEnvProduction &&
+        shouldInlineRuntimeChunk &&
+        new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [ /runtime~.+[.]js/ ]),
+
+      // Makes some environment variables available in index.html.
+      // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
+      // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+      // In production, it will be an empty string unless you specify "homepage"
+      // in `package.json`, in which case it will be the pathname of that URL.
+      // In development, this will be an empty string.
+      new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
+
+      // This gives some necessary context to module not found errors, such as
+      // the requesting resource.
+      new ModuleNotFoundPlugin(paths.appPath),
+
+      // Makes some environment variables available to the JS code, for example:
+      // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
+      // It is absolutely essential that NODE_ENV is set to production
+      // during a production build.
+      // Otherwise React will be compiled in the very slow development mode.
+      new webpack.DefinePlugin(env.stringified),
+
+      // This is necessary to emit hot updates (currently CSS only):
+      isEnvDevelopment && new webpack.HotModuleReplacementPlugin(),
+
+      // Watcher doesn't work well if you mistype casing in a path so we use
+      // a plugin that prints an error when you attempt to do this.
+      // See https://github.com/facebook/create-react-app/issues/240
+      isEnvDevelopment && new CaseSensitivePathsPlugin(),
+
+      // If you require a missing module and then `npm install` it, you still have
+      // to restart the development server for Webpack to discover it. This plugin
+      // makes the discovery automatic so you don't have to restart.
+      // See https://github.com/facebook/create-react-app/issues/186
+      isEnvDevelopment &&
+        new WatchMissingNodeModulesPlugin(paths.appNodeModules),
+      isEnvProduction &&
+        new MiniCssExtractPlugin({
+
+          // Options similar to the same options in webpackOptions.output
+          // both options are optional
+          filename: 'static/css/[name].[contenthash:8].css',
+          chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
+        }),
+
+      // Generate a manifest file which contains a mapping of all asset filenames
+      // to their corresponding output file so that tools can pick it up without
+      // having to parse `index.html`.
+      new ManifestPlugin({
+        fileName: 'asset-manifest.json',
+        publicPath,
+      }),
+
+      // Moment.js is an extremely popular library that bundles large locale files
+      // by default due to how Webpack interprets its code. This is a practical
+      // solution that requires the user to opt into importing specific locales.
+      // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
+      // You can remove this if you don't use Moment.js:
+      new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+
+      // Generate a service worker script that will precache, and keep up to date,
+      // the HTML & assets that are part of the Webpack build.
+      isEnvProduction &&
+        new WorkboxWebpackPlugin.GenerateSW({
+          clientsClaim: true,
+          exclude: [ /\.map$/, /asset-manifest\.json$/ ],
+          importWorkboxFrom: 'cdn',
+          navigateFallback: `${publicUrl}/index.html`,
+          navigateFallbackBlacklist: [
+
+            // Exclude URLs starting with /_, as they're likely an API call
+            new RegExp('^/_'),
+
+            // Exclude URLs containing a dot, as they're likely a resource in
+            // public/ and not a SPA route
+            new RegExp('/[^/]+\\.[^/]+$'),
+          ],
+        }),
+
+      // TypeScript type checking
+      useTypeScript &&
+        new ForkTsCheckerWebpackPlugin({
+          typescript: resolve.sync('typescript', {
+            basedir: paths.appNodeModules,
+          }),
+          async: false,
+          checkSyntacticErrors: true,
+          tsconfig: paths.appTsConfig,
+          compilerOptions: {
+            module: 'esnext',
+            moduleResolution: 'node',
+            resolveJsonModule: true,
+            isolatedModules: true,
+            noEmit: true,
+            jsx: 'preserve',
+          },
+          reportFiles: [
+            '**',
+            '!**/*.json',
+            '!**/__tests__/**',
+            '!**/?(*.)(spec|test).*',
+            '!**/src/setupProxy.*',
+            '!**/src/setupTests.*',
+          ],
+          watch: paths.appSrc,
+          silent: true,
+          formatter: typescriptFormatter,
+        }),
+    ].filter(Boolean),
+
+    // Some libraries import Node modules but don't use them in the browser.
+    // Tell Webpack to provide empty mocks for them so importing them works.
+    node: {
+      dgram: 'empty',
+      fs: 'empty',
+      net: 'empty',
+      tls: 'empty',
+      child_process: 'empty',
+    },
+
+    // Turn off performance processing because we utilize
+    // our own hints via the FileSizeReporter
+    performance: false,
+  };
+};
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -1,385 +0,0 @@
-
-const path = require('path');
-const autoprefixer = require('autoprefixer');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const ManifestPlugin = require('webpack-manifest-plugin');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
-const eslintFormatter = require('react-dev-utils/eslintFormatter');
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-const paths = require('./paths');
-const getClientEnvironment = require('./env');
-
-// Webpack uses `publicPath` to determine where the app is being served from.
-// It requires a trailing slash, or the file assets will get an incorrect path.
-const publicPath = paths.servedPath;
-
-// Some apps do not use client-side routing with pushState.
-// For these, "homepage" can be set to "." to enable relative asset paths.
-const shouldUseRelativeAssetPaths = publicPath === './';
-
-// Source maps are resource heavy and can cause out of memory issue for large source files.
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
-
-// `publicUrl` is just like `publicPath`, but we will provide it to our app
-// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-// Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
-const publicUrl = publicPath.slice(0, -1);
-
-// Get environment variables to inject into our app.
-const env = getClientEnvironment(publicUrl);
-
-// Assert this just to be safe.
-// Development builds of React are slow and not intended for production.
-if (env.stringified['process.env'].NODE_ENV !== '"production"') {
-  throw new Error('Production builds must have NODE_ENV=production.');
-}
-
-// Note: defined here because it will be used more than once.
-const cssFilename = 'static/css/[name].[contenthash:8].css';
-
-// ExtractTextPlugin expects the build output to be flat.
-// (See https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/27)
-// However, our output is structured with css, js and media folders.
-// To have this structure working with relative paths, we have to use custom options.
-// Making sure that the publicPath goes back to to build folder.
-const extractTextPluginOptions = shouldUseRelativeAssetPaths
-  ? { publicPath: Array(cssFilename.split('/').length).join('../') }
-  : {};
-
-// This is the production configuration.
-// It compiles slowly and is focused on producing a fast and minimal bundle.
-// The development configuration is different and lives in a separate file.
-module.exports = {
-
-  // Don't attempt to continue if there are any errors.
-  bail: true,
-
-  // We generate sourcemaps in production. This is slow but gives good results.
-  // You can exclude the *.map files from the build during deployment.
-  devtool: shouldUseSourceMap ? 'source-map' : false,
-
-  // In production, we only want to load the polyfills and the app code.
-  entry: [ require.resolve('./polyfills'), paths.appIndexJs ],
-  output: {
-
-    // The build folder.
-    path: paths.appBuild,
-
-    // Generated JS file names (with nested folders).
-    // There will be one main bundle, and one file per asynchronous chunk.
-    // We don't currently advertise code splitting but Webpack supports it.
-    filename: 'static/js/[name].[chunkhash:8].js',
-    chunkFilename: 'static/js/[name].[chunkhash:8].chunk.js',
-
-    // We inferred the "public path" (such as / or /my-project) from homepage.
-    publicPath,
-
-    // Point sourcemap entries to original disk location (format as URL on Windows)
-    devtoolModuleFilenameTemplate: (info) =>
-      path
-        .relative(paths.appSrc, info.absoluteResourcePath)
-        .replace(/\\/g, '/'),
-  },
-  resolve: {
-
-    // This allows you to set a fallback for where Webpack should look for modules.
-    // We placed these paths second because we want `node_modules` to "win"
-    // if there are any conflicts. This matches Node resolution mechanism.
-    // https://github.com/facebookincubator/create-react-app/issues/253
-    modules: [ 'node_modules', paths.appNodeModules ].concat(
-
-      // It is guaranteed to exist because we tweak it in `env.js`
-      process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
-    ),
-
-    // These are the reasonable defaults supported by the Node ecosystem.
-    // We also include JSX as a common component filename extension to support
-    // some tools, although we do not recommend using it, see:
-    // https://github.com/facebookincubator/create-react-app/issues/290
-    // `web` extension prefixes have been added for better support
-    // for React Native Web.
-    extensions: [ '.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx' ],
-    alias: {
-
-      // Support React Native Web
-      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
-    },
-    plugins: [
-
-      // Prevents users from importing files from outside of src/ (or node_modules/).
-      // This often causes confusion because we only process files within src/ with babel.
-      // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
-      // please link the files into your node_modules/ and let module-resolution kick in.
-      // Make sure your source files are compiled, as they will not be processed in any way.
-      new ModuleScopePlugin(paths.appSrc, [ paths.appPackageJson ]),
-    ],
-  },
-  module: {
-    strictExportPresence: true,
-    rules: [
-
-      // TODO: Disable require.ensure as it's not a standard language feature.
-      // We are waiting for https://github.com/facebookincubator/create-react-app/issues/2176.
-      // { parser: { requireEnsure: false } },
-
-      // First, run the linter.
-      // It's important to do this before Babel processes the JS.
-      {
-        test: /\.(js|jsx|mjs)$/,
-        enforce: 'pre',
-        use: [
-          {
-            options: {
-              formatter: eslintFormatter,
-              eslintPath: require.resolve('eslint'),
-
-            },
-            loader: require.resolve('eslint-loader'),
-          },
-        ],
-        include: paths.appSrc,
-      },
-      {
-
-        // "oneOf" will traverse all following loaders until one will
-        // match the requirements. When no loader matches it will fall
-        // back to the "file" loader at the end of the loader list.
-        oneOf: [
-
-          // "url" loader works just like "file" loader but it also embeds
-          // assets smaller than specified size as data URLs to avoid requests.
-          {
-            test: [ /\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/ ],
-            loader: require.resolve('url-loader'),
-            options: {
-              limit: 10000,
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
-
-          // Process JS with Babel.
-          {
-            test: /\.(js|jsx|mjs)$/,
-            include: paths.appSrc,
-            loader: require.resolve('babel-loader'),
-            options: {
-
-              compact: true,
-            },
-          },
-
-          // The notation here is somewhat confusing.
-          // "postcss" loader applies autoprefixer to our CSS.
-          // "css" loader resolves paths in CSS and adds assets as dependencies.
-          // "style" loader normally turns CSS into JS modules injecting <style>,
-          // but unlike in development configuration, we do something different.
-          // `ExtractTextPlugin` first applies the "postcss" and "css" loaders
-          // (second argument), then grabs the result CSS and puts it into a
-          // separate file in our build process. This way we actually ship
-          // a single CSS file in production instead of JS code injecting <style>
-          // tags. If you use code splitting, however, any async bundles will still
-          // use the "style" loader inside the async code so CSS from them won't be
-          // in the main CSS file.
-          {
-            test: [ /\.css$/, /\.scss$/ ],
-            loader: ExtractTextPlugin.extract(
-              Object.assign(
-                {
-                  fallback: {
-                    loader: require.resolve('style-loader'),
-                    options: {
-                      hmr: false,
-                    },
-                  },
-                  use: [
-                    {
-                      loader: require.resolve('css-loader'),
-                      options: {
-                        importLoaders: 1,
-                        minimize: true,
-                        sourceMap: shouldUseSourceMap,
-                      },
-                    },
-                    {
-                      loader: require.resolve('sass-loader'),
-                    },
-                    {
-                      loader: require.resolve('postcss-loader'),
-                      options: {
-
-                        // Necessary for external CSS imports to work
-                        // https://github.com/facebookincubator/create-react-app/issues/2677
-                        ident: 'postcss',
-                        plugins: () => [
-                          require('postcss-flexbugs-fixes'),
-                          autoprefixer({
-                            browsers: [
-                              '>1%',
-                              'last 4 versions',
-                              'Firefox ESR',
-                              'not ie < 9',
-                            ],
-                            flexbox: 'no-2009',
-                          }),
-                        ],
-                      },
-                    },
-                  ],
-                },
-                extractTextPluginOptions
-              )
-            ),
-
-            // Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
-          },
-
-          // "file" loader makes sure assets end up in the `build` folder.
-          // When you `import` an asset, you get its filename.
-          // This loader doesn't use a "test" so it will catch all modules
-          // that fall through the other loaders.
-          {
-            loader: require.resolve('file-loader'),
-
-            // Exclude `js` files to keep "css" loader working as it injects
-            // it's runtime that would otherwise processed through "file" loader.
-            // Also exclude `html` and `json` extensions so they get processed
-            // by webpacks internal loaders.
-            exclude: [ /\.(js|jsx|mjs)$/, /\.html$/, /\.json$/ ],
-            options: {
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
-
-          // ** STOP ** Are you adding a new loader?
-          // Make sure to add the new loader(s) before the "file" loader.
-        ],
-      },
-    ],
-  },
-  plugins: [
-
-    // Makes some environment variables available in index.html.
-    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
-    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-    // In production, it will be an empty string unless you specify "homepage"
-    // in `package.json`, in which case it will be the pathname of that URL.
-    new InterpolateHtmlPlugin(env.raw),
-
-    // Generates an `index.html` file with the <script> injected.
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: paths.appHtml,
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeRedundantAttributes: true,
-        useShortDoctype: true,
-        removeEmptyAttributes: true,
-        removeStyleLinkTypeAttributes: true,
-        keepClosingSlash: true,
-        minifyJS: true,
-        minifyCSS: true,
-        minifyURLs: true,
-      },
-    }),
-
-    // Makes some environment variables available to the JS code, for example:
-    // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
-    // It is absolutely essential that NODE_ENV was set to production here.
-    // Otherwise React will be compiled in the very slow development mode.
-    new webpack.DefinePlugin(env.stringified),
-
-    // Minify the code.
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false,
-
-        // Disabled because of an issue with Uglify breaking seemingly valid code:
-        // https://github.com/facebookincubator/create-react-app/issues/2376
-        // Pending further investigation:
-        // https://github.com/mishoo/UglifyJS2/issues/2011
-        comparisons: false,
-      },
-      mangle: {
-        safari10: true,
-      },
-      output: {
-        comments: false,
-
-        // Turned on because emoji and regex is not minified properly using default
-        // https://github.com/facebookincubator/create-react-app/issues/2488
-        ascii_only: true,
-      },
-      sourceMap: shouldUseSourceMap,
-    }),
-
-    // Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
-    new ExtractTextPlugin({
-      filename: cssFilename,
-    }),
-
-    // Generate a manifest file which contains a mapping of all asset filenames
-    // to their corresponding output file so that tools can pick it up without
-    // having to parse `index.html`.
-    new ManifestPlugin({
-      fileName: 'asset-manifest.json',
-    }),
-
-    // Generate a service worker script that will precache, and keep up to date,
-    // the HTML & assets that are part of the Webpack build.
-    new SWPrecacheWebpackPlugin({
-
-      // By default, a cache-busting query parameter is appended to requests
-      // used to populate the caches, to ensure the responses are fresh.
-      // If a URL is already hashed by Webpack, then there is no concern
-      // about it being stale, and the cache-busting can be skipped.
-      dontCacheBustUrlsMatching: /\.\w{8}\./,
-      filename: 'service-worker.js',
-      logger(message) {
-        if (message.indexOf('Total precache size is') === 0) {
-          // This message occurs for every build and is a bit too noisy.
-          return;
-        }
-        if (message.indexOf('Skipping static resource') === 0) {
-          // This message obscures real errors so we ignore it.
-          // https://github.com/facebookincubator/create-react-app/issues/2612
-          return;
-        }
-
-        console.log(message); // eslint-disable-line
-      },
-      minify: true,
-
-      // For unknown URLs, fallback to the index page
-      navigateFallback: `${publicUrl}/index.html`,
-
-      // Ignores URLs starting from /__ (useful for Firebase):
-      // https://github.com/facebookincubator/create-react-app/issues/2237#issuecomment-302693219
-      navigateFallbackWhitelist: [ /^(?!\/__).*/ ],
-
-      // Don't precache sourcemaps (they're large) and build asset manifest:
-      staticFileGlobsIgnorePatterns: [ /\.map$/, /asset-manifest\.json$/ ],
-    }),
-
-    // Moment.js is an extremely popular library that bundles large locale files
-    // by default due to how Webpack interprets its code. This is a practical
-    // solution that requires the user to opt into importing specific locales.
-    // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
-    // You can remove this if you don't use Moment.js:
-    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-  ],
-
-  // Some libraries import Node modules but don't use them in the browser.
-  // Tell Webpack to provide empty mocks for them so importing them works.
-  node: {
-    dgram: 'empty',
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty',
-  },
-};
--- a/config/webpackDevServer.config.js
+++ b/config/webpackDevServer.config.js
@@ -1,8 +1,9 @@

+const fs = require('fs');
 const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
+const evalSourceMapMiddleware = require('react-dev-utils/evalSourceMapMiddleware');
 const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
 const ignoredFiles = require('react-dev-utils/ignoredFiles');
-const config = require('./webpack.config.dev');
 const paths = require('./paths');

 const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
@@ -17,8 +18,8 @@ module.exports = function(proxy, allowedHost) {
    // https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a
    // However, it made several existing use cases such as development in cloud
    // environment or subdomains in development significantly more complicated:
-    // https://github.com/facebookincubator/create-react-app/issues/2271
-    // https://github.com/facebookincubator/create-react-app/issues/2233
+    // https://github.com/facebook/create-react-app/issues/2271
+    // https://github.com/facebook/create-react-app/issues/2233
    // While we're investigating better solutions, for now we will take a
    // compromise. Since our WDS configuration only serves files in the `public`
    // folder we won't consider accessing them a vulnerability. However, if you
@@ -65,16 +66,16 @@ module.exports = function(proxy, allowedHost) {

    // It is important to tell WebpackDevServer to use the same "root" path
    // as we specified in the config. In development, we always serve from /.
-    publicPath: config.output.publicPath,
+    publicPath: '/',

    // WebpackDevServer is noisy by default so we emit custom message instead
-    // by listening to the compiler events with `compiler.plugin` calls above.
+    // by listening to the compiler events with `compiler.hooks[...].tap` calls above.
    quiet: true,

    // Reportedly, this avoids CPU overload on some systems.
-    // https://github.com/facebookincubator/create-react-app/issues/293
+    // https://github.com/facebook/create-react-app/issues/293
    // src/node_modules is not ignored to support absolute imports
-    // https://github.com/facebookincubator/create-react-app/issues/1065
+    // https://github.com/facebook/create-react-app/issues/1065
    watchOptions: {
      ignored: ignoredFiles(paths.appSrc),
    },
@@ -86,12 +87,20 @@ module.exports = function(proxy, allowedHost) {
    historyApiFallback: {

      // Paths with dots should still use the history fallback.
-      // See https://github.com/facebookincubator/create-react-app/issues/387.
+      // See https://github.com/facebook/create-react-app/issues/387.
      disableDotRule: true,
    },
    public: allowedHost,
    proxy,
-    before(app) {
+    before(app, server) {
+      if (fs.existsSync(paths.proxySetup)) {
+        // This registers user provided middleware for proxy reasons
+        require(paths.proxySetup)(app);
+      }
+
+      // This lets us fetch source contents from webpack for the error overlay
+      app.use(evalSourceMapMiddleware(server));
+
      // This lets us open files from the runtime error overlay.
      app.use(errorOverlayMiddleware());

@@ -99,7 +108,7 @@ module.exports = function(proxy, allowedHost) {
      // previous service worker registered for the same host:port combination.
      // We do this in development to avoid hitting the production cache if
      // it used the same host and port.
-      // https://github.com/facebookincubator/create-react-app/issues/2272#issuecomment-302832432
+      // https://github.com/facebook/create-react-app/issues/2272#issuecomment-302832432
      app.use(noopServiceWorkerMiddleware());
    },
  };
--- a/docker-compose.override.yml.dist
+++ b/docker-compose.override.yml.dist
@@ -6,3 +6,4 @@ services:
    volumes:
      - /etc/passwd:/etc/passwd:ro
      - /etc/group:/etc/group:ro
+      - ./home:/home/alejandro
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3'
 services:
  shlink_web_client_node:
    container_name: shlink_web_client_node
-    image: node:10.4.1-alpine
-    command: /bin/sh -c "cd /home/shlink/www && yarn install && yarn start"
+    image: node:10.16.3-alpine
+    command: /bin/sh -c "cd /home/shlink/www && npm install && npm run start"
    volumes:
      - ./:/home/shlink/www
    ports:
--- a/6
+++ b/6
@@ -1,2 +1,8 @@
 #!/usr/bin/env bash
+
+# Run docker container if it's not up yet
+if ! [[ $(docker ps | grep shlink_web_client_node) ]]; then
+    docker-compose up -d
+fi
+
 docker exec -it shlink_web_client_node /bin/sh -c "cd /home/shlink/www && $*"
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,33 +1,44 @@
 module.exports = {
  coverageDirectory: '<rootDir>/coverage',
  collectCoverageFrom: [
-    'src/**/*.{js,jsx,mjs}',
+    'src/**/*.js',
    '!src/registerServiceWorker.js',
    '!src/index.js',
+    '!src/reducers/index.js',
+    '!src/**/provideServices.js',
+    '!src/container/*.js',
  ],
+  resolver: 'jest-pnp-resolver',
  setupFiles: [
-    '<rootDir>/config/polyfills.js',
+    'react-app-polyfill/jsdom',
    '<rootDir>/config/setupEnzyme.js',
  ],
-  testMatch: [ '<rootDir>/test/**/*.test.{js,jsx,mjs}' ],
-  testEnvironment: 'node',
+  testMatch: [ '<rootDir>/test/**/*.test.{js,jsx,ts,tsx}' ],
+  testEnvironment: 'jsdom',
  testURL: 'http://localhost',
  transform: {
    '^.+\\.(js|jsx|mjs)$': '<rootDir>/node_modules/babel-jest',
    '^.+\\.css$': '<rootDir>/config/jest/cssTransform.js',
    '^(?!.*\\.(js|jsx|mjs|css|json)$)': '<rootDir>/config/jest/fileTransform.js',
  },
-  transformIgnorePatterns: [ '[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs)$' ],
+  transformIgnorePatterns: [
+    '[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$',
+    '^.+\\.module\\.(css|sass|scss)$',
+  ],
  moduleNameMapper: {
    '^react-native$': 'react-native-web',
+    '^.+\\.module\\.(css|sass|scss)$': 'identity-obj-proxy',
  },
  moduleFileExtensions: [
    'web.js',
    'js',
+    'web.ts',
+    'ts',
+    'web.tsx',
+    'tsx',
    'json',
    'web.jsx',
    'jsx',
    'node',
-    'mjs',
  ],
 };
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -3,108 +3,151 @@
  "description": "A React-based progressive web application for shlink",
  "version": "1.0.0",
  "private": false,
+  "homepage": "",
+  "repository": "https://github.com/shlinkio/shlink-web-client",
+  "license": "MIT",
  "scripts": {
-    "lint": "yarn lint:js && yarn lint:css",
+    "lint": "npm run lint:js && npm run lint:css",
    "lint:js": "eslint src test scripts config",
-    "lint:js:fix": "yarn lint:js --fix",
+    "lint:js:fix": "npm run lint:js -- --fix",
    "lint:css": "stylelint src/*.scss src/**/*.scss",
-    "lint:css:fix": "yarn lint:css --fix",
+    "lint:css:fix": "npm run lint:css -- --fix",
    "start": "node scripts/start.js",
+    "serve:build": "serve ./build",
    "build": "node scripts/build.js",
    "test": "node scripts/test.js --env=jsdom --colors",
-    "test:ci": "yarn test --coverage --coverageReporters=text --coverageReporters=text-summary --coverageReporters=clover",
-    "test:pretty": "yarn test --coverage --coverageReporters=text --coverageReporters=text-summary --coverageReporters=html"
+    "test:ci": "npm run test -- --coverage --coverageReporters=text --coverageReporters=text-summary --coverageReporters=clover",
+    "test:pretty": "npm run test -- --coverage --coverageReporters=text --coverageReporters=text-summary --coverageReporters=html",
+    "mutate": "./node_modules/.bin/stryker run",
+    "mutate:ci": "npm run mutate -- --mutate=$MUTATION_FILES"
  },
  "dependencies": {
-    "@fortawesome/fontawesome": "^1.1.8",
-    "@fortawesome/fontawesome-free-regular": "^5.0.13",
-    "@fortawesome/fontawesome-free-solid": "^5.0.13",
-    "@fortawesome/react-fontawesome": "0.0.19",
+    "@fortawesome/fontawesome-free": "^5.6.3",
+    "@fortawesome/fontawesome-svg-core": "^1.2.0",
+    "@fortawesome/free-regular-svg-icons": "^5.6.3",
+    "@fortawesome/free-solid-svg-icons": "^5.6.3",
+    "@fortawesome/react-fontawesome": "^0.1.3",
+    "array-filter": "^1.0.0",
+    "array-map": "^0.0.0",
+    "array-reduce": "^0.0.0",
    "axios": "^0.18.0",
-    "bootstrap": "^4.1.1",
+    "bootstrap": "^4.3.1",
+    "bottlejs": "^1.7.1",
    "chart.js": "^2.7.2",
    "classnames": "^2.2.6",
    "csvjson": "^5.1.0",
+    "leaflet": "^1.4.0",
    "moment": "^2.22.2",
-    "promise": "8.0.1",
+    "promise": "^8.0.1",
    "prop-types": "^15.6.2",
    "qs": "^6.5.2",
-    "ramda": "^0.25.0",
-    "react": "^16.3.2",
+    "ramda": "^0.26.1",
+    "react": "^16.8.0",
    "react-autosuggest": "^9.4.0",
    "react-chartjs-2": "^2.7.4",
    "react-color": "^2.14.1",
    "react-copy-to-clipboard": "^5.0.1",
-    "react-datepicker": "^1.5.0",
-    "react-dom": "^16.3.2",
+    "react-datepicker": "~1.5.0",
+    "react-dom": "^16.8.0",
+    "react-external-link": "^1.0.0",
+    "react-leaflet": "^2.2.1",
    "react-moment": "^0.7.6",
    "react-redux": "^5.0.7",
    "react-router-dom": "^4.2.2",
    "react-swipeable": "^4.3.0",
    "react-tagsinput": "^3.19.0",
-    "reactstrap": "^6.0.1",
+    "reactstrap": "^7.1.0",
    "redux": "^4.0.0",
+    "redux-actions": "^2.6.5",
    "redux-thunk": "^2.3.0",
    "uuid": "^3.3.2"
  },
  "devDependencies": {
-    "adm-zip": "^0.4.11",
-    "autoprefixer": "7.1.6",
-    "babel-core": "6.26.0",
-    "babel-eslint": "7.2.3",
-    "babel-jest": "20.0.3",
-    "babel-loader": "^7.1.2",
-    "babel-preset-react-app": "^3.1.1",
-    "babel-runtime": "6.26.0",
-    "case-sensitive-paths-webpack-plugin": "2.1.1",
-    "chalk": "1.1.3",
-    "css-loader": "0.28.7",
-    "dotenv": "4.0.0",
-    "dotenv-expand": "4.2.0",
+    "@babel/core": "^7.1.6",
+    "@stryker-mutator/core": "^1.2.0",
+    "@stryker-mutator/html-reporter": "^1.2.0",
+    "@stryker-mutator/javascript-mutator": "^1.2.0",
+    "@stryker-mutator/jest-runner": "^1.2.0",
+    "@svgr/webpack": "^2.4.1",
+    "adm-zip": "0.4.11",
+    "autoprefixer": "^7.1.6",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^23.6.0",
+    "babel-loader": "^8.0.4",
+    "babel-plugin-named-asset-import": "^0.3.0",
+    "babel-preset-react-app": "^7.0.0",
+    "babel-runtime": "^6.26.0",
+    "bfj": "^6.1.1",
+    "case-sensitive-paths-webpack-plugin": "^2.1.2",
+    "chalk": "^2.4.1",
+    "css-loader": "^1.0.0",
+    "dotenv": "^6.0.0",
+    "dotenv-expand": "^4.2.0",
    "enzyme": "^3.3.0",
    "enzyme-adapter-react-16": "^1.1.1",
-    "eslint": "^4.19.0",
-    "eslint-config-adidas-babel": "^1.0.1",
-    "eslint-config-adidas-env": "^1.0.1",
-    "eslint-config-adidas-es6": "^1.0.1",
-    "eslint-config-adidas-react": "^1.0.1",
-    "eslint-loader": "1.9.0",
-    "eslint-plugin-import": "^2.8.0",
+    "eslint": "^5.11.1",
+    "eslint-config-adidas-babel": "^1.1.0",
+    "eslint-config-adidas-env": "^1.1.0",
+    "eslint-config-adidas-es6": "^1.2.0",
+    "eslint-config-adidas-react": "^1.1.1",
+    "eslint-loader": "^2.1.1",
+    "eslint-plugin-import": "^2.14.0",
    "eslint-plugin-jest": "^21.22.0",
-    "eslint-plugin-promise": "^3.0.0",
-    "eslint-plugin-react": "^7.4.0",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "1.1.5",
-    "fs-extra": "3.0.1",
-    "html-webpack-plugin": "2.29.0",
-    "jest": "20.0.4",
+    "eslint-plugin-jsx-a11y": "^6.1.2",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-react": "^7.11.1",
+    "file-loader": "^2.0.0",
+    "fork-ts-checker-webpack-plugin-alt": "^0.4.14",
+    "fs-extra": "^7.0.0",
+    "html-webpack-plugin": "^4.0.0-alpha.2",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^23.6.0",
+    "jest-each": "^24.9.0",
+    "jest-pnp-resolver": "^1.0.1",
+    "jest-resolve": "^23.6.0",
+    "mini-css-extract-plugin": "^0.4.3",
    "node-sass": "^4.9.0",
-    "object-assign": "4.1.1",
+    "object-assign": "^4.1.1",
    "ocular.js": "^0.1.0",
-    "postcss-flexbugs-fixes": "3.2.0",
-    "postcss-loader": "2.0.8",
-    "raf": "3.4.0",
-    "react-dev-utils": "^5.0.1",
-    "resolve": "1.6.0",
-    "sass-loader": "^7.0.1",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
+    "pnp-webpack-plugin": "^1.1.0",
+    "postcss": "^7.0.7",
+    "postcss-flexbugs-fixes": "^4.1.0",
+    "postcss-loader": "^3.0.0",
+    "postcss-preset-env": "^6.3.1",
+    "postcss-safe-parser": "^4.0.1",
+    "raf": "^3.4.0",
+    "react-app-polyfill": "^0.2.0",
+    "react-dev-utils": "^7.0.1",
+    "resolve": "^1.8.1",
+    "sass-loader": "^7.1.0",
    "serve": "^10.0.0",
-    "sinon": "^6.1.5",
-    "style-loader": "0.19.0",
-    "stylelint": "^9.5.0",
-    "stylelint-config-adidas": "^1.0.1",
-    "stylelint-config-adidas-bem": "^1.0.1",
+    "stryker-cli": "^1.0.0",
+    "style-loader": "^0.23.0",
+    "stylelint": "^9.9.0",
+    "stylelint-config-adidas": "^1.2.1",
+    "stylelint-config-adidas-bem": "^1.2.0",
    "stylelint-config-recommended-scss": "^3.2.0",
    "stylelint-scss": "^3.3.0",
-    "sw-precache-webpack-plugin": "0.11.4",
-    "url-loader": "0.6.2",
-    "webpack": "3.8.1",
-    "webpack-dev-server": "2.9.4",
-    "webpack-manifest-plugin": "1.3.2",
-    "whatwg-fetch": "2.0.3"
+    "sw-precache-webpack-plugin": "^0.11.4",
+    "terser-webpack-plugin": "^1.1.0",
+    "url-loader": "^1.1.1",
+    "webpack": "^4.19.1",
+    "webpack-dev-server": "^3.1.14",
+    "webpack-manifest-plugin": "^2.0.4",
+    "whatwg-fetch": "^2.0.3",
+    "workbox-webpack-plugin": "^3.6.3"
  },
  "babel": {
    "presets": [
      "react-app"
    ]
-  }
+  },
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
 }
--- a/public/index.html
+++ b/public/index.html
@@ -4,17 +4,19 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
    <meta name="theme-color" content="#4696e5">
+
    <!--
      manifest.json provides metadata used when your web app is added to the
      homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
    <link rel="apple-touch-icon" href="%PUBLIC_URL%/icons/shlink-128.png">
    <link rel="apple-touch-icon" sizes="64x64" href="%PUBLIC_URL%/icons/shlink-64.png">
    <link rel="apple-touch-icon" sizes="32x32" href="%PUBLIC_URL%/icons/shlink-32.png">
    <link rel="apple-touch-icon" sizes="24x24" href="%PUBLIC_URL%/icons/shlink-24.png">
    <link rel="apple-touch-icon" sizes="16x16" href="%PUBLIC_URL%/icons/shlink-16.png">
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
    <!--
      Notice the use of %PUBLIC_URL% in the tags above.
      It will be replaced with the URL of the `public` folder during the build.
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -1,4 +1,4 @@
-/* eslint no-console: "off" */
+/* eslint-disable no-console */

 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'production';
@@ -18,14 +18,16 @@ const path = require('path');
 const chalk = require('chalk');
 const fs = require('fs-extra');
 const webpack = require('webpack');
+const bfj = require('bfj');
+const AdmZip = require('adm-zip');
 const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
 const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
 const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
 const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
 const printBuildError = require('react-dev-utils/printBuildError');
-const AdmZip = require('adm-zip');
+const { checkBrowsers } = require('react-dev-utils/browsersHelper');
 const paths = require('../config/paths');
-const config = require('../config/webpack.config.prod');
+const configFactory = require('../config/webpack.config');

 const { measureFileSizesBeforeBuild, printFileSizesAfterBuild } = FileSizeReporter;
 const useYarn = fs.existsSync(paths.yarnLockFile);
@@ -34,14 +36,27 @@ const useYarn = fs.existsSync(paths.yarnLockFile);
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024; // eslint-disable-line
 const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024; // eslint-disable-line

+const isInteractive = process.stdout.isTTY;
+
 // Warn and crash if required files are missing
 if (!checkRequiredFiles([ paths.appHtml, paths.appIndexJs ])) {
  process.exit(1);
 }

-// First, read the current file sizes in build directory.
-// This lets us display how much they changed later.
-measureFileSizesBeforeBuild(paths.appBuild)
+// Process CLI arguments
+const argvSliceStart = 2;
+const argv = process.argv.slice(argvSliceStart);
+const writeStatsJson = argv.indexOf('--stats') !== -1;
+
+// Generate configuration
+const config = configFactory('production');
+
+checkBrowsers(paths.appPath, isInteractive)
+  .then(() =>
+
+    // First, read the current file sizes in build directory.
+    // This lets us display how much they changed later.
+    measureFileSizesBeforeBuild(paths.appBuild))
  .then((previousFileSizes) => {
    // Remove all content but keep the directory so that
    // if you're in it, you don't end up in Trash
@@ -85,7 +100,7 @@ measureFileSizesBeforeBuild(paths.appBuild)
      const appPackage = require(paths.appPackageJson);

      const { publicUrl } = paths;
-      const { publicPath } = config.output;
+      const { output: { publicPath } } = config;
      const buildFolder = path.relative(process.cwd(), paths.appBuild);

      printHostingInstructions(
@@ -102,7 +117,14 @@ measureFileSizesBeforeBuild(paths.appBuild)
      process.exit(1);
    }
  )
-  .then(zipDist);
+  .then(zipDist)
+  .catch((err) => {
+    if (err && err.message) {
+      console.log(err.message);
+    }
+
+    process.exit(1);
+  });

 // Create the production build and print the deployment instructions.
 function build(previousFileSizes) {
@@ -112,12 +134,22 @@ function build(previousFileSizes) {

  return new Promise((resolve, reject) => {
    compiler.run((err, stats) => {
+      let messages;
+
      if (err) {
-        return reject(err);
+        if (!err.message) {
+          return reject(err);
+        }
+
+        messages = formatWebpackMessages({
+          errors: [ err.message ],
+          warnings: [],
+        });
+      } else {
+        messages = formatWebpackMessages(
+          stats.toJson({ all: false, warnings: true, errors: true })
+        );
      }
-
-      const messages = formatWebpackMessages(stats.toJson({}, true));
-
      if (messages.errors.length) {
        // Only keep the first error. Others are often indicative
        // of the same problem, but confuse the reader with noise.
@@ -143,11 +175,20 @@ function build(previousFileSizes) {
        return reject(new Error(messages.warnings.join('\n\n')));
      }

-      return resolve({
+      const resolveArgs = {
        stats,
        previousFileSizes,
        warnings: messages.warnings,
-      });
+      };
+
+      if (writeStatsJson) {
+        return bfj // eslint-disable-line promise/no-promise-in-callback
+          .write(`${paths.appBuild}/bundle-stats.json`, stats.toJson())
+          .then(() => resolve(resolveArgs))
+          .catch((error) => reject(new Error(error)));
+      }
+
+      return resolve(resolveArgs);
    });
  });
 }
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -1,4 +1,4 @@
-/* eslint no-console: "off" */
+/* eslint-disable no-console */

 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'development';
@@ -27,8 +27,9 @@ const {
  prepareUrls,
 } = require('react-dev-utils/WebpackDevServerUtils');
 const openBrowser = require('react-dev-utils/openBrowser');
+const { checkBrowsers } = require('react-dev-utils/browsersHelper');
 const paths = require('../config/paths');
-const config = require('../config/webpack.config.dev');
+const configFactory = require('../config/webpack.config');
 const createDevServerConfig = require('../config/webpackDevServer.config');

 const useYarn = fs.existsSync(paths.yarnLockFile);
@@ -40,8 +41,8 @@ if (!checkRequiredFiles([ paths.appHtml, paths.appIndexJs ])) {
 }

 // Tools like Cloud9 rely on this.
-const FALLBACK_PORT = 3000;
-const DEFAULT_PORT = parseInt(process.env.PORT, 10) || FALLBACK_PORT;
+const DEFAULT_PORT = 3000;
+const PORT = parseInt(process.env.PORT) || DEFAULT_PORT;
 const HOST = process.env.HOST || '0.0.0.0';

 if (process.env.HOST) {
@@ -55,19 +56,25 @@ if (process.env.HOST) {
  console.log(
    'If this was unintentional, check that you haven\'t mistakenly set it in your shell.'
  );
-  console.log(`Learn more here: ${chalk.yellow('http://bit.ly/2mwWSwH')}`);
+  console.log(
+    `Learn more here: ${chalk.yellow('http://bit.ly/CRA-advanced-config')}`
+  );
  console.log();
 }

-// We attempt to use the default port but if it is busy, we offer the user to
-// run on a different port. `choosePort()` Promise resolves to the next free port.
-choosePort(HOST, DEFAULT_PORT)
+checkBrowsers(paths.appPath, isInteractive)
+  .then(() =>
+
+    // We attempt to use the default port but if it is busy, we offer the user to
+    // run on a different port. `choosePort()` Promise resolves to the next free port.
+    choosePort(HOST, PORT))
  .then((port) => {
    if (port === null) {
      // We have not found a port.
      return;
    }

+    const config = configFactory('development');
    const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
    const appName = require(paths.appPackageJson).name;

@@ -81,7 +88,7 @@ choosePort(HOST, DEFAULT_PORT)

    const proxyConfig = prepareProxy(proxySetting, paths.appPublic);

-    // Serve webpack assets generated by the compiler over a web sever.
+    // Serve webpack assets generated by the compiler over a web server.
    const serverConfig = createDevServerConfig(
      proxyConfig,
      urls.lanUrlForConfig
@@ -89,19 +96,17 @@ choosePort(HOST, DEFAULT_PORT)
    const devServer = new WebpackDevServer(compiler, serverConfig);

    // Launch WebpackDevServer.
-
    devServer.listen(port, HOST, (err) => {
      if (err) {
-        console.log(err);
-
-        return;
+        return console.log(err);
      }
      if (isInteractive) {
        clearConsole();
      }

      console.log(chalk.cyan('Starting the development server...\n'));
-      openBrowser(urls.localUrlForBrowser);
+
+      return openBrowser(urls.localUrlForBrowser);
    });

    [ 'SIGINT', 'SIGTERM' ].forEach((sig) => {
--- a/src/App.js
+++ b/src/App.js
@@ -1,23 +1,21 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 import './App.scss';
-import Home from './common/Home';
-import MainHeader from './common/MainHeader';
-import MenuLayout from './common/MenuLayout';
-import CreateServer from './servers/CreateServer';
+import NotFound from './common/NotFound';

-export default function App() {
-  return (
-    <div className="container-fluid app-container">
-      <MainHeader />
+const App = (MainHeader, Home, MenuLayout, CreateServer) => () => (
+  <div className="container-fluid app-container">
+    <MainHeader />

-      <div className="app">
-        <Switch>
-          <Route exact path="/server/create" component={CreateServer} />
-          <Route exact path="/" component={Home} />
-          <Route path="/server/:serverId" component={MenuLayout} />
-        </Switch>
-      </div>
+    <div className="app">
+      <Switch>
+        <Route exact path="/server/create" component={CreateServer} />
+        <Route exact path="/" component={Home} />
+        <Route path="/server/:serverId" component={MenuLayout} />
+        <Route component={NotFound} />
+      </Switch>
    </div>
-  );
-}
+  </div>
+);
+
+export default App;
--- a/src/api/ShlinkApiClient.js
+++ b/src/api/ShlinkApiClient.js
@@ -1,119 +0,0 @@
-import axios from 'axios';
-import qs from 'qs';
-import { isEmpty, isNil, reject } from 'ramda';
-
-const API_VERSION = '1';
-const STATUS_UNAUTHORIZED = 401;
-
-export class ShlinkApiClient {
-  constructor(axios) {
-    this.axios = axios;
-    this._baseUrl = '';
-    this._apiKey = '';
-    this._token = '';
-  }
-
-  /**
-   * Sets the base URL to be used on any request
-   */
-  setConfig = ({ url, apiKey }) => {
-    this._baseUrl = `${url}/rest/v${API_VERSION}`;
-    this._apiKey = apiKey;
-  };
-
-  listShortUrls = (options = {}) =>
-    this._performRequest('/short-codes', 'GET', options)
-      .then((resp) => resp.data.shortUrls)
-      .catch((e) => this._handleAuthError(e, this.listShortUrls, [ options ]));
-
-  createShortUrl = (options) => {
-    const filteredOptions = reject((value) => isEmpty(value) || isNil(value), options);
-
-    return this._performRequest('/short-codes', 'POST', {}, filteredOptions)
-      .then((resp) => resp.data)
-      .catch((e) => this._handleAuthError(e, this.createShortUrl, [ filteredOptions ]));
-  };
-
-  getShortUrlVisits = (shortCode, dates) =>
-    this._performRequest(`/short-codes/${shortCode}/visits`, 'GET', dates)
-      .then((resp) => resp.data.visits.data)
-      .catch((e) => this._handleAuthError(e, this.getShortUrlVisits, [ shortCode, dates ]));
-
-  getShortUrl = (shortCode) =>
-    this._performRequest(`/short-codes/${shortCode}`, 'GET')
-      .then((resp) => resp.data)
-      .catch((e) => this._handleAuthError(e, this.getShortUrl, [ shortCode ]));
-
-  deleteShortUrl = (shortCode) =>
-    this._performRequest(`/short-codes/${shortCode}`, 'DELETE')
-      .then(() => ({}))
-      .catch((e) => this._handleAuthError(e, this.deleteShortUrl, [ shortCode ]));
-
-  updateShortUrlTags = (shortCode, tags) =>
-    this._performRequest(`/short-codes/${shortCode}/tags`, 'PUT', {}, { tags })
-      .then((resp) => resp.data.tags)
-      .catch((e) => this._handleAuthError(e, this.updateShortUrlTags, [ shortCode, tags ]));
-
-  listTags = () =>
-    this._performRequest('/tags', 'GET')
-      .then((resp) => resp.data.tags.data)
-      .catch((e) => this._handleAuthError(e, this.listTags, []));
-
-  deleteTags = (tags) =>
-    this._performRequest('/tags', 'DELETE', { tags })
-      .then(() => ({ tags }))
-      .catch((e) => this._handleAuthError(e, this.deleteTags, [ tags ]));
-
-  editTag = (oldName, newName) =>
-    this._performRequest('/tags', 'PUT', {}, { oldName, newName })
-      .then(() => ({ oldName, newName }))
-      .catch((e) => this._handleAuthError(e, this.editTag, [ oldName, newName ]));
-
-  _performRequest = async (url, method = 'GET', query = {}, body = {}) => {
-    if (isEmpty(this._token)) {
-      this._token = await this._authenticate();
-    }
-
-    return await this.axios({
-      method,
-      url: `${this._baseUrl}${url}`,
-      headers: { Authorization: `Bearer ${this._token}` },
-      params: query,
-      data: body,
-      paramsSerializer: (params) => qs.stringify(params, { arrayFormat: 'brackets' }),
-    }).then((resp) => {
-      // Save new token
-      const { authorization = '' } = resp.headers;
-
-      this._token = authorization.substr('Bearer '.length);
-
-      return resp;
-    });
-  };
-
-  _authenticate = async () => {
-    const resp = await this.axios({
-      method: 'POST',
-      url: `${this._baseUrl}/authenticate`,
-      data: { apiKey: this._apiKey },
-    });
-
-    return resp.data.token;
-  };
-
-  _handleAuthError = (e, method, args) => {
-    // If auth failed, reset token to force it to be regenerated, and perform a new request
-    if (e.response.status === STATUS_UNAUTHORIZED) {
-      this._token = '';
-
-      return method(...args);
-    }
-
-    // Otherwise, let caller handle the rejection
-    return Promise.reject(e);
-  };
-}
-
-const shlinkApiClient = new ShlinkApiClient(axios);
-
-export default shlinkApiClient;
--- a/src/common/AsideMenu.js
+++ b/src/common/AsideMenu.js
@@ -1,14 +1,11 @@
-import listIcon from '@fortawesome/fontawesome-free-solid/faList';
-import createIcon from '@fortawesome/fontawesome-free-solid/faLink';
-import tagsIcon from '@fortawesome/fontawesome-free-solid/faTags';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { faList as listIcon, faLink as createIcon, faTags as tagsIcon } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import React from 'react';
 import { NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import DeleteServerButton from '../servers/DeleteServerButton';
-import './AsideMenu.scss';
 import { serverType } from '../servers/prop-types';
+import './AsideMenu.scss';

 const defaultProps = {
  className: '',
@@ -20,51 +17,57 @@ const propTypes = {
  showOnMobile: PropTypes.bool,
 };

-export default function AsideMenu({ selectedServer, className, showOnMobile }) {
-  const serverId = selectedServer ? selectedServer.id : '';
-  const asideClass = classnames('aside-menu', className, {
-    'aside-menu--hidden': !showOnMobile,
-  });
-  const shortUrlsIsActive = (match, location) => location.pathname.match('/list-short-urls');
+const AsideMenu = (DeleteServerButton) => {
+  const AsideMenu = ({ selectedServer, className, showOnMobile }) => {
+    const serverId = selectedServer ? selectedServer.id : '';
+    const asideClass = classnames('aside-menu', className, {
+      'aside-menu--hidden': !showOnMobile,
+    });
+    const shortUrlsIsActive = (match, location) => location.pathname.match('/list-short-urls');

-  return (
-    <aside className={asideClass}>
-      <nav className="nav flex-column aside-menu__nav">
-        <NavLink
-          className="aside-menu__item"
-          activeClassName="aside-menu__item--selected"
-          to={`/server/${serverId}/list-short-urls/1`}
-          isActive={shortUrlsIsActive}
-        >
-          <FontAwesomeIcon icon={listIcon} />
-          <span className="aside-menu__item-text">List short URLs</span>
-        </NavLink>
-        <NavLink
-          className="aside-menu__item"
-          activeClassName="aside-menu__item--selected"
-          to={`/server/${serverId}/create-short-url`}
-        >
-          <FontAwesomeIcon icon={createIcon} flip="horizontal" />
-          <span className="aside-menu__item-text">Create short URL</span>
-        </NavLink>
+    return (
+      <aside className={asideClass}>
+        <nav className="nav flex-column aside-menu__nav">
+          <NavLink
+            className="aside-menu__item"
+            activeClassName="aside-menu__item--selected"
+            to={`/server/${serverId}/list-short-urls/1`}
+            isActive={shortUrlsIsActive}
+          >
+            <FontAwesomeIcon icon={listIcon} />
+            <span className="aside-menu__item-text">List short URLs</span>
+          </NavLink>
+          <NavLink
+            className="aside-menu__item"
+            activeClassName="aside-menu__item--selected"
+            to={`/server/${serverId}/create-short-url`}
+          >
+            <FontAwesomeIcon icon={createIcon} flip="horizontal" />
+            <span className="aside-menu__item-text">Create short URL</span>
+          </NavLink>

-        <NavLink
-          className="aside-menu__item"
-          activeClassName="aside-menu__item--selected"
-          to={`/server/${serverId}/manage-tags`}
-        >
-          <FontAwesomeIcon icon={tagsIcon} />
-          <span className="aside-menu__item-text">Manage tags</span>
-        </NavLink>
+          <NavLink
+            className="aside-menu__item"
+            activeClassName="aside-menu__item--selected"
+            to={`/server/${serverId}/manage-tags`}
+          >
+            <FontAwesomeIcon icon={tagsIcon} />
+            <span className="aside-menu__item-text">Manage tags</span>
+          </NavLink>

-        <DeleteServerButton
-          className="aside-menu__item aside-menu__item--danger"
-          server={selectedServer}
-        />
-      </nav>
-    </aside>
-  );
-}
+          <DeleteServerButton
+            className="aside-menu__item aside-menu__item--danger"
+            server={selectedServer}
+          />
+        </nav>
+      </aside>
+    );
+  };

-AsideMenu.defaultProps = defaultProps;
-AsideMenu.propTypes = propTypes;
+  AsideMenu.defaultProps = defaultProps;
+  AsideMenu.propTypes = propTypes;
+
+  return AsideMenu;
+};
+
+export default AsideMenu;
--- a/src/common/AsideMenu.scss
+++ b/src/common/AsideMenu.scss
@@ -1,5 +1,4 @@
@import '../utils/base';
-@import '../utils/mixins/box-shadow';
@import '../utils/mixins/vertical-align';

 $asideMenuMobileWidth: 280px;
@@ -26,8 +25,7 @@ $asideMenuMobileWidth: 280px;
    width: $asideMenuMobileWidth !important;
    transition: left 300ms;
    top: $headerHeight - 3px;
-
-    @include box-shadow(-10px 0 50px 11px rgba(0, 0, 0, .55));
+    box-shadow: -10px 0 50px 11px rgba(0, 0, 0, .55);
  }
 }

--- a/src/common/DateInput.js
+++ b/src/common/DateInput.js
@@ -1,37 +0,0 @@
-import calendarIcon from '@fortawesome/fontawesome-free-regular/faCalendarAlt';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
-import React from 'react';
-import DatePicker from 'react-datepicker';
-import { isNil } from 'ramda';
-import './DateInput.scss';
-
-export default class DateInput extends React.Component {
-  constructor(props) {
-    super(props);
-    this.inputRef = props.ref || React.createRef();
-  }
-
-  render() {
-    const { className, isClearable, selected } = this.props;
-    const showCalendarIcon = !isClearable || isNil(selected);
-
-    return (
-      <div className="date-input-container">
-        <DatePicker
-          {...this.props}
-          className={`date-input-container__input form-control ${className || ''}`}
-          dateFormat="YYYY-MM-DD"
-          readOnly
-          ref={this.inputRef}
-        />
-        {showCalendarIcon && (
-          <FontAwesomeIcon
-            icon={calendarIcon}
-            className="date-input-container__icon"
-            onClick={() => this.inputRef.current.input.focus()}
-          />
-        )}
-      </div>
-    );
-  }
-}
--- a/src/common/ErrorHandler.js
+++ b/src/common/ErrorHandler.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import * as PropTypes from 'prop-types';
+import './ErrorHandler.scss';
+import { Button } from 'reactstrap';
+
+const ErrorHandler = ({ location }, { error }) => class ErrorHandler extends React.Component {
+  static propTypes = {
+    children: PropTypes.node.isRequired,
+  };
+
+  constructor(props) {
+    super(props);
+    this.state = { hasError: false };
+  }
+
+  static getDerivedStateFromError() {
+    return { hasError: true };
+  }
+
+  componentDidCatch(e) {
+    if (process.env.NODE_ENV !== 'development') {
+      error(e);
+    }
+  }
+
+  render() {
+    if (this.state.hasError) {
+      return (
+        <div className="error-handler">
+          <h1>Oops! This is awkward :S</h1>
+          <p>It seems that something went wrong. Try refreshing the page or just click this button.</p>
+          <br />
+          <Button outline color="primary" onClick={() => location.reload()}>Take me back</Button>
+        </div>
+      );
+    }
+
+    return this.props.children;
+  }
+};
+
+export default ErrorHandler;
--- a/src/common/ErrorHandler.scss
+++ b/src/common/ErrorHandler.scss
@@ -0,0 +1,9 @@
+@import '../utils/mixins/vertical-align.scss';
+
+.error-handler {
+  @include vertical-align();
+
+  padding: 20px;
+  text-align: center;
+  width: 100%;
+}
--- a/src/common/Home.js
+++ b/src/common/Home.js
@@ -1,15 +1,13 @@
-import chevronIcon from '@fortawesome/fontawesome-free-solid/faChevronRight';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
-import { isEmpty, pick, values } from 'ramda';
+import { faChevronRight as chevronIcon } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { isEmpty, values } from 'ramda';
 import React from 'react';
-import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { ListGroup, ListGroupItem } from 'reactstrap';
 import PropTypes from 'prop-types';
-import { resetSelectedServer } from '../servers/reducers/selectedServer';
 import './Home.scss';

-export class HomeComponent extends React.Component {
+export default class Home extends React.Component {
  static propTypes = {
    resetSelectedServer: PropTypes.func,
    servers: PropTypes.object,
@@ -20,18 +18,20 @@ export class HomeComponent extends React.Component {
  }

  render() {
-    const servers = values(this.props.servers);
+    const { servers: { list, loading } } = this.props;
+    const servers = values(list);
    const hasServers = !isEmpty(servers);

    return (
      <div className="home">
        <h1 className="home__title">Welcome to Shlink</h1>
        <h5 className="home__intro">
-          {hasServers && <span>Please, select a server.</span>}
-          {!hasServers && <span>Please, <Link to="/server/create">add a server</Link>.</span>}
+          {!loading && hasServers && <span>Please, select a server.</span>}
+          {!loading && !hasServers && <span>Please, <Link to="/server/create">add a server</Link>.</span>}
+          {loading && <span>Trying to load servers...</span>}
        </h5>

-        {hasServers && (
+        {!loading && hasServers && (
          <ListGroup className="home__servers-list">
            {servers.map(({ name, id }) => (
              <ListGroupItem
@@ -50,7 +50,3 @@ export class HomeComponent extends React.Component {
    );
  }
 }
-
-const Home = connect(pick([ 'servers' ]), { resetSelectedServer })(HomeComponent);
-
-export default Home;
--- a/src/common/MainHeader.js
+++ b/src/common/MainHeader.js
@@ -1,16 +1,14 @@
-import plusIcon from '@fortawesome/fontawesome-free-solid/faPlus';
-import arrowIcon from '@fortawesome/fontawesome-free-solid/faChevronDown';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { faPlus as plusIcon, faChevronDown as arrowIcon } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import React from 'react';
-import { Link, withRouter } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { Collapse, Nav, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } from 'reactstrap';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import ServersDropdown from '../servers/ServersDropdown';
-import './MainHeader.scss';
 import shlinkLogo from './shlink-logo-white.png';
+import './MainHeader.scss';

-export class MainHeaderComponent extends React.Component {
+const MainHeader = (ServersDropdown) => class MainHeader extends React.Component {
  static propTypes = {
    location: PropTypes.object,
  };
@@ -62,8 +60,6 @@ export class MainHeaderComponent extends React.Component {
      </Navbar>
    );
  }
-}
-
-const MainHeader = withRouter(MainHeaderComponent);
+};

 export default MainHeader;
--- a/src/common/MenuLayout.js
+++ b/src/common/MenuLayout.js
@@ -1,113 +1,110 @@
 import React from 'react';
-import { Route, Switch, withRouter } from 'react-router-dom';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-import { pick } from 'ramda';
+import { Route, Switch } from 'react-router-dom';
 import Swipeable from 'react-swipeable';
-import burgerIcon from '@fortawesome/fontawesome-free-solid/faBars';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { faBars as burgerIcon } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import classnames from 'classnames';
 import * as PropTypes from 'prop-types';
-import ShortUrlsVisits from '../visits/ShortUrlVisits';
-import { selectServer } from '../servers/reducers/selectedServer';
-import CreateShortUrl from '../short-urls/CreateShortUrl';
-import ShortUrls from '../short-urls/ShortUrls';
-import './MenuLayout.scss';
-import TagsList from '../tags/TagsList';
 import { serverType } from '../servers/prop-types';
-import AsideMenu from './AsideMenu';
+import NotFound from './NotFound';
+import './MenuLayout.scss';

-export class MenuLayoutComponent extends React.Component {
-  static propTypes = {
-    match: PropTypes.object,
-    selectServer: PropTypes.func,
-    location: PropTypes.object,
-    selectedServer: serverType,
+const MenuLayout = (TagsList, ShortUrls, AsideMenu, CreateShortUrl, ShortUrlVisits) =>
+  class MenuLayout extends React.Component {
+    static propTypes = {
+      match: PropTypes.object,
+      selectServer: PropTypes.func,
+      location: PropTypes.object,
+      selectedServer: serverType,
+    };
+
+    state = { showSideBar: false };
+
+    componentDidMount() {
+      const { match, selectServer } = this.props;
+      const { params: { serverId } } = match;
+
+      selectServer(serverId);
+    }
+
+    componentDidUpdate(prevProps) {
+      const { location } = this.props;
+
+      // Hide sidebar when location changes
+      if (location !== prevProps.location) {
+        this.setState({ showSideBar: false });
+      }
+    }
+
+    render() {
+      const { selectedServer, match } = this.props;
+      const { params: { serverId } } = match;
+      const burgerClasses = classnames('menu-layout__burger-icon', {
+        'menu-layout__burger-icon--active': this.state.showSideBar,
+      });
+      const swipeMenuIfNoModalExists = (showSideBar) => () => {
+        if (document.querySelector('.modal')) {
+          return;
+        }
+
+        this.setState({ showSideBar });
+      };
+
+      return (
+        <React.Fragment>
+          <FontAwesomeIcon
+            icon={burgerIcon}
+            className={burgerClasses}
+            onClick={() => this.setState(({ showSideBar }) => ({ showSideBar: !showSideBar }))}
+          />
+
+          <Swipeable
+            delta={40}
+            className="menu-layout__swipeable"
+            onSwipedLeft={swipeMenuIfNoModalExists(false)}
+            onSwipedRight={swipeMenuIfNoModalExists(true)}
+          >
+            <div className="row menu-layout__swipeable-inner">
+              <AsideMenu
+                className="col-lg-2 col-md-3"
+                selectedServer={selectedServer}
+                showOnMobile={this.state.showSideBar}
+              />
+              <div
+                className="col-lg-10 offset-lg-2 col-md-9 offset-md-3"
+                onClick={() => this.setState({ showSideBar: false })}
+              >
+                <Switch>
+                  <Route
+                    exact
+                    path="/server/:serverId/list-short-urls/:page"
+                    component={ShortUrls}
+                  />
+                  <Route
+                    exact
+                    path="/server/:serverId/create-short-url"
+                    component={CreateShortUrl}
+                  />
+                  <Route
+                    exact
+                    path="/server/:serverId/short-code/:shortCode/visits"
+                    component={ShortUrlVisits}
+                  />
+                  <Route
+                    exact
+                    path="/server/:serverId/manage-tags"
+                    component={TagsList}
+                  />
+                  <Route
+                    render={() => <NotFound to={`/server/${serverId}/list-short-urls/1`} btnText="List short URLs" />}
+                  />
+                </Switch>
+              </div>
+            </div>
+          </Swipeable>
+        </React.Fragment>
+      );
+    }
  };

-  state = { showSideBar: false };
-
-  // FIXME Shouldn't use componentWillMount, but this code has to be run before children components are rendered
-  /* eslint react/no-deprecated: "off" */
-  componentWillMount() {
-    const { match, selectServer } = this.props;
-    const { params: { serverId } } = match;
-
-    selectServer(serverId);
-  }
-
-  componentDidUpdate(prevProps) {
-    const { location } = this.props;
-
-    // Hide sidebar when location changes
-    if (location !== prevProps.location) {
-      this.setState({ showSideBar: false });
-    }
-  }
-
-  render() {
-    const { selectedServer } = this.props;
-    const burgerClasses = classnames('menu-layout__burger-icon', {
-      'menu-layout__burger-icon--active': this.state.showSideBar,
-    });
-
-    return (
-      <React.Fragment>
-        <FontAwesomeIcon
-          icon={burgerIcon}
-          className={burgerClasses}
-          onClick={() => this.setState(({ showSideBar }) => ({ showSideBar: !showSideBar }))}
-        />
-
-        <Swipeable
-          delta={40}
-          className="menu-layout__swipeable"
-          onSwipedLeft={() => this.setState({ showSideBar: false })}
-          onSwipedRight={() => this.setState({ showSideBar: true })}
-        >
-          <div className="row menu-layout__swipeable-inner">
-            <AsideMenu
-              className="col-lg-2 col-md-3"
-              selectedServer={selectedServer}
-              showOnMobile={this.state.showSideBar}
-            />
-            <div
-              className="col-lg-10 offset-lg-2 col-md-9 offset-md-3"
-              onClick={() => this.setState({ showSideBar: false })}
-            >
-              <Switch>
-                <Route
-                  exact
-                  path="/server/:serverId/list-short-urls/:page"
-                  component={ShortUrls}
-                />
-                <Route
-                  exact
-                  path="/server/:serverId/create-short-url"
-                  component={CreateShortUrl}
-                />
-                <Route
-                  exact
-                  path="/server/:serverId/short-code/:shortCode/visits"
-                  component={ShortUrlsVisits}
-                />
-                <Route
-                  exact
-                  path="/server/:serverId/manage-tags"
-                  component={TagsList}
-                />
-              </Switch>
-            </div>
-          </div>
-        </Swipeable>
-      </React.Fragment>
-    );
-  }
-}
-
-const MenuLayout = compose(
-  connect(pick([ 'selectedServer', 'shortUrlsListParams' ]), { selectServer }),
-  withRouter
-)(MenuLayoutComponent);
-
 export default MenuLayout;
--- a/src/common/NotFound.js
+++ b/src/common/NotFound.js
@@ -0,0 +1,23 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import * as PropTypes from 'prop-types';
+
+const propTypes = {
+  to: PropTypes.string,
+  btnText: PropTypes.string,
+};
+
+const NotFound = ({ to = '/', btnText = 'Home' }) => (
+  <div className="home">
+    <h2>Oops! We could not find requested route.</h2>
+    <p>
+      Use your browser{'\''}s back button to navigate to the page you have previously come from, or just press this button.
+    </p>
+    <br />
+    <Link to={to} className="btn btn-outline-primary btn-lg">{btnText}</Link>
+  </div>
+);
+
+NotFound.propTypes = propTypes;
+
+export default NotFound;
--- a/src/common/ScrollToTop.js
+++ b/src/common/ScrollToTop.js
@@ -1,32 +1,23 @@
 import React from 'react';
-import { withRouter } from 'react-router-dom';
 import PropTypes from 'prop-types';

-export class ScrollToTopComponent extends React.Component {
+const ScrollToTop = ({ scrollTo }) => class ScrollToTop extends React.Component {
  static propTypes = {
    location: PropTypes.object,
-    window: PropTypes.shape({
-      scrollTo: PropTypes.func,
-    }),
    children: PropTypes.node,
  };
-  static defaultProps = {
-    window,
-  };

-  componentDidUpdate(prevProps) {
-    const { location, window } = this.props;
+  componentDidUpdate({ location: prevLocation }) {
+    const { location } = this.props;

-    if (location !== prevProps.location) {
-      window.scrollTo(0, 0);
+    if (location !== prevLocation) {
+      scrollTo(0, 0);
    }
  }

  render() {
    return this.props.children;
  }
-}
-
-const ScrollToTop = withRouter(ScrollToTopComponent);
+};

 export default ScrollToTop;
--- a/src/common/SimplePaginator.js
+++ b/src/common/SimplePaginator.js
@@ -0,0 +1,65 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Pagination, PaginationItem, PaginationLink } from 'reactstrap';
+import { range, max, min } from 'ramda';
+import './SimplePaginator.scss';
+
+const propTypes = {
+  pagesCount: PropTypes.number.isRequired,
+  currentPage: PropTypes.number.isRequired,
+  setCurrentPage: PropTypes.func.isRequired,
+};
+
+export const ellipsis = '...';
+
+const pagination = (currentPage, pageCount) => {
+  const delta = 2;
+  const pages = range(
+    max(delta, currentPage - delta),
+    min(pageCount - 1, currentPage + delta) + 1
+  );
+
+  if (currentPage - delta > delta) {
+    pages.unshift(ellipsis);
+  }
+  if (currentPage + delta < pageCount - 1) {
+    pages.push(ellipsis);
+  }
+
+  pages.unshift(1);
+  pages.push(pageCount);
+
+  return pages;
+};
+
+const SimplePaginator = ({ pagesCount, currentPage, setCurrentPage }) => {
+  if (pagesCount < 2) {
+    return null;
+  }
+
+  const onClick = (page) => () => setCurrentPage(page);
+
+  return (
+    <Pagination listClassName="flex-wrap justify-content-center mb-0 simple-paginator">
+      <PaginationItem disabled={currentPage <= 1}>
+        <PaginationLink previous tag="span" onClick={onClick(currentPage - 1)} />
+      </PaginationItem>
+      {pagination(currentPage, pagesCount).map((page, index) => (
+        <PaginationItem
+          key={page !== ellipsis ? page : `${page}_${index}`}
+          active={page === currentPage}
+          disabled={page === ellipsis}
+        >
+          <PaginationLink tag="span" onClick={onClick(page)}>{page}</PaginationLink>
+        </PaginationItem>
+      ))}
+      <PaginationItem disabled={currentPage >= pagesCount}>
+        <PaginationLink next tag="span" onClick={onClick(currentPage + 1)} />
+      </PaginationItem>
+    </Pagination>
+  );
+};
+
+SimplePaginator.propTypes = propTypes;
+
+export default SimplePaginator;
--- a/src/common/SimplePaginator.scss
+++ b/src/common/SimplePaginator.scss
@@ -0,0 +1,3 @@
+.simple-paginator {
+  user-select: none;
+}
--- a/src/common/react-tagsinput.scss
+++ b/src/common/react-tagsinput.scss
@@ -27,12 +27,12 @@

 .react-tagsinput-remove {
  cursor: pointer;
-  font-weight: bold;
+  font-weight: 700;
  margin-left: 8px;
 }

 .react-tagsinput-tag span:before {
-  content: "\2715";
+  content: '\2715';
  color: #fff;
 }

--- a/src/common/services/provideServices.js
+++ b/src/common/services/provideServices.js
@@ -0,0 +1,38 @@
+import ScrollToTop from '../ScrollToTop';
+import MainHeader from '../MainHeader';
+import Home from '../Home';
+import MenuLayout from '../MenuLayout';
+import AsideMenu from '../AsideMenu';
+import ErrorHandler from '../ErrorHandler';
+
+const provideServices = (bottle, connect, withRouter) => {
+  bottle.constant('window', global.window);
+  bottle.constant('console', global.console);
+
+  bottle.serviceFactory('ScrollToTop', ScrollToTop, 'window');
+  bottle.decorator('ScrollToTop', withRouter);
+
+  bottle.serviceFactory('MainHeader', MainHeader, 'ServersDropdown');
+  bottle.decorator('MainHeader', withRouter);
+
+  bottle.serviceFactory('Home', () => Home);
+  bottle.decorator('Home', connect([ 'servers' ], [ 'resetSelectedServer' ]));
+
+  bottle.serviceFactory(
+    'MenuLayout',
+    MenuLayout,
+    'TagsList',
+    'ShortUrls',
+    'AsideMenu',
+    'CreateShortUrl',
+    'ShortUrlVisits'
+  );
+  bottle.decorator('MenuLayout', connect([ 'selectedServer', 'shortUrlsListParams' ], [ 'selectServer' ]));
+  bottle.decorator('MenuLayout', withRouter);
+
+  bottle.serviceFactory('AsideMenu', AsideMenu, 'DeleteServerButton');
+
+  bottle.serviceFactory('ErrorHandler', ErrorHandler, 'window', 'console');
+};
+
+export default provideServices;
--- a/src/container/index.js
+++ b/src/container/index.js
@@ -0,0 +1,38 @@
+import Bottle from 'bottlejs';
+import { withRouter } from 'react-router-dom';
+import { connect as reduxConnect } from 'react-redux';
+import { pick } from 'ramda';
+import App from '../App';
+import provideCommonServices from '../common/services/provideServices';
+import provideShortUrlsServices from '../short-urls/services/provideServices';
+import provideServersServices from '../servers/services/provideServices';
+import provideVisitsServices from '../visits/services/provideServices';
+import provideTagsServices from '../tags/services/provideServices';
+import provideUtilsServices from '../utils/services/provideServices';
+
+const bottle = new Bottle();
+const { container } = bottle;
+
+const lazyService = (container, serviceName) => (...args) => container[serviceName](...args);
+const mapActionService = (map, actionName) => ({
+  ...map,
+
+  // Wrap actual action service in a function so that it is lazily created the first time it is called
+  [actionName]: lazyService(container, actionName),
+});
+const connect = (propsFromState, actionServiceNames) =>
+  reduxConnect(
+    propsFromState ? pick(propsFromState) : null,
+    actionServiceNames.reduce(mapActionService, {})
+  );
+
+bottle.serviceFactory('App', App, 'MainHeader', 'Home', 'MenuLayout', 'CreateServer');
+
+provideCommonServices(bottle, connect, withRouter);
+provideShortUrlsServices(bottle, connect);
+provideServersServices(bottle, connect, withRouter);
+provideTagsServices(bottle, connect);
+provideVisitsServices(bottle, connect);
+provideUtilsServices(bottle);
+
+export default container;
--- a/src/container/store.js
+++ b/src/container/store.js
@@ -0,0 +1,13 @@
+import ReduxThunk from 'redux-thunk';
+import { applyMiddleware, compose, createStore } from 'redux';
+import reducers from '../reducers';
+
+const composeEnhancers = process.env.NODE_ENV !== 'production' && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
+  ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
+  : compose;
+
+const store = createStore(reducers, composeEnhancers(
+  applyMiddleware(ReduxThunk)
+));
+
+export default store;
--- a/src/index.js
+++ b/src/index.js
@@ -1,31 +1,31 @@
 import 'bootstrap/dist/css/bootstrap.min.css';
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { render } from 'react-dom';
 import { Provider } from 'react-redux';
 import { BrowserRouter } from 'react-router-dom';
-import { applyMiddleware, compose, createStore } from 'redux';
-import ReduxThunk from 'redux-thunk';
-import App from './App';
-import './index.scss';
-import ScrollToTop from './common/ScrollToTop';
-import reducers from './reducers';
+import { homepage } from '../package.json';
 import registerServiceWorker from './registerServiceWorker';
-import '../node_modules/react-datepicker/dist/react-datepicker.css';
+import container from './container';
+import store from './container/store';
+import { fixLeafletIcons } from './utils/utils';
+import 'react-datepicker/dist/react-datepicker.css';
+import 'leaflet/dist/leaflet.css';
 import './common/react-tagsinput.scss';
+import './index.scss';

-const composeEnhancers = process.env.NODE_ENV !== 'production' && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
-  ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
-  : compose;
-const store = createStore(reducers, composeEnhancers(
-  applyMiddleware(ReduxThunk)
-));
+// This overwrites icons used for leaflet maps, fixing some issues caused by webpack while processing the CSS
+fixLeafletIcons();

-ReactDOM.render(
+const { App, ScrollToTop, ErrorHandler } = container;
+
+render(
  <Provider store={store}>
-    <BrowserRouter>
-      <ScrollToTop>
-        <App />
-      </ScrollToTop>
+    <BrowserRouter basename={homepage}>
+      <ErrorHandler>
+        <ScrollToTop>
+          <App />
+        </ScrollToTop>
+      </ErrorHandler>
    </BrowserRouter>
  </Provider>,
  document.getElementById('root')
--- a/src/index.scss
+++ b/src/index.scss
@@ -18,12 +18,12 @@ body,
  background-color: $mainColor !important;
 }

-.dropdown-item {
+.dropdown-item:not(:disabled) {
  cursor: pointer;
 }

-.dropdown-item.active,
-.dropdown-item:active {
+.dropdown-item.active:not(:disabled),
+.dropdown-item:active:not(:disabled) {
  background-color: $lightGrey !important;
  color: inherit !important;
 }
@@ -51,3 +51,11 @@ body,
    margin: 0 auto !important;
  }
 }
+
+.pagination .page-link {
+  cursor: pointer;
+}
+
+.paddingless {
+  padding: 0;
+}
--- a/src/registerServiceWorker.js
+++ b/src/registerServiceWorker.js
@@ -43,22 +43,22 @@ export default function register() {

        // Add some additional logging to localhost, pointing developers to the
        // service worker/PWA documentation.
-        navigator.serviceWorker.ready.then(() => {
+        return navigator.serviceWorker.ready.then(() => {
          console.log(
            'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit https://goo.gl/SC7cgQ'
+            'worker. To learn more, visit https://goo.gl/SC7cgQ'
          );
        });
-      } else {
-        // Is not local host. Just register service worker
-        registerValidSW(swUrl);
      }
+
+      // Is not local host. Just register service worker
+      return registerValidSW(swUrl);
    });
  }
 }

 function registerValidSW(swUrl) {
-  navigator.serviceWorker
+  return navigator.serviceWorker
    .register(swUrl)
    .then((registration) => {
      registration.onupdatefound = () => {
@@ -99,15 +99,14 @@ function checkValidServiceWorker(swUrl) {
        response.headers.get('content-type').indexOf('javascript') === -1
      ) {
        // No service worker found. Probably a different app. Reload the page.
-        navigator.serviceWorker.ready.then((registration) => {
+        return navigator.serviceWorker.ready.then((registration) =>
          registration.unregister().then(() => {
            window.location.reload();
-          });
-        });
-      } else {
-        // Service worker found. Proceed as normal.
-        registerValidSW(swUrl);
+          }));
      }
+
+      // Service worker found. Proceed as normal.
+      return registerValidSW(swUrl);
    })
    .catch(() => {
      console.log(
@@ -120,6 +119,6 @@ export function unregister() {
  if ('serviceWorker' in navigator) {
    navigator.serviceWorker.ready.then((registration) => {
      registration.unregister();
-    });
+    }).catch(() => {});
  }
 }
--- a/src/servers/CreateServer.js
+++ b/src/servers/CreateServer.js
@@ -1,17 +1,12 @@
-import { assoc, dissoc, pick, pipe } from 'ramda';
+import { assoc, dissoc, pipe } from 'ramda';
 import React from 'react';
-import { connect } from 'react-redux';
 import { v4 as uuid } from 'uuid';
 import PropTypes from 'prop-types';
-import { stateFlagTimeout } from '../utils/utils';
-import { resetSelectedServer } from './reducers/selectedServer';
-import { createServer } from './reducers/server';
 import './CreateServer.scss';
-import ImportServersBtn from './helpers/ImportServersBtn';

 const SHOW_IMPORT_MSG_TIME = 4000;

-export class CreateServerComponent extends React.Component {
+const CreateServer = (ImportServersBtn, stateFlagTimeout) => class CreateServer extends React.Component {
  static propTypes = {
    createServer: PropTypes.func,
    history: PropTypes.shape({
@@ -91,11 +86,6 @@ export class CreateServerComponent extends React.Component {
      </div>
    );
  }
-}
-
-const CreateServer = connect(
-  pick([ 'selectedServer' ]),
-  { createServer, resetSelectedServer }
-)(CreateServerComponent);
+};

 export default CreateServer;
--- a/src/servers/CreateServer.scss
+++ b/src/servers/CreateServer.scss
@@ -5,7 +5,7 @@
 }

 .create-server__label {
-  font-weight: bold;
+  font-weight: 700;
  cursor: pointer;

  @media (min-width: $mdMin) {
--- a/src/servers/DeleteServerButton.js
+++ b/src/servers/DeleteServerButton.js
@@ -1,11 +1,10 @@
-import deleteIcon from '@fortawesome/fontawesome-free-solid/faMinusCircle';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { faMinusCircle as deleteIcon } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import React from 'react';
 import PropTypes from 'prop-types';
-import DeleteServerModal from './DeleteServerModal';
 import { serverType } from './prop-types';

-export default class DeleteServerButton extends React.Component {
+const DeleteServerButton = (DeleteServerModal) => class DeleteServerButton extends React.Component {
  static propTypes = {
    server: serverType,
    className: PropTypes.string,
@@ -36,4 +35,6 @@ export default class DeleteServerButton extends React.Component {
      </React.Fragment>
    );
  }
-}
+};
+
+export default DeleteServerButton;
--- a/src/servers/DeleteServerModal.js
+++ b/src/servers/DeleteServerModal.js
@@ -1,10 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
-import { compose } from 'redux';
-import { deleteServer } from './reducers/server';
 import { serverType } from './prop-types';

 const propTypes = {
@@ -17,7 +13,7 @@ const propTypes = {
  }),
 };

-export const DeleteServerModalComponent = ({ server, toggle, isOpen, deleteServer, history }) => {
+const DeleteServerModal = ({ server, toggle, isOpen, deleteServer, history }) => {
  const closeModal = () => {
    deleteServer(server);
    toggle();
@@ -42,11 +38,6 @@ export const DeleteServerModalComponent = ({ server, toggle, isOpen, deleteServe
  );
 };

-DeleteServerModalComponent.propTypes = propTypes;
-
-const DeleteServerModal = compose(
-  withRouter,
-  connect(null, { deleteServer })
-)(DeleteServerModalComponent);
+DeleteServerModal.propTypes = propTypes;

 export default DeleteServerModal;
--- a/src/servers/ServersDropdown.js
+++ b/src/servers/ServersDropdown.js
@@ -1,30 +1,25 @@
-import { isEmpty, pick, values } from 'ramda';
+import { isEmpty, values } from 'ramda';
 import React from 'react';
-import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { DropdownItem, DropdownMenu, DropdownToggle, UncontrolledDropdown } from 'reactstrap';
 import PropTypes from 'prop-types';
-import { selectServer } from '../servers/reducers/selectedServer';
-import serversExporter from '../servers/services/ServersExporter';
-import { listServers } from './reducers/server';
 import { serverType } from './prop-types';

-export class ServersDropdownComponent extends React.Component {
-  static defaultProps = {
-    serversExporter,
-  };
+const ServersDropdown = (serversExporter) => class ServersDropdown extends React.Component {
  static propTypes = {
    servers: PropTypes.object,
-    serversExporter: PropTypes.shape({
-      exportServers: PropTypes.func,
-    }),
    selectedServer: serverType,
    selectServer: PropTypes.func,
    listServers: PropTypes.func,
  };

  renderServers = () => {
-    const { servers, selectedServer, selectServer, serversExporter } = this.props;
+    const { servers: { list, loading }, selectedServer, selectServer } = this.props;
+    const servers = values(list);
+
+    if (loading) {
+      return <DropdownItem disabled><i>Trying to load servers...</i></DropdownItem>;
+    }

    if (isEmpty(servers)) {
      return <DropdownItem disabled><i>Add a server first...</i></DropdownItem>;
@@ -32,7 +27,7 @@ export class ServersDropdownComponent extends React.Component {

    return (
      <React.Fragment>
-        {values(servers).map(({ name, id }) => (
+        {servers.map(({ name, id }) => (
          <DropdownItem
            key={id}
            tag={Link}
@@ -56,23 +51,14 @@ export class ServersDropdownComponent extends React.Component {
    );
  };

-  componentDidMount() {
-    this.props.listServers();
-  }
+  componentDidMount = this.props.listServers;

-  render() {
-    return (
-      <UncontrolledDropdown nav inNavbar>
-        <DropdownToggle nav caret>Servers</DropdownToggle>
-        <DropdownMenu right>{this.renderServers()}</DropdownMenu>
-      </UncontrolledDropdown>
-    );
-  }
-}
-
-const ServersDropdown = connect(
-  pick([ 'servers', 'selectedServer' ]),
-  { listServers, selectServer }
-)(ServersDropdownComponent);
+  render = () => (
+    <UncontrolledDropdown nav inNavbar>
+      <DropdownToggle nav caret>Servers</DropdownToggle>
+      <DropdownMenu right>{this.renderServers()}</DropdownMenu>
+    </UncontrolledDropdown>
+  );
+};

 export default ServersDropdown;
--- a/src/servers/helpers/ImportServersBtn.js
+++ b/src/servers/helpers/ImportServersBtn.js
@@ -1,20 +1,13 @@
 import React from 'react';
-import { connect } from 'react-redux';
 import { UncontrolledTooltip } from 'reactstrap';
-import { assoc } from 'ramda';
-import { v4 as uuid } from 'uuid';
 import PropTypes from 'prop-types';
-import { createServers } from '../reducers/server';
-import serversImporter, { serversImporterType } from '../services/ServersImporter';

-export class ImportServersBtnComponent extends React.Component {
+const ImportServersBtn = (serversImporter) => class ImportServersBtn extends React.Component {
  static defaultProps = {
-    serversImporter,
    onImport: () => ({}),
  };
  static propTypes = {
    onImport: PropTypes.func,
-    serversImporter: serversImporterType,
    createServers: PropTypes.func,
    fileRef: PropTypes.oneOfType([ PropTypes.object, PropTypes.node ]),
  };
@@ -25,12 +18,16 @@ export class ImportServersBtnComponent extends React.Component {
  }

  render() {
-    const { serversImporter: { importServersFromFile }, onImport, createServers } = this.props;
-    const onChange = (e) =>
-      importServersFromFile(e.target.files[0])
-        .then((servers) => servers.map((server) => assoc('id', uuid(), server)))
+    const { importServersFromFile } = serversImporter;
+    const { onImport, createServers } = this.props;
+    const onChange = ({ target }) =>
+      importServersFromFile(target.files[0])
        .then(createServers)
-        .then(onImport);
+        .then(onImport)
+        .then(() => {
+          // Reset input after processing file
+          target.value = null;
+        });

    return (
      <React.Fragment>
@@ -56,8 +53,6 @@ export class ImportServersBtnComponent extends React.Component {
      </React.Fragment>
    );
  }
-}
-
-const ImportServersBtn = connect(null, { createServers })(ImportServersBtnComponent);
+};

 export default ImportServersBtn;
--- a/src/servers/reducers/selectedServer.js
+++ b/src/servers/reducers/selectedServer.js
@@ -1,34 +1,19 @@
-import { curry } from 'ramda';
-import shlinkApiClient from '../../api/ShlinkApiClient';
-import serversService from '../../servers/services/ServersService';
+import { createAction, handleActions } from 'redux-actions';
 import { resetShortUrlParams } from '../../short-urls/reducers/shortUrlsListParams';

-/* eslint-disable padding-line-between-statements, newline-after-var */
+/* eslint-disable padding-line-between-statements */
 export const SELECT_SERVER = 'shlink/selectedServer/SELECT_SERVER';
 export const RESET_SELECTED_SERVER = 'shlink/selectedServer/RESET_SELECTED_SERVER';
-/* eslint-enable padding-line-between-statements, newline-after-var */
+/* eslint-enable padding-line-between-statements */

-const defaultState = null;
+const initialState = null;

-export default function reducer(state = defaultState, action) {
-  switch (action.type) {
-    case SELECT_SERVER:
-      return action.selectedServer;
-    case RESET_SELECTED_SERVER:
-      return defaultState;
-    default:
-      return state;
-  }
-}
+export const resetSelectedServer = createAction(RESET_SELECTED_SERVER);

-export const resetSelectedServer = () => ({ type: RESET_SELECTED_SERVER });
-
-export const _selectServer = (shlinkApiClient, serversService, serverId) => (dispatch) => {
+export const selectServer = ({ findServerById }) => (serverId) => (dispatch) => {
  dispatch(resetShortUrlParams());

-  const selectedServer = serversService.findServerById(serverId);
-
-  shlinkApiClient.setConfig(selectedServer);
+  const selectedServer = findServerById(serverId);

  dispatch({
    type: SELECT_SERVER,
@@ -36,4 +21,7 @@ export const _selectServer = (shlinkApiClient, serversService, serverId) => (dis
  });
 };

-export const selectServer = curry(_selectServer)(shlinkApiClient, serversService);
+export default handleActions({
+  [RESET_SELECTED_SERVER]: () => initialState,
+  [SELECT_SERVER]: (state, { selectedServer }) => selectedServer,
+}, initialState);
--- a/src/servers/reducers/server.js
+++ b/src/servers/reducers/server.js
@@ -1,44 +1,51 @@
-import { curry } from 'ramda';
-import serversService from '../services/ServersService';
+import { handleActions } from 'redux-actions';
+import { pipe, isEmpty, assoc, map, prop } from 'ramda';
+import { v4 as uuid } from 'uuid';
+import { homepage } from '../../../package.json';

+/* eslint-disable padding-line-between-statements */
+export const FETCH_SERVERS_START = 'shlink/servers/FETCH_SERVERS_START';
 export const FETCH_SERVERS = 'shlink/servers/FETCH_SERVERS';
+/* eslint-enable padding-line-between-statements */

-export default function reducer(state = {}, action) {
-  switch (action.type) {
-    case FETCH_SERVERS:
-      return action.servers;
-    default:
-      return state;
+const initialState = {
+  list: {},
+  loading: false,
+};
+
+const assocId = (server) => assoc('id', server.id || uuid(), server);
+
+export default handleActions({
+  [FETCH_SERVERS_START]: (state) => ({ ...state, loading: true }),
+  [FETCH_SERVERS]: (state, { list }) => ({ list, loading: false }),
+}, initialState);
+
+export const listServers = ({ listServers, createServers }, { get }) => () => async (dispatch) => {
+  dispatch({ type: FETCH_SERVERS_START });
+  const localList = listServers();
+
+  if (!isEmpty(localList)) {
+    dispatch({ type: FETCH_SERVERS, list: localList });
+
+    return;
  }
-}

-export const _listServers = (serversService) => ({
-  type: FETCH_SERVERS,
-  servers: serversService.listServers(),
-});
+  // If local list is empty, try to fetch it remotely and calculate IDs for every server
+  const remoteList = await get(`${homepage}/servers.json`)
+    .then(prop('data'))
+    .then(map(assocId))
+    .catch(() => []);

-export const listServers = () => _listServers(serversService);
-
-export const _createServer = (serversService, server) => {
-  serversService.createServer(server);
-
-  return _listServers(serversService);
+  createServers(remoteList);
+  dispatch({ type: FETCH_SERVERS, list: remoteList.reduce((map, server) => ({ ...map, [server.id]: server }), {}) });
 };

-export const createServer = curry(_createServer)(serversService);
+export const createServer = ({ createServer }, listServersAction) => pipe(createServer, listServersAction);

-export const _deleteServer = (serversService, server) => {
-  serversService.deleteServer(server);
+export const deleteServer = ({ deleteServer }, listServersAction) => pipe(deleteServer, listServersAction);

-  return _listServers(serversService);
-};
-
-export const deleteServer = curry(_deleteServer)(serversService);
-
-export const _createServers = (serversService, servers) => {
-  serversService.createServers(servers);
-
-  return _listServers(serversService);
-};
-
-export const createServers = curry(_createServers)(serversService);
+export const createServers = ({ createServers }, listServersAction) => pipe(
+  map(assocId),
+  createServers,
+  listServersAction
+);
--- a/src/servers/services/ServersExporter.js
+++ b/src/servers/services/ServersExporter.js
@@ -1,6 +1,4 @@
 import { dissoc, head, keys, values } from 'ramda';
-import csvjson from 'csvjson';
-import serversService from './ServersService';

 const saveCsv = (window, csv) => {
  const { navigator, document } = window;
@@ -26,7 +24,7 @@ const saveCsv = (window, csv) => {
  document.body.removeChild(link);
 };

-export class ServersExporter {
+export default class ServersExporter {
  constructor(serversService, window, csvjson) {
    this.serversService = serversService;
    this.window = window;
@@ -49,7 +47,3 @@ export class ServersExporter {
    }
  };
 }
-
-const serverExporter = new ServersExporter(serversService, global.window, csvjson);
-
-export default serverExporter;
--- a/src/servers/services/ServersImporter.js
+++ b/src/servers/services/ServersImporter.js
@@ -1,11 +1,4 @@
-import csvjson from 'csvjson';
-import PropTypes from 'prop-types';
-
-export const serversImporterType = PropTypes.shape({
-  importServersFromFile: PropTypes.func,
-});
-
-export class ServersImporter {
+export default class ServersImporter {
  constructor(csvjson) {
    this.csvjson = csvjson;
  }
@@ -28,7 +21,3 @@ export class ServersImporter {
    });
  };
 }
-
-const serversImporter = new ServersImporter(csvjson);
-
-export default serversImporter;
--- a/src/servers/services/ServersService.js
+++ b/src/servers/services/ServersService.js
@@ -1,9 +1,8 @@
 import { assoc, dissoc, reduce } from 'ramda';
-import storage from '../../utils/Storage';

 const SERVERS_STORAGE_KEY = 'servers';

-export class ServersService {
+export default class ServersService {
  constructor(storage) {
    this.storage = storage;
  }
@@ -24,13 +23,6 @@ export class ServersService {
    this.storage.set(SERVERS_STORAGE_KEY, allServers);
  };

-  deleteServer = (server) =>
-    this.storage.set(
-      SERVERS_STORAGE_KEY,
-      dissoc(server.id, this.listServers())
-    );
+  deleteServer = ({ id }) =>
+    this.storage.set(SERVERS_STORAGE_KEY, dissoc(id, this.listServers()));
 }
-
-const serversService = new ServersService(storage);
-
-export default serversService;
--- a/src/servers/services/provideServices.js
+++ b/src/servers/services/provideServices.js
@@ -0,0 +1,46 @@
+import csvjson from 'csvjson';
+import CreateServer from '../CreateServer';
+import ServersDropdown from '../ServersDropdown';
+import DeleteServerModal from '../DeleteServerModal';
+import DeleteServerButton from '../DeleteServerButton';
+import ImportServersBtn from '../helpers/ImportServersBtn';
+import { resetSelectedServer, selectServer } from '../reducers/selectedServer';
+import { createServer, createServers, deleteServer, listServers } from '../reducers/server';
+import ServersImporter from './ServersImporter';
+import ServersService from './ServersService';
+import ServersExporter from './ServersExporter';
+
+const provideServices = (bottle, connect, withRouter) => {
+  // Components
+  bottle.serviceFactory('CreateServer', CreateServer, 'ImportServersBtn', 'stateFlagTimeout');
+  bottle.decorator('CreateServer', connect([ 'selectedServer' ], [ 'createServer', 'resetSelectedServer' ]));
+
+  bottle.serviceFactory('ServersDropdown', ServersDropdown, 'ServersExporter');
+  bottle.decorator('ServersDropdown', connect([ 'servers', 'selectedServer' ], [ 'listServers', 'selectServer' ]));
+
+  bottle.serviceFactory('DeleteServerModal', () => DeleteServerModal);
+  bottle.decorator('DeleteServerModal', withRouter);
+  bottle.decorator('DeleteServerModal', connect(null, [ 'deleteServer' ]));
+
+  bottle.serviceFactory('DeleteServerButton', DeleteServerButton, 'DeleteServerModal');
+
+  bottle.serviceFactory('ImportServersBtn', ImportServersBtn, 'ServersImporter');
+  bottle.decorator('ImportServersBtn', connect(null, [ 'createServers' ]));
+
+  // Services
+  bottle.constant('csvjson', csvjson);
+  bottle.service('ServersImporter', ServersImporter, 'csvjson');
+  bottle.service('ServersService', ServersService, 'Storage');
+  bottle.service('ServersExporter', ServersExporter, 'ServersService', 'window', 'csvjson');
+
+  // Actions
+  bottle.serviceFactory('selectServer', selectServer, 'ServersService');
+  bottle.serviceFactory('createServer', createServer, 'ServersService', 'listServers');
+  bottle.serviceFactory('createServers', createServers, 'ServersService', 'listServers');
+  bottle.serviceFactory('deleteServer', deleteServer, 'ServersService', 'listServers');
+  bottle.serviceFactory('listServers', listServers, 'ServersService', 'axios');
+
+  bottle.serviceFactory('resetSelectedServer', () => resetSelectedServer);
+};
+
+export default provideServices;
--- a/src/short-urls/CreateShortUrl.js
+++ b/src/short-urls/CreateShortUrl.js
@@ -1,16 +1,24 @@
-import downIcon from '@fortawesome/fontawesome-free-solid/faAngleDoubleDown';
-import upIcon from '@fortawesome/fontawesome-free-solid/faAngleDoubleUp';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
-import { assoc, dissoc, isNil, pick, pipe, replace, trim } from 'ramda';
+import { faAngleDoubleDown as downIcon, faAngleDoubleUp as upIcon } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { assoc, dissoc, isNil, pipe, replace, trim } from 'ramda';
 import React from 'react';
-import { connect } from 'react-redux';
 import { Collapse } from 'reactstrap';
-import DateInput from '../common/DateInput';
-import TagsSelector from '../tags/helpers/TagsSelector';
-import CreateShortUrlResult from './helpers/CreateShortUrlResult';
-import { createShortUrl, resetCreateShortUrl } from './reducers/shortUrlCreation';
+import * as PropTypes from 'prop-types';
+import DateInput from '../utils/DateInput';
+import Checkbox from '../utils/Checkbox';
+import { createShortUrlResultType } from './reducers/shortUrlCreation';
+import UseExistingIfFoundInfoIcon from './UseExistingIfFoundInfoIcon';
+
+const normalizeTag = pipe(trim, replace(/ /g, '-'));
+const formatDate = (date) => isNil(date) ? date : date.format();
+
+const CreateShortUrl = (TagsSelector, CreateShortUrlResult) => class CreateShortUrl extends React.Component {
+  static propTypes = {
+    createShortUrl: PropTypes.func,
+    shortUrlCreationResult: createShortUrlResultType,
+    resetCreateShortUrl: PropTypes.func,
+  };

-export class CreateShortUrlComponent extends React.Component {
  state = {
    longUrl: '',
    tags: [],
@@ -18,33 +26,38 @@ export class CreateShortUrlComponent extends React.Component {
    validSince: undefined,
    validUntil: undefined,
    maxVisits: undefined,
+    findIfExists: false,
    moreOptionsVisible: false,
  };

  render() {
    const { createShortUrl, shortUrlCreationResult, resetCreateShortUrl } = this.props;

-    const changeTags = (tags) => this.setState({ tags: tags.map(pipe(trim, replace(/ /g, '-'))) });
+    const changeTags = (tags) => this.setState({ tags: tags.map(normalizeTag) });
    const renderOptionalInput = (id, placeholder, type = 'text', props = {}) => (
-      <input
-        className="form-control"
-        type={type}
-        placeholder={placeholder}
-        value={this.state[id]}
-        onChange={(e) => this.setState({ [id]: e.target.value })}
-        {...props}
-      />
+      <div className="form-group">
+        <input
+          className="form-control"
+          id={id}
+          type={type}
+          placeholder={placeholder}
+          value={this.state[id]}
+          onChange={(e) => this.setState({ [id]: e.target.value })}
+          {...props}
+        />
+      </div>
    );
-    const createDateInput = (id, placeholder, props = {}) => (
-      <DateInput
-        selected={this.state[id]}
-        placeholderText={placeholder}
-        isClearable
-        onChange={(date) => this.setState({ [id]: date })}
-        {...props}
-      />
+    const renderDateInput = (id, placeholder, props = {}) => (
+      <div className="form-group">
+        <DateInput
+          selected={this.state[id]}
+          placeholderText={placeholder}
+          isClearable
+          onChange={(date) => this.setState({ [id]: date })}
+          {...props}
+        />
+      </div>
    );
-    const formatDate = (date) => isNil(date) ? date : date.format();
    const save = (e) => {
      e.preventDefault();
      createShortUrl(pipe(
@@ -75,38 +88,38 @@ export class CreateShortUrlComponent extends React.Component {

            <div className="row">
              <div className="col-sm-6">
-                <div className="form-group">
-                  {renderOptionalInput('customSlug', 'Custom slug')}
-                </div>
-                <div className="form-group">
-                  {renderOptionalInput('maxVisits', 'Maximum number of visits allowed', 'number', { min: 1 })}
-                </div>
+                {renderOptionalInput('customSlug', 'Custom slug')}
+                {renderOptionalInput('maxVisits', 'Maximum number of visits allowed', 'number', { min: 1 })}
              </div>
              <div className="col-sm-6">
-                <div className="form-group">
-                  {createDateInput('validSince', 'Enabled since...', { maxDate: this.state.validUntil })}
-                </div>
-                <div className="form-group">
-                  {createDateInput('validUntil', 'Enabled until...', { minDate: this.state.validSince })}
-                </div>
+                {renderDateInput('validSince', 'Enabled since...', { maxDate: this.state.validUntil })}
+                {renderDateInput('validUntil', 'Enabled until...', { minDate: this.state.validSince })}
              </div>
            </div>
+
+            <div className="mb-3 text-right">
+              <Checkbox
+                className="mr-2"
+                checked={this.state.findIfExists}
+                onChange={(findIfExists) => this.setState({ findIfExists })}
+              >
+                Use existing URL if found
+              </Checkbox>
+              <UseExistingIfFoundInfoIcon />
+            </div>
          </Collapse>

          <div>
            <button
              type="button"
-              className="btn btn-outline-secondary create-short-url__btn"
+              className="btn btn-outline-secondary"
              onClick={() => this.setState(({ moreOptionsVisible }) => ({ moreOptionsVisible: !moreOptionsVisible }))}
            >
              <FontAwesomeIcon icon={this.state.moreOptionsVisible ? upIcon : downIcon} />
              &nbsp;
              {this.state.moreOptionsVisible ? 'Less' : 'More'} options
            </button>
-            <button
-              className="btn btn-outline-primary create-short-url__btn float-right"
-              disabled={shortUrlCreationResult.loading}
-            >
+            <button className="btn btn-outline-primary float-right" disabled={shortUrlCreationResult.loading}>
              {shortUrlCreationResult.loading ? 'Creating...' : 'Create'}
            </button>
          </div>
@@ -116,11 +129,6 @@ export class CreateShortUrlComponent extends React.Component {
      </div>
    );
  }
-}
-
-const CreateShortUrl = connect(pick([ 'shortUrlCreationResult' ]), {
-  createShortUrl,
-  resetCreateShortUrl,
-})(CreateShortUrlComponent);
+};

 export default CreateShortUrl;
--- a/src/short-urls/Paginator.js
+++ b/src/short-urls/Paginator.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Pagination, PaginationItem, PaginationLink } from 'reactstrap';
 import PropTypes from 'prop-types';
-import { range } from 'ramda';
+import { rangeOf } from '../utils/utils';

 const propTypes = {
  serverId: PropTypes.string.isRequired,
@@ -20,7 +20,7 @@ export default function Paginator({ paginator = {}, serverId }) {
  }

  const renderPages = () =>
-    range(1, pagesCount + 1).map((pageNumber) => (
+    rangeOf(pagesCount, (pageNumber) => (
      <PaginationItem key={pageNumber} active={currentPage === pageNumber}>
        <PaginationLink
          tag={Link}
--- a/src/short-urls/SearchBar.js
+++ b/src/short-urls/SearchBar.js
@@ -1,55 +1,56 @@
-import tagsIcon from '@fortawesome/fontawesome-free-solid/faTags';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { faTags as tagsIcon } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import React from 'react';
-import { connect } from 'react-redux';
-import { isEmpty, pick } from 'ramda';
+import { isEmpty } from 'ramda';
 import PropTypes from 'prop-types';
-import Tag from '../tags/helpers/Tag';
 import SearchField from '../utils/SearchField';
-import { listShortUrls } from './reducers/shortUrlsList';
-import './SearchBar.scss';
+import Tag from '../tags/helpers/Tag';
 import { shortUrlsListParamsType } from './reducers/shortUrlsListParams';
+import './SearchBar.scss';

 const propTypes = {
  listShortUrls: PropTypes.func,
  shortUrlsListParams: shortUrlsListParamsType,
 };

-export function SearchBarComponent({ listShortUrls, shortUrlsListParams }) {
-  const selectedTags = shortUrlsListParams.tags || [];
+const SearchBar = (colorGenerator) => {
+  const SearchBar = ({ listShortUrls, shortUrlsListParams }) => {
+    const selectedTags = shortUrlsListParams.tags || [];

-  return (
-    <div className="serach-bar-container">
-      <SearchField onChange={
-        (searchTerm) => listShortUrls({ ...shortUrlsListParams, searchTerm })
-      }
-      />
+    return (
+      <div className="serach-bar-container">
+        <SearchField onChange={
+          (searchTerm) => listShortUrls({ ...shortUrlsListParams, searchTerm })
+        }
+        />

-      {!isEmpty(selectedTags) && (
-        <h4 className="search-bar__selected-tag mt-2">
-          <FontAwesomeIcon icon={tagsIcon} className="search-bar__tags-icon" />
-          &nbsp;
-          {selectedTags.map((tag) => (
-            <Tag
-              key={tag}
-              text={tag}
-              clearable
-              onClose={() => listShortUrls(
-                {
-                  ...shortUrlsListParams,
-                  tags: selectedTags.filter((selectedTag) => selectedTag !== tag),
-                }
-              )}
-            />
-          ))}
-        </h4>
-      )}
-    </div>
-  );
-}
+        {!isEmpty(selectedTags) && (
+          <h4 className="search-bar__selected-tag mt-2">
+            <FontAwesomeIcon icon={tagsIcon} className="search-bar__tags-icon" />
+            &nbsp;
+            {selectedTags.map((tag) => (
+              <Tag
+                colorGenerator={colorGenerator}
+                key={tag}
+                text={tag}
+                clearable
+                onClose={() => listShortUrls(
+                  {
+                    ...shortUrlsListParams,
+                    tags: selectedTags.filter((selectedTag) => selectedTag !== tag),
+                  }
+                )}
+              />
+            ))}
+          </h4>
+        )}
+      </div>
+    );
+  };

-SearchBarComponent.propTypes = propTypes;
+  SearchBar.propTypes = propTypes;

-const SearchBar = connect(pick([ 'shortUrlsListParams' ]), { listShortUrls })(SearchBarComponent);
+  return SearchBar;
+};

 export default SearchBar;
--- a/src/short-urls/ShortUrls.js
+++ b/src/short-urls/ShortUrls.js
@@ -1,27 +1,35 @@
 import React from 'react';
-import { connect } from 'react-redux';
-import { assoc } from 'ramda';
+import PropTypes from 'prop-types';
 import Paginator from './Paginator';
-import SearchBar from './SearchBar';
-import ShortUrlsList from './ShortUrlsList';

-export function ShortUrlsComponent(props) {
-  const { match: { params } } = props;
+const ShortUrls = (SearchBar, ShortUrlsList) => {
+  const propTypes = {
+    match: PropTypes.shape({
+      params: PropTypes.object,
+    }),
+    shortUrlsList: PropTypes.object,
+  };

-  // Using a key on a component makes react to create a new instance every time the key changes
-  const urlsListKey = `${params.serverId}_${params.page}`;
+  const ShortUrlsComponent = (props) => {
+    const { match: { params }, shortUrlsList } = props;
+    const { page, serverId } = params;
+    const { data = [], pagination } = shortUrlsList;

-  return (
-    <div className="shlink-container">
-      <div className="form-group"><SearchBar /></div>
-      <ShortUrlsList {...props} shortUrlsList={props.shortUrlsList.data || []} key={urlsListKey} />
-      <Paginator paginator={props.shortUrlsList.pagination} serverId={props.match.params.serverId} />
-    </div>
-  );
-}
+    // Using a key on a component makes react to create a new instance every time the key changes
+    const urlsListKey = `${serverId}_${page}`;

-const ShortUrls = connect(
-  (state) => assoc('shortUrlsList', state.shortUrlsList.shortUrls, state.shortUrlsList)
-)(ShortUrlsComponent);
+    return (
+      <div className="shlink-container">
+        <div className="form-group"><SearchBar /></div>
+        <ShortUrlsList {...props} shortUrlsList={data} key={urlsListKey} />
+        <Paginator paginator={pagination} serverId={serverId} />
+      </div>
+    );
+  };
+
+  ShortUrlsComponent.propTypes = propTypes;
+
+  return ShortUrlsComponent;
+};

 export default ShortUrls;
--- a/src/short-urls/ShortUrlsList.js
+++ b/src/short-urls/ShortUrlsList.js
@@ -1,26 +1,24 @@
-import caretDownIcon from '@fortawesome/fontawesome-free-solid/faCaretDown';
-import caretUpIcon from '@fortawesome/fontawesome-free-solid/faCaretUp';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
-import { head, isEmpty, pick, toPairs, keys, values } from 'ramda';
+import { faCaretDown as caretDownIcon, faCaretUp as caretUpIcon } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { head, isEmpty, keys, values } from 'ramda';
 import React from 'react';
-import { connect } from 'react-redux';
-import { DropdownItem, DropdownMenu, DropdownToggle, UncontrolledDropdown } from 'reactstrap';
 import qs from 'qs';
 import PropTypes from 'prop-types';
 import { serverType } from '../servers/prop-types';
-import { ShortUrlsRow } from './helpers/ShortUrlsRow';
-import { listShortUrls, shortUrlType } from './reducers/shortUrlsList';
+import SortingDropdown from '../utils/SortingDropdown';
+import { determineOrderDir } from '../utils/utils';
+import { shortUrlType } from './reducers/shortUrlsList';
+import { shortUrlsListParamsType } from './reducers/shortUrlsListParams';
 import './ShortUrlsList.scss';
-import { shortUrlsListParamsType, resetShortUrlParams } from './reducers/shortUrlsListParams';

-const SORTABLE_FIELDS = {
+export const SORTABLE_FIELDS = {
  dateCreated: 'Created at',
  shortCode: 'Short URL',
-  originalUrl: 'Long URL',
+  longUrl: 'Long URL',
  visits: 'Visits',
 };

-export class ShortUrlsListComponent extends React.Component {
+const ShortUrlsList = (ShortUrlsRow) => class ShortUrlsList extends React.Component {
  static propTypes = {
    listShortUrls: PropTypes.func,
    resetShortUrlParams: PropTypes.func,
@@ -41,33 +39,25 @@ export class ShortUrlsListComponent extends React.Component {
      ...extraParams,
    });
  };
-  determineOrderDir = (field) => {
+  handleOrderBy = (orderField, orderDir) => {
+    this.setState({ orderField, orderDir });
+    this.refreshList({ orderBy: { [orderField]: orderDir } });
+  };
+  orderByColumn = (columnName) => () =>
+    this.handleOrderBy(columnName, determineOrderDir(columnName, this.state.orderField, this.state.orderDir));
+  renderOrderIcon = (field) => {
    if (this.state.orderField !== field) {
-      return 'ASC';
+      return null;
    }

-    const newOrderMap = {
-      ASC: 'DESC',
-      DESC: undefined,
-    };
-
-    return this.state.orderDir ? newOrderMap[this.state.orderDir] : 'ASC';
-  };
-  orderBy = (field) => {
-    const newOrderDir = this.determineOrderDir(field);
-
-    this.setState({ orderField: newOrderDir !== undefined ? field : undefined, orderDir: newOrderDir });
-    this.refreshList({ orderBy: { [field]: newOrderDir } });
-  };
-  renderOrderIcon = (field, className = 'short-urls-list__header-icon') => {
-    if (this.state.orderField !== field) {
+    if (!this.state.orderDir) {
      return null;
    }

    return (
      <FontAwesomeIcon
        icon={this.state.orderDir === 'ASC' ? caretUpIcon : caretDownIcon}
-        className={className}
+        className="short-urls-list__header-icon"
      />
    );
  };
@@ -126,58 +116,45 @@ export class ShortUrlsListComponent extends React.Component {
    ));
  }

-  renderMobileOrderingControls() {
-    return (
-      <div className="d-block d-md-none mb-3">
-        <UncontrolledDropdown>
-          <DropdownToggle caret className="btn-block">
-            Order by
-          </DropdownToggle>
-          <DropdownMenu className="short-urls-list__order-dropdown">
-            {toPairs(SORTABLE_FIELDS).map(([ key, value ]) => (
-              <DropdownItem key={key} active={this.state.orderField === key} onClick={() => this.orderBy(key)}>
-                {value}
-                {this.renderOrderIcon(key, 'short-urls-list__header-icon--mobile')}
-              </DropdownItem>
-            ))}
-          </DropdownMenu>
-        </UncontrolledDropdown>
-      </div>
-    );
-  }
-
  render() {
    return (
      <React.Fragment>
-        {this.renderMobileOrderingControls()}
+        <div className="d-block d-md-none mb-3">
+          <SortingDropdown
+            items={SORTABLE_FIELDS}
+            orderField={this.state.orderField}
+            orderDir={this.state.orderDir}
+            onChange={this.handleOrderBy}
+          />
+        </div>
        <table className="table table-striped table-hover">
          <thead className="short-urls-list__header">
            <tr>
              <th
                className="short-urls-list__header-cell short-urls-list__header-cell--with-action"
-                onClick={() => this.orderBy('dateCreated')}
+                onClick={this.orderByColumn('dateCreated')}
              >
                {this.renderOrderIcon('dateCreated')}
                Created at
              </th>
              <th
                className="short-urls-list__header-cell short-urls-list__header-cell--with-action"
-                onClick={() => this.orderBy('shortCode')}
+                onClick={this.orderByColumn('shortCode')}
              >
                {this.renderOrderIcon('shortCode')}
                Short URL
              </th>
              <th
                className="short-urls-list__header-cell short-urls-list__header-cell--with-action"
-                onClick={() => this.orderBy('originalUrl')}
+                onClick={this.orderByColumn('longUrl')}
              >
-                {this.renderOrderIcon('originalUrl')}
+                {this.renderOrderIcon('longUrl')}
                Long URL
              </th>
              <th className="short-urls-list__header-cell">Tags</th>
              <th
                className="short-urls-list__header-cell short-urls-list__header-cell--with-action"
-                onClick={() => this.orderBy('visits')}
+                onClick={this.orderByColumn('visits')}
              >
                <span className="nowrap">{this.renderOrderIcon('visits')} Visits</span>
              </th>
@@ -191,11 +168,6 @@ export class ShortUrlsListComponent extends React.Component {
      </React.Fragment>
    );
  }
-}
-
-const ShortUrlsList = connect(
-  pick([ 'selectedServer', 'shortUrlsListParams' ]),
-  { listShortUrls, resetShortUrlParams }
-)(ShortUrlsListComponent);
+};

 export default ShortUrlsList;
--- a/src/short-urls/ShortUrlsList.scss
+++ b/src/short-urls/ShortUrlsList.scss
@@ -14,15 +14,6 @@
  margin-right: 5px;
 }

-.short-urls-list__header-icon--mobile {
-  margin: 3.5px 0 0;
-  float: right;
-}
-
 .short-urls-list__header-cell--with-action {
  cursor: pointer;
 }
-
-.short-urls-list__order-dropdown {
-  width: 100%;
-}
--- a/src/short-urls/UseExistingIfFoundInfoIcon.js
+++ b/src/short-urls/UseExistingIfFoundInfoIcon.js
@@ -0,0 +1,56 @@
+import React from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faInfoCircle as infoIcon } from '@fortawesome/free-solid-svg-icons';
+import { Modal, ModalBody, ModalHeader } from 'reactstrap';
+import './UseExistingIfFoundInfoIcon.scss';
+import { useToggle } from '../utils/utils';
+
+const renderInfoModal = (isOpen, toggle) => (
+  <Modal isOpen={isOpen} toggle={toggle} centered size="lg">
+    <ModalHeader toggle={toggle}>Info</ModalHeader>
+    <ModalBody>
+      <p>
+        When the&nbsp;
+        <b><i>&quot;Use existing URL if found&quot;</i></b>
+        &nbsp;checkbox is checked, the server will return an existing short URL if it matches provided params.
+      </p>
+      <p>
+        These are the checks performed by Shlink in order to determine if an existing short URL should be returned:
+      </p>
+      <ul>
+        <li>
+          When only the long URL is provided: The most recent match will be returned, or a new short URL will be created
+          if none is found
+        </li>
+        <li>
+          When long URL and custom slug are provided: Same as in previous case, but it will try to match the short URL
+          using both the long URL and the slug.
+          <br />
+          If the slug is being used by another long URL, an error will be returned.
+        </li>
+        <li>
+          When other params are provided: Same as in previous cases, but it will try to match existing short URLs with
+          all provided data. If any of them does not match, a new short URL will be created
+        </li>
+      </ul>
+      <blockquote className="use-existing-if-found-info-icon__modal-quote">
+        <b>Important:</b> This feature will be ignored while using a Shlink version older than v1.16.0.
+      </blockquote>
+    </ModalBody>
+  </Modal>
+);
+
+const UseExistingIfFoundInfoIcon = () => {
+  const [ isModalOpen, toggleModal ] = useToggle(false);
+
+  return (
+    <React.Fragment>
+      <span title="What does this mean?">
+        <FontAwesomeIcon icon={infoIcon} style={{ cursor: 'pointer' }} onClick={toggleModal} />
+      </span>
+      {renderInfoModal(isModalOpen, toggleModal)}
+    </React.Fragment>
+  );
+};
+
+export default UseExistingIfFoundInfoIcon;
--- a/src/short-urls/UseExistingIfFoundInfoIcon.scss
+++ b/src/short-urls/UseExistingIfFoundInfoIcon.scss
@@ -0,0 +1,7 @@
+.use-existing-if-found-info-icon__modal-quote {
+  margin-bottom: 0;
+  padding: 10px 15px;
+  font-size: 17.5px;
+  border-left: 5px solid #eee;
+  background-color: #f9f9f9;
+}
--- a/src/short-urls/helpers/CreateShortUrlResult.js
+++ b/src/short-urls/helpers/CreateShortUrlResult.js
@@ -1,15 +1,14 @@
-import copyIcon from '@fortawesome/fontawesome-free-regular/faCopy';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { faCopy as copyIcon } from '@fortawesome/free-regular-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { isNil } from 'ramda';
 import React from 'react';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { Card, CardBody, Tooltip } from 'reactstrap';
 import PropTypes from 'prop-types';
 import { createShortUrlResultType } from '../reducers/shortUrlCreation';
-import { stateFlagTimeout } from '../../utils/utils';
 import './CreateShortUrlResult.scss';

-export default class CreateShortUrlResult extends React.Component {
+const CreateShortUrlResult = (stateFlagTimeout) => class CreateShortUrlResult extends React.Component {
  static propTypes = {
    resetCreateShortUrl: PropTypes.func,
    error: PropTypes.bool,
@@ -61,4 +60,6 @@ export default class CreateShortUrlResult extends React.Component {
      </Card>
    );
  }
-}
+};
+
+export default CreateShortUrlResult;
--- a/src/short-urls/helpers/DeleteShortUrlModal.js
+++ b/src/short-urls/helpers/DeleteShortUrlModal.js
@@ -1,18 +1,11 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
+import React from 'react';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
 import PropTypes from 'prop-types';
-import { pick, identity } from 'ramda';
+import { identity } from 'ramda';
 import { shortUrlType } from '../reducers/shortUrlsList';
-import {
-  deleteShortUrl,
-  resetDeleteShortUrl,
-  shortUrlDeleted,
-  shortUrlDeletionType,
-} from '../reducers/shortUrlDeletion';
-import './QrCodeModal.scss';
+import { shortUrlDeletionType } from '../reducers/shortUrlDeletion';

-export class DeleteShortUrlModalComponent extends Component {
+export default class DeleteShortUrlModal extends React.Component {
  static propTypes = {
    shortUrl: shortUrlType,
    toggle: PropTypes.func,
@@ -47,6 +40,8 @@ export class DeleteShortUrlModalComponent extends Component {
  render() {
    const { shortUrl, toggle, isOpen, shortUrlDeletion } = this.props;
    const THRESHOLD_REACHED = 'INVALID_SHORTCODE_DELETION';
+    const hasThresholdError = shortUrlDeletion.error && shortUrlDeletion.errorData.error === THRESHOLD_REACHED;
+    const hasErrorOtherThanThreshold = shortUrlDeletion.error && shortUrlDeletion.errorData.error !== THRESHOLD_REACHED;

    return (
      <Modal isOpen={isOpen} toggle={toggle} centered>
@@ -66,12 +61,12 @@ export class DeleteShortUrlModalComponent extends Component {
              onChange={(e) => this.setState({ inputValue: e.target.value })}
            />

-            {shortUrlDeletion.error && shortUrlDeletion.errorData.error === THRESHOLD_REACHED && (
+            {hasThresholdError && (
              <div className="p-2 mt-2 bg-warning text-center">
                This short URL has received too many visits and therefore, it cannot be deleted
              </div>
            )}
-            {shortUrlDeletion.error && shortUrlDeletion.errorData.error !== THRESHOLD_REACHED && (
+            {hasErrorOtherThanThreshold && (
              <div className="p-2 mt-2 bg-danger text-white text-center">
                Something went wrong while deleting the URL :(
              </div>
@@ -92,10 +87,3 @@ export class DeleteShortUrlModalComponent extends Component {
    );
  }
 }
-
-const DeleteShortUrlModal = connect(
-  pick([ 'shortUrlDeletion' ]),
-  { deleteShortUrl, resetDeleteShortUrl, shortUrlDeleted }
-)(DeleteShortUrlModalComponent);
-
-export default DeleteShortUrlModal;
--- a/src/short-urls/helpers/EditTagsModal.js
+++ b/src/short-urls/helpers/EditTagsModal.js
@@ -1,19 +1,11 @@
 import React from 'react';
-import { connect } from 'react-redux';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
 import PropTypes from 'prop-types';
-import { pick } from 'ramda';
-import TagsSelector from '../../tags/helpers/TagsSelector';
-import {
-  editShortUrlTags,
-  resetShortUrlsTags,
-  shortUrlTagsType,
-  shortUrlTagsEdited,
-} from '../reducers/shortUrlTags';
 import ExternalLink from '../../utils/ExternalLink';
+import { shortUrlTagsType } from '../reducers/shortUrlTags';
 import { shortUrlType } from '../reducers/shortUrlsList';

-export class EditTagsModalComponent extends React.Component {
+const EditTagsModal = (TagsSelector) => class EditTagsModal extends React.Component {
  static propTypes = {
    isOpen: PropTypes.bool.isRequired,
    toggle: PropTypes.func.isRequired,
@@ -88,11 +80,6 @@ export class EditTagsModalComponent extends React.Component {
      </Modal>
    );
  }
-}
-
-const EditTagsModal = connect(
-  pick([ 'shortUrlTags' ]),
-  { editShortUrlTags, resetShortUrlsTags, shortUrlTagsEdited }
-)(EditTagsModalComponent);
+};

 export default EditTagsModal;
--- a/src/short-urls/helpers/PreviewModal.js
+++ b/src/short-urls/helpers/PreviewModal.js
@@ -10,20 +10,20 @@ const propTypes = {
  isOpen: PropTypes.bool,
 };

-export default function PreviewModal({ url, toggle, isOpen }) {
-  return (
-    <Modal isOpen={isOpen} toggle={toggle} size="lg">
-      <ModalHeader toggle={toggle}>
-        Preview for <ExternalLink href={url}>{url}</ExternalLink>
-      </ModalHeader>
-      <ModalBody>
-        <div className="text-center">
-          <p className="preview-modal__loader">Loading...</p>
-          <img src={`${url}/preview`} className="preview-modal__img" alt="Preview" />
-        </div>
-      </ModalBody>
-    </Modal>
-  );
-}
+const PreviewModal = ({ url, toggle, isOpen }) => (
+  <Modal isOpen={isOpen} toggle={toggle} size="lg">
+    <ModalHeader toggle={toggle}>
+      Preview for <ExternalLink href={url}>{url}</ExternalLink>
+    </ModalHeader>
+    <ModalBody>
+      <div className="text-center">
+        <p className="preview-modal__loader">Loading...</p>
+        <img src={`${url}/preview`} className="preview-modal__img" alt="Preview" />
+      </div>
+    </ModalBody>
+  </Modal>
+);

 PreviewModal.propTypes = propTypes;
+
+export default PreviewModal;
--- a/src/short-urls/helpers/QrCodeModal.js
+++ b/src/short-urls/helpers/QrCodeModal.js
@@ -10,19 +10,19 @@ const propTypes = {
  isOpen: PropTypes.bool,
 };

-export default function QrCodeModal({ url, toggle, isOpen }) {
-  return (
-    <Modal isOpen={isOpen} toggle={toggle} centered>
-      <ModalHeader toggle={toggle}>
-        QR code for <ExternalLink href={url}>{url}</ExternalLink>
-      </ModalHeader>
-      <ModalBody>
-        <div className="text-center">
-          <img src={`${url}/qr-code`} className="qr-code-modal__img" alt="QR code" />
-        </div>
-      </ModalBody>
-    </Modal>
-  );
-}
+const QrCodeModal = ({ url, toggle, isOpen }) => (
+  <Modal isOpen={isOpen} toggle={toggle} centered>
+    <ModalHeader toggle={toggle}>
+      QR code for <ExternalLink href={url}>{url}</ExternalLink>
+    </ModalHeader>
+    <ModalBody>
+      <div className="text-center">
+        <img src={`${url}/qr-code`} className="qr-code-modal__img" alt="QR code" />
+      </div>
+    </ModalBody>
+  </Modal>
+);

 QrCodeModal.propTypes = propTypes;
+
+export default QrCodeModal;
--- a/src/short-urls/helpers/ShortUrlsRow.js
+++ b/src/short-urls/helpers/ShortUrlsRow.js
@@ -2,16 +2,18 @@ import { isEmpty } from 'ramda';
 import React from 'react';
 import Moment from 'react-moment';
 import PropTypes from 'prop-types';
-import Tag from '../../tags/helpers/Tag';
 import { shortUrlsListParamsType } from '../reducers/shortUrlsListParams';
 import { serverType } from '../../servers/prop-types';
 import ExternalLink from '../../utils/ExternalLink';
 import { shortUrlType } from '../reducers/shortUrlsList';
-import { stateFlagTimeout } from '../../utils/utils';
-import { ShortUrlsRowMenu } from './ShortUrlsRowMenu';
+import Tag from '../../tags/helpers/Tag';
 import './ShortUrlsRow.scss';

-export class ShortUrlsRow extends React.Component {
+const ShortUrlsRow = (
+  ShortUrlsRowMenu,
+  colorGenerator,
+  stateFlagTimeout
+) => class ShortUrlsRow extends React.Component {
  static propTypes = {
    refreshList: PropTypes.func,
    shortUrlsListParams: shortUrlsListParamsType,
@@ -31,6 +33,7 @@ export class ShortUrlsRow extends React.Component {

    return tags.map((tag) => (
      <Tag
+        colorGenerator={colorGenerator}
        key={tag}
        text={tag}
        onClick={() => refreshList({ tags: [ ...selectedTags, tag ] })}
@@ -40,7 +43,6 @@ export class ShortUrlsRow extends React.Component {

  render() {
    const { shortUrl, selectedServer } = this.props;
-    const completeShortUrl = !selectedServer ? shortUrl.shortCode : `${selectedServer.url}/${shortUrl.shortCode}`;

    return (
      <tr className="short-urls-row">
@@ -48,10 +50,10 @@ export class ShortUrlsRow extends React.Component {
          <Moment format="YYYY-MM-DD HH:mm">{shortUrl.dateCreated}</Moment>
        </td>
        <td className="short-urls-row__cell" data-th="Short URL: ">
-          <ExternalLink href={completeShortUrl}>{completeShortUrl}</ExternalLink>
+          <ExternalLink href={shortUrl.shortUrl} />
        </td>
        <td className="short-urls-row__cell short-urls-row__cell--break" data-th="Long URL: ">
-          <ExternalLink href={shortUrl.originalUrl}>{shortUrl.originalUrl}</ExternalLink>
+          <ExternalLink href={shortUrl.longUrl} />
        </td>
        <td className="short-urls-row__cell" data-th="Tags: ">{this.renderTags(shortUrl.tags)}</td>
        <td className="short-urls-row__cell text-md-right" data-th="Visits: ">{shortUrl.visitsCount}</td>
@@ -63,7 +65,6 @@ export class ShortUrlsRow extends React.Component {
            Copied short URL!
          </small>
          <ShortUrlsRowMenu
-            completeShortUrl={completeShortUrl}
            selectedServer={selectedServer}
            shortUrl={shortUrl}
            onCopyToClipboard={() => stateFlagTimeout(this.setState.bind(this), 'copiedToClipboard')}
@@ -72,4 +73,6 @@ export class ShortUrlsRow extends React.Component {
      </tr>
    );
  }
-}
+};
+
+export default ShortUrlsRow;
--- a/src/short-urls/helpers/ShortUrlsRowMenu.js
+++ b/src/short-urls/helpers/ShortUrlsRowMenu.js
@@ -1,11 +1,12 @@
-import copyIcon from '@fortawesome/fontawesome-free-regular/faCopy';
-import pictureIcon from '@fortawesome/fontawesome-free-regular/faImage';
-import tagsIcon from '@fortawesome/fontawesome-free-solid/faTags';
-import pieChartIcon from '@fortawesome/fontawesome-free-solid/faChartPie';
-import menuIcon from '@fortawesome/fontawesome-free-solid/faEllipsisV';
-import qrIcon from '@fortawesome/fontawesome-free-solid/faQrcode';
-import deleteIcon from '@fortawesome/fontawesome-free-solid/faMinusCircle';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { faCopy as copyIcon, faImage as pictureIcon } from '@fortawesome/free-regular-svg-icons';
+import {
+  faTags as tagsIcon,
+  faChartPie as pieChartIcon,
+  faEllipsisV as menuIcon,
+  faQrcode as qrIcon,
+  faMinusCircle as deleteIcon,
+} from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import React from 'react';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { Link } from 'react-router-dom';
@@ -16,12 +17,9 @@ import { shortUrlType } from '../reducers/shortUrlsList';
 import PreviewModal from './PreviewModal';
 import QrCodeModal from './QrCodeModal';
 import './ShortUrlsRowMenu.scss';
-import EditTagsModal from './EditTagsModal';
-import DeleteShortUrlModal from './DeleteShortUrlModal';

-export class ShortUrlsRowMenu extends React.Component {
+const ShortUrlsRowMenu = (DeleteShortUrlModal, EditTagsModal) => class ShortUrlsRowMenu extends React.Component {
  static propTypes = {
-    completeShortUrl: PropTypes.string,
    onCopyToClipboard: PropTypes.func,
    selectedServer: serverType,
    shortUrl: shortUrlType,
@@ -30,28 +28,28 @@ export class ShortUrlsRowMenu extends React.Component {
  state = {
    isOpen: false,
    isQrModalOpen: false,
-    isPreviewOpen: false,
+    isPreviewModalOpen: false,
    isTagsModalOpen: false,
    isDeleteModalOpen: false,
  };
  toggle = () => this.setState(({ isOpen }) => ({ isOpen: !isOpen }));

  render() {
-    const { completeShortUrl, onCopyToClipboard, selectedServer, shortUrl } = this.props;
-    const serverId = selectedServer ? selectedServer.id : '';
+    const { onCopyToClipboard, shortUrl, selectedServer } = this.props;
+    const completeShortUrl = shortUrl && shortUrl.shortUrl ? shortUrl.shortUrl : '';
    const toggleModal = (prop) => () => this.setState((prevState) => ({ [prop]: !prevState[prop] }));
    const toggleQrCode = toggleModal('isQrModalOpen');
-    const togglePreview = toggleModal('isPreviewOpen');
+    const togglePreview = toggleModal('isPreviewModalOpen');
    const toggleTags = toggleModal('isTagsModalOpen');
    const toggleDelete = toggleModal('isDeleteModalOpen');

    return (
-      <ButtonDropdown toggle={this.toggle} isOpen={this.state.isOpen} direction="left">
-        <DropdownToggle size="sm" caret className="short-urls-row-menu__dropdown-toggle btn-outline-secondary">
+      <ButtonDropdown toggle={this.toggle} isOpen={this.state.isOpen}>
+        <DropdownToggle size="sm" caret outline className="short-urls-row-menu__dropdown-toggle">
          &nbsp;<FontAwesomeIcon icon={menuIcon} />&nbsp;
        </DropdownToggle>
-        <DropdownMenu>
-          <DropdownItem tag={Link} to={`/server/${serverId}/short-code/${shortUrl.shortCode}/visits`}>
+        <DropdownMenu right>
+          <DropdownItem tag={Link} to={`/server/${selectedServer ? selectedServer.id : ''}/short-code/${shortUrl.shortCode}/visits`}>
            <FontAwesomeIcon icon={pieChartIcon} /> &nbsp;Visit stats
          </DropdownItem>

@@ -68,31 +66,19 @@ export class ShortUrlsRowMenu extends React.Component {
          <DropdownItem className="short-urls-row-menu__dropdown-item--danger" onClick={toggleDelete}>
            <FontAwesomeIcon icon={deleteIcon} /> &nbsp;Delete short URL
          </DropdownItem>
-          <DeleteShortUrlModal
-            shortUrl={shortUrl}
-            isOpen={this.state.isDeleteModalOpen}
-            toggle={toggleDelete}
-          />
+          <DeleteShortUrlModal shortUrl={shortUrl} isOpen={this.state.isDeleteModalOpen} toggle={toggleDelete} />

          <DropdownItem divider />

          <DropdownItem onClick={togglePreview}>
            <FontAwesomeIcon icon={pictureIcon} /> &nbsp;Preview
          </DropdownItem>
-          <PreviewModal
-            url={completeShortUrl}
-            isOpen={this.state.isPreviewOpen}
-            toggle={togglePreview}
-          />
+          <PreviewModal url={completeShortUrl} isOpen={this.state.isPreviewModalOpen} toggle={togglePreview} />

          <DropdownItem onClick={toggleQrCode}>
            <FontAwesomeIcon icon={qrIcon} /> &nbsp;QR code
          </DropdownItem>
-          <QrCodeModal
-            url={completeShortUrl}
-            isOpen={this.state.isQrModalOpen}
-            toggle={toggleQrCode}
-          />
+          <QrCodeModal url={completeShortUrl} isOpen={this.state.isQrModalOpen} toggle={toggleQrCode} />

          <DropdownItem divider />

@@ -105,4 +91,6 @@ export class ShortUrlsRowMenu extends React.Component {
      </ButtonDropdown>
    );
  }
-}
+};
+
+export default ShortUrlsRowMenu;
--- a/src/short-urls/helpers/ShortUrlsRowMenu.scss
+++ b/src/short-urls/helpers/ShortUrlsRowMenu.scss
@@ -1,6 +1,6 @@
@import '../../utils/base';

-.short-urls-row-menu__dropdown-toggle:before {
+.short-urls-row-menu__dropdown-toggle:after {
  display: none !important;
 }

--- a/src/short-urls/reducers/shortUrlCreation.js
+++ b/src/short-urls/reducers/shortUrlCreation.js
@@ -1,13 +1,12 @@
-import { curry } from 'ramda';
 import PropTypes from 'prop-types';
-import shlinkApiClient from '../../api/ShlinkApiClient';
+import { createAction, handleActions } from 'redux-actions';

-/* eslint-disable padding-line-between-statements, newline-after-var */
-const CREATE_SHORT_URL_START = 'shlink/createShortUrl/CREATE_SHORT_URL_START';
-const CREATE_SHORT_URL_ERROR = 'shlink/createShortUrl/CREATE_SHORT_URL_ERROR';
-const CREATE_SHORT_URL = 'shlink/createShortUrl/CREATE_SHORT_URL';
-const RESET_CREATE_SHORT_URL = 'shlink/createShortUrl/RESET_CREATE_SHORT_URL';
-/* eslint-enable padding-line-between-statements, newline-after-var */
+/* eslint-disable padding-line-between-statements */
+export const CREATE_SHORT_URL_START = 'shlink/createShortUrl/CREATE_SHORT_URL_START';
+export const CREATE_SHORT_URL_ERROR = 'shlink/createShortUrl/CREATE_SHORT_URL_ERROR';
+export const CREATE_SHORT_URL = 'shlink/createShortUrl/CREATE_SHORT_URL';
+export const RESET_CREATE_SHORT_URL = 'shlink/createShortUrl/RESET_CREATE_SHORT_URL';
+/* eslint-enable padding-line-between-statements */

 export const createShortUrlResultType = PropTypes.shape({
  result: PropTypes.shape({
@@ -17,43 +16,26 @@ export const createShortUrlResultType = PropTypes.shape({
  error: PropTypes.bool,
 });

-const defaultState = {
+const initialState = {
  result: null,
  saving: false,
  error: false,
 };

-export default function reducer(state = defaultState, action) {
-  switch (action.type) {
-    case CREATE_SHORT_URL_START:
-      return {
-        ...state,
-        saving: true,
-      };
-    case CREATE_SHORT_URL_ERROR:
-      return {
-        ...state,
-        saving: false,
-        error: true,
-      };
-    case CREATE_SHORT_URL:
-      return {
-        result: action.result,
-        saving: false,
-        error: false,
-      };
-    case RESET_CREATE_SHORT_URL:
-      return defaultState;
-    default:
-      return state;
-  }
-}
+export default handleActions({
+  [CREATE_SHORT_URL_START]: (state) => ({ ...state, saving: true, error: false }),
+  [CREATE_SHORT_URL_ERROR]: (state) => ({ ...state, saving: false, error: true }),
+  [CREATE_SHORT_URL]: (state, { result }) => ({ result, saving: false, error: false }),
+  [RESET_CREATE_SHORT_URL]: () => initialState,
+}, initialState);

-export const _createShortUrl = (shlinkApiClient, data) => async (dispatch) => {
+export const createShortUrl = (buildShlinkApiClient) => (data) => async (dispatch, getState) => {
  dispatch({ type: CREATE_SHORT_URL_START });

+  const { createShortUrl } = await buildShlinkApiClient(getState);
+
  try {
-    const result = await shlinkApiClient.createShortUrl(data);
+    const result = await createShortUrl(data);

    dispatch({ type: CREATE_SHORT_URL, result });
  } catch (e) {
@@ -61,6 +43,4 @@ export const _createShortUrl = (shlinkApiClient, data) => async (dispatch) => {
  }
 };

-export const createShortUrl = curry(_createShortUrl)(shlinkApiClient);
-
-export const resetCreateShortUrl = () => ({ type: RESET_CREATE_SHORT_URL });
+export const resetCreateShortUrl = createAction(RESET_CREATE_SHORT_URL);
--- a/src/short-urls/reducers/shortUrlDeletion.js
+++ b/src/short-urls/reducers/shortUrlDeletion.js
@@ -1,14 +1,13 @@
-import { curry } from 'ramda';
+import { createAction, handleActions } from 'redux-actions';
 import PropTypes from 'prop-types';
-import shlinkApiClient from '../../api/ShlinkApiClient';

-/* eslint-disable padding-line-between-statements, newline-after-var */
-const DELETE_SHORT_URL_START = 'shlink/deleteShortUrl/DELETE_SHORT_URL_START';
-const DELETE_SHORT_URL_ERROR = 'shlink/deleteShortUrl/DELETE_SHORT_URL_ERROR';
-const DELETE_SHORT_URL = 'shlink/deleteShortUrl/DELETE_SHORT_URL';
-const RESET_DELETE_SHORT_URL = 'shlink/deleteShortUrl/RESET_DELETE_SHORT_URL';
+/* eslint-disable padding-line-between-statements */
+export const DELETE_SHORT_URL_START = 'shlink/deleteShortUrl/DELETE_SHORT_URL_START';
+export const DELETE_SHORT_URL_ERROR = 'shlink/deleteShortUrl/DELETE_SHORT_URL_ERROR';
+export const DELETE_SHORT_URL = 'shlink/deleteShortUrl/DELETE_SHORT_URL';
+export const RESET_DELETE_SHORT_URL = 'shlink/deleteShortUrl/RESET_DELETE_SHORT_URL';
 export const SHORT_URL_DELETED = 'shlink/deleteShortUrl/SHORT_URL_DELETED';
-/* eslint-enable padding-line-between-statements, newline-after-var */
+/* eslint-enable padding-line-between-statements */

 export const shortUrlDeletionType = PropTypes.shape({
  shortCode: PropTypes.string.isRequired,
@@ -20,47 +19,27 @@ export const shortUrlDeletionType = PropTypes.shape({
  }).isRequired,
 });

-const defaultState = {
+const initialState = {
  shortCode: '',
  loading: false,
  error: false,
  errorData: {},
 };

-export default function reducer(state = defaultState, action) {
-  switch (action.type) {
-    case DELETE_SHORT_URL_START:
-      return {
-        ...state,
-        loading: true,
-        error: false,
-      };
-    case DELETE_SHORT_URL_ERROR:
-      return {
-        ...state,
-        loading: false,
-        error: true,
-        errorData: action.errorData,
-      };
-    case DELETE_SHORT_URL:
-      return {
-        ...state,
-        shortCode: action.shortCode,
-        loading: false,
-        error: false,
-      };
-    case RESET_DELETE_SHORT_URL:
-      return defaultState;
-    default:
-      return state;
-  }
-}
+export default handleActions({
+  [DELETE_SHORT_URL_START]: (state) => ({ ...state, loading: true, error: false }),
+  [DELETE_SHORT_URL_ERROR]: (state, { errorData }) => ({ ...state, errorData, loading: false, error: true }),
+  [DELETE_SHORT_URL]: (state, { shortCode }) => ({ ...state, shortCode, loading: false, error: false }),
+  [RESET_DELETE_SHORT_URL]: () => initialState,
+}, initialState);

-export const _deleteShortUrl = (shlinkApiClient, shortCode) => async (dispatch) => {
+export const deleteShortUrl = (buildShlinkApiClient) => (shortCode) => async (dispatch, getState) => {
  dispatch({ type: DELETE_SHORT_URL_START });

+  const { deleteShortUrl } = await buildShlinkApiClient(getState);
+
  try {
-    await shlinkApiClient.deleteShortUrl(shortCode);
+    await deleteShortUrl(shortCode);
    dispatch({ type: DELETE_SHORT_URL, shortCode });
  } catch (e) {
    dispatch({ type: DELETE_SHORT_URL_ERROR, errorData: e.response.data });
@@ -69,8 +48,6 @@ export const _deleteShortUrl = (shlinkApiClient, shortCode) => async (dispatch)
  }
 };

-export const deleteShortUrl = curry(_deleteShortUrl)(shlinkApiClient);
-
-export const resetDeleteShortUrl = () => ({ type: RESET_DELETE_SHORT_URL });
+export const resetDeleteShortUrl = createAction(RESET_DELETE_SHORT_URL);

 export const shortUrlDeleted = (shortCode) => ({ type: SHORT_URL_DELETED, shortCode });
--- a/src/short-urls/reducers/shortUrlTags.js
+++ b/src/short-urls/reducers/shortUrlTags.js
@@ -1,14 +1,13 @@
-import { curry } from 'ramda';
+import { createAction, handleActions } from 'redux-actions';
 import PropTypes from 'prop-types';
-import shlinkApiClient from '../../api/ShlinkApiClient';

-/* eslint-disable padding-line-between-statements, newline-after-var */
+/* eslint-disable padding-line-between-statements */
 export const EDIT_SHORT_URL_TAGS_START = 'shlink/shortUrlTags/EDIT_SHORT_URL_TAGS_START';
 export const EDIT_SHORT_URL_TAGS_ERROR = 'shlink/shortUrlTags/EDIT_SHORT_URL_TAGS_ERROR';
 export const EDIT_SHORT_URL_TAGS = 'shlink/shortUrlTags/EDIT_SHORT_URL_TAGS';
 export const RESET_EDIT_SHORT_URL_TAGS = 'shlink/shortUrlTags/RESET_EDIT_SHORT_URL_TAGS';
 export const SHORT_URL_TAGS_EDITED = 'shlink/shortUrlTags/SHORT_URL_TAGS_EDITED';
-/* eslint-enable padding-line-between-statements, newline-after-var */
+/* eslint-enable padding-line-between-statements */

 export const shortUrlTagsType = PropTypes.shape({
  shortCode: PropTypes.string,
@@ -17,46 +16,26 @@ export const shortUrlTagsType = PropTypes.shape({
  error: PropTypes.bool.isRequired,
 });

-const defaultState = {
+const initialState = {
  shortCode: null,
  tags: [],
  saving: false,
  error: false,
 };

-export default function reducer(state = defaultState, action) {
-  switch (action.type) {
-    case EDIT_SHORT_URL_TAGS_START:
-      return {
-        ...state,
-        saving: true,
-        error: false,
-      };
-    case EDIT_SHORT_URL_TAGS_ERROR:
-      return {
-        ...state,
-        saving: false,
-        error: true,
-      };
-    case EDIT_SHORT_URL_TAGS:
-      return {
-        shortCode: action.shortCode,
-        tags: action.tags,
-        saving: false,
-        error: false,
-      };
-    case RESET_EDIT_SHORT_URL_TAGS:
-      return defaultState;
-    default:
-      return state;
-  }
-}
+export default handleActions({
+  [EDIT_SHORT_URL_TAGS_START]: (state) => ({ ...state, saving: true, error: false }),
+  [EDIT_SHORT_URL_TAGS_ERROR]: (state) => ({ ...state, saving: false, error: true }),
+  [EDIT_SHORT_URL_TAGS]: (state, { shortCode, tags }) => ({ shortCode, tags, saving: false, error: false }),
+  [RESET_EDIT_SHORT_URL_TAGS]: () => initialState,
+}, initialState);

-export const _editShortUrlTags = (shlinkApiClient, shortCode, tags) => async (dispatch) => {
+export const editShortUrlTags = (buildShlinkApiClient) => (shortCode, tags) => async (dispatch, getState) => {
  dispatch({ type: EDIT_SHORT_URL_TAGS_START });
+  const { updateShortUrlTags } = await buildShlinkApiClient(getState);

  try {
-    const normalizedTags = await shlinkApiClient.updateShortUrlTags(shortCode, tags);
+    const normalizedTags = await updateShortUrlTags(shortCode, tags);

    dispatch({ tags: normalizedTags, shortCode, type: EDIT_SHORT_URL_TAGS });
  } catch (e) {
@@ -66,9 +45,7 @@ export const _editShortUrlTags = (shlinkApiClient, shortCode, tags) => async (di
  }
 };

-export const editShortUrlTags = curry(_editShortUrlTags)(shlinkApiClient);
-
-export const resetShortUrlsTags = () => ({ type: RESET_EDIT_SHORT_URL_TAGS });
+export const resetShortUrlsTags = createAction(RESET_EDIT_SHORT_URL_TAGS);

 export const shortUrlTagsEdited = (shortCode, tags) => ({
  tags,
--- a/src/short-urls/reducers/shortUrlsList.js
+++ b/src/short-urls/reducers/shortUrlsList.js
@@ -1,70 +1,57 @@
-import { assoc, assocPath, reject } from 'ramda';
+import { handleActions } from 'redux-actions';
+import { assoc, assocPath, propEq, reject } from 'ramda';
 import PropTypes from 'prop-types';
-import shlinkApiClient from '../../api/ShlinkApiClient';
 import { SHORT_URL_TAGS_EDITED } from './shortUrlTags';
 import { SHORT_URL_DELETED } from './shortUrlDeletion';

-/* eslint-disable padding-line-between-statements, newline-after-var */
-const LIST_SHORT_URLS_START = 'shlink/shortUrlsList/LIST_SHORT_URLS_START';
-const LIST_SHORT_URLS_ERROR = 'shlink/shortUrlsList/LIST_SHORT_URLS_ERROR';
+/* eslint-disable padding-line-between-statements */
+export const LIST_SHORT_URLS_START = 'shlink/shortUrlsList/LIST_SHORT_URLS_START';
+export const LIST_SHORT_URLS_ERROR = 'shlink/shortUrlsList/LIST_SHORT_URLS_ERROR';
 export const LIST_SHORT_URLS = 'shlink/shortUrlsList/LIST_SHORT_URLS';
-/* eslint-enable padding-line-between-statements, newline-after-var */
+/* eslint-enable padding-line-between-statements */

 export const shortUrlType = PropTypes.shape({
-  tags: PropTypes.arrayOf(PropTypes.string),
  shortCode: PropTypes.string,
-  originalUrl: PropTypes.string,
+  shortUrl: PropTypes.string,
+  longUrl: PropTypes.string,
+  tags: PropTypes.arrayOf(PropTypes.string),
 });

 const initialState = {
  shortUrls: {},
  loading: true,
+  error: false,
 };

-export default function reducer(state = initialState, action) {
-  switch (action.type) {
-    case LIST_SHORT_URLS_START:
-      return { ...state, loading: true, error: false };
-    case LIST_SHORT_URLS:
-      return {
-        loading: false,
-        error: false,
-        shortUrls: action.shortUrls,
-      };
-    case LIST_SHORT_URLS_ERROR:
-      return {
-        loading: false,
-        error: true,
-        shortUrls: [],
-      };
-    case SHORT_URL_TAGS_EDITED:
-      const { data } = state.shortUrls;
+export default handleActions({
+  [LIST_SHORT_URLS_START]: (state) => ({ ...state, loading: true, error: false }),
+  [LIST_SHORT_URLS]: (state, { shortUrls }) => ({ loading: false, error: false, shortUrls }),
+  [LIST_SHORT_URLS_ERROR]: () => ({ loading: false, error: true, shortUrls: {} }),
+  [SHORT_URL_TAGS_EDITED]: (state, action) => { // eslint-disable-line object-shorthand
+    const { data } = state.shortUrls;

-      return assocPath([ 'shortUrls', 'data' ], data.map((shortUrl) =>
-        shortUrl.shortCode === action.shortCode
-          ? assoc('tags', action.tags, shortUrl)
-          : shortUrl), state);
-    case SHORT_URL_DELETED:
-      return assocPath(
-        [ 'shortUrls', 'data' ],
-        reject((shortUrl) => shortUrl.shortCode === action.shortCode, state.shortUrls.data),
-        state,
-      );
-    default:
-      return state;
-  }
-}
+    return assocPath([ 'shortUrls', 'data' ], data.map((shortUrl) =>
+      shortUrl.shortCode === action.shortCode
+        ? assoc('tags', action.tags, shortUrl)
+        : shortUrl), state);
+  },
+  [SHORT_URL_DELETED]: (state, action) => assocPath(
+    [ 'shortUrls', 'data' ],
+    reject(propEq('shortCode', action.shortCode), state.shortUrls.data),
+    state,
+  ),
+}, initialState);

-export const _listShortUrls = (shlinkApiClient, params = {}) => async (dispatch) => {
+export const listShortUrls = (buildShlinkApiClient) => (params = {}) => async (dispatch, getState) => {
  dispatch({ type: LIST_SHORT_URLS_START });

+  const { listShortUrls } = await buildShlinkApiClient(getState);
+
  try {
-    const shortUrls = await shlinkApiClient.listShortUrls(params);
+    const shortUrls = await listShortUrls(params);

    dispatch({ type: LIST_SHORT_URLS, shortUrls, params });
  } catch (e) {
    dispatch({ type: LIST_SHORT_URLS_ERROR, params });
  }
 };
-
-export const listShortUrls = (params = {}) => _listShortUrls(shlinkApiClient, params);
--- a/src/short-urls/reducers/shortUrlsListParams.js
+++ b/src/short-urls/reducers/shortUrlsListParams.js
@@ -1,3 +1,4 @@
+import { createAction, handleActions } from 'redux-actions';
 import PropTypes from 'prop-types';
 import { LIST_SHORT_URLS } from './shortUrlsList';

@@ -9,17 +10,11 @@ export const shortUrlsListParamsType = PropTypes.shape({
  searchTerm: PropTypes.string,
 });

-const defaultState = { page: '1' };
+const initialState = { page: '1' };

-export default function reducer(state = defaultState, action) {
-  switch (action.type) {
-    case LIST_SHORT_URLS:
-      return { ...state, ...action.params };
-    case RESET_SHORT_URL_PARAMS:
-      return defaultState;
-    default:
-      return state;
-  }
-}
+export default handleActions({
+  [LIST_SHORT_URLS]: (state, { params }) => ({ ...state, ...params }),
+  [RESET_SHORT_URL_PARAMS]: () => initialState,
+}, initialState);

-export const resetShortUrlParams = () => ({ type: RESET_SHORT_URL_PARAMS });
+export const resetShortUrlParams = createAction(RESET_SHORT_URL_PARAMS);
--- a/src/short-urls/services/provideServices.js
+++ b/src/short-urls/services/provideServices.js
@@ -0,0 +1,73 @@
+import { connect as reduxConnect } from 'react-redux';
+import { assoc } from 'ramda';
+import ShortUrls from '../ShortUrls';
+import SearchBar from '../SearchBar';
+import ShortUrlsList from '../ShortUrlsList';
+import ShortUrlsRow from '../helpers/ShortUrlsRow';
+import ShortUrlsRowMenu from '../helpers/ShortUrlsRowMenu';
+import CreateShortUrl from '../CreateShortUrl';
+import DeleteShortUrlModal from '../helpers/DeleteShortUrlModal';
+import EditTagsModal from '../helpers/EditTagsModal';
+import CreateShortUrlResult from '../helpers/CreateShortUrlResult';
+import { listShortUrls } from '../reducers/shortUrlsList';
+import { createShortUrl, resetCreateShortUrl } from '../reducers/shortUrlCreation';
+import { deleteShortUrl, resetDeleteShortUrl, shortUrlDeleted } from '../reducers/shortUrlDeletion';
+import { editShortUrlTags, resetShortUrlsTags, shortUrlTagsEdited } from '../reducers/shortUrlTags';
+import { resetShortUrlParams } from '../reducers/shortUrlsListParams';
+
+const provideServices = (bottle, connect) => {
+  // Components
+  bottle.serviceFactory('ShortUrls', ShortUrls, 'SearchBar', 'ShortUrlsList');
+  bottle.decorator('ShortUrls', reduxConnect(
+    (state) => assoc('shortUrlsList', state.shortUrlsList.shortUrls, state.shortUrlsList)
+  ));
+
+  bottle.serviceFactory('SearchBar', SearchBar, 'ColorGenerator');
+  bottle.decorator('SearchBar', connect([ 'shortUrlsListParams' ], [ 'listShortUrls' ]));
+
+  bottle.serviceFactory('ShortUrlsList', ShortUrlsList, 'ShortUrlsRow');
+  bottle.decorator('ShortUrlsList', connect(
+    [ 'selectedServer', 'shortUrlsListParams' ],
+    [ 'listShortUrls', 'resetShortUrlParams' ]
+  ));
+
+  bottle.serviceFactory('ShortUrlsRow', ShortUrlsRow, 'ShortUrlsRowMenu', 'ColorGenerator', 'stateFlagTimeout');
+
+  bottle.serviceFactory('ShortUrlsRowMenu', ShortUrlsRowMenu, 'DeleteShortUrlModal', 'EditTagsModal');
+  bottle.serviceFactory('CreateShortUrlResult', CreateShortUrlResult, 'stateFlagTimeout');
+
+  bottle.serviceFactory('CreateShortUrl', CreateShortUrl, 'TagsSelector', 'CreateShortUrlResult');
+  bottle.decorator(
+    'CreateShortUrl',
+    connect([ 'shortUrlCreationResult' ], [ 'createShortUrl', 'resetCreateShortUrl' ])
+  );
+
+  bottle.serviceFactory('DeleteShortUrlModal', () => DeleteShortUrlModal);
+  bottle.decorator('DeleteShortUrlModal', connect(
+    [ 'shortUrlDeletion' ],
+    [ 'deleteShortUrl', 'resetDeleteShortUrl', 'shortUrlDeleted' ]
+  ));
+
+  bottle.serviceFactory('EditTagsModal', EditTagsModal, 'TagsSelector');
+  bottle.decorator('EditTagsModal', connect(
+    [ 'shortUrlTags' ],
+    [ 'editShortUrlTags', 'resetShortUrlsTags', 'shortUrlTagsEdited' ]
+  ));
+
+  // Actions
+  bottle.serviceFactory('editShortUrlTags', editShortUrlTags, 'buildShlinkApiClient');
+  bottle.serviceFactory('resetShortUrlsTags', () => resetShortUrlsTags);
+  bottle.serviceFactory('shortUrlTagsEdited', () => shortUrlTagsEdited);
+
+  bottle.serviceFactory('listShortUrls', listShortUrls, 'buildShlinkApiClient');
+  bottle.serviceFactory('resetShortUrlParams', () => resetShortUrlParams);
+
+  bottle.serviceFactory('createShortUrl', createShortUrl, 'buildShlinkApiClient');
+  bottle.serviceFactory('resetCreateShortUrl', () => resetCreateShortUrl);
+
+  bottle.serviceFactory('deleteShortUrl', deleteShortUrl, 'buildShlinkApiClient');
+  bottle.serviceFactory('resetDeleteShortUrl', () => resetDeleteShortUrl);
+  bottle.serviceFactory('shortUrlDeleted', () => shortUrlDeleted);
+};
+
+export default provideServices;
--- a/src/tags/TagCard.js
+++ b/src/tags/TagCard.js
@@ -1,16 +1,13 @@
 import { Card, CardBody } from 'reactstrap';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
-import deleteIcon from '@fortawesome/fontawesome-free-solid/faTrash';
-import editIcon from '@fortawesome/fontawesome-free-solid/faPencilAlt';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faTrash as deleteIcon, faPencilAlt as editIcon } from '@fortawesome/free-solid-svg-icons';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Link } from 'react-router-dom';
 import TagBullet from './helpers/TagBullet';
 import './TagCard.scss';
-import DeleteTagConfirmModal from './helpers/DeleteTagConfirmModal';
-import EditTagModal from './helpers/EditTagModal';

-export default class TagCard extends React.Component {
+const TagCard = (DeleteTagConfirmModal, EditTagModal, colorGenerator) => class TagCard extends React.Component {
  static propTypes = {
    tag: PropTypes.string,
    currentServerId: PropTypes.string,
@@ -28,37 +25,23 @@ export default class TagCard extends React.Component {
    return (
      <Card className="tag-card">
        <CardBody className="tag-card__body">
-          <button
-            className="btn btn-light btn-sm tag-card__btn tag-card__btn--last"
-            onClick={toggleDelete}
-          >
+          <button className="btn btn-light btn-sm tag-card__btn tag-card__btn--last" onClick={toggleDelete}>
            <FontAwesomeIcon icon={deleteIcon} />
          </button>
-          <button
-            className="btn btn-light btn-sm tag-card__btn"
-            onClick={toggleEdit}
-          >
+          <button className="btn btn-light btn-sm tag-card__btn" onClick={toggleEdit}>
            <FontAwesomeIcon icon={editIcon} />
          </button>
          <h5 className="tag-card__tag-title">
-            <TagBullet tag={tag} />
-            <Link to={`/server/${currentServerId}/list-short-urls/1?tag=${tag}`}>
-              {tag}
-            </Link>
+            <TagBullet tag={tag} colorGenerator={colorGenerator} />
+            <Link to={`/server/${currentServerId}/list-short-urls/1?tag=${tag}`}>{tag}</Link>
          </h5>
        </CardBody>

-        <DeleteTagConfirmModal
-          tag={tag}
-          toggle={toggleDelete}
-          isOpen={this.state.isDeleteModalOpen}
-        />
-        <EditTagModal
-          tag={tag}
-          toggle={toggleEdit}
-          isOpen={this.state.isEditModalOpen}
-        />
+        <DeleteTagConfirmModal tag={tag} toggle={toggleDelete} isOpen={this.state.isDeleteModalOpen} />
+        <EditTagModal tag={tag} toggle={toggleEdit} isOpen={this.state.isEditModalOpen} />
      </Card>
    );
  }
-}
+};
+
+export default TagCard;
--- a/src/tags/TagsList.js
+++ b/src/tags/TagsList.js
@@ -1,21 +1,20 @@
 import React from 'react';
-import { connect } from 'react-redux';
-import { pick, splitEvery } from 'ramda';
+import { splitEvery } from 'ramda';
 import PropTypes from 'prop-types';
 import MuttedMessage from '../utils/MuttedMessage';
 import SearchField from '../utils/SearchField';
-import { filterTags, forceListTags } from './reducers/tagsList';
-import TagCard from './TagCard';

 const { ceil } = Math;
-const TAGS_GROUP_SIZE = 4;
+const TAGS_GROUPS_AMOUNT = 4;

-export class TagsListComponent extends React.Component {
+const TagsList = (TagCard) => class TagsList extends React.Component {
  static propTypes = {
    filterTags: PropTypes.func,
    forceListTags: PropTypes.func,
    tagsList: PropTypes.shape({
      loading: PropTypes.bool,
+      error: PropTypes.bool,
+      filteredTags: PropTypes.arrayOf(PropTypes.string),
    }),
    match: PropTypes.object,
  };
@@ -23,7 +22,7 @@ export class TagsListComponent extends React.Component {
  componentDidMount() {
    const { forceListTags } = this.props;

-    forceListTags(true);
+    forceListTags();
  }

  renderContent() {
@@ -47,7 +46,7 @@ export class TagsListComponent extends React.Component {
      return <MuttedMessage>No tags found</MuttedMessage>;
    }

-    const tagsGroups = splitEvery(ceil(tagsCount / TAGS_GROUP_SIZE), tagsList.filteredTags);
+    const tagsGroups = splitEvery(ceil(tagsCount / TAGS_GROUPS_AMOUNT), tagsList.filteredTags);

    return (
      <React.Fragment>
@@ -71,21 +70,15 @@ export class TagsListComponent extends React.Component {

    return (
      <div className="shlink-container">
-        {!this.props.tagsList.loading && (
-          <SearchField
-            className="mb-3"
-            placeholder="Search tags..."
-            onChange={filterTags}
-          />
-        )}
+        {!this.props.tagsList.loading &&
+          <SearchField className="mb-3" placeholder="Search tags..." onChange={filterTags} />
+        }
        <div className="row">
          {this.renderContent()}
        </div>
      </div>
    );
  }
-}
-
-const TagsList = connect(pick([ 'tagsList' ]), { forceListTags, filterTags })(TagsListComponent);
+};

 export default TagsList;
--- a/src/tags/helpers/DeleteTagConfirmModal.js
+++ b/src/tags/helpers/DeleteTagConfirmModal.js
@@ -1,11 +1,9 @@
 import React from 'react';
-import { connect } from 'react-redux';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
 import PropTypes from 'prop-types';
-import { pick } from 'ramda';
-import { deleteTag, tagDeleted, tagDeleteType } from '../reducers/tagDelete';
+import { tagDeleteType } from '../reducers/tagDelete';

-export class DeleteTagConfirmModalComponent extends React.Component {
+export default class DeleteTagConfirmModal extends React.Component {
  static propTypes = {
    tag: PropTypes.string.isRequired,
    toggle: PropTypes.func.isRequired,
@@ -15,13 +13,12 @@ export class DeleteTagConfirmModalComponent extends React.Component {
    tagDeleted: PropTypes.func,
  };

-  doDelete = () => {
+  doDelete = async () => {
    const { tag, toggle, deleteTag } = this.props;

-    deleteTag(tag).then(() => {
-      this.tagWasDeleted = true;
-      toggle();
-    });
+    await deleteTag(tag);
+    this.tagWasDeleted = true;
+    toggle();
  };
  handleOnClosed = () => {
    if (!this.tagWasDeleted) {
@@ -67,10 +64,3 @@ export class DeleteTagConfirmModalComponent extends React.Component {
    );
  }
 }
-
-const DeleteTagConfirmModal = connect(
-  pick([ 'tagDelete' ]),
-  { deleteTag, tagDeleted }
-)(DeleteTagConfirmModalComponent);
-
-export default DeleteTagConfirmModal;
--- a/src/tags/helpers/EditTagModal.js
+++ b/src/tags/helpers/EditTagModal.js
@@ -1,31 +1,23 @@
 import React from 'react';
-import { connect } from 'react-redux';
 import { Modal, ModalBody, ModalFooter, ModalHeader, Popover } from 'reactstrap';
-import { pick } from 'ramda';
 import { ChromePicker } from 'react-color';
-import colorIcon from '@fortawesome/fontawesome-free-solid/faPalette';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { faPalette as colorIcon } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import PropTypes from 'prop-types';
-import colorGenerator, { colorGeneratorType } from '../../utils/ColorGenerator';
-import { editTag, tagEdited } from '../reducers/tagEdit';
 import './EditTagModal.scss';

-export class EditTagModalComponent extends React.Component {
+const EditTagModal = ({ getColorForKey }) => class EditTagModal extends React.Component {
  static propTypes = {
    tag: PropTypes.string,
    editTag: PropTypes.func,
    toggle: PropTypes.func,
    tagEdited: PropTypes.func,
-    colorGenerator: colorGeneratorType,
    isOpen: PropTypes.bool,
    tagEdit: PropTypes.shape({
      error: PropTypes.bool,
      editing: PropTypes.bool,
    }),
  };
-  static defaultProps = {
-    colorGenerator,
-  };

  saveTag = (e) => {
    e.preventDefault();
@@ -53,12 +45,12 @@ export class EditTagModalComponent extends React.Component {
  constructor(props) {
    super(props);

-    const { colorGenerator, tag } = props;
+    const { tag } = props;

    this.state = {
      showColorPicker: false,
      tag,
-      color: colorGenerator.getColorForKey(tag),
+      color: getColorForKey(tag),
    };
  }

@@ -131,8 +123,6 @@ export class EditTagModalComponent extends React.Component {
      </Modal>
    );
  }
-}
-
-const EditTagModal = connect(pick([ 'tagEdit' ]), { editTag, tagEdited })(EditTagModalComponent);
+};

 export default EditTagModal;
--- a/src/tags/helpers/Tag.js
+++ b/src/tags/helpers/Tag.js
@@ -1,41 +1,35 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import colorGenerator, { colorGeneratorType } from '../../utils/ColorGenerator';
 import './Tag.scss';
+import { colorGeneratorType } from '../../utils/services/ColorGenerator';

 const propTypes = {
-  colorGenerator: colorGeneratorType,
  text: PropTypes.string,
  children: PropTypes.node,
  clearable: PropTypes.bool,
+  colorGenerator: colorGeneratorType,
  onClick: PropTypes.func,
  onClose: PropTypes.func,
 };
-const defaultProps = {
+
+const Tag = ({
+  text,
+  children,
+  clearable,
  colorGenerator,
-};
+  onClick = () => {},
+  onClose = () => {},
+}) => (
+  <span
+    className="badge tag"
+    style={{ backgroundColor: colorGenerator.getColorForKey(text), cursor: clearable ? 'auto' : 'pointer' }}
+    onClick={onClick}
+  >
+    {children || text}
+    {clearable && <span className="close tag__close-selected-tag" onClick={onClose}>&times;</span>}
+  </span>
+);

-export default function Tag(
-  {
-    colorGenerator,
-    text,
-    children,
-    clearable,
-    onClick = () => ({}),
-    onClose = () => ({}),
-  }
-) {
-  return (
-    <span
-      className="badge tag"
-      style={{ backgroundColor: colorGenerator.getColorForKey(text), cursor: clearable ? 'auto' : 'pointer' }}
-      onClick={onClick}
-    >
-      {children || text}
-      {clearable && <span className="close tag__close-selected-tag" onClick={onClose}>&times;</span>}
-    </span>
-  );
-}
-
-Tag.defaultProps = defaultProps;
 Tag.propTypes = propTypes;
+
+export default Tag;
--- a/src/tags/helpers/TagBullet.js
+++ b/src/tags/helpers/TagBullet.js
@@ -1,24 +1,20 @@
 import React from 'react';
 import * as PropTypes from 'prop-types';
-import colorGenerator, { colorGeneratorType } from '../../utils/ColorGenerator';
+import { colorGeneratorType } from '../../utils/services/ColorGenerator';
 import './TagBullet.scss';

 const propTypes = {
  tag: PropTypes.string.isRequired,
  colorGenerator: colorGeneratorType,
 };
-const defaultProps = {
-  colorGenerator,
-};

-export default function TagBullet({ tag, colorGenerator }) {
-  return (
-    <div
-      style={{ backgroundColor: colorGenerator.getColorForKey(tag) }}
-      className="tag-bullet"
-    />
-  );
-}
+const TagBullet = ({ tag, colorGenerator }) => (
+  <div
+    style={{ backgroundColor: colorGenerator.getColorForKey(tag) }}
+    className="tag-bullet"
+  />
+);

 TagBullet.propTypes = propTypes;
-TagBullet.defaultProps = defaultProps;
+
+export default TagBullet;
--- a/src/tags/helpers/TagsSelector.js
+++ b/src/tags/helpers/TagsSelector.js
@@ -1,26 +1,22 @@
 import React from 'react';
-import { connect } from 'react-redux';
 import TagsInput from 'react-tagsinput';
 import PropTypes from 'prop-types';
 import Autosuggest from 'react-autosuggest';
-import { pick, identity } from 'ramda';
-import { listTags } from '../reducers/tagsList';
-import colorGenerator, { colorGeneratorType } from '../../utils/ColorGenerator';
-import './TagsSelector.scss';
+import { identity } from 'ramda';
 import TagBullet from './TagBullet';
+import './TagsSelector.scss';

-export class TagsSelectorComponent extends React.Component {
+const TagsSelector = (colorGenerator) => class TagsSelector extends React.Component {
  static propTypes = {
    tags: PropTypes.arrayOf(PropTypes.string).isRequired,
    onChange: PropTypes.func.isRequired,
+    listTags: PropTypes.func,
    placeholder: PropTypes.string,
-    colorGenerator: colorGeneratorType,
    tagsList: PropTypes.shape({
      tags: PropTypes.arrayOf(PropTypes.string),
    }),
  };
  static defaultProps = {
-    colorGenerator,
    placeholder: 'Add tags to the URL',
  };

@@ -31,7 +27,7 @@ export class TagsSelectorComponent extends React.Component {
  }

  render() {
-    const { tags, onChange, placeholder, colorGenerator, tagsList } = this.props;
+    const { tags, onChange, placeholder, tagsList } = this.props;
    const renderTag = ({ tag, key, disabled, onRemove, classNameRemove, getTagDisplayValue, ...other }) => (
      <span key={key} style={{ backgroundColor: colorGenerator.getColorForKey(tag) }} {...other}>
        {getTagDisplayValue(tag)}
@@ -59,7 +55,7 @@ export class TagsSelectorComponent extends React.Component {
          getSuggestionValue={(suggestion) => suggestion}
          renderSuggestion={(suggestion) => (
            <React.Fragment>
-              <TagBullet tag={suggestion} />
+              <TagBullet tag={suggestion} colorGenerator={colorGenerator} />
              {suggestion}
            </React.Fragment>
          )}
@@ -86,8 +82,6 @@ export class TagsSelectorComponent extends React.Component {
      />
    );
  }
-}
-
-const TagsSelector = connect(pick([ 'tagsList' ]), { listTags })(TagsSelectorComponent);
+};

 export default TagsSelector;
--- a/src/tags/reducers/tagDelete.js
+++ b/src/tags/reducers/tagDelete.js
@@ -1,51 +1,36 @@
-import { curry } from 'ramda';
+import { handleActions } from 'redux-actions';
 import PropTypes from 'prop-types';
-import shlinkApiClient from '../../api/ShlinkApiClient';

-/* eslint-disable padding-line-between-statements, newline-after-var */
-const DELETE_TAG_START = 'shlink/deleteTag/DELETE_TAG_START';
-const DELETE_TAG_ERROR = 'shlink/deleteTag/DELETE_TAG_ERROR';
-const DELETE_TAG = 'shlink/deleteTag/DELETE_TAG';
+/* eslint-disable padding-line-between-statements */
+export const DELETE_TAG_START = 'shlink/deleteTag/DELETE_TAG_START';
+export const DELETE_TAG_ERROR = 'shlink/deleteTag/DELETE_TAG_ERROR';
+export const DELETE_TAG = 'shlink/deleteTag/DELETE_TAG';
 export const TAG_DELETED = 'shlink/deleteTag/TAG_DELETED';
-/* eslint-enable padding-line-between-statements, newline-after-var */
+/* eslint-enable padding-line-between-statements */

 export const tagDeleteType = PropTypes.shape({
  deleting: PropTypes.bool,
  error: PropTypes.bool,
 });

-const defaultState = {
+const initialState = {
  deleting: false,
  error: false,
 };

-export default function reducer(state = defaultState, action) {
-  switch (action.type) {
-    case DELETE_TAG_START:
-      return {
-        deleting: true,
-        error: false,
-      };
-    case DELETE_TAG_ERROR:
-      return {
-        deleting: false,
-        error: true,
-      };
-    case DELETE_TAG:
-      return {
-        deleting: false,
-        error: false,
-      };
-    default:
-      return state;
-  }
-}
+export default handleActions({
+  [DELETE_TAG_START]: () => ({ deleting: true, error: false }),
+  [DELETE_TAG_ERROR]: () => ({ deleting: false, error: true }),
+  [DELETE_TAG]: () => ({ deleting: false, error: false }),
+}, initialState);

-export const _deleteTag = (shlinkApiClient, tag) => async (dispatch) => {
+export const deleteTag = (buildShlinkApiClient) => (tag) => async (dispatch, getState) => {
  dispatch({ type: DELETE_TAG_START });

+  const { deleteTags } = await buildShlinkApiClient(getState);
+
  try {
-    await shlinkApiClient.deleteTags([ tag ]);
+    await deleteTags([ tag ]);
    dispatch({ type: DELETE_TAG });
  } catch (e) {
    dispatch({ type: DELETE_TAG_ERROR });
@@ -54,6 +39,4 @@ export const _deleteTag = (shlinkApiClient, tag) => async (dispatch) => {
  }
 };

-export const deleteTag = curry(_deleteTag)(shlinkApiClient);
-
 export const tagDeleted = (tag) => ({ type: TAG_DELETED, tag });
--- a/src/tags/reducers/tagEdit.js
+++ b/src/tags/reducers/tagEdit.js
@@ -1,63 +1,49 @@
-import { curry, pick } from 'ramda';
-import shlinkApiClient from '../../api/ShlinkApiClient';
-import colorGenerator from '../../utils/ColorGenerator';
+import { pick } from 'ramda';
+import { handleActions } from 'redux-actions';

-/* eslint-disable padding-line-between-statements, newline-after-var */
-const EDIT_TAG_START = 'shlink/editTag/EDIT_TAG_START';
-const EDIT_TAG_ERROR = 'shlink/editTag/EDIT_TAG_ERROR';
-const EDIT_TAG = 'shlink/editTag/EDIT_TAG';
-/* eslint-enable padding-line-between-statements, newline-after-var */
+/* eslint-disable padding-line-between-statements */
+export const EDIT_TAG_START = 'shlink/editTag/EDIT_TAG_START';
+export const EDIT_TAG_ERROR = 'shlink/editTag/EDIT_TAG_ERROR';
+export const EDIT_TAG = 'shlink/editTag/EDIT_TAG';
+/* eslint-enable padding-line-between-statements */

 export const TAG_EDITED = 'shlink/editTag/TAG_EDITED';

-const defaultState = {
+const initialState = {
  oldName: '',
  newName: '',
  editing: false,
  error: false,
 };

-export default function reducer(state = defaultState, action) {
-  switch (action.type) {
-    case EDIT_TAG_START:
-      return {
-        ...state,
-        editing: true,
-        error: false,
-      };
-    case EDIT_TAG_ERROR:
-      return {
-        ...state,
-        editing: false,
-        error: true,
-      };
-    case EDIT_TAG:
-      return {
-        ...pick([ 'oldName', 'newName' ], action),
-        editing: false,
-        error: false,
-      };
-    default:
-      return state;
+export default handleActions({
+  [EDIT_TAG_START]: (state) => ({ ...state, editing: true, error: false }),
+  [EDIT_TAG_ERROR]: (state) => ({ ...state, editing: false, error: true }),
+  [EDIT_TAG]: (state, action) => ({
+    ...pick([ 'oldName', 'newName' ], action),
+    editing: false,
+    error: false,
+  }),
+}, initialState);
+
+export const editTag = (buildShlinkApiClient, colorGenerator) => (oldName, newName, color) => async (
+  dispatch,
+  getState
+) => {
+  dispatch({ type: EDIT_TAG_START });
+
+  const { editTag } = await buildShlinkApiClient(getState);
+
+  try {
+    await editTag(oldName, newName);
+    colorGenerator.setColorForKey(newName, color);
+    dispatch({ type: EDIT_TAG, oldName, newName });
+  } catch (e) {
+    dispatch({ type: EDIT_TAG_ERROR });
+
+    throw e;
  }
-}
-
-export const _editTag = (shlinkApiClient, colorGenerator, oldName, newName, color) =>
-  async (dispatch) => {
-    dispatch({ type: EDIT_TAG_START });
-
-    try {
-      await shlinkApiClient.editTag(oldName, newName);
-      colorGenerator.setColorForKey(newName, color);
-      dispatch({ type: EDIT_TAG, oldName, newName });
-    } catch (e) {
-      dispatch({ type: EDIT_TAG_ERROR });
-
-      throw e;
-    }
-  };
-
-export const editTag = curry(_editTag)(shlinkApiClient, colorGenerator);
+};

 export const tagEdited = (oldName, newName, color) => ({
  type: TAG_EDITED,
--- a/src/tags/reducers/tagsList.js
+++ b/src/tags/reducers/tagsList.js
@@ -1,72 +1,46 @@
+import { handleActions } from 'redux-actions';
 import { isEmpty, reject } from 'ramda';
-import shlinkApiClient from '../../api/ShlinkApiClient';
 import { TAG_DELETED } from './tagDelete';
 import { TAG_EDITED } from './tagEdit';

-/* eslint-disable padding-line-between-statements, newline-after-var */
-const LIST_TAGS_START = 'shlink/tagsList/LIST_TAGS_START';
-const LIST_TAGS_ERROR = 'shlink/tagsList/LIST_TAGS_ERROR';
-const LIST_TAGS = 'shlink/tagsList/LIST_TAGS';
-const FILTER_TAGS = 'shlink/tagsList/FILTER_TAGS';
-/* eslint-enable padding-line-between-statements, newline-after-var */
+/* eslint-disable padding-line-between-statements */
+export const LIST_TAGS_START = 'shlink/tagsList/LIST_TAGS_START';
+export const LIST_TAGS_ERROR = 'shlink/tagsList/LIST_TAGS_ERROR';
+export const LIST_TAGS = 'shlink/tagsList/LIST_TAGS';
+export const FILTER_TAGS = 'shlink/tagsList/FILTER_TAGS';
+/* eslint-enable padding-line-between-statements */

-const defaultState = {
+const initialState = {
  tags: [],
  filteredTags: [],
  loading: false,
  error: false,
 };

-export default function reducer(state = defaultState, action) {
-  switch (action.type) {
-    case LIST_TAGS_START:
-      return {
-        ...state,
-        loading: true,
-        error: false,
-      };
-    case LIST_TAGS_ERROR:
-      return {
-        ...state,
-        loading: false,
-        error: true,
-      };
-    case LIST_TAGS:
-      return {
-        tags: action.tags,
-        filteredTags: action.tags,
-        loading: false,
-        error: false,
-      };
-    case TAG_DELETED:
-      return {
-        ...state,
+const renameTag = (oldName, newName) => (tag) => tag === oldName ? newName : tag;
+const rejectTag = (tags, tagToReject) => reject((tag) => tag === tagToReject, tags);

-        // FIXME This should be optimized somehow...
-        tags: reject((tag) => tag === action.tag, state.tags),
-        filteredTags: reject((tag) => tag === action.tag, state.filteredTags),
-      };
-    case TAG_EDITED:
-      const renameTag = (tag) => tag === action.oldName ? action.newName : tag;
+export default handleActions({
+  [LIST_TAGS_START]: (state) => ({ ...state, loading: true, error: false }),
+  [LIST_TAGS_ERROR]: (state) => ({ ...state, loading: false, error: true }),
+  [LIST_TAGS]: (state, { tags }) => ({ tags, filteredTags: tags, loading: false, error: false }),
+  [TAG_DELETED]: (state, { tag }) => ({
+    ...state,
+    tags: rejectTag(state.tags, tag),
+    filteredTags: rejectTag(state.filteredTags, tag),
+  }),
+  [TAG_EDITED]: (state, { oldName, newName }) => ({
+    ...state,
+    tags: state.tags.map(renameTag(oldName, newName)).sort(),
+    filteredTags: state.filteredTags.map(renameTag(oldName, newName)).sort(),
+  }),
+  [FILTER_TAGS]: (state, { searchTerm }) => ({
+    ...state,
+    filteredTags: state.tags.filter((tag) => tag.toLowerCase().match(searchTerm)),
+  }),
+}, initialState);

-      return {
-        ...state,
-
-        // FIXME This should be optimized somehow...
-        tags: state.tags.map(renameTag).sort(),
-        filteredTags: state.filteredTags.map(renameTag).sort(),
-      };
-    case FILTER_TAGS:
-      return {
-        ...state,
-        filteredTags: state.tags.filter((tag) => tag.toLowerCase().match(action.searchTerm)),
-      };
-    default:
-      return state;
-  }
-}
-
-export const _listTags = (shlinkApiClient, force = false) => async (dispatch, getState) => {
+export const listTags = (buildShlinkApiClient, force = true) => () => async (dispatch, getState) => {
  const { tagsList } = getState();

  if (!force && (tagsList.loading || !isEmpty(tagsList.tags))) {
@@ -76,7 +50,8 @@ export const _listTags = (shlinkApiClient, force = false) => async (dispatch, ge
  dispatch({ type: LIST_TAGS_START });

  try {
-    const tags = await shlinkApiClient.listTags();
+    const { listTags } = await buildShlinkApiClient(getState);
+    const tags = await listTags();

    dispatch({ tags, type: LIST_TAGS });
  } catch (e) {
@@ -84,10 +59,6 @@ export const _listTags = (shlinkApiClient, force = false) => async (dispatch, ge
  }
 };

-export const listTags = () => _listTags(shlinkApiClient);
-
-export const forceListTags = () => _listTags(shlinkApiClient, true);
-
 export const filterTags = (searchTerm) => ({
  type: FILTER_TAGS,
  searchTerm,
--- a/src/tags/services/provideServices.js
+++ b/src/tags/services/provideServices.js
@@ -0,0 +1,39 @@
+import TagsSelector from '../helpers/TagsSelector';
+import TagCard from '../TagCard';
+import DeleteTagConfirmModal from '../helpers/DeleteTagConfirmModal';
+import EditTagModal from '../helpers/EditTagModal';
+import TagsList from '../TagsList';
+import { filterTags, listTags } from '../reducers/tagsList';
+import { deleteTag, tagDeleted } from '../reducers/tagDelete';
+import { editTag, tagEdited } from '../reducers/tagEdit';
+
+const provideServices = (bottle, connect) => {
+  // Components
+  bottle.serviceFactory('TagsSelector', TagsSelector, 'ColorGenerator');
+  bottle.decorator('TagsSelector', connect([ 'tagsList' ], [ 'listTags' ]));
+
+  bottle.serviceFactory('TagCard', TagCard, 'DeleteTagConfirmModal', 'EditTagModal', 'ColorGenerator');
+
+  bottle.serviceFactory('DeleteTagConfirmModal', () => DeleteTagConfirmModal);
+  bottle.decorator('DeleteTagConfirmModal', connect([ 'tagDelete' ], [ 'deleteTag', 'tagDeleted' ]));
+
+  bottle.serviceFactory('EditTagModal', EditTagModal, 'ColorGenerator');
+  bottle.decorator('EditTagModal', connect([ 'tagEdit' ], [ 'editTag', 'tagEdited' ]));
+
+  bottle.serviceFactory('TagsList', TagsList, 'TagCard');
+  bottle.decorator('TagsList', connect([ 'tagsList' ], [ 'forceListTags', 'filterTags' ]));
+
+  // Actions
+  const listTagsActionFactory = (force) => ({ buildShlinkApiClient }) => listTags(buildShlinkApiClient, force);
+
+  bottle.factory('listTags', listTagsActionFactory(false));
+  bottle.factory('forceListTags', listTagsActionFactory(true));
+  bottle.serviceFactory('filterTags', () => filterTags);
+  bottle.serviceFactory('tagDeleted', () => tagDeleted);
+  bottle.serviceFactory('tagEdited', () => tagEdited);
+
+  bottle.serviceFactory('deleteTag', deleteTag, 'buildShlinkApiClient');
+  bottle.serviceFactory('editTag', editTag, 'buildShlinkApiClient', 'ColorGenerator');
+};
+
+export default provideServices;
--- a/src/utils/Checkbox.js
+++ b/src/utils/Checkbox.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { v4 as uuid } from 'uuid';
+
+const propTypes = {
+  checked: PropTypes.bool.isRequired,
+  onChange: PropTypes.func.isRequired,
+  children: PropTypes.oneOfType([ PropTypes.string, PropTypes.node ]),
+  className: PropTypes.string,
+};
+
+const Checkbox = ({ checked, onChange, className, children }) => {
+  const id = uuid();
+  const onChecked = (e) => onChange(e.target.checked, e);
+
+  return (
+    <span className={classNames('custom-control custom-checkbox', className)} style={{ display: 'inline' }}>
+      <input type="checkbox" className="custom-control-input" id={id} checked={checked} onChange={onChecked} />
+      <label className="custom-control-label" htmlFor={id}>{children}</label>
+    </span>
+  );
+};
+
+Checkbox.propTypes = propTypes;
+
+export default Checkbox;
--- a/src/utils/DateInput.js
+++ b/src/utils/DateInput.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import { isNil } from 'ramda';
+import DatePicker from 'react-datepicker';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faCalendarAlt as calendarIcon } from '@fortawesome/free-regular-svg-icons';
+import * as PropTypes from 'prop-types';
+import './DateInput.scss';
+
+const propTypes = {
+  className: PropTypes.string,
+  isClearable: PropTypes.bool,
+  selected: PropTypes.oneOfType([ PropTypes.string, PropTypes.object ]),
+  ref: PropTypes.object,
+};
+
+const DateInput = (props) => {
+  const { className, isClearable, selected, ref = React.createRef() } = props;
+  const showCalendarIcon = !isClearable || isNil(selected);
+
+  return (
+    <div className="date-input-container">
+      <DatePicker
+        {...props}
+        className={`date-input-container__input form-control ${className || ''}`}
+        dateFormat="YYYY-MM-DD"
+        readOnly
+        ref={ref}
+      />
+      {showCalendarIcon && (
+        <FontAwesomeIcon
+          icon={calendarIcon}
+          className="date-input-container__icon"
+          onClick={() => ref.current.input.focus()}
+        />
+      )}
+    </div>
+  );
+};
+
+DateInput.propTypes = propTypes;
+
+export default DateInput;
--- a/src/common/DateInput.scss
+++ b/src/common/DateInput.scss
@@ -1,5 +1,5 @@
-@import '../utils/mixins/vertical-align';
-@import '../utils/base';
+@import './mixins/vertical-align';
+@import './base';

 .date-input-container {
  position: relative;
--- a/src/utils/ExternalLink.js
+++ b/src/utils/ExternalLink.js
@@ -1,19 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import { ExternalLink } from 'react-external-link';

-const propTypes = {
-  href: PropTypes.string.isRequired,
-  children: PropTypes.node,
-};
-
-export default function ExternalLink(props) {
-  const { href, children, ...rest } = props;
-
-  return (
-    <a target="_blank" rel="noopener noreferrer" href={href} {...rest}>
-      {children || href}
-    </a>
-  );
-}
-
-ExternalLink.propTypes = propTypes;
+export default ExternalLink;
--- a/src/utils/PaginationDropdown.js
+++ b/src/utils/PaginationDropdown.js
@@ -0,0 +1,33 @@
+import React from 'react';
+import { DropdownItem, DropdownMenu, DropdownToggle, UncontrolledDropdown } from 'reactstrap';
+import * as PropTypes from 'prop-types';
+
+const propTypes = {
+  toggleClassName: PropTypes.string,
+  ranges: PropTypes.arrayOf(PropTypes.number).isRequired,
+  value: PropTypes.number.isRequired,
+  setValue: PropTypes.func.isRequired,
+};
+
+const PaginationDropdown = ({ toggleClassName, ranges, value, setValue }) => (
+  <UncontrolledDropdown>
+    <DropdownToggle caret color="link" className={toggleClassName}>
+      Paginate
+    </DropdownToggle>
+    <DropdownMenu right>
+      {ranges.map((itemsPerPage) => (
+        <DropdownItem key={itemsPerPage} active={itemsPerPage === value} onClick={() => setValue(itemsPerPage)}>
+          <b>{itemsPerPage}</b> items per page
+        </DropdownItem>
+      ))}
+      <DropdownItem divider />
+      <DropdownItem disabled={value === Infinity} onClick={() => setValue(Infinity)}>
+        <i>Clear pagination</i>
+      </DropdownItem>
+    </DropdownMenu>
+  </UncontrolledDropdown>
+);
+
+PaginationDropdown.propTypes = propTypes;
+
+export default PaginationDropdown;
--- a/src/utils/SearchField.js
+++ b/src/utils/SearchField.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
-import searchIcon from '@fortawesome/fontawesome-free-solid/faSearch';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faSearch as searchIcon } from '@fortawesome/free-solid-svg-icons';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import './SearchField.scss';
--- a/Show More
+++ b/Show More