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

Finished redesigning Issue 5 Exhibit #115

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
"@emotion/styled": "^11.6.0",
"@mui/icons-material": "^5.3.1",
"@mui/material": "^5.3.1",
"next": "^12.0.9",
"react": "17.0.2",
"next": "^13.3.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would be beneficial to stay with original versions of Next, React, etc.. would recommend omitting this file unless there's a feature that is not currently implemented in the previous versions

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh okay, I will try omitting the file. I think the versions got updated after running yarn or npm.

"react": "^18.2.0",
"react-audio-player": "^0.17.0",
"react-dom": "17.0.2",
"react-dom": "^18.2.0",
"react-scroll": "^1.8.4"
},
"devDependencies": {
"@types/node": "^16.11.22",
"@types/react": "^17.0.38",
"eslint": "8.8.0",
"eslint-config-next": "^12.0.9",
"eslint-config-next": "^13.3.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-react-app": "^7.0.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
Expand Down
30 changes: 18 additions & 12 deletions src/pages/learn.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Typography from '@mui/material/Typography'
import Head from 'next/head'
import Image from 'next/image'
import ReactAudioPlayer from 'react-audio-player'
Expand Down Expand Up @@ -49,7 +50,7 @@ export const learn = () => {
quality={65}
/>
</div>
<div className={learnStyles.orca}>
{/* <div className={learnStyles.orca}>
<Image
src={roundorca}
alt="OrcaImage"
Expand All @@ -58,8 +59,8 @@ export const learn = () => {
layout="intrinsic"
quality={65}
/>
</div>
<h2 className={learnStyles.calls}>3 Common Calls</h2>
</div> */}
{/* <h2 className={learnStyles.calls}>3 Common Calls</h2>
<div>
<div className={learnStyles.gallery}>
<Image src={frequency1} alt="J pod's call - Frequency and Time" />
Expand Down Expand Up @@ -103,18 +104,23 @@ export const learn = () => {
/>
</div>
</div>
</div>
</div> */}
<div className={learnStyles.property}>
<h2 className={learnStyles.exhibits}>Exhibits</h2>
<p className={learnStyles.exhibit}>
{`Learn About the Marine acoustic landscape and the hydrophone network`}
<br></br>
{`by exploring these Orcasound Exhibit screens designed for
educational organizations in the Pudget Sound regions`}
</p>
<Typography variant="h2" fontSize="40px" align="left" mt={5} mb={2}>
Exhibit
</Typography>
<Typography variant="p" fontSize="18px" align="left">
Learn About the Marine acoustic landscape and the hydrophone network
by exploring these Orcasound Exhibit screens designed for educational
organizations in the Pudget Sound regions
</Typography>
</div>

<div className={learnStyles.org}>
<Image src={organization1} alt="Seattle aquarium exhibit" />
<a href="https://www.seattleaquarium.org/">
<Image src={organization1} alt="Seattle aquarium exhibit" />
</a>

<a href="https://killerwhaletales.org/">
<Image src={organization2} alt="Marine Science Center Logo" />
</a>
Expand Down
24 changes: 17 additions & 7 deletions src/styles/Learn.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
.gallery2 {
float: left;
background-color: rgba(190, 255, 246, 0.76);
margin: 295px 30px;
margin: 270px 30px;
}
.audio {
top: 0;
Expand All @@ -82,12 +82,15 @@

.pods {
text-align: center;

align-items: center;
}

.property {
text-align: left;
justify-content: left;
width: 100%;
/* flex-wrap: wrap; */

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove commented styles

/* margin: 1200px 0; */
padding: 40px 10px 100px 100px;
}

.exhibits {
Expand All @@ -101,13 +104,20 @@
margin-left: 40px;
text-align: left;
}

/* This is selecting the row container holding the two images. */
.org {
width: 100%;
height: auto;
display: flex;
margin-top: 80px;
margin: 0 30px 50px 30px;
text-align: center;
margin-left: 300px;
padding: 5px 5px;
padding: 0 5px 30px 5px;
justify-content: space-evenly;
}
.org :nth-of-type(1) {
border-radius: 10%;
}
.org :nth-of-type(2) {
/* border: solid 1px; */

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove commented style.

border-radius: 10%;
}
Loading