From 294174596aeaa2b9c2f37232cbfa4864e01f3eaf Mon Sep 17 00:00:00 2001 From: Rupeshiya Date: Sat, 9 May 2020 13:16:22 +0530 Subject: [PATCH 1/2] fixed some client side issues and integrated backend --- CODE_OF_CONDUCT.md | 0 README.md | 0 READMEassets/Home.jpg | Bin READMEassets/Info.png | Bin READMEassets/about.jpg | Bin READMEassets/about2.jpg | Bin READMEassets/codeuino.png | Bin READMEassets/dashboard.png | Bin READMEassets/doughnut.png | Bin READMEassets/edit_profile.png | Bin READMEassets/feeds.png | Bin READMEassets/forking-the-repo.gif | Bin READMEassets/landing.gif | Bin READMEassets/running-locally.gif | Bin READMEassets/signup_community.png | Bin READMEassets/signup_user.png | Bin READMEassets/womenwhocode.png | Bin build.sh | 0 src/App.js | 2 +- src/actions/eventAction.js | 43 +++++ src/images/jitsi.png | Bin 0 -> 8339 bytes src/index.css | 2 + src/svgs/donut-icon.svg | 2 +- src/user/dashboard/navigation/navigation.js | 131 ++++++++------- src/user/dashboard/navigation/navigation.scss | 16 +- src/user/dashboard/news-feed/news-feed.js | 12 +- src/user/events/events.js | 93 +++++++++-- src/user/events/events.scss | 25 +-- src/user/events/popups/DeleteEvent.js | 70 ++++++++ src/user/events/popups/EditEvent.js | 157 ++++++++++++++++++ src/user/events/popups/popup.scss | 22 ++- src/user/pinned-posts/posts/pinPosts.js | 12 +- src/user/profile/popups/logout.js | 8 +- src/user/projects/projects.js | 9 +- src/user/projects/projects.scss | 1 - 35 files changed, 485 insertions(+), 120 deletions(-) mode change 100755 => 100644 CODE_OF_CONDUCT.md mode change 100755 => 100644 README.md mode change 100755 => 100644 READMEassets/Home.jpg mode change 100755 => 100644 READMEassets/Info.png mode change 100755 => 100644 READMEassets/about.jpg mode change 100755 => 100644 READMEassets/about2.jpg mode change 100755 => 100644 READMEassets/codeuino.png mode change 100755 => 100644 READMEassets/dashboard.png mode change 100755 => 100644 READMEassets/doughnut.png mode change 100755 => 100644 READMEassets/edit_profile.png mode change 100755 => 100644 READMEassets/feeds.png mode change 100755 => 100644 READMEassets/forking-the-repo.gif mode change 100755 => 100644 READMEassets/landing.gif mode change 100755 => 100644 READMEassets/running-locally.gif mode change 100755 => 100644 READMEassets/signup_community.png mode change 100755 => 100644 READMEassets/signup_user.png mode change 100755 => 100644 READMEassets/womenwhocode.png mode change 100755 => 100644 build.sh create mode 100644 src/actions/eventAction.js create mode 100644 src/images/jitsi.png create mode 100644 src/user/events/popups/DeleteEvent.js create mode 100644 src/user/events/popups/EditEvent.js diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/READMEassets/Home.jpg b/READMEassets/Home.jpg old mode 100755 new mode 100644 diff --git a/READMEassets/Info.png b/READMEassets/Info.png old mode 100755 new mode 100644 diff --git a/READMEassets/about.jpg b/READMEassets/about.jpg old mode 100755 new mode 100644 diff --git a/READMEassets/about2.jpg b/READMEassets/about2.jpg old mode 100755 new mode 100644 diff --git a/READMEassets/codeuino.png b/READMEassets/codeuino.png old mode 100755 new mode 100644 diff --git a/READMEassets/dashboard.png b/READMEassets/dashboard.png old mode 100755 new mode 100644 diff --git a/READMEassets/doughnut.png b/READMEassets/doughnut.png old mode 100755 new mode 100644 diff --git a/READMEassets/edit_profile.png b/READMEassets/edit_profile.png old mode 100755 new mode 100644 diff --git a/READMEassets/feeds.png b/READMEassets/feeds.png old mode 100755 new mode 100644 diff --git a/READMEassets/forking-the-repo.gif b/READMEassets/forking-the-repo.gif old mode 100755 new mode 100644 diff --git a/READMEassets/landing.gif b/READMEassets/landing.gif old mode 100755 new mode 100644 diff --git a/READMEassets/running-locally.gif b/READMEassets/running-locally.gif old mode 100755 new mode 100644 diff --git a/READMEassets/signup_community.png b/READMEassets/signup_community.png old mode 100755 new mode 100644 diff --git a/READMEassets/signup_user.png b/READMEassets/signup_user.png old mode 100755 new mode 100644 diff --git a/READMEassets/womenwhocode.png b/READMEassets/womenwhocode.png old mode 100755 new mode 100644 diff --git a/build.sh b/build.sh old mode 100755 new mode 100644 diff --git a/src/App.js b/src/App.js index 9d3fd213..88583c48 100644 --- a/src/App.js +++ b/src/App.js @@ -36,7 +36,7 @@ class App extends Component { rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" - crossorigin="anonymous" + crossOrigin="anonymous" /> diff --git a/src/actions/eventAction.js b/src/actions/eventAction.js new file mode 100644 index 00000000..a7961b1c --- /dev/null +++ b/src/actions/eventAction.js @@ -0,0 +1,43 @@ +import axios from 'axios'; +import { errorHandler } from '../utils/errorHandler'; +import { setRequestStatus } from '../utils/setRequestStatus'; + +// DELETE EVENT REQUEST +export const deleteEvent = (eventId) => async (dispatch) => { + try { + const res = await axios.delete(`/event/${eventId}`) + dispatch(setRequestStatus(false)); + if(res.status === 200){ + dispatch(setRequestStatus(true)); + } + } catch(error) { + dispatch(errorHandler(error)) + } +} + +// UPDATE EVENT REQUEST +export const updateEvent = (eventId, updatedInfo) => async (dispatch) => { + try { + const res = await axios.patch(`/event/${eventId}`, updatedInfo); + dispatch(setRequestStatus(false)); + if(res.status === 200){ + dispatch(setRequestStatus(true)); + } + } catch(error) { + dispatch(errorHandler(error)) + } +} + +// CREATE EVENT +export const createEvent = (eventInfo, history) => async (dispatch) => { + try { + const res = await axios.post('/event/', eventInfo) + dispatch(setRequestStatus(false)) + if(res.status === 201){ + dispatch(setRequestStatus(true)) + history.push('/events'); + } + } catch(error) { + dispatch(errorHandler(error)) + } +} diff --git a/src/images/jitsi.png b/src/images/jitsi.png new file mode 100644 index 0000000000000000000000000000000000000000..308864f60e5a52115a5f5a2695f9bfeb117bf5d2 GIT binary patch literal 8339 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 literal 0 HcmV?d00001 diff --git a/src/index.css b/src/index.css index 21c28d58..ac3c063f 100644 --- a/src/index.css +++ b/src/index.css @@ -6,6 +6,8 @@ body { /* font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; */ + box-sizing: border-box; + overflow-x: hidden; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } diff --git a/src/svgs/donut-icon.svg b/src/svgs/donut-icon.svg index bb4666aa..b7079ea9 100644 --- a/src/svgs/donut-icon.svg +++ b/src/svgs/donut-icon.svg @@ -1,3 +1,3 @@ - + diff --git a/src/user/dashboard/navigation/navigation.js b/src/user/dashboard/navigation/navigation.js index cdb4d5f2..38cc67d3 100644 --- a/src/user/dashboard/navigation/navigation.js +++ b/src/user/dashboard/navigation/navigation.js @@ -7,6 +7,7 @@ import "./navigation.scss"; import Logout from "../../profile/popups/logout"; import logo from "../../../svgs/logout.svg"; import {Info} from "../../integrations/NameForm"; +import JitsiMeets from '../../../images/jitsi.png' class Navigation extends Component { state = { logout:false }; @@ -18,14 +19,14 @@ class Navigation extends Component { open: false }); const divStyle = { - position: "absolute", - bottom: '4.5em' + position: "fixed", + bottom: '5em' }; const divStyle2 = { - position: "absolute", - bottom: 0 + position: "fixed", + bottom: "2em" }; - + const { dashboard, posts, org, event, proj, profile, logout, settings } = this.props; return (
@@ -33,7 +34,7 @@ class Navigation extends Component {
@@ -55,7 +56,7 @@ class Navigation extends Component { Dashboard - + @@ -78,7 +79,7 @@ class Navigation extends Component { Pinned Posts - + @@ -100,47 +101,47 @@ class Navigation extends Component { - - - - - + + + + + - - Events - + + Events + - - - - - + + + + + - - Projects - + + Projects + @@ -162,7 +163,7 @@ class Navigation extends Component { + className={settings ? "active" : "inactive"} > Settings + - + onHide={cancel} + /> + - +
this.setState({open:true})} + > + jitsi + Jitsi Meet +
{this.state.open ? : null} diff --git a/src/user/dashboard/navigation/navigation.scss b/src/user/dashboard/navigation/navigation.scss index bb785850..020d3947 100644 --- a/src/user/dashboard/navigation/navigation.scss +++ b/src/user/dashboard/navigation/navigation.scss @@ -53,10 +53,17 @@ } } -.jitsi{ - margin-left: 12.5px; +.jitsi { + display: flex; color: rgba(0, 0, 0, 0.5); } +.jitsi-meet{ + height: 21px; + width: 21px; + color: rgba(0, 0, 0, 0.5); + margin-right: 15px; + margin-left: 2px; +} .navigation{ .list-group { @@ -81,5 +88,8 @@ .log-button{ margin-left: -8.5px; + position: fixed; + z-index: 999; color: rgba(0, 0, 0, 0.5); -} \ No newline at end of file + bottom: 2em; +} diff --git a/src/user/dashboard/news-feed/news-feed.js b/src/user/dashboard/news-feed/news-feed.js index 7caf6f01..466c1230 100644 --- a/src/user/dashboard/news-feed/news-feed.js +++ b/src/user/dashboard/news-feed/news-feed.js @@ -71,10 +71,10 @@ export default function PinPosts(props){ changeType(atrb); second('s'); }; - let posts = feed.map((newsItem) => { + let posts = feed.map((newsItem, index) => { if(newsItem.type === "Project" && (type === 'All' || type === newsItem.type)){ return( -
+
) }else if(newsItem.type === "Event" && (type === 'All' || type === newsItem.type)){ return( -
+
) }else if(newsItem.type === "Donut" && (type === 'All' || type === newsItem.type)){ return( -
+
@@ -306,9 +306,9 @@ export default function PinPosts(props){
{ (first === 'f') ? - : - }
@@ -181,7 +238,7 @@ class Events extends Component { )} - See More +
@@ -205,10 +262,10 @@ class Events extends Component {
+ option={this.state.option} + optionValue={this.state.optionValue} + modalShow={this.state.modalShow} + />
); } diff --git a/src/user/events/events.scss b/src/user/events/events.scss index 547b423b..432e4918 100644 --- a/src/user/events/events.scss +++ b/src/user/events/events.scss @@ -5,7 +5,6 @@ font-family: Muli, sans-serif; .events { margin-top: 2vh; - } } @@ -34,7 +33,7 @@ width: 10px; margin: 1px; text-align: center; - height: 100%; + height: 100%; font-size: 30px; } @@ -43,7 +42,7 @@ width: 10px; margin: 1px; text-align: center; - height: 100%; + height: 100%; font-size: 30px; } @@ -52,7 +51,7 @@ width: 10px; margin: 1px; text-align: center; - height: 100%; + height: 100%; font-size: 30px; } @@ -90,17 +89,19 @@ } .short-des{ -font-weight: 100; -font-size: smaller; -color: #5d5d5d; + font-weight: 100; + font-size: smaller; + color: #5d5d5d; + text-align: justify; + text-overflow: ellipsis; } .createdAt{ -text-align: center; -font-size: 12px; -font-weight: bold; + text-align: center; + font-size: 12px; + font-weight: bold; } .event-card{ -max-width: 345px; -margin-top: 20px; + max-width: 345px; + margin-top: 20px; } \ No newline at end of file diff --git a/src/user/events/popups/DeleteEvent.js b/src/user/events/popups/DeleteEvent.js new file mode 100644 index 00000000..0cc9d429 --- /dev/null +++ b/src/user/events/popups/DeleteEvent.js @@ -0,0 +1,70 @@ +import React, { Component } from 'react' +import { Modal, Button } from 'react-bootstrap'; +import PropTypes from 'prop-types'; +import { connect } from 'react-redux'; +import "./popup.scss"; +import { deleteEvent } from '../../../actions/eventAction'; + +class DeleteEvent extends Component { + constructor(props) { + super(props); + this.state = { + eventId: '', + success: false + } + } + + deleteEventClick = (e) => { + e.preventDefault(); + console.log("Clicked on delete event") + this.props.deleteEvent(this.props.eventId); + if(this.props.status.success){ + this.setState({ show: false, success: true }) + } else { + console.log('Something went wrong!') + } + } + + render() { + const { show, onHide, eventId } = this.props; + return ( +
+ +
+ + +
Delete Event?
+
Are you sure you want to delete this event?
+ + + +
+ + +
+
+ +
+ ) + } +} + +DeleteEvent.propTypes = { + show: PropTypes.bool.isRequired, + onHide: PropTypes.func.isRequired, + eventId: PropTypes.string.isRequired +} + +const mapStateToProps = (state) => ({ + auth: state.auth, + error: state.error, + status: state.status +}) + +export default connect(mapStateToProps, { deleteEvent })(DeleteEvent); \ No newline at end of file diff --git a/src/user/events/popups/EditEvent.js b/src/user/events/popups/EditEvent.js new file mode 100644 index 00000000..2541235d --- /dev/null +++ b/src/user/events/popups/EditEvent.js @@ -0,0 +1,157 @@ +import React, {Component} from 'react'; +import {Modal, Button, Row, Col, Form} from 'react-bootstrap'; +import "./popup.scss"; +import { connect } from 'react-redux'; +import { updateEvent, deleteEvent } from '../../../actions/eventAction'; +import PropTypes from 'prop-types' + + +class EditEvent extends Component { + constructor(props) { + super(props); + this.state = { + eventName: "", + shortDesc: "", + longDesc: "", + location: "", + date: "", + }; + } + + componentDidMount = () => { + // FETCH THE EVENT DETAILS ON POPUP GETS TRIGGERED (INTEGRATION) + console.log("Fetching the event details!"); + }; + + onChange = (event) => { + const { name, value } = event.target; + this.setState({ [name]: value }); + }; + + updateEvent = (e) => { + e.preventDefault(); + console.log("Updating the event!!"); + // DISPATCH THE ACTION TO UPDATE EVENT (INTEGRATION) + const { eventName, shortDesc, longDesc, date, location } = this.state; + const { eventId } = this.props; + const updatedInfo = { + eventName, + description: { + shortDescription: shortDesc, + longDescription: longDesc, + }, + location, + eventDate: date, + }; + console.log('submitted data ', updatedInfo); + this.props.updateEvent(eventId, updatedInfo); + }; + + render() { + const { show, onHide } = this.props; + + return ( + +
+ + +
Edit Event
+
Event Information
+ + + + + + Event Name + + + + + Short description + + + + Long description + + + + Location + + + + Event Date + + + +
+ + +
+
+ + ); + } +} + +EditEvent.propTypes = { + show: PropTypes.bool.isRequired, + onHide: PropTypes.func.isRequired, + eventId: PropTypes.string.isRequired +} + +const mapStateToProps = (state) => ({ + error: state.error, + statue: state.status +}) + +export default connect(mapStateToProps, { updateEvent, deleteEvent })((EditEvent)) diff --git a/src/user/events/popups/popup.scss b/src/user/events/popups/popup.scss index 96c35c17..d9fc2de0 100644 --- a/src/user/events/popups/popup.scss +++ b/src/user/events/popups/popup.scss @@ -27,6 +27,26 @@ .info-description{ font-size: 15px; - text-align: center; + text-align: justify; color:rgb(56, 55, 55); +} + +.form-footer { + margin-top: 0; + Button { + width: 90px; + margin-right: 20px; + margin-bottom: 30px; + border-radius: 100px; + font-weight: 600; + } + .savebtn { + background-color: #1A73E8; + } +} +.modal-backdrop { + background-color: rgba(0,0,0, 0.1) !important; +} +.modal-backdrop.in{ + opacity: 0.5; } \ No newline at end of file diff --git a/src/user/pinned-posts/posts/pinPosts.js b/src/user/pinned-posts/posts/pinPosts.js index 70b68ebf..d26f26bd 100644 --- a/src/user/pinned-posts/posts/pinPosts.js +++ b/src/user/pinned-posts/posts/pinPosts.js @@ -70,10 +70,10 @@ export default function PinPosts(props){ changeType(atrb); second('s'); }; - let posts = feed.map((newsItem) => { + let posts = feed.map((newsItem, index) => { if(newsItem.type === "Project" && (type === 'All' || type === newsItem.type)){ return( -
+
) }else if(newsItem.type === "Event" && (type === 'All' || type === newsItem.type)){ return( -
+
) }else if(newsItem.type === "Donut" && (type === 'All' || type === newsItem.type)){ return( -
+
@@ -275,9 +275,9 @@ export default function PinPosts(props){

Pinned Posts

{ (first === 'f') ? - : - } - diff --git a/src/user/projects/projects.scss b/src/user/projects/projects.scss index f5cef1e8..045aab75 100644 --- a/src/user/projects/projects.scss +++ b/src/user/projects/projects.scss @@ -1,7 +1,6 @@ .organization { display: flex; min-height: 100vh; - height: auto; font-family: Muli, sans-serif; .navigation { flex: 0.5; From 37fdac1372d3bcb24a3bcf7a5350f166141133bf Mon Sep 17 00:00:00 2001 From: Rupesh Krishna Jha Date: Mon, 11 May 2020 19:12:51 +0530 Subject: [PATCH 2/2] Make build.sh executable --- build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755