Skip to content

Front page fix (updated)#153

Merged
adriandarian merged 3 commits intodevelopfrom
frontPageFix
Mar 31, 2021
Merged

Front page fix (updated)#153
adriandarian merged 3 commits intodevelopfrom
frontPageFix

Conversation

@ifelsejet
Copy link
Copy Markdown
Member

Proposed changes

Fixed links based off the current develop branch

Types of changes

What types of changes does your code introduce to HackMerced Hub?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING doc
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)
  • Any dependent changes have been merged and published in downstream modules

Responsiveness

Check off the different browsers and devices you have tested on. Note: testing includes Horizontal and Vertical alignments

Browsers

  • Chrome
  • Firefox
  • Edge
  • Safari
  • Brave
  • Opera

Devices

Phones

  • Moto G4
  • Galaxy S5
  • Pixel 2
  • Pixel 2 XL
  • iPhone 5/SE
  • iPhone 6/7/8
  • iPhone 6/7/8 Plus
  • iPhone X

Tablets

  • iPad
  • iPad Pro

Desktops

  • Windows 10
  • MacOSX
  • Ubuntu

Screenshots

Please attach at least one Desktop and Mobile screenshot of your update.

Further comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

@github-actions github-actions bot added the react label Mar 26, 2021
@adriandarian adriandarian added the invalid This doesn't seem right label Mar 26, 2021
@adriandarian adriandarian self-requested a review March 26, 2021 22:48
&__break-line {
border: 0.5rem solid var(--orange);
opacity: 50%;
opacity: 0.5;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this is the same thing as previously

Comment on lines +1 to +79
import React, { FC } from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
faHandHoldingHeart,
faHandshake,
faLaptopCode,
faPalette,
faMeteor,
faSchool,
faMicrochip,
faSearch,
faCloud,
} from "@fortawesome/free-solid-svg-icons";
import { faDigitalOcean } from "@fortawesome/free-brands-svg-icons";

import "./styles.scss";

const PastWinners: FC = (): JSX.Element => {
return (
<section className="PAST-WINNERS">
<h3 className="past-winners-title">Past Winners</h3>
<div className="break-line"></div>
<nav className="winners">
<a href="https://devpost.com/software/sustainably-yours" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faHandHoldingHeart} className="fa winner-icon" />
<h5 className="winner-title">Social Good</h5>
<h6 className="winner-group">Sustainably Yours</h6>
</a>
<a href="https://devpost.com/software/undyslexify" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faHandshake} className="fa winner-icon" />
<h5 className="winner-title">Inclusivity</h5>
<h6 className="winner-group">Undyslexify</h6>
</a>
<a href="https://devpost.com/software/repul-ink" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faLaptopCode} className="fa winner-icon" />
<h5 className="winner-title">CyberSecurity</h5>
<h6 className="winner-group">Repul.ink</h6>
</a>
<a href="https://devpost.com/software/sustainably-yours" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faPalette} className="fa winner-icon" />
<h5 className="winner-title">Best in Design</h5>
<h6 className="winner-group">Sustainably Yours</h6>
</a>
<a href="https://devpost.com/software/uc-merced-basketball-analysis" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faSchool} className="fa winner-icon" />
<h5 className="winner-title">Best UC Merced-Related Hack</h5>
<h6 className="winner-group">UC Merced Basketball Analysis</h6>
</a>
<a href="https://devpost.com/software/esose" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faSearch} className="fa winner-icon" />
<h5 className="winner-title">Tech for Social Good</h5>
<h6 className="winner-group">Vacchecker</h6>
</a>
<a href="https://devpost.com/software/3d-for-education" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faMicrochip} className="fa winner-icon" />
<h5 className="winner-title">Best Hardware Hack</h5>
<h6 className="winner-group">EcoSafe</h6>
</a>
<a href="https://devpost.com/software/blood-buds" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faMeteor} className="fa winner-icon" />
<h5 className="winner-title">Moonshot</h5>
<h6 className="winner-group">Blood Buds</h6>
</a>
<a href="https://devpost.com/software/streetspots" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faDigitalOcean} className="fa winner-icon" />
<h5 className="winner-title">Best Domain Using Domain.com</h5>
<h6 className="winner-group">StreetSpots.Online</h6>
</a>
<a href="https://devpost.com/software/idvision" target="_blank" rel="noopener noreferrer">
<FontAwesomeIcon icon={faCloud} className="fa winner-icon" />
<h5 className="winner-title">Best Use of Google Cloud</h5>
<h6 className="winner-group">IdVision</h6>
</a>
</nav>
</section>
);
};

export default PastWinners;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Past Winners was migrated to the src/pages/Home, please make your changes there.

@adriandarian
Copy link
Copy Markdown
Member

Please don't make a PR into the master branch.

image

@ifelsejet ifelsejet changed the base branch from master to develop March 27, 2021 00:17
Copy link
Copy Markdown
Member

@adriandarian adriandarian left a comment

Choose a reason for hiding this comment

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

delete the src/components/PastWinners/index.tsx, since you made the changes to the winners.ts data file. We no longer support non-reusable components.

@adriandarian adriandarian merged commit f7e35fc into develop Mar 31, 2021
@delete-merged-branch delete-merged-branch bot deleted the frontPageFix branch March 31, 2021 04:14
adriandarian added a commit that referenced this pull request Oct 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

invalid This doesn't seem right react

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants