Skip to content

Commit 76f42fe

Browse files
RupeshiyaRupeshiya
committed
fixing inconsistencies issues
1 parent 23887f6 commit 76f42fe

File tree

27 files changed

+599
-386
lines changed

27 files changed

+599
-386
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"react-cookies": "^0.1.1",
2424
"react-dom": "^16.12.0",
2525
"react-dropzone": "^11.0.1",
26-
"react-icons": "^3.9.0",
26+
"react-icons": "^3.10.0",
2727
"react-images": "^1.1.7",
2828
"react-lottie": "^1.2.3",
2929
"react-markdown-editor-lite": "^1.1.4",

‎src/auth/login/login.js‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import LoginForm from "../login-form/login-form";
44
import SignUpForm from "../signup-form/signup-form";
55
import { DonutTitle } from "../../donutTitle/donutTitle";
66
import multipleDonuts from "../../images/extra-donuts.png";
7+
import GoogleLogin from '../../images/icons8-google-48.png'
8+
import { FaGoogle, FaGithub } from 'react-icons/fa'
79
import "./login.scss";
810

911
class Login extends Component {
@@ -55,40 +57,24 @@ class Login extends Component {
5557
? "Or Sign In with"
5658
: "Or SignUp with"}
5759
</p>
58-
<Row>
59-
<Col className="button-column">
60+
<div className="login__options">
61+
<div className="">
6062
<a
61-
href="http://localhost:4000/auth/google"
63+
href="http://localhost:5000/auth/google"
6264
style={{ padding: "1vh" }}
6365
>
64-
<Button
65-
className="selectorbtn"
66-
type="submit"
67-
variant="primary"
68-
color="primary"
69-
size="sm"
70-
>
71-
<span className="selectorbtn-content">Google</span>
72-
</Button>
66+
<img src={GoogleLogin} alt="Google" className="google__login"/>
7367
</a>
74-
</Col>
75-
<Col className="button-column">
68+
</div>
69+
<div className="" >
7670
<a
77-
href="http://localhost:4000/auth/github"
71+
href="http://localhost:5000/auth/github"
7872
style={{ padding: "1vh" }}
7973
>
80-
<Button
81-
className="selectorbtn"
82-
type="submit"
83-
variant="primary"
84-
color="primary"
85-
size="sm"
86-
>
87-
<span className="selectorbtn-content">Github</span>
88-
</Button>
74+
<FaGithub color="#24292e" className="github__login"/>
8975
</a>
90-
</Col>
91-
</Row>
76+
</div>
77+
</div>
9278
<p className="login-text-selector">
9379
{this.state.activeForm === "login"
9480
? "Don't have an account? "

‎src/auth/login/login.scss‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,15 @@
108108
height: 38px;
109109
}
110110
}
111+
112+
.login__options {
113+
display: flex;
114+
justify-content: space-around;
115+
.google__login {
116+
height: 30px;
117+
}
118+
.github__login {
119+
height: 30px;
120+
width: 30px;
121+
}
122+
}

‎src/auth/signup-form/signup-form.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class SignUpForm extends Component {
2828
}
2929

3030
componentWillReceiveProps(nextProps) {
31-
if (nextProps.error?.msg.length > 0) {
31+
if (nextProps.error?.msg?.length > 0) {
3232
this.setState({
3333
error: {
3434
msg: "Something went wrong, Please recheck the input!",

‎src/common/Popups.js‎

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Component } from 'react'
22
import PropTypes from 'prop-types';
3-
import { Modal, Button, Form } from 'react-bootstrap';
3+
import { Modal, Button, Form, Col } from 'react-bootstrap';
44
import { MdVerifiedUser } from 'react-icons/md';
55
import { FaUserSlash } from 'react-icons/fa';
66
import { connect } from 'react-redux';
@@ -160,25 +160,24 @@ nextButton(){
160160
</Form>
161161
);
162162
const updateUsername = (
163-
<Form>
164-
<div className="row">
165-
<div className="col-md-9">
166-
<Form.Group controlId="formBasicEmail">
163+
<Form className="modal__form">
164+
<Form.Row className="modal__row">
165+
<Form.Group as={Col} className="modal__group">
166+
<Form.Label className="modal__label" controlId="formBasicEmail" />
167167
<Form.Control
168168
type="text"
169169
placeholder="Enter your username"
170170
onChange={this.onChange}
171171
defaultValue={optionValue}
172172
name="username"
173173
/>
174-
</Form.Group>
175-
</div>
176-
<div className="col-md-3">
177-
<Button className="btn btn-light" type="button" onClick={this.handleSubmit}>
178-
Save
174+
</Form.Group>
175+
</Form.Row>
176+
<div className="modal__buttons">
177+
<Button className="modal__save" onClick={this.handleSubmit}>
178+
<span className="modal__buttontext">Save</span>
179179
</Button>
180180
</div>
181-
</div>
182181
</Form>
183182
);
184183

@@ -219,7 +218,7 @@ nextButton(){
219218
)
220219
const updatePassword = (
221220
<React.Fragment>
222-
<form onSubmit={this.handleSubmit}>
221+
<Form className="modal__form" onSubmit={this.handleSubmit}>
223222
<Step1
224223
currentStep={this.state.currentStep}
225224
onChange={this.onChange}
@@ -232,7 +231,7 @@ nextButton(){
232231

233232
{this.nextButton()}
234233

235-
</form>
234+
</Form>
236235
</React.Fragment>
237236
);
238237
const deactivateAccount = (
@@ -261,11 +260,21 @@ nextButton(){
261260
</div>
262261
)
263262
return (
264-
<Modal show={this.state.show} onHide={this.handleClose} animation={false} centered>
265-
<Modal.Header closeButton>
266-
<Modal.Title>Update { " " + option }</Modal.Title>
263+
<Modal
264+
show={this.state.show}
265+
onHide={this.handleClose}
266+
animation={true}
267+
centered
268+
className="modal"
269+
>
270+
<Modal.Header closeButton className="modal__header">
271+
<Modal.Title className="modal__title">
272+
<div className="modal__main-title">
273+
Update { " " + option }
274+
</div>
275+
</Modal.Title>
267276
</Modal.Header>
268-
<Modal.Body>
277+
<Modal.Body className="modal__body">
269278
{Boolean(option === "name") ? updateName : null}
270279
{Boolean(option === "email") ? updateEmail: null}
271280
{Boolean(option === "username") ? updateUsername: null}
@@ -287,18 +296,24 @@ function Step1(props) {
287296
return null
288297
}
289298
return(
290-
<div className="form-group">
291-
<label htmlFor="email">Registered-Email address</label>
292-
<input
293-
className="form-control"
294-
id="email"
295-
name="email"
296-
type="text"
297-
placeholder="abc@gmail.com"
298-
value={props.email}
299-
onChange={props.onChange}
300-
/>
301-
</div>
299+
<Form.Row className="modal__row">
300+
<Form.Group as={Col} className="modal__group">
301+
<Form.Label
302+
htmlFor="email"
303+
className="modal__label"
304+
>
305+
Registered-Email address
306+
</Form.Label>
307+
<Form.Control
308+
id="email"
309+
name="email"
310+
type="text"
311+
placeholder="abc@gmail.com"
312+
value={props.email}
313+
onChange={props.onChange}
314+
/>
315+
</Form.Group>
316+
</Form.Row>
302317
);
303318
}
304319

‎src/images/icons8-google-48.png‎

1.56 KB
Loading

‎src/user/Admin/register.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,10 @@
325325
display: flex;
326326
justify-content: flex-end;
327327
float: right;
328-
height: 18vh;
328+
height: 169px;
329329
margin-top: -9vh;
330330
opacity: 0.1;
331-
width: 15vw;
331+
width: 200px;
332332
}
333333
}
334334

‎src/user/dashboard/insights/components/community.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
width: 11vw;
2121
height: 5vh;
2222
background: #1A73E8;
23-
border-radius: 100px;
23+
// border-radius: 100px;
2424
padding: 0.3em;
2525
margin-right: 1em;
2626
}
2727
.member_btn {
2828
width: 11vw;
2929
height: 5vh;
3030
background: rgb(250, 251, 252);
31-
border-radius: 100px;
31+
// border-radius: 100px;
3232
color: #1A73E8;
3333
padding: 0.3em;
3434
}

‎src/user/dashboard/insights/insight.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
width: 11vw;
2727
height: 5vh;
2828
background: #1A73E8;
29-
border-radius: 100px;
29+
// border-radius: 100px;
3030
padding: 0.3em;
3131
margin-right: 1em;
3232
}
3333
.member_btn {
3434
width: 11vw;
3535
height: 5vh;
3636
background: rgb(250, 251, 252);
37-
border-radius: 100px;
37+
// border-radius: 100px;
3838
color: #1A73E8;
3939
padding: 0.3em;
4040
}

‎src/user/dashboard/news-feed/news-feed.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418

419419
.posts {
420420
width: 140%;
421-
margin-top: 25px;
421+
// margin-top: 25px;
422422
margin-left: 20px;
423423
margin-right: 10px;
424424
margin-bottom: 24px;

0 commit comments

Comments
 (0)