Skip to content

Commit

Permalink
Add "show company / people" view and "Notes" concept (twentyhq#528)
Browse files Browse the repository at this point in the history
* Begin adding show view and refactoring threads to become notes

* Progress on design

* Progress redesign timeline

* Dropdown button, design improvement

* Open comment thread edit mode in drawer

* Autosave local storage and commentThreadcount

* Improve display and fix missing key issue

* Remove some hardcoded CSS properties

* Create button

* Split company show into ui/business + fix eslint

* Fix font weight

* Begin auto-save on edit mode

* Save server-side query result to Apollo cache

* Fix save behavior

* Refetch timeline after creating note

* Rename createCommentThreadWithComment

* Improve styling

* Revert "Improve styling"

This reverts commit 9fbbf2d.

* Improve CSS styling

* Bring back border radius inadvertently removed

* padding adjustment

* Improve blocknote design

* Improve edit mode display

* Remove Comments.tsx

* Remove irrelevant comment stories

* Removed un-necessary panel component

* stop using fragment, move trash icon

* Add a basic story for CompanyShow

* Add a basic People show view

* Fix storybook tests

* Add very basic Person story

* Refactor PR1

* Refactor part 2

* Refactor part 3

* Refactor part 4

* Fix tests

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
  • Loading branch information
FelixMalfait and charlesBochet authored Jul 10, 2023
1 parent ca180ac commit 94a913a
Show file tree
Hide file tree
Showing 191 changed files with 5,363 additions and 694 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"!javascript",
"!json",
"!typescript",
"!typescriptreact",
"md",
"mdx"
],
Expand Down
14 changes: 13 additions & 1 deletion front/craco.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
const path = require("path");

module.exports = {
devServer: {
client: {
overlay: {
runtimeErrors: (error) => {
if (error.message === "ResizeObserver loop limit exceeded") {
return false;
}
return true;
},
},
}
},
webpack: {
alias: {
'~': path.resolve(__dirname, 'src'),
'@': path.resolve(__dirname, 'src/modules'),
'@testing': path.resolve(__dirname, 'src/testing'),
}
},
},
jest: {
configure: {
Expand Down
2 changes: 2 additions & 0 deletions front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"dependencies": {
"@apollo/client": "^3.7.5",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@blocknote/core": "^0.8.2",
"@blocknote/react": "^0.8.2",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.5",
"@floating-ui/react": "^0.24.3",
Expand Down
8 changes: 8 additions & 0 deletions front/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import { People } from '~/pages/people/People';
import { SettingsProfile } from '~/pages/settings/SettingsProfile';
import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMembers';

import { CompanyShow } from './pages/companies/CompanyShow';
import { PersonShow } from './pages/people/PersonShow';
import { AppInternalHooks } from './AppInternalHooks';

/**
Expand Down Expand Up @@ -65,7 +67,13 @@ export function App() {
<Routes>
<Route path="" element={<Navigate to="/people" replace />} />
<Route path="people" element={<People />} />
<Route path="person/:personId" element={<PersonShow />} />
<Route path="companies" element={<Companies />} />
<Route
path="companies/:companyId"
element={<CompanyShow />}
/>

<Route path="opportunities" element={<Opportunities />} />
<Route
path="settings/*"
Expand Down
Loading

0 comments on commit 94a913a

Please sign in to comment.