diff --git a/front/package-lock.json b/front/package-lock.json index afba0e57e..9bb69a12c 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -10,6 +10,10 @@ "dependencies": { "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", + "@fortawesome/fontawesome-svg-core": "^6.2.1", + "@fortawesome/free-regular-svg-icons": "^6.2.1", + "@fortawesome/free-solid-svg-icons": "^6.2.1", + "@fortawesome/react-fontawesome": "^0.2.0", "@types/node": "^16.18.4", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.9", @@ -2264,6 +2268,63 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz", + "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz", + "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.2.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-regular-svg-icons": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz", + "integrity": "sha512-wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.2.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz", + "integrity": "sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.2.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/react-fontawesome": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", + "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "dependencies": { + "prop-types": "^15.8.1" + }, + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "~1 || ~6", + "react": ">=16.3" + } + }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", @@ -35640,6 +35701,43 @@ } } }, + "@fortawesome/fontawesome-common-types": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz", + "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==" + }, + "@fortawesome/fontawesome-svg-core": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz", + "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==", + "requires": { + "@fortawesome/fontawesome-common-types": "6.2.1" + } + }, + "@fortawesome/free-regular-svg-icons": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz", + "integrity": "sha512-wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA==", + "requires": { + "@fortawesome/fontawesome-common-types": "6.2.1" + } + }, + "@fortawesome/free-solid-svg-icons": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz", + "integrity": "sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==", + "requires": { + "@fortawesome/fontawesome-common-types": "6.2.1" + } + }, + "@fortawesome/react-fontawesome": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", + "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "requires": { + "prop-types": "^15.8.1" + } + }, "@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", diff --git a/front/package.json b/front/package.json index e8d046d88..efb7958ff 100644 --- a/front/package.json +++ b/front/package.json @@ -5,6 +5,10 @@ "dependencies": { "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", + "@fortawesome/fontawesome-svg-core": "^6.2.1", + "@fortawesome/free-regular-svg-icons": "^6.2.1", + "@fortawesome/free-solid-svg-icons": "^6.2.1", + "@fortawesome/react-fontawesome": "^0.2.0", "@types/node": "^16.18.4", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.9", @@ -43,7 +47,7 @@ "react-refresh": "0.14.0" }, "jest": { - "coveragePathIgnorePatterns" : [ + "coveragePathIgnorePatterns": [ "src/stories" ] }, diff --git a/front/src/App.tsx b/front/src/App.tsx index 08bd528e9..57fb0953c 100644 --- a/front/src/App.tsx +++ b/front/src/App.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import Tasks from './pages/tasks/Tasks'; -import History from './pages/History'; -import Performances from './pages/Performances'; +import Inbox from './pages/inbox/Inbox'; +import Contacts from './pages/Contacts'; +import Insights from './pages/Insights'; import AppLayout from './layout/AppLayout'; import { Routes, Route } from 'react-router-dom'; @@ -9,9 +9,9 @@ function App() { return ( - } /> - } /> - } /> + } /> + } /> + } /> ); diff --git a/front/src/layout/navbar/Navbar.tsx b/front/src/layout/navbar/Navbar.tsx index 09433bcb2..8931e0b88 100644 --- a/front/src/layout/navbar/Navbar.tsx +++ b/front/src/layout/navbar/Navbar.tsx @@ -16,7 +16,7 @@ function Navbar() { <> ( - +export const NavbarOnInsights = () => ( + ); diff --git a/front/src/tests/layout/navbar/NavItem.test.tsx b/front/src/layout/navbar/__tests__/NavItem.test.tsx similarity index 80% rename from front/src/tests/layout/navbar/NavItem.test.tsx rename to front/src/layout/navbar/__tests__/NavItem.test.tsx index 7d94194eb..f235428b4 100644 --- a/front/src/tests/layout/navbar/NavItem.test.tsx +++ b/front/src/layout/navbar/__tests__/NavItem.test.tsx @@ -1,6 +1,6 @@ import { render, fireEvent } from '@testing-library/react'; -import { NavItemDefault } from '../../../stories/layout/navbar/NavItem.stories'; //👈 Our stories imported here. +import { NavItemDefault } from '../__stories__/NavItem.stories'; const mockedNavigate = jest.fn(); jest.mock('react-router-dom', () => ({ diff --git a/front/src/layout/navbar/__tests__/Navbar.test.tsx b/front/src/layout/navbar/__tests__/Navbar.test.tsx new file mode 100644 index 000000000..b0bdb9553 --- /dev/null +++ b/front/src/layout/navbar/__tests__/Navbar.test.tsx @@ -0,0 +1,17 @@ +import { render } from '@testing-library/react'; + +import { NavbarOnInsights } from '../__stories__/Navbar.stories'; + +it('Checks the NavItem renders', () => { + const { getByRole } = render(); + + expect(getByRole('button', { name: 'Insights' })).toHaveAttribute( + 'aria-selected', + 'true', + ); + + expect(getByRole('button', { name: 'Inbox' })).toHaveAttribute( + 'aria-selected', + 'false', + ); +}); diff --git a/front/src/pages/History.tsx b/front/src/pages/Contacts.tsx similarity index 62% rename from front/src/pages/History.tsx rename to front/src/pages/Contacts.tsx index badf9b3fe..9d28c6d59 100644 --- a/front/src/pages/History.tsx +++ b/front/src/pages/Contacts.tsx @@ -1,4 +1,4 @@ -function History() { +function Contacts() { return (

This is the history page

@@ -6,4 +6,4 @@ function History() { ); } -export default History; +export default Contacts; diff --git a/front/src/pages/Performances.tsx b/front/src/pages/Insights.tsx similarity index 60% rename from front/src/pages/Performances.tsx rename to front/src/pages/Insights.tsx index a9837b175..295f39af0 100644 --- a/front/src/pages/Performances.tsx +++ b/front/src/pages/Insights.tsx @@ -1,4 +1,4 @@ -function Performances() { +function Insights() { return (

This is the performances page

@@ -6,4 +6,4 @@ function Performances() { ); } -export default Performances; +export default Insights; diff --git a/front/src/pages/inbox/Inbox.tsx b/front/src/pages/inbox/Inbox.tsx new file mode 100644 index 000000000..e84334a1f --- /dev/null +++ b/front/src/pages/inbox/Inbox.tsx @@ -0,0 +1,18 @@ +import FullWidthContainer from '../../layout/containers/FullWidthContainer'; +import DiscussionPanel from './discussion-panel/DiscussionPanel'; +import ListPanel from './list-panel/ListPanel'; +import PluginPanel from './plugin-panel/PluginPanel'; + +function Inbox() { + return ( + + <> + + + + + + ); +} + +export default Inbox; diff --git a/front/src/pages/inbox/__stories__/Inbox.stories.tsx b/front/src/pages/inbox/__stories__/Inbox.stories.tsx new file mode 100644 index 000000000..b91c1fe47 --- /dev/null +++ b/front/src/pages/inbox/__stories__/Inbox.stories.tsx @@ -0,0 +1,13 @@ +import { MemoryRouter } from 'react-router-dom'; +import Inbox from '../Inbox'; + +export default { + title: 'Inbox', + component: Inbox, +}; + +export const InboxDefault = () => ( + + + +); diff --git a/front/src/pages/inbox/__tests__/Inbox.test.tsx b/front/src/pages/inbox/__tests__/Inbox.test.tsx new file mode 100644 index 000000000..604c664fb --- /dev/null +++ b/front/src/pages/inbox/__tests__/Inbox.test.tsx @@ -0,0 +1,10 @@ +import { render } from '@testing-library/react'; + +import { InboxDefault } from '../__stories__/Inbox.stories'; + +it('Checks the Inbox page render', () => { + const { getAllByRole } = render(); + + const button = getAllByRole('button'); + expect(button[0]).toHaveTextContent('Sylvie Vartan'); +}); diff --git a/front/src/pages/inbox/discussion-panel/DiscussionPanel.tsx b/front/src/pages/inbox/discussion-panel/DiscussionPanel.tsx new file mode 100644 index 000000000..f5be950b5 --- /dev/null +++ b/front/src/pages/inbox/discussion-panel/DiscussionPanel.tsx @@ -0,0 +1,12 @@ +import styled from '@emotion/styled'; + +const StyledPanel = styled.div` + display: flex; + flex-grow: 1; +`; + +function DiscussionPanel() { + return ; +} + +export default DiscussionPanel; diff --git a/front/src/pages/inbox/discussion-panel/composer/Composer.tsx b/front/src/pages/inbox/discussion-panel/composer/Composer.tsx new file mode 100644 index 000000000..410aedb89 --- /dev/null +++ b/front/src/pages/inbox/discussion-panel/composer/Composer.tsx @@ -0,0 +1,7 @@ +import styled from '@emotion/styled'; + +function Composer() { + return; +} + +export default Composer; diff --git a/front/src/pages/inbox/discussion-panel/composer/ComposerSwitch.tsx b/front/src/pages/inbox/discussion-panel/composer/ComposerSwitch.tsx new file mode 100644 index 000000000..401704285 --- /dev/null +++ b/front/src/pages/inbox/discussion-panel/composer/ComposerSwitch.tsx @@ -0,0 +1,7 @@ +import styled from '@emotion/styled'; + +function ComposerSwitch() { + return; +} + +export default ComposerSwitch; diff --git a/front/src/pages/inbox/discussion-panel/events/Booking.tsx b/front/src/pages/inbox/discussion-panel/events/Booking.tsx new file mode 100644 index 000000000..43db278ef --- /dev/null +++ b/front/src/pages/inbox/discussion-panel/events/Booking.tsx @@ -0,0 +1,7 @@ +import styled from '@emotion/styled'; + +function Booking() { + return; +} + +export default Booking; diff --git a/front/src/pages/inbox/discussion-panel/events/Message.tsx b/front/src/pages/inbox/discussion-panel/events/Message.tsx new file mode 100644 index 000000000..6a131a5a6 --- /dev/null +++ b/front/src/pages/inbox/discussion-panel/events/Message.tsx @@ -0,0 +1,7 @@ +import styled from '@emotion/styled'; + +function Message() { + return; +} + +export default Message; diff --git a/front/src/pages/inbox/discussion-panel/events/Note.tsx b/front/src/pages/inbox/discussion-panel/events/Note.tsx new file mode 100644 index 000000000..bd696ff77 --- /dev/null +++ b/front/src/pages/inbox/discussion-panel/events/Note.tsx @@ -0,0 +1,7 @@ +import styled from '@emotion/styled'; + +function Note() { + return; +} + +export default Note; diff --git a/front/src/pages/tasks/TaskList.tsx b/front/src/pages/inbox/list-panel/ListPanel.tsx similarity index 79% rename from front/src/pages/tasks/TaskList.tsx rename to front/src/pages/inbox/list-panel/ListPanel.tsx index 102885df6..cf1752d89 100644 --- a/front/src/pages/tasks/TaskList.tsx +++ b/front/src/pages/inbox/list-panel/ListPanel.tsx @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -import TaskListHeader from './TaskListHeader'; -import TaskListItem from './TaskListItem'; +import ListPanelHeader from './ListPanelHeader'; +import ListPanelItem from './ListPanelItem'; const StyledList = styled.div` display: flex; @@ -17,7 +17,7 @@ export type Task = { lastMessage: string; }; -function TaskList() { +function ListPanel() { const tasks: Task[] = [ { id: 1, @@ -38,13 +38,13 @@ function TaskList() { return ( <> - + {tasks.map((item) => ( - + ))} ); } -export default TaskList; +export default ListPanel; diff --git a/front/src/pages/tasks/TaskListHeader.tsx b/front/src/pages/inbox/list-panel/ListPanelHeader.tsx similarity index 82% rename from front/src/pages/tasks/TaskListHeader.tsx rename to front/src/pages/inbox/list-panel/ListPanelHeader.tsx index 78627cc4c..1d0a0ad81 100644 --- a/front/src/pages/tasks/TaskListHeader.tsx +++ b/front/src/pages/inbox/list-panel/ListPanelHeader.tsx @@ -10,8 +10,8 @@ const StyledHeader = styled.div` border-bottom: 1px solid #eaecee; `; -function TaskListHeader() { +function ListPanelHeader() { return 6 tasks waiting; } -export default TaskListHeader; +export default ListPanelHeader; diff --git a/front/src/pages/tasks/TaskListItem.tsx b/front/src/pages/inbox/list-panel/ListPanelItem.tsx similarity index 94% rename from front/src/pages/tasks/TaskListItem.tsx rename to front/src/pages/inbox/list-panel/ListPanelItem.tsx index 510a03800..c1a7d570d 100644 --- a/front/src/pages/tasks/TaskListItem.tsx +++ b/front/src/pages/inbox/list-panel/ListPanelItem.tsx @@ -1,5 +1,5 @@ import styled from '@emotion/styled'; -import { Task } from './TaskList'; +import { Task } from './ListPanel'; type OwnProps = { task: Task; @@ -72,7 +72,7 @@ const StyledContent = styled.div` margin-top: 8px; `; -function TaskListItem({ task }: OwnProps) { +function ListPanelItem({ task }: OwnProps) { return ( @@ -95,4 +95,4 @@ function TaskListItem({ task }: OwnProps) { ); } -export default TaskListItem; +export default ListPanelItem; diff --git a/front/src/pages/inbox/list-panel/__stories__/ListPanel.stories.tsx b/front/src/pages/inbox/list-panel/__stories__/ListPanel.stories.tsx new file mode 100644 index 000000000..5ff9c50e3 --- /dev/null +++ b/front/src/pages/inbox/list-panel/__stories__/ListPanel.stories.tsx @@ -0,0 +1,8 @@ +import ListPanel from '../ListPanel'; + +export default { + title: 'Inbox', + component: ListPanel, +}; + +export const ListPanelDefault = () => ; diff --git a/front/src/pages/inbox/list-panel/__stories__/ListPanelHeader.stories.tsx b/front/src/pages/inbox/list-panel/__stories__/ListPanelHeader.stories.tsx new file mode 100644 index 000000000..8564816bb --- /dev/null +++ b/front/src/pages/inbox/list-panel/__stories__/ListPanelHeader.stories.tsx @@ -0,0 +1,9 @@ +import { MemoryRouter } from 'react-router-dom'; +import ListPanelHeader from '../ListPanelHeader'; + +export default { + title: 'Inbox', + component: ListPanelHeader, +}; + +export const ListPanelHeaderDefault = () => ; diff --git a/front/src/stories/pages/tasks/TaskListItem.stories.tsx b/front/src/pages/inbox/list-panel/__stories__/ListPanelItem.stories.tsx similarity index 66% rename from front/src/stories/pages/tasks/TaskListItem.stories.tsx rename to front/src/pages/inbox/list-panel/__stories__/ListPanelItem.stories.tsx index c611ad175..d089994db 100644 --- a/front/src/stories/pages/tasks/TaskListItem.stories.tsx +++ b/front/src/pages/inbox/list-panel/__stories__/ListPanelItem.stories.tsx @@ -1,13 +1,13 @@ import { MemoryRouter } from 'react-router-dom'; -import TaskListItem from '../../../pages/tasks/TaskListItem'; +import ListPanelItem from '../ListPanelItem'; export default { - title: 'Tasks', - component: TaskListItem, + title: 'Inbox', + component: ListPanelItem, }; -export const TaskListItemDefault = () => ( - ( + { + const { getAllByRole } = render(); + + const button = getAllByRole('button'); + expect(button[0]).toHaveTextContent('Sylvie Vartan'); +}); diff --git a/front/src/pages/inbox/list-panel/__tests__/ListPanelHeader.test.tsx b/front/src/pages/inbox/list-panel/__tests__/ListPanelHeader.test.tsx new file mode 100644 index 000000000..5c18987ba --- /dev/null +++ b/front/src/pages/inbox/list-panel/__tests__/ListPanelHeader.test.tsx @@ -0,0 +1,10 @@ +import { render } from '@testing-library/react'; + +import { ListPanelHeaderDefault } from '../__stories__/ListPanelHeader.stories'; + +it('Checks the ListPanelHeader render', () => { + const { getAllByText } = render(); + + const text = getAllByText('6 tasks waiting'); + expect(text).toBeDefined(); +}); diff --git a/front/src/pages/inbox/list-panel/__tests__/ListPanelItem.test.tsx b/front/src/pages/inbox/list-panel/__tests__/ListPanelItem.test.tsx new file mode 100644 index 000000000..efe251375 --- /dev/null +++ b/front/src/pages/inbox/list-panel/__tests__/ListPanelItem.test.tsx @@ -0,0 +1,10 @@ +import { render } from '@testing-library/react'; + +import { ListPanelItemDefault } from '../__stories__/ListPanelItem.stories'; + +it('Checks the ListPanelItem render', () => { + const { getAllByText } = render(); + + const text = getAllByText('Sylvie Vartan'); + expect(text).toBeDefined(); +}); diff --git a/front/src/pages/inbox/plugin-panel/PluginPanel.tsx b/front/src/pages/inbox/plugin-panel/PluginPanel.tsx new file mode 100644 index 000000000..bf5acc7f1 --- /dev/null +++ b/front/src/pages/inbox/plugin-panel/PluginPanel.tsx @@ -0,0 +1,27 @@ +import styled from '@emotion/styled'; +import PluginPanelNav from './PluginPanelNav'; +import PluginHistory from './plugin-history/PanelHistory'; + +const StyledPanel = styled.div` + display: flex; + width: 350px; + border-left: 1px solid #eaecee; +`; + +const StyledContainer = styled.div` + display: flex; + flex-grow: 1; +`; + +function PluginPanel() { + return ( + + + + + + + ); +} + +export default PluginPanel; diff --git a/front/src/pages/inbox/plugin-panel/PluginPanelNav.tsx b/front/src/pages/inbox/plugin-panel/PluginPanelNav.tsx new file mode 100644 index 000000000..296526d6f --- /dev/null +++ b/front/src/pages/inbox/plugin-panel/PluginPanelNav.tsx @@ -0,0 +1,46 @@ +import styled from '@emotion/styled'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { faClone } from '@fortawesome/free-regular-svg-icons'; + +const StyledNav = styled.div` + display: flex; + flex-direction: column; + width: 60px; + border-left: 1px solid #eaecee; + background: #f1f3f5; +`; + +const StyledNavItem = styled.div` + display: flex; + width: 60px; + border-bottom: 1px solid #eaecee; + padding: 22px; + cursor: pointer; +`; + +function PluginPanelNav() { + return ( + + + + + + + + + + + + + + + + + + + + + ); +} + +export default PluginPanelNav; diff --git a/front/src/pages/inbox/plugin-panel/plugin-history/PanelHistory.tsx b/front/src/pages/inbox/plugin-panel/plugin-history/PanelHistory.tsx new file mode 100644 index 000000000..1d8bc01b4 --- /dev/null +++ b/front/src/pages/inbox/plugin-panel/plugin-history/PanelHistory.tsx @@ -0,0 +1,7 @@ +import styled from '@emotion/styled'; + +function PluginHistory() { + return
; +} + +export default PluginHistory; diff --git a/front/src/pages/inbox/plugin-panel/plugin-history/UserActivity.tsx b/front/src/pages/inbox/plugin-panel/plugin-history/UserActivity.tsx new file mode 100644 index 000000000..5109fbf57 --- /dev/null +++ b/front/src/pages/inbox/plugin-panel/plugin-history/UserActivity.tsx @@ -0,0 +1,7 @@ +import styled from '@emotion/styled'; + +function UserActivity() { + return; +} + +export default UserActivity; diff --git a/front/src/pages/inbox/plugin-panel/plugin-history/UserInformation.tsx b/front/src/pages/inbox/plugin-panel/plugin-history/UserInformation.tsx new file mode 100644 index 000000000..c060da814 --- /dev/null +++ b/front/src/pages/inbox/plugin-panel/plugin-history/UserInformation.tsx @@ -0,0 +1,7 @@ +import styled from '@emotion/styled'; + +function UserInformation() { + return; +} + +export default UserInformation; diff --git a/front/src/pages/tasks/Tasks.tsx b/front/src/pages/tasks/Tasks.tsx deleted file mode 100644 index 4c3822e18..000000000 --- a/front/src/pages/tasks/Tasks.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import FullWidthContainer from '../../layout/containers/FullWidthContainer'; -import TaskList from './TaskList'; - -function Tasks() { - return ( - - - - ); -} - -export default Tasks; diff --git a/front/src/stories/pages/tasks/TaskList.stories.tsx b/front/src/stories/pages/tasks/TaskList.stories.tsx deleted file mode 100644 index 0a98aea9d..000000000 --- a/front/src/stories/pages/tasks/TaskList.stories.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import TaskList from '../../../pages/tasks/TaskList'; - -export default { - title: 'Tasks', - component: TaskList, -}; - -export const TaskListDefault = () => ; diff --git a/front/src/stories/pages/tasks/TaskListHeader.stories.tsx b/front/src/stories/pages/tasks/TaskListHeader.stories.tsx deleted file mode 100644 index 888660da6..000000000 --- a/front/src/stories/pages/tasks/TaskListHeader.stories.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import { MemoryRouter } from 'react-router-dom'; -import TaskListHeader from '../../../pages/tasks/TaskListHeader'; - -export default { - title: 'Tasks', - component: TaskListHeader, -}; - -export const TaskListHeaderDefault = () => ; diff --git a/front/src/stories/pages/tasks/Tasks.stories.tsx b/front/src/stories/pages/tasks/Tasks.stories.tsx deleted file mode 100644 index 1a3121735..000000000 --- a/front/src/stories/pages/tasks/Tasks.stories.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import { MemoryRouter } from 'react-router-dom'; -import Tasks from '../../../pages/tasks/Tasks'; - -export default { - title: 'Tasks', - component: Tasks, -}; - -export const TasksDefault = () => ( - - - -); diff --git a/front/src/tests/layout/navbar/Navbar.test.tsx b/front/src/tests/layout/navbar/Navbar.test.tsx deleted file mode 100644 index 6f4298e1e..000000000 --- a/front/src/tests/layout/navbar/Navbar.test.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { render } from '@testing-library/react'; - -import { NavbarOnPerformance } from '../../../stories/layout/navbar/Navbar.stories'; - -it('Checks the NavItem renders', () => { - const { getByRole } = render(); - - expect(getByRole('button', { name: 'Performances' })).toHaveAttribute( - 'aria-selected', - 'true', - ); - - expect(getByRole('button', { name: 'Tasks' })).toHaveAttribute( - 'aria-selected', - 'false', - ); -}); diff --git a/front/src/tests/pages/tasks/TaskList.test.tsx b/front/src/tests/pages/tasks/TaskList.test.tsx deleted file mode 100644 index 993aacd25..000000000 --- a/front/src/tests/pages/tasks/TaskList.test.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { render } from '@testing-library/react'; - -import { TaskListDefault } from '../../../stories/pages/tasks/TaskList.stories'; - -it('Checks the Tasks page render', () => { - const { getAllByRole } = render(); - - const button = getAllByRole('button'); - expect(button[0]).toHaveTextContent('Sylvie Vartan'); -}); diff --git a/front/src/tests/pages/tasks/TaskListHeader.test.tsx b/front/src/tests/pages/tasks/TaskListHeader.test.tsx deleted file mode 100644 index b6d42fe91..000000000 --- a/front/src/tests/pages/tasks/TaskListHeader.test.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { render } from '@testing-library/react'; - -import { TaskListHeaderDefault } from '../../../stories/pages/tasks/TaskListHeader.stories'; - -it('Checks the TaskListHeader render', () => { - const { getAllByText } = render(); - - const text = getAllByText('6 tasks waiting'); - expect(text).toBeDefined(); -}); diff --git a/front/src/tests/pages/tasks/TaskListItem.test.tsx b/front/src/tests/pages/tasks/TaskListItem.test.tsx deleted file mode 100644 index 27331e5fa..000000000 --- a/front/src/tests/pages/tasks/TaskListItem.test.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { render } from '@testing-library/react'; - -import { TaskListItemDefault } from '../../../stories/pages/tasks/TaskListItem.stories'; - -it('Checks the TaskListItem render', () => { - const { getAllByText } = render(); - - const text = getAllByText('Sylvie Vartan'); - expect(text).toBeDefined(); -}); diff --git a/front/src/tests/pages/tasks/Tasks.test.tsx b/front/src/tests/pages/tasks/Tasks.test.tsx deleted file mode 100644 index 24e70d89e..000000000 --- a/front/src/tests/pages/tasks/Tasks.test.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { render } from '@testing-library/react'; - -import { TasksDefault } from '../../../stories/pages/tasks/Tasks.stories'; - -it('Checks the Tasks page render', () => { - const { getAllByRole } = render(); - - const button = getAllByRole('button'); - expect(button[0]).toHaveTextContent('Sylvie Vartan'); -}); diff --git a/server/.gitignore b/server/.gitignore index 22f55adc5..f50588412 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -30,6 +30,6 @@ lerna-debug.log* # IDE - VSCode .vscode/* !.vscode/settings.json -!.vscode/tasks.json +!.vscode/inbox.json !.vscode/launch.json !.vscode/extensions.json \ No newline at end of file