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

fix: employee competency and border radius #988

Merged
merged 2 commits into from
Dec 11, 2024
Merged

fix: employee competency and border radius #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9973ee3
fix: update competancy fields
mikaelbr Dec 10, 2024
eb25cb2
fix: rounded corners for employee cards
mikaelbr Dec 10, 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
5 changes: 3 additions & 2 deletions messages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@
"consultants": "consultants",
"location": "Location",
"all": "All",
"Project Management": "Project Management",
"Design": "Design",
"Utvikling": "Development",
"Administasjon": "Administration",
"Ledelse": " ",
"Prosjekt- og produktledelse": "Project and product management",
"Strategi": "Strategy",
"field": "Field",
"showMore": "Show all"
},
Expand Down
5 changes: 3 additions & 2 deletions messages/no.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@
"consultants": "konsulenter",
"location": "Lokasjon",
"all": "Alle",
"Project Management": "Prosjektledelse",
"Design": "Design",
"Utvikling": "Utvikling",
"Administasjon": "Administrasjon",
"Ledelse": "Ledelse",
"Prosjekt- og produktledelse": "Prosjekt- og produktledelse",
"Strategi": "Strategi",
"field": "Fag",
"showMore": "Vis alle"
},
Expand Down
5 changes: 3 additions & 2 deletions messages/se.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@
"consultants": "konsulter",
"location": "Kontor",
"all": "Alla",
"Project Management": "Projektledning",
"Prosjekt- og produktledelse": "Produkt- och projektledning",
"Design": "Design",
"Utvikling": "Utveckling",
"Administasjon": "Administration",
"Ledelse": "Ledelse",
"Strategi": "Strategi",
"field": "Fält",
"showMore": "Vis alla"
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/employeeCard/EmployeeCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default function EmployeeCard({
key={competence}
as="span"
>
{t(competence)}
{t.has(competence) ? t(competence) : competence}
</Text>
))
)}
Expand Down
2 changes: 2 additions & 0 deletions src/components/employeeCard/employeeCard.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@

background-color: var(--background-bg-dark);
border-radius: var(--medium, 12px);

overflow: hidden;
}
.employeeImage--dark {
background-color: var(--background-bg-light-primary);
Expand Down
5 changes: 3 additions & 2 deletions src/components/sections/employees/EmployeeList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ import { EmployeeListSkeleton } from "./EmployeeSkeleton";

const competences: Competence[] = [
"Utvikling",
"Administasjon",
"Ledelse",
"Design",
"Project Management",
"Prosjekt- og produktledelse",
"Strategi",
];

export interface EmployeesProps {
Expand Down
5 changes: 3 additions & 2 deletions src/types/employees.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ export function isChewbaccaEmployeesResponse(
}

export type Competence =
| "Project Management"
| "Design"
| "Utvikling"
| "Administasjon";
| "Prosjekt- og produktledelse"
| "Ledelse"
| "Strategi";

export interface ChewbaccaEmployee {
email?: string | null;
Expand Down
Loading