+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master

Close #1597 Squashed commit of the following: commit 1eb89586dd71260e561420fe669abc8b56a506a1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 14:54:10 2020 +0300 Fix translation in install options commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 13:11:34 2020 +0300 Remove commented code commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 19:02:49 2020 +0300 Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version commit 3fcf73fb14cd9da508522d1a300b66af24da95e5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 17:30:37 2020 +0300 Remove all unused dependencies commit e761810e3e54e188ada41245bdce7414cd0f03e8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:35:24 2020 +0300 Remove unused dependencies commit d89d27da6befcaabcdc12bf5e7e94cbb24140010 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:14:09 2020 +0300 Update regular dependencies commit d2dfd01233d059870d5173ffd748cf61a477936f Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 15:34:10 2020 +0300 Update all dev dependancies commit 02b6fb480e9d310039fbe9b7aae062a41128f070 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 14:14:44 2020 +0300 Update all postcss packages commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:45:02 2020 +0300 Prevent git from converting linebreaks in .js files commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:43:01 2020 +0300 Prevent git from converting linebreaks in .js files commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:24:47 2020 +0300 Remove linebreak-style eslint rule commit df893dec53adebb1d662fe805fab508fd4ed5e06 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 20:55:47 2020 +0300 Add prop types commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 18:52:07 2020 +0300 Update eslint and babel, fix eslint warnings commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 16:45:49 2020 +0300 Update css loading webpack rules commit 247fa1ed548ef0706a03fdada8309c1454d191f8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 16:13:49 2020 +0300 Suppress linebreak-style eslint error for Windows commit d6499aac507100d6918c849c06d739d80f2229f0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:55:07 2020 +0300 Suppress eslint exit code commit ae2d6c614ea23a90d515168f8752e959298894ef Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:05:18 2020 +0300 Edit css file warnings commit 60675050f2a5baebc679fc05da7e033e5c740d90 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 13:10:26 2020 +0300 Remove uglifyjs plugin commit a27806434dd8672e71a26c7a2e810d77e5e229fa Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:29:17 2020 +0300 Fix DefinePlugin value commit 8f2966ca59195c2f70bca5072d20515d536f42a6 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:05:03 2020 +0300 Update webpack
2020-05-22 17:06:05 +03:00
parent 8b25a4886e
commit 6f3cd4e7eb
131 changed files with 7454 additions and 8907 deletions
--- a/client/src/actions/access.js
+++ b/client/src/actions/access.js
@@ -1,10 +1,10 @@
 import { createAction } from 'redux-actions';
-import { t } from 'i18next';
+import i18next from 'i18next';

 import apiClient from '../api/Api';
-import { addErrorToast, addSuccessToast } from './index';
 import { normalizeTextarea } from '../helpers/helpers';
 import { ACTION } from '../helpers/constants';
+import { addErrorToast, addSuccessToast } from './toasts';

 export const getAccessListRequest = createAction('GET_ACCESS_LIST_REQUEST');
 export const getAccessListFailure = createAction('GET_ACCESS_LIST_FAILURE');
@@ -25,7 +25,7 @@ export const setAccessListRequest = createAction('SET_ACCESS_LIST_REQUEST');
 export const setAccessListFailure = createAction('SET_ACCESS_LIST_FAILURE');
 export const setAccessListSuccess = createAction('SET_ACCESS_LIST_SUCCESS');

-export const setAccessList = config => async (dispatch) => {
+export const setAccessList = (config) => async (dispatch) => {
    dispatch(setAccessListRequest());
    try {
        const { allowed_clients, disallowed_clients, blocked_hosts } = config;
@@ -58,7 +58,7 @@ export const toggleClientBlock = (type, ip) => async (dispatch) => {
        let updatedDisallowedClients = disallowed_clients || [];

        if (type === ACTION.unblock && updatedDisallowedClients.includes(ip)) {
-            updatedDisallowedClients = updatedDisallowedClients.filter(client => client !== ip);
+            updatedDisallowedClients = updatedDisallowedClients.filter((client) => client !== ip);
        } else if (type === ACTION.block && !updatedDisallowedClients.includes(ip)) {
            updatedDisallowedClients.push(ip);
        }
@@ -73,9 +73,9 @@ export const toggleClientBlock = (type, ip) => async (dispatch) => {
        dispatch(toggleClientBlockSuccess(values));

        if (type === ACTION.unblock) {
-            dispatch(addSuccessToast(t('client_unblocked', { ip })));
+            dispatch(addSuccessToast(i18next.t('client_unblocked', { ip })));
        } else if (type === ACTION.block) {
-            dispatch(addSuccessToast(t('client_blocked', { ip })));
+            dispatch(addSuccessToast(i18next.t('client_blocked', { ip })));
        }
    } catch (error) {
        dispatch(addErrorToast({ error }));
--- a/client/src/actions/clients.js
+++ b/client/src/actions/clients.js
@@ -1,7 +1,8 @@
 import { createAction } from 'redux-actions';
-import { t } from 'i18next';
+import i18next from 'i18next';
 import apiClient from '../api/Api';
-import { addErrorToast, addSuccessToast, getClients } from './index';
+import { getClients } from './index';
+import { addErrorToast, addSuccessToast } from './toasts';

 export const toggleClientModal = createAction('TOGGLE_CLIENT_MODAL');

@@ -9,13 +10,13 @@ export const addClientRequest = createAction('ADD_CLIENT_REQUEST');
 export const addClientFailure = createAction('ADD_CLIENT_FAILURE');
 export const addClientSuccess = createAction('ADD_CLIENT_SUCCESS');

-export const addClient = config => async (dispatch) => {
+export const addClient = (config) => async (dispatch) => {
    dispatch(addClientRequest());
    try {
        await apiClient.addClient(config);
        dispatch(addClientSuccess());
        dispatch(toggleClientModal());
-        dispatch(addSuccessToast(t('client_added', { key: config.name })));
+        dispatch(addSuccessToast(i18next.t('client_added', { key: config.name })));
        dispatch(getClients());
    } catch (error) {
        dispatch(addErrorToast({ error }));
@@ -27,12 +28,12 @@ export const deleteClientRequest = createAction('DELETE_CLIENT_REQUEST');
 export const deleteClientFailure = createAction('DELETE_CLIENT_FAILURE');
 export const deleteClientSuccess = createAction('DELETE_CLIENT_SUCCESS');

-export const deleteClient = config => async (dispatch) => {
+export const deleteClient = (config) => async (dispatch) => {
    dispatch(deleteClientRequest());
    try {
        await apiClient.deleteClient(config);
        dispatch(deleteClientSuccess());
-        dispatch(addSuccessToast(t('client_deleted', { key: config.name })));
+        dispatch(addSuccessToast(i18next.t('client_deleted', { key: config.name })));
        dispatch(getClients());
    } catch (error) {
        dispatch(addErrorToast({ error }));
@@ -52,7 +53,7 @@ export const updateClient = (config, name) => async (dispatch) => {
        await apiClient.updateClient(data);
        dispatch(updateClientSuccess());
        dispatch(toggleClientModal());
-        dispatch(addSuccessToast(t('client_updated', { key: name })));
+        dispatch(addSuccessToast(i18next.t('client_updated', { key: name })));
        dispatch(getClients());
    } catch (error) {
        dispatch(addErrorToast({ error }));
--- a/client/src/actions/dnsConfig.js
+++ b/client/src/actions/dnsConfig.js
@@ -1,8 +1,8 @@
 import { createAction } from 'redux-actions';

 import apiClient from '../api/Api';
-import { addErrorToast, addSuccessToast } from './index';
 import { normalizeTextarea } from '../helpers/helpers';
+import { addErrorToast, addSuccessToast } from './toasts';

 export const getDnsConfigRequest = createAction('GET_DNS_CONFIG_REQUEST');
 export const getDnsConfigFailure = createAction('GET_DNS_CONFIG_FAILURE');
@@ -23,7 +23,7 @@ export const setDnsConfigRequest = createAction('SET_DNS_CONFIG_REQUEST');
 export const setDnsConfigFailure = createAction('SET_DNS_CONFIG_FAILURE');
 export const setDnsConfigSuccess = createAction('SET_DNS_CONFIG_SUCCESS');

-export const setDnsConfig = config => async (dispatch) => {
+export const setDnsConfig = (config) => async (dispatch) => {
    dispatch(setDnsConfigRequest());
    try {
        const data = { ...config };
--- a/client/src/actions/encryption.js
+++ b/client/src/actions/encryption.js
@@ -1,7 +1,7 @@
 import { createAction } from 'redux-actions';
 import apiClient from '../api/Api';
-import { addErrorToast, addSuccessToast } from './index';
 import { redirectToCurrentProtocol } from '../helpers/helpers';
+import { addErrorToast, addSuccessToast } from './toasts';

 export const getTlsStatusRequest = createAction('GET_TLS_STATUS_REQUEST');
 export const getTlsStatusFailure = createAction('GET_TLS_STATUS_FAILURE');
@@ -25,7 +25,7 @@ export const setTlsConfigRequest = createAction('SET_TLS_CONFIG_REQUEST');
 export const setTlsConfigFailure = createAction('SET_TLS_CONFIG_FAILURE');
 export const setTlsConfigSuccess = createAction('SET_TLS_CONFIG_SUCCESS');

-export const setTlsConfig = config => async (dispatch, getState) => {
+export const setTlsConfig = (config) => async (dispatch, getState) => {
    dispatch(setTlsConfigRequest());
    try {
        const { httpPort } = getState().dashboard;
@@ -51,7 +51,7 @@ export const validateTlsConfigRequest = createAction('VALIDATE_TLS_CONFIG_REQUES
 export const validateTlsConfigFailure = createAction('VALIDATE_TLS_CONFIG_FAILURE');
 export const validateTlsConfigSuccess = createAction('VALIDATE_TLS_CONFIG_SUCCESS');

-export const validateTlsConfig = config => async (dispatch) => {
+export const validateTlsConfig = (config) => async (dispatch) => {
    dispatch(validateTlsConfigRequest());
    try {
        const values = { ...config };
--- a/client/src/actions/filtering.js
+++ b/client/src/actions/filtering.js
@@ -1,10 +1,10 @@
 import { createAction } from 'redux-actions';
 import { showLoading, hideLoading } from 'react-redux-loading-bar';
-import { t } from 'i18next';
+import i18next from 'i18next';

 import { normalizeFilteringStatus, normalizeRulesTextarea } from '../helpers/helpers';
-import { addErrorToast, addSuccessToast } from './index';
 import apiClient from '../api/Api';
+import { addErrorToast, addSuccessToast } from './toasts';

 export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
 export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
@@ -28,7 +28,7 @@ export const setRulesRequest = createAction('SET_RULES_REQUEST');
 export const setRulesFailure = createAction('SET_RULES_FAILURE');
 export const setRulesSuccess = createAction('SET_RULES_SUCCESS');

-export const setRules = rules => async (dispatch) => {
+export const setRules = (rules) => async (dispatch) => {
    dispatch(setRulesRequest());
    try {
        const normalizedRules = normalizeRulesTextarea(rules);
@@ -113,7 +113,7 @@ export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
 export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
 export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');

-export const refreshFilters = config => async (dispatch) => {
+export const refreshFilters = (config) => async (dispatch) => {
    dispatch(refreshFiltersRequest());
    dispatch(showLoading());
    try {
@@ -122,7 +122,7 @@ export const refreshFilters = config => async (dispatch) => {
        dispatch(refreshFiltersSuccess());

        if (updated > 0) {
-            dispatch(addSuccessToast(t('list_updated', { count: updated })));
+            dispatch(addSuccessToast(i18next.t('list_updated', { count: updated })));
        } else {
            dispatch(addSuccessToast('all_lists_up_to_date_toast'));
        }
@@ -140,7 +140,7 @@ export const setFiltersConfigRequest = createAction('SET_FILTERS_CONFIG_REQUEST'
 export const setFiltersConfigFailure = createAction('SET_FILTERS_CONFIG_FAILURE');
 export const setFiltersConfigSuccess = createAction('SET_FILTERS_CONFIG_SUCCESS');

-export const setFiltersConfig = config => async (dispatch, getState) => {
+export const setFiltersConfig = (config) => async (dispatch, getState) => {
    dispatch(setFiltersConfigRequest());
    try {
        const { enabled } = config;
@@ -170,7 +170,7 @@ export const checkHostSuccess = createAction('CHECK_HOST_SUCCESS');
 * @param {string} host.name
 * @returns {undefined}
 */
-export const checkHost = host => async (dispatch) => {
+export const checkHost = (host) => async (dispatch) => {
    dispatch(checkHostRequest());
    try {
        const data = await apiClient.checkHost(host);
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -1,16 +1,12 @@
 import { createAction } from 'redux-actions';
-import { t } from 'i18next';
+import i18next from 'i18next';
 import axios from 'axios';

-import { normalizeTextarea, sortClients, isVersionGreater } from '../helpers/helpers';
-import { SETTINGS_NAMES, CHECK_TIMEOUT } from '../helpers/constants';
+import { isVersionGreater, normalizeTextarea, sortClients } from '../helpers/helpers';
+import { CHECK_TIMEOUT, SETTINGS_NAMES } from '../helpers/constants';
 import { getTlsStatus } from './encryption';
 import apiClient from '../api/Api';
-
-export const addErrorToast = createAction('ADD_ERROR_TOAST');
-export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
-export const addNoticeToast = createAction('ADD_NOTICE_TOAST');
-export const removeToast = createAction('REMOVE_TOAST');
+import { addErrorToast, addNoticeToast, addSuccessToast } from './toasts';

 export const toggleSettingStatus = createAction('SETTING_STATUS_TOGGLE');
 export const showSettingsFailure = createAction('SETTINGS_FAILURE_SHOW');
@@ -62,7 +58,7 @@ export const initSettingsRequest = createAction('SETTINGS_INIT_REQUEST');
 export const initSettingsFailure = createAction('SETTINGS_INIT_FAILURE');
 export const initSettingsSuccess = createAction('SETTINGS_INIT_SUCCESS');

-export const initSettings = settingsList => async (dispatch) => {
+export const initSettings = (settingsList) => async (dispatch) => {
    dispatch(initSettingsRequest());
    try {
        const safebrowsingStatus = await apiClient.getSafebrowsingStatus();
@@ -89,7 +85,7 @@ export const toggleProtectionRequest = createAction('TOGGLE_PROTECTION_REQUEST')
 export const toggleProtectionFailure = createAction('TOGGLE_PROTECTION_FAILURE');
 export const toggleProtectionSuccess = createAction('TOGGLE_PROTECTION_SUCCESS');

-export const toggleProtection = status => async (dispatch) => {
+export const toggleProtection = (status) => async (dispatch) => {
    dispatch(toggleProtectionRequest());
    try {
        const successMessage = status ? 'disabled_protection' : 'enabled_protection';
@@ -139,7 +135,7 @@ const checkStatus = async (handleRequestSuccess, handleRequestError, attempts =
        handleRequestError();
    }

-    const rmTimeout = t => t && clearTimeout(t);
+    const rmTimeout = (t) => t && clearTimeout(t);

    try {
        const response = await axios.get('control/status');
@@ -270,7 +266,7 @@ export const testUpstreamRequest = createAction('TEST_UPSTREAM_REQUEST');
 export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE');
 export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS');

-export const testUpstream = config => async (dispatch) => {
+export const testUpstream = (config) => async (dispatch) => {
    dispatch(testUpstreamRequest());
    try {
        const values = { ...config };
@@ -281,12 +277,12 @@ export const testUpstream = config => async (dispatch) => {
        const testMessages = Object.keys(upstreamResponse).map((key) => {
            const message = upstreamResponse[key];
            if (message !== 'OK') {
-                dispatch(addErrorToast({ error: t('dns_test_not_ok_toast', { key }) }));
+                dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
            }
            return message;
        });

-        if (testMessages.every(message => message === 'OK')) {
+        if (testMessages.every((message) => message === 'OK')) {
            dispatch(addSuccessToast('dns_test_ok_toast'));
        }

@@ -301,7 +297,7 @@ export const changeLanguageRequest = createAction('CHANGE_LANGUAGE_REQUEST');
 export const changeLanguageFailure = createAction('CHANGE_LANGUAGE_FAILURE');
 export const changeLanguageSuccess = createAction('CHANGE_LANGUAGE_SUCCESS');

-export const changeLanguage = lang => async (dispatch) => {
+export const changeLanguage = (lang) => async (dispatch) => {
    dispatch(changeLanguageRequest());
    try {
        await apiClient.changeLanguage(lang);
@@ -361,7 +357,7 @@ export const findActiveDhcpRequest = createAction('FIND_ACTIVE_DHCP_REQUEST');
 export const findActiveDhcpSuccess = createAction('FIND_ACTIVE_DHCP_SUCCESS');
 export const findActiveDhcpFailure = createAction('FIND_ACTIVE_DHCP_FAILURE');

-export const findActiveDhcp = name => async (dispatch) => {
+export const findActiveDhcp = (name) => async (dispatch) => {
    dispatch(findActiveDhcpRequest());
    try {
        const activeDhcp = await apiClient.findActiveDhcp(name);
@@ -376,7 +372,7 @@ export const setDhcpConfigRequest = createAction('SET_DHCP_CONFIG_REQUEST');
 export const setDhcpConfigSuccess = createAction('SET_DHCP_CONFIG_SUCCESS');
 export const setDhcpConfigFailure = createAction('SET_DHCP_CONFIG_FAILURE');

-export const setDhcpConfig = values => async (dispatch, getState) => {
+export const setDhcpConfig = (values) => async (dispatch, getState) => {
    const { config } = getState().dhcp;
    const updatedConfig = { ...config, ...values };
    dispatch(setDhcpConfigRequest());
@@ -395,7 +391,7 @@ export const toggleDhcpRequest = createAction('TOGGLE_DHCP_REQUEST');
 export const toggleDhcpFailure = createAction('TOGGLE_DHCP_FAILURE');
 export const toggleDhcpSuccess = createAction('TOGGLE_DHCP_SUCCESS');

-export const toggleDhcp = values => async (dispatch) => {
+export const toggleDhcp = (values) => async (dispatch) => {
    dispatch(toggleDhcpRequest());
    let config = { ...values, enabled: false };
    let successMessage = 'disabled_dhcp';
@@ -438,13 +434,13 @@ export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
 export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
 export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');

-export const addStaticLease = config => async (dispatch) => {
+export const addStaticLease = (config) => async (dispatch) => {
    dispatch(addStaticLeaseRequest());
    try {
        const name = config.hostname || config.ip;
        await apiClient.addStaticLease(config);
        dispatch(addStaticLeaseSuccess(config));
-        dispatch(addSuccessToast(t('dhcp_lease_added', { key: name })));
+        dispatch(addSuccessToast(i18next.t('dhcp_lease_added', { key: name })));
        dispatch(toggleLeaseModal());
    } catch (error) {
        dispatch(addErrorToast({ error }));
@@ -456,15 +452,17 @@ export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUES
 export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
 export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');

-export const removeStaticLease = config => async (dispatch) => {
+export const removeStaticLease = (config) => async (dispatch) => {
    dispatch(removeStaticLeaseRequest());
    try {
        const name = config.hostname || config.ip;
        await apiClient.removeStaticLease(config);
        dispatch(removeStaticLeaseSuccess(config));
-        dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: name })));
+        dispatch(addSuccessToast(i18next.t('dhcp_lease_deleted', { key: name })));
    } catch (error) {
        dispatch(addErrorToast({ error }));
        dispatch(removeStaticLeaseFailure());
    }
 };
+
+export const removeToast = createAction('REMOVE_TOAST');
--- a/client/src/actions/install.js
+++ b/client/src/actions/install.js
@@ -1,6 +1,6 @@
 import { createAction } from 'redux-actions';
 import apiClient from '../api/Api';
-import { addErrorToast, addSuccessToast } from './index';
+import { addErrorToast, addSuccessToast } from './toasts';

 export const nextStep = createAction('NEXT_STEP');
 export const prevStep = createAction('PREV_STEP');
@@ -24,7 +24,7 @@ export const setAllSettingsRequest = createAction('SET_ALL_SETTINGS_REQUEST');
 export const setAllSettingsFailure = createAction('SET_ALL_SETTINGS_FAILURE');
 export const setAllSettingsSuccess = createAction('SET_ALL_SETTINGS_SUCCESS');

-export const setAllSettings = values => async (dispatch) => {
+export const setAllSettings = (values) => async (dispatch) => {
    dispatch(setAllSettingsRequest());
    try {
        const {
@@ -47,7 +47,7 @@ export const checkConfigRequest = createAction('CHECK_CONFIG_REQUEST');
 export const checkConfigFailure = createAction('CHECK_CONFIG_FAILURE');
 export const checkConfigSuccess = createAction('CHECK_CONFIG_SUCCESS');

-export const checkConfig = values => async (dispatch) => {
+export const checkConfig = (values) => async (dispatch) => {
    dispatch(checkConfigRequest());
    try {
        const check = await apiClient.checkConfig(values);
--- a/client/src/actions/login.js
+++ b/client/src/actions/login.js
@@ -1,13 +1,13 @@
 import { createAction } from 'redux-actions';

-import { addErrorToast } from './index';
 import apiClient from '../api/Api';
+import { addErrorToast } from './toasts';

 export const processLoginRequest = createAction('PROCESS_LOGIN_REQUEST');
 export const processLoginFailure = createAction('PROCESS_LOGIN_FAILURE');
 export const processLoginSuccess = createAction('PROCESS_LOGIN_SUCCESS');

-export const processLogin = values => async (dispatch) => {
+export const processLogin = (values) => async (dispatch) => {
    dispatch(processLoginRequest());
    try {
        await apiClient.login(values);
--- a/client/src/actions/queryLogs.js
+++ b/client/src/actions/queryLogs.js
@@ -1,9 +1,9 @@
 import { createAction } from 'redux-actions';

 import apiClient from '../api/Api';
-import { addErrorToast, addSuccessToast } from './index';
 import { normalizeLogs, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
 import { TABLE_DEFAULT_PAGE_SIZE } from '../helpers/constants';
+import { addErrorToast, addSuccessToast } from './toasts';

 const getLogsWithParams = async (config) => {
    const { older_than, filter, ...values } = config;
@@ -27,9 +27,9 @@ const checkFilteredLogs = async (data, filter, dispatch, total) => {
    const { logs, oldest } = data;
    const totalData = total || { logs };

-    const needToGetAdditionalLogs = (logs.length < TABLE_DEFAULT_PAGE_SIZE ||
-        totalData.logs.length < TABLE_DEFAULT_PAGE_SIZE) &&
-        oldest !== '';
+    const needToGetAdditionalLogs = (logs.length < TABLE_DEFAULT_PAGE_SIZE
+        || totalData.logs.length < TABLE_DEFAULT_PAGE_SIZE)
+        && oldest !== '';

    if (needToGetAdditionalLogs) {
        dispatch(getAdditionalLogsRequest());
@@ -61,7 +61,7 @@ export const getLogsRequest = createAction('GET_LOGS_REQUEST');
 export const getLogsFailure = createAction('GET_LOGS_FAILURE');
 export const getLogsSuccess = createAction('GET_LOGS_SUCCESS');

-export const getLogs = config => async (dispatch, getState) => {
+export const getLogs = (config) => async (dispatch, getState) => {
    dispatch(getLogsRequest());
    try {
        const { isFiltered, filter, page } = getState().queryLogs;
@@ -85,7 +85,7 @@ export const setLogsFilterRequest = createAction('SET_LOGS_FILTER_REQUEST');
 export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
 export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');

-export const setLogsFilter = filter => async (dispatch) => {
+export const setLogsFilter = (filter) => async (dispatch) => {
    dispatch(setLogsFilterRequest());
    try {
        const data = await getLogsWithParams({ older_than: '', filter });
@@ -135,7 +135,7 @@ export const setLogsConfigRequest = createAction('SET_LOGS_CONFIG_REQUEST');
 export const setLogsConfigFailure = createAction('SET_LOGS_CONFIG_FAILURE');
 export const setLogsConfigSuccess = createAction('SET_LOGS_CONFIG_SUCCESS');

-export const setLogsConfig = config => async (dispatch) => {
+export const setLogsConfig = (config) => async (dispatch) => {
    dispatch(setLogsConfigRequest());
    try {
        await apiClient.setQueryLogConfig(config);
--- a/client/src/actions/rewrites.js
+++ b/client/src/actions/rewrites.js
@@ -1,7 +1,7 @@
 import { createAction } from 'redux-actions';
-import { t } from 'i18next';
+import i18next from 'i18next';
 import apiClient from '../api/Api';
-import { addErrorToast, addSuccessToast } from './index';
+import { addErrorToast, addSuccessToast } from './toasts';

 export const toggleRewritesModal = createAction('TOGGLE_REWRITES_MODAL');

@@ -24,14 +24,14 @@ export const addRewriteRequest = createAction('ADD_REWRITE_REQUEST');
 export const addRewriteFailure = createAction('ADD_REWRITE_FAILURE');
 export const addRewriteSuccess = createAction('ADD_REWRITE_SUCCESS');

-export const addRewrite = config => async (dispatch) => {
+export const addRewrite = (config) => async (dispatch) => {
    dispatch(addRewriteRequest());
    try {
        await apiClient.addRewrite(config);
        dispatch(addRewriteSuccess(config));
        dispatch(toggleRewritesModal());
        dispatch(getRewritesList());
-        dispatch(addSuccessToast(t('rewrite_added', { key: config.domain })));
+        dispatch(addSuccessToast(i18next.t('rewrite_added', { key: config.domain })));
    } catch (error) {
        dispatch(addErrorToast({ error }));
        dispatch(addRewriteFailure());
@@ -42,13 +42,13 @@ export const deleteRewriteRequest = createAction('DELETE_REWRITE_REQUEST');
 export const deleteRewriteFailure = createAction('DELETE_REWRITE_FAILURE');
 export const deleteRewriteSuccess = createAction('DELETE_REWRITE_SUCCESS');

-export const deleteRewrite = config => async (dispatch) => {
+export const deleteRewrite = (config) => async (dispatch) => {
    dispatch(deleteRewriteRequest());
    try {
        await apiClient.deleteRewrite(config);
        dispatch(deleteRewriteSuccess());
        dispatch(getRewritesList());
-        dispatch(addSuccessToast(t('rewrite_deleted', { key: config.domain })));
+        dispatch(addSuccessToast(i18next.t('rewrite_deleted', { key: config.domain })));
    } catch (error) {
        dispatch(addErrorToast({ error }));
        dispatch(deleteRewriteFailure());
--- a/client/src/actions/services.js
+++ b/client/src/actions/services.js
@@ -1,6 +1,6 @@
 import { createAction } from 'redux-actions';
 import apiClient from '../api/Api';
-import { addErrorToast, addSuccessToast } from './index';
+import { addErrorToast, addSuccessToast } from './toasts';

 export const getBlockedServicesRequest = createAction('GET_BLOCKED_SERVICES_REQUEST');
 export const getBlockedServicesFailure = createAction('GET_BLOCKED_SERVICES_FAILURE');
@@ -21,7 +21,7 @@ export const setBlockedServicesRequest = createAction('SET_BLOCKED_SERVICES_REQU
 export const setBlockedServicesFailure = createAction('SET_BLOCKED_SERVICES_FAILURE');
 export const setBlockedServicesSuccess = createAction('SET_BLOCKED_SERVICES_SUCCESS');

-export const setBlockedServices = values => async (dispatch) => {
+export const setBlockedServices = (values) => async (dispatch) => {
    dispatch(setBlockedServicesRequest());
    try {
        await apiClient.setBlockedServices(values);
--- a/client/src/actions/stats.js
+++ b/client/src/actions/stats.js
@@ -1,8 +1,10 @@
 import { createAction } from 'redux-actions';

 import apiClient from '../api/Api';
-import { addErrorToast, addSuccessToast } from './index';
-import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
+import {
+    normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo,
+} from '../helpers/helpers';
+import { addErrorToast, addSuccessToast } from './toasts';

 export const getStatsConfigRequest = createAction('GET_STATS_CONFIG_REQUEST');
 export const getStatsConfigFailure = createAction('GET_STATS_CONFIG_FAILURE');
@@ -23,7 +25,7 @@ export const setStatsConfigRequest = createAction('SET_STATS_CONFIG_REQUEST');
 export const setStatsConfigFailure = createAction('SET_STATS_CONFIG_FAILURE');
 export const setStatsConfigSuccess = createAction('SET_STATS_CONFIG_SUCCESS');

-export const setStatsConfig = config => async (dispatch) => {
+export const setStatsConfig = (config) => async (dispatch) => {
    dispatch(setStatsConfigRequest());
    try {
        await apiClient.setStatsConfig(config);
--- a/client/src/actions/toasts.js
+++ b/client/src/actions/toasts.js
@@ -0,0 +1,5 @@
+import { createAction } from 'redux-actions';
+
+export const addErrorToast = createAction('ADD_ERROR_TOAST');
+export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
+export const addNoticeToast = createAction('ADD_NOTICE_TOAST');