forked from ElseeCCD1/Tasks
-
Notifications
You must be signed in to change notification settings - Fork 0
Hw try2 #1
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
Open
SaidKamalov
wants to merge
1
commit into
master
Choose a base branch
from
server-mock
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Hw try2 #1
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,26 @@ | ||
| { | ||
| "tasks": [ | ||
| { | ||
| "id": "gdfgfg564", | ||
| "tasks":[ | ||
| { | ||
| "id":1, | ||
| "name": "Task 1", | ||
| "assignee": "Ivan Ivanov", | ||
| "start_date": "10 april", | ||
| "due_date": "11 april" | ||
| "assignee":"Ivan Ivanov", | ||
| "start_date":"2020-04-25T13:25:00.000Z", | ||
| "due_date": "2020-05-06T00:00:00.000Z" | ||
|
|
||
| }, | ||
| { | ||
| "id":2, | ||
| "name": "Task 2", | ||
| "assignee": "Ivan Petrov", | ||
| "start_date": "10 may", | ||
| "due_date": "11 may" | ||
| "assignee":"Petr Sidorov", | ||
| "start_date":"2020-05-20T00:00:00.000Z", | ||
| "due_date": "2020-05-25T00:00:00.000Z" | ||
| }, | ||
| { | ||
| "id":3, | ||
| "name": "Task 3", | ||
| "assignee": "Petr Ivanov", | ||
| "start_date": "10 april", | ||
| "due_date": "11 april" | ||
| "assignee":"Guy Ritchie", | ||
| "start_date":"2020-05-26T00:00:00.000Z", | ||
| "due_date": "2020-06-01T00:00:00.000Z" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| .container { | ||
| .container{ | ||
| padding: 40px 30px; | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import React, {Component} from 'react'; | ||
| import cn from 'classnames'; | ||
| import styles from './Buttons.module.css'; | ||
| const Buttons = (props)=>{ | ||
| return( | ||
| <button className={cn(styles.button, props.type === 'grey' ? styles.button__grey : '')}>{props.children}</button> | ||
| ) | ||
| } | ||
| export {Buttons} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| .button{ | ||
| border-radius: 4px; | ||
| padding:8px; | ||
| background: #4a90e2; | ||
| color:#fff; | ||
| text-transform: uppercase; | ||
| font-weight: 700px; | ||
| font-size:12px; | ||
| line-height: 1em; | ||
| cursor:pointer; | ||
| } | ||
| .button__grey{ | ||
| background: #ccc; | ||
| color: #354354; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,49 @@ | ||
| import React from 'react'; | ||
| import DatePicker from 'react-datepicker'; | ||
| import "react-datepicker/dist/react-datepicker.css"; | ||
| import React, {Component} from 'react'; | ||
| import styles from './Filters.module.css'; | ||
| import {Select} from '../Select/Select'; | ||
| import DatePicker from 'react-datepicker'; | ||
| import 'react-datepicker/dist/react-datepicker.css'; | ||
|
|
||
| const selectValues = [ | ||
| { | ||
| value: 1, | ||
| label: "My first value" | ||
| }, | ||
| { | ||
| value: 2, | ||
| label: "My second value" | ||
| } | ||
| { | ||
| value:1, | ||
| label:'My first value' | ||
| }, | ||
| { | ||
| value:2, | ||
| label:'My second value' | ||
| }, | ||
| { | ||
| value:3, | ||
| label:'My third value' | ||
| } | ||
| ]; | ||
|
|
||
| class Filters extends React.Component { | ||
| render() { | ||
| return ( | ||
| class Filters extends Component{ | ||
| render(){ | ||
| return( | ||
| <div className={styles.container}> | ||
| <div className={styles["filter-item"]}> | ||
| <div className={styles.label}>Assignee</div> | ||
| <div className={styles.label}>Asignee</div> | ||
| <Select values={selectValues} /> | ||
| </div> | ||
| <div className={styles["filter-item"]}> | ||
| <div className={styles.label}>Starting Date</div> | ||
| <DatePicker | ||
| <DatePicker | ||
| selected={this.props.startDate} | ||
| onChange={date => this.props.onStartDateChange(date)} | ||
| /> | ||
| onChange={date => this.props.onStartDateChange(date)} | ||
| /> | ||
| </div> | ||
| <div className={styles["filter-item"]}> | ||
| <div className={styles.label}>Due Date</div> | ||
| <DatePicker | ||
| selected={this.props.dueDate} | ||
| onChange={date => this.props.onDueDateChange(date)} | ||
| onChange={date => this.props.onDueDateChange(date)} | ||
| /> | ||
| </div> | ||
|
|
||
| </div> | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| export {Filters} | ||
| export {Filters} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,13 @@ | ||
| .container { | ||
| .container{ | ||
| display: flex; | ||
| margin: 12px 0 20px; | ||
| margin:12px 0 20px; | ||
| } | ||
|
|
||
| .label { | ||
| .label{ | ||
| font-size: 16px; | ||
| color: #9aa1a9; | ||
| margin-bottom: 4px; | ||
| font-weight: 700; | ||
| color: grey; | ||
| margin-bottom: 5px; | ||
| font-weight: 700px; | ||
| } | ||
|
|
||
| .filter-item + .filter-item { | ||
| margin-left: 12px; | ||
| margin:5px; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| import React from 'react'; | ||
| import React, {Component} from 'react'; | ||
| import styles from './Header.module.css'; | ||
| import {Button} from '../Button/Button'; | ||
|
|
||
| const Header = () => { | ||
| return ( | ||
| import {Buttons} from '../Buttons/Buttons' | ||
| const Header = () =>{ | ||
| return( | ||
| <div className={styles.container}> | ||
| <h1 className={styles.title}>Tasks</h1> | ||
| <Button>+ add</Button> | ||
| <h1 className='title'>Tasks</h1> | ||
| <Buttons>+ Add</Buttons> | ||
| </div> | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| export {Header} | ||
| export {Header} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| .container { | ||
| .container{ | ||
| display: flex; | ||
| justify-content: space-between; | ||
| padding-bottom: 16px; | ||
| border-bottom: 1px solid #ccc; | ||
| border-bottom: 1px solid #CCC; | ||
| } | ||
|
|
||
| .title { | ||
| font-weight: 900; | ||
| margin: 0; | ||
| .title{ | ||
| margin:0; | ||
| font-weight: 900px; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
кажется, название стоит изменить )