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/tasks/Tasks.tsx b/front/src/pages/inbox/Inbox.tsx
similarity index 83%
rename from front/src/pages/tasks/Tasks.tsx
rename to front/src/pages/inbox/Inbox.tsx
index 4c3822e18..4a0779ee3 100644
--- a/front/src/pages/tasks/Tasks.tsx
+++ b/front/src/pages/inbox/Inbox.tsx
@@ -1,7 +1,7 @@
import FullWidthContainer from '../../layout/containers/FullWidthContainer';
import TaskList from './TaskList';
-function Tasks() {
+function Inbox() {
return (
@@ -9,4 +9,4 @@ function Tasks() {
);
}
-export default Tasks;
+export default Inbox;
diff --git a/front/src/pages/tasks/TaskList.tsx b/front/src/pages/inbox/TaskList.tsx
similarity index 100%
rename from front/src/pages/tasks/TaskList.tsx
rename to front/src/pages/inbox/TaskList.tsx
diff --git a/front/src/pages/tasks/TaskListHeader.tsx b/front/src/pages/inbox/TaskListHeader.tsx
similarity index 100%
rename from front/src/pages/tasks/TaskListHeader.tsx
rename to front/src/pages/inbox/TaskListHeader.tsx
diff --git a/front/src/pages/tasks/TaskListItem.tsx b/front/src/pages/inbox/TaskListItem.tsx
similarity index 100%
rename from front/src/pages/tasks/TaskListItem.tsx
rename to front/src/pages/inbox/TaskListItem.tsx
diff --git a/front/src/stories/layout/navbar/Navbar.stories.tsx b/front/src/stories/layout/navbar/Navbar.stories.tsx
index 772c952e9..841b4c6df 100644
--- a/front/src/stories/layout/navbar/Navbar.stories.tsx
+++ b/front/src/stories/layout/navbar/Navbar.stories.tsx
@@ -7,8 +7,8 @@ export default {
component: Navbar,
};
-export const NavbarOnPerformance = () => (
-
+export const NavbarOnInsights = () => (
+
);
diff --git a/front/src/stories/pages/inbox/Inbox.stories.tsx b/front/src/stories/pages/inbox/Inbox.stories.tsx
new file mode 100644
index 000000000..97aa92fa9
--- /dev/null
+++ b/front/src/stories/pages/inbox/Inbox.stories.tsx
@@ -0,0 +1,13 @@
+import { MemoryRouter } from 'react-router-dom';
+import Inbox from '../../../pages/inbox/Inbox';
+
+export default {
+ title: 'Inbox',
+ component: Inbox,
+};
+
+export const InboxDefault = () => (
+
+
+
+);
diff --git a/front/src/stories/pages/tasks/TaskList.stories.tsx b/front/src/stories/pages/inbox/TaskList.stories.tsx
similarity index 57%
rename from front/src/stories/pages/tasks/TaskList.stories.tsx
rename to front/src/stories/pages/inbox/TaskList.stories.tsx
index 0a98aea9d..70eec25ec 100644
--- a/front/src/stories/pages/tasks/TaskList.stories.tsx
+++ b/front/src/stories/pages/inbox/TaskList.stories.tsx
@@ -1,7 +1,7 @@
-import TaskList from '../../../pages/tasks/TaskList';
+import TaskList from '../../../pages/inbox/TaskList';
export default {
- title: 'Tasks',
+ title: 'Inbox',
component: TaskList,
};
diff --git a/front/src/stories/pages/tasks/TaskListHeader.stories.tsx b/front/src/stories/pages/inbox/TaskListHeader.stories.tsx
similarity index 66%
rename from front/src/stories/pages/tasks/TaskListHeader.stories.tsx
rename to front/src/stories/pages/inbox/TaskListHeader.stories.tsx
index 888660da6..58a5aa3b2 100644
--- a/front/src/stories/pages/tasks/TaskListHeader.stories.tsx
+++ b/front/src/stories/pages/inbox/TaskListHeader.stories.tsx
@@ -1,8 +1,8 @@
import { MemoryRouter } from 'react-router-dom';
-import TaskListHeader from '../../../pages/tasks/TaskListHeader';
+import TaskListHeader from '../../../pages/inbox/TaskListHeader';
export default {
- title: 'Tasks',
+ title: 'Inbox',
component: TaskListHeader,
};
diff --git a/front/src/stories/pages/tasks/TaskListItem.stories.tsx b/front/src/stories/pages/inbox/TaskListItem.stories.tsx
similarity index 84%
rename from front/src/stories/pages/tasks/TaskListItem.stories.tsx
rename to front/src/stories/pages/inbox/TaskListItem.stories.tsx
index c611ad175..143dce87a 100644
--- a/front/src/stories/pages/tasks/TaskListItem.stories.tsx
+++ b/front/src/stories/pages/inbox/TaskListItem.stories.tsx
@@ -1,8 +1,8 @@
import { MemoryRouter } from 'react-router-dom';
-import TaskListItem from '../../../pages/tasks/TaskListItem';
+import TaskListItem from '../../../pages/inbox/TaskListItem';
export default {
- title: 'Tasks',
+ title: 'Inbox',
component: TaskListItem,
};
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
index 6f4298e1e..0e813259e 100644
--- a/front/src/tests/layout/navbar/Navbar.test.tsx
+++ b/front/src/tests/layout/navbar/Navbar.test.tsx
@@ -1,16 +1,16 @@
import { render } from '@testing-library/react';
-import { NavbarOnPerformance } from '../../../stories/layout/navbar/Navbar.stories';
+import { NavbarOnInsights } from '../../../stories/layout/navbar/Navbar.stories';
it('Checks the NavItem renders', () => {
- const { getByRole } = render();
+ const { getByRole } = render();
- expect(getByRole('button', { name: 'Performances' })).toHaveAttribute(
+ expect(getByRole('button', { name: 'Insights' })).toHaveAttribute(
'aria-selected',
'true',
);
- expect(getByRole('button', { name: 'Tasks' })).toHaveAttribute(
+ expect(getByRole('button', { name: 'Inbox' })).toHaveAttribute(
'aria-selected',
'false',
);
diff --git a/front/src/tests/pages/tasks/Tasks.test.tsx b/front/src/tests/pages/inbox/Inbox.test.tsx
similarity index 50%
rename from front/src/tests/pages/tasks/Tasks.test.tsx
rename to front/src/tests/pages/inbox/Inbox.test.tsx
index 24e70d89e..6918edef7 100644
--- a/front/src/tests/pages/tasks/Tasks.test.tsx
+++ b/front/src/tests/pages/inbox/Inbox.test.tsx
@@ -1,9 +1,9 @@
import { render } from '@testing-library/react';
-import { TasksDefault } from '../../../stories/pages/tasks/Tasks.stories';
+import { InboxDefault } from '../../../stories/pages/inbox/Inbox.stories';
-it('Checks the Tasks page render', () => {
- const { getAllByRole } = render();
+it('Checks the Inbox page render', () => {
+ const { getAllByRole } = render();
const button = getAllByRole('button');
expect(button[0]).toHaveTextContent('Sylvie Vartan');
diff --git a/front/src/tests/pages/tasks/TaskList.test.tsx b/front/src/tests/pages/inbox/TaskList.test.tsx
similarity index 67%
rename from front/src/tests/pages/tasks/TaskList.test.tsx
rename to front/src/tests/pages/inbox/TaskList.test.tsx
index 993aacd25..8ae9b42f5 100644
--- a/front/src/tests/pages/tasks/TaskList.test.tsx
+++ b/front/src/tests/pages/inbox/TaskList.test.tsx
@@ -1,8 +1,8 @@
import { render } from '@testing-library/react';
-import { TaskListDefault } from '../../../stories/pages/tasks/TaskList.stories';
+import { TaskListDefault } from '../../../stories/pages/inbox/TaskList.stories';
-it('Checks the Tasks page render', () => {
+it('Checks the task list render', () => {
const { getAllByRole } = render();
const button = getAllByRole('button');
diff --git a/front/src/tests/pages/tasks/TaskListHeader.test.tsx b/front/src/tests/pages/inbox/TaskListHeader.test.tsx
similarity index 72%
rename from front/src/tests/pages/tasks/TaskListHeader.test.tsx
rename to front/src/tests/pages/inbox/TaskListHeader.test.tsx
index b6d42fe91..e5ce2625c 100644
--- a/front/src/tests/pages/tasks/TaskListHeader.test.tsx
+++ b/front/src/tests/pages/inbox/TaskListHeader.test.tsx
@@ -1,6 +1,6 @@
import { render } from '@testing-library/react';
-import { TaskListHeaderDefault } from '../../../stories/pages/tasks/TaskListHeader.stories';
+import { TaskListHeaderDefault } from '../../../stories/pages/inbox/TaskListHeader.stories';
it('Checks the TaskListHeader render', () => {
const { getAllByText } = render();
diff --git a/front/src/tests/pages/tasks/TaskListItem.test.tsx b/front/src/tests/pages/inbox/TaskListItem.test.tsx
similarity index 72%
rename from front/src/tests/pages/tasks/TaskListItem.test.tsx
rename to front/src/tests/pages/inbox/TaskListItem.test.tsx
index 27331e5fa..a9d9bf64a 100644
--- a/front/src/tests/pages/tasks/TaskListItem.test.tsx
+++ b/front/src/tests/pages/inbox/TaskListItem.test.tsx
@@ -1,6 +1,6 @@
import { render } from '@testing-library/react';
-import { TaskListItemDefault } from '../../../stories/pages/tasks/TaskListItem.stories';
+import { TaskListItemDefault } from '../../../stories/pages/inbox/TaskListItem.stories';
it('Checks the TaskListItem render', () => {
const { getAllByText } = render();
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