-
-
Notifications
You must be signed in to change notification settings - Fork 232
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Notifications, visual fixes (#2884)
- Loading branch information
Showing
11 changed files
with
143 additions
and
112 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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
47 changes: 7 additions & 40 deletions
47
webapp/src/component/layout/Notifications/TaskAssignedItem.tsx
This file contains 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,52 +1,19 @@ | ||
| import { default as React, FunctionComponent } from 'react'; | ||
| import { Box, styled } from '@mui/material'; | ||
| import { T } from '@tolgee/react'; | ||
| import { | ||
| NotificationItem, | ||
| NotificationItemProps, | ||
| } from 'tg.component/layout/Notifications/NotificationItem'; | ||
| import { getTaskUrl } from 'tg.constants/links'; | ||
| TaskItem, | ||
| TaskItemProps, | ||
| } from 'tg.component/layout/Notifications/TaskItem'; | ||
|
|
||
| const StyledLinkedDetailItem = styled(Box)` | ||
| margin-right: 10px; | ||
| display: inline; | ||
| `; | ||
|
|
||
| const StyledLinkedDetailNumber = styled(StyledLinkedDetailItem)` | ||
| color: ${({ theme }) => theme.palette.text.secondary}; | ||
| `; | ||
|
|
||
| type TaskAssignedItemProps = NotificationItemProps; | ||
| type TaskAssignedItemProps = TaskItemProps; | ||
|
|
||
| export const TaskAssignedItem: FunctionComponent<TaskAssignedItemProps> = ({ | ||
| notification, | ||
| ...props | ||
| }) => { | ||
| const destinationUrl = getTaskUrl( | ||
| notification.project!.id, | ||
| notification.linkedTask!.number | ||
| ); | ||
| return ( | ||
| <NotificationItem | ||
| notification={notification} | ||
| destinationUrl={destinationUrl} | ||
| {...props} | ||
| > | ||
| <Box> | ||
| <b>{notification.originatingUser?.name}</b> | ||
| <T keyName="notifications-task-assigned" /> | ||
| </Box> | ||
| <Box> | ||
| <StyledLinkedDetailItem> | ||
| {notification.linkedTask?.language.flagEmoji} | ||
| </StyledLinkedDetailItem> | ||
| <StyledLinkedDetailItem> | ||
| {notification.linkedTask?.name} | ||
| </StyledLinkedDetailItem> | ||
| <StyledLinkedDetailNumber> | ||
| #{notification.linkedTask?.number} | ||
| </StyledLinkedDetailNumber> | ||
| </Box> | ||
| </NotificationItem> | ||
| <TaskItem notification={notification} {...props}> | ||
| <T keyName="notifications-task-assigned" /> | ||
| </TaskItem> | ||
| ); | ||
| }; |
19 changes: 19 additions & 0 deletions
19
webapp/src/component/layout/Notifications/TaskClosedItem.tsx
This file contains 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,19 @@ | ||
| import { default as React, FunctionComponent } from 'react'; | ||
| import { T } from '@tolgee/react'; | ||
| import { | ||
| TaskItem, | ||
| TaskItemProps, | ||
| } from 'tg.component/layout/Notifications/TaskItem'; | ||
|
|
||
| type TaskClosedItemProps = TaskItemProps; | ||
|
|
||
| export const TaskClosedItem: FunctionComponent<TaskClosedItemProps> = ({ | ||
| notification, | ||
| ...props | ||
| }) => { | ||
| return ( | ||
| <TaskItem notification={notification} {...props}> | ||
| <T keyName="notifications-task-closed" /> | ||
| </TaskItem> | ||
| ); | ||
| }; |
47 changes: 7 additions & 40 deletions
47
webapp/src/component/layout/Notifications/TaskCompletedItem.tsx
This file contains 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,52 +1,19 @@ | ||
| import { default as React, FunctionComponent } from 'react'; | ||
| import { Box, styled } from '@mui/material'; | ||
| import { T } from '@tolgee/react'; | ||
| import { | ||
| NotificationItem, | ||
| NotificationItemProps, | ||
| } from 'tg.component/layout/Notifications/NotificationItem'; | ||
| import { getTaskUrl } from 'tg.constants/links'; | ||
| TaskItem, | ||
| TaskItemProps, | ||
| } from 'tg.component/layout/Notifications/TaskItem'; | ||
|
|
||
| const StyledLinkedDetailItem = styled(Box)` | ||
| margin-right: 10px; | ||
| display: inline; | ||
| `; | ||
|
|
||
| const StyledLinkedDetailNumber = styled(StyledLinkedDetailItem)` | ||
| color: ${({ theme }) => theme.palette.text.secondary}; | ||
| `; | ||
|
|
||
| type TaskCompletedItemProps = NotificationItemProps; | ||
| type TaskCompletedItemProps = TaskItemProps; | ||
|
|
||
| export const TaskCompletedItem: FunctionComponent<TaskCompletedItemProps> = ({ | ||
| notification, | ||
| ...props | ||
| }) => { | ||
| const destinationUrl = getTaskUrl( | ||
| notification.project!.id, | ||
| notification.linkedTask!.number | ||
| ); | ||
| return ( | ||
| <NotificationItem | ||
| notification={notification} | ||
| destinationUrl={destinationUrl} | ||
| {...props} | ||
| > | ||
| <Box> | ||
| <b>{notification.originatingUser?.name}</b> | ||
| <T keyName="notifications-task-completed" /> | ||
| </Box> | ||
| <Box> | ||
| <StyledLinkedDetailItem> | ||
| {notification.linkedTask?.language.flagEmoji} | ||
| </StyledLinkedDetailItem> | ||
| <StyledLinkedDetailItem> | ||
| {notification.linkedTask?.name} | ||
| </StyledLinkedDetailItem> | ||
| <StyledLinkedDetailNumber> | ||
| #{notification.linkedTask?.number} | ||
| </StyledLinkedDetailNumber> | ||
| </Box> | ||
| </NotificationItem> | ||
| <TaskItem notification={notification} {...props}> | ||
| <T keyName="notifications-task-completed" /> | ||
| </TaskItem> | ||
| ); | ||
| }; |
Oops, something went wrong.