Skip to content
This repository has been archived by the owner on Dec 7, 2020. It is now read-only.

Commit

Permalink
Merge pull request #99 from uktrade/feature/my-companies-dashboard
Browse files Browse the repository at this point in the history
feat: Add companies dashboard
  • Loading branch information
ian-leggett authored Aug 22, 2019
2 parents 16cc292 + 8e3de5c commit b388ce5
Show file tree
Hide file tree
Showing 31 changed files with 2,864 additions and 1,549 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ typings/

# IDE
.idea/
.history*

# Production build
dist/
Expand Down
40 changes: 40 additions & 0 deletions fixtures/Dashboard/companies.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[
{
"company": {
"name": "A1 BMW LTD!!!!!",
"id": "a1138c1c-d449-4846-aa58-18fae7e1cb92",
"isArchived": false
},
"latestInteraction": {
"id": "79d92719-7402-45b6-b3d7-eff559d6b282",
"date": "2019-08-14",
"displayDate": "14 Aug 19",
"subject": "Here is a long interaction title some more text some more text some more text almost finished some more text nearly there more text finished"
}
},
{
"company": {
"name": "Portable Potatoes",
"id": "a30b1db3-7140-44ca-ad7a-9824c3c2ed56",
"isArchived": false
},
"latestInteraction": {
"displayDate": "-",
"date": null,
"subject": "No interactions have been recorded"
}
},
{
"company": {
"name": "Zebra clothing",
"id": "b89b1db3-7140-44ca-ad7a-9824c3c2gh74",
"isArchived": false
},
"latestInteraction": {
"id": "86f92719-7402-45b6-b3d7-eff559d6b678",
"displayDate": "21 Feb 2019",
"date": "2019-02-21",
"subject": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
}
}
]
7 changes: 7 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@
"dependencies": {
"@babel/runtime": "^7.4.5",
"@govuk-react/constants": "^0.7.1",
"@govuk-react/details": "^0.7.1",
"@govuk-react/label-text": "^0.7.1",
"@govuk-react/lib": "^0.7.1",
"@govuk-react/link": "^0.7.1",
"@govuk-react/select": "^0.7.1",
"@govuk-react/table": "^0.7.1",
"axios": "^0.19.0",
"constate": "^1.2.0",
"govuk-colours": "^1.0.3",
Expand All @@ -50,6 +56,7 @@
"pluralise": "^1.0.1",
"prop-types": "^15.7.2",
"query-string": "^6.8.2",
"react-lines-ellipsis": "^0.14.1",
"react-markdown": "^4.0.8",
"styled-components": "^4.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/activity-feed/ActivityFeed.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import interactionActivityFixture from '../../fixtures/activity_feed/interaction
// Lock the date so moment's relative date doesn't break our deterministic tests.
MockDate.set(1559750582706)

const FEED_MAX_RENDER_TIME_SECONDS = 3.0
const FEED_MAX_RENDER_TIME_SECONDS = 7.0

const generateActivities = total => Array.from({ length: total }, () => ({
...interactionActivityFixture,
Expand Down
Loading

0 comments on commit b388ce5

Please sign in to comment.