Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
planner-team-one
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
21
Issues
21
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Евгений Положенцев
planner-team-one
Commits
abf6c3c9
Commit
abf6c3c9
authored
Nov 03, 2022
by
Нелли Ибрагимова
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
скорректировала MyTaskToolBar
parent
dd582bd4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
26 deletions
+8
-26
App.js
planner-front/src/App.js
+1
-1
MyTaskToolBar.js
planner-front/src/components/MyTaskToolBar/MyTaskToolBar.js
+1
-1
MyTasks.js
planner-front/src/containers/MyTasks/MyTasks.js
+5
-11
MyTasksHeader.js
...ont/src/containers/MyTasks/MyTasksHeader/MyTasksHeader.js
+1
-13
No files found.
planner-front/src/App.js
View file @
abf6c3c9
...
@@ -21,7 +21,7 @@ const App = () => {
...
@@ -21,7 +21,7 @@ const App = () => {
<>
<>
<
AppToolbar
/>
<
AppToolbar
/>
<
main
>
<
main
>
<
Container
>
<
Container
>
<
Outlet
/>
<
Outlet
/>
<
/Container
>
<
/Container
>
<
/main
>
<
/main
>
...
...
planner-front/src/co
ntainers/MyTask
s/MyTaskToolBar/MyTaskToolBar.js
→
planner-front/src/co
mponent
s/MyTaskToolBar/MyTaskToolBar.js
View file @
abf6c3c9
...
@@ -24,7 +24,7 @@ export default function ButtonAppBar() {
...
@@ -24,7 +24,7 @@ export default function ButtonAppBar() {
<
Typography
variant
=
"h6"
component
=
"div"
sx
=
{{
flexGrow
:
1
}}
>
<
Typography
variant
=
"h6"
component
=
"div"
sx
=
{{
flexGrow
:
1
}}
>
Мои
задачи
Мои
задачи
<
/Typography
>
<
/Typography
>
<
Button
color
=
"inherit"
>
Login
<
/Button
>
<
Button
color
=
"inherit"
>
Добавить
задачу
<
/Button
>
<
/Toolbar
>
<
/Toolbar
>
<
/AppBar
>
<
/AppBar
>
<
/Box
>
<
/Box
>
...
...
planner-front/src/containers/MyTasks/MyTasks.js
View file @
abf6c3c9
import
*
as
React
from
'react'
;
import
*
as
React
from
'react'
;
import
PropTypes
from
'prop-types'
;
import
Box
from
'@mui/material/Box'
;
import
Box
from
'@mui/material/Box'
;
import
Table
from
'@mui/material/Table'
;
import
Table
from
'@mui/material/Table'
;
import
TableBody
from
'@mui/material/TableBody'
;
import
TableBody
from
'@mui/material/TableBody'
;
...
@@ -7,7 +6,6 @@ import TableCell from '@mui/material/TableCell';
...
@@ -7,7 +6,6 @@ import TableCell from '@mui/material/TableCell';
import
TableContainer
from
'@mui/material/TableContainer'
;
import
TableContainer
from
'@mui/material/TableContainer'
;
import
TablePagination
from
'@mui/material/TablePagination'
;
import
TablePagination
from
'@mui/material/TablePagination'
;
import
TableRow
from
'@mui/material/TableRow'
;
import
TableRow
from
'@mui/material/TableRow'
;
import
Typography
from
'@mui/material/Typography'
;
import
Paper
from
'@mui/material/Paper'
;
import
Paper
from
'@mui/material/Paper'
;
import
IconButton
from
'@mui/material/IconButton'
;
import
IconButton
from
'@mui/material/IconButton'
;
import
Tooltip
from
'@mui/material/Tooltip'
;
import
Tooltip
from
'@mui/material/Tooltip'
;
...
@@ -18,8 +16,7 @@ import { Done } from '@mui/icons-material';
...
@@ -18,8 +16,7 @@ import { Done } from '@mui/icons-material';
import
{
Edit
}
from
'@mui/icons-material'
import
{
Edit
}
from
'@mui/icons-material'
import
TaskModal
from
'../../components/UI/TaskModal/TaskModal'
import
TaskModal
from
'../../components/UI/TaskModal/TaskModal'
import
EnhancedTableHead
from
'./MyTasksHeader/MyTasksHeader'
;
import
EnhancedTableHead
from
'./MyTasksHeader/MyTasksHeader'
;
import
{
Container
}
from
'@mui/system'
;
import
MyTaskToolBar
from
'../../components/MyTaskToolBar/MyTaskToolBar'
import
Button
from
'../../components/UI/Button/Button'
function
descendingComparator
(
a
,
b
,
orderBy
)
{
function
descendingComparator
(
a
,
b
,
orderBy
)
{
if
(
b
[
orderBy
]
<
a
[
orderBy
])
{
if
(
b
[
orderBy
]
<
a
[
orderBy
])
{
...
@@ -183,14 +180,11 @@ const exampleTasks=[
...
@@ -183,14 +180,11 @@ const exampleTasks=[
return
(
return
(
<
Box
sx
=
{{
width
:
'
100%
'
}}
>
<
Box
sx
=
{{
width
:
'
fullwidth
'
}}
>
<
Paper
sx
=
{{
width
:
'100%'
,
mb
:
2
}}
>
<
Paper
sx
=
{{
width
:
'100%'
,
mb
:
2
}}
>
<
Container
sx
=
{{
display
:
'flex'
,
justifyContent
:
'space-between'
}}
>
<
Typography
sx
=
{{
margin
:
'10px'
}}
>
Мои
задачи
<
/Typography
>
<
MyTaskToolBar
/>
<
Button
btnText
=
{
'Добавить задачу'
}
/
>
<
/Container
>
<
TableContainer
>
<
TableContainer
>
<
Table
<
Table
sx
=
{{
minWidth
:
750
}}
sx
=
{{
minWidth
:
750
}}
...
...
planner-front/src/containers/MyTasks/MyTasksHeader/MyTasksHeader.js
View file @
abf6c3c9
import
*
as
React
from
'react'
;
import
*
as
React
from
'react'
;
import
PropTypes
from
'prop-types'
;
import
PropTypes
from
'prop-types'
;
import
Box
from
'@mui/material/Box'
;
import
Box
from
'@mui/material/Box'
;
import
Table
from
'@mui/material/Table'
;
import
TableBody
from
'@mui/material/TableBody'
;
import
TableCell
from
'@mui/material/TableCell'
;
import
TableCell
from
'@mui/material/TableCell'
;
import
TableContainer
from
'@mui/material/TableContainer'
;
import
TableHead
from
'@mui/material/TableHead'
;
import
TableHead
from
'@mui/material/TableHead'
;
import
TablePagination
from
'@mui/material/TablePagination'
;
import
TableRow
from
'@mui/material/TableRow'
;
import
TableRow
from
'@mui/material/TableRow'
;
import
TableSortLabel
from
'@mui/material/TableSortLabel'
;
import
TableSortLabel
from
'@mui/material/TableSortLabel'
;
import
Typography
from
'@mui/material/Typography'
;
import
Paper
from
'@mui/material/Paper'
;
import
IconButton
from
'@mui/material/IconButton'
;
import
Tooltip
from
'@mui/material/Tooltip'
;
import
DeleteIcon
from
'@mui/icons-material/Delete'
;
import
{
visuallyHidden
}
from
'@mui/utils'
;
import
{
visuallyHidden
}
from
'@mui/utils'
;
import
{
useState
}
from
"react"
;
import
Input
from
'@mui/material/Input'
;
import
{
Done
}
from
'@mui/icons-material'
;
import
{
Edit
}
from
'@mui/icons-material'
function
descendingComparator
(
a
,
b
,
orderBy
)
{
function
descendingComparator
(
a
,
b
,
orderBy
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment