diff --git a/client/src/components/EditProfile.js b/client/src/components/EditProfile.js index 861e0856..fb8fdabf 100644 --- a/client/src/components/EditProfile.js +++ b/client/src/components/EditProfile.js @@ -60,8 +60,6 @@ class EditProfile extends Component { constructor() { super(); this.state = { - first_name: "", - last_name: "", year: "", name: "", school: "", @@ -99,24 +97,24 @@ class EditProfile extends Component { return
{error.message}
; } else if (props) { props = props.user_profile; + console.log(props) + console.log(years) if (!this.state.name && props.name) { this.setState({ ...props }) } - return (
-
+ return (
+ - - + - - - + + + - - + @@ -125,24 +123,24 @@ class EditProfile extends Component {
- + - - - {this.state.cur_error_message} -
+ + {this.state.cur_error_message} +
) } @@ -178,7 +176,7 @@ class EditProfile extends Component { }; onYearChange = (e, {value}) => { - this.setState({year: value}) + this.setState({grad_year: value}) } onSkillsChange = (e, {value}) => { diff --git a/client/src/components/Feed.js b/client/src/components/Feed.js index 73d0aee1..171f4760 100644 --- a/client/src/components/Feed.js +++ b/client/src/components/Feed.js @@ -39,29 +39,21 @@ class Feed extends Component { /> ); return ( -
- { /*

HACKGT7: REIMAGINE REALITY

*/} -
- {/*HackGT Team Formation*/} - - - - +
+
+
+ +
-
-
+ + +
+
- {this.state.skills.length || - this.state.years.length || - this.state.schools.length ? ( -
-
- Filters Applied +
+ + + + + {this.state.skills.length || + this.state.years.length || + this.state.schools.length ? ( +
+
+ Filters Applied +
+
+ +
-
- -
-
- ) : null} + ) : null} +
{cards}
diff --git a/client/src/components/FeedCards.js b/client/src/components/FeedCards.js index cdb37d99..247fa683 100644 --- a/client/src/components/FeedCards.js +++ b/client/src/components/FeedCards.js @@ -26,7 +26,7 @@ const getUsersQuery = graphql ` id } } - } + } `; class FeedCards extends Component { @@ -51,13 +51,14 @@ class FeedCards extends Component { // } // console.log("HELLO" + props.user_profile.team.id); let cards = props.users.map(user => { - // console.log("Stuff: " + props.user_profile.team.id); - return }) - return (
- {cards} + return ( +
+ {cards}
); } }}/>); diff --git a/client/src/components/FeedTeamCards.js b/client/src/components/FeedTeamCards.js index d690c2e0..4a5a4587 100644 --- a/client/src/components/FeedTeamCards.js +++ b/client/src/components/FeedTeamCards.js @@ -49,7 +49,7 @@ class FeedTeamCards extends Component { }) return (
- {cards} + {cards}
); } }}/>); diff --git a/client/src/components/Filter.js b/client/src/components/Filter.js index a8e83fc0..40a838dd 100644 --- a/client/src/components/Filter.js +++ b/client/src/components/Filter.js @@ -3,7 +3,7 @@ import './css/Filter.css'; const Filter = props => { return (
-
+
{/* SKILLS */}
diff --git a/client/src/components/Members.js b/client/src/components/Members.js index bce4335f..12c8b1b5 100644 --- a/client/src/components/Members.js +++ b/client/src/components/Members.js @@ -36,10 +36,6 @@ class Members extends Component { if (this.props.members) { users = this.props.members; } - // users.push(props.users[0]); - // users.push(props.users[1]); - // users.push(props.users[2]); - // users.push(props.users[3]); for (let i = 0; i < users.length; i++) { let user = users[i]; @@ -61,24 +57,14 @@ class Members extends Component { } for (let j = 4 - users.length; j > 0; j--) { memberCards.push( - - - - - - - +
+ + + +
); } - - let cards = ( - - {memberCards} - - ); - return
{cards}
; + return
{memberCards}
; } } diff --git a/client/src/components/MembersBlank.js b/client/src/components/MembersBlank.js index 93f19948..90a73cf7 100644 --- a/client/src/components/MembersBlank.js +++ b/client/src/components/MembersBlank.js @@ -54,24 +54,13 @@ class Members extends Component { /> ); } - for (let j = 4 - users.length; j > 0; j--) { - memberCards.push( - - - {/* */} - - - ); - } let cards = ( {memberCards} ); - return
{cards}
; + return
{memberCards}
; } } diff --git a/client/src/components/NoTeam.js b/client/src/components/NoTeam.js index aa456e7a..de466f45 100644 --- a/client/src/components/NoTeam.js +++ b/client/src/components/NoTeam.js @@ -28,28 +28,24 @@ class NoTeam extends Component { render() { return (
-

{this.props.team.name}

-
) } } -export default NoTeam; \ No newline at end of file +export default NoTeam; diff --git a/client/src/components/NotificationGroup.js b/client/src/components/NotificationGroup.js index e2f028df..ff4a6c4f 100644 --- a/client/src/components/NotificationGroup.js +++ b/client/src/components/NotificationGroup.js @@ -69,6 +69,8 @@ class NotificationGroup extends Component { /> ); }); + var notificationMessage = notificationCards.length > 0 ? notificationCards : "No notifications right now!" + console.log(notificationMessage) return ( - {notificationCards} + {notificationMessage} ); } diff --git a/client/src/components/OnTeam.js b/client/src/components/OnTeam.js index 0096e36c..8b534810 100644 --- a/client/src/components/OnTeam.js +++ b/client/src/components/OnTeam.js @@ -70,11 +70,7 @@ class OnTeam extends Component { {/*
); } diff --git a/client/src/components/TeamInformation.js b/client/src/components/TeamInformation.js index b8ed6d8d..6166bd6f 100644 --- a/client/src/components/TeamInformation.js +++ b/client/src/components/TeamInformation.js @@ -79,7 +79,7 @@ class TeamInformation extends Component {
- Team Information + Team Information TEST
- Interests + Interests {interestLabels}
diff --git a/client/src/components/TeamNotifications.js b/client/src/components/TeamNotifications.js index 1966bbe8..ed2651a9 100644 --- a/client/src/components/TeamNotifications.js +++ b/client/src/components/TeamNotifications.js @@ -74,15 +74,17 @@ class TeamNotifications extends Component { let notificationMesssage = notificationCards.length > 0 ? notificationCards : "No notifications right now!" return ( - - - Notifications - - {notificationMesssage} - - - +
+ + + Notifications + + {notificationMesssage} + + + +
); } }} diff --git a/client/src/components/TeamRequestsSent.js b/client/src/components/TeamRequestsSent.js index ff1b69ef..20ad3b57 100644 --- a/client/src/components/TeamRequestsSent.js +++ b/client/src/components/TeamRequestsSent.js @@ -4,6 +4,7 @@ import NotificationCard from './NotificationCard'; import { QueryRenderer } from "react-relay"; import { graphql } from "babel-plugin-relay/macro"; import environment from "./Environment"; +import "./css/NotificationCard.css"; const getSentRequestsQuery = graphql` query TeamRequestsSentQuery { @@ -72,14 +73,16 @@ class TeamRequestsSent extends Component { ); }); return ( - - - Requests Sent - - {sentRequestCards} - - - +
+ + + Requests Sent + + {sentRequestCards} + + + +
); } }} diff --git a/client/src/components/css/EditProfile.css b/client/src/components/css/EditProfile.css index 2ddc5cc1..1258a805 100644 --- a/client/src/components/css/EditProfile.css +++ b/client/src/components/css/EditProfile.css @@ -5,20 +5,75 @@ padding-top: 30px; } -.input-container { +.ui.selection.dropdown { + border-radius: .28571429rem !important; +} + +.input-container-small { width: 220px; } +.ui.form input[type=text] { + background: rgba(255, 255, 255, 0.22); + font-family: Quicksand-Bold; +} + +.ui.form input[type=text]:focus { + background: rgba(255, 255, 255, 0.22); + font-family: Quicksand-Bold; +} + +.ui.form div.input-container-large textarea { + color: white; + background: rgba(255, 255, 255, 0.22); + font-family: Quicksand-Bold; +} + +.ui.form div.input-container-large textarea:focus { + color: white; + background: rgba(255, 255, 255, 0.22); + font-family: Quicksand-Bold; +} + +.ui.form div.input-container-large.field>label { + color: white; + font-family: Quicksand-Bold; +} + +.ui.form div.input-container-small.field>label { + color: white; + font-family: Quicksand-Bold; +} + +.school-and-year { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; +} + .input-container-large { width: 440px; } +@media (max-width: 595px) { + .input-container-large { + width: 220px; + } + .ui.form .fields .field { + margin-bottom: 15px; + } +} + .button-container { display: flex; flex-direction: row; justify-content: center; } -.save-button-container { - padding-right: 40px; +.ui.button.save-button { + background: rgba(255, 255, 255, 0.22); + color: white; + margin-right: 15px; + margin-left: 15px; } \ No newline at end of file diff --git a/client/src/components/css/Feed.css b/client/src/components/css/Feed.css index 3dd8e747..6a6dd1fb 100644 --- a/client/src/components/css/Feed.css +++ b/client/src/components/css/Feed.css @@ -18,23 +18,37 @@ src: url("./fonts/quicksand/Quicksand-Bold.ttf"); } -.Feed-container { +.feed-container { + display: flex; + flex-direction: row; +} + +.left-side { + margin-left: 20px; + min-width: 250px; +} + +.right-side { + width: 100vw; + display: flex; + flex-direction: column; + align-items: center; +} + +.feed-cards { padding-top: 2%; - margin: 0 auto; + /* margin: 0 auto; */ width: 90%; display: flex; flex-direction: row; } .Cards-container { - /* padding-top: 2%; */ - margin: 0 auto; - padding-left: 3%; - justify-content: left; -} - -.center-group { - margin: 0 auto; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + margin: 0 0 0 auto; } .ui.buttons .button:first-child { @@ -72,27 +86,21 @@ padding-bottom: 2%; } -.menu { - text-align: left; -} - .user-input { padding-left: 3%; - padding-bottom: 2%; flex-direction: column; + align-items: center; } #dropdown-menu { margin: 2%; flex-direction: column; } - -.Side-menu { - text-align: left; - padding-left: 10%; - padding-bottom: 10%; -} .filters-applied { padding-bottom: 1%; + padding-top: 2%; + color: white; + font-size: 20px; + font-family: Quicksand-Bold; } .ui.buttons .button { @@ -101,24 +109,21 @@ .teamFormation { font-family: Lekton-Bold; - font-size: 30px; + font-size: 22px; color: white; - float: left; - margin-left: 1%; + margin-left: 15px; } .switch-feed { padding: 1%; - text-align: center; - justify-content: center; } .HackGTitle { color: white; text-shadow: 0px 0px 8px #ffffff; font-family: Bavro-Regular; - font-size: 25px; - margin-left: 2%; + font-size: 18px; + margin-left: 15px; } .team-info { @@ -133,10 +138,10 @@ flex-direction: row; } -.team-card-container { +/* .team-card-container { flex: 1; padding-right: 2%; -} +} */ .ui.centered.cards { justify-content: left; @@ -184,3 +189,15 @@ border-top-right-radius: 15px; border-bottom-right-radius: 15px; } + +@media (min-width: 595px) { + .side-menu-top { + display: none; + } +} + +@media (max-width: 595px) { + .left-side { + display: none; + } +} \ No newline at end of file diff --git a/client/src/components/css/Headers.css b/client/src/components/css/Headers.css index 76dbe9bd..37b4170b 100644 --- a/client/src/components/css/Headers.css +++ b/client/src/components/css/Headers.css @@ -18,6 +18,24 @@ overflow-y: auto; } +@media (max-width: 595px) { + .header-name, .desktopTitles { + display: none; + } + + .innerMobileTitles { + display: flex; + flex-direction: column; + text-align: center; + } +} + +@media (min-width: 595px) { + .mobileTitles { + display: none; + } +} + @font-face { font-family: Quicksand-Bold; src: url("./fonts/quicksand/Quicksand-Bold.ttf"); @@ -67,4 +85,4 @@ element.style { .ui.visible.popup { background-color: #a8c5d6; border-radius: 15px; -} \ No newline at end of file +} diff --git a/client/src/components/css/InputTagCollection.css b/client/src/components/css/InputTagCollection.css index 78813ca1..c1611a23 100644 --- a/client/src/components/css/InputTagCollection.css +++ b/client/src/components/css/InputTagCollection.css @@ -4,7 +4,7 @@ #chosen-tags { display: flex; - justify-content: left; + justify-content: center; width: 100%; flex-flow: wrap; margin-bottom: 1em; diff --git a/client/src/components/css/Members.css b/client/src/components/css/Members.css index 05ca1229..1ea42f27 100644 --- a/client/src/components/css/Members.css +++ b/client/src/components/css/Members.css @@ -3,8 +3,22 @@ margin: 20px } -.add-card { +.emptyCard { display: flex; - align-items: center; justify-content: center; + align-items: center; + font-size: 25px; + color: gray; + border: solid 2.5px grey; + box-shadow: -20px 20px 0px -8px rgba(0, 0, 0, 0.2); + border-radius: 15px; + margin: 15px; + min-width: 270px; + width: 270px; + min-height: 382px; + max-height: 382px; +} + +i.icon.plus:before { + color: gray } \ No newline at end of file diff --git a/client/src/components/css/MembersBlank.css b/client/src/components/css/MembersBlank.css index dd1e69e4..c9726392 100644 --- a/client/src/components/css/MembersBlank.css +++ b/client/src/components/css/MembersBlank.css @@ -1,7 +1,11 @@ .member-cards-container { - padding: 20px; - margin: 2px; - + padding: 25px; + background: rgba(255, 255, 255, 0.22); + border-radius: 15px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; } .add-card { diff --git a/client/src/components/css/NotificationCard.css b/client/src/components/css/NotificationCard.css index 6e46a04e..ff74235c 100644 --- a/client/src/components/css/NotificationCard.css +++ b/client/src/components/css/NotificationCard.css @@ -69,6 +69,11 @@ border-radius: 25px; } -.message { - text-align: center; +.notificationsCard, .requestsSent { + min-width: 300px; + margin-top: 30px; } + +/* .requestsSent { + min-width: 300px; +} */ diff --git a/client/src/components/css/SideMenu.css b/client/src/components/css/SideMenu.css index 84ef1d00..e78938db 100644 --- a/client/src/components/css/SideMenu.css +++ b/client/src/components/css/SideMenu.css @@ -1,10 +1,18 @@ .h3 { - text-align: left; + text-align: center; color: white; font-size: 20px; font-family: Quicksand-Bold; } +.SideMenu-container { + display: flex; + flex-direction: column; + align-items: center; + margin-bottom: 20px; + margin-top: 20px; +} + @font-face { font-family: Lekton-Regular; src: url("./fonts/lekton/Lekton-Regular.ttf"); @@ -22,8 +30,10 @@ .ui.input.focus > input { border-color: transparent; + padding: 10px; background: rgba(255, 255, 255, 0.22); - border-radius: 12px; + border-radius: .28571429rem; + width: 200px; font-size: 15px; } @@ -61,12 +71,3 @@ font-size: 15px; border-radius: 12px; } - -.SideMenu-container { - height: 100%; -} - -.filter-box { - height: 2%; - text-indent: 5px; -} diff --git a/client/src/components/css/TeamInformation.css b/client/src/components/css/TeamInformation.css index 8570b974..1fdf3043 100644 --- a/client/src/components/css/TeamInformation.css +++ b/client/src/components/css/TeamInformation.css @@ -3,6 +3,27 @@ src: url("./fonts/quicksand/Quicksand-Bold.ttf"); } +@media (min-width: 595px) { + .team-card-container { + max-width: 900px; + width: 500px; + min-width: 300px; + margin: 28px; + } +} + +@media (max-width: 595px) { + .team-card-container { + /* max-width: 900px; */ + /* width: 500px; */ + display: flex; + flex-direction: row; + align-items: stretch; + min-width: 300px; + margin: 28px; + } +} + .header { flex-direction: row; display: inline-block; @@ -31,25 +52,24 @@ .ui.form .disabled.fields .field, .ui.form .field :disabled { opacity: 1; + color: #85808A; + font-family: Quicksand-Bold; } -.ui.form textarea { - color: gray; +.ui.form .field.disabled :disabled { + border: 1px solid #C3BBCD; } .ui.form .field.disabled > label, .ui.form .fields.disabled > label { opacity: 1; + color: #85808A; } .ui.fluid.dropdown { border: none; } -.ui.form .field > .selection.dropdown { - opacity: 1; -} - .ui.selection.dropdown { text-align: left; } @@ -72,14 +92,6 @@ float: right; } -.ui.form .field > label { - color: #85808a; -} - -.ui.form textarea { - color: #85808a; -} - .ui.fluid.card { box-shadow: -20px 20px 0px -8px rgba(0, 0, 0, 0.2); border-radius: 15px; @@ -107,16 +119,4 @@ .ui.card > .content, .ui.cards > .card > .content { padding-bottom: 20px; -} - -.member-cards-container { - transform: scale(0.8); -} - -.member-cards-container { - margin-top: -2%; -} - -.ui.form .field { - border-bottom: 1px solid #c3bbcd; -} +} \ No newline at end of file diff --git a/client/src/components/css/TeamPage.css b/client/src/components/css/TeamPage.css index d466275c..8a53262d 100644 --- a/client/src/components/css/TeamPage.css +++ b/client/src/components/css/TeamPage.css @@ -6,12 +6,39 @@ .first-row { width: 100%; display: flex; - justify-content: space-evenly; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; margin-top: 3%; margin-bottom: 3%; align-items: flex-start; } +.ui.button.ask-to-join { + font-family: Quicksand-Bold; + background: rgba(255, 255, 255, 0.22); + color: white; +} + +.ui.button.leaveTeam { + font-family: Quicksand-Bold; + background: rgba(255, 255, 255, 0.22); + color: white; +} + +.no-team-heading { + color: white; + font-family: Quicksand-Bold; +} + +.noTeam-content { + display: flex; + flex-direction: row; + align-items: flex-start; + justify-content: center; + flex-wrap: wrap; +} + .team-page { display: flex; flex-direction: column; @@ -20,11 +47,20 @@ } .first-col { - width: 40%; + max-width: 600px; + display: flex; + flex-direction: column; + justify-content: space-between; + margin-right: 15px; + height: 600px; } .second-col { - width: 50%; + /* max-width: 500px; */ + display: flex; + flex-direction: row; + justify-content: center; + margin-left: 15px; } #header { @@ -48,11 +84,3 @@ padding: 0; background: #656cae; } - -.teamFormation { - font-family: Lekton-Bold; - font-size: 30px; - color: white; - float: left; - margin-left: 1%; -} diff --git a/client/src/components/css/UserCard.css b/client/src/components/css/UserCard.css index cd98afde..59c7c903 100644 --- a/client/src/components/css/UserCard.css +++ b/client/src/components/css/UserCard.css @@ -88,7 +88,11 @@ body .ui.card:hover { .ui.card.card1 { box-shadow: -20px 20px 0px -8px rgba(0, 0, 0, 0.2); border-radius: 15px; - padding-bottom: 30px; + margin: 15px; + min-width: 270px; + width: 270px; + min-height: 382px; + max-height: 382px; } .ui.card > .content > .header:not(.ui), @@ -120,4 +124,4 @@ body .ui.card:hover { padding-top: 10px; padding-bottom: 5px; font-family: Quicksand-Bold; -} +} \ No newline at end of file diff --git a/client/src/components/css/login-css/main.css b/client/src/components/css/login-css/main.css index 75544d21..291e142b 100644 --- a/client/src/components/css/login-css/main.css +++ b/client/src/components/css/login-css/main.css @@ -161,7 +161,7 @@ iframe { left: 0; } -@media (max-width: 576px) { +@media (max-width: 596px) { .wrap-login100 { padding-left: 15px; padding-right: 15px; diff --git a/client/src/components/ui_subcomponents/HeaderFeed.js b/client/src/components/ui_subcomponents/HeaderFeed.js index bba42d91..4ccd3818 100644 --- a/client/src/components/ui_subcomponents/HeaderFeed.js +++ b/client/src/components/ui_subcomponents/HeaderFeed.js @@ -1,18 +1,13 @@ import React, { Component } from "react"; -import TeamRequest from "./TeamRequest"; -import JoinTeam from "./JoinTeam"; import "../css/Headers.css"; import "../css/Modal.css"; import { Menu, Dropdown, Icon, Popup, Button } from "semantic-ui-react"; import { Link } from "react-router-dom"; -import { commitMutation } from "react-relay"; import { graphql } from "babel-plugin-relay/macro"; import environment from "../Environment"; import { QueryRenderer } from "react-relay"; import NotificationGroup from "../NotificationGroup"; -import IndividualRequest from "./IndividualRequest"; -import JoinIndividual from "./JoinIndividual"; -import { Input } from "semantic-ui-react"; + const mutation = graphql` mutation HeaderFeedMutation { @@ -88,7 +83,7 @@ class Headers extends Component { />; } else { let link = "/team/" + props.user_profile.team.id; - teamIcon = + teamIcon = @@ -109,17 +104,17 @@ class Headers extends Component {
- - - +
+ +
- +
+

HACKGT7: REIMAGINE REALITY

- HackGT Team Formation - + Team Formation + +
+
+ +
+

HACKGT7: REIMAGINE REALITY

+ Team Formation +
+ +
); } diff --git a/client/src/components/ui_subcomponents/IndividualRequest.js b/client/src/components/ui_subcomponents/IndividualRequest.js index 472c2627..75f2e59d 100644 --- a/client/src/components/ui_subcomponents/IndividualRequest.js +++ b/client/src/components/ui_subcomponents/IndividualRequest.js @@ -121,13 +121,13 @@ class IndividualRequest extends Component {
- this.setState({ secondOpen:false})} secondModal={() => this.props.closeModal()} onOpen={() => this.setState({ secondOpen:true})} showModal={this.state.secondOpen} - + />