diff --git a/src/assets/bio-photos/skyler-other-pics/skyler-vr.jpg b/src/assets/bio-photos/skyler-other-pics/skyler-vr.jpg
new file mode 100644
index 0000000..01573f5
Binary files /dev/null and b/src/assets/bio-photos/skyler-other-pics/skyler-vr.jpg differ
diff --git a/src/assets/meet-the-team-2022/anastasia-avatar.png b/src/assets/meet-the-team-2022/anastasia-avatar.png
new file mode 100644
index 0000000..b911c79
Binary files /dev/null and b/src/assets/meet-the-team-2022/anastasia-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/ange-avatar.png b/src/assets/meet-the-team-2022/ange-avatar.png
new file mode 100644
index 0000000..6535bf3
Binary files /dev/null and b/src/assets/meet-the-team-2022/ange-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/austin-avatar.png b/src/assets/meet-the-team-2022/austin-avatar.png
new file mode 100644
index 0000000..2fba93a
Binary files /dev/null and b/src/assets/meet-the-team-2022/austin-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/belinda-avatar.png b/src/assets/meet-the-team-2022/belinda-avatar.png
new file mode 100644
index 0000000..9cd2e53
Binary files /dev/null and b/src/assets/meet-the-team-2022/belinda-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/claire-avatar.png b/src/assets/meet-the-team-2022/claire-avatar.png
new file mode 100644
index 0000000..ae9d05c
Binary files /dev/null and b/src/assets/meet-the-team-2022/claire-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/desiree-avatar.png b/src/assets/meet-the-team-2022/desiree-avatar.png
new file mode 100644
index 0000000..69e62fa
Binary files /dev/null and b/src/assets/meet-the-team-2022/desiree-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/diana-avatar.png b/src/assets/meet-the-team-2022/diana-avatar.png
new file mode 100644
index 0000000..0b959d6
Binary files /dev/null and b/src/assets/meet-the-team-2022/diana-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/edison-avatar.png b/src/assets/meet-the-team-2022/edison-avatar.png
new file mode 100644
index 0000000..d6aec83
Binary files /dev/null and b/src/assets/meet-the-team-2022/edison-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/grace-avatar.png b/src/assets/meet-the-team-2022/grace-avatar.png
new file mode 100644
index 0000000..7c6c3fb
Binary files /dev/null and b/src/assets/meet-the-team-2022/grace-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/hannah-avatar.png b/src/assets/meet-the-team-2022/hannah-avatar.png
new file mode 100644
index 0000000..cc181a4
Binary files /dev/null and b/src/assets/meet-the-team-2022/hannah-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/jacob-avatar.png b/src/assets/meet-the-team-2022/jacob-avatar.png
new file mode 100644
index 0000000..fc2f740
Binary files /dev/null and b/src/assets/meet-the-team-2022/jacob-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/jake-avatar.png b/src/assets/meet-the-team-2022/jake-avatar.png
new file mode 100644
index 0000000..aa6b7dd
Binary files /dev/null and b/src/assets/meet-the-team-2022/jake-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/jenny-avatar.png b/src/assets/meet-the-team-2022/jenny-avatar.png
new file mode 100644
index 0000000..1d6291b
Binary files /dev/null and b/src/assets/meet-the-team-2022/jenny-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/julian-avatar.png b/src/assets/meet-the-team-2022/julian-avatar.png
new file mode 100644
index 0000000..e9643e2
Binary files /dev/null and b/src/assets/meet-the-team-2022/julian-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/julie-avatar.png b/src/assets/meet-the-team-2022/julie-avatar.png
new file mode 100644
index 0000000..b1d8bcb
Binary files /dev/null and b/src/assets/meet-the-team-2022/julie-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/kadiatou-avatar-modified.png b/src/assets/meet-the-team-2022/kadiatou-avatar-modified.png
new file mode 100644
index 0000000..c9be411
Binary files /dev/null and b/src/assets/meet-the-team-2022/kadiatou-avatar-modified.png differ
diff --git a/src/assets/meet-the-team-2022/katelyn-avatar.png b/src/assets/meet-the-team-2022/katelyn-avatar.png
new file mode 100644
index 0000000..ee1ca4b
Binary files /dev/null and b/src/assets/meet-the-team-2022/katelyn-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/kevin-avatar.png b/src/assets/meet-the-team-2022/kevin-avatar.png
new file mode 100644
index 0000000..8a8fbfb
Binary files /dev/null and b/src/assets/meet-the-team-2022/kevin-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/lauren-avatar.png b/src/assets/meet-the-team-2022/lauren-avatar.png
new file mode 100644
index 0000000..a28fae1
Binary files /dev/null and b/src/assets/meet-the-team-2022/lauren-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/lily-avatar.png b/src/assets/meet-the-team-2022/lily-avatar.png
new file mode 100644
index 0000000..8305695
Binary files /dev/null and b/src/assets/meet-the-team-2022/lily-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/mae-avatar.png b/src/assets/meet-the-team-2022/mae-avatar.png
new file mode 100644
index 0000000..1cee7ba
Binary files /dev/null and b/src/assets/meet-the-team-2022/mae-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/margaret-avatar-1.png b/src/assets/meet-the-team-2022/margaret-avatar-1.png
new file mode 100644
index 0000000..2d32b87
Binary files /dev/null and b/src/assets/meet-the-team-2022/margaret-avatar-1.png differ
diff --git a/src/assets/meet-the-team-2022/raghu-avatar.png b/src/assets/meet-the-team-2022/raghu-avatar.png
new file mode 100644
index 0000000..a772926
Binary files /dev/null and b/src/assets/meet-the-team-2022/raghu-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/skyler-avatar.png b/src/assets/meet-the-team-2022/skyler-avatar.png
new file mode 100644
index 0000000..b8da7ae
Binary files /dev/null and b/src/assets/meet-the-team-2022/skyler-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/suji-avatar.png b/src/assets/meet-the-team-2022/suji-avatar.png
new file mode 100644
index 0000000..d0a24fd
Binary files /dev/null and b/src/assets/meet-the-team-2022/suji-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/trupti-avatar.png b/src/assets/meet-the-team-2022/trupti-avatar.png
new file mode 100644
index 0000000..9c38ed3
Binary files /dev/null and b/src/assets/meet-the-team-2022/trupti-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/ty-avatar.png b/src/assets/meet-the-team-2022/ty-avatar.png
new file mode 100644
index 0000000..866ef8d
Binary files /dev/null and b/src/assets/meet-the-team-2022/ty-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/tyler-avatar.png b/src/assets/meet-the-team-2022/tyler-avatar.png
new file mode 100644
index 0000000..82a378c
Binary files /dev/null and b/src/assets/meet-the-team-2022/tyler-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/yang-avatar.png b/src/assets/meet-the-team-2022/yang-avatar.png
new file mode 100644
index 0000000..d03b73a
Binary files /dev/null and b/src/assets/meet-the-team-2022/yang-avatar.png differ
diff --git a/src/assets/meet-the-team-2022/zack-avatar.png b/src/assets/meet-the-team-2022/zack-avatar.png
new file mode 100644
index 0000000..29ba63a
Binary files /dev/null and b/src/assets/meet-the-team-2022/zack-avatar.png differ
diff --git a/src/index.jsx b/src/index.jsx
index d7bcfe4..82aa679 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,4 +1,5 @@
-import React from 'react';
+
+import React, { useState, useEffect } from 'react';
import ReactDOM from 'react-dom';
import{
HashRouter as Router,
@@ -10,8 +11,33 @@ import './styles/main.scss';
import Home from './Home.jsx';
import Team from './Team.jsx';
import APIinfo from './APIinfo.jsx';
+import SwaggerParser from "@apidevtools/swagger-parser";
+import AngesComponent from './wintern-bios/2022/AngesComponent.jsx';
+import KadiatouComponent from './wintern-bios/2022/KadiatouComponent.jsx';
+import LaurenComponent from './wintern-bios/2022/LaurenComponent.jsx';
+import SkylerComponent from './wintern-bios/2022/SkylerComponent.jsx';
+import MargaretComponent from './wintern-bios/2022/MargaretComponent.jsx';
+import Header from './Header.jsx';
const App = () => {
+const [api, setApi] = useState(null);
+
+useEffect(() => {
+ const openSwaggerFile = async () => {
+ try {
+ let api = await SwaggerParser.validate("./static/v4.json");
+ setApi(api);
+ console.log("API name: %s, Version: %s", api.info.title, api.info.version);
+ console.log(api);
+ }
+ catch(err) {
+ console.error(err);
+ }
+ }
+
+ openSwaggerFile();
+}, [])
+
return (
@@ -24,13 +50,34 @@ const App = () => {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ {api ? : Loading ...
}
);
-}
+
+ }
ReactDOM.render(
, document.getElementById('app'));
diff --git a/src/styles/2022_team_styles/_skyler-bio.scss b/src/styles/2022_team_styles/_skyler-bio.scss
index 5e20cc0..2b83127 100644
--- a/src/styles/2022_team_styles/_skyler-bio.scss
+++ b/src/styles/2022_team_styles/_skyler-bio.scss
@@ -11,8 +11,11 @@
font-weight: 900 !important;
}
+
.about-content h1, h2, h3 {
font-family: 'Poppins', sans-serif !important;
+ color:black !important;
+
}
.about-content {
@@ -21,7 +24,8 @@
.about-content p{
text-align: center !important;
-
+ color:black !important;
+
}
.aboutallcontent {
text-align: center;
@@ -31,6 +35,7 @@
font-size: 25px;
font-family: 'Poppins', sans-serif !important;
font-weight: bolder !important;
+ color:black !important;
}
@@ -38,6 +43,14 @@
font-size: 18px;
font-family: 'Poppins', sans-serif !important;
font-weight: bolder !important;
+ color:black !important;
+
+}
+
+.main-container{
+ background:#F2F1FF;
+ border: 1px solid black;
+ box-shadow: 3px 3px black;
}
@@ -63,6 +76,9 @@
.main-container p {
text-align: left;
font-family: 'Poppins', sans-serif !important;
+ color:black !important;
+ font-size: 17px;
+
}
@@ -74,12 +90,23 @@
text-align: center;
}
+.skyler-giphys {
+ display: block;
+ padding: 10px;
+ width: 200px;
+ height: auto;
+ text-align: center;
+ box-shadow: 3px 3px black;
+ border: 1px solid black;
+ background-color: white;
+}
+
.main-container {
display: table;
overflow: hidden;
min-height: 4200px; /* USE THIS TO ADJUST FIXED CONTAINER HEIGHT */
- padding-left: 250px;
- padding-right: 250px;
+ padding-left: 330px;
+ padding-right: 330px;
/* min-height: 1300px !important;
/* increase size of div according to contents? https://stackoverflow.com/questions/20814855/how-to-increase-size-of-div-according-to-its-contents
/*
@@ -97,6 +124,9 @@
padding: 10px;
width: 200px;
height: auto;
+ box-shadow: 3px 3px black;
+ border: 1px solid black;
+ background-color: white;
}
@@ -229,7 +259,7 @@
padding: 0px;
width: auto;
height: 250px;
- border-radius: 10px;
+ border-radius: 0px;
box-shadow: 3px 3px black;
border: 1px solid black;
@@ -242,7 +272,7 @@
padding: 0px;
width: auto;
height: 250px;
- border-radius: 10px;
+ border-radius: 0px;
box-shadow: 3px 3px black;
border: 1px solid black;
}
@@ -281,6 +311,8 @@
.contact-formspree textarea {
font-family: 'Poppins', sans-serif !important;
width: 400px;
+ border: 1px solid black;
+
}
.contact-formspree-button button p {
diff --git a/src/styles/2022_team_styles/_teamlist2022.scss b/src/styles/2022_team_styles/_teamlist2022.scss
new file mode 100644
index 0000000..00f8524
--- /dev/null
+++ b/src/styles/2022_team_styles/_teamlist2022.scss
@@ -0,0 +1,252 @@
+@import url('https://fonts.googleapis.com/css2?family=Poppins&display=swap'), url('https://www.scdn.co/i/connect/header-spikes-sm.jpg');
+
+
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ src: url('https://fonts.googleapis.com/css2?family=Poppins&display=swap');
+}
+
+.teampage2022 h1 {
+ font-family: 'Poppins', sans-serif !important;
+ font-weight: 900;
+ color: black;
+ text-align: center;
+}
+
+.teampage2022 p {
+ font-family: 'Poppins', sans-serif !important;
+ font-weight: 200;
+ color: black;
+}
+
+.avatar-cards {
+ display: flex;
+}
+
+/* Create two equal columns that sits next to each other */
+.avatar-card {
+ flex: 50%;
+ padding: 35px;
+}
+
+.avatar-card h5 {
+ margin-top: 0px;
+ margin-bottom: 0px;
+ padding-bottom: 15px;
+
+ font-family: 'Poppins', sans-serif !important;
+ font-weight: 200;
+ margin-right: auto;
+ margin-left: auto;
+ text-align: center;
+
+}
+.avatar-circle {
+ display: block;
+ padding: 10px;
+ width: 200px;
+ height: auto;
+ margin-right: auto;
+ margin-left: auto;
+ text-align: center;
+}
+
+.learn-more-button-yellow {
+ display: block;
+ padding: 10px 20px 10px 20px;
+ width: fit-content;
+ border-radius: 5px;
+ text-decoration: none;
+ line-height: 0px;
+ border: 1px solid black;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 10px;
+
+ /* Colors */
+ background-color: #FAF1D2;
+ box-shadow: 3px 3px black;
+
+ color: var(--navy);
+ transition: .5s ease-out;
+
+ /* Font */
+ font-weight: 600;
+ font-size: 11px !important;
+ color: black !important;
+
+}
+
+.learn-more-button-yellow p {
+ font-size: 14px !important;
+ font-weight: 900;
+
+}
+
+.learn-more-button-lightgreen {
+ display: block;
+ padding: 10px 20px 10px 20px;
+ width: fit-content;
+ border-radius: 5px;
+ text-decoration: none;
+ line-height: 0px;
+ border: 1px solid black;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 10px;
+
+
+ /* Colors */
+ background-color: #E8F9E8;
+ box-shadow: 3px 3px black;
+
+ color: var(--navy);
+ transition: .5s ease-out;
+
+ /* Font */
+ font-weight: 600;
+ font-size: 11px !important;
+ color: black !important;
+
+}
+
+.learn-more-button-lightgreen p {
+ font-size: 14px !important;
+ font-weight: 900;
+
+}
+
+.learn-more-button-green {
+ display: block;
+ padding: 10px 20px 10px 20px;
+ width: fit-content;
+ border-radius: 5px;
+ text-decoration: none;
+ line-height: 0px;
+ border: 1px solid black;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 10px;
+
+
+ /* Colors */
+ background-color: #9DC79F;
+ box-shadow: 3px 3px black;
+
+ color: var(--navy);
+ transition: .5s ease-out;
+
+ /* Font */
+ font-weight: 600;
+ font-size: 11px !important;
+ color: black !important;
+
+}
+
+.learn-more-button-green p {
+ font-size: 14px !important;
+ font-weight: 900;
+
+}
+
+.learn-more-button-green {
+ display: block;
+ padding: 10px 20px 10px 20px;
+ width: fit-content;
+ border-radius: 5px;
+ text-decoration: none;
+ line-height: 0px;
+ border: 1px solid black;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 10px;
+
+
+ /* Colors */
+ background-color: #9DC79F;
+ box-shadow: 3px 3px black;
+
+ color: var(--navy);
+ transition: .5s ease-out;
+
+ /* Font */
+ font-weight: 600;
+ font-size: 11px !important;
+ color: black !important;
+
+}
+
+.learn-more-button-green p {
+ font-size: 14px !important;
+ font-weight: 900;
+
+}
+
+.learn-more-button-blue {
+ display: block;
+ padding: 10px 20px 10px 20px;
+ width: fit-content;
+ border-radius: 5px;
+ text-decoration: none;
+ line-height: 0px;
+ border: 1px solid black;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 10px;
+
+
+ /* Colors */
+ background-color: #C8DEFF;
+ box-shadow: 3px 3px black;
+
+ color: var(--navy);
+ transition: .5s ease-out;
+
+ /* Font */
+ font-weight: 600;
+ font-size: 11px !important;
+ color: black !important;
+
+}
+
+.learn-more-button-blue p {
+ font-size: 14px !important;
+ font-weight: 900;
+
+}
+
+.learn-more-button-purple {
+ display: block;
+ padding: 10px 20px 10px 20px;
+ width: fit-content;
+ border-radius: 5px;
+ text-decoration: none;
+ line-height: 0px;
+ border: 1px solid black;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 10px;
+
+
+ /* Colors */
+ background-color: #E0DDFF;
+ box-shadow: 3px 3px black;
+
+ color: var(--navy);
+ transition: .5s ease-out;
+
+ /* Font */
+ font-weight: 600;
+ font-size: 11px !important;
+ color: black !important;
+
+}
+
+.learn-more-button-purple p {
+ font-size: 14px !important;
+ font-weight: 900;
+
+}
+
+
diff --git a/src/styles/main.scss b/src/styles/main.scss
index f35b33a..19a26d4 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -26,6 +26,7 @@ $blue: #03b5d2;
@import '2021_team_styles/margaret-bio.scss';
@import 'lauren-bio.scss';
@import '2022_team_styles/_skyler-bio.scss';
+@import '2022_team_styles/teamlist2022.scss';
.main {
display: flex;
diff --git a/src/styles/new_sidebar.scss b/src/styles/new_sidebar.scss
new file mode 100644
index 0000000..4308621
--- /dev/null
+++ b/src/styles/new_sidebar.scss
@@ -0,0 +1,97 @@
+
+@import url('https://fonts.googleapis.com/css2?family=Poppins&display=swap'), url('https://www.scdn.co/i/connect/header-spikes-sm.jpg');
+
+
+@font-face {
+ font-family: 'Poppins';
+ font-style: normal;
+ src: url('https://fonts.googleapis.com/css2?family=Poppins&display=swap');
+}
+
+.sidebar-new{
+ width: 23%;
+ background: #F2F8FC;
+ padding-bottom: 200px;
+ overflow: scroll;
+ display: inline-block;
+ font-family: 'Poppins', sans-serif;
+ color: black;
+ height: 800px; /* USE THIS TO ADJUST FIXED CONTAINER HEIGHT */
+ }
+
+.sidebar-new-object h5 {
+ color: black;
+ margin-right: 10px;
+ padding-top: 30px;
+ padding-bottom: 30px;
+ display: inline;
+ margin-bottom: 30px;
+ font-family: 'Poppins', sans-serif;
+
+}
+
+.sidebar-title {
+ display: inline-block;
+}
+
+.sidebar-new-object {
+ padding-bottom: 10px;
+ padding-top: 10px;
+
+}
+
+
+.sidebar-type {
+
+ &--green, &--blue, &--orange, &--red {
+ display: inline-block;
+ width: 110px;
+ }
+ &--green h4 {
+ background-color: #75C0AD;
+ }
+
+ &--blue h4 {
+ background-color: #61B3DE;
+ }
+
+ &--orange h4 {
+ background-color: #E2986A;
+ }
+
+ &--red h4 {
+ background-color: #E47F7F;
+ }
+
+}
+
+
+.sidebar-new-object h4 {
+ color: white;
+ padding-left: 7px;
+ padding-right: 7px;
+ margin: 0;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ display: inline;
+ border-radius: 15px;
+ margin-left: 20px;
+ margin-bottom: 30px;
+ font-size: 20px;
+ width: 50px;
+ display: inline;
+
+}
+
+
+.sidebar-new-object:hover {
+ background-color: #D0EAFE;
+ //border-left: #163B6B 5px solid;
+ box-shadow:5px 0px 0px 0px #163B6B inset;
+
+ }
+
+ .sidebar-new-object:active {
+ background-color: #D0EAFE;
+
+ }
\ No newline at end of file
diff --git a/src/wintern-bios/2022/SkylerComponent.jsx b/src/wintern-bios/2022/SkylerComponent.jsx
index aec6ad7..33c5121 100644
--- a/src/wintern-bios/2022/SkylerComponent.jsx
+++ b/src/wintern-bios/2022/SkylerComponent.jsx
@@ -1,5 +1,6 @@
import React from 'react';
import skylerheadshot from '../../assets/bio-photos/Skyler-Basco-Headshot-Circle.png';
+import skylervr from '../../assets/bio-photos/skyler-other-pics/skyler-vr.jpg';
import unicornstackpic from '../../assets/bio-photos/skyler-other-pics/unicorn-stack-pic.png';
import m4mpic from '../../assets/bio-photos/skyler-other-pics/m4m-pic.png';
import learnifypic from '../../assets/bio-photos/skyler-other-pics/learnify-pic.png';
@@ -17,6 +18,7 @@ import animatedcap from '../../assets/bio-photos/skyler-other-pics/animatedcap.g
import mcsheep from '../../assets/bio-photos/skyler-other-pics/mcsheep.gif';
import qrcode3dbitly from '../../assets/bio-photos/skyler-other-pics/qrcode3dbitly.jpg';
import mcparrot from '../../assets/bio-photos/skyler-other-pics/mcparrot.gif';
+import smileybackground from '../../assets/bio-photos/skyler-other-pics/smiley-background.png';
const SkylerComponent = () => {
return (
@@ -30,18 +32,14 @@ const SkylerComponent = () => {
M 3 = Minecrafter. Marvel(er). Maker.
-
+
+
+
My name is Skyler! I’m a developer and designer with an affinity for creative mediums in tech, including augmented/virtual reality, 3D software, and visual effects.
@@ -51,6 +49,7 @@ const SkylerComponent = () => {
👇 Scan the QR Code below with your phone to see Bitly's logo in 3D/AR! Made with Blender and echo3D.
Want to connect, collaborate, or build something innovative together? I’m happy to chat about anything from CS to design to future projects.
Feel free to shoot me a DM on LinkedIn, email me at skylerbasco@gmail.com, or send a message through the form below! ⬇️
+ Want to connect, collaborate, or build something innovative together? I’m happy to chat about anything from CS to design to future projects.
Feel free to shoot me a DM on LinkedIn, email me at skylerbasco@gmail.com, or send a message through the form below! ⬇️