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

Commit 3f183e0

Browse files
Implement new Workshop Design: final
1 parent 0652490 commit 3f183e0

File tree

20 files changed

+575
-418
lines changed

20 files changed

+575
-418
lines changed

package-lock.json

100755100644
Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
},
3030
"dependencies": {
3131
"@date-io/core": "^2.5.0",
32+
"@date-io/date-fns": "^1.3.13",
3233
"@date-io/moment": "^1.3.13",
3334
"@emotion/core": "^10.0.28",
3435
"@emotion/styled": "^10.0.27",
@@ -59,6 +60,7 @@
5960
"change-case": "^4.1.1",
6061
"chart.js": "^2.9.3",
6162
"clsx": "^1.1.0",
63+
"date-fns": "^2.16.1",
6264
"draft-js": "^0.11.7",
6365
"firebase": "^7.21.1",
6466
"formik": "^2.1.4",

public/static/images/backs/course.png

532 KB
Loading

public/static/images/backs/ws.png

492 KB
Loading

src/Routes.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import Error404View from 'src/views/pages/Error404View';
1616
import StudentDashboardView from 'src/views/pages/StudentDashboardView';
1717
import EditProfileView from 'src/views/pages/StudentDashboardView/EditProfile';
1818
import CoursePage from 'src/views/pages/Course/CoursePage';
19+
import WorkshopView from 'src/views/pages/WorkshopView';
1920
import TermsView from './views/pages/documents/termsView';
2021
import DocsLayout from './layouts/DocsLayout';
2122
import PrivacyView from './views/pages/documents/privacyView';
@@ -137,6 +138,15 @@ const renderRoutes = () => (
137138
</MainLayout>
138139
)}
139140
/>
141+
<Route
142+
path="/workshops"
143+
exact
144+
render={props => (
145+
<MainLayout>
146+
<WorkshopView {...props} />
147+
</MainLayout>
148+
)}
149+
/>
140150

141151
<Route
142152
path={`/machine-learning-using-python`}

src/views/pages/CoursesView/CTA.js renamed to src/components/CTA/CTA.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function CTA({ className, ...rest }) {
9797
<Button
9898
className={classes.Button + ' ' + classes.primeBtn}
9999
component="a"
100-
href="https://codecau.se/ws"
100+
href="/workshops"
101101
target="_blank"
102102
size="large"
103103
variant="contained"

src/views/pages/Course/partials/Projects.js renamed to src/components/SidePanel/Projects.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const useStyles = makeStyles(theme => ({
1515
}
1616
}));
1717

18-
function Projects({ projects, flat }) {
18+
function Projects({ title, projects, flat }) {
1919
const classes = useStyles();
2020

2121
return (
@@ -39,7 +39,7 @@ function Projects({ projects, flat }) {
3939
margin: '12px 0px 12px 8px'
4040
}}
4141
>
42-
Learn To Make From this Course
42+
{title}
4343
</Typography>
4444
{projects.map((project, index) => {
4545
return <Project project={project} />;

src/constants/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ export const horizontalGradient =
99
'linear-gradient(270.72deg, #180255 0.25%, #000000 97.54%)';
1010

1111
export const verticalGradient =
12-
'linear-gradient(180.72deg, #180255 0.25%, #000000 97.54%)';
12+
'linear-gradient(180.72deg, #180255 0.25%, #000000 85.54%)';

src/views/pages/CLView/CTA.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ function CTA({ className, ...rest }) {
145145
target="_blank"
146146
size="large"
147147
variant="outlined"
148+
focusRipple={false}
148149
>
149150
Submit Request
150151
</Button>
@@ -203,10 +204,11 @@ function CTA({ className, ...rest }) {
203204
<Button
204205
className={classes.Button + ' ' + classes.secondaryBtn}
205206
component="a"
206-
href="https://codecau.se/ws"
207+
href="/workshops"
207208
target="_blank"
208209
size="large"
209210
variant="outlined"
211+
focusRipple={false}
210212
>
211213
Submit Request
212214
</Button>

src/views/pages/Course/Major.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Grid, Box, Hidden } from '@material-ui/core';
44
import Details from './partials/Details';
55
import Overview from './partials/Overview';
66
import Topics from './partials/Topics';
7-
import Projects from './partials/Projects';
7+
import Projects from '../../../components/SidePanel/Projects';
88

99
const useStyles = makeStyles(theme => ({
1010
icon: {
@@ -106,7 +106,10 @@ export default function Major({ course }) {
106106

107107
<Hidden smDown>
108108
<Box display="flex" flexDirection="column" mb={3} ml={2}>
109-
<Projects projects={course.projects} />
109+
<Projects
110+
title="Learn To Make From This Course"
111+
projects={course.projects}
112+
/>
110113
</Box>
111114
</Hidden>
112115
</Box>

src/views/pages/CoursesView/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { makeStyles } from '@material-ui/core';
33
import Page from 'src/components/Page';
44
import Hero from './Hero';
55
import Footer from '../common/Footer';
6-
import CTA from './CTA';
6+
import CTA from '../../../components/CTA/CTA';
77
import Courses from './Courses';
88
import Apply from '../common/Apply';
99

src/views/pages/EventsView/CTA.js

Lines changed: 0 additions & 204 deletions
This file was deleted.

src/views/pages/EventsView/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { makeStyles } from '@material-ui/core';
33
import Page from 'src/components/Page';
44
import Hero from './Hero';
55
import Footer from '../common/Footer';
6-
import CTA from './CTA';
6+
import CTA from '../../../components/CTA/CTA';
77
import Events from './Events';
88
import Apply from '../common/Apply';
99

0 commit comments

Comments
 (0)