Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/RENCI/APSViz-UI-V3 into iss…
Browse files Browse the repository at this point in the history
…ue-310-secure-token
  • Loading branch information
PhillipsOwen committed Oct 29, 2024
2 parents d653936 + c1986c5 commit fb9a43a
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { ComparePanel } from '@components/compare-panel';
import { MapLegend } from '@components/legend';
import { AlertUser } from '@components/alert-user';
import { Config } from '@components/config';
import { Acknowledgements } from "@components/acknowledgements";

/**
* renders the main content
Expand Down Expand Up @@ -42,6 +43,7 @@ const Content = () => {
{ (defaultInstanceName != null) && <ControlPanel/> }
<ComparePanel/>
<MapLegend />
<Acknowledgements />
</Fragment>
);
};
Expand Down
75 changes: 75 additions & 0 deletions src/components/acknowledgements/acknowledgements.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import React, { Fragment } from "react";
import { Sheet, Stack, Box, Link } from '@mui/joy';
import crc_logo from "@images/CRC_LOGO.jpg";
import nuu_logo from "@images/NCU_LOGO.jpg";
import twi_logo from "@images/TWI_LOGO.jpg";
import uga_logo from "@images/UGA_LOGO.jpg";
import renci_logo from "@images/renci-logo.png";

export const Acknowledgements = () => {

return(
<Fragment>
<Sheet
variant="soft"
sx={{
position: 'absolute',
bottom: 0, left: 75,
height: '50vh',
zIndex: 900,
maxHeight: '25px',
overflow: 'hidden',
p: 0,
transition: 'max-height 250ms, filter 250ms, background-color 1000ms 500ms',
display: 'flex',
flexDirection: 'row',
background: 'white',
}}>
<Stack alignItems="left" spacing={1} direction="row">
<Link href="https://www.coastalresiliencecenter.org/" underline="none">
<Box
component="img"
height="18px"
sx={{ pb: .25, pl: .25 }}
alt="Coastal Resilience Center"
src={ crc_logo }>
</Box>
</Link>
<Link href="https://renci.org/research/earth-data-science-research/" underline="none">
<Box
component="img"
height="18px"
alt="Renaissance Computing Institute"
src={ renci_logo }
/>
</Link>
<Link href="https://thewaterinstitute.org/" underline="none">
<Box
component="img"
height="18px"
alt="The Water Institute"
src={ twi_logo }
/>
</Link>
<Link href="https://ccee.ncsu.edu/research/ewc/" underline="none">
<Box
component="img"
height="18px"
alt="North Carolina State University"
src={ nuu_logo }
/>
</Link>
<Link href="https://engineering.uga.edu/team_member/matthew-v-bilskie/" underline="none">
<Box
component="img"
height="18px"
sx={{ pr: .5 }}
alt="University of Georgia"
src={ uga_logo }
/>
</Link>
</Stack>
</Sheet>
</Fragment>
);
};
1 change: 1 addition & 0 deletions src/components/acknowledgements/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './acknowledgements';
Binary file added src/images/CRC_LOGO.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/NCU_LOGO.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/TWI_LOGO.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/UGA_LOGO.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ module.exports = {
'@utils': path.resolve(__dirname, 'src/utils/'),
'@side-by-side': path.resolve(__dirname, 'src/components/side-by-side/'),
'@alert-user': path.resolve(__dirname, 'src/components/alert-user/'),
'@acknowledgements': path.resolve(__dirname, 'src/components/acknowledgements/'),
'@config': path.resolve(__dirname, 'src/components/config/')
}
},
Expand Down

0 comments on commit fb9a43a

Please sign in to comment.