From b57ecf33e663fe7732e42babb6c4dc2ce031a5bc Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 6 Dec 2022 18:36:41 -0800 Subject: [PATCH] Updated roles and permissions logic. --- assets/arrow-right.svg | 2 +- assets/arrow-up-right-from-square.svg | 2 +- assets/bars.svg | 2 +- assets/chart-bar.svg | 2 +- assets/check.svg | 2 +- assets/chevron-down.svg | 2 +- assets/code.svg | 2 +- assets/external-link.svg | 2 +- assets/gear.svg | 2 +- assets/logo.svg | 3 +- assets/moon.svg | 2 +- assets/pen.svg | 2 +- assets/sun.svg | 2 +- assets/times.svg | 2 +- assets/user.svg | 2 +- assets/xmark.svg | 2 +- components/layout/Layout.js | 4 +- components/pages/WebsiteDetails.js | 4 +- interface/api/auth.d.ts | 8 -- interface/api/models.d.ts | 66 --------- interface/api/nextApi.d.ts | 14 -- interface/index.d.ts | 0 lib/auth.ts | 83 +++-------- lib/constants.ts | 46 ++++++ lib/middleware.js | 5 + lib/redis.js | 2 - lib/session.js | 2 +- lib/types.ts | 131 +++++++++++------- pages/api/auth/login.ts | 2 +- pages/api/auth/verify.ts | 2 +- pages/api/realtime/init.ts | 4 +- pages/api/realtime/update.ts | 4 +- pages/api/share/[id].ts | 2 +- pages/api/teams/[id]/index.ts | 8 +- pages/api/teams/[id]/{user.ts => users.ts} | 12 +- .../teams/[id]/{website.ts => websites.ts} | 12 +- pages/api/teams/index.ts | 19 +-- pages/api/users/[id]/index.ts | 10 +- pages/api/users/[id]/password.ts | 2 +- pages/api/users/[id]/role.ts | 62 --------- pages/api/users/[id]/websites.ts | 57 ++++++++ pages/api/users/index.ts | 15 +- pages/api/websites/[id]/active.ts | 4 +- pages/api/websites/[id]/eventdata.ts | 4 +- pages/api/websites/[id]/events.ts | 4 +- pages/api/websites/[id]/index.ts | 4 +- pages/api/websites/[id]/metrics.ts | 4 +- pages/api/websites/[id]/pageviews.ts | 3 +- pages/api/websites/[id]/reset.ts | 2 +- pages/api/websites/[id]/stats.ts | 4 +- pages/api/websites/index.ts | 16 +-- queries/admin/team.ts | 57 +++++--- queries/admin/teamUser.ts | 31 +++-- queries/admin/user.ts | 86 +++++++----- queries/admin/userRole.ts | 51 ------- queries/admin/website.ts | 54 ++------ queries/analytics/event/getEventData.ts | 8 +- queries/analytics/event/getEventMetrics.ts | 8 +- queries/analytics/event/saveEvent.ts | 7 +- .../analytics/pageview/getPageviewMetrics.ts | 8 +- .../analytics/pageview/getPageviewStats.ts | 6 +- queries/analytics/pageview/savePageView.ts | 7 +- queries/index.js | 1 - 63 files changed, 432 insertions(+), 546 deletions(-) delete mode 100644 interface/api/auth.d.ts delete mode 100644 interface/api/models.d.ts delete mode 100644 interface/api/nextApi.d.ts delete mode 100644 interface/index.d.ts rename pages/api/teams/[id]/{user.ts => users.ts} (81%) rename pages/api/teams/[id]/{website.ts => websites.ts} (78%) delete mode 100644 pages/api/users/[id]/role.ts create mode 100644 pages/api/users/[id]/websites.ts delete mode 100644 queries/admin/userRole.ts diff --git a/assets/arrow-right.svg b/assets/arrow-right.svg index 6fc93909..efc5d74a 100644 --- a/assets/arrow-right.svg +++ b/assets/arrow-right.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/arrow-up-right-from-square.svg b/assets/arrow-up-right-from-square.svg index 90ad457f..8f6de672 100644 --- a/assets/arrow-up-right-from-square.svg +++ b/assets/arrow-up-right-from-square.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/bars.svg b/assets/bars.svg index fdb2d6e4..ba383fa4 100644 --- a/assets/bars.svg +++ b/assets/bars.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/chart-bar.svg b/assets/chart-bar.svg index d1d72fdc..36820b76 100644 --- a/assets/chart-bar.svg +++ b/assets/chart-bar.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/check.svg b/assets/check.svg index 1a7abdce..65810c19 100644 --- a/assets/check.svg +++ b/assets/check.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/chevron-down.svg b/assets/chevron-down.svg index cb9d8fe1..69add632 100644 --- a/assets/chevron-down.svg +++ b/assets/chevron-down.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/code.svg b/assets/code.svg index cd29765e..0f8e0814 100644 --- a/assets/code.svg +++ b/assets/code.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/external-link.svg b/assets/external-link.svg index ed09306f..e24896b0 100644 --- a/assets/external-link.svg +++ b/assets/external-link.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/gear.svg b/assets/gear.svg index ab97a693..47805d46 100644 --- a/assets/gear.svg +++ b/assets/gear.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/logo.svg b/assets/logo.svg index f0e52261..d2c71326 100644 --- a/assets/logo.svg +++ b/assets/logo.svg @@ -1,2 +1 @@ - - + \ No newline at end of file diff --git a/assets/moon.svg b/assets/moon.svg index 6c8955ae..638286fd 100644 --- a/assets/moon.svg +++ b/assets/moon.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/pen.svg b/assets/pen.svg index 426c520c..b2979420 100644 --- a/assets/pen.svg +++ b/assets/pen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/sun.svg b/assets/sun.svg index ebc20eb2..3e487291 100644 --- a/assets/sun.svg +++ b/assets/sun.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/times.svg b/assets/times.svg index c528bcdd..261bb277 100644 --- a/assets/times.svg +++ b/assets/times.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/user.svg b/assets/user.svg index c0094666..62df2c42 100644 --- a/assets/user.svg +++ b/assets/user.svg @@ -1 +1 @@ -Asset 1 \ No newline at end of file + \ No newline at end of file diff --git a/assets/xmark.svg b/assets/xmark.svg index 340f479e..83bd5740 100644 --- a/assets/xmark.svg +++ b/assets/xmark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/components/layout/Layout.js b/components/layout/Layout.js index 2c097e41..0e4b2b61 100644 --- a/components/layout/Layout.js +++ b/components/layout/Layout.js @@ -1,4 +1,3 @@ -import React from 'react'; import Head from 'next/head'; import Header from 'components/layout/Header'; import Footer from 'components/layout/Footer'; @@ -10,9 +9,8 @@ export default function Layout({ title, children, header = true, footer = true } return ( <> - umami{title && ` - ${title}`} + {title ? `${title} | umami` : 'umami'} - {header &&
}
{children}
{footer &&