Skip to content
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.

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

minor changes #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified public/images/startup.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: 1 addition & 1 deletion src/actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const registerEvent = formData => (dispatch) => {
services.registerEvent(formData).then((data) => {
if (data.success) {
dispatch(success('EVENT_REGISTERED_SUCCESS', data));
SweetAlert('Registered SuccessFully', 'success');
SweetAlert('Registered Successfully', 'success');
dispatch(getRegisteredEvents());
} else {
dispatch(failure('EVENT_REGISTERED_FAILURE', data));
Expand Down
1 change: 1 addition & 0 deletions src/components/Events/Events.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ body, html {
border: 0px solid;
transition: all 0.2s ease;
margin-bottom: 20px;
min-width: 100%;
}
#events-page .card:hover {
box-shadow: 0px 0px 10px 0px #565656;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Events/Events.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const checkUser = (registerEvent, eventCategory, eventName, history) => {
if ((localStorage.getItem('token') ? jwtDecode(localStorage.getItem('token')).name : null)) {
registerEvent(eventCategory, eventName);
} else {
SweetAlert('Please Login to Register for an event', 'error');
SweetAlert('Please Login to Register for an event', 'warning');
history.push('/');
}
};
Expand Down Expand Up @@ -231,7 +231,7 @@ class Events extends React.Component {
const str = e.eventName;
if (str.match(re)) {
return (
<div key={e.eventName} className="col-sm-4">
<div key={e.eventName} className="col-sm-4 d-flex align-items-stretch justify-content-center">
<EventCard event={e} rules={e.rules} registerEvent={registerEvent} registeredEvents={registeredEvents} history={history} />
</div>
);
Expand Down
24 changes: 22 additions & 2 deletions src/components/OnBoarding/OnBoarding.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@
min-height: 100vh;
margin: 0px;
animation-name: fade-in;
animation-duration: 0.3s;
animation-timing-function: ease-in-out;
animation-duration: 0.3s;
background: none !important;
animation-timing-function: ease-in-out;
color: #fff !important;
}
#onBoarding-page h1 {
font-weight: bold;
}
.control-width {
max-width: 50%;
margin-left: 20px;
}
body, html {
background: linear-gradient(rgb(17, 67, 87), rgb(242, 148, 146)) !important;
}

@keyframes fade-in {
from {
opacity: 0;
Expand All @@ -18,4 +27,15 @@
opacity: 1;
transform: scale(1);
}
}

/* For Firefox */
input[type='number'] {
-moz-appearance:textfield;
}
/* Webkit browsers like Safari and Chrome */
input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}
10 changes: 5 additions & 5 deletions src/components/OnBoarding/OnBoarding.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ class OnBoarding extends React.Component {
<h1 className="display-4 text-center">
Welcome aboard
</h1>
<h1 className="text-center mb-5">
Techspardha18 Prime
</h1>
<h5 className="text-center">
<h3 className="text-center mb-5">
Techspardha'18 Prime
</h3>
<p className="lead text-center">
To continue we need a few more details about you...
</h5>
</p>
<div className="container text-center">
<hr className="my-4" />

Expand Down
1 change: 1 addition & 0 deletions src/components/User/User.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ body, html {
}
#myProfile-heading {
margin-bottom: 30px;
font-weight: bold !important;
}
#user-name, #user-college, #user-year {
text-transform: capitalize;
Expand Down