mirror of
https://github.com/umami-software/umami.git
synced 2026-02-14 09:35:36 +01:00
Changed route ids to be more explicit.
This commit is contained in:
parent
1a70350936
commit
18e36aa7b3
105 changed files with 86 additions and 76 deletions
|
|
@ -1,6 +1,6 @@
|
|||
'use client';
|
||||
import { useState } from 'react';
|
||||
import { Item, Loading, Tabs, Flexbox } from 'react-basics';
|
||||
import { Item, Loading, Tabs, Flexbox, Text, Icon } from 'react-basics';
|
||||
import TeamsContext from 'app/(main)/teams/TeamsContext';
|
||||
import PageHeader from 'components/layout/PageHeader';
|
||||
import { ROLES } from 'lib/constants';
|
||||
|
|
@ -10,6 +10,7 @@ import TeamEditForm from './TeamEditForm';
|
|||
import TeamMembers from './TeamMembers';
|
||||
import TeamWebsites from './TeamWebsites';
|
||||
import TeamData from './TeamData';
|
||||
import LinkButton from 'components/common/LinkButton';
|
||||
|
||||
export function TeamSettings({ teamId }: { teamId: string }) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
|
|
@ -28,7 +29,14 @@ export function TeamSettings({ teamId }: { teamId: string }) {
|
|||
return (
|
||||
<TeamsContext.Provider value={team}>
|
||||
<Flexbox direction="column">
|
||||
<PageHeader title={team?.name} icon={<Icons.Users />} />
|
||||
<PageHeader title={team?.name} icon={<Icons.Users />}>
|
||||
<LinkButton href={`/teams/${teamId}`} variant="primary">
|
||||
<Icon>
|
||||
<Icons.External />
|
||||
</Icon>
|
||||
<Text>{formatMessage(labels.view)}</Text>
|
||||
</LinkButton>
|
||||
</PageHeader>
|
||||
<Tabs
|
||||
selectedKey={tab}
|
||||
onSelect={(value: any) => setTab(value)}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
import TeamSettings from './TeamSettings';
|
||||
|
||||
export default function ({ params }) {
|
||||
export default function ({ params: { teamId } }) {
|
||||
if (process.env.cloudMode) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return <TeamSettings teamId={params.id} />;
|
||||
return <TeamSettings teamId={teamId} />;
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
import UserSettings from './UserSettings';
|
||||
|
||||
export default function ({ params }) {
|
||||
export default function ({ params: { userId } }) {
|
||||
if (process.env.cloudMode) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return <UserSettings userId={params.id} />;
|
||||
return <UserSettings userId={userId} />;
|
||||
}
|
||||
|
|
@ -4,12 +4,12 @@ import { Item, Tabs, Button, Text, Icon, Loading } from 'react-basics';
|
|||
import Link from 'next/link';
|
||||
import Icons from 'components/icons';
|
||||
import PageHeader from 'components/layout/PageHeader';
|
||||
import WebsiteEditForm from './[id]/WebsiteEditForm';
|
||||
import WebsiteData from './[id]/WebsiteData';
|
||||
import TrackingCode from './[id]/TrackingCode';
|
||||
import ShareUrl from './[id]/ShareUrl';
|
||||
import WebsiteEditForm from './[websiteId]/WebsiteEditForm';
|
||||
import WebsiteData from './[websiteId]/WebsiteData';
|
||||
import TrackingCode from './[websiteId]/TrackingCode';
|
||||
import ShareUrl from './[websiteId]/ShareUrl';
|
||||
import { useWebsite, useMessages } from 'components/hooks';
|
||||
import WebsiteContext from 'app/(main)/websites/[id]/WebsiteContext';
|
||||
import WebsiteContext from '../../websites/[websiteId]/WebsiteContext';
|
||||
|
||||
export function WebsiteSettings({ websiteId, openExternal = false }) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
import { TextArea } from 'react-basics';
|
||||
import { useMessages, useConfig } from 'components/hooks';
|
||||
|
||||
const SCRIPT_NAME = 'script.js';
|
||||
|
||||
export function TrackingCode({ websiteId, hostUrl }: { websiteId: string; hostUrl?: string }) {
|
||||
const { formatMessage, messages } = useMessages();
|
||||
const config = useConfig();
|
||||
|
||||
const trackerScriptName =
|
||||
config?.trackerScriptName?.split(',')?.map((n: string) => n.trim())?.[0] || 'script.js';
|
||||
config?.trackerScriptName?.split(',')?.map((n: string) => n.trim())?.[0] || SCRIPT_NAME;
|
||||
|
||||
const url = trackerScriptName?.startsWith('http')
|
||||
? trackerScriptName
|
||||
Loading…
Add table
Add a link
Reference in a new issue