📈 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
some improvments
kruzhambus7c647e4f90ec
diff --git a/src/api/index.ts b/src/api/index.tsindex 9ee28597e..134fc2637 100644--- a/src/api/index.ts+++ b/src/api/index.ts@@ -988,7 +988,7 @@ export const getUserFlow = (export const checkPassword = (pid: string, password: string) =>api.get(`project/password/${pid}`, {- data: {+ headers: {password,},})diff --git a/src/hoc/projectProtected.tsx b/src/hoc/projectProtected.tsxindex f86b0c022..38bb42785 100644--- a/src/hoc/projectProtected.tsx+++ b/src/hoc/projectProtected.tsx@@ -13,7 +13,7 @@ type PropsType = {export const withProjectProtected = <P extends PropsType>(WrappedComponent: any) => {const WithProjectProtected = (props: P) => {- const passwords = useSelector((state: StateType) => state.ui.projects.passwordHash)+ const passwords = useSelector((state: StateType) => state.ui.projects.password)const projects = useSelector((state: StateType) => state.ui.projects.projects)const { id }: {diff --git a/src/pages/Project/ProjectProtectedPassword/index.tsx b/src/pages/Project/ProjectProtectedPassword/index.tsxindex 9c14b8c4b..dc37451c8 100644--- a/src/pages/Project/ProjectProtectedPassword/index.tsx+++ b/src/pages/Project/ProjectProtectedPassword/index.tsx@@ -76,7 +76,7 @@ const ProjectProtectedPassword = (): JSX.Element => {.then((res) => {if (res) {setItem(PROJECTS_PROTECTED, data.password)- history.push(_replace(routes.project, { id }))+ history.push(_replace(routes.project, ':id', id))}setErrors({password: t('auth.common.wrongPassword'),diff --git a/src/pages/Project/Settings/ProjectSettings.tsx b/src/pages/Project/Settings/ProjectSettings.tsxindex 6b7c5a195..f363d0cbd 100644--- a/src/pages/Project/Settings/ProjectSettings.tsx+++ b/src/pages/Project/Settings/ProjectSettings.tsx@@ -167,7 +167,7 @@ const ProjectSettings = ({name?: string,origins?: string,ipBlacklist?: string,- passwordHash?: string,+ password?: string,}>({})const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)const [showDelete, setShowDelete] = useState<boolean>(false)@@ -296,7 +296,7 @@ const ProjectSettings = ({name?: string,origins?: string,ipBlacklist?: string,- passwordHash?: string,+ password?: string,} = {}if (_isEmpty(form.name)) {@@ -315,8 +315,8 @@ const ProjectSettings = ({allErrors.ipBlacklist = t('project.settings.oxCharsError', { amount: MAX_IPBLACKLIST_LENGTH })}- if (!_isEmpty(form?.passwordHash) && _size(form.passwordHash) > 0 && !isValidPassword(form?.passwordHash || '')) {- allErrors.passwordHash = t('auth.common.xCharsError', { amount: MIN_PASSWORD_CHARS })+ if (!_isEmpty(form?.password) && _size(form.password) > 0 && !isValidPassword(form?.password || '')) {+ allErrors.password = t('auth.common.xCharsError', { amount: MIN_PASSWORD_CHARS })}const valid = _isEmpty(_keys(allErrors))@@ -377,8 +377,8 @@ const ProjectSettings = ({isPasswordProtected: true,})- if (!_isEmpty(form.passwordHash) && !_isEmpty(form.id)) {- setProjectProtectedPassword(form?.id || '', form?.passwordHash || '')+ if (!_isEmpty(form.password) && !_isEmpty(form.id)) {+ setProjectProtectedPassword(form?.id || '', form?.password || '')}setShowProtected(false)@@ -574,15 +574,15 @@ const ProjectSettings = ({{t('project.settings.protectedHint')}</p><Input- name='passwordHash'- id='passwordHash'+ name='password'+ id='password'type='password'label={t('project.settings.password')}- value={form?.passwordHash || ''}+ value={form?.password || ''}placeholder={t('project.settings.password')}className='mt-4'onChange={handleInput}- error={beenSubmitted ? errors.passwordHash : null}+ error={beenSubmitted ? errors.password : null}/></div>)}diff --git a/src/pages/Project/View/ViewProject.container.tsx b/src/pages/Project/View/ViewProject.container.tsxindex 538b53052..21f4547da 100644--- a/src/pages/Project/View/ViewProject.container.tsx+++ b/src/pages/Project/View/ViewProject.container.tsx@@ -25,7 +25,7 @@ const mapStateToProps = (state: StateType) => {projectTab: state.ui.projects.projectTab,customEventsPrefs: state.ui.cache.customEventsPrefs,liveStats: state.ui.projects.liveStats,- passwordHash: state.ui.projects.passwordHash,+ password: state.ui.projects.password,}}@@ -43,7 +43,7 @@ const mapStateToProps = (state: StateType) => {projectTab: state.ui.projects.projectTab,customEventsPrefs: state.ui.cache.customEventsPrefs,liveStats: state.ui.projects.liveStats,- passwordHash: state.ui.projects.passwordHash,+ password: state.ui.projects.password,}}diff --git a/src/pages/Project/View/ViewProject.tsx b/src/pages/Project/View/ViewProject.tsxindex 9e9630090..899598c67 100644--- a/src/pages/Project/View/ViewProject.tsx+++ b/src/pages/Project/View/ViewProject.tsx@@ -89,7 +89,7 @@ interface IProjectView extends IProject {const ViewProject = ({projects, isLoading: _isLoading, showError, cache, cachePerf, setProjectCache, projectViewPrefs, setProjectViewPrefs, setPublicProject,setLiveStatsForProject, authenticated, timezone, user, sharedProjects, extensions, generateAlert, setProjectCachePerf,- projectTab, setProjectTab, setProjects, setProjectForcastCache, customEventsPrefs, setCustomEventsPrefs, liveStats, passwordHash,+ projectTab, setProjectTab, setProjects, setProjectForcastCache, customEventsPrefs, setCustomEventsPrefs, liveStats, password,}: {projects: IProjectView[],extensions: any,@@ -122,7 +122,7 @@ const ViewProject = ({customEventsPrefs: any,setCustomEventsPrefs: (pid: string, data: any) => void,liveStats: ILiveStats,- passwordHash: {+ password: {[key: string]: string,},}) => {@@ -152,7 +152,7 @@ const ViewProject = ({} = useParams()const history = useHistory()const project: IProjectForShared = useMemo(() => _find([...projects, ..._map(sharedProjects, (item) => ({ ...item.project, role: item.role }))], p => p.id === id) || {} as IProjectForShared, [projects, id, sharedProjects])- const projectPassword: string = useMemo(() => passwordHash[id] || getItem(PROJECTS_PROTECTED_PASSWORD)?.[id] || '', [id, passwordHash])+ const projectPassword: string = useMemo(() => password[id] || getItem(PROJECTS_PROTECTED_PASSWORD)?.[id] || '', [id, password])const isSharedProject = useMemo(() => {const foundProject = _find([..._map(sharedProjects, (item) => item.project)], p => p.id === id)return !_isEmpty(foundProject)diff --git a/src/redux/models/IProject.ts b/src/redux/models/IProject.tsindex 860926a85..2d96f65b1 100644--- a/src/redux/models/IProject.ts+++ b/src/redux/models/IProject.ts@@ -55,7 +55,7 @@ export interface IProject {isPublic?: booleanisTransferring?: booleanisPasswordProtected?: boolean- passwordHash?: string+ password?: string}export interface ICaptchaProject {diff --git a/src/redux/reducers/ui/projects.ts b/src/redux/reducers/ui/projects.tsindex 3cce39e4b..a9b1d2f82 100644--- a/src/redux/reducers/ui/projects.ts+++ b/src/redux/reducers/ui/projects.ts@@ -28,7 +28,7 @@ interface IInitialState {alerts: IAlerts[]subscribers: any[]liveStats: ILiveStats- passwordHash: {+ password: {[key: string]: string}}@@ -53,7 +53,7 @@ const initialState: IInitialState = {alerts: [],subscribers: [],liveStats: {},- passwordHash: getItem(PROJECTS_PROTECTED_PASSWORD) || {},+ password: getItem(PROJECTS_PROTECTED_PASSWORD) || {},}const projectsSlice = createSlice({@@ -203,11 +203,11 @@ const projectsSlice = createSlice({setProjectProtectedPassword: (state, { payload }: PayloadAction<{ id: string, password: string }>) => {const { id, password } = payload- state.passwordHash = {- ...state.passwordHash,+ state.password = {+ ...state.password,[id]: password,}- setItem(PROJECTS_PROTECTED_PASSWORD, JSON.stringify(state.passwordHash))+ setItem(PROJECTS_PROTECTED_PASSWORD, JSON.stringify(state.password))},reset(state) {state.projects = []