Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make tables wider #5187

Merged
merged 2 commits into from
Nov 15, 2024
Merged

Make tables wider #5187

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7785fa7
Make tables wider
Bestem0r Nov 13, 2024
b536550
Fix spacing
Bestem0r Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 64 additions & 71 deletions app/routes/bdb/components/BdbDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,76 +447,6 @@ const BdbDetail = () => {
skeleton={showSkeleton}
/>
)}

<div>
<Flex justifyContent="space-between" alignItems="center">
<h3>Bedriftskontakter</h3>
<LinkButton href={`/bdb/${company.id}/company-contacts/add`}>
Legg til bedriftskontakt
</LinkButton>
</Flex>
{company.companyContacts?.length > 0 ? (
<Table
columns={contactsColumns}
data={company.companyContacts}
hasMore={false}
loading={showSkeleton}
/>
) : (
<EmptyState body="Ingen bedriftskontakter registrert" />
)}
</div>

<div>
<h3>Semesterstatuser</h3>
{company.semesterStatuses?.length > 0 ? (
<Table
columns={semesterColumns}
data={company.semesterStatuses}
hasMore={false}
loading={showSkeleton}
/>
) : (
<EmptyState body="Ingen semesterstatuser registrert" />
)}
</div>

<div>
<h3>Bedriftens arrangementer</h3>
{companyEvents.length > 0 ? (
<Table
columns={eventColumns}
data={companyEvents}
hasMore={showFetchMoreEvents}
loading={fetchingCompany}
/>
) : (
<EmptyState body="Ingen arrangementer registrert" />
)}
</div>

<div>
<h3>Bedriftens jobbannonser</h3>
{fetchingJoblistings && !joblistings.length ? (
<Skeleton className={joblistingStyles.joblistingItem} />
) : joblistings.length > 0 ? (
<Flex column gap="var(--spacing-sm)">
{joblistings.map((joblisting) => (
<JoblistingItem key={joblisting.id} joblisting={joblisting} />
))}
</Flex>
) : (
<EmptyState body="Ingen tidligere jobbannonser" />
)}
</div>

{company.contentTarget && (
<CommentView
contentTarget={company.contentTarget}
comments={comments}
newOnTop
/>
)}
</ContentMain>

<ContentSidebar>
Expand All @@ -535,7 +465,6 @@ const BdbDetail = () => {
<TextWithIcon
key={info.text}
iconName={info.icon}
className={styles.companyInfo}
content={
info.link ? (
<a href={info.text}>{company.name}</a>
Expand All @@ -548,6 +477,70 @@ const BdbDetail = () => {
)}
</ContentSidebar>
</ContentSection>

<Flex column gap="var(--spacing-md)" margin="var(--spacing-md) 0 0 0">
<Flex justifyContent="space-between" alignItems="center">
<h3>Bedriftskontakter</h3>
<LinkButton href={`/bdb/${company.id}/company-contacts/add`}>
Legg til bedriftskontakt
</LinkButton>
</Flex>
{company.companyContacts?.length > 0 ? (
<Table
columns={contactsColumns}
data={company.companyContacts}
hasMore={false}
loading={showSkeleton}
/>
) : (
<EmptyState body="Ingen bedriftskontakter registrert" />
)}

<h3>Semesterstatuser</h3>
{company.semesterStatuses?.length > 0 ? (
<Table
columns={semesterColumns}
data={company.semesterStatuses}
hasMore={false}
loading={showSkeleton}
/>
) : (
<EmptyState body="Ingen semesterstatuser registrert" />
)}
Bestem0r marked this conversation as resolved.
Show resolved Hide resolved

<h3>Bedriftens arrangementer</h3>
{companyEvents.length > 0 ? (
<Table
columns={eventColumns}
data={companyEvents}
hasMore={showFetchMoreEvents}
loading={fetchingCompany}
/>
) : (
<EmptyState body="Ingen arrangementer registrert" />
)}

<h3>Bedriftens jobbannonser</h3>
{fetchingJoblistings && !joblistings.length ? (
<Skeleton className={joblistingStyles.joblistingItem} />
) : joblistings.length > 0 ? (
<Flex column gap="var(--spacing-sm)">
{joblistings.map((joblisting) => (
<JoblistingItem key={joblisting.id} joblisting={joblisting} />
))}
</Flex>
) : (
<EmptyState body="Ingen tidligere jobbannonser" />
)}

{company.contentTarget && (
<CommentView
contentTarget={company.contentTarget}
comments={comments}
newOnTop
/>
)}
</Flex>
</Page>
);
};
Expand Down
Loading