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.

Sign up for GitHub

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

[Website] - Changes to the Landing Page & Team Page #289

Merged
merged 26 commits into from
May 8, 2023
Merged

[Website] - Changes to the Landing Page & Team Page #289

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2855e85
Home Page update
jasonmosley21 May 1, 2023
eecd342
changing sizes and logos
jasonmosley21 May 2, 2023
a43a32c
:construction:
cindyqquach May 2, 2023
7433ce2
cleans up features.js formatting. adds demo prop to SectionHeading.jsx
drewjhart May 2, 2023
a497e5f
fixed team page
jasonmosley21 May 2, 2023
a2a58da
update on team members & advisor pic
cindyqquach May 2, 2023
d539369
Merge branch 'coop2023' of https://github.com/rightoneducation/offici…
cindyqquach May 2, 2023
cc483eb
refine on photos
cindyqquach May 2, 2023
0a6089d
removes package-lock.json from repo files
drewjhart May 2, 2023
5c3b634
update team member profiles and animation speed
cindyqquach May 3, 2023
a283b84
Merge branch 'coop2023' of https://github.com/rightoneducation/offici…
cindyqquach May 3, 2023
560121e
Update to Home Page
jasonmosley21 May 3, 2023
1db72d1
fix indents and rename logo files
cindyqquach May 4, 2023
db789ef
Updates to indentation
jasonmosley21 May 4, 2023
01e8ade
fix the background img
jasonmosley21 May 4, 2023
6cc9241
Centered logos and adjusted spacing
jasonmosley21 May 4, 2023
400aef6
Update landingPage.scss
cindyqquach May 4, 2023
99a7191
Merge branch 'coop2023' of https://github.com/rightoneducation/offici…
cindyqquach May 4, 2023
5917778
Adjusted Headings and underline
jasonmosley21 May 4, 2023
7d255ec
update to logos, video comments, and formatting
jasonmosley21 May 5, 2023
eec1749
Updates the supporters.jsx
jasonmosley21 May 5, 2023
26baca2
fixed responsive header, footer on tablet
cindyqquach May 5, 2023
fd7b7b2
Merge branch 'coop2023' of https://github.com/rightoneducation/offici…
cindyqquach May 5, 2023
4a39eeb
clean up space
cindyqquach May 5, 2023
ddf54ea
fixed an positioning issue
jasonmosley21 May 5, 2023
3be8056
formatting
drewjhart May 8, 2023
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
13 changes: 5 additions & 8 deletions package.json
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you both need to make these changes to get the environment running? It's probably not a big deal but can you provide some context to explain why each of the versions are changing?

Copy link
Contributor

Choose a reason for hiding this comment

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

We actually don't know what happened but currently we both have the node-sass: 8.0 version on our local folder.

Copy link
Contributor

Choose a reason for hiding this comment

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

hmmm, ok sounds good. let's go with these versions then.

Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,21 @@
"@material-ui/icons": "^4.9.1",
"bootstrap": "5.1.3",
"classnames": "2.3.1",
"node-sass": "^7.0.1",
"node-sass": "^8.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-modal": "^3.15.1",
"react-flippy": "^0.1.5",
"react-icons": "^4.4.0",
"react-material-ui-carousel": "^3.4.2",
"react-modal": "^3.15.1",
"react-router-dom": "^5.3.3",
"react-scripts": "^4.0.3",
"react-scripts": "^5.0.1",
"reactjs-video-playlist-player": "^1.1.1",
"sass": "1.50.0",
"styled-components": "^5.3.5",
"velocity-react": "^1.4.3"
},
"overrides": {
},
"overrides": {},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
Expand All @@ -36,7 +35,5 @@
"not dead",
"not ie <= 11",
"not op_mini all"
],
"devDependencies": {
}
]
}
14 changes: 14 additions & 0 deletions public/images/4.0.svg
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

this is nitpicky but can we rename this file so that it doesn't include a period in the filename itself? 4point.svg or something?

Copy link

Choose a reason for hiding this comment

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

Great point -- 4.0 oftentimes uses 4pt0, so we might go with that

Copy link
Contributor

Choose a reason for hiding this comment

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

fixed it!

Copy link
Contributor

Choose a reason for hiding this comment

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

perfect, nice one

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/NSF.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/Schmidt Futures.svg
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Similarly, if we are using hyphens between words (like with andy-circle.png) we should probably be consistent throughout the folder. So this would be coming schmidt-futures.svg

Copy link
Contributor

Choose a reason for hiding this comment

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

just renamed it with the rest of the logos!

Copy link
Contributor

Choose a reason for hiding this comment

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

sounds good

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions public/images/Tools Competition.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions public/images/Vela.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading