diff --git a/src/app/routes/Dashboard.tsx b/src/app/routes/Dashboard.tsx index 674bd3b..9653967 100644 --- a/src/app/routes/Dashboard.tsx +++ b/src/app/routes/Dashboard.tsx @@ -430,8 +430,7 @@ export const Dashboard: React.FC = () => { selectedCharacter={characters[selectedCharacterIndex]!} onCharacterClick={handleCharacterClick} /> - - + + + + + + + + + + ); +} diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index f17737a..9d1a790 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -1,5 +1,8 @@ import React from 'react'; -import { Box, Typography } from '@mui/material'; +import { Box, Stack, Typography } from '@mui/material'; +import LogoutButton from '@/features/auth/components/LogoutButton'; +import RefreshCharacters from './RefreshCharacters'; +import CoffeeButton from './CoffeeButton'; interface FooterProps { emblemUrl: string; @@ -13,7 +16,7 @@ const Footer: React.FC = ({ emblemUrl }) => { bottom: 0, left: 0, right: 0, - height: '40px', + height: '5.4%', backgroundImage: `url(${emblemUrl})`, backgroundSize: 'cover', backgroundPosition: 'center', @@ -36,16 +39,32 @@ const Footer: React.FC = ({ emblemUrl }) => { > Built by Dragoni and Rorschach. Destiny 2 and its assets are the property of Bungie. Used - under Bungie's Fan-Created Media and Art guidelines. + under Bungie's Fan-Created Media and Art guidelines. Consider supporting us! + + + + + + + + ); }; diff --git a/src/components/HeaderComponent.tsx b/src/components/HeaderComponent.tsx index 304f579..afb726a 100644 --- a/src/components/HeaderComponent.tsx +++ b/src/components/HeaderComponent.tsx @@ -12,6 +12,10 @@ import { HeaderStyledLink, Header, } from '../styled'; +import LogoutButton from '@/features/auth/components/LogoutButton'; +import RefreshCharacters from './RefreshCharacters'; +import { Tooltip } from '@mui/material'; +import CoffeeButton from './CoffeeButton'; interface HeaderComponentProps { emblemUrl: string; @@ -54,22 +58,6 @@ const HeaderComponent: React.FC = ({ ))} - - - Coffee - - - Patreon - - ); }; diff --git a/src/components/RefreshCharacters.tsx b/src/components/RefreshCharacters.tsx index d383b18..c2e4608 100644 --- a/src/components/RefreshCharacters.tsx +++ b/src/components/RefreshCharacters.tsx @@ -17,10 +17,6 @@ export default function RefreshCharacters() { return ( @@ -32,9 +28,10 @@ export default function RefreshCharacters() { onClick={onRefreshClick} sx={{ borderRadius: 4, + mixBlendMode: 'difference', }} > - + )} diff --git a/src/features/auth/components/LogoutButton.tsx b/src/features/auth/components/LogoutButton.tsx index b042ea0..ccd4161 100644 --- a/src/features/auth/components/LogoutButton.tsx +++ b/src/features/auth/components/LogoutButton.tsx @@ -13,10 +13,6 @@ export default function LogoutButton() { return ( @@ -25,9 +21,10 @@ export default function LogoutButton() { onClick={onLogoutClick} sx={{ borderRadius: 4, + mixBlendMode: 'difference', }} > - + diff --git a/src/styled/index.ts b/src/styled/index.ts index 552f19c..f8abe2e 100644 --- a/src/styled/index.ts +++ b/src/styled/index.ts @@ -83,17 +83,18 @@ export const HeaderCharacterText = styled('div')<{ isSelected: boolean }>(({ isS export const HeaderLinksContainer = styled('div')({ position: 'absolute', right: '20px', - bottom: '-2px', + top: '6%', display: 'flex', - gap: '20px', + gap: '12px', alignItems: 'flex-end', }); export const HeaderStyledLink = styled('a')({ ...sharedTextStyles, - color: 'rgba(255, 255, 255, 0.6)', + color: 'rgba(255, 255, 255, 0.9)', textDecoration: 'none', opacity: 0.6, + mixBlendMode: 'difference', '&:hover': { ...sharedTextStyles['&:hover'], color: 'white', diff --git a/vite.config.ts b/vite.config.ts index 31a17ca..b4f6ba5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,21 +1,28 @@ -import { defineConfig } from "vite"; -import react from "@vitejs/plugin-react"; -import fs from "fs"; +import { defineConfig } from 'vite'; +import * as path from 'path'; +import react from '@vitejs/plugin-react'; +import fs from 'fs'; export default defineConfig(({ command, mode, isSsrBuild, isPreview }) => { - if (command === "serve") { + if (command === 'serve') { return { plugins: [react()], server: { https: { - key: fs.readFileSync("./certs/localhost.key"), - cert: fs.readFileSync("./certs/localhost.crt"), + key: fs.readFileSync('./certs/localhost.key'), + cert: fs.readFileSync('./certs/localhost.crt'), }, }, + resolve: { + alias: [{ find: '@', replacement: path.resolve(__dirname, 'src') }], + }, }; } else { return { plugins: [react()], + resolve: { + alias: [{ find: '@', replacement: path.resolve(__dirname, 'src') }], + }, }; } });