Skip to content

Commit

Permalink
Inconsistency fix and backend integration, worked on events client si…
Browse files Browse the repository at this point in the history
…de (#470)

* fixed some client side issues and integrated backend

* Make build.sh executable

Co-authored-by: Devesh Verma <[email protected]>
  • Loading branch information
Rupeshiya and devesh-verma authored May 13, 2020
1 parent ac764e7 commit 4a1d1a0
Show file tree
Hide file tree
Showing 34 changed files with 513 additions and 103 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
before_install:
- chmod +x build.sh
Empty file modified CODE_OF_CONDUCT.md
100755 → 100644
Empty file.
Empty file modified README.md
100755 → 100644
Empty file.
Empty file modified READMEassets/Home.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/Info.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/about.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/about2.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/codeuino.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/dashboard.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/doughnut.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/edit_profile.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/feeds.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/forking-the-repo.gif
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/landing.gif
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/running-locally.gif
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/signup_community.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/signup_user.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified READMEassets/womenwhocode.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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"
/>
<Router />
</React.Fragment>
Expand Down
43 changes: 43 additions & 0 deletions src/actions/eventAction.js
Original file line number Diff line number Diff line change
@@ -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))
}
}
Binary file added src/images/jitsi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/svgs/donut-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4a1d1a0

Please sign in to comment.