diff --git a/package-lock.json b/package-lock.json index 0bd99eeca7262b328f871dac57218d0a9218542a..3c207cd0ebbb1470c3ffc7b57fd8d1abdf10cce9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9229,6 +9229,11 @@ "is-fullwidth-code-point": "2.0.0" } }, + "slick-carousel": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/slick-carousel/-/slick-carousel-1.8.1.tgz", + "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==" + }, "sntp": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", diff --git a/package.json b/package.json index b058ad52d0439fac1ea5b67a30e3f1c0cdb43bd2..75756b9afa51b39487427e388bda8c7c51dc1473 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "redux-logger": "^3.0.6", "redux-thunk": "^2.2.0", "semantic-ui-css": "^2.2.12", - "semantic-ui-react": "^0.77.2" + "semantic-ui-react": "^0.77.2", + "slick-carousel": "^1.8.1" }, "scripts": { "start": "react-scripts start", diff --git a/src/actions/auth.js b/src/actions/auth.js index 20f19754ea0158088e666869427a51050d7272b2..1ea3bf6b05c13b0c5e2f7eca6addd97a0e4d6933 100644 --- a/src/actions/auth.js +++ b/src/actions/auth.js @@ -47,11 +47,11 @@ export const groupChange = groups => ( ); export const submitRegistration = ({ - nick, groups, signed, motivation, id, + nick, groups, signed, motivationAbout, motivationProfession, motivationExercise, id, }) => ( async (dispatch) => { const response = await axios.patch(`/api/v1/profiles/${id}/`, { - nick, groups, signed, motivation, + nick, groups, signed, motivationAbout, motivationProfession, motivationExercise, }); if (response.data.id === id) { alert('Sikeres mentĂŠs!'); diff --git a/src/components/pages/Home.js b/src/components/pages/Home.js index 539329ec117118c70b5eb8009757c59e8768ad32..4ce8bf8763fc56c9da8cd16c8ce5e24b1b223b6b 100644 --- a/src/components/pages/Home.js +++ b/src/components/pages/Home.js @@ -24,7 +24,6 @@ const settings = { slidesToShow: 1, slidesToScroll: 1, centerMode: true, - lazyLoad: true, }; const range = (count) => { diff --git a/src/components/pages/Profile.js b/src/components/pages/Profile.js index 17a77df316b2935c071e53b1b9177d97441a986e..af9a8b93f731426c917d8e68ff3b94c262cc4649 100644 --- a/src/components/pages/Profile.js +++ b/src/components/pages/Profile.js @@ -20,7 +20,7 @@ class Profile extends Component { render() { const { - nick, groups, motivation, signed, id, + nick, groups, motivationAbout, motivationProfession, motivationExercise, signed, id, } = this.props; return ( <Container @@ -43,16 +43,34 @@ class Profile extends Component { value={nick} /> - <Divider horizontal>MotivĂĄciĂłs levĂŠl</Divider> + <Divider horizontal>MotivĂĄciĂł</Divider> <Form.TextArea rows={10} - name='motivation' + name='motivationAbout' onChange={e => this.props.textChange(e)} - placeholder='MiĂŠrt szeretnĂŠk jelentkezni...' - value={motivation} + placeholder='MesĂŠlj nekĂźnk egy kicsit magadrĂłl. Milyen szakmai vagy mĂĄs eredmĂŠnyeket ĂŠrtĂŠl el, amikre bĂźszke vagy?' + value={motivationAbout} /> - <Divider horizontal>Ărdekelt KĂśrĂśk</Divider> + <Divider horizontal /> + <Form.TextArea + rows={10} + name='motivationProfession' + onChange={e => this.props.textChange(e)} + placeholder='Mit vĂĄrsz el a kĂŠpzĂŠstĂľl, miĂŠrt szeretnĂŠl rĂĄ jelentkezni, szerinted mire tudod majd hasznĂĄlni az itt megszerzett tudĂĄst? Mit szeretnĂŠl elĂŠrni a szakmĂĄdban?' + value={motivationProfession} + /> + + <Divider horizontal /> + <Form.TextArea + rows={10} + name='motivationExercise' + onChange={e => this.props.textChange(e)} + placeholder='Itt egy feladat kĂŠrdĂŠse lesz, ĂŠjfĂŠlig megcsinĂĄljuk a kĂŠrdĂŠst.' + value={motivationExercise} + /> + + <Divider horizontal>ĂrdekelĹdĂŠs</Divider> <Dropdown fluid multiple @@ -73,7 +91,7 @@ class Profile extends Component { /> <Form.Button onClick={() => this.props.submitRegistration({ - nick, motivation, signed, groups, id, + nick, motivationAbout, motivationProfession, motivationExercise, signed, groups, id, })} > MentĂŠs @@ -87,12 +105,14 @@ class Profile extends Component { const mapStateToProps = ({ user: { - nick, groups, motivation, signed, id, + nick, groups, motivationAbout, motivationProfession, motivationExercise, signed, id, }, }) => ({ nick, groups, - motivation, + motivationAbout, + motivationProfession, + motivationExercise, signed, id, }); diff --git a/src/index.js b/src/index.js index f8d5c11df5f785925e29ffa4acaed74bf6e0ea89..1d37e06b60fd0d7943ebdc2a3e1430d586231210 100644 --- a/src/index.js +++ b/src/index.js @@ -2,6 +2,8 @@ import React from 'react'; import { render } from 'react-dom'; import { Provider } from 'react-redux'; import { BrowserRouter as Router } from 'react-router-dom'; +import 'slick-carousel/slick/slick.css'; +import 'slick-carousel/slick/slick-theme.css'; import 'semantic-ui-css/semantic.min.css'; import configureStore from './configureStore';