Skip to content

📈 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!

Move project providers to root project folder

Blue Mousea476d7505efe
diff --git a/web/app/pages/Captcha/View/ViewCaptcha.tsx b/web/app/pages/Captcha/View/ViewCaptcha.tsx
index 9e45914ff..3fd1e105e 100644
--- a/web/app/pages/Captcha/View/ViewCaptcha.tsx
+++ b/web/app/pages/Captcha/View/ViewCaptcha.tsx
@@ -36,8 +36,8 @@ import {
DEFAULT_TIMEZONE,
} from '~/lib/constants'
import { StateType } from '~/lib/store'
+import { useCurrentProject } from '~/pages/Project/providers/CurrentProjectProvider'
import { Panel } from '~/pages/Project/View/Panels'
-import { useCurrentProject } from '~/pages/Project/View/providers/CurrentProjectProvider'
import { parseFiltersFromUrl } from '~/pages/Project/View/utils/filters'
import { ViewProjectContext } from '~/pages/Project/View/ViewProject'
import { deviceIconMapping, onCSVExportClick } from '~/pages/Project/View/ViewProject.helpers'
diff --git a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx
index 4d37dc25e..20045ccb1 100644
--- a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx
+++ b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx
@@ -30,7 +30,7 @@ import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
import routes from '~/utils/routes'
-import { useCurrentProject } from '../../View/providers/CurrentProjectProvider'
+import { useCurrentProject } from '../../providers/CurrentProjectProvider'
const Separator = ({ className }: { className?: string }) => (
<svg viewBox='0 0 2 2' className={cx('h-0.5 w-0.5 flex-none fill-gray-400', className)}>
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index c0b4f6d31..9d059c527 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -133,6 +133,7 @@ import { getItem, setItem } from '~/utils/localstorage'
import routes from '~/utils/routes'
import ProjectAlertsView from '../Alerts/View'
+import { useCurrentProject, useProjectPassword } from '../providers/CurrentProjectProvider'
import AddAViewModal from './components/AddAViewModal'
import BrowserDropdown from './components/BrowserDropdown'
@@ -175,7 +176,6 @@ import {
TrafficLogResponse,
} from './interfaces/traffic'
import { Panel, Metadata } from './Panels'
-import { useCurrentProject, useProjectPassword } from './providers/CurrentProjectProvider'
import {
handleNavigationParams,
updateFilterState,
diff --git a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx
index 6e0749554..38ca27eea 100644
--- a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx
+++ b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx
@@ -10,7 +10,7 @@ import { PROJECT_TABS } from '~/lib/constants'
import Flag from '~/ui/Flag'
import PulsatingCircle from '~/ui/icons/PulsatingCircle'
-import { useCurrentProject, useProjectPassword } from '../providers/CurrentProjectProvider'
+import { useCurrentProject, useProjectPassword } from '../../providers/CurrentProjectProvider'
interface LiveVisitorsDropdownProps {
live: number | string
diff --git a/web/app/pages/Project/View/components/UserFlow.tsx b/web/app/pages/Project/View/components/UserFlow.tsx
index c48a3f8dd..bcd729efa 100644
--- a/web/app/pages/Project/View/components/UserFlow.tsx
+++ b/web/app/pages/Project/View/components/UserFlow.tsx
@@ -8,7 +8,7 @@ import { getUserFlow } from '~/api'
import { UserFlowType } from '~/lib/models/UserFlow'
import Loader from '~/ui/Loader'
-import { useCurrentProject, useProjectPassword } from '../providers/CurrentProjectProvider'
+import { useCurrentProject, useProjectPassword } from '../../providers/CurrentProjectProvider'
import { useViewProjectContext } from '../ViewProject'
import { getFormatDate } from '../ViewProject.helpers'
diff --git a/web/app/pages/Project/View/utils/cache.ts b/web/app/pages/Project/View/utils/cache.ts
index 47a7cfbce..36b083487 100644
--- a/web/app/pages/Project/View/utils/cache.ts
+++ b/web/app/pages/Project/View/utils/cache.ts
@@ -2,7 +2,7 @@ import { isBrowser, LS_PROJECTS_PROTECTED_KEY, LS_VIEW_PREFS_SETTING } from '~/l
import { type Project } from '~/lib/models/Project'
import { getItem, removeItem, setItem } from '~/utils/localstorage'
-import { ProjectPreferences } from '../providers/CurrentProjectProvider'
+import { ProjectPreferences } from '../../providers/CurrentProjectProvider'
import { filterInvalidPreferences } from './filters'
diff --git a/web/app/pages/Project/View/utils/filters.tsx b/web/app/pages/Project/View/utils/filters.tsx
index 3167947e8..e8d48946e 100644
--- a/web/app/pages/Project/View/utils/filters.tsx
+++ b/web/app/pages/Project/View/utils/filters.tsx
@@ -6,8 +6,8 @@ import _some from 'lodash/some'
import _startsWith from 'lodash/startsWith'
import React from 'react'
+import { ProjectPreferences } from '../../providers/CurrentProjectProvider'
import { Filter } from '../interfaces/traffic'
-import { ProjectPreferences } from '../providers/CurrentProjectProvider'
export const ERROR_FILTERS_MAPPING = {
showResolved: 'showResolved',
diff --git a/web/app/pages/Project/View/providers/CurrentProjectProvider.tsx b/web/app/pages/Project/providers/CurrentProjectProvider.tsx
similarity index 98%
rename from web/app/pages/Project/View/providers/CurrentProjectProvider.tsx
rename to web/app/pages/Project/providers/CurrentProjectProvider.tsx
index 824460a78..758681937 100644
--- a/web/app/pages/Project/View/providers/CurrentProjectProvider.tsx
+++ b/web/app/pages/Project/providers/CurrentProjectProvider.tsx
@@ -12,8 +12,8 @@ import { type StateType } from '~/lib/store'
import { getItem, removeItem } from '~/utils/localstorage'
import routes from '~/utils/routes'
-import { getProjectPreferences, setProjectPreferences } from '../utils/cache'
-import { CHART_METRICS_MAPPING } from '../ViewProject.helpers'
+import { getProjectPreferences, setProjectPreferences } from '../View/utils/cache'
+import { CHART_METRICS_MAPPING } from '../View/ViewProject.helpers'
interface CurrentProjectContextType {
id: string
diff --git a/web/app/routes/captchas.$id.tsx b/web/app/routes/captchas.$id.tsx
index 01206f20a..2a37e5445 100644
--- a/web/app/routes/captchas.$id.tsx
+++ b/web/app/routes/captchas.$id.tsx
@@ -3,7 +3,7 @@ import { useLoaderData } from 'react-router'
import { useRequiredParams } from '~/hooks/useRequiredParams'
import ViewCaptcha from '~/pages/Captcha/View'
-import { CurrentProjectProvider } from '~/pages/Project/View/providers/CurrentProjectProvider'
+import { CurrentProjectProvider } from '~/pages/Project/providers/CurrentProjectProvider'
import ProjectViewStyle from '~/styles/ProjectViewStyle.css?url'
import { detectTheme } from '~/utils/server'
diff --git a/web/app/routes/projects.$id.tsx b/web/app/routes/projects.$id.tsx
index dfa65e5d1..b51fac2df 100644
--- a/web/app/routes/projects.$id.tsx
+++ b/web/app/routes/projects.$id.tsx
@@ -3,8 +3,8 @@ import { type LinksFunction, type LoaderFunctionArgs, type MetaFunction } from '
import { useRequiredParams } from '~/hooks/useRequiredParams'
import { API_URL } from '~/lib/constants'
+import { CurrentProjectProvider } from '~/pages/Project/providers/CurrentProjectProvider'
import ViewProject from '~/pages/Project/View'
-import { CurrentProjectProvider } from '~/pages/Project/View/providers/CurrentProjectProvider'
import ProjectViewStyle from '~/styles/ProjectViewStyle.css?url'
import { detectTheme, isEmbedded, isAuthenticated, getProjectTabs } from '~/utils/server'