diff --git a/src/pages/admin/claims.tsx b/src/pages/admin/claims.tsx index 810ccd1f..3dce7ae6 100644 --- a/src/pages/admin/claims.tsx +++ b/src/pages/admin/claims.tsx @@ -2,8 +2,8 @@ import { Button, Checkbox, Group, Paper, Progress, Title, Tooltip } from '@manti import useSWR, { mutate } from 'swr'; import Page from '@/components/Page'; -import { AdminSettingsTabs } from '@/components/SettingsTabs'; import { swrFetcher } from '@/components/SWRSetup'; +import { AdminSettingsTabs } from '@/components/SettingsTabs'; import { useAccessToken } from '@/hooks/useAccessToken'; import thumbnail from '@/public/images/thumbnails/teams.png'; import { showNotification } from '@mantine/notifications'; @@ -123,7 +123,7 @@ const Settings = ({ data: tempData }: any) => { image: thumbnail, }} seo={{ nofollow: true, noindex: true }} - requiredPermissions={['admin.admin']} + requiredPermissions={{ permissions: ['admin.admin'] }} > {progress?.buildings && ( diff --git a/src/pages/admin/cron.tsx b/src/pages/admin/cron.tsx index c379607e..a0a3fcd5 100644 --- a/src/pages/admin/cron.tsx +++ b/src/pages/admin/cron.tsx @@ -29,7 +29,7 @@ const Settings = ({ data: tempData }: any) => { image: thumbnail, }} seo={{ nofollow: true, noindex: true }} - requiredPermissions={['admin.admin']} + requiredPermissions={{ permissions: ['admin.admin'] }} loading={!data} > diff --git a/src/pages/admin/images/index.tsx b/src/pages/admin/images/index.tsx index 7f751671..eed2399a 100644 --- a/src/pages/admin/images/index.tsx +++ b/src/pages/admin/images/index.tsx @@ -102,7 +102,7 @@ const Settings = () => { image: thumbnail, }} seo={{ nofollow: true, noindex: true }} - requiredPermissions={['team.claim.list']} + requiredPermissions={{ permissions: ['team.claim.list'] }} > diff --git a/src/pages/calendar/manage.tsx b/src/pages/calendar/manage.tsx index da8620e6..a403fbd4 100644 --- a/src/pages/calendar/manage.tsx +++ b/src/pages/calendar/manage.tsx @@ -75,7 +75,7 @@ const Calendar: NextPage = () => { image: thumbnail, }} seo={{ nofollow: true, noindex: true }} - requiredPermissions={['calendar.manage']} + requiredPermissions={{ permissions: ['calendar.manage'] }} >

Add Calendar Event

diff --git a/src/pages/faq/manage.tsx b/src/pages/faq/manage.tsx index d1f08c57..7da78b03 100644 --- a/src/pages/faq/manage.tsx +++ b/src/pages/faq/manage.tsx @@ -100,7 +100,7 @@ const Faq: NextPage = () => { image: thumbnail, }} seo={{ nofollow: true, noindex: true }} - requiredPermissions={['faq.edit', 'faq.remove', 'faq.add']} + requiredPermissions={{ permissions: ['faq.edit', 'faq.remove', 'faq.add'] }} loading={!data} > {!data ? ( diff --git a/src/pages/me/claims/[id].tsx b/src/pages/me/claims/[id].tsx index fa45134a..6b86fd8d 100644 --- a/src/pages/me/claims/[id].tsx +++ b/src/pages/me/claims/[id].tsx @@ -11,14 +11,14 @@ import { MenuItem, MenuTarget, NumberInput, - rem, Select, Switch, Table, Text, - Textarea, TextInput, + Textarea, Tooltip, + rem, } from '@mantine/core'; import { useClipboard, useDebouncedState } from '@mantine/hooks'; import { @@ -34,23 +34,24 @@ import { } from '@tabler/icons-react'; import { useEffect, useState } from 'react'; +import Page from '@/components/Page'; import { ClaimDrawerImages } from '@/components/map/ClaimDrawerImages'; import Map from '@/components/map/Map'; -import { Discord } from '@icons-pack/react-simple-icons'; -import MapboxDraw from '@mapbox/mapbox-gl-draw'; -import { NextPage } from 'next'; -import Link from 'next/link'; -/* eslint-disable react-hooks/exhaustive-deps */ -import Page from '@/components/Page'; import { useAccessToken } from '@/hooks/useAccessToken'; import { useUser } from '@/hooks/useUser'; import thumbnail from '@/public/images/thumbnails/me.png'; import fetcher from '@/utils/Fetcher'; +import { Discord } from '@icons-pack/react-simple-icons'; import { showNotification } from '@mantine/notifications'; +import MapboxDraw from '@mapbox/mapbox-gl-draw'; +import { NextPage } from 'next'; import { serverSideTranslations } from 'next-i18next/serverSideTranslations'; +import Link from 'next/link'; import { useRouter } from 'next/router'; import { useTranslation } from 'react-i18next'; +/* eslint-disable react-hooks/exhaustive-deps */ + const ClaimPage: NextPage = ({ claimId, data }: any) => { const [polygon, setPolygon] = useState({ type: 'Feature', @@ -192,7 +193,7 @@ const ClaimPage: NextPage = ({ claimId, data }: any) => { image: thumbnail, }} smallPadding - requiredPermissions={['account.edit', 'account.info']} + requiredPermissions={{ permissions: ['account.edit', 'account.info'] }} loading={!data} > {!data ? ( diff --git a/src/pages/me/index.tsx b/src/pages/me/index.tsx index 9781ef93..db0861c6 100644 --- a/src/pages/me/index.tsx +++ b/src/pages/me/index.tsx @@ -5,10 +5,10 @@ import { Code, Grid, Group, - rem, Stack, Text, Tooltip, + rem, useMantineColorScheme, useMantineTheme, } from '@mantine/core'; @@ -48,7 +48,7 @@ const MePage: NextPage = () => { title: t('head.title'), image: thumbnail, }} - requiredPermissions={['account.info']} + requiredPermissions={{ permissions: ['account.info'] }} loading={!data} > {data && ( diff --git a/src/pages/me/review.tsx b/src/pages/me/review.tsx index c5bbddce..ba8d0e62 100644 --- a/src/pages/me/review.tsx +++ b/src/pages/me/review.tsx @@ -23,7 +23,7 @@ const ReviewPage: NextPage = () => { title: 'Review Applications', image: thumbnail, }} - requiredPermissions={['account.info']} + requiredPermissions={{ permissions: ['account.info'] }} loading={!data} > diff --git a/src/pages/me/settings/[type].tsx b/src/pages/me/settings/[type].tsx index a1666e62..f61940e1 100644 --- a/src/pages/me/settings/[type].tsx +++ b/src/pages/me/settings/[type].tsx @@ -1,6 +1,5 @@ -import { Alert, Badge, Button, Card, Flex, Group, rem, Tabs, Text, TextInput } from '@mantine/core'; -/* eslint-disable react-hooks/exhaustive-deps */ import { Discord, Github } from '@icons-pack/react-simple-icons'; +import { Alert, Badge, Button, Card, Flex, Group, rem, Tabs, Text, TextInput } from '@mantine/core'; import { IconAlertCircle, IconBroadcast, @@ -28,6 +27,8 @@ import { useRouter } from 'next/router'; import { useTranslation } from 'react-i18next'; import useSWR from 'swr'; +/* eslint-disable react-hooks/exhaustive-deps */ + const Settings: NextPage = ({ type }: any) => { const user = useUser(); const { accessToken } = useAccessToken(); @@ -93,7 +94,7 @@ const Settings: NextPage = ({ type }: any) => { title: 'Account Settings', image: thumbnail, }} - requiredPermissions={['account.edit', 'account.info']} + requiredPermissions={{ permissions: ['account.edit', 'account.info'] }} loading={!data} > {data && (