Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@ server/data

trakt-proxy/wrangler.jsonc
trakt-proxy/.wrangler
EVENTS-DOC.MD
2 changes: 2 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"singleQuote": true,
"jsxSingleQuote": true,
"overrides": [
{
"files": "*.jsonc",
Expand Down
19 changes: 12 additions & 7 deletions client/src/components/layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ export default function Header() {
onClick={() => {
setStartFetch(Date.now());
navigate('/');
}}>
}}
>
<Logo width={50} />
</span>
{lastSync && (
Expand All @@ -64,8 +65,9 @@ export default function Header() {
variant='outline'
className={cn(
pathname === '/discover' &&
'bg-secondary text-secondary-foreground'
)}>
'bg-secondary text-secondary-foreground',
)}
>
<Binoculars strokeWidth={2} size={16} />
</Button>

Expand All @@ -77,8 +79,10 @@ export default function Header() {
variant='outline'
onClick={() => navigate('/search')}
className={cn(
pathname === '/search' && 'bg-secondary text-secondary-foreground'
)}>
pathname === '/search' &&
'bg-secondary text-secondary-foreground',
)}
>
<Search strokeWidth={3} size={16} />
</Button>

Expand All @@ -88,8 +92,9 @@ export default function Header() {
onClick={() => navigate('/settings')}
className={cn(
pathname === '/settings' &&
'bg-secondary text-secondary-foreground'
)}>
'bg-secondary text-secondary-foreground',
)}
>
<Cog strokeWidth={2} size={16} />
</Button>

Expand Down
16 changes: 14 additions & 2 deletions client/src/components/settings/SettingsMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ export default function SettingsMenu() {
<Button
onClick={() => navigate('/settings')}
variant={pathname === '/settings' ? 'secondary' : 'outline'}
className='font-bold'>
className='font-bold'
>
General
</Button>

Expand All @@ -19,9 +20,20 @@ export default function SettingsMenu() {
variant={
pathname === '/settings/credentials' ? 'secondary' : 'outline'
}
className='font-bold'>
className='font-bold'
>
Trackers Credentials
</Button>

<Button
onClick={() => navigate('/settings/event-journal')}
variant={
pathname === '/settings/event-journal' ? 'secondary' : 'outline'
}
className='font-bold'
>
Events Journal
</Button>
</div>
</div>
);
Expand Down
11 changes: 10 additions & 1 deletion client/src/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import { lazy } from 'react';
const Dashboard = lazy(() => import('./routes/dashboard'));
const Discover = lazy(() => import('./routes/dashboard/discover'));
const Search = lazy(() => import('./routes/dashboard/search'));
const SettingsEventJournal = lazy(() => import('./routes/dashboard/journal'));
const Settings = lazy(() => import('./routes/dashboard/settings'));
const SignUp = lazy(() => import('./routes/sign-up'));
const Login = lazy(() => import('./routes/login'));
const CredentialsSettings = lazy(
() => import('./routes/dashboard/settings.credentials')
() => import('./routes/dashboard/settings.credentials'),
);

// eslint-disable-next-line react-refresh/only-export-components
Expand All @@ -36,6 +37,10 @@ export const routes = [
path: '/settings',
meta: { title: 'Settings', description: '' },
},
{
path: '/settings/event-journal',
meta: { title: 'Events Journal', description: '' },
},
{
path: '/sign-up',
meta: { title: 'Sign Up', description: '' },
Expand All @@ -55,6 +60,10 @@ export default function Router() {
<Route path='/discover' element={<Discover />} />
<Route path='/search' element={<Search />} />
<Route path='/settings' element={<Settings />} />
<Route
path='/settings/event-journal'
element={<SettingsEventJournal />}
/>
<Route
path='/settings/credentials'
element={<CredentialsSettings />}
Expand Down
Loading
Loading