diff --git a/front/public/favicon.ico b/front/public/favicon.ico deleted file mode 100644 index 546c56962f..0000000000 Binary files a/front/public/favicon.ico and /dev/null differ diff --git a/front/public/icon-128x128.png b/front/public/icon-128x128.png new file mode 100644 index 0000000000..bcc4d6a515 Binary files /dev/null and b/front/public/icon-128x128.png differ diff --git a/front/public/icon-144x144.png b/front/public/icon-144x144.png new file mode 100644 index 0000000000..ea2e75ac35 Binary files /dev/null and b/front/public/icon-144x144.png differ diff --git a/front/public/icon-152x152.png b/front/public/icon-152x152.png new file mode 100644 index 0000000000..750d482d98 Binary files /dev/null and b/front/public/icon-152x152.png differ diff --git a/front/public/icon-192x192.png b/front/public/icon-192x192.png new file mode 100644 index 0000000000..2a779b0095 Binary files /dev/null and b/front/public/icon-192x192.png differ diff --git a/front/public/icon-284x284.png b/front/public/icon-284x284.png new file mode 100644 index 0000000000..52fee73b54 Binary files /dev/null and b/front/public/icon-284x284.png differ diff --git a/front/public/icon-48x48.png b/front/public/icon-48x48.png new file mode 100644 index 0000000000..ec1f76fc78 Binary files /dev/null and b/front/public/icon-48x48.png differ diff --git a/front/public/icon-512x512.png b/front/public/icon-512x512.png new file mode 100644 index 0000000000..eba569d2b1 Binary files /dev/null and b/front/public/icon-512x512.png differ diff --git a/front/public/icon-72x72.png b/front/public/icon-72x72.png new file mode 100644 index 0000000000..873f987984 Binary files /dev/null and b/front/public/icon-72x72.png differ diff --git a/front/public/icon-96x96.png b/front/public/icon-96x96.png new file mode 100644 index 0000000000..0447a690a4 Binary files /dev/null and b/front/public/icon-96x96.png differ diff --git a/front/public/index.html b/front/public/index.html index d10a53a2f8..3c6d9b09ab 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,17 +2,20 @@ - + - + - + Twenty diff --git a/front/public/logo192.png b/front/public/logo192.png deleted file mode 100644 index 4d82d63d54..0000000000 Binary files a/front/public/logo192.png and /dev/null differ diff --git a/front/public/manifest.json b/front/public/manifest.json index c527e2bfa0..91ab1a9d56 100644 --- a/front/public/manifest.json +++ b/front/public/manifest.json @@ -1,16 +1,51 @@ { - "short_name": "React App", - "name": "Create React App Sample", + "short_name": "Twenty", + "name": "Twenty", "icons": [ { - "src": "favicon.ico", + "src": "icon-48x48.png", "sizes": "48x48", - "type": "image/x-icon" + "type": "image/png" }, { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" + "src": "icon-72x72.png", + "sizes": "72x72", + "type": "image/png" + }, + { + "src": "icon-96x96.png", + "sizes": "96x96", + "type": "image/png" + }, + { + "src": "icon-128x128.png", + "sizes": "128x128", + "type": "image/png" + }, + { + "src": "icon-144x144.png", + "sizes": "144x144", + "type": "image/png" + }, + { + "src": "icon-152x152.png", + "sizes": "152x152", + "type": "image/png" + }, + { + "src": "icon-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icon-284x284.png", + "sizes": "284x284", + "type": "image/png" + }, + { + "src": "icon-512x512.png", + "sizes": "512x512", + "type": "image/png" } ], "start_url": ".", diff --git a/front/src/interfaces/entities/__tests__/company.interface.test.ts b/front/src/interfaces/entities/__tests__/company.interface.test.ts index ff1ddfbd71..cabead90be 100644 --- a/front/src/interfaces/entities/__tests__/company.interface.test.ts +++ b/front/src/interfaces/entities/__tests__/company.interface.test.ts @@ -20,7 +20,7 @@ describe('Company mappers', () => { account_owner: { id: '7af20dea-0412-4c4c-8b13-d6f0e6e09e87', email: 'john@example.com', - display_name: 'John Doe', + displayName: 'John Doe', __typename: 'User', }, pipes: [ diff --git a/front/src/interfaces/entities/__tests__/user.interface.test.ts b/front/src/interfaces/entities/__tests__/user.interface.test.ts index 69c1382c7f..c4672c02dc 100644 --- a/front/src/interfaces/entities/__tests__/user.interface.test.ts +++ b/front/src/interfaces/entities/__tests__/user.interface.test.ts @@ -12,7 +12,7 @@ describe('User mappers', () => { now.setMilliseconds(0); const graphQLUser = { id: '7dfbc3f7-6e5e-4128-957e-8d86808cdf6b', - display_name: 'John Doe', + displayName: 'John Doe', email: 'john.doe@gmail.com', workspace_member: { id: '7af20dea-0412-4c4c-8b13-d6f0e6e09e88', @@ -30,7 +30,7 @@ describe('User mappers', () => { expect(User).toStrictEqual({ __typename: 'users', id: graphQLUser.id, - displayName: graphQLUser.display_name, + displayName: graphQLUser.displayName, email: graphQLUser.email, workspaceMember: { id: graphQLUser.workspace_member.id, @@ -64,7 +64,7 @@ describe('User mappers', () => { const graphQLUser = mapToGqlUser(user); expect(graphQLUser).toStrictEqual({ id: user.id, - display_name: user.displayName, + displayName: user.displayName, email: user.email, workspace_member_id: user.workspaceMember.id, __typename: 'users', diff --git a/front/src/interfaces/entities/user.interface.ts b/front/src/interfaces/entities/user.interface.ts index b1788cb369..48bd0a11f7 100644 --- a/front/src/interfaces/entities/user.interface.ts +++ b/front/src/interfaces/entities/user.interface.ts @@ -15,7 +15,7 @@ export interface User { export type GraphqlQueryUser = { id: string; email?: string; - display_name?: string; + displayName?: string; workspace_member?: GraphqlQueryWorkspaceMember; __typename: string; }; @@ -23,7 +23,7 @@ export type GraphqlQueryUser = { export type GraphqlMutationUser = { id: string; email?: string; - display_name?: string; + displayName?: string; workspace_member_id?: string; __typename: string; }; @@ -32,7 +32,7 @@ export const mapToUser = (user: GraphqlQueryUser): User => ({ __typename: 'users', id: user.id, email: user.email, - displayName: user.display_name, + displayName: user.displayName, workspaceMember: user.workspace_member ? mapToWorkspaceMember(user.workspace_member) : user.workspace_member, @@ -41,7 +41,7 @@ export const mapToUser = (user: GraphqlQueryUser): User => ({ export const mapToGqlUser = (user: User): GraphqlMutationUser => ({ id: user.id, email: user.email, - display_name: user.displayName, + displayName: user.displayName, workspace_member_id: user.workspaceMember?.id, __typename: 'users', }); diff --git a/front/src/layout/containers/WithTopBarContainer.tsx b/front/src/layout/containers/WithTopBarContainer.tsx index 9c29fd3ac5..6dcf001b93 100644 --- a/front/src/layout/containers/WithTopBarContainer.tsx +++ b/front/src/layout/containers/WithTopBarContainer.tsx @@ -34,6 +34,7 @@ const ContentSubContainer = styled.div` border-radius: 8px; height: 100%; flex: 1; + border: 1px solid ${(props) => props.theme.primaryBorder}; `; function FullWidthContainer({ diff --git a/front/tsconfig.json b/front/tsconfig.json index a273b0cfc0..9d379a3c4a 100644 --- a/front/tsconfig.json +++ b/front/tsconfig.json @@ -1,11 +1,7 @@ { "compilerOptions": { "target": "es5", - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], + "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, "skipLibCheck": true, "esModuleInterop": true, @@ -20,7 +16,5 @@ "noEmit": true, "jsx": "react-jsx" }, - "include": [ - "src" - ] + "include": ["src"] }