Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/footer #100

Merged
merged 7 commits into from
Sep 21, 2023
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
7 changes: 7 additions & 0 deletions src/App.styled.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import styled from 'styled-components'

const StyledOutletWrapper = styled.section`
height: calc(100% - 200px);
overflow: scroll;
`
export { StyledOutletWrapper as OutletWrapper }
7 changes: 6 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import {
useMsal,
} from '@azure/msal-react'
import { Outlet } from 'react-router-dom'
import * as Styled from './App.styled'
import AppBar from './features/AppBar/AppBar'
import { Footer } from './features/Footer/Footer'

export function App() {
const { instance } = useMsal()
Expand All @@ -15,7 +17,10 @@ export function App() {
<AppBar title="PEPM" />
<p>Authenticated</p>
<button onClick={() => instance.logoutRedirect()}>Log out</button>
<Outlet />
<Styled.OutletWrapper>
<Outlet />
</Styled.OutletWrapper>
<Footer text="All information is proprietary of Equinor © 2023 Equinor ASA" />
</AuthenticatedTemplate>
<UnauthenticatedTemplate>
<p>Not authenticated</p>
Expand Down
1 change: 0 additions & 1 deletion src/components/Table.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export const StyledDiv = styled.div`
> .table-wrapper {
> table {
width: auto !important;
margin: 0px !important;
mheggelund marked this conversation as resolved.
Show resolved Hide resolved
}

> div {
Expand Down
3 changes: 2 additions & 1 deletion src/components/Table.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Chip } from '@equinor/eds-core-react'
import { EdsDataGrid } from '@equinor/eds-data-grid-react'
import * as Styled from './Table.styled'
import { useAnalogueModels } from '../hooks/useAnalogueModels'
import * as Styled from './Table.styled'

export const Table = () => {
const { models } = useAnalogueModels()
Expand All @@ -15,6 +15,7 @@ export const Table = () => {
enablePagination
emptyMessage="Empty :("
rows={models.data.data}
pageSize={15}
mheggelund marked this conversation as resolved.
Show resolved Hide resolved
columns={[
{
accessorKey: 'analogueModelId',
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions src/features/Footer/Footer.styled.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import styled from 'styled-components'
import { spacings } from '../../tokens/spacings'
import { theme } from '../../tokens/theme'

const StyledFooter = styled.footer`
height: ${spacings.XXXX_LARGE};

display: flex;
justify-content: space-between;
align-items: center;

border-top: 1px solid ${theme.light.ui.background.medium};

padding: ${spacings.SMALL} ${spacings.LARGE};

position: fixed;
left: 0;
bottom: 0;
width: 100%;

> .footer-img {
height: ${spacings.XXX_LARGE};
}
`
export { StyledFooter as Footer }
13 changes: 13 additions & 0 deletions src/features/Footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Typography } from '@equinor/eds-core-react'

import logo from './Equinor_HORIZ_logo_RGB_RED.png'
import * as Styled from './Footer.styled'

export const Footer = ({ text }: { text: string }) => {
return (
<Styled.Footer>
<Typography>{text}</Typography>
<img className="footer-img" src={logo} alt="Equinor Logo" />
</Styled.Footer>
)
}
9 changes: 7 additions & 2 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ body {
box-sizing: inherit;
}

#root {
height: 100vh;
}

code {
font-family: 'Equinor Mono', source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
}
font-family: 'Equinor Mono', source-code-pro, Menlo, Monaco, Consolas,
'Courier New', monospace;
}
9 changes: 9 additions & 0 deletions src/pages/Api/Api.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Typography } from '@equinor/eds-core-react'

export const Api = () => {
return (
<>
<Typography> Api to come her soon! </Typography>
</>
)
}
3 changes: 2 additions & 1 deletion src/router.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { createBrowserRouter, NonIndexRouteObject } from 'react-router-dom'
import { App } from './App'
import { ModelView } from './features/ModelView/ModelView'
import { Api } from './pages/Api/Api'
import { Browse } from './pages/Browse/Browse'
import { Compute } from './pages/ModelPages/Compute/Compute'
import { Model } from './pages/ModelPages/Model/Model'
Expand All @@ -18,7 +19,7 @@ const tabs: Tab[] = [
path: 'models',
element: <Browse />,
},
{ title: 'API', path: 'api', element: <NotImplemented /> },
{ title: 'API', path: 'api', element: <Api /> },
{ title: 'About', path: 'about', element: <NotImplemented /> },
]
const appRoutes = (tabs as NonIndexRouteObject[]).concat([
Expand Down
29 changes: 20 additions & 9 deletions src/tokens/spacings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,24 @@ import { tokens } from '@equinor/eds-tokens'
const comfortable = tokens.spacings.comfortable

export const spacings = {
XX_SMALL: comfortable.xx_small /* 2px */,
X_SMALL: comfortable.x_small /* 4px */,
SMALL: comfortable.small /* 8px */,
MEDIUM_SMALL: comfortable.medium_small /* 12px */,
MEDIUM: comfortable.medium /* 16px */,
LARGE: comfortable.large /* 24px */,
X_LARGE: comfortable.x_large /* 32px */,
XX_LARGE: comfortable.xx_large /* 40px */,
XXX_LARGE: comfortable.xxx_large /* 48px */,
/** 2px */
XX_SMALL: comfortable.xx_small,
/** 4px */
X_SMALL: comfortable.x_small,
/** 8px */
SMALL: comfortable.small,
/** 12px */
MEDIUM_SMALL: comfortable.medium_small,
/** 16px */
MEDIUM: comfortable.medium,
/** 24px */
LARGE: comfortable.large,
/** 32px */
X_LARGE: comfortable.x_large,
/** 40px */
XX_LARGE: comfortable.xx_large,
/** 48px */
XXX_LARGE: comfortable.xxx_large,
/** 64px */
XXXX_LARGE: '64px',
}