diff --git a/frontend/src/components/page/index.tsx b/frontend/src/components/page/index.tsx index 5d31ca8a20ff8c779db47e94380b346a8debdc21..4bb1738818a30d466ec1475642fba34b3527a921 100644 --- a/frontend/src/components/page/index.tsx +++ b/frontend/src/components/page/index.tsx @@ -1,3 +1,3 @@ import Page from 'components/page/page' -export { Page } +export default { Page } diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index 059e8b4984845324ad08cd6a2d330e181d0c0b74..4237ac3faad693edf181048c19b300c16adc68ab 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -8,8 +8,8 @@ import 'i18n' import getTheme from 'themes' import GlobalStyle from 'globalStyles' import App from 'routes' -import reportWebVitals from './reportWebVitals' import Loading from 'components/loading' +import reportWebVitals from './reportWebVitals' function appRoot() { return ( diff --git a/frontend/src/routes/index.tsx b/frontend/src/routes/index.tsx index e9f0a2eb8980232e9808948635b02a838660da1e..08b097b96a15db5874424dc0a461fbcf3f60c9bf 100644 --- a/frontend/src/routes/index.tsx +++ b/frontend/src/routes/index.tsx @@ -10,6 +10,7 @@ import FrontPage from 'routes/frontpage' import Footer from 'routes/components/footer' import Header from 'routes/components/header' import NotFound from 'routes/components/notFound' +import Link from '../components/link' const AppWrapper = styled.div` display: flex; @@ -37,6 +38,12 @@ export default function App() { <NotFound /> </Route> </Switch> + + <Link to='test@example.org' mail>Mail link</Link> + <Link to='test4' external underline noExternalIcon>Internal link</Link> + <Link to='test6' external underline noUnderline>External link</Link> + <Link to='test5' external noUnderline>Another internal link</Link> + <Footer /> </AppWrapper> ) diff --git a/frontend/src/routes/register/index.tsx b/frontend/src/routes/register/index.tsx index f9c66e80ccb980407473cf6b9e9af11cd58764d0..2e7736db6ab03af384e17a9c2d9ea3ec75b456b9 100644 --- a/frontend/src/routes/register/index.tsx +++ b/frontend/src/routes/register/index.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { Page } from 'components/page' +import Page from 'components/page' export default function Register() { return ( diff --git a/frontend/src/setupProxy.js b/frontend/src/setupProxy.js index b1f04abd2b8ecd454be5833ff912e2000a8f7f86..a7d60f51a8c878a73e44ebf9849b965a65b330db 100644 --- a/frontend/src/setupProxy.js +++ b/frontend/src/setupProxy.js @@ -1,6 +1,6 @@ const { createProxyMiddleware } = require('http-proxy-middleware') -module.exports = function (app) { +module.exports = (app) => { app.use( '/api', createProxyMiddleware({ diff --git a/frontend/src/test-utils.tsx b/frontend/src/test-utils.tsx index 10d9b958a0aa203673faa8bae81053b340b6dcf7..10782331e89c522f61684182381cdedda326771f 100644 --- a/frontend/src/test-utils.tsx +++ b/frontend/src/test-utils.tsx @@ -5,9 +5,7 @@ import { ThemeProvider } from 'styled-components/macro' import mainTheme from 'themes/main' // Providers used in test rendering -const AllTheProviders = ({ children }: any) => { - return <ThemeProvider theme={mainTheme}> {children} </ThemeProvider> -} +const AllTheProviders = ({ children }: any) => <ThemeProvider theme={mainTheme}> {children} </ThemeProvider> // Custom testing-library/react renderer using our providers. const customRender = (ui: React.ReactElement, options?: any) => diff --git a/frontend/src/themes/main.ts b/frontend/src/themes/main.ts index e03827205a038806e78c27605a3877ff81869820..57a15f592c3e5722932b6ec69de374c81f0d0232 100644 --- a/frontend/src/themes/main.ts +++ b/frontend/src/themes/main.ts @@ -14,7 +14,7 @@ const mainTheme: DefaultTheme = { height: '5rem', }, horizontalPadding: '2rem', - linkInternalColor: 'white', + linkInternalColor: 'black', linkExternalColor: 'blueish', maxWidth: '110rem', page: {