Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/portfolio/skills.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function SkillCard({ skill, index, isSmallScreen }: SkillCardProps) {
className="opacity-100 px-4"
color={getChipColorForSkill(index)}
marks={getSliderMarks(skill.level, isSmallScreen)}
maxValue={4}
maxValue={5}
minValue={0}
step={1}
value={levelToIndex(skill.level)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/portfolioEditor/skills-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export function SkillsForm(props: SkillsFormProps) {
className="pb-4 px-5"
label={`Proficiency: ${newSkill.level}`}
marks={getSliderMarks(newSkill.level, isSmallScreen)}
maxValue={4}
maxValue={5}
minValue={0}
name="level"
step={1}
Expand Down Expand Up @@ -139,7 +139,7 @@ export function SkillsForm(props: SkillsFormProps) {
showSteps
className="px-4"
marks={getSliderMarks(skill.level, isMediumScreen)}
maxValue={4}
maxValue={5}
minValue={0}
step={1}
value={levelToIndex(skill.level)}
Expand Down
12 changes: 6 additions & 6 deletions src/config/site.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ export const siteConfig = {
youtube: "johndoe",
},
skills: [
{ name: "React", level: "Master" },
{ name: "TypeScript", level: "Expert" },
{ name: "Node.js", level: "Expert" },
{ name: "CSS/Tailwind", level: "Advanced" },
{ name: "UI/UX Design", level: "Intermediate" },
{ name: "GraphQL", level: "Beginner" },
{ name: "React", level: "C2" },
{ name: "TypeScript", level: "C1" },
{ name: "Node.js", level: "C1" },
{ name: "CSS/Tailwind", level: "B2" },
{ name: "UI/UX Design", level: "B1" },
{ name: "GraphQL", level: "A1" },
],
cv: [
{
Expand Down
4 changes: 2 additions & 2 deletions src/lib/use-portfolio-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function usePortfolioEditor() {
const [isLoading, setIsLoading] = useState(true);
const [newSkill, setNewSkill] = useState<Skill>({
name: "",
level: "Intermediate",
level: "B1",
});
const [saveAlert, setSaveAlert] = useState(false);
const [resetAlert, setResetAlert] = useState(false);
Expand Down Expand Up @@ -217,7 +217,7 @@ export function usePortfolioEditor() {
};
});

setNewSkill({ name: "", level: "Intermediate" });
setNewSkill({ name: "", level: "B1" });
};

const handleRemoveSkill = (index: number) => {
Expand Down
7 changes: 1 addition & 6 deletions src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ export type IconSvgProps = SVGProps<SVGSVGElement> & {
size?: number;
};

export type SkillLevel =
| "Beginner"
| "Intermediate"
| "Advanced"
| "Expert"
| "Master";
export type SkillLevel = "A1" | "A2" | "B1" | "B2" | "C1" | "C2";

export interface Skill {
name: string;
Expand Down
8 changes: 1 addition & 7 deletions src/utils/skills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@ import { useEffect, useState } from "react";

import { SkillLevel } from "@/types";

export const SKILL_LEVELS: SkillLevel[] = [
"Beginner",
"Intermediate",
"Advanced",
"Expert",
"Master",
];
export const SKILL_LEVELS: SkillLevel[] = ["A1", "A2", "B1", "B2", "C1", "C2"];

export function useIsSmallScreen(pixels: number = 500) {
const [isSmallScreen, setIsSmallScreen] = useState(false);
Expand Down
12 changes: 6 additions & 6 deletions tests/components/edit/portfolio-editor.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ const mockUsePortfolioEditor = {
reddit: "johndoe",
},
skills: [
{ name: "UI/UX Design", level: "Intermediate" },
{ name: "React", level: "Master" },
{ name: "UI/UX Design", level: "B1" },
{ name: "React", level: "C2" },
],
},
isLoading: false,
newSkill: { name: "", level: "Intermediate" },
newSkill: { name: "", level: "B1" },
useUrlForAvatar: true,
isUploadedImage: false,
saveAlert: false,
resetAlert: false,
fileAlert: false,
fileAlertMessage: "",
SKILL_LEVELS: ["Beginner", "Intermediate", "Advanced", "Expert", "Master"],
SKILL_LEVELS: ["A1", "A2", "B1", "B2", "C1", "C2"],
handleBasicInfoChange: vi.fn(),
handleFileSelect: vi.fn(),
handleSocialChange: vi.fn(),
Expand Down Expand Up @@ -90,8 +90,8 @@ describe("PortfolioEditor", () => {
reddit: "johndoe",
},
skills: [
{ name: "UI/UX Design", level: "Intermediate" },
{ name: "React", level: "Master" },
{ name: "UI/UX Design", level: "B1" },
{ name: "React", level: "C2" },
],
};
mockUsePortfolioEditor.saveAlert = false;
Expand Down
31 changes: 16 additions & 15 deletions tests/components/edit/skills-form.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@ import { Skill, SkillLevel } from "@/types";
describe("SkillsForm", () => {
const mockPortfolioData: { skills: Skill[] } = {
skills: [
{ name: "UI/UX Design", level: "Intermediate" },
{ name: "TypeScript", level: "Expert" },
{ name: "React", level: "Master" },
{ name: "UI/UX Design", level: "B1" },
{ name: "TypeScript", level: "C1" },
{ name: "React", level: "C2" },
],
};

const mockNewSkill: Skill = { name: "Vue.js", level: "Advanced" };
const mockNewSkill: Skill = { name: "Vue.js", level: "B2" };

const mockSkillLevels: SkillLevel[] = [
"Beginner",
"Intermediate",
"Advanced",
"Expert",
"Master",
"A1",
"A2",
"B1",
"B2",
"C1",
"C2",
];

const defaultProps = {
Expand Down Expand Up @@ -55,7 +56,7 @@ describe("SkillsForm", () => {
expect(screen.getByText("Add New Skill")).toBeInTheDocument();
expect(screen.getByLabelText("Skill name")).toBeInTheDocument();
expect(
screen.getAllByLabelText("Proficiency: Advanced")[0],
screen.getAllByLabelText("Proficiency: B2")[0],
).toBeInTheDocument();
expect(screen.getByText("Add Skill")).toBeInTheDocument();
});
Expand All @@ -65,7 +66,7 @@ describe("SkillsForm", () => {

expect(screen.getByDisplayValue("Vue.js")).toBeInTheDocument();
expect(
screen.getAllByLabelText("Proficiency: Advanced")[0],
screen.getAllByLabelText("Proficiency: B2")[0],
).toBeInTheDocument();
});

Expand Down Expand Up @@ -106,8 +107,8 @@ describe("SkillsForm", () => {
expect(screen.getByDisplayValue("UI/UX Design")).toBeInTheDocument();
expect(screen.getByDisplayValue("TypeScript")).toBeInTheDocument();
expect(screen.getByDisplayValue("React")).toBeInTheDocument();
expect(screen.getAllByText("Expert")[0]).toBeInTheDocument();
expect(screen.getAllByText("Master")[0]).toBeInTheDocument();
expect(screen.getAllByText("C1")[0]).toBeInTheDocument();
expect(screen.getAllByText("C2")[0]).toBeInTheDocument();
});

it("calls onSkillNameChange when existing skill name is changed", () => {
Expand Down Expand Up @@ -179,7 +180,7 @@ describe("SkillsForm", () => {
const levelInput = screen.getAllByRole("slider")[0];
expect(levelInput).toHaveAttribute("type", "range");
expect(levelInput).toHaveAttribute("min", "0");
expect(levelInput).toHaveAttribute("max", "4");
expect(levelInput).toHaveAttribute("max", "5");
});

it("renders skill name input with correct attributes", () => {
Expand All @@ -197,7 +198,7 @@ describe("SkillsForm", () => {
sliders.forEach((slider) => {
expect(slider).toHaveAttribute("type", "range");
expect(slider).toHaveAttribute("min", "0");
expect(slider).toHaveAttribute("max", "4");
expect(slider).toHaveAttribute("max", "5");
});
});

Expand Down
8 changes: 4 additions & 4 deletions tests/components/edit/use-portfolio-editor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ describe("usePortfolioEditor", () => {
});
expect(result.current.newSkill).toEqual({
name: "",
level: "Intermediate",
level: "B1",
});
});

Expand Down Expand Up @@ -312,10 +312,10 @@ describe("usePortfolioEditor", () => {

// Change skill level
act(() => {
result.current.handleSkillLevelChange(0, "Master");
result.current.handleSkillLevelChange(0, "C2");
});

expect(result.current.portfolioData.skills[0].level).toBe("Master");
expect(result.current.portfolioData.skills[0].level).toBe("C2");
});

it("handles skill name change", async () => {
Expand Down Expand Up @@ -904,7 +904,7 @@ describe("usePortfolioEditor", () => {

// These should not throw errors when portfolio data is null
act(() => {
result.current.handleSkillLevelChange(0, "Intermediate");
result.current.handleSkillLevelChange(0, "B1");
});

act(() => {
Expand Down
10 changes: 5 additions & 5 deletions tests/components/portfolio/skills.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ vi.mock("@/hooks/usePortfolioData", () => ({
usePortfolioData: vi.fn(() => ({
portfolioData: {
skills: [
{ name: "UI/UX Design", level: "Intermediate" },
{ name: "TypeScript", level: "Expert" },
{ name: "React", level: "Master" },
{ name: "UI/UX Design", level: "B1" },
{ name: "TypeScript", level: "C1" },
{ name: "React", level: "C2" },
],
},
isLoading: false,
Expand All @@ -26,8 +26,8 @@ describe("Skills", () => {
expect(screen.getByText("UI/UX Design")).toBeInTheDocument();
expect(screen.getByText("TypeScript")).toBeInTheDocument();
expect(screen.getByText("React")).toBeInTheDocument();
expect(screen.getAllByText("Expert")[0]).toBeInTheDocument();
expect(screen.getAllByText("Intermediate")[0]).toBeInTheDocument();
expect(screen.getAllByText("C1")[0]).toBeInTheDocument();
expect(screen.getAllByText("B1")[0]).toBeInTheDocument();
});
});

Expand Down