-
Notifications
You must be signed in to change notification settings - Fork 0
Companies Page #5
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
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
ec564c0
Companies Page
Jvil26 c5ff477
Companies Page
Jvil26 2a07cfa
Merge branch 'companies-page' of https://github.com/acmucsd/space-202…
Jvil26 b3535b4
Added Responsiveness
Jvil26 6a59c2e
Improved styling for company image
Jvil26 312338b
Improve grid scaling
Jvil26 3277bb3
Companies Page
Jvil26 9f8d7be
Added Responsiveness
Jvil26 afa0716
Improved styling for company image
Jvil26 76cab9a
Improve grid scaling
Jvil26 075907a
Merge branch 'companies-page' of https://github.com/acmucsd/space-202…
Jvil26 a8c4d29
Update Company Info and Styling
Jvil26 8393fc0
Added Flock Freight Logo
Jvil26 16321de
Aspect Ratio of Company Items & Commented Out Companies
Jvil26 be44766
Merge branch 'main' into companies-page
farisashai File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| import s from "./style.module.scss"; | ||
|
|
||
| const companies = [ | ||
| // { | ||
| // name: "Shield AI", | ||
| // logo: "", | ||
| // link: "https://shield.ai/", | ||
| // alt: "Shield AI Company Sponsor Logo", | ||
| // }, | ||
| { | ||
| name: "MaXentric", | ||
| logo: "asset/MaXentric_logo.png", | ||
| link: "https://maxentric.com/", | ||
| alt: "MaXentric Company Sponsor Logo", | ||
| }, | ||
| { | ||
| name: "MagnaFlow", | ||
| logo: "asset/MagnaFlow_logo.png", | ||
| link: "https://www.magnaflow.com/", | ||
| alt: "MagnaFlow Company Sponsor Logo", | ||
| }, | ||
|
|
||
| { | ||
| name: "LPL Financial", | ||
| logo: "asset/LplFinancial_logo.png", | ||
| link: "https://www.lpl.com/", | ||
| alt: "LPL Financial Company Sponsor Logo", | ||
| }, | ||
| { | ||
| name: "Xifin", | ||
| logo: "asset/Xifin_logo.png", | ||
| link: "https://www.xifin.com/", | ||
| alt: "Xifin Company Sponsor Logo", | ||
| }, | ||
| { | ||
| name: "Flock Freight", | ||
| logo: "asset/FlockFreight_logo.png", | ||
| link: "https://www.flockfreight.com/", | ||
| alt: "Flock Freight Company Sponsor Logo", | ||
| }, | ||
| // { | ||
| // name: "ASML", | ||
| // logo: "", | ||
| // link: "https://www.asml.com/en", | ||
| // alt: "ASML Company Sponsor Logo", | ||
| // }, | ||
| ]; | ||
|
|
||
| const CompaniesGrid: React.FC = () => { | ||
| return ( | ||
| <div className={s.container}> | ||
| {companies.map((company, index) => ( | ||
| <a className={s.companyItem} key={index} href={company.link}> | ||
| <img src={company.logo} className={s.companyLogo} alt={company.alt} /> | ||
| <h5 className={s.companyName}>{company.name}</h5> | ||
| </a> | ||
| ))} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default CompaniesGrid; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| @use "src/styles/vars.scss" as vars; | ||
|
|
||
| .container { | ||
| display: grid; | ||
| grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr)); | ||
| margin-top: 4rem; | ||
| row-gap: 1.7rem; | ||
| column-gap: 1.25rem; | ||
|
|
||
| .companyItem { | ||
| background: vars.$grey; | ||
| border-radius: 1.25rem; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| padding: 2rem 2rem 0.75rem 2rem; | ||
| text-decoration: none; | ||
|
|
||
| &:hover { | ||
| transform: scale(1.03); | ||
| transition: 0.5s ease-in-out; | ||
| } | ||
| > .companyName { | ||
| margin: 0; | ||
| font-style: normal; | ||
| font-weight: 600; | ||
| font-size: 1.12rem; | ||
| line-height: 1.2rem; | ||
| color: #120e46; | ||
| } | ||
|
|
||
| .companyLogo { | ||
| object-fit: contain; | ||
| width: 80%; | ||
| height: 6rem; | ||
| overflow: hidden; | ||
| } | ||
| } | ||
|
|
||
| @media only screen and (max-width: 425px) { | ||
| .companyItem { | ||
| width: 80vw; | ||
| } | ||
| grid-template-columns: repeat(auto-fit, minmax(11.25rem, 1fr)); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,13 @@ | ||
| import CompaniesGrid from "src/components/CompaniesGrid"; | ||
| import s from "./style.module.scss"; | ||
|
|
||
| const Companies: React.FC = () => { | ||
| return <div></div> | ||
| } | ||
| return ( | ||
| <section className={s.container}> | ||
| <h1>Participating Companies</h1> | ||
| <CompaniesGrid /> | ||
| </section> | ||
| ); | ||
| }; | ||
|
|
||
| export default Companies; | ||
| export default Companies; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| @use "src/styles/vars.scss" as vars; | ||
|
|
||
| .container { | ||
| background: linear-gradient(180deg, vars.$pink 30%, vars.$blue 160%); | ||
| min-height: 100vh; | ||
| padding: 2.5rem; | ||
|
|
||
| > h1 { | ||
| font-style: normal; | ||
| font-size: 2.8rem; | ||
| font-weight: 600; | ||
| color: vars.$white; | ||
| text-align: center; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,4 @@ $black: #000000; | |
| $blue: #110f47; | ||
| $pink: #967785; | ||
| $white: #ffffff; | ||
| $grey: #d9d9d9; | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.