Skip to content

Commit

Permalink
Prepare for launch (#33)
Browse files Browse the repository at this point in the history
* Add SIGs section with working SIG switcher

* Add buttons

* Add grid layout, colors

* Inital commit

* Add SIGs section with working SIG switcher

* Update footer styling

* Update sponsors styling

* Fixed breakpoints and scaling for hero

* Contain width of page on all but events sections

* Create similar styling

* Add icons

* Fix font sizes in footer

* Update events styling

* Add sig image files, fix logo background in hero

* Fix more sizing for hero background

* Added email form link

* Add missing SIG information

* Remove 'About' section

* Create community icons

* Add scrolling for communities + sigs -> communities

* Remove the sign-in button

* Fix issue with filter not showing all events

* Update event entries

* Change event community icon to match other section

* Fix issue with incorrect event width

* Remove items from and rearrange footer

* Change 'About ACM' to 'ACM Global'

* Fix email placement in SIGs + constrained events

* tighter page constraint

* Remove unnecessary console output

* Add empty filter text

* Fix footer link to communities section

* Fix footer section line margin
  • Loading branch information
Clay McGinnis authored and kevinschoonover committed Aug 19, 2019
1 parent 0b89e09 commit 0d53464
Show file tree
Hide file tree
Showing 31 changed files with 575 additions and 451 deletions.
2 changes: 1 addition & 1 deletion apps/web/src/components/common/PageConstraint.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from "styled-components";

const PageConstraint: any = styled.div`
max-width: 1400px;
max-width: 1200px;
width: 100%;
height: 100%;
margin: auto;
Expand Down
13 changes: 8 additions & 5 deletions apps/web/src/components/pages/HomePage/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import * as React from "react";
import styled from "styled-components";

// import About from "./sections/About";
// import Events from "./sections/Events";
// import { Footer } from "./sections/Footer";
import Events from "./sections/Events";
import { Footer } from "./sections/Footer";
import Hero from "./sections/Hero";
import { Nav } from "./sections/Nav";
// import { SIGs } from "./sections/SIGs";
// import { Sponsors } from "./sections/Sponsors";
import { SIGs } from "./sections/SIGs";
import { Sponsors } from "./sections/Sponsors";

const NavHeroWrapper = styled.div`
height: 100vh;
Expand All @@ -30,6 +29,10 @@ const HomePage: React.FC<{}> = () => {
<Nav />
<Hero />
</NavHeroWrapper>
<SIGs />
<Events />
<Sponsors />
<Footer />
</div>
);
};
Expand Down
1 change: 0 additions & 1 deletion apps/web/src/components/pages/HomePage/sections/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import styled from "styled-components";

import { PageConstraint } from "../../../common/PageConstraint";


const Wrapper = styled.div`
.sectionWrapper {
position: relative;
Expand Down
36 changes: 18 additions & 18 deletions apps/web/src/components/pages/HomePage/sections/Events.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"events": [
{
"img_path": "flier.jpg",
"img_path": "recruitment_drive.jpg",
"day": "27",
"month": "AUG",
"sig_logo": "icon.svg",
"sig_logo": "game.png",
"title": "Recruitment Drive",
"location": "Toomey Hall Rm. 199",
"time": "5:00pm - 6:00pm",
Expand All @@ -13,22 +13,22 @@
"group": "ACM General"
},
{
"img_path": "flier.jpg",
"img_path": "",
"day": "24",
"month": "SEPT",
"sig_logo": "icon.svg",
"sig_logo": "acm.png",
"title": "Career Fair Dinner",
"location": "Alex's Pizza",
"time": "6:00pm - 9:00pm",
"desc": "Talk to companies looking for Computer Science students for longer than a 2-minute career fair interaction, without the hassle of waiting in long lines. Join ACM at our fall Career Fair Dinner! Reminder: You must be an ACM member to participate in the dinner.",
"shortDesc": "Talk to companies looking for Computer Science students for longer than a 2-minute career fair interaction, without the hassle of waiting in long lines",
"shortDesc": "Talk to companies looking for Computer Science students for longer than a 2-minute career fair interaction, without the hassle of waiting in long lines.",
"group": "ACM General"
},
{
"img_path": "flier.jpg",
"img_path": "",
"day": "19",
"month": "OCT",
"sig_logo": "icon.svg",
"sig_logo": "comp.png",
"title": "Programming Cup",
"location": "TBD",
"time": "TBD",
Expand All @@ -37,10 +37,10 @@
"group": "ACM Comp"
},
{
"img_path": "flier.jpg",
"img_path": "",
"day": "26",
"month": "OCT",
"sig_logo": "icon.svg",
"sig_logo": "sec.png",
"title": "WiFi Workshop",
"location": "TBD",
"time": "TBD",
Expand All @@ -49,28 +49,28 @@
"group": "ACM Sec"
},
{
"img_path": "flier.jpg",
"img_path": "",
"day": "31",
"month": "OCT",
"sig_logo": "icon.svg",
"sig_logo": "sec.png",
"title": "Lockpicking Fundraiser",
"location": "TBD",
"time": "TBD",
"desc": "Come learn how to lockpick and compete to win a lockpicking set. Proceeds support ACM Security.",
"shortDesc": "Come learn how to lockpick and compete to win a lockpicking set. Proceeds support ACM Security.",
"desc": "Learn how to lockpick and compete to win a lockpicking set. Proceeds support ACM Security.",
"shortDesc": "Learn how to lockpick and compete to win a lockpicking set. Proceeds support ACM Security.",
"group": "ACM Sec"
},
{
"img_path": "flier.jpg",
"img_path": "",
"day": "06",
"month": "DEC",
"sig_logo": "icon.svg",
"sig_logo": "acm.png",
"title": "MinerLAN",
"location": "BCH Atrium",
"time": "6:00pm - 12:00am",
"desc": "Come relax, eat food, and play games to win prizes with ACM before starting finals!",
"shortDesc": "Come relax, eat food, and play games to win prizes with ACM before starting finals!",
"desc": "Relax, eat food, and play games to win prizes with ACM before starting finals!",
"shortDesc": "Relax, eat food, and play games to win prizes with ACM before starting finals!",
"group": "ACM General"
}
]
}
}
Loading

0 comments on commit 0d53464

Please sign in to comment.