Skip to content

#127 adding cancel button #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CiTRuS93 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

#127 adding cancel button #213

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3bde167
#198 adding loading spinner to protest page
CiTRuS93 Nov 9, 2020
f6bc333
add margin, p and short import
CiTRuS93 Nov 10, 2020
22c275c
Merge pull request #1 from guytepper/master
CiTRuS93 Nov 16, 2020
2cdecad
Merge pull request #2 from guytepper/master
CiTRuS93 Nov 17, 2020
8e65077
#127 add cancel button
CiTRuS93 Nov 17, 2020
f14f840
Merge branch 'master' of https://github.com/CiTRuS93/1km.co.il
CiTRuS93 Nov 17, 2020
332a751
added confirm
CiTRuS93 Nov 18, 2020
39fa6bf
change cancel button color to red
CiTRuS93 Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/components/ProtestForm/ProtestForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { validateLatLng, isValidUrl } from '../../utils';
import { fetchNearbyProtests } from '../../api';
import L from 'leaflet';
import DateTimeList from '../DateTimeList';
import { useHistory } from 'react-router-dom';

const protestMarker = new L.Icon({
iconUrl: '/icons/fist.svg',
Expand All @@ -25,6 +26,7 @@ function ProtestForm({
editMode = null,
isAdmin,
}) {
const history = useHistory();
const coordinatesUpdater = useCallback(() => {
let initialState = [31.7749837, 35.219797];
if (validateLatLng(initialCoords)) initialState = initialCoords;
Expand Down Expand Up @@ -84,6 +86,11 @@ function ProtestForm({
nearbyProtests();
}, [coordinatesUpdater]);

const onCancel = () => {
if (window.confirm('המידע שהזנת לא יישמר. לחזור אחורה?')) {
history.goBack();
}
};
const onSubmit = async (params) => {
if (!editMode && !params.streetAddress) {
alert('אנא הזינו את כתובת ההפגנה');
Expand Down Expand Up @@ -275,6 +282,10 @@ function ProtestForm({
)}
</>
)}
<br />
<Button type="button" onClick={onCancel} color="tomato">
ביטול
</Button>
</ProtestFormWrapper>
);
}
Expand Down