📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
rename: redux -> lib
Blue Mousef01140a89b06
diff --git a/web/app/components/SEO.tsx b/web/app/components/SEO.tsxindex d8ff9eee7..4d686aff6 100644--- a/web/app/components/SEO.tsx+++ b/web/app/components/SEO.tsx@@ -2,7 +2,6 @@ import { useTranslation } from 'react-i18next'import { useLocation } from '@remix-run/react'import _startsWith from 'lodash/startsWith'import _toUpper from 'lodash/toUpper'-// import { MAIN_URL } from 'redux/constants'import { getPageMeta } from 'utils/server'import { getOgImageUrl } from 'lib/constants'import routes from 'utils/routes'diff --git a/web/app/lib/reducers/ui/cache.ts b/web/app/lib/reducers/ui/cache.tsindex 6911932ed..8cface402 100644--- a/web/app/lib/reducers/ui/cache.ts+++ b/web/app/lib/reducers/ui/cache.ts@@ -9,8 +9,8 @@ import {getProjectCaptchaCacheKey,getUserFlowCacheKey,isBrowser,-} from 'redux/constants'-import { IUserFlow } from 'redux/models/UserFlow'+} from 'lib/constants'+import { IUserFlow } from 'lib/models/UserFlow'import { filterInvalidViewPrefs } from 'pages/Project/View/utils/filters'const getInitialViewPrefs = (LS_VIEW: string) => {diff --git a/web/app/lib/reducers/ui/misc.ts b/web/app/lib/reducers/ui/misc.tsindex af1386f1c..83c2aa13e 100644--- a/web/app/lib/reducers/ui/misc.ts+++ b/web/app/lib/reducers/ui/misc.ts@@ -1,9 +1,9 @@import { createSlice, PayloadAction } from '@reduxjs/toolkit'-import { LOW_EVENTS_WARNING } from 'redux/constants'+import { LOW_EVENTS_WARNING } from 'lib/constants'import { setCookie } from 'utils/cookie'import { secondsTillNextMonth } from 'utils/generic'-import { Stats } from 'redux/models/Stats'-import { Metainfo } from 'redux/models/Metainfo'+import { Stats } from 'lib/models/Stats'+import { Metainfo } from 'lib/models/Metainfo'interface InitialState {stats: Statsdiff --git a/web/app/lib/reducers/ui/theme.ts b/web/app/lib/reducers/ui/theme.tsindex 7ee7c9a8e..fdf271160 100644--- a/web/app/lib/reducers/ui/theme.ts+++ b/web/app/lib/reducers/ui/theme.ts@@ -1,7 +1,7 @@import { createSlice, PayloadAction } from '@reduxjs/toolkit'import _includes from 'lodash/includes'import { setCookie, getCookie } from 'utils/cookie'-import { isBrowser, LS_THEME_SETTING, SUPPORTED_THEMES, ThemeType } from 'redux/constants'+import { isBrowser, LS_THEME_SETTING, SUPPORTED_THEMES, ThemeType } from 'lib/constants'const setThemeToDOM = (theme: string) => {if (!isBrowser) {diff --git a/web/app/pages/Captcha/View/components/NoEvents.tsx b/web/app/pages/Captcha/View/components/NoEvents.tsxindex 451252736..0b085baf9 100644--- a/web/app/pages/Captcha/View/components/NoEvents.tsx+++ b/web/app/pages/Captcha/View/components/NoEvents.tsx@@ -3,7 +3,7 @@ import { useTranslation, Trans } from 'react-i18next'import _isEmpty from 'lodash/isEmpty'import Button from 'ui/Button'-import { DOCS_CAPTCHA_URL } from 'redux/constants'+import { DOCS_CAPTCHA_URL } from 'lib/constants'import { Filter } from 'pages/Project/View/interfaces/traffic'interface NoEventsProps {diff --git a/web/app/pages/Organisations/Settings/index.tsx b/web/app/pages/Organisations/Settings/index.tsxindex 939e955ed..44fc9e571 100644--- a/web/app/pages/Organisations/Settings/index.tsx+++ b/web/app/pages/Organisations/Settings/index.tsx@@ -7,7 +7,7 @@ import _size from 'lodash/size'import _keys from 'lodash/keys'import { withAuthentication, auth } from 'hoc/protected'-import { TITLE_SUFFIX } from 'redux/constants'+import { TITLE_SUFFIX } from 'lib/constants'import { transferProject, getOrganisation, updateOrganisation, deleteOrganisation } from 'api'import Input from 'ui/Input'import Button from 'ui/Button'@@ -17,8 +17,8 @@ import routes from 'utils/routes'import People from './People'import { useRequiredParams } from 'hooks/useRequiredParams'-import { DetailedOrganisation } from 'redux/models/Organisation'-import { StateType } from 'redux/store'+import { DetailedOrganisation } from 'lib/models/Organisation'+import { StateType } from 'lib/store'import { useSelector } from 'react-redux'import { Projects } from './Projects'import { TrashIcon, XCircleIcon } from '@heroicons/react/24/outline'diff --git a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx b/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsxindex 942e6e0f9..b8c74d80d 100644--- a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx+++ b/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx@@ -17,13 +17,13 @@ import Input from 'ui/Input'import Button from 'ui/Button'import Checkbox from 'ui/Checkbox'import Modal from 'ui/Modal'-import { PROJECT_TABS, QUERY_CONDITION, QUERY_METRIC, QUERY_TIME } from 'redux/constants'+import { PROJECT_TABS, QUERY_CONDITION, QUERY_METRIC, QUERY_TIME } from 'lib/constants'import { createAlert, updateAlert, deleteAlert, CreateAlert, getAlert } from 'api'import { withAuthentication, auth } from 'hoc/protected'import routes from 'utils/routes'import Select from 'ui/Select'-import { Alerts } from 'redux/models/Alerts'-import { StateType } from 'redux/store'+import { Alerts } from 'lib/models/Alerts'+import { StateType } from 'lib/store'import { useSelector } from 'react-redux'import { useRequiredParams } from 'hooks/useRequiredParams'import Loader from 'ui/Loader'diff --git a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsxindex 32e3560c6..449677a36 100644--- a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx+++ b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx@@ -23,10 +23,10 @@ import routes from 'utils/routes'import Button from 'ui/Button'import Modal from 'ui/Modal'import PaidFeature from 'modals/PaidFeature'-import { QUERY_METRIC, PLAN_LIMITS, DEFAULT_ALERTS_TAKE } from 'redux/constants'+import { QUERY_METRIC, PLAN_LIMITS, DEFAULT_ALERTS_TAKE } from 'lib/constants'import { deleteAlert as deleteAlertApi, getProjectAlerts } from 'api'-import { StateType } from 'redux/store'-import { Alerts } from 'redux/models/Alerts'+import { StateType } from 'lib/store'+import { Alerts } from 'lib/models/Alerts'import Loader from 'ui/Loader'import Pagination from 'ui/Pagination'diff --git a/web/app/pages/Project/ProjectProtectedPassword/index.tsx b/web/app/pages/Project/ProjectProtectedPassword/index.tsxindex f88cf2cb4..cb803d7e1 100644--- a/web/app/pages/Project/ProjectProtectedPassword/index.tsx+++ b/web/app/pages/Project/ProjectProtectedPassword/index.tsx@@ -11,7 +11,7 @@ import Input from 'ui/Input'import Button from 'ui/Button'import { checkPassword } from 'api'import { useDispatch } from 'react-redux'-import UIActions from 'redux/reducers/ui'+import UIActions from 'lib/reducers/ui'import Header from 'components/Header'import Footer from 'components/Footer'import { useRequiredParams } from 'hooks/useRequiredParams'diff --git a/web/app/pages/Project/Settings/Emails/Emails.tsx b/web/app/pages/Project/Settings/Emails/Emails.tsxindex 3cc28a90e..027940bec 100644--- a/web/app/pages/Project/Settings/Emails/Emails.tsx+++ b/web/app/pages/Project/Settings/Emails/Emails.tsx@@ -13,7 +13,7 @@ import { addSubscriber, removeSubscriber, getSubscribers, updateSubscriber } froimport { isValidEmail } from 'utils/validator'import useOnClickOutside from 'hooks/useOnClickOutside'-import { reportFrequencyForEmailsOptions } from 'redux/constants'+import { reportFrequencyForEmailsOptions } from 'lib/constants'import Input from 'ui/Input'import Button from 'ui/Button'@@ -21,7 +21,7 @@ import Modal from 'ui/Modal'import Loader from 'ui/Loader'import cx from 'clsx'import { Badge } from 'ui/Badge'-import { Subscriber } from 'redux/models/Subscriber'+import { Subscriber } from 'lib/models/Subscriber'interface ModalMessageProps {handleInput: (e: React.ChangeEvent<HTMLInputElement>) => voiddiff --git a/web/app/pages/Project/Settings/People/People.tsx b/web/app/pages/Project/Settings/People/People.tsxindex 396ca1c26..daf6d9f1b 100644--- a/web/app/pages/Project/Settings/People/People.tsx+++ b/web/app/pages/Project/Settings/People/People.tsx@@ -16,12 +16,12 @@ import { Badge } from 'ui/Badge'import Button from 'ui/Button'import Modal from 'ui/Modal'import PaidFeature from 'modals/PaidFeature'-import { roles, INVITATION_EXPIRES_IN } from 'redux/constants'+import { roles, INVITATION_EXPIRES_IN } from 'lib/constants'import useOnClickOutside from 'hooks/useOnClickOutside'-import { Project, ShareOwnerProject } from 'redux/models/Project'-import { Role } from 'redux/models/Organisation'+import { Project, ShareOwnerProject } from 'lib/models/Project'+import { Role } from 'lib/models/Organisation'import { useSelector } from 'react-redux'-import { StateType } from 'redux/store'+import { StateType } from 'lib/store'const NoPeople = () => {const { t } = useTranslation('common')diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 18d88e4e6..19df0319c 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -101,9 +101,9 @@ import {ERROR_PERIOD_PAIRS,FUNNELS_PERIOD_PAIRS,ThemeType,-} from 'redux/constants'-import { Project, Funnel, AnalyticsFunnel, OverallObject, OverallPerformanceObject } from 'redux/models/Project'-import { CountryEntry } from 'redux/models/Entry'+} from 'lib/constants'+import { Project, Funnel, AnalyticsFunnel, OverallObject, OverallPerformanceObject } from 'lib/models/Project'+import { CountryEntry } from 'lib/models/Entry'import Loader from 'ui/Loader'import Dropdown from 'ui/Dropdown'import Checkbox from 'ui/Checkbox'@@ -220,8 +220,8 @@ import { AIProcessedResponse, AIResponse } from './interfaces/ai'import { useRequiredParams } from 'hooks/useRequiredParams'import BrowserDropdown from './components/BrowserDropdown'import OSDropdown from './components/OSDropdown'-import { StateType, useAppDispatch } from 'redux/store'-import UIActions from 'redux/reducers/ui'+import { StateType, useAppDispatch } from 'lib/store'+import UIActions from 'lib/reducers/ui'import { useSelector } from 'react-redux'const SwetrixSDK = require('@swetrix/sdk')diff --git a/web/app/pages/Project/View/components/AddAViewModal.tsx b/web/app/pages/Project/View/components/AddAViewModal.tsxindex 1f771bfcc..8dc2fb5b3 100644--- a/web/app/pages/Project/View/components/AddAViewModal.tsx+++ b/web/app/pages/Project/View/components/AddAViewModal.tsx@@ -11,7 +11,7 @@ import { toast } from 'sonner'import Modal from 'ui/Modal'import Select from 'ui/Select'import Combobox from 'ui/Combobox'-import { FILTERS_PANELS_ORDER } from 'redux/constants'+import { FILTERS_PANELS_ORDER } from 'lib/constants'import countries from 'utils/isoCountries'import { getFilters, createProjectView, updateProjectView } from 'api'import { Filter } from './Filters'diff --git a/web/app/pages/Project/View/components/FunnelsList.tsx b/web/app/pages/Project/View/components/FunnelsList.tsxindex 232431d94..a0ac4dff8 100644--- a/web/app/pages/Project/View/components/FunnelsList.tsx+++ b/web/app/pages/Project/View/components/FunnelsList.tsx@@ -3,7 +3,7 @@ import _map from 'lodash/map'import cx from 'clsx'import { useTranslation } from 'react-i18next'import { AdjustmentsVerticalIcon, PlusCircleIcon, TrashIcon } from '@heroicons/react/24/outline'-import { Funnel } from 'redux/models/Project'+import { Funnel } from 'lib/models/Project'interface FunnelsListProps {funnels?: any[]diff --git a/web/app/pages/Project/View/components/InteractiveMap.tsx b/web/app/pages/Project/View/components/InteractiveMap.tsxindex b4a6a8071..dfbb6c586 100644--- a/web/app/pages/Project/View/components/InteractiveMap.tsx+++ b/web/app/pages/Project/View/components/InteractiveMap.tsx@@ -4,10 +4,10 @@ import _map from 'lodash/map'import _reduce from 'lodash/reduce'import { useTranslation } from 'react-i18next'import countries from 'utils/isoCountries'-import { PROJECT_TABS } from 'redux/constants'+import { PROJECT_TABS } from 'lib/constants'import { getTimeFromSeconds, getStringFromTime, nFormatter } from 'utils/generic'-import { Entry } from 'redux/models/Entry'+import { Entry } from 'lib/models/Entry'import countriesList from 'utils/countries'import { useSearchParams } from '@remix-run/react'diff --git a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsxindex e3fe66b4c..cbb3bcede 100644--- a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx+++ b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx@@ -9,7 +9,7 @@ import PulsatingCircle from 'ui/icons/PulsatingCircle'import Flag from 'ui/Flag'import { useViewProjectContext } from '../ViewProject'import { Link } from '@remix-run/react'-import { PROJECT_TABS } from 'redux/constants'+import { PROJECT_TABS } from 'lib/constants'interface LiveVisitorsDropdownProps {live: number | stringdiff --git a/web/app/pages/Project/View/components/LockedDashboard.tsx b/web/app/pages/Project/View/components/LockedDashboard.tsxindex 1e816f90f..cd0093f89 100644--- a/web/app/pages/Project/View/components/LockedDashboard.tsx+++ b/web/app/pages/Project/View/components/LockedDashboard.tsx@@ -1,8 +1,8 @@import React, { useMemo } from 'react'import { LockClosedIcon } from '@heroicons/react/24/outline'import { Link } from '@remix-run/react'-import { User, DashboardBlockReason } from 'redux/models/User'-import { ProjectForShared } from 'redux/models/SharedProject'+import { User, DashboardBlockReason } from 'lib/models/User'+import { ProjectForShared } from 'lib/models/SharedProject'import { useTranslation } from 'react-i18next'import routes from 'utils/routes'diff --git a/web/app/pages/Project/View/components/MetricCards.tsx b/web/app/pages/Project/View/components/MetricCards.tsxindex 247f14f72..696f9f3d2 100644--- a/web/app/pages/Project/View/components/MetricCards.tsx+++ b/web/app/pages/Project/View/components/MetricCards.tsx@@ -7,10 +7,10 @@ import _isEmpty from 'lodash/isEmpty'import _isNumber from 'lodash/isNumber'import _map from 'lodash/map'import { nFormatter, getStringFromTime, getTimeFromSeconds } from 'utils/generic'-import { OverallObject, OverallPerformanceObject } from 'redux/models/Project'+import { OverallObject, OverallPerformanceObject } from 'lib/models/Project'import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'import { Badge } from 'ui/Badge'-import { MonitorOverallObject } from 'redux/models/Uptime'+import { MonitorOverallObject } from 'lib/models/Uptime'interface MetricCardProps {label: stringdiff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsxindex 3cea095b0..4d5d4d803 100644--- a/web/app/pages/Project/View/components/SearchFilters.tsx+++ b/web/app/pages/Project/View/components/SearchFilters.tsx@@ -9,7 +9,7 @@ import Modal from 'ui/Modal'import Checkbox from 'ui/Checkbox'import Select from 'ui/Select'import Combobox from 'ui/Combobox'-import { FILTERS_PANELS_ORDER, ERRORS_FILTERS_PANELS_ORDER } from 'redux/constants'+import { FILTERS_PANELS_ORDER, ERRORS_FILTERS_PANELS_ORDER } from 'lib/constants'import countries from 'utils/isoCountries'import { getFilters, getErrorsFilters } from 'api'import { Filter } from './Filters'diff --git a/web/app/pages/Project/View/components/TBPeriodSelector.tsx b/web/app/pages/Project/View/components/TBPeriodSelector.tsxindex c6d3da489..8533a89e1 100644--- a/web/app/pages/Project/View/components/TBPeriodSelector.tsx+++ b/web/app/pages/Project/View/components/TBPeriodSelector.tsx@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'import _map from 'lodash/map'import _includes from 'lodash/includes'import cx from 'clsx'-import { ALL_PERIODS } from 'redux/constants'+import { ALL_PERIODS } from 'lib/constants'interface TBPeriodSelectorProps {title: string | number | React.ReactNodediff --git a/web/app/pages/Project/View/components/UserFlow.tsx b/web/app/pages/Project/View/components/UserFlow.tsxindex 425641a4f..8f87da9d0 100644--- a/web/app/pages/Project/View/components/UserFlow.tsx+++ b/web/app/pages/Project/View/components/UserFlow.tsx@@ -2,11 +2,11 @@ import { useEffect, useState } from 'react'import { toast } from 'sonner'import { ResponsiveSankey } from '@nivo/sankey'import { connect } from 'react-redux'-import { StateType, AppDispatch } from 'redux/store'-import UIActions from 'redux/reducers/ui'-import { IUserFlow } from 'redux/models/UserFlow'+import { StateType, AppDispatch } from 'lib/store'+import UIActions from 'lib/reducers/ui'+import { IUserFlow } from 'lib/models/UserFlow'import _isEmpty from 'lodash/isEmpty'-import { getUserFlowCacheKey } from 'redux/constants'+import { getUserFlowCacheKey } from 'lib/constants'import { getUserFlow } from 'api'import Loader from 'ui/Loader'import { Filter } from '../interfaces/traffic'diff --git a/web/app/pages/Project/View/components/WaitingForAnError.tsx b/web/app/pages/Project/View/components/WaitingForAnError.tsxindex abfdfb3b1..ee56d0ee1 100644--- a/web/app/pages/Project/View/components/WaitingForAnError.tsx+++ b/web/app/pages/Project/View/components/WaitingForAnError.tsx@@ -2,7 +2,7 @@ import { BugAntIcon } from '@heroicons/react/24/outline'import { Link } from '@remix-run/react'import { useTranslation, Trans } from 'react-i18next'import routes from 'utils/routes'-import { ERROR_TRACKING_DOCS_URL } from 'redux/constants'+import { ERROR_TRACKING_DOCS_URL } from 'lib/constants'const TROUBLESHOOTING_URL = 'https://docs.swetrix.com/troubleshooting'diff --git a/web/app/pages/Project/View/components/WaitingForAnEvent.tsx b/web/app/pages/Project/View/components/WaitingForAnEvent.tsxindex 245c5a678..e1e617fca 100644--- a/web/app/pages/Project/View/components/WaitingForAnEvent.tsx+++ b/web/app/pages/Project/View/components/WaitingForAnEvent.tsx@@ -1,7 +1,7 @@import React, { useState } from 'react'import { Link } from '@remix-run/react'-import { User } from 'redux/models/User'-import { ProjectForShared } from 'redux/models/SharedProject'+import { User } from 'lib/models/User'+import { ProjectForShared } from 'lib/models/SharedProject'import { useTranslation, Trans } from 'react-i18next'import routes from 'utils/routes'import PulsatingCircle from 'ui/icons/PulsatingCircle'diff --git a/web/app/pages/Project/uptime/Settings.tsx b/web/app/pages/Project/uptime/Settings.tsxindex 2a8cc6d1d..73d2dd8be 100644--- a/web/app/pages/Project/uptime/Settings.tsx+++ b/web/app/pages/Project/uptime/Settings.tsx@@ -15,14 +15,14 @@ import { clsx as cx } from 'clsx'import Input from 'ui/Input'import Button from 'ui/Button'import Modal from 'ui/Modal'-import { PROJECT_TABS } from 'redux/constants'+import { PROJECT_TABS } from 'lib/constants'import { createMonitor, updateMonitor, deleteMonitor, CreateMonitor, getProjectMonitor } from 'api'import { withAuthentication, auth } from 'hoc/protected'import routes from 'utils/routes'-import { Monitor } from 'redux/models/Uptime'+import { Monitor } from 'lib/models/Uptime'import { useSelector } from 'react-redux'import { toast } from 'sonner'-import { StateType } from 'redux/store'+import { StateType } from 'lib/store'import { useRequiredParams } from 'hooks/useRequiredParams'import Select from 'ui/Select'import { formatTime } from 'utils/date'diff --git a/web/app/pages/Project/uptime/View.tsx b/web/app/pages/Project/uptime/View.tsxindex 313fe7eb8..3ce5d142a 100644--- a/web/app/pages/Project/uptime/View.tsx+++ b/web/app/pages/Project/uptime/View.tsx@@ -25,10 +25,10 @@ import routes from 'utils/routes'import Button from 'ui/Button'import Modal from 'ui/Modal'import PaidFeature from 'modals/PaidFeature'-import { DEFAULT_MONITORS_TAKE, PLAN_LIMITS, tbPeriodPairs, UPTIME_PERIOD_PAIRS } from 'redux/constants'+import { DEFAULT_MONITORS_TAKE, PLAN_LIMITS, tbPeriodPairs, UPTIME_PERIOD_PAIRS } from 'lib/constants'import { deleteMonitor as deleteMonitorApi, getMonitorOverallStats, getMonitorStats, getProjectMonitors } from 'api'-import { StateType } from 'redux/store'-import { Monitor, MonitorOverallObject } from 'redux/models/Uptime'+import { StateType } from 'lib/store'+import { Monitor, MonitorOverallObject } from 'lib/models/Uptime'import { useViewProjectContext } from '../View/ViewProject'import { getFormatDate, getSettingsUptime } from '../View/ViewProject.helpers'import TBPeriodSelector from '../View/components/TBPeriodSelector'diff --git a/web/app/pages/UserSettings/components/Integrations.tsx b/web/app/pages/UserSettings/components/Integrations.tsxindex 3895b0b3e..763a6ba3b 100644--- a/web/app/pages/UserSettings/components/Integrations.tsx+++ b/web/app/pages/UserSettings/components/Integrations.tsx@@ -12,10 +12,10 @@ import Telegram from 'ui/icons/Telegram'import Slack from 'ui/icons/Slack'import Discord from 'ui/icons/Discord'import { removeTgIntegration } from 'api'-import { User } from 'redux/models/User'-import { StateType, useAppDispatch } from 'redux/store'+import { User } from 'lib/models/User'+import { StateType, useAppDispatch } from 'lib/store'import { useSelector } from 'react-redux'-import { authActions } from 'redux/reducers/auth'+import { authActions } from 'lib/reducers/auth'const getAvailableIntegrations = (t: typeof i18next.t,diff --git a/web/app/pages/UserSettings/components/Organisations.tsx b/web/app/pages/UserSettings/components/Organisations.tsxindex ca1689f30..58a2d74f3 100644--- a/web/app/pages/UserSettings/components/Organisations.tsx+++ b/web/app/pages/UserSettings/components/Organisations.tsx@@ -8,9 +8,9 @@ import _filter from 'lodash/filter'import Button from 'ui/Button'import Modal from 'ui/Modal'import { rejectOrganisationInvitation, acceptOrganisationInvitation } from 'api'-import { OrganisationMembership } from 'redux/models/Organisation'-import { StateType, useAppDispatch } from 'redux/store'-import { authActions } from 'redux/reducers/auth'+import { OrganisationMembership } from 'lib/models/Organisation'+import { StateType, useAppDispatch } from 'lib/store'+import { authActions } from 'lib/reducers/auth'import { useSelector } from 'react-redux'interface OrganisationsProps {diff --git a/web/app/pages/UserSettings/components/ProjectList.tsx b/web/app/pages/UserSettings/components/ProjectList.tsxindex 0a4a744b3..60fc7fbcc 100644--- a/web/app/pages/UserSettings/components/ProjectList.tsx+++ b/web/app/pages/UserSettings/components/ProjectList.tsx@@ -8,9 +8,9 @@ import _filter from 'lodash/filter'import Button from 'ui/Button'import Modal from 'ui/Modal'import { rejectProjectShare, acceptProjectShare } from 'api'-import { SharedProject } from 'redux/models/SharedProject'-import { StateType, useAppDispatch } from 'redux/store'-import { authActions } from 'redux/reducers/auth'+import { SharedProject } from 'lib/models/SharedProject'+import { StateType, useAppDispatch } from 'lib/store'+import { authActions } from 'lib/reducers/auth'import { useSelector } from 'react-redux'interface ProjectListProps {diff --git a/web/app/pages/UserSettings/components/Referral.tsx b/web/app/pages/UserSettings/components/Referral.tsxindex 5639a75ca..2c2d92b89 100644--- a/web/app/pages/UserSettings/components/Referral.tsx+++ b/web/app/pages/UserSettings/components/Referral.tsx@@ -20,12 +20,12 @@ import {BillingFrequency,MERCHANT_FEE,REFERRAL_CUT,-} from 'redux/constants'+} from 'lib/constants'import { isValidEmail } from 'utils/validator'import { useSelector } from 'react-redux'-import { StateType, useAppDispatch } from 'redux/store'-import UIActions from 'redux/reducers/ui'-import { authActions } from 'redux/reducers/auth'+import { StateType, useAppDispatch } from 'lib/store'+import UIActions from 'lib/reducers/ui'+import { authActions } from 'lib/reducers/auth'const Referral = () => {const { user } = useSelector((state: StateType) => state.auth)diff --git a/web/app/pages/UserSettings/components/Socialisations.tsx b/web/app/pages/UserSettings/components/Socialisations.tsxindex 9a8ad8f59..a66ff3ff4 100644--- a/web/app/pages/UserSettings/components/Socialisations.tsx+++ b/web/app/pages/UserSettings/components/Socialisations.tsx@@ -8,12 +8,12 @@ import Button from 'ui/Button'import Google from 'ui/icons/GoogleG'import GithubDark from 'ui/icons/GithubDark'import GithubLight from 'ui/icons/GithubLight'-import { User } from 'redux/models/User'-import { SSO_PROVIDERS } from 'redux/constants'-import { StateType, useAppDispatch } from 'redux/store'+import { User } from 'lib/models/User'+import { SSO_PROVIDERS } from 'lib/constants'+import { StateType, useAppDispatch } from 'lib/store'import { useSelector } from 'react-redux'import { authMe, generateSSOAuthURL, linkBySSOHash, unlinkSSO } from 'api'-import { authActions } from 'redux/reducers/auth'+import { authActions } from 'lib/reducers/auth'import { delay, openBrowserWindow } from 'utils/generic'const AVAILABLE_SSO_PROVIDERS = [diff --git a/web/app/pages/UserSettings/components/TwoFA.tsx b/web/app/pages/UserSettings/components/TwoFA.tsxindex f68165e09..16a9caf42 100644--- a/web/app/pages/UserSettings/components/TwoFA.tsx+++ b/web/app/pages/UserSettings/components/TwoFA.tsx@@ -11,9 +11,9 @@ import Button from 'ui/Button'import { generate2FA, enable2FA, disable2FA } from 'api'import { setAccessToken } from 'utils/accessToken'import { setRefreshToken } from 'utils/refreshToken'-import { StateType, useAppDispatch } from 'redux/store'+import { StateType, useAppDispatch } from 'lib/store'import { useSelector } from 'react-redux'-import { authActions } from 'redux/reducers/auth'+import { authActions } from 'lib/reducers/auth'const TwoFA = () => {const dispatch = useAppDispatch()