diff --git a/react/src/components/HazmapperHeader/HazmapperHeader.module.css b/react/src/components/HazmapperHeader/HazmapperHeader.module.css new file mode 100644 index 00000000..21463ab4 --- /dev/null +++ b/react/src/components/HazmapperHeader/HazmapperHeader.module.css @@ -0,0 +1,9 @@ +.root { + display: flex; + align-items: center; + flex-direction: row; + justify-content: space-between; + } + .userName { + color: white; + } diff --git a/react/src/components/HazmapperHeader/HazmapperHeader.tsx b/react/src/components/HazmapperHeader/HazmapperHeader.tsx new file mode 100644 index 00000000..e06e9368 --- /dev/null +++ b/react/src/components/HazmapperHeader/HazmapperHeader.tsx @@ -0,0 +1,20 @@ +import React from 'react'; +import useAuthenticatedUser from '@hazmapper/hooks/user/useAuthenticatedUser'; +import { AuthenticatedUser } from '@hazmapper/types'; +import { Layout } from 'antd'; +import styles from './HazmapperHeader.module.css' + + + +export const HazmapperHeader: React.FC<{ user: string;}> = ({user}) => { + const { Header } = Layout; + + return ( +
+ +
{user}
+
+ + ) +} +export default HazmapperHeader; diff --git a/react/src/components/HazmapperHeader/index.tsx b/react/src/components/HazmapperHeader/index.tsx new file mode 100644 index 00000000..1d95eba8 --- /dev/null +++ b/react/src/components/HazmapperHeader/index.tsx @@ -0,0 +1 @@ +export { default } from './HazmapperHeader'; diff --git a/react/src/components/Projects/ProjectListing.module.css b/react/src/components/Projects/ProjectListing.module.css index 0cc0c81b..373475f2 100644 --- a/react/src/components/Projects/ProjectListing.module.css +++ b/react/src/components/Projects/ProjectListing.module.css @@ -1,76 +1,101 @@ .root { display: flex; flex-direction: column; - width: 100vh; - height: 100vh; + padding-left:50px; + padding-right: 50px; } + .projectList { - display: flex; - flex-direction: column; - width: 100%; - table-layout: fixed; - padding: 10px; - overflow-y: scroll; - height: 60%; + flex-grow: 1; + overflow: hidden; + justify-content: center; + padding:10px; } -.errorMessage { + +.projectList table { width: 100%; - padding: 10px; + table-layout: fixed; + border-collapse: collapse; + } -.projectList th { + +.projectList thead { + position: sticky; + top: 0; + z-index: 10; background: #d0d0d0; +} + +.projectList thead th { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; + background: #d0d0d0; } -.projectList th, -button { - overflow: visible; - overflow-wrap: normal; + +.projectList tbody { + display: block; + max-height: 300px; + overflow-y: auto; } -.projectList tr, -td { + +.projectList tr { + display: table; width: 100%; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; + table-layout: fixed; } + .projectList tr:hover td { color: white; background-color: var(--global-color-accent--light); } + .projectList tr:hover td button { color: white; } + .mapColumn { width: 42%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; } + .projectColumn { width: 42%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; } + .buttonColumn { width: 16%; text-align: end; } + .buttonColumn button { max-width: 100%; text-overflow: ellipsis; - white-space: wrap; + white-space: nowrap; justify-content: flex-start; } + .userGuide { font-weight: bold; font-size: medium; justify-content: flex-end; - height: 10%; + padding-right: 10px; } + .versionContainer { display: flex; flex-direction: column; - height: 30%; + justify-content: center; align-items: center; } + .versionContainer img { - height: 80%; + max-height: min-content; + } diff --git a/react/src/components/Projects/ProjectListing.tsx b/react/src/components/Projects/ProjectListing.tsx index f0fc8db5..aa4ffbf9 100644 --- a/react/src/components/Projects/ProjectListing.tsx +++ b/react/src/components/Projects/ProjectListing.tsx @@ -56,7 +56,8 @@ const ProjectListing: React.FC = () => {
{'Version 2.17'}
- +
+
@@ -104,6 +105,7 @@ const ProjectListing: React.FC = () => { )}
Map
+