From b45e52dcfd679069476dab30ef35b321794d52cb Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Tue, 11 Aug 2020 13:18:20 +0200 Subject: [PATCH] Center user initials and user proper thumbnail sizes --- src/fragments/staff.ts | 6 +++--- .../types/PermissionGroupDetailsFragment.ts | 6 ------ src/fragments/types/StaffMemberDetailsFragment.ts | 12 ++++++------ src/fragments/types/StaffMemberFragment.ts | 6 ------ src/permissionGroups/types/PermissionGroupCreate.ts | 6 ------ src/permissionGroups/types/PermissionGroupDetails.ts | 6 ------ src/permissionGroups/types/PermissionGroupUpdate.ts | 6 ------ src/staff/components/StaffList/StaffList.tsx | 4 ++-- src/staff/queries.ts | 3 +++ src/staff/types/StaffMemberAdd.ts | 12 ++++++------ src/staff/types/StaffMemberDetails.ts | 12 ++++++------ src/staff/types/StaffMemberUpdate.ts | 12 ++++++------ 12 files changed, 32 insertions(+), 59 deletions(-) diff --git a/src/fragments/staff.ts b/src/fragments/staff.ts index 4262563c8..edc469c7e 100644 --- a/src/fragments/staff.ts +++ b/src/fragments/staff.ts @@ -7,9 +7,6 @@ export const staffMemberFragment = gql` firstName isActive lastName - avatar { - url - } } `; export const staffMemberDetailsFragment = gql` @@ -25,5 +22,8 @@ export const staffMemberDetailsFragment = gql` code name } + avatar(size: 120) { + url + } } `; diff --git a/src/fragments/types/PermissionGroupDetailsFragment.ts b/src/fragments/types/PermissionGroupDetailsFragment.ts index 189247a10..6ede9da3d 100644 --- a/src/fragments/types/PermissionGroupDetailsFragment.ts +++ b/src/fragments/types/PermissionGroupDetailsFragment.ts @@ -8,11 +8,6 @@ import { PermissionEnum } from "./../../types/globalTypes"; // GraphQL fragment: PermissionGroupDetailsFragment // ==================================================== -export interface PermissionGroupDetailsFragment_users_avatar { - __typename: "Image"; - url: string; -} - export interface PermissionGroupDetailsFragment_users { __typename: "User"; id: string; @@ -20,7 +15,6 @@ export interface PermissionGroupDetailsFragment_users { lastName: string; email: string; isActive: boolean; - avatar: PermissionGroupDetailsFragment_users_avatar | null; } export interface PermissionGroupDetailsFragment_permissions { diff --git a/src/fragments/types/StaffMemberDetailsFragment.ts b/src/fragments/types/StaffMemberDetailsFragment.ts index a52f00126..22f80c5d8 100644 --- a/src/fragments/types/StaffMemberDetailsFragment.ts +++ b/src/fragments/types/StaffMemberDetailsFragment.ts @@ -8,11 +8,6 @@ import { PermissionEnum } from "./../../types/globalTypes"; // GraphQL fragment: StaffMemberDetailsFragment // ==================================================== -export interface StaffMemberDetailsFragment_avatar { - __typename: "Image"; - url: string; -} - export interface StaffMemberDetailsFragment_permissionGroups { __typename: "Group"; id: string; @@ -26,6 +21,11 @@ export interface StaffMemberDetailsFragment_userPermissions { name: string; } +export interface StaffMemberDetailsFragment_avatar { + __typename: "Image"; + url: string; +} + export interface StaffMemberDetailsFragment { __typename: "User"; id: string; @@ -33,7 +33,7 @@ export interface StaffMemberDetailsFragment { firstName: string; isActive: boolean; lastName: string; - avatar: StaffMemberDetailsFragment_avatar | null; permissionGroups: (StaffMemberDetailsFragment_permissionGroups | null)[] | null; userPermissions: (StaffMemberDetailsFragment_userPermissions | null)[] | null; + avatar: StaffMemberDetailsFragment_avatar | null; } diff --git a/src/fragments/types/StaffMemberFragment.ts b/src/fragments/types/StaffMemberFragment.ts index f5098fcdf..118b747c1 100644 --- a/src/fragments/types/StaffMemberFragment.ts +++ b/src/fragments/types/StaffMemberFragment.ts @@ -6,11 +6,6 @@ // GraphQL fragment: StaffMemberFragment // ==================================================== -export interface StaffMemberFragment_avatar { - __typename: "Image"; - url: string; -} - export interface StaffMemberFragment { __typename: "User"; id: string; @@ -18,5 +13,4 @@ export interface StaffMemberFragment { firstName: string; isActive: boolean; lastName: string; - avatar: StaffMemberFragment_avatar | null; } diff --git a/src/permissionGroups/types/PermissionGroupCreate.ts b/src/permissionGroups/types/PermissionGroupCreate.ts index 6eee4ebd4..9702d5337 100644 --- a/src/permissionGroups/types/PermissionGroupCreate.ts +++ b/src/permissionGroups/types/PermissionGroupCreate.ts @@ -14,11 +14,6 @@ export interface PermissionGroupCreate_permissionGroupCreate_errors { field: string | null; } -export interface PermissionGroupCreate_permissionGroupCreate_group_users_avatar { - __typename: "Image"; - url: string; -} - export interface PermissionGroupCreate_permissionGroupCreate_group_users { __typename: "User"; id: string; @@ -26,7 +21,6 @@ export interface PermissionGroupCreate_permissionGroupCreate_group_users { lastName: string; email: string; isActive: boolean; - avatar: PermissionGroupCreate_permissionGroupCreate_group_users_avatar | null; } export interface PermissionGroupCreate_permissionGroupCreate_group_permissions { diff --git a/src/permissionGroups/types/PermissionGroupDetails.ts b/src/permissionGroups/types/PermissionGroupDetails.ts index cde1dea2b..3da5eb877 100644 --- a/src/permissionGroups/types/PermissionGroupDetails.ts +++ b/src/permissionGroups/types/PermissionGroupDetails.ts @@ -8,11 +8,6 @@ import { PermissionEnum } from "./../../types/globalTypes"; // GraphQL query operation: PermissionGroupDetails // ==================================================== -export interface PermissionGroupDetails_permissionGroup_users_avatar { - __typename: "Image"; - url: string; -} - export interface PermissionGroupDetails_permissionGroup_users { __typename: "User"; id: string; @@ -20,7 +15,6 @@ export interface PermissionGroupDetails_permissionGroup_users { lastName: string; email: string; isActive: boolean; - avatar: PermissionGroupDetails_permissionGroup_users_avatar | null; } export interface PermissionGroupDetails_permissionGroup_permissions { diff --git a/src/permissionGroups/types/PermissionGroupUpdate.ts b/src/permissionGroups/types/PermissionGroupUpdate.ts index 4ff8bd464..974b92bcc 100644 --- a/src/permissionGroups/types/PermissionGroupUpdate.ts +++ b/src/permissionGroups/types/PermissionGroupUpdate.ts @@ -14,11 +14,6 @@ export interface PermissionGroupUpdate_permissionGroupUpdate_errors { field: string | null; } -export interface PermissionGroupUpdate_permissionGroupUpdate_group_users_avatar { - __typename: "Image"; - url: string; -} - export interface PermissionGroupUpdate_permissionGroupUpdate_group_users { __typename: "User"; id: string; @@ -26,7 +21,6 @@ export interface PermissionGroupUpdate_permissionGroupUpdate_group_users { lastName: string; email: string; isActive: boolean; - avatar: PermissionGroupUpdate_permissionGroupUpdate_group_users_avatar | null; } export interface PermissionGroupUpdate_permissionGroupUpdate_group_permissions { diff --git a/src/staff/components/StaffList/StaffList.tsx b/src/staff/components/StaffList/StaffList.tsx index e00898098..2f60804de 100644 --- a/src/staff/components/StaffList/StaffList.tsx +++ b/src/staff/components/StaffList/StaffList.tsx @@ -38,8 +38,8 @@ const useStyles = makeStyles( width: 47 }, avatarDefault: { - "& p": { - color: "#fff", + "& div": { + color: theme.palette.primary.contrastText, lineHeight: "47px" }, background: theme.palette.primary.main, diff --git a/src/staff/queries.ts b/src/staff/queries.ts index b8a86103c..4c2c6ef0e 100644 --- a/src/staff/queries.ts +++ b/src/staff/queries.ts @@ -34,6 +34,9 @@ const staffList = gql` cursor node { ...StaffMemberFragment + avatar(size: 48) { + url + } } } pageInfo { diff --git a/src/staff/types/StaffMemberAdd.ts b/src/staff/types/StaffMemberAdd.ts index d42e80dcf..d5b176cff 100644 --- a/src/staff/types/StaffMemberAdd.ts +++ b/src/staff/types/StaffMemberAdd.ts @@ -14,11 +14,6 @@ export interface StaffMemberAdd_staffCreate_errors { field: string | null; } -export interface StaffMemberAdd_staffCreate_user_avatar { - __typename: "Image"; - url: string; -} - export interface StaffMemberAdd_staffCreate_user_permissionGroups { __typename: "Group"; id: string; @@ -32,6 +27,11 @@ export interface StaffMemberAdd_staffCreate_user_userPermissions { name: string; } +export interface StaffMemberAdd_staffCreate_user_avatar { + __typename: "Image"; + url: string; +} + export interface StaffMemberAdd_staffCreate_user { __typename: "User"; id: string; @@ -39,9 +39,9 @@ export interface StaffMemberAdd_staffCreate_user { firstName: string; isActive: boolean; lastName: string; - avatar: StaffMemberAdd_staffCreate_user_avatar | null; permissionGroups: (StaffMemberAdd_staffCreate_user_permissionGroups | null)[] | null; userPermissions: (StaffMemberAdd_staffCreate_user_userPermissions | null)[] | null; + avatar: StaffMemberAdd_staffCreate_user_avatar | null; } export interface StaffMemberAdd_staffCreate { diff --git a/src/staff/types/StaffMemberDetails.ts b/src/staff/types/StaffMemberDetails.ts index 1935e7461..2ec999c1a 100644 --- a/src/staff/types/StaffMemberDetails.ts +++ b/src/staff/types/StaffMemberDetails.ts @@ -8,11 +8,6 @@ import { PermissionEnum } from "./../../types/globalTypes"; // GraphQL query operation: StaffMemberDetails // ==================================================== -export interface StaffMemberDetails_user_avatar { - __typename: "Image"; - url: string; -} - export interface StaffMemberDetails_user_permissionGroups { __typename: "Group"; id: string; @@ -26,6 +21,11 @@ export interface StaffMemberDetails_user_userPermissions { name: string; } +export interface StaffMemberDetails_user_avatar { + __typename: "Image"; + url: string; +} + export interface StaffMemberDetails_user { __typename: "User"; id: string; @@ -33,9 +33,9 @@ export interface StaffMemberDetails_user { firstName: string; isActive: boolean; lastName: string; - avatar: StaffMemberDetails_user_avatar | null; permissionGroups: (StaffMemberDetails_user_permissionGroups | null)[] | null; userPermissions: (StaffMemberDetails_user_userPermissions | null)[] | null; + avatar: StaffMemberDetails_user_avatar | null; } export interface StaffMemberDetails { diff --git a/src/staff/types/StaffMemberUpdate.ts b/src/staff/types/StaffMemberUpdate.ts index b7ce4c317..abf093d50 100644 --- a/src/staff/types/StaffMemberUpdate.ts +++ b/src/staff/types/StaffMemberUpdate.ts @@ -14,11 +14,6 @@ export interface StaffMemberUpdate_staffUpdate_errors { field: string | null; } -export interface StaffMemberUpdate_staffUpdate_user_avatar { - __typename: "Image"; - url: string; -} - export interface StaffMemberUpdate_staffUpdate_user_permissionGroups { __typename: "Group"; id: string; @@ -32,6 +27,11 @@ export interface StaffMemberUpdate_staffUpdate_user_userPermissions { name: string; } +export interface StaffMemberUpdate_staffUpdate_user_avatar { + __typename: "Image"; + url: string; +} + export interface StaffMemberUpdate_staffUpdate_user { __typename: "User"; id: string; @@ -39,9 +39,9 @@ export interface StaffMemberUpdate_staffUpdate_user { firstName: string; isActive: boolean; lastName: string; - avatar: StaffMemberUpdate_staffUpdate_user_avatar | null; permissionGroups: (StaffMemberUpdate_staffUpdate_user_permissionGroups | null)[] | null; userPermissions: (StaffMemberUpdate_staffUpdate_user_userPermissions | null)[] | null; + avatar: StaffMemberUpdate_staffUpdate_user_avatar | null; } export interface StaffMemberUpdate_staffUpdate {