From b69fccefa6926404cfcad23e902aa18aaea13801 Mon Sep 17 00:00:00 2001
From: Tore Brede <Tore.Brede@uib.no>
Date: Thu, 16 Sep 2021 13:48:38 +0200
Subject: [PATCH] Fixing eslint warnings
---
frontend/src/components/page/index.tsx | 2 +-
frontend/src/index.tsx | 2 +-
frontend/src/routes/index.tsx | 7 +++++++
frontend/src/routes/register/index.tsx | 2 +-
frontend/src/setupProxy.js | 2 +-
frontend/src/test-utils.tsx | 4 +---
frontend/src/themes/main.ts | 2 +-
7 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/frontend/src/components/page/index.tsx b/frontend/src/components/page/index.tsx
index 5d31ca8a..4bb17388 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 059e8b49..4237ac3f 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 e9f0a2eb..08b097b9 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 f9c66e80..2e7736db 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 b1f04abd..a7d60f51 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 10d9b958..10782331 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 e0382720..57a15f59 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: {
--
GitLab