Skip to content

Commit 89d5e76

Browse files
Sparsh1212Sparsh1212
committed
Added confirm alert library and removed sweet alert
1 parent 925edcd commit 89d5e76

12 files changed

+843
-158
lines changed

‎frontend-beta-spuggy/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
"react-router-dom": "^5.1.2",
1919
"react-scripts": "3.4.1",
2020
"semantic-ui-css": "^2.4.1",
21-
"semantic-ui-react": "^0.88.2",
22-
"sweetalert2-react": "^0.8.3"
21+
"semantic-ui-react": "^0.88.2"
2322
},
2423
"scripts": {
2524
"start": "react-scripts start",
@@ -42,4 +41,4 @@
4241
"last 1 safari version"
4342
]
4443
}
45-
}
44+
}

‎frontend-beta-spuggy/src/components/CreateIssueComponent.js

+90-91
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
} from 'semantic-ui-react';
1111
import './mainstyle.css';
1212
import ListIssues from './ListIssuesComponent';
13-
import SweetAlert from 'sweetalert2-react';
1413
import { faHome, faImage } from '@fortawesome/free-solid-svg-icons';
1514
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
1615

@@ -123,103 +122,103 @@ class CreateIssue extends Component {
123122
project_detail={this.props.project_detail}
124123
/>
125124
) : (
126-
// If not then rendering Create Issue form
127-
<div className='main'>
128-
<Container>
129-
<Button
130-
onClick={() => {
131-
this.setState({ display_issues: true });
132-
}}
133-
primary
134-
>
135-
<FontAwesomeIcon icon={faHome} /> Return to Issues
136-
</Button>
137-
<br />
138-
<br />
139-
{this.state.show ? (
140-
<Message
141-
success
142-
header='Issue Successfully Raised'
143-
content='You may now return to the Issues to view your newly raised issue.'
144-
/>
145-
) : (
146-
<div></div>
147-
)}
148-
{this.state.failure ? (
149-
<Message
150-
warning
151-
header='Oops Something Went Wrong'
152-
content='Looks like you left something important'
153-
/>
154-
) : (
155-
<div></div>
156-
)}
157-
<Form onSubmit={this.handleSubmit}>
158-
<h1>Create a New Issue</h1>
159-
<Form.Group widths='equal'>
160-
<Form.Field
161-
id='form-input-control-first-name'
162-
onChange={this.handleChange2}
163-
control={Input}
164-
label='Issue Title'
165-
placeholder='Enter the title of Issue'
166-
/>
167-
168-
<Form.Field
169-
control={Select}
170-
options={[
171-
{ key: 'b', text: 'Bug', value: 'Bug' },
172-
{ key: 'u', text: 'Enhancement/UI', value: 'UI' },
173-
]}
174-
label={{
175-
children: 'Type of Issue',
176-
htmlFor: 'form-select-control-gender',
177-
}}
178-
placeholder='Enter type of Issue'
179-
search
180-
searchInput={{ id: 'form-select-control-gender' }}
181-
onChange={this.handleChange}
182-
/>
183-
</Form.Group>
125+
// If not then rendering Create Issue form
126+
<div className='main'>
127+
<Container>
184128
<Button
185129
onClick={() => {
186-
this.setState({
187-
include_image: !this.state.include_image,
188-
});
130+
this.setState({ display_issues: true });
189131
}}
190-
color='teal'
132+
primary
191133
>
192-
<FontAwesomeIcon icon={faImage} /> Image (Optional)
193-
</Button>
194-
<br /> <br />
195-
{this.state.include_image ? (
196-
<Form.Field>
197-
<input
198-
type='file'
199-
id='image'
200-
accept='image/png, image/jpeg'
201-
onChange={this.handleImageChange}
202-
/>
203-
</Form.Field>
204-
) : (
205-
<div></div>
206-
)}
134+
<FontAwesomeIcon icon={faHome} /> Return to Issues
135+
</Button>
207136
<br />
208-
<Form.Field
209-
id='form-textarea-control-opinion'
210-
control={TextArea}
211-
label='Issue Description (Optional)'
212-
onChange={this.handleChange3}
213-
placeholder='Give a nice description that could be understood by everyone'
214-
/>
215137
<br />
216-
<Button positive type='submit'>
217-
Submit
138+
{this.state.show ? (
139+
<Message
140+
success
141+
header='Issue Successfully Raised'
142+
content='You may now return to the Issues to view your newly raised issue.'
143+
/>
144+
) : (
145+
<div></div>
146+
)}
147+
{this.state.failure ? (
148+
<Message
149+
warning
150+
header='Oops Something Went Wrong'
151+
content='Looks like you left something important'
152+
/>
153+
) : (
154+
<div></div>
155+
)}
156+
<Form onSubmit={this.handleSubmit}>
157+
<h1>Create a New Issue</h1>
158+
<Form.Group widths='equal'>
159+
<Form.Field
160+
id='form-input-control-first-name'
161+
onChange={this.handleChange2}
162+
control={Input}
163+
label='Issue Title'
164+
placeholder='Enter the title of Issue'
165+
/>
166+
167+
<Form.Field
168+
control={Select}
169+
options={[
170+
{ key: 'b', text: 'Bug', value: 'Bug' },
171+
{ key: 'u', text: 'Enhancement/UI', value: 'UI' },
172+
]}
173+
label={{
174+
children: 'Type of Issue',
175+
htmlFor: 'form-select-control-gender',
176+
}}
177+
placeholder='Enter type of Issue'
178+
search
179+
searchInput={{ id: 'form-select-control-gender' }}
180+
onChange={this.handleChange}
181+
/>
182+
</Form.Group>
183+
<Button
184+
onClick={() => {
185+
this.setState({
186+
include_image: !this.state.include_image,
187+
});
188+
}}
189+
color='teal'
190+
>
191+
<FontAwesomeIcon icon={faImage} /> Image (Optional)
192+
</Button>
193+
<br /> <br />
194+
{this.state.include_image ? (
195+
<Form.Field>
196+
<input
197+
type='file'
198+
id='image'
199+
accept='image/png, image/jpeg'
200+
onChange={this.handleImageChange}
201+
/>
202+
</Form.Field>
203+
) : (
204+
<div></div>
205+
)}
206+
<br />
207+
<Form.Field
208+
id='form-textarea-control-opinion'
209+
control={TextArea}
210+
label='Issue Description (Optional)'
211+
onChange={this.handleChange3}
212+
placeholder='Give a nice description that could be understood by everyone'
213+
/>
214+
<br />
215+
<Button positive type='submit'>
216+
Submit
218217
</Button>
219-
</Form>
220-
</Container>
221-
</div>
222-
)
218+
</Form>
219+
</Container>
220+
</div>
221+
)
223222
}
224223
</div>
225224
);

‎frontend-beta-spuggy/src/components/CreateProjectComponent.js

+7-12
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Button, Form, Container, Header, Message } from 'semantic-ui-react';
55
import './mainstyle.css';
66
import ListProjects from './ListProjectsComponent';
77
import { Dropdown } from 'semantic-ui-react';
8-
import SweetAlert from 'sweetalert2-react';
98
import { faHome } from '@fortawesome/free-solid-svg-icons';
109
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
1110

@@ -111,17 +110,17 @@ class CreateProject extends Component {
111110
content='You may now return to the Dashboard to view your newly created project.'
112111
/>
113112
) : (
114-
<div></div>
115-
)}
113+
<div></div>
114+
)}
116115
{this.state.failure ? (
117116
<Message
118117
warning
119118
header='Oops Something Went Wrong'
120119
content='Looks like you left something important'
121120
/>
122121
) : (
123-
<div></div>
124-
)}
122+
<div></div>
123+
)}
125124
<Header as='h2'>Create a New Project</Header>
126125
<Form>
127126
<Form.Field>
@@ -167,16 +166,12 @@ class CreateProject extends Component {
167166
Create Project
168167
</Button>
169168
</Form>
170-
{/* <SweetAlert
171-
show={this.state.show}
172-
text='Your Project Has Been Successfully Created'
173-
onConfirm={() => this.setState({ show: false })}
174-
/> */}
169+
175170
</Container>
176171
</div>
177172
) : (
178-
<ListProjects />
179-
)}
173+
<ListProjects />
174+
)}
180175
</div>
181176
);
182177
}

‎frontend-beta-spuggy/src/components/ListCommentsComponent.js

+27-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ import {
2525
faUser,
2626
} from '@fortawesome/free-solid-svg-icons';
2727
import MyPage from './MyPageComponent';
28+
import { confirmAlert } from 'react-confirm-alert'; // Import
29+
import 'react-confirm-alert/src/react-confirm-alert.css';
30+
2831

2932
class ListComments extends Component {
3033
constructor(props) {
@@ -202,7 +205,25 @@ class ListComments extends Component {
202205
});
203206
};
204207

208+
confirm_delete() {
209+
confirmAlert({
210+
title: 'Confirm to Delete Issue',
211+
message: 'Are you sure you want to delete this Issue ?',
212+
buttons: [
213+
{
214+
label: 'Yes',
215+
onClick: () => this.delete()
216+
},
217+
{
218+
label: 'No',
219+
onClick: () => { }
220+
}
221+
]
222+
});
223+
}
224+
205225
delete() {
226+
206227
let value = 'Token ' + this.state.token;
207228
var id = this.props.issue_id.id;
208229
let url = 'http://127.0.0.1:8000/spuggy/api/Issues/' + id + '/';
@@ -292,6 +313,9 @@ class ListComments extends Component {
292313
)}
293314
<Card.Content>
294315
<Card.Header>{issue1.issue_title}</Card.Header>
316+
<h4>
317+
Project: <i>{issue1.projectname}</i>
318+
</h4>
295319
<Card.Meta style={{ padding: '10px' }}>
296320
Created By:{' '}
297321
<b>
@@ -339,7 +363,7 @@ class ListComments extends Component {
339363
</Button>
340364
<Button
341365
onClick={() => {
342-
this.delete();
366+
this.confirm_delete();
343367
}}
344368
color='red'
345369
>
@@ -359,7 +383,7 @@ class ListComments extends Component {
359383
</Button>
360384
<Button
361385
onClick={() => {
362-
this.delete();
386+
this.confirm_delete();
363387
}}
364388
color='red'
365389
>
@@ -381,7 +405,7 @@ class ListComments extends Component {
381405
</Button>
382406
<Button
383407
onClick={() => {
384-
this.delete();
408+
this.confirm_delete();
385409
}}
386410
color='red'
387411
>

0 commit comments

Comments
 (0)