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!

added tabs for dashboaard

kruzhambusbb76e6a390d7
diff --git a/src/api/index.js b/src/api/index.js
index b31e94227..94f6dfdf4 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -173,6 +173,17 @@ export const getProjects = (take = 0, skip = 0) =>
: error.response.data.message
})
+export const getSharedProjects = (take = 0, skip = 0) =>
+ api
+ .get(`/project/shared?take=${take}&skip=${skip}`)
+ .then((response) => response.data)
+ .catch((error) => {
+ debug('%s', error)
+ throw _isEmpty(error.response.data?.message)
+ ? error.response.data
+ : error.response.data.message
+ })
+
export const getProject = (pid) =>
api
.get(`/project/${pid}`)
diff --git a/src/pages/Dashboard/Dashboard.container.jsx b/src/pages/Dashboard/Dashboard.container.jsx
index e01d47602..47a643a3b 100644
--- a/src/pages/Dashboard/Dashboard.container.jsx
+++ b/src/pages/Dashboard/Dashboard.container.jsx
@@ -33,6 +33,9 @@ const mapDispatchToProps = (dispatch) => ({
loadProjects: (take, skip) => {
dispatch(UIActions.loadProjects(take, skip))
},
+ loadSharedProjects: (take, skip) => {
+ dispatch(UIActions.loadSharedProjects(take, skip))
+ },
setDashboardPaginationPage: (page) => {
dispatch(UIActions.setDashboardPaginationPage(page))
},
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsx
index d18990f10..8b2818b94 100644
--- a/src/pages/Dashboard/Dashboard.jsx
+++ b/src/pages/Dashboard/Dashboard.jsx
@@ -25,7 +25,9 @@ import Loader from 'ui/Loader'
import { ActivePin, InactivePin, WarningPin } from 'ui/Pin'
import PulsatingCircle from 'ui/icons/PulsatingCircle'
import routes from 'routes'
-import { isSelfhosted, ENTRIES_PER_PAGE_DASHBOARD } from 'redux/constants'
+import {
+ isSelfhosted, ENTRIES_PER_PAGE_DASHBOARD, tabsForDashboard, tabForOwnedProject, tabForSharedProject,
+} from 'redux/constants'
import EventsRunningOutBanner from 'components/EventsRunningOutBanner'
import { acceptShareProject } from 'api'
@@ -172,12 +174,12 @@ const NoProjects = ({ t }) => (
)
const Dashboard = ({
- projects, isLoading, error, user, deleteProjectFailed, setProjectsShareData, setUserShareData, userSharedUpdate, sharedProjectError, loadProjects, total, setDashboardPaginationPage, dashboardPaginationPage,
+ projects, isLoading, error, user, deleteProjectFailed, setProjectsShareData, setUserShareData, userSharedUpdate, sharedProjectError, loadProjects, loadSharedProjects, total, setDashboardPaginationPage, dashboardPaginationPage,
}) => {
const { t, i18n: { language } } = useTranslation('common')
const [showActivateEmailModal, setShowActivateEmailModal] = useState(false)
const history = useHistory()
-
+ const [tabProjects, setTabProjects] = useState(tabForOwnedProject)
const pageAmount = useMemo(() => _ceil(total / ENTRIES_PER_PAGE_DASHBOARD), [total])
const onNewProject = () => {
@@ -193,6 +195,12 @@ const Dashboard = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [dashboardPaginationPage])
+ useEffect(() => {
+ if (tabProjects === tabForSharedProject) {
+ loadSharedProjects(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD)
+ }
+ }, [tabProjects, tabForSharedProject])
+
if (error && !isLoading) {
return (
<Title title={t('titles.dashboard')}>
@@ -220,24 +228,74 @@ const Dashboard = ({
<div className='flex flex-col py-6 px-4 sm:px-6 lg:px-8'>
<div className='max-w-7xl w-full mx-auto'>
<div className='flex justify-between'>
- <h2 className='mt-2 text-3xl font-extrabold text-gray-900 dark:text-gray-50'>
+ <h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>
{t('titles.dashboard')}
</h2>
<span onClick={onNewProject} className='inline-flex cursor-pointer items-center border border-transparent leading-4 font-medium rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 px-4 py-2 text-sm'>
{t('dashboard.newProject')}
</span>
</div>
+ <div className='mt-6'>
+ <nav className='-mb-px flex space-x-8'>
+ {_map(tabsForDashboard, (tab) => (
+ <button
+ key={tab.name}
+ type='button'
+ onClick={() => setTabProjects(tab.name)}
+ className={cx(
+ tabProjects === tab.name
+ ? 'border-indigo-500 text-indigo-600'
+ : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300',
+ 'whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-md',
+ )}
+ aria-current={tab.name === tabProjects ? 'page' : undefined}
+ >
+ {t(tab.label)}
+ </button>
+ ))}
+ </nav>
+ </div>
{_isEmpty(projects) ? (
<NoProjects t={t} />
) : (
- <div className='shadow overflow-hidden sm:rounded-md mt-10'>
- <ul className='divide-y divide-gray-200 dark:divide-gray-500'>
- {_map(_filter(projects, ({ uiHidden }) => !uiHidden), ({
- name, id, created, active, overall, live, public: isPublic, confirmed, shared,
- }) => (
- <div key={confirmed ? `${id}-confirmed` : id}>
- {
- !(dashboardPaginationPage > 1 && shared) && (
+ <div className='shadow overflow-hidden sm:rounded-md'>
+ {tabProjects === tabForOwnedProject && (
+ <ul className='divide-y divide-gray-200 dark:divide-gray-500'>
+ {_map(_filter(projects, ({ uiHidden }) => !uiHidden), ({
+ name, id, created, active, overall, live, public: isPublic, confirmed, shared,
+ }) => (
+ <div key={confirmed ? `${id}-confirmed` : id}>
+ <ProjectCart
+ t={t}
+ id={id}
+ language={language}
+ name={name}
+ created={created}
+ shared={shared}
+ active={active}
+ isPublic={isPublic}
+ overall={overall}
+ confirmed={confirmed}
+ sharedProjects={user.sharedProjects}
+ setProjectsShareData={setProjectsShareData}
+ setUserShareData={setUserShareData}
+ live={_isNumber(live) ? live : 'N/A'}
+ userSharedUpdate={userSharedUpdate}
+ sharedProjectError={sharedProjectError}
+ deleteProjectFailed={deleteProjectFailed}
+ />
+ </div>
+ ))}
+ </ul>
+ )}
+
+ {tabProjects === tabForSharedProject && (
+ <ul className='divide-y divide-gray-200 dark:divide-gray-500'>
+ {_map(_filter(projects, ({ uiHidden }) => !uiHidden), ({
+ name, id, created, active, overall, live, public: isPublic, confirmed, shared,
+ }) => (
+ <div key={confirmed ? `${id}-confirmed` : id}>
+ {
(_isUndefined(confirmed) || confirmed) ? (
<Link to={_replace(routes.project, ':id', id)}>
<ProjectCart
@@ -274,11 +332,11 @@ const Dashboard = ({
deleteProjectFailed={deleteProjectFailed}
/>
)
- )
- }
- </div>
- ))}
- </ul>
+ }
+ </div>
+ ))}
+ </ul>
+ )}
</div>
)}
diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.js
index e0455eb75..42f70e801 100644
--- a/src/redux/actions/ui/index.js
+++ b/src/redux/actions/ui/index.js
@@ -5,6 +5,11 @@ const loadProjects = (take, skip) => ({
payload: { take, skip },
})
+const loadSharedProjects = (take, skip) => ({
+ type: types.LOAD_SHARED_PROJECTS,
+ payload: { take, skip },
+})
+
const setProjects = (projects) => ({
type: types.SET_PROJECTS,
payload: {
@@ -139,6 +144,7 @@ const shareVerifyAsync = (data, successfulCallback, errorCallback) => ({
const UIActions = {
loadProjects,
+ loadSharedProjects,
setProjects,
setProjectsError,
setProjectsLoading,
diff --git a/src/redux/actions/ui/types.js b/src/redux/actions/ui/types.js
index fb4943e18..d064cde9d 100644
--- a/src/redux/actions/ui/types.js
+++ b/src/redux/actions/ui/types.js
@@ -19,4 +19,5 @@ export const types = {
SET_SHOW_NO_EVENTS_LEFT: 'UI_SET_SHOW_NO_EVENTS_LEFT',
SET_PROJECTS_SHARE_DATA: 'UI_SET_PROJECTS_SHARE_DATA',
SHARE_VERIFY_ASYNC: 'UI_SHARE_VERIFY_ASYNC',
+ LOAD_SHARED_PROJECTS: 'UI_LOAD_SHARED_PROJECTS',
}
diff --git a/src/redux/constants/index.js b/src/redux/constants/index.js
index 4deae4a6c..fdb48e323 100644
--- a/src/redux/constants/index.js
+++ b/src/redux/constants/index.js
@@ -150,6 +150,8 @@ export const paddleLanguageMapping = {
el: 'en',
}
+// dashboard && projects
+
export const roles = ['admin', 'viewer']
export const roleViewer = {
@@ -164,5 +166,19 @@ export const roleAdmin = {
description: 'Can manage the project',
}
+export const tabForOwnedProject = 'owned'
+export const tabForSharedProject = 'shared'
+
+export const tabsForDashboard = [
+ {
+ name: tabForOwnedProject,
+ label: 'Owned projects',
+ },
+ {
+ name: tabForSharedProject,
+ label: 'profileSettings.shared',
+ },
+]
+
export const INVITATION_EXPIRES_IN = 48 // hours
export const ENTRIES_PER_PAGE_DASHBOARD = 10
diff --git a/src/redux/sagas/ui/index.js b/src/redux/sagas/ui/index.js
index 7533ccdcf..64fcc6a23 100644
--- a/src/redux/sagas/ui/index.js
+++ b/src/redux/sagas/ui/index.js
@@ -10,6 +10,7 @@ import setProjectViewPrefs from './set_project_view_prefs'
import isEventsAvailable from './worker_is_events_available'
import shareVerify from './share_verify'
import logout from './logout'
+import loadSharedProjects from './load_shared_projects'
function* mainUISaga() {
yield fork(initialise)
@@ -18,6 +19,7 @@ function* mainUISaga() {
// yield fork(generalStats)
yield takeEvery(types.SET_PROJECT_VIEW_PREFS, setProjectViewPrefs)
yield takeEvery(types.LOAD_PROJECTS, loadProjects)
+ yield takeEvery(types.LOAD_SHARED_PROJECTS, loadSharedProjects)
yield takeEvery(authTypes.LOGOUT, logout)
yield takeLatest(types.SHARE_VERIFY_ASYNC, shareVerify)
}
diff --git a/src/redux/sagas/ui/load_shared_projects.js b/src/redux/sagas/ui/load_shared_projects.js
new file mode 100644
index 000000000..952ce105a
--- /dev/null
+++ b/src/redux/sagas/ui/load_shared_projects.js
@@ -0,0 +1,50 @@
+import { put, call } from 'redux-saga/effects'
+import _map from 'lodash/map'
+import _isString from 'lodash/isString'
+import Debug from 'debug'
+
+import UIActions from 'redux/actions/ui'
+
+import { ENTRIES_PER_PAGE_DASHBOARD } from 'redux/constants'
+import {
+ getSharedProjects, getOverallStats, getLiveVisitors,
+} from '../../../api'
+
+const debug = Debug('swetrix:rx:s:load-projects')
+
+export default function* loadSharedProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0 } }) {
+ try {
+ yield put(UIActions.setProjectsLoading(true))
+
+ let {
+ // eslint-disable-next-line prefer-const
+ results, totalMonthlyEvents, total,
+ } = yield call(getSharedProjects, take, skip)
+
+ const pids = _map(results, result => result.id)
+ let overall
+
+ try {
+ overall = yield call(getOverallStats, pids)
+ } catch (e) {
+ debug('failed to overall stats: %s', e)
+ }
+
+ results = _map(results, res => ({
+ ...res,
+ overall: overall?.[res.id],
+ }))
+
+ yield put(UIActions.setProjects(results))
+ yield put(UIActions.setTotalMonthlyEvents(totalMonthlyEvents))
+ yield put(UIActions.setTotal(total))
+
+ const liveStats = yield call(getLiveVisitors, pids)
+ yield put(UIActions.setLiveStats(liveStats))
+ } catch ({ message }) {
+ if (_isString(message)) {
+ yield put(UIActions.setProjectsError(message))
+ }
+ debug('failed to load projects: %s', message)
+ }
+}