Skip to content
This repository was archived by the owner on Dec 12, 2021. It is now read-only.
Open
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
4 changes: 2 additions & 2 deletions src/components/common/footer/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const ADDRESS = <div className='missionStatement'>Nouri's Address:<br />7241 185

export const Footer = () => {
return (
<div>
<span>
<div className='links-container'>
Copy link
Member

Choose a reason for hiding this comment

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

I think this links container can actually be put inside the footer tag since it's part of the whole footer. You will have to readjust the styling but the separation between areas of the page will be clearer.

Copy link
Member

Choose a reason for hiding this comment

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

You would also be able to remove the fragment that surrounds the footer.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

Copy link
Member

Choose a reason for hiding this comment

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

I'm seeing a new span tag added to replace the <> or

instead of all the contents being put under the footer element.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes I used a span tag. If you want the elements totally I believe react will let me use an array to wrap the elements in [,

] for example. I don't know how well that would work but worth a try.

<a href='https://www.facebook.com/teamnouri/' className='facebook' target='_blank' rel='noopener noreferrer'>
<FontAwesomeIcon
Expand Down Expand Up @@ -47,7 +47,7 @@ export const Footer = () => {
<br />
{ADDRESS}
</footer>
</div>
</span>

)
}
6 changes: 5 additions & 1 deletion src/components/common/footer/footer.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.links-container {
.links-container {
@media only screen and (min-width: 1024px) and (max-width: 1366px){
display: inline-flex;
padding-left: 25vh;
}
display: flex;
justify-content: center;
margin-top: 5%;
Expand Down
65 changes: 65 additions & 0 deletions src/components/home/sections/BoardMembers.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import React from 'react'
import './volunteer.scss'
import './boardmembers.scss'
/* IMAGES */
import johnson from '../../../images/johnson.jpg'
import kim from '../../../images/kim.jpg'
import timKim from '../../../images/tim-kim.jpg'
import green from '../../../images/green.jpg'
import roger from '../../../images/roger.jpg'
export const BoardMembers = () => {
return (
<div className='main'>
<div className='volunteer-content'>

<h1 className='volunteer-title'>Board Members</h1>
Copy link
Member

Choose a reason for hiding this comment

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

Is this class name being used in css anywhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If you are referring to className 'main' then yes. The others were created before I joined the team.

Copy link
Member

Choose a reason for hiding this comment

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

This one is about the "volunteer-title". Same as above.

<div className='board'>
<div className='individual'>
<img src={kim} alt='board-img' />
<div className='text-div'>
<p>Amber Kim</p>
<p>Chair</p>
</div>
</div>

<div className='individual'>
<img src={green} alt='board-img' />
<div className='text-div'>
<p>Cody Green</p>
<p>Vice Chair</p>
</div>
</div>
<div className='individual'>
<img src={johnson} alt='board-img' />
<div className='text-div'>
<p>Ryan Johnson</p>
<p>Member of the Board</p>
</div>
</div>

</div>
<div id='team'>
<h1 className='volunteer-title'>Leadership Team</h1>
<div className='board'>
<div className='individual'>
<img src={timKim} alt='board-img' />
<div className='text-div'>
<p>Timothy Kim</p>
<p>Chief of Operations</p>
</div>
</div>

<div className='individual'>
<img src={roger} alt='deadpool' />
<div className='text-div'>
<p>Roger Keith</p>
<p>Lead Software Engineer</p>
</div>

</div>
</div>
</div>
</div>
</div>
)
}
63 changes: 15 additions & 48 deletions src/components/home/sections/Volunteer.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import React from 'react'
import './volunteer.scss'

/* IMAGES */
import johnson from '../../../images/johnson.jpg'
import kim from '../../../images/kim.jpg'
import timKim from '../../../images/tim-kim.jpg'
import green from '../../../images/green.jpg'
import { BoardMembers } from './BoardMembers.jsx'

const CONTENT1 = 'If you are another nonprofit or social worker in the Redmond, Kirkland, Woodinville, Bothell, or Bellevue who would like to refer families with school-aged, disabled, or unborn children, we would love to help. Currently, we are only able to deliver within Redmond, Kirkland, Woodinville, Bothell, and Bellevue. Hopefully, we\'ll be able to expand soon.'
const CONTENT2 = 'If you are looking for ways to volunteer remotely from your home, we would love to chat with you. Some of the things we could use help in include marketing, organizing, and developing apps to help us automate some processes with our deliveries (stack: JavaScript, Node, React, AWS, DynamoDB).'
Expand All @@ -14,52 +9,24 @@ const SECTION_TITLE = 'An invitation from our board members'

export const Volunteer = () => {
return (
<section id='volunteer'>

<div className='volunteer-content'>
<span>
<section id='volunteer'>

<h1 className='volunteer-title'>{SECTION_TITLE}</h1>
<p>{CONTENT1}</p>
<a href='https://docs.google.com/forms/d/e/1FAIpQLScEOOuZ1iZw9IWbsiWc1AX3OHhFQ4wpxYs_TZHyykx2glsrFw/viewform' target='_blank' rel='noopener noreferrer'><button className='btn-container'>Sign Up</button></a>
<p>{CONTENT2}</p>
<p>{CONTENT3}</p>
<div className='volunteer-content'>

<a href='https://docs.google.com/forms/d/e/1FAIpQLSd9N1_wWETbeMs7UAxzUTCMl0FhCnVneozlA-EMAMQXSBFy3A/viewform' target='_blank' rel='noopener noreferrer'>
<button className='btn-container'>volunteer with us</button>
</a>
</div>
<h1 className='volunteer-title'>{SECTION_TITLE}</h1>
Copy link
Member

Choose a reason for hiding this comment

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

Is this class name being used in css anywhere?

Copy link
Contributor Author

@rhtaylor rhtaylor Nov 12, 2020

Choose a reason for hiding this comment

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

I believe this is being used. If not it was intended to be used and was never implemented as I was not on the team when the volunteer sections were created.

Copy link
Member

Choose a reason for hiding this comment

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

No need to keep it if it's not being used.

<p>{CONTENT1}</p>
<a href='https://docs.google.com/forms/d/e/1FAIpQLScEOOuZ1iZw9IWbsiWc1AX3OHhFQ4wpxYs_TZHyykx2glsrFw/viewform' target='_blank' rel='noopener noreferrer'><button className='btn-container'>Sign Up</button></a>
<p>{CONTENT2}</p>
<p>{CONTENT3}</p>

<div className='image-col'>
<div className='overlay'>
<img src={kim} alt='board-img' />
<div className='text-div'>
<p>Amber Kim</p>
<p>Chair</p>
</div>
<a href='https://docs.google.com/forms/d/e/1FAIpQLSd9N1_wWETbeMs7UAxzUTCMl0FhCnVneozlA-EMAMQXSBFy3A/viewform' target='_blank' rel='noopener noreferrer'>
<button className='btn-container'>volunteer with us</button>
</a>
</div>
</section>
<BoardMembers />
Copy link
Member

Choose a reason for hiding this comment

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

It would probably better to include this in the section as this whole part can be considered one section:
Screen Shot 2020-11-08 at 1 15 35 PM

The div that encompasses the paragraphs and the pictures can then be removed.

Copy link
Contributor

Choose a reason for hiding this comment

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

Is it just me or does anyone else think the pics and words should be centered?

Copy link
Member

Choose a reason for hiding this comment

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

@RaevLogic Are you talking about the text justification or the whole section being off? There is padding that's pushing and making the section off.

Copy link
Contributor

Choose a reason for hiding this comment

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

Untitled
I just edited it in Paint 3D real quick so it's not perfect, but that's more what I was thinking if we're splitting it in two sections like this.

Copy link
Contributor

Choose a reason for hiding this comment

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

Two sections being the section with paragraphs and the section with all of our pictures.

Copy link
Contributor

Choose a reason for hiding this comment

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

The only thing I don't like about this from a UI perspective is the split vision aspect. I find it awkward for our SPA to read down as a single column for the majority of the page, and then hit this portion and it's a two-column design where I have to read down the paragraphs and then go back up the page to visually scan back down the pictures section.

Copy link
Member

Choose a reason for hiding this comment

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

🤷‍♀️I'm good with either one or two columns. I think if we have them stacked, I would put the pictures on top and then the text below.

Copy link
Member

Choose a reason for hiding this comment

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

I think we can stick w/ the 2 column for now (unless it gets too annoying for you @rhtaylor ) and then create a new task for 1 column if we want to redesign to that.

Copy link
Contributor

Choose a reason for hiding this comment

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

Lol, I'm not exactly a designer over here. Just letting everyone know my thoughts so I'm not wondering if I should have said something for two weeks xD

Copy link
Member

Choose a reason for hiding this comment

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

Constructive feedback is always good. If it can improve user experience, we should think about it.


<div className='overlay'>
<img src={green} alt='board-img' />
<div className='text-div'>
<p>Cody Green</p>
<p>Vice Chair</p>
</div>
</div>
<div className='overlay'>
<img src={johnson} alt='board-img' />
<div className='text-div'>
<p>Ryan Johnson</p>
<p>Member of the Board</p>
</div>
</div>
<div className='overlay'>
<img src={timKim} alt='board-img' />
<div className='text-div'>
<p>Timothy Kim</p>
<p>Chief of Operations</p>
</div>
</div>
</div>
</section>
</span>
)
}
77 changes: 77 additions & 0 deletions src/components/home/sections/boardmembers.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
.main{
@media only screen and (max-width: 768px){
display: block;
width: 30ev;
height: 20ev;
.volunteer-content{
margin:auto;

}
.board{
margin: auto;
}
}
@media only screen and (max-width: 1024px){
display: flex;
width: 30ev;
height: 20ev;

}
display: flex;
direction: row;
@media only screen and (max-width: 430px){
display: none;
}
.volunteer-content{
Copy link
Member

Choose a reason for hiding this comment

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

Duplicate class name from volunteer.scss

Copy link
Member

Choose a reason for hiding this comment

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

For example, on here we are inside the board member scss and not volunteer content. So it's unclear why we are using "volunteer" here.

width: 70%;
h1{
text-align: center}
.board{
display: flex;
direction: row;
align-content: center;
align-self: center;
width: 500px;
@media only screen and (max-width: 1024px){
width: 250px;
}
#team{
flex: 2;
align-items: center;
//float: right;


}
img{
@media only screen and (max-width: 1024px) {
width: 100px;
height: 100px;
}
width: 200px;
height: 200px;
}
div{
border: 1px solid #000;
// padding: 0 5px;

}
}

} }

.individual{
width: 250px;
height: 250px;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.3), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
p{
font-size: 16px;
}
.text-div {
//position: absolute;
bottom: 15px;
width: 90px;
color: white;
background-color: rgba(0, 0, 0, 0.75);
padding: 5px; }

}
21 changes: 14 additions & 7 deletions src/components/home/sections/volunteer.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
$dark-purple: #412F8A;

#volunteer {
@media only screen and (min-width: 1024px) {
#volunteer {
width: 100%;
@media only screen and (min-width: 1024px) {
width: 60%;
flex-direction: row;

float: left;
padding: 1em;
@media only screen and (min-width: 1366px) {
width: 80%;
margin: auto;
width: 40%;
margin: auto;
padding-left: 20vh;
Copy link
Member

Choose a reason for hiding this comment

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

This is causing the left padding which adds to things being pushed too far to the right.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought I took care of the extra space in the padding?

Copy link
Member

Choose a reason for hiding this comment

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

This is still causing the issue on my end. Removing it removes the extra padding

With the padding:
Screen Shot 2020-11-14 at 4 16 08 PM

Without:
Screen Shot 2020-11-14 at 4 16 30 PM

Copy link
Member

Choose a reason for hiding this comment

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

If you've removed this, can you double check that you pushed your local changes up. I'm still seeing this here on github

}
}

.volunteer-content {
Copy link
Member

Choose a reason for hiding this comment

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

Duplicate class name from boardmember.scss

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am thinking this was due to the nesting nature of scss. I believe the class name will have different attributes if it has a different parent so to speak.

Copy link
Member

Choose a reason for hiding this comment

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

Even if they are in different components and React will automate some things once everything has been processed, it's still good practice to be clearer and more intentional about avoiding collisions w/ naming.

display: flex;
flex-direction: column;
margin: 5%;

margin: 5%;

@media only screen and (min-width: 320px){
padding: 0;
}
@media only screen and (min-width: 1024px) {
width: 50%;
margin: 0 5% 0 5%;
Expand Down
Binary file added src/images/roger.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.