diff --git a/front/src/AppNavbar.tsx b/front/src/AppNavbar.tsx index e04f27352..7e6ba6f6e 100644 --- a/front/src/AppNavbar.tsx +++ b/front/src/AppNavbar.tsx @@ -1,7 +1,7 @@ import { useMatch, useResolvedPath } from 'react-router-dom'; import { - IconBuilding, + IconBuildingSkyscraper, IconInbox, IconSearch, IconSettings, @@ -50,7 +50,7 @@ export function AppNavbar() { } + icon={} active={ !!useMatch({ path: useResolvedPath('/companies').pathname, diff --git a/front/src/modules/opportunities/components/BoardCard.tsx b/front/src/modules/opportunities/components/BoardCard.tsx index b6acc117c..75ffe0378 100644 --- a/front/src/modules/opportunities/components/BoardCard.tsx +++ b/front/src/modules/opportunities/components/BoardCard.tsx @@ -5,12 +5,12 @@ import CompanyChip from '../../companies/components/CompanyChip'; import PersonPlaceholder from '../../people/components/person-placeholder.png'; import { PersonChip } from '../../people/components/PersonChip'; import { - IconBuilding, - IconCalendar, + IconBuildingSkyscraper, + IconCalendarEvent, IconMail, IconPhone, - IconSum, IconUser, + IconUsers, } from '../../ui/icons'; import { getLogoUrlFromDomainName, humanReadableDate } from '../../utils/utils'; @@ -69,7 +69,7 @@ const PersonBoardCard = ({ person }: { person: Person }) => { - + { {person.phone} - + {humanReadableDate(new Date(person.createdAt as string))} @@ -110,10 +110,10 @@ const CompanyBoardCard = ({ company }: { company: Company }) => { - {company.employees} + {company.employees} - + {humanReadableDate(new Date(company.createdAt as string))} diff --git a/front/src/modules/ui/icons/index.ts b/front/src/modules/ui/icons/index.ts index 016e11f81..5152ecb39 100644 --- a/front/src/modules/ui/icons/index.ts +++ b/front/src/modules/ui/icons/index.ts @@ -1,5 +1,5 @@ export { IconAddressBook } from './components/IconAddressBook'; -export { IconBuilding } from '@tabler/icons-react'; +export { IconBuildingSkyscraper } from '@tabler/icons-react'; export { IconMessageCircle as IconComment } from '@tabler/icons-react'; export { IconCheck } from '@tabler/icons-react'; export { IconTrash } from '@tabler/icons-react'; @@ -16,12 +16,12 @@ export { IconX } from '@tabler/icons-react'; export { IconChevronLeft } from '@tabler/icons-react'; export { IconPlus } from '@tabler/icons-react'; export { IconLink } from '@tabler/icons-react'; -export { IconSum } from '@tabler/icons-react'; -export { IconCalendar } from '@tabler/icons-react'; -export { IconMapPin } from '@tabler/icons-react'; +export { IconUsers } from '@tabler/icons-react'; +export { IconCalendarEvent } from '@tabler/icons-react'; +export { IconMap } from '@tabler/icons-react'; export { IconMail } from '@tabler/icons-react'; export { IconPhone } from '@tabler/icons-react'; -export { IconTarget } from '@tabler/icons-react'; +export { IconTargetArrow } from '@tabler/icons-react'; export { IconChevronDown } from '@tabler/icons-react'; export { IconArrowNarrowDown } from '@tabler/icons-react'; export { IconArrowNarrowUp } from '@tabler/icons-react'; diff --git a/front/src/modules/ui/layout/SecondaryLayout.tsx b/front/src/modules/ui/layout/SecondaryLayout.tsx index fa6c098ca..e6d36957f 100644 --- a/front/src/modules/ui/layout/SecondaryLayout.tsx +++ b/front/src/modules/ui/layout/SecondaryLayout.tsx @@ -31,8 +31,7 @@ const SubContainer = styled.div` flex-direction: column; margin: ${(props) => props.theme.spacing(4)}; max-width: calc(100vw - 500px); - padding: 32px; - padding: ${(props) => props.theme.spacing(2)}; + padding: ${(props) => props.theme.spacing(8)}; width: 100%; @media (max-width: ${MOBILE_VIEWPORT}px) { diff --git a/front/src/modules/ui/layout/navbar/NavBackButton.tsx b/front/src/modules/ui/layout/navbar/NavBackButton.tsx index db667a707..96ae4e8bf 100644 --- a/front/src/modules/ui/layout/navbar/NavBackButton.tsx +++ b/front/src/modules/ui/layout/navbar/NavBackButton.tsx @@ -39,7 +39,7 @@ export default function NavBackButton({ title }: OwnProps) { navigate('/', { replace: true })} > - + {title} diff --git a/front/src/pages/companies/Companies.tsx b/front/src/pages/companies/Companies.tsx index 09c16c567..21df587a1 100644 --- a/front/src/pages/companies/Companies.tsx +++ b/front/src/pages/companies/Companies.tsx @@ -19,7 +19,7 @@ import { import { SelectedFilterType } from '@/filters-and-sorts/interfaces/filters/interface'; import { EntityTableActionBar } from '@/ui/components/table/action-bar/EntityTableActionBar'; import { EntityTable } from '@/ui/components/table/EntityTable'; -import { IconBuilding } from '@/ui/icons/index'; +import { IconBuildingSkyscraper } from '@/ui/icons/index'; import { IconList } from '@/ui/icons/index'; import { WithTopBarContainer } from '@/ui/layout/containers/WithTopBarContainer'; import { BoolExpType } from '@/utils/interfaces/generic.interface'; @@ -78,7 +78,7 @@ export function Companies() { } + icon={} onAddButtonClick={handleAddButtonClick} > <> @@ -87,7 +87,7 @@ export function Companies() { data={companies} columns={companiesColumns} viewName="All Companies" - viewIcon={} + viewIcon={} availableSorts={availableSorts} availableFilters={availableFilters} onSortsUpdate={updateSorts} diff --git a/front/src/pages/companies/companies-columns.tsx b/front/src/pages/companies/companies-columns.tsx index 85e61788e..04abcb729 100644 --- a/front/src/pages/companies/companies-columns.tsx +++ b/front/src/pages/companies/companies-columns.tsx @@ -15,12 +15,12 @@ import { EditableRelation } from '@/ui/components/editable-cell/types/EditableRe import { EditableText } from '@/ui/components/editable-cell/types/EditableText'; import { ColumnHead } from '@/ui/components/table/ColumnHead'; import { - IconBuilding, - IconCalendar, + IconBuildingSkyscraper, + IconCalendarEvent, IconLink, - IconMapPin, - IconSum, + IconMap, IconUser, + IconUsers, } from '@/ui/icons/index'; import { getCheckBoxColumn } from '@/ui/tables/utils/getCheckBoxColumn'; import { mapToUser, User } from '@/users/interfaces/user.interface'; @@ -34,7 +34,10 @@ export const useCompaniesColumns = () => { getCheckBoxColumn(), columnHelper.accessor('name', { header: () => ( - } /> + } + /> ), cell: (props) => ( @@ -60,7 +63,7 @@ export const useCompaniesColumns = () => { }), columnHelper.accessor('employees', { header: () => ( - } /> + } /> ), cell: (props) => ( { }), columnHelper.accessor('address', { header: () => ( - } /> + } /> ), cell: (props) => ( { header: () => ( } + viewIcon={} /> ), cell: (props) => ( diff --git a/front/src/pages/companies/companies-filters.tsx b/front/src/pages/companies/companies-filters.tsx index ae23304d5..8273cebeb 100644 --- a/front/src/pages/companies/companies-filters.tsx +++ b/front/src/pages/companies/companies-filters.tsx @@ -2,12 +2,12 @@ import { Company } from '@/companies/interfaces/company.interface'; import { FilterConfigType } from '@/filters-and-sorts/interfaces/filters/interface'; import { SEARCH_USER_QUERY } from '@/search/services/search'; import { - IconBuilding, - IconCalendar, + IconBuildingSkyscraper, + IconCalendarEvent, IconLink, - IconMapPin, - IconSum, + IconMap, IconUser, + IconUsers, } from '@/ui/icons/index'; import { mapToUser, User } from '@/users/interfaces/user.interface'; import { QueryMode } from '~/generated/graphql'; @@ -15,7 +15,7 @@ import { QueryMode } from '~/generated/graphql'; export const nameFilter = { key: 'name', label: 'Name', - icon: , + icon: , type: 'text', operands: [ { @@ -45,7 +45,7 @@ export const nameFilter = { export const employeesFilter = { key: 'employees', label: 'Employees', - icon: , + icon: , type: 'text', operands: [ { @@ -105,7 +105,7 @@ export const urlFilter = { export const addressFilter = { key: 'address', label: 'Address', - icon: , + icon: , type: 'text', operands: [ { @@ -135,7 +135,7 @@ export const addressFilter = { export const ccreatedAtFilter = { key: 'createdAt', label: 'Created At', - icon: , + icon: , type: 'date', operands: [ { diff --git a/front/src/pages/companies/companies-sorts.tsx b/front/src/pages/companies/companies-sorts.tsx index e61fba769..80187dd6f 100644 --- a/front/src/pages/companies/companies-sorts.tsx +++ b/front/src/pages/companies/companies-sorts.tsx @@ -1,10 +1,10 @@ import { SortType } from '@/filters-and-sorts/interfaces/sorts/interface'; import { - IconBuilding, - IconCalendar, + IconBuildingSkyscraper, + IconCalendarEvent, IconLink, - IconMapPin, - IconSum, + IconMap, + IconUsers, } from '@/ui/icons/index'; import { CompanyOrderByWithRelationInput as Companies_Order_By } from '~/generated/graphql'; @@ -12,13 +12,13 @@ export const availableSorts = [ { key: 'name', label: 'Name', - icon: , + icon: , _type: 'default_sort', }, { key: 'employees', label: 'Employees', - icon: , + icon: , _type: 'default_sort', }, { @@ -30,13 +30,13 @@ export const availableSorts = [ { key: 'address', label: 'Address', - icon: , + icon: , _type: 'default_sort', }, { key: 'createdAt', label: 'Creation', - icon: , + icon: , _type: 'default_sort', }, ] satisfies Array>; diff --git a/front/src/pages/opportunities/Opportunities.tsx b/front/src/pages/opportunities/Opportunities.tsx index 899450876..dcc750ed6 100644 --- a/front/src/pages/opportunities/Opportunities.tsx +++ b/front/src/pages/opportunities/Opportunities.tsx @@ -1,4 +1,4 @@ -import { IconTarget } from '@/ui/icons/index'; +import { IconTargetArrow } from '@/ui/icons/index'; import { WithTopBarContainer } from '@/ui/layout/containers/WithTopBarContainer'; import { AppPage } from '~/AppPage'; @@ -14,7 +14,7 @@ export function Opportunities() { return
Initial board or items not found
; return ( - }> + }> diff --git a/front/src/pages/people/people-columns.tsx b/front/src/pages/people/people-columns.tsx index 39ffea044..8d7f2c8d5 100644 --- a/front/src/pages/people/people-columns.tsx +++ b/front/src/pages/people/people-columns.tsx @@ -10,10 +10,10 @@ import { EditablePhone } from '@/ui/components/editable-cell/types/EditablePhone import { EditableText } from '@/ui/components/editable-cell/types/EditableText'; import { ColumnHead } from '@/ui/components/table/ColumnHead'; import { - IconBuilding, - IconCalendar, + IconBuildingSkyscraper, + IconCalendarEvent, IconMail, - IconMapPin, + IconMap, IconPhone, IconUser, } from '@/ui/icons/index'; @@ -65,7 +65,7 @@ export const usePeopleColumns = () => { header: () => ( } + viewIcon={} /> ), cell: (props) => , @@ -92,7 +92,7 @@ export const usePeopleColumns = () => { header: () => ( } + viewIcon={} /> ), cell: (props) => ( @@ -109,7 +109,7 @@ export const usePeopleColumns = () => { }), columnHelper.accessor('city', { header: () => ( - } /> + } /> ), cell: (props) => ( , + icon: , type: 'relation', searchConfig: { query: SEARCH_COMPANY_QUERY, @@ -165,7 +165,7 @@ export const phoneFilter = { export const createdAtFilter = { key: 'createdAt', label: 'Created At', - icon: , + icon: , type: 'date', operands: [ { @@ -192,7 +192,7 @@ export const createdAtFilter = { export const cityFilter = { key: 'city', label: 'City', - icon: , + icon: , type: 'text', operands: [ { diff --git a/front/src/pages/people/people-sorts.tsx b/front/src/pages/people/people-sorts.tsx index 2052ebf0a..51fa0a2e0 100644 --- a/front/src/pages/people/people-sorts.tsx +++ b/front/src/pages/people/people-sorts.tsx @@ -1,9 +1,9 @@ import { SortType } from '@/filters-and-sorts/interfaces/sorts/interface'; import { - IconBuilding, - IconCalendar, + IconBuildingSkyscraper, + IconCalendarEvent, IconMail, - IconMapPin, + IconMap, IconPhone, IconUser, } from '@/ui/icons/index'; @@ -30,7 +30,7 @@ export const availableSorts = [ { key: 'company_name', label: 'Company', - icon: , + icon: , _type: 'custom_sort', orderByTemplates: [(order: Order_By) => ({ company: { name: order } })], }, @@ -49,13 +49,13 @@ export const availableSorts = [ { key: 'createdAt', label: 'Created at', - icon: , + icon: , _type: 'default_sort', }, { key: 'city', label: 'City', - icon: , + icon: , _type: 'default_sort', }, ] satisfies Array>;