admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update favicon, manifest, page border (#127)

Browse Source
This commit is contained in:
Charles Bochet
2023-05-18 10:07:47 +02:00
committed by GitHub
parent cdc9e24ac0
commit 4211d5872b
18 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/interfaces/entities/__tests__/company.interface.test.ts
View File

@ -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: [

6
front/src/interfaces/entities/__tests__/user.interface.test.ts
View File

@ -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',

8
front/src/interfaces/entities/user.interface.ts
View File

@ -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',
});

1
front/src/layout/containers/WithTopBarContainer.tsx
View File

@ -34,6 +34,7 @@ const ContentSubContainer = styled.div`
border-radius: 8px;
height: 100%;
flex: 1;
border: 1px solid ${(props) => props.theme.primaryBorder};
`;
function FullWidthContainer({