Skip to content

Commit 67b52a5

Browse files
cherylqiancherylqian
committed
add video links and update exec info
1 parent ddba17d commit 67b52a5

File tree

5 files changed

+80
-20
lines changed

5 files changed

+80
-20
lines changed

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"react-router-dom": "^5.0.1",
1414
"react-scripts": "^3.0.1",
1515
"react-stack-grid": "^0.7.1",
16+
"react-youtube": "^7.9.0",
1617
"three": "^0.106.2"
1718
},
1819
"scripts": {

‎src/About.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const About = ({ size }) => {
2626
<>
2727
<h2>About Us</h2>
2828
{about.about}
29-
<p className="h5 mt-3">Meet us on Mondays 7pm @ Siebel 3401!</p>
29+
<p className="h5 mt-3">{about.meeting}</p>
3030
<h3 className="mt-1">Exec</h3>
3131
<StackGrid columnWidth={width <= 768 ? "100%" : "33.33%"}>
3232
{about.exec.map(item => (

‎src/Projects.js

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
11
import React from "react";
2+
import { Card, Button } from "react-bootstrap";
23
import StackGrid from "react-stack-grid";
4+
5+
import YouTube from "react-youtube";
6+
37
import { projects } from "./data/data";
48

59
const Project = ({ item }) => {
10+
const opts = {
11+
height: 300,
12+
width: 640,
13+
playerVars: {
14+
// https://developers.google.com/youtube/player_parameters
15+
autoplay: 1
16+
}
17+
};
618
return (
7-
<div className="card m-3">
8-
<div className="card-body">
9-
<h3 className="card-title">{item.name}</h3>
10-
<p className="card-text">{item.description}</p>
11-
</div>
12-
</div>
19+
<Card>
20+
<Card.Body>
21+
<Card.Title>{item.name}</Card.Title>
22+
<Card.Text>{item.description}</Card.Text>
23+
{item.media && (
24+
<Button variant="secondary" block href={item.media}>
25+
Demo
26+
</Button>
27+
)}
28+
</Card.Body>
29+
</Card>
1330
);
1431
};
1532

‎src/data/data.js

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ export const projects = {
33
{
44
name: "Go Squirrel",
55
description:
6-
"A tiny little squirrel is crossing the street, and there comes a car..."
6+
"A tiny little squirrel is crossing the street, and there comes a car...",
7+
media: "https://youtu.be/FCCHRdrrfnw"
78
},
89
{
910
name: "Sunny",
@@ -12,8 +13,13 @@ export const projects = {
1213
},
1314
{
1415
name: "Pro Bending VR",
16+
description: "A Pro Bending game developed in VR."
17+
},
18+
{
19+
name: "3D Museum",
1520
description:
16-
"A Pro Bending game developed in VR."
21+
"A collection of distinct model works over the past semester",
22+
media: "https://youtu.be/MGKMD_lFVrM"
1723
}
1824
],
1925
past: [
@@ -40,19 +46,27 @@ export const about = {
4046
"We are the student chapter of ACM SIGGRAPH at the University of Illinois at Urbana-Champaign. ACM SIGGRAPH is a nonprofit international membership organization made up of thousands of people who share a passion for computer graphics and interactive techniques. ACM SIGGRAPH members are involved in a wide variety of fields, including computer graphics research, software development, digital art, scientific visualization, interactive technology, game design, visual effects, computer science, education, engineering, graphic design, film and television production, scientific research and more.",
4147
exec: [
4248
{
43-
name: "Samuel McFadden",
49+
name: "Chen Qian",
4450
position: "Chair",
45-
email: "[email protected]"
46-
},
47-
{
48-
name: "Jasmine Shih",
49-
position: "Vice Chair",
50-
email: "[email protected]"
51+
email: "[email protected]"
5152
},
5253
{
5354
name: "Michelle Giang",
54-
position: "Treasurer",
55+
position: "Soical Lead",
5556
email: "[email protected]"
57+
},
58+
{
59+
name: "Samuel McFadden",
60+
position: "Tech Lead",
61+
email: "[email protected]"
62+
},
63+
64+
{
65+
name: "Kevin Zhang",
66+
position: "Project Lead",
67+
email: ""
5668
}
57-
]
69+
],
70+
meeting:
71+
"The meeting time and location is still TBD. Join Slack and we'll keep you updated!"
5872
};

‎yarn.lock

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3217,7 +3217,7 @@ date-now@^0.1.4:
32173217
resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
32183218
integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
32193219

3220-
[email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
3220+
[email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
32213221
version "2.6.9"
32223222
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
32233223
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -6228,6 +6228,11 @@ load-json-file@^4.0.0:
62286228
pify "^3.0.0"
62296229
strip-bom "^3.0.0"
62306230

6231+
load-script@^1.0.0:
6232+
version "1.0.0"
6233+
resolved "https://registry.yarnpkg.com/load-script/-/load-script-1.0.0.tgz#0491939e0bee5643ee494a7e3da3d2bac70c6ca4"
6234+
integrity sha1-BJGTngvuVkPuSUp+PaPSuscMbKQ=
6235+
62316236
loader-fs-cache@^1.0.0:
62326237
version "1.0.2"
62336238
resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz#54cedf6b727e1779fd8f01205f05f6e88706f086"
@@ -8260,7 +8265,7 @@ prop-types-extra@^1.1.0:
82608265
react-is "^16.3.2"
82618266
warning "^3.0.0"
82628267

8263-
prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
8268+
prop-types@^15.5.10, prop-types@^15.5.3, prop-types@^15.5.6, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
82648269
version "15.7.2"
82658270
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
82668271
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -8693,6 +8698,15 @@ react-transition-group@^4.0.0:
86938698
loose-envify "^1.4.0"
86948699
prop-types "^15.6.2"
86958700

8701+
react-youtube@^7.9.0:
8702+
version "7.9.0"
8703+
resolved "https://registry.yarnpkg.com/react-youtube/-/react-youtube-7.9.0.tgz#cf513c253581e1e45aa412a77d03420dfd7f7ba7"
8704+
integrity sha512-2+nBF4qP8nStYEILIO1/SylKOCnnJUxuZm+qCeWA0eeZxnWZIIixfAeAqbzblwx5L1n/26ACocy3epm9Glox8w==
8705+
dependencies:
8706+
fast-deep-equal "^2.0.1"
8707+
prop-types "^15.5.3"
8708+
youtube-player "^5.5.1"
8709+
86968710
react@^16.8.6:
86978711
version "16.8.6"
86988712
resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
@@ -9388,6 +9402,11 @@ simple-swizzle@^0.2.2:
93889402
dependencies:
93899403
is-arrayish "^0.3.1"
93909404

9405+
sister@^3.0.0:
9406+
version "3.0.2"
9407+
resolved "https://registry.yarnpkg.com/sister/-/sister-3.0.2.tgz#bb3e39f07b1f75bbe1945f29a27ff1e5a2f26be4"
9408+
integrity sha512-p19rtTs+NksBRKW9qn0UhZ8/TUI9BPw9lmtHny+Y3TinWlOa9jWh9xB0AtPSdmOy49NJJJSSe0Ey4C7h0TrcYA==
9409+
93919410
sisteransi@^1.0.0:
93929411
version "1.0.2"
93939412
resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.2.tgz#ec57d64b6f25c4f26c0e2c7dd23f2d7f12f7e418"
@@ -11048,3 +11067,12 @@ yargs@^7.0.0:
1104811067
which-module "^1.0.0"
1104911068
y18n "^3.2.1"
1105011069
yargs-parser "^5.0.0"
11070+
11071+
youtube-player@^5.5.1:
11072+
version "5.5.2"
11073+
resolved "https://registry.yarnpkg.com/youtube-player/-/youtube-player-5.5.2.tgz#052b86b1eabe21ff331095ffffeae285fa7f7cb5"
11074+
integrity sha512-ZGtsemSpXnDky2AUYWgxjaopgB+shFHgXVpiJFeNB5nWEugpW1KWYDaHKuLqh2b67r24GtP6HoSW5swvf0fFIQ==
11075+
dependencies:
11076+
debug "^2.6.6"
11077+
load-script "^1.0.0"
11078+
sister "^3.0.0"

0 commit comments

Comments
 (0)