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

Implement workshop figma #100

Open
wants to merge 2 commits into
base: development
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
20 changes: 20 additions & 0 deletions package-lock.json
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
},
"dependencies": {
"@date-io/core": "^2.5.0",
"@date-io/date-fns": "^1.3.13",
"@date-io/moment": "^1.3.13",
"@emotion/core": "^10.0.28",
"@emotion/styled": "^10.0.27",
Expand Down Expand Up @@ -61,6 +62,7 @@
"change-case": "^4.1.1",
"chart.js": "^2.9.3",
"clsx": "^1.1.0",
"date-fns": "^2.16.1",
"draft-js": "^0.11.7",
"firebase": "^7.21.1",
"formik": "^2.1.4",
Expand Down
Binary file added public/static/images/backs/course.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/images/backs/ws.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/Routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import Error404View from 'src/views/pages/Error404View';
import StudentDashboardView from 'src/views/pages/StudentDashboardView';
import EditProfileView from 'src/views/pages/StudentDashboardView/EditProfile';
import CoursePage from 'src/views/pages/Course/CoursePage';
import WorkshopView from 'src/views/pages/WorkshopView';
import TermsView from './views/pages/documents/termsView';
import DocsLayout from './layouts/DocsLayout';
import PrivacyView from './views/pages/documents/privacyView';
Expand Down Expand Up @@ -156,6 +157,16 @@ const renderRoutes = () => (
)}
/>

<Route
path="/workshops"
exact
render={props => (
<MainLayout>
<WorkshopView {...props} />
</MainLayout>
)}
/>

<Route
path={`/machine-learning-using-python`}
exact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function CTA({ className, ...rest }) {
<Button
className={classes.Button + ' ' + classes.primeBtn}
component="a"
href="https://codecau.se/ws"
href="/workshops"
target="_blank"
size="large"
variant="contained"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const useStyles = makeStyles(theme => ({
}
}));

function Projects({ projects, flat }) {
function Projects({ title, projects, flat }) {
const classes = useStyles();

return (
Expand All @@ -39,7 +39,7 @@ function Projects({ projects, flat }) {
margin: '12px 0px 12px 8px'
}}
>
Projects you'll make in this course
{title}
</Typography>
{projects.map((project, index) => {
return <Project project={project} />;
Expand Down
2 changes: 1 addition & 1 deletion src/constants/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ export const horizontalGradient =
'linear-gradient(270.72deg, #180255 0.25%, #000000 97.54%)';

export const verticalGradient =
'linear-gradient(180.72deg, #180255 0.25%, #000000 97.54%)';
'linear-gradient(180.72deg, #180255 0.25%, #000000 85.54%)';
4 changes: 3 additions & 1 deletion src/views/pages/CLView/CTA.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ function CTA({ className, ...rest }) {
target="_blank"
size="large"
variant="outlined"
focusRipple={false}
>
Submit Request
</Button>
Expand Down Expand Up @@ -203,10 +204,11 @@ function CTA({ className, ...rest }) {
<Button
className={classes.Button + ' ' + classes.secondaryBtn}
component="a"
href="https://codecau.se/ws"
href="/workshops"
target="_blank"
size="large"
variant="outlined"
focusRipple={false}
>
Submit Request
</Button>
Expand Down
7 changes: 5 additions & 2 deletions src/views/pages/Course/Major.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Grid, Box, Hidden } from '@material-ui/core';
import Details from './partials/Details';
import Overview from './partials/Overview';
import Topics from './partials/Topics';
import Projects from './partials/Projects';
import Projects from '../../../components/SidePanel/Projects';

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

<Hidden smDown>
<Box display="flex" flexDirection="column" mb={3} ml={2}>
<Projects projects={course.projects} />
<Projects
title="Projects you'll make in this course"
projects={course.projects}
/>
</Box>
</Hidden>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion src/views/pages/CoursesView/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { makeStyles } from '@material-ui/core';
import Page from 'src/components/Page';
import Hero from './Hero';
import Footer from '../common/Footer';
import CTA from './CTA';
import CTA from '../../../components/CTA/CTA';
import Courses from './Courses';
import Apply from '../common/Apply';

Expand Down
204 changes: 0 additions & 204 deletions src/views/pages/EventsView/CTA.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/views/pages/EventsView/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { makeStyles } from '@material-ui/core';
import Page from 'src/components/Page';
import Hero from './Hero';
import Footer from '../common/Footer';
import CTA from './CTA';
import CTA from '../../../components/CTA/CTA';
import Events from './Events';
import Apply from '../common/Apply';

Expand Down
Loading