From 8de77ad7a13a10824ad3b7e2c4ee12ee0671bcd6 Mon Sep 17 00:00:00 2001 From: Meha Agrawal Date: Wed, 26 Aug 2020 00:41:56 -0700 Subject: [PATCH 01/18] cards wrap so they fit on different desktop screens and hamburger menu appears based on certain screen sizes --- client/src/components/FeedCards.js | 7 ++++--- client/src/components/css/Feed.css | 9 ++++----- client/src/components/css/Headers.css | 6 ++++++ client/src/components/ui_subcomponents/HeaderFeed.js | 12 ++++++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/client/src/components/FeedCards.js b/client/src/components/FeedCards.js index 3abf33d5..4aacc228 100644 --- a/client/src/components/FeedCards.js +++ b/client/src/components/FeedCards.js @@ -41,12 +41,13 @@ class FeedCards extends Component { } else if (props) { let cards = props.users.map(user => { console.log("Stuff: " + user.id); - return }) - return (
- {cards} + return ( +
+ {cards}
); } }}/>); diff --git a/client/src/components/css/Feed.css b/client/src/components/css/Feed.css index 3dd8e747..a26d8fc1 100644 --- a/client/src/components/css/Feed.css +++ b/client/src/components/css/Feed.css @@ -28,13 +28,12 @@ .Cards-container { /* padding-top: 2%; */ + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-content: space-around; margin: 0 auto; padding-left: 3%; - justify-content: left; -} - -.center-group { - margin: 0 auto; } .ui.buttons .button:first-child { diff --git a/client/src/components/css/Headers.css b/client/src/components/css/Headers.css index f59d03bd..4705081b 100644 --- a/client/src/components/css/Headers.css +++ b/client/src/components/css/Headers.css @@ -22,3 +22,9 @@ font-family: Quicksand-Bold; src: url("./fonts/quicksand/Quicksand-Bold.ttf"); } + +@media (min-width: 915px) { + .hamburger-icon{ + display: none; + } +} \ No newline at end of file diff --git a/client/src/components/ui_subcomponents/HeaderFeed.js b/client/src/components/ui_subcomponents/HeaderFeed.js index 7edfc746..4506e716 100644 --- a/client/src/components/ui_subcomponents/HeaderFeed.js +++ b/client/src/components/ui_subcomponents/HeaderFeed.js @@ -76,6 +76,18 @@ class Headers extends Component { return (
+ +
+ +
+ Date: Sun, 30 Aug 2020 00:08:16 -0700 Subject: [PATCH 02/18] things don't look horrible --- client/src/components/Feed.js | 97 +++++++++++-------- client/src/components/Filter.js | 2 +- client/src/components/SideMenu.js | 2 +- client/src/components/css/Feed.css | 69 ++++++++----- client/src/components/css/Headers.css | 12 +-- .../src/components/css/InputTagCollection.css | 2 +- client/src/components/css/SideMenu.css | 9 +- client/src/components/css/UserCard.css | 5 +- .../components/ui_subcomponents/HeaderFeed.js | 16 +-- 9 files changed, 127 insertions(+), 87 deletions(-) diff --git a/client/src/components/Feed.js b/client/src/components/Feed.js index 35353168..5547ed96 100644 --- a/client/src/components/Feed.js +++ b/client/src/components/Feed.js @@ -36,29 +36,26 @@ class Feed extends Component { /> ); return ( -
-

HACKGT7: REIMAGINE REALITY

-
- HackGT Team Formation - - - - +
+
+ {/* hackgt title, filter menu, and fish logo */} +

HACKGT7: REIMAGINE REALITY

+

HackGT Team Formation

+
+ +
-
-
+ + +
+

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} -
{cards}
+ ) : null} +
+ +
+
{cards}
+
+ {/* feed and individual/teams toggle 8 */}
); 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/SideMenu.js b/client/src/components/SideMenu.js index 32a8be05..526e175f 100644 --- a/client/src/components/SideMenu.js +++ b/client/src/components/SideMenu.js @@ -137,7 +137,7 @@ class SideMenu extends Component { scrolling="scrolling" closeOnChange="false" /> - React Logo + {/* React Logo */}
); } diff --git a/client/src/components/css/Feed.css b/client/src/components/css/Feed.css index a26d8fc1..8f450310 100644 --- a/client/src/components/css/Feed.css +++ b/client/src/components/css/Feed.css @@ -18,7 +18,21 @@ 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; +} + +.feed-cards-container { padding-top: 2%; margin: 0 auto; width: 90%; @@ -27,13 +41,11 @@ } .Cards-container { - /* padding-top: 2%; */ display: flex; flex-direction: row; flex-wrap: wrap; - align-content: space-around; - margin: 0 auto; - padding-left: 3%; + justify-content: center; + margin: 0 0 0 auto; } .ui.buttons .button:first-child { @@ -71,39 +83,35 @@ 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 { width: 110px; } -.teamFormation { +.teamFormation, .teamFormation-top { font-family: Lekton-Bold; - font-size: 30px; + font-size: 22px; color: white; - float: left; - margin-left: 1%; +} + +.teamFormation-top { + text-align: center; } .switch-feed { @@ -112,12 +120,15 @@ justify-content: center; } -.HackGTitle { +.HackGTitle, .HackGTitle-top { color: white; text-shadow: 0px 0px 8px #ffffff; font-family: Bavro-Regular; - font-size: 25px; - margin-left: 2%; + font-size: 18px; +} + +.HackGTitle-top { + text-align: center; } .team-info { @@ -183,3 +194,15 @@ border-top-right-radius: 15px; border-bottom-right-radius: 15px; } + +@media (min-width: 415px) { + .side-menu-top, .HackGTitle-top, .teamFormation-top { + display: none; + } +} + +@media (max-width: 415px) { + .side-menu, .HackGTitle, .teamFormation, .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 4705081b..d47f2d89 100644 --- a/client/src/components/css/Headers.css +++ b/client/src/components/css/Headers.css @@ -18,13 +18,13 @@ overflow-y: auto; } +@media (max-width: 415px) { + .header-name { + display: none; + } +} + @font-face { font-family: Quicksand-Bold; src: url("./fonts/quicksand/Quicksand-Bold.ttf"); -} - -@media (min-width: 915px) { - .hamburger-icon{ - display: none; - } } \ 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/SideMenu.css b/client/src/components/css/SideMenu.css index ac8f729c..43ad47a0 100644 --- a/client/src/components/css/SideMenu.css +++ b/client/src/components/css/SideMenu.css @@ -1,10 +1,17 @@ .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; +} + @font-face { font-family: Lekton-Regular; src: url("./fonts/lekton/Lekton-Regular.ttf"); diff --git a/client/src/components/css/UserCard.css b/client/src/components/css/UserCard.css index 37f3f229..af30142a 100644 --- a/client/src/components/css/UserCard.css +++ b/client/src/components/css/UserCard.css @@ -87,7 +87,8 @@ 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; + max-width: 270px; } .ui.card > .content > .header:not(.ui), @@ -119,4 +120,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/ui_subcomponents/HeaderFeed.js b/client/src/components/ui_subcomponents/HeaderFeed.js index 4506e716..802825d1 100644 --- a/client/src/components/ui_subcomponents/HeaderFeed.js +++ b/client/src/components/ui_subcomponents/HeaderFeed.js @@ -76,10 +76,10 @@ class Headers extends Component { return (
- -
+ +
- - - Date: Thu, 10 Sep 2020 23:39:51 -0700 Subject: [PATCH 03/18] changed the color of textboxes so that the default text shows up --- client/src/components/EditProfile.js | 6 ++---- client/src/components/css/EditProfile.css | 8 ++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/client/src/components/EditProfile.js b/client/src/components/EditProfile.js index 4c2ce567..201dfbe7 100644 --- a/client/src/components/EditProfile.js +++ b/client/src/components/EditProfile.js @@ -56,8 +56,6 @@ class EditProfile extends Component { constructor() { super(); this.state = { - first_name: "", - last_name: "", year: "", name: "", school: "", @@ -94,6 +92,7 @@ class EditProfile extends Component { return
{error.message}
; } else if (props) { props = props.user_profile; + console.log(props) if (!this.state.name && props.name) { this.setState({ ...props @@ -102,8 +101,7 @@ class EditProfile extends Component { return (
- - + diff --git a/client/src/components/css/EditProfile.css b/client/src/components/css/EditProfile.css index 2ddc5cc1..3cd9fdeb 100644 --- a/client/src/components/css/EditProfile.css +++ b/client/src/components/css/EditProfile.css @@ -9,6 +9,14 @@ width: 220px; } +.ui.form input[type=text] { + background: rgba(255, 255, 255, 0.22); +} + +.ui.form input[type=text]:focus { + background: rgba(255, 255, 255, 0.22); +} + .input-container-large { width: 440px; } From 8c292009c370fd06966f903256fce34edad262c1 Mon Sep 17 00:00:00 2001 From: Meha Agrawal Date: Thu, 10 Sep 2020 23:45:28 -0700 Subject: [PATCH 04/18] remove ugly borders --- client/src/components/css/EditProfile.css | 10 ++++++++++ client/src/components/css/TeamInformation.css | 13 ------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/client/src/components/css/EditProfile.css b/client/src/components/css/EditProfile.css index 3cd9fdeb..6de70a0b 100644 --- a/client/src/components/css/EditProfile.css +++ b/client/src/components/css/EditProfile.css @@ -17,6 +17,16 @@ background: rgba(255, 255, 255, 0.22); } +.ui.form textarea { + color: white; + background: rgba(255, 255, 255, 0.22); +} + +.ui.form textarea:focus { + color: white; + background: rgba(255, 255, 255, 0.22); +} + .input-container-large { width: 440px; } diff --git a/client/src/components/css/TeamInformation.css b/client/src/components/css/TeamInformation.css index 8dd0d3cf..44c709e9 100644 --- a/client/src/components/css/TeamInformation.css +++ b/client/src/components/css/TeamInformation.css @@ -17,13 +17,6 @@ padding-bottom: 2%; } -.ui.form textarea { - min-height: 150px; - border: 3px solid; - border-image-source: linear-gradient(0deg, rgba(85,196,235,1) 0%, rgba(135,91,163,1) 100%); - border-image-slice: 1; -} - .ui.form .disabled.field, .ui.form .disabled.fields .field, .ui.form .field :disabled { @@ -39,12 +32,6 @@ opacity: 1; } -.ui.fluid.dropdown { - border: 3px solid; - border-image-source: linear-gradient(0deg, rgba(85,196,235,1) 0%, rgba(135,91,163,1) 100%); - border-image-slice: 1; -} - .ui.form .field > .selection.dropdown { opacity: 1; } From 33af5b517a6cd871819af111910973bcb4ad359d Mon Sep 17 00:00:00 2001 From: Rahul Rajan Date: Sun, 13 Sep 2020 20:42:53 -0400 Subject: [PATCH 05/18] fix notifications --- client/src/components/NotificationCard.js | 1 + client/src/components/NotificationGroup.js | 1 + client/src/components/TeamNotifications.js | 3 +- .../ui_subcomponents/IndividualRequest.js | 18 ++- .../IndividualRequest2Mutation.graphql.js | 109 ++++++++++++++++++ server/src/app.ts | 46 +++++--- 6 files changed, 161 insertions(+), 17 deletions(-) create mode 100644 client/src/components/ui_subcomponents/__generated__/IndividualRequest2Mutation.graphql.js diff --git a/client/src/components/NotificationCard.js b/client/src/components/NotificationCard.js index be71047a..5d162ebb 100644 --- a/client/src/components/NotificationCard.js +++ b/client/src/components/NotificationCard.js @@ -63,6 +63,7 @@ class NotificationCard extends Component { showModal={this.state.showIndividualModal} closeModal={this.closeIndividualModal} sender={this.props.sender} + receiver={this.props.receiver} notification_id={this.props.notification_id} /> ) : ( diff --git a/client/src/components/NotificationGroup.js b/client/src/components/NotificationGroup.js index da2f4b40..daa59d7c 100644 --- a/client/src/components/NotificationGroup.js +++ b/client/src/components/NotificationGroup.js @@ -62,6 +62,7 @@ class NotificationGroup extends Component { idea={notif.idea} meta={notif.meta} sender={notif.sender} + receiver={'USER'} notification_id={notif.id} color={colors[count++ % 2]} /> diff --git a/client/src/components/TeamNotifications.js b/client/src/components/TeamNotifications.js index a1aef17d..a405671e 100644 --- a/client/src/components/TeamNotifications.js +++ b/client/src/components/TeamNotifications.js @@ -61,6 +61,7 @@ class TeamNotifications extends Component {

- {props.user.name}'s Request Message: + {props.user.name + "'s"} Request Message:

{this.props.userRequestMessage} @@ -85,7 +94,7 @@ class IndividualRequest extends Component { marginTop: 30, }} > - {props.user.name}'s Project Idea: + {props.user.name + "'s'"} Project Idea:

{this.props.userProjectIdea} @@ -98,8 +107,11 @@ class IndividualRequest extends Component {

+ +

HACKGT7: REIMAGINE REALITY

+ HackGT Team Formation +
); } diff --git a/client/src/components/ui_subcomponents/IndividualRequest.js b/client/src/components/ui_subcomponents/IndividualRequest.js index 2622b213..583f4088 100644 --- a/client/src/components/ui_subcomponents/IndividualRequest.js +++ b/client/src/components/ui_subcomponents/IndividualRequest.js @@ -42,6 +42,7 @@ const acceptTeamRequestMutation = graphql` class IndividualRequest extends Component { render() { const sender = this.props.sender; + console.log(sender) console.log(sender.id) return (
@@ -42,6 +56,13 @@ class TeamRequest extends Component { @@ -168,7 +168,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/TeamInformation.js b/client/src/components/TeamInformation.js index 21c71aa5..23d3a5d6 100644 --- a/client/src/components/TeamInformation.js +++ b/client/src/components/TeamInformation.js @@ -74,11 +74,11 @@ class TeamInformation extends Component { Team Information - - diff --git a/client/src/components/css/EditProfile.css b/client/src/components/css/EditProfile.css index 6de70a0b..563d2bd6 100644 --- a/client/src/components/css/EditProfile.css +++ b/client/src/components/css/EditProfile.css @@ -5,38 +5,66 @@ 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 textarea { +.ui.form div.input-container-large textarea { color: white; background: rgba(255, 255, 255, 0.22); + font-family: Quicksand-Bold; } -.ui.form textarea:focus { +.ui.form div.input-container-large textarea:focus { color: white; background: rgba(255, 255, 255, 0.22); + 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: 415px) { + .input-container-large { + width: 220px; + } + .ui.form .fields .field { + margin-bottom: 15px; + } +} + .button-container { display: flex; flex-direction: row; justify-content: center; } +.save-button { + width: 80px; +} + .save-button-container { padding-right: 40px; } \ No newline at end of file diff --git a/client/src/components/css/TeamInformation.css b/client/src/components/css/TeamInformation.css index 44c709e9..f2df9b7f 100644 --- a/client/src/components/css/TeamInformation.css +++ b/client/src/components/css/TeamInformation.css @@ -23,7 +23,7 @@ opacity: 1; } -.ui.form textarea { +.ui.form div.teaminfo-input textarea { color: gray; } From 8ab28e723fa6c5e44e8e11bafbd5af81b5d5dbc5 Mon Sep 17 00:00:00 2001 From: Rahul Rajan Date: Tue, 15 Sep 2020 22:20:46 -0400 Subject: [PATCH 09/18] leave team done --- client/src/components/NotificationGroup.js | 1 + client/src/components/OnTeam.js | 17 ++- client/src/components/TeamNotifications.js | 9 +- .../OnTeamLeaveMutation.graphql.js | 102 ++++++++++++++++ .../ui_subcomponents/IndividualRequest.js | 2 + .../ui_subcomponents/TeamRequest.js | 6 +- .../TeamRequestMutation.graphql.js | 109 ++++++++++++++++++ server/api.graphql | 1 + server/src/app.ts | 41 ++++++- 9 files changed, 276 insertions(+), 12 deletions(-) create mode 100644 client/src/components/__generated__/OnTeamLeaveMutation.graphql.js create mode 100644 client/src/components/ui_subcomponents/__generated__/TeamRequestMutation.graphql.js diff --git a/client/src/components/NotificationGroup.js b/client/src/components/NotificationGroup.js index daa59d7c..a9563ee0 100644 --- a/client/src/components/NotificationGroup.js +++ b/client/src/components/NotificationGroup.js @@ -54,6 +54,7 @@ class NotificationGroup extends Component { var colors = ["#A8C5D6", "#CCBEDF"]; var count = 0; var notificationCards = notifications.map((notif) => { + console.log("SENDERR: ", notif.sender) return ( this.setState({ showModal: true })} + onClick={() => { + commitMutation(environment, { + mutation: leaveTeamMutation + }); + window.location.reload(); + }} > - Join Team + Leave Team ); }); + let notificationMesssage = notificationCards.length > 0 ? notificationCards : + "No notifications right now!" return ( - + Notifications - - {notificationCards} + + {notificationMesssage} diff --git a/client/src/components/__generated__/OnTeamLeaveMutation.graphql.js b/client/src/components/__generated__/OnTeamLeaveMutation.graphql.js new file mode 100644 index 00000000..dd6b15a1 --- /dev/null +++ b/client/src/components/__generated__/OnTeamLeaveMutation.graphql.js @@ -0,0 +1,102 @@ +/** + * @flow + * @relayHash f749db765bc3ef28343cffb1e41fd72d + */ + +/* eslint-disable */ + +'use strict'; + +/*:: +import type { ConcreteRequest } from 'relay-runtime'; +export type OnTeamLeaveMutationVariables = {||}; +export type OnTeamLeaveMutationResponse = {| + +leave_team: ?{| + +name: ?string + |} +|}; +export type OnTeamLeaveMutation = {| + variables: OnTeamLeaveMutationVariables, + response: OnTeamLeaveMutationResponse, +|}; +*/ + + +/* +mutation OnTeamLeaveMutation { + leave_team { + name + id + } +} +*/ + +const node/*: ConcreteRequest*/ = (function(){ +var v0 = { + "kind": "ScalarField", + "alias": null, + "name": "name", + "args": null, + "storageKey": null +}; +return { + "kind": "Request", + "fragment": { + "kind": "Fragment", + "name": "OnTeamLeaveMutation", + "type": "Mutation", + "metadata": null, + "argumentDefinitions": [], + "selections": [ + { + "kind": "LinkedField", + "alias": null, + "name": "leave_team", + "storageKey": null, + "args": null, + "concreteType": "User", + "plural": false, + "selections": [ + (v0/*: any*/) + ] + } + ] + }, + "operation": { + "kind": "Operation", + "name": "OnTeamLeaveMutation", + "argumentDefinitions": [], + "selections": [ + { + "kind": "LinkedField", + "alias": null, + "name": "leave_team", + "storageKey": null, + "args": null, + "concreteType": "User", + "plural": false, + "selections": [ + (v0/*: any*/), + { + "kind": "ScalarField", + "alias": null, + "name": "id", + "args": null, + "storageKey": null + } + ] + } + ] + }, + "params": { + "operationKind": "mutation", + "name": "OnTeamLeaveMutation", + "id": null, + "text": "mutation OnTeamLeaveMutation {\n leave_team {\n name\n id\n }\n}\n", + "metadata": {} + } +}; +})(); +// prettier-ignore +(node/*: any*/).hash = '5f64a44fc05fb94c0a60703402785ea1'; +module.exports = node; diff --git a/client/src/components/ui_subcomponents/IndividualRequest.js b/client/src/components/ui_subcomponents/IndividualRequest.js index 583f4088..3f85cfc4 100644 --- a/client/src/components/ui_subcomponents/IndividualRequest.js +++ b/client/src/components/ui_subcomponents/IndividualRequest.js @@ -118,6 +118,8 @@ class IndividualRequest extends Component { }, }); this.props.closeModal(); + window.location.reload(); + }} > Accept diff --git a/client/src/components/ui_subcomponents/TeamRequest.js b/client/src/components/ui_subcomponents/TeamRequest.js index 54001e77..a7cf4e27 100644 --- a/client/src/components/ui_subcomponents/TeamRequest.js +++ b/client/src/components/ui_subcomponents/TeamRequest.js @@ -8,7 +8,7 @@ import "../css/Modal.css"; const acceptRequestMutation = graphql` - mutation IndividualRequestMutation($notification_id: String) { + mutation TeamRequestMutation($notification_id: String) { accept_user_request(notification_id: $notification_id) { id name @@ -41,6 +41,9 @@ class TeamRequest extends Component {
*/} - - - ); - } let cards = ( {memberCards} ); - return
{cards}
; + return
{memberCards}
; } } diff --git a/client/src/components/NoTeam.js b/client/src/components/NoTeam.js index 4358967f..1b275c62 100644 --- a/client/src/components/NoTeam.js +++ b/client/src/components/NoTeam.js @@ -23,16 +23,12 @@ class NoTeam extends Component { render() { return (
-

{this.props.team.name}

-
- Interests + Interests {interestLabels} diff --git a/client/src/components/css/EditProfile.css b/client/src/components/css/EditProfile.css index 6adc1c96..c9285c62 100644 --- a/client/src/components/css/EditProfile.css +++ b/client/src/components/css/EditProfile.css @@ -36,11 +36,13 @@ } .ui.form div.input-container-large.field>label { - color: white; + color: white; + font-family: Quicksand-Bold; } .ui.form div.input-container-small.field>label { - color: white; + color: white; + font-family: Quicksand-Bold; } .school-and-year { @@ -74,8 +76,4 @@ color: white; margin-right: 15px; margin-left: 15px; -} - -/* .save-button-container { - padding-right: 40px; -} */ \ No newline at end of file +} \ No newline at end of file diff --git a/client/src/components/css/MembersBlank.css b/client/src/components/css/MembersBlank.css index dd1e69e4..57cbc996 100644 --- a/client/src/components/css/MembersBlank.css +++ b/client/src/components/css/MembersBlank.css @@ -1,7 +1,13 @@ .member-cards-container { - padding: 20px; + padding: 50px; margin: 2px; - + background: rgba(255, 255, 255, 0.22); + border-radius: 15px; + max-width: 700px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; } .add-card { diff --git a/client/src/components/css/TeamInformation.css b/client/src/components/css/TeamInformation.css index ea19f22a..ba38786b 100644 --- a/client/src/components/css/TeamInformation.css +++ b/client/src/components/css/TeamInformation.css @@ -3,6 +3,12 @@ src: url("./fonts/quicksand/Quicksand-Bold.ttf"); } +.team-card-container { + max-width: 500px; + min-width: 300px; + margin: 30px +} + .header { flex-direction: row; display: inline-block; @@ -31,25 +37,24 @@ .ui.form .disabled.fields .field, .ui.form .field :disabled { opacity: 1; + color: #85808A; + font-family: Quicksand-Bold; } -.ui.form div.teaminfo-input 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; } diff --git a/client/src/components/css/TeamPage.css b/client/src/components/css/TeamPage.css index 2182c08e..3f650880 100644 --- a/client/src/components/css/TeamPage.css +++ b/client/src/components/css/TeamPage.css @@ -12,6 +12,25 @@ align-items: flex-start; } +.ui.button.ask-to-join { + 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; From 51063cee611ea05d39ce1a304877cb36b5c6b5bc Mon Sep 17 00:00:00 2001 From: Meha Agrawal Date: Wed, 16 Sep 2020 00:48:20 -0700 Subject: [PATCH 11/18] kinda fixed the search bar...kinda --- client/src/components/css/SideMenu.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/components/css/SideMenu.css b/client/src/components/css/SideMenu.css index 43ad47a0..f72d8474 100644 --- a/client/src/components/css/SideMenu.css +++ b/client/src/components/css/SideMenu.css @@ -29,8 +29,9 @@ .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; } @@ -64,4 +65,4 @@ text-align: center; font-size: 15px; border-radius: 12px; -} +} \ No newline at end of file From f2229ab2cf298e0cf06168470447eb5849906499 Mon Sep 17 00:00:00 2001 From: Rahul Rajan Date: Wed, 16 Sep 2020 03:53:29 -0400 Subject: [PATCH 12/18] hot reloading --- client/.babelrc | 3 +- client/package-lock.json | 49 +++++++++++++++++++ client/package.json | 4 +- client/src/components/Content.js | 3 +- .../ui_subcomponents/IndividualRequest.js | 1 - 5 files changed, 56 insertions(+), 4 deletions(-) diff --git a/client/.babelrc b/client/.babelrc index 2f5eb4a3..fc895d40 100644 --- a/client/.babelrc +++ b/client/.babelrc @@ -3,6 +3,7 @@ "env" ], "plugins": [ - "relay" + "relay", + "react-hot-loader/babel" ] } diff --git a/client/package-lock.json b/client/package-lock.json index be685577..848c7d21 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -4662,6 +4662,11 @@ } } }, + "dom-walk": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", + "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -7196,6 +7201,15 @@ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" }, + "global": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", + "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", + "requires": { + "min-document": "^2.19.0", + "process": "^0.11.10" + } + }, "global-dirs": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", @@ -10134,6 +10148,14 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" }, + "min-document": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", + "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", + "requires": { + "dom-walk": "^0.1.0" + } + }, "mini-create-react-context": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz", @@ -15208,11 +15230,38 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.2.tgz", "integrity": "sha512-7kEBKwU9R8fKnZJBRa5RSIfay4KJwnYvKB6gODGicUmDSAhQJ7Tdnll5S0RLtYrzRfMVXlqYw61rzrSpP4ThLQ==" }, + "react-hot-loader": { + "version": "4.12.21", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.21.tgz", + "integrity": "sha512-Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA==", + "requires": { + "fast-levenshtein": "^2.0.6", + "global": "^4.3.0", + "hoist-non-react-statics": "^3.3.0", + "loader-utils": "^1.1.0", + "prop-types": "^15.6.1", + "react-lifecycles-compat": "^3.0.4", + "shallowequal": "^1.1.0", + "source-map": "^0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + } + } + }, "react-is": { "version": "16.8.6", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" }, + "react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + }, "react-popper": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.7.tgz", diff --git a/client/package.json b/client/package.json index 0851e6aa..6b4d9e88 100644 --- a/client/package.json +++ b/client/package.json @@ -45,6 +45,7 @@ "react-cookie": "^3.1.1", "react-dev-utils": "^7.0.1", "react-dom": "^16.8.4", + "react-hot-loader": "^4.12.21", "react-relay": "^3.0.0", "react-router": "^5.0.0", "react-router-dom": "^5.2.0", @@ -94,5 +95,6 @@ "presets": [ "react-app" ] - } + }, + "proxy": "http://localhost:3000" } diff --git a/client/src/components/Content.js b/client/src/components/Content.js index a704ea08..9c193a13 100644 --- a/client/src/components/Content.js +++ b/client/src/components/Content.js @@ -1,3 +1,4 @@ +import { hot } from 'react-hot-loader/root'; import React, {Component} from "react"; import { BrowserRouter as Router, @@ -126,4 +127,4 @@ class Content extends Component { } -export default Content; +export default hot(Content); diff --git a/client/src/components/ui_subcomponents/IndividualRequest.js b/client/src/components/ui_subcomponents/IndividualRequest.js index 3f85cfc4..ee730073 100644 --- a/client/src/components/ui_subcomponents/IndividualRequest.js +++ b/client/src/components/ui_subcomponents/IndividualRequest.js @@ -119,7 +119,6 @@ class IndividualRequest extends Component { }); this.props.closeModal(); window.location.reload(); - }} > Accept From 4f8c2fab2db281f87da7dc8025105d6bc6ac3ec2 Mon Sep 17 00:00:00 2001 From: Rahul Rajan Date: Wed, 16 Sep 2020 20:42:50 -0400 Subject: [PATCH 13/18] fix 0 notifications message --- client/src/components/NotificationGroup.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/components/NotificationGroup.js b/client/src/components/NotificationGroup.js index a9563ee0..b8ea5d54 100644 --- a/client/src/components/NotificationGroup.js +++ b/client/src/components/NotificationGroup.js @@ -69,14 +69,18 @@ class NotificationGroup extends Component { /> ); }); + var notificationMessage = notificationCards.length > 0 ? notificationCards : "No notifications right now!" + console.log(notificationMessage) return ( - {notificationCards} + {notificationMessage} ); } From 964dc605d3d0e5dd2dba1a3150620c1919cd8b97 Mon Sep 17 00:00:00 2001 From: Meha Agrawal Date: Wed, 16 Sep 2020 20:26:00 -0700 Subject: [PATCH 14/18] fixed spacing of heading --- client/src/components/Feed.js | 4 ---- client/src/components/css/Feed.css | 18 ++++++------------ client/src/components/css/SideMenu.css | 1 + .../components/ui_subcomponents/HeaderFeed.js | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/client/src/components/Feed.js b/client/src/components/Feed.js index 7235262b..a1433cea 100644 --- a/client/src/components/Feed.js +++ b/client/src/components/Feed.js @@ -38,8 +38,6 @@ class Feed extends Component { return (
-

HACKGT7: REIMAGINE REALITY

-

HackGT Team Formation

-

HACKGT7: REIMAGINE REALITY

-

HackGT Team Formation

HACKGT7: REIMAGINE REALITY

- HackGT Team Formation + Team Formation
); From e10f1e2500037acafd7803dc096df8419003e928 Mon Sep 17 00:00:00 2001 From: Meha Agrawal Date: Wed, 16 Sep 2020 20:48:57 -0700 Subject: [PATCH 15/18] fixed the headings so they are centered on mobile --- client/src/components/css/Headers.css | 14 +++++++++++++- .../src/components/ui_subcomponents/HeaderFeed.js | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/client/src/components/css/Headers.css b/client/src/components/css/Headers.css index d47f2d89..6c63cc9d 100644 --- a/client/src/components/css/Headers.css +++ b/client/src/components/css/Headers.css @@ -19,7 +19,19 @@ } @media (max-width: 415px) { - .header-name { + .header-name, .desktopTitles { + display: none; + } + + .innerMobileTitles { + display: flex; + flex-direction: column; + text-align: center; + } +} + +@media (min-width: 416px) { + .mobileTitles { display: none; } } diff --git a/client/src/components/ui_subcomponents/HeaderFeed.js b/client/src/components/ui_subcomponents/HeaderFeed.js index 439cf72a..c62d1ebf 100644 --- a/client/src/components/ui_subcomponents/HeaderFeed.js +++ b/client/src/components/ui_subcomponents/HeaderFeed.js @@ -135,10 +135,20 @@ class Headers extends Component {
+
-

HACKGT7: REIMAGINE REALITY

- Team Formation +

HACKGT7: REIMAGINE REALITY

+ Team Formation +
+
+ +
+

HACKGT7: REIMAGINE REALITY

+ Team Formation +
+ +
); } From f77156e184c45d180ce215362b36bcbe4fcb6b00 Mon Sep 17 00:00:00 2001 From: Meha Agrawal Date: Wed, 16 Sep 2020 20:57:57 -0700 Subject: [PATCH 16/18] making @media tags consistent --- client/src/components/css/EditProfile.css | 2 +- client/src/components/css/Feed.css | 4 ++-- client/src/components/css/Headers.css | 4 ++-- client/src/components/css/login-css/main.css | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/components/css/EditProfile.css b/client/src/components/css/EditProfile.css index c9285c62..1258a805 100644 --- a/client/src/components/css/EditProfile.css +++ b/client/src/components/css/EditProfile.css @@ -56,7 +56,7 @@ width: 440px; } -@media (max-width: 415px) { +@media (max-width: 595px) { .input-container-large { width: 220px; } diff --git a/client/src/components/css/Feed.css b/client/src/components/css/Feed.css index ff5c794b..299a9f63 100644 --- a/client/src/components/css/Feed.css +++ b/client/src/components/css/Feed.css @@ -190,13 +190,13 @@ border-bottom-right-radius: 15px; } -@media (min-width: 590px) { +@media (min-width: 595px) { .side-menu-top { display: none; } } -@media (max-width: 590px) { +@media (max-width: 595px) { .left-side { display: none; } diff --git a/client/src/components/css/Headers.css b/client/src/components/css/Headers.css index 6c63cc9d..3d5b80ee 100644 --- a/client/src/components/css/Headers.css +++ b/client/src/components/css/Headers.css @@ -18,7 +18,7 @@ overflow-y: auto; } -@media (max-width: 415px) { +@media (max-width: 595px) { .header-name, .desktopTitles { display: none; } @@ -30,7 +30,7 @@ } } -@media (min-width: 416px) { +@media (min-width: 595px) { .mobileTitles { display: none; } 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; From 69c37ec184b55ebc3b971805d0dbeb7727c7e142 Mon Sep 17 00:00:00 2001 From: Meha Agrawal Date: Wed, 16 Sep 2020 22:41:39 -0700 Subject: [PATCH 17/18] fixed the member cards in editable team page --- client/src/components/Members.js | 22 ++++++---------------- client/src/components/OnTeam.js | 6 +----- client/src/components/css/Members.css | 18 ++++++++++++++++-- client/src/components/css/MembersBlank.css | 2 +- client/src/components/css/TeamPage.css | 6 ++++++ client/src/components/css/UserCard.css | 2 ++ 6 files changed, 32 insertions(+), 24 deletions(-) diff --git a/client/src/components/Members.js b/client/src/components/Members.js index bce4335f..a73c0c66 100644 --- a/client/src/components/Members.js +++ b/client/src/components/Members.js @@ -61,24 +61,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/OnTeam.js b/client/src/components/OnTeam.js index 832c7b63..ebf3abd1 100644 --- a/client/src/components/OnTeam.js +++ b/client/src/components/OnTeam.js @@ -60,11 +60,7 @@ class OnTeam extends Component { {/*
) : null} - -
-
{cards}
-
+
{cards}
); diff --git a/client/src/components/FeedTeamCards.js b/client/src/components/FeedTeamCards.js index 12004e94..c46d35c2 100644 --- a/client/src/components/FeedTeamCards.js +++ b/client/src/components/FeedTeamCards.js @@ -44,7 +44,7 @@ class FeedTeamCards extends Component { }) return (
- {cards} + {cards}
); } }}/>); diff --git a/client/src/components/Members.js b/client/src/components/Members.js index a73c0c66..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]; diff --git a/client/src/components/TeamInformation.js b/client/src/components/TeamInformation.js index 812387aa..4b0ad156 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