mirror of
https://github.com/plankanban/planka.git
synced 2025-07-18 20:59:44 +02:00
Small UI improvements, update dependencies
This commit is contained in:
Maksim Eltyshev
parent
3b9241e298
commit
9e99b89907
17 changed files with 99 additions and 103 deletions
6
client/package-lock.json
generated
6
client/package-lock.json
generated
|
|
@ -4197,9 +4197,9 @@
|
|||
}
|
||||
},
|
||||
"date-fns": {
|
||||
"version": "2.4.1",
|
||||
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.4.1.tgz",
|
||||
"integrity": "sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw=="
|
||||
"version": "2.5.0",
|
||||
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.5.0.tgz",
|
||||
"integrity": "sha512-I6Tkis01//nRcmvMQw/MRE1HAtcuA5Ie6jGPb8bJZJub7494LGOObqkV3ParnsSVviAjk5C8mNKDqYVBzCopWg=="
|
||||
},
|
||||
"date-now": {
|
||||
"version": "0.1.4",
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
"axios": "^0.19.0",
|
||||
"classnames": "^2.2.6",
|
||||
"connected-react-router": "^6.5.2",
|
||||
"date-fns": "^2.4.1",
|
||||
"date-fns": "^2.5.0",
|
||||
"dequal": "^1.0.0",
|
||||
"history": "^4.10.1",
|
||||
"i18next": "^17.2.0",
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ const EditStep = React.memo(({
|
|||
</Popup.Header>
|
||||
<Popup.Content>
|
||||
<Form onSubmit={handleSubmit}>
|
||||
<div className={styles.text}>{t('common.title')}</div>
|
||||
<Input
|
||||
fluid
|
||||
ref={nameField}
|
||||
|
|
|
|||
|
|
@ -8,3 +8,10 @@
|
|||
.field {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.text {
|
||||
color: #444444;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
padding-bottom: 6px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,13 +105,7 @@ const CardModal = React.memo(
|
|||
const labelIds = labels.map((label) => label.id);
|
||||
|
||||
return (
|
||||
<Modal
|
||||
open
|
||||
closeIcon
|
||||
size="small"
|
||||
centered={false}
|
||||
onClose={onClose}
|
||||
>
|
||||
<Modal open closeIcon size="small" centered={false} onClose={onClose}>
|
||||
<Grid className={styles.grid}>
|
||||
<Grid.Row className={styles.headerPadding}>
|
||||
<Grid.Column width={16} className={styles.headerPadding}>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { Icon, Menu } from 'semantic-ui-react';
|
||||
|
||||
|
|
@ -20,26 +19,21 @@ const Header = React.memo(
|
|||
onNotificationDelete,
|
||||
onUsers,
|
||||
onLogout,
|
||||
}) => {
|
||||
const [t] = useTranslation();
|
||||
|
||||
return (
|
||||
}) => (
|
||||
<div className={styles.wrapper}>
|
||||
<Link to={Paths.ROOT} className={styles.logo}>
|
||||
Planka
|
||||
</Link>
|
||||
<Menu inverted size="large" className={styles.menu}>
|
||||
<Menu.Menu position="right">
|
||||
{isEditable && (
|
||||
<Menu.Item className={styles.item} onClick={onUsers}>
|
||||
{t('common.users', {
|
||||
context: 'title',
|
||||
})}
|
||||
<Icon fitted name="users" />
|
||||
</Menu.Item>
|
||||
)}
|
||||
<Menu.Menu position="right">
|
||||
<NotificationsPopup items={notifications} onDelete={onNotificationDelete}>
|
||||
<Menu.Item className={styles.item}>
|
||||
<Icon name="bell" className={styles.icon} />
|
||||
<Icon fitted name="bell" />
|
||||
{notifications.length > 0 && (
|
||||
<span className={styles.notification}>{notifications.length}</span>
|
||||
)}
|
||||
|
|
@ -58,8 +52,7 @@ const Header = React.memo(
|
|||
</Menu.Menu>
|
||||
</Menu>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
Header.propTypes = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,3 @@
|
|||
.icon {
|
||||
margin: 0 !important;
|
||||
}
|
||||
|
||||
.item:before {
|
||||
background: none !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ const EditNameStep = React.memo(({
|
|||
</Popup.Header>
|
||||
<Popup.Content>
|
||||
<Form onSubmit={handleSubmit}>
|
||||
<div className={styles.text}>{t('common.name')}</div>
|
||||
<Input
|
||||
fluid
|
||||
ref={field}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
.field {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.text {
|
||||
color: #444444;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
padding-bottom: 6px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ const EditStep = React.memo(({
|
|||
</Popup.Header>
|
||||
<Popup.Content>
|
||||
<Form onSubmit={handleSubmit}>
|
||||
<div className={styles.text}>{t('common.title')}</div>
|
||||
<Input
|
||||
fluid
|
||||
ref={nameField}
|
||||
|
|
|
|||
|
|
@ -8,3 +8,10 @@
|
|||
.field {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.text {
|
||||
color: #444444;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
padding-bottom: 6px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ const Project = React.memo(
|
|||
<Grid className={styles.header}>
|
||||
<Grid.Row>
|
||||
<Grid.Column>
|
||||
{isEditable ? (
|
||||
<EditPopup
|
||||
defaultData={{
|
||||
name,
|
||||
|
|
@ -42,6 +43,9 @@ const Project = React.memo(
|
|||
>
|
||||
<Button content={name} disabled={!isEditable} className={styles.name} />
|
||||
</EditPopup>
|
||||
) : (
|
||||
<span className={styles.name}>{name}</span>
|
||||
)}
|
||||
<span className={styles.users}>
|
||||
{memberships.map((membership) => (
|
||||
<span key={membership.id} className={styles.user}>
|
||||
|
|
|
|||
|
|
@ -22,9 +22,11 @@
|
|||
.name {
|
||||
background: transparent !important;
|
||||
color: #fff !important;
|
||||
display: inline-block !important;
|
||||
font-size: 32px !important;
|
||||
font-weight: bold !important;
|
||||
line-height: 36px !important;
|
||||
margin-right: 8px !important;
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,12 @@ import React, { useCallback } from 'react';
|
|||
import PropTypes from 'prop-types';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import {
|
||||
Button, Header, Modal, Table,
|
||||
Button, Modal, Table,
|
||||
} from 'semantic-ui-react';
|
||||
|
||||
import AddUserPopupContainer from '../../containers/AddUserPopupContainer';
|
||||
import Item from './Item';
|
||||
|
||||
import styles from './UsersModal.module.css';
|
||||
|
||||
const UsersModal = React.memo(({
|
||||
items, onUpdate, onDelete, onClose,
|
||||
}) => {
|
||||
|
|
@ -30,13 +28,13 @@ const UsersModal = React.memo(({
|
|||
);
|
||||
|
||||
return (
|
||||
<Modal open closeIcon size="large" onClose={onClose}>
|
||||
<Modal.Content>
|
||||
<Header size="huge" className={styles.title}>
|
||||
<Modal open closeIcon size="large" centered={false} onClose={onClose}>
|
||||
<Modal.Header>
|
||||
{t('common.users', {
|
||||
context: 'title',
|
||||
})}
|
||||
</Header>
|
||||
</Modal.Header>
|
||||
<Modal.Content>
|
||||
<Table basic="very">
|
||||
<Table.Header>
|
||||
<Table.Row>
|
||||
|
|
@ -58,17 +56,13 @@ const UsersModal = React.memo(({
|
|||
/>
|
||||
))}
|
||||
</Table.Body>
|
||||
<Table.Footer>
|
||||
<Table.Row>
|
||||
<Table.HeaderCell colSpan="4">
|
||||
<AddUserPopupContainer>
|
||||
<Button positive content={t('action.addUser')} className={styles.button} />
|
||||
</AddUserPopupContainer>
|
||||
</Table.HeaderCell>
|
||||
</Table.Row>
|
||||
</Table.Footer>
|
||||
</Table>
|
||||
</Modal.Content>
|
||||
<Modal.Actions>
|
||||
<AddUserPopupContainer>
|
||||
<Button positive content={t('action.addUser')} />
|
||||
</AddUserPopupContainer>
|
||||
</Modal.Actions>
|
||||
</Modal>
|
||||
);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
.button {
|
||||
float: right;
|
||||
height: 32px;
|
||||
line-height: 20px;
|
||||
margin-top: -2px;
|
||||
padding: 6px 12px;
|
||||
}
|
||||
|
||||
.title {
|
||||
display: inline-block;
|
||||
}
|
||||
22
server/package-lock.json
generated
22
server/package-lock.json
generated
|
|
@ -1186,9 +1186,9 @@
|
|||
}
|
||||
},
|
||||
"dotenv": {
|
||||
"version": "8.1.0",
|
||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.1.0.tgz",
|
||||
"integrity": "sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA=="
|
||||
"version": "8.2.0",
|
||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
|
||||
"integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
|
||||
},
|
||||
"dotenv-cli": {
|
||||
"version": "3.0.0",
|
||||
|
|
@ -4125,18 +4125,18 @@
|
|||
}
|
||||
},
|
||||
"nodemon": {
|
||||
"version": "1.19.3",
|
||||
"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.3.tgz",
|
||||
"integrity": "sha512-TBNKRmJykEbxpTniZBusqRrUTHIEqa2fpecbTQDQj1Gxjth7kKAPP296ztR0o5gPUWsiYbuEbt73/+XMYab1+w==",
|
||||
"version": "1.19.4",
|
||||
"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.4.tgz",
|
||||
"integrity": "sha512-VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"chokidar": "^2.1.5",
|
||||
"debug": "^3.1.0",
|
||||
"chokidar": "^2.1.8",
|
||||
"debug": "^3.2.6",
|
||||
"ignore-by-default": "^1.0.1",
|
||||
"minimatch": "^3.0.4",
|
||||
"pstree.remy": "^1.1.6",
|
||||
"semver": "^5.5.0",
|
||||
"supports-color": "^5.2.0",
|
||||
"pstree.remy": "^1.1.7",
|
||||
"semver": "^5.7.1",
|
||||
"supports-color": "^5.5.0",
|
||||
"touch": "^3.1.0",
|
||||
"undefsafe": "^2.0.2",
|
||||
"update-notifier": "^2.5.0"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"bcrypt": "^3.0.6",
|
||||
"dotenv": "^8.1.0",
|
||||
"dotenv": "^8.2.0",
|
||||
"dotenv-cli": "^3.0.0",
|
||||
"jsonwebtoken": "^8.5.1",
|
||||
"knex": "^0.19.5",
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"eslint": "5.16.0",
|
||||
"nodemon": "^1.19.3"
|
||||
"nodemon": "^1.19.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^12.10"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue