Skip to content
This repository was archived by the owner on Mar 7, 2024. It is now read-only.

Commit 2f959a0

Browse files
committed
update application procedure in course page
1 parent a89738b commit 2f959a0

File tree

8 files changed

+66
-54
lines changed

8 files changed

+66
-54
lines changed

src/data/courses/advanced/CompetitiveJava.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export const competitiveJava = {
44
level: 'Level 2',
55
link: '/competitive-programming-using-java',
66
domain: 'Interview Prepration',
7-
title: 'Competitve Programming using Java',
7+
title: 'Competitive Programming using Java',
88
upcoming: 'Oct 1st',
99
schedule: [
1010
{

src/views/pages/ApplicationsView/ApplicationSteps.js

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
SelectValidator
1414
} from 'react-material-ui-form-validator';
1515

16-
// import axios from 'axios';
1716

1817
const useStyles = makeStyles(theme => ({
1918
root: {
@@ -337,36 +336,52 @@ function FormChallenge({ setActiveStep, data, setData }) {
337336
setActiveStep(3);
338337
};
339338

339+
// useEffect(() => {
340+
// ValidatorForm.addValidationRule('isNotShort', value => {
341+
// console.log(value);
342+
// if (value.length < 100) {
343+
// return false;
344+
// }
345+
// return true;
346+
// });
347+
// });
348+
340349
return (
341350
<ValidatorForm onSubmit={handleSubmit}>
342351
<TextValidator
343352
className={classes.textField}
344353
multiline
345354
fullWidth
346-
label="Why ?"
355+
label="Why do you wish to take up this course?"
347356
variant="outlined"
348357
onChange={handleChange}
349358
rows={4}
359+
validators={['required']}
360+
errorMessages={['College is a required field']}
350361
/>
351362

352363
<TextValidator
353364
className={classes.textField}
354365
multiline
355366
fullWidth
356-
label="What is your expectation from this course?"
367+
label="Why do you deserve this scholarship?"
357368
variant="outlined"
358369
onChange={handleChange}
359370
rows={4}
371+
validators={['required']}
372+
errorMessages={['College is a required field']}
360373
/>
361374

362375
<TextValidator
363376
className={classes.textField}
364377
multiline
365378
fullWidth
366-
label="What is your viewpoint toward Coding in Community Contribution?"
379+
label="What is your viewpoint towards Coding for a Cause?"
367380
variant="outlined"
368381
onChange={handleChange}
369382
rows={4}
383+
validators={['required']}
384+
errorMessages={['College is a required field']}
370385
/>
371386

372387
<Button variant="outlined" onClick={handlePrev} color="secondary">

src/views/pages/Courses/Process.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import ProcessSteppers from './ProcessSteppers';
66

77
const useStyles = makeStyles(theme => ({
88
root: {
9-
padding: theme.spacing(0, 10, 10),
9+
background: 'linear-gradient(180deg, #2A185A 0%, #000000 100%)',
10+
padding: theme.spacing(14, 10, 10),
1011
[theme.breakpoints.down('md')]: {
11-
padding: theme.spacing(0, 0, 10),
12+
padding: theme.spacing(14, 0, 10)
1213
},
1314
color: '#000000'
14-
},
15+
}
1516
}));
1617

1718
function Process({ benefits, className, ...rest }) {
@@ -21,12 +22,21 @@ function Process({ benefits, className, ...rest }) {
2122
<div className={clsx(classes.root, className)} {...rest}>
2223
<Container maxWidth="lg">
2324
<Typography
24-
style={{ marginTop: '10px' }}
25+
style={{ color: '#ffffff' }}
2526
variant="h2"
2627
align="center"
2728
gutterBottom
2829
>
29-
Application Process for Selection
30+
Offering 70% Scholarship On this Batch
31+
</Typography>
32+
33+
<Typography
34+
style={{ marginTop: '32px', color: '#ffffff' }}
35+
variant="h4"
36+
align="center"
37+
gutterBottom
38+
>
39+
Application Process To Get Shortlisted
3040
</Typography>
3141
<Grid container component="dl" style={{ padding: '20px 0px 20px' }}>
3242
<ProcessSteppers />

src/views/pages/Courses/ProcessSteppers.js

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { makeStyles, withStyles } from '@material-ui/core/styles';
44
import clsx from 'clsx';
5-
import Stepper from '@material-ui/core/Stepper';
5+
import { Stepper, Typography } from '@material-ui/core';
66
import Step from '@material-ui/core/Step';
77
import StepLabel from '@material-ui/core/StepLabel';
88
import Check from '@material-ui/icons/Check';
@@ -48,8 +48,8 @@ function QontoStepIcon(props) {
4848
{completed ? (
4949
<Check className={classes.completed} />
5050
) : (
51-
<div className={classes.circle} />
52-
)}
51+
<div className={classes.circle} />
52+
)}
5353
</div>
5454
);
5555
}
@@ -71,14 +71,12 @@ const ColorlibConnector = withStyles({
7171
},
7272
active: {
7373
'& $line': {
74-
backgroundImage:
75-
'linear-gradient( 95deg,rgb(242,113,33) 0%,rgb(233,64,87) 50%,rgb(138,35,135) 100%)'
74+
background: '#ffffff'
7675
}
7776
},
7877
completed: {
7978
'& $line': {
80-
backgroundImage:
81-
'linear-gradient( 95deg,rgb(242,113,33) 0%,rgb(233,64,87) 50%,rgb(138,35,135) 100%)'
79+
background: '#ffffff'
8280
}
8381
},
8482
line: {
@@ -93,7 +91,7 @@ const useColorlibStepIconStyles = makeStyles({
9391
root: {
9492
backgroundColor: '#ccc',
9593
zIndex: 1,
96-
color: '#fff',
94+
color: 'linear-gradient(180deg, #2A185A 0%, #000000 100%)',
9795
width: 50,
9896
height: 50,
9997
display: 'flex',
@@ -102,13 +100,10 @@ const useColorlibStepIconStyles = makeStyles({
102100
alignItems: 'center'
103101
},
104102
active: {
105-
backgroundImage:
106-
'linear-gradient( 136deg, rgb(242,113,33) 0%, rgb(233,64,87) 50%, rgb(138,35,135) 100%)',
107-
boxShadow: '0 4px 10px 0 rgba(0,0,0,.25)'
103+
background: '#ffffff'
108104
},
109105
completed: {
110-
backgroundImage:
111-
'linear-gradient( 136deg, rgb(242,113,33) 0%, rgb(233,64,87) 50%, rgb(138,35,135) 100%)'
106+
background: '#ffffff'
112107
}
113108
});
114109

@@ -174,7 +169,7 @@ function getSteps() {
174169

175170
export default function ProcessSteppers() {
176171
const classes = useStyles();
177-
const activeStep = 3;
172+
const activeStep = 4;
178173
const steps = getSteps();
179174

180175
return (
@@ -184,12 +179,21 @@ export default function ProcessSteppers() {
184179
activeStep={activeStep}
185180
connector={<ColorlibConnector />}
186181
style={{
187-
padding: '24px 0px'
182+
padding: '24px 0px',
183+
backgroundColor: 'transparent'
188184
}}
189185
>
190186
{steps.map(label => (
191187
<Step key={label}>
192-
<StepLabel StepIconComponent={ColorlibStepIcon}>{label}</StepLabel>
188+
<StepLabel StepIconComponent={ColorlibStepIcon}>
189+
<Typography
190+
style={{
191+
color: '#ffffff'
192+
}}
193+
>
194+
{label}
195+
</Typography>
196+
</StepLabel>
193197
</Step>
194198
))}
195199
</Stepper>

src/views/pages/Courses/Schedule.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ const useStyles = makeStyles(theme => ({
1616
marginRight: theme.spacing(2)
1717
},
1818
root: {
19-
padding: theme.spacing(0, 10, 10),
19+
padding: theme.spacing(10, 10, 10),
2020
display: 'flex',
2121
justifyContent: 'center',
2222
alignItems: 'center',
2323
[theme.breakpoints.down('md')]: {
24-
padding: theme.spacing(0, 3, 10)
24+
padding: theme.spacing(10, 3, 10)
2525
}
2626
},
2727

src/views/pages/Courses/partials/Details.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,13 @@ export default function Details({ course, bottom }) {
6262
<Box mb={2} display="flex" flexDirection="row">
6363
<Typography
6464
style={{
65-
marginRight: '48px',
65+
marginRight: '24px',
6666
color: '#0085FF'
6767
}}
6868
variant="body1"
6969
>
7070
{course.difficulty}
7171
</Typography>
72-
<Typography variant="body1">{course.level}</Typography>
7372
</Box>
7473

7574
<Box mb={4} display="flex" flexDirection="row" flexWrap="wrap">

src/views/pages/Courses/partials/DetailsBottom.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,13 @@ export default function DetailsBottom({ course, batch }) {
6464
>
6565
<Typography
6666
style={{
67-
marginRight: '48px',
67+
marginRight: '24px',
6868
color: '#0085FF'
6969
}}
7070
variant="body1"
7171
>
7272
{course.difficulty}
7373
</Typography>
74-
<Typography variant="body1">{course.level}</Typography>
7574
</Box>
7675

7776
<Box mb={4} display="flex" flexDirection="row" flexWrap="wrap">

src/views/pages/common/CourseCard.js

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@ import React from 'react';
22
import { makeStyles } from '@material-ui/core/styles';
33
import ParallaxSlide from '@mui-treasury/components/slide/parallax';
44

5-
import {
6-
Typography,
7-
Box,
8-
Card,
9-
CardContent,
10-
} from '@material-ui/core';
5+
import { Typography, Box, Card, CardContent } from '@material-ui/core';
116
import { Link } from 'react-router-dom';
127

138
const useStyles = makeStyles(theme => ({
@@ -118,12 +113,12 @@ export default function CourseCard({ course }) {
118113
display="flex"
119114
flexDirection="row"
120115
style={{
121-
margin: '8px 0px 0px'
116+
margin: '8px 0px 16px'
122117
}}
123118
>
124119
<Typography
125120
align="left"
126-
variant="body2"
121+
variant="h5"
127122
style={{
128123
width: '50%',
129124
color: '#0085FF'
@@ -133,26 +128,16 @@ export default function CourseCard({ course }) {
133128
</Typography>
134129
<Typography
135130
align="right"
136-
variant="body2"
131+
variant="h5"
137132
style={{
138-
width: '50%'
133+
width: '50%',
134+
color: '#FF4C00'
139135
}}
140136
>
141-
<Box fontWeight={600}>{course.level}</Box>
137+
{course.domain}
142138
</Typography>
143139
</Box>
144140

145-
<Typography
146-
variant="h5"
147-
align="left"
148-
style={{
149-
marginBottom: '16px',
150-
color: '#FF4C00'
151-
}}
152-
>
153-
{course.domain}
154-
</Typography>
155-
156141
<Typography variant="h4" align="left">
157142
{course.title}
158143
</Typography>

0 commit comments

Comments
 (0)