diff --git a/package.json b/package.json index 0545857..d7ac233 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "gen-branches && vite", + "dev": "npm run gen-branches && vite", "build": "tsc -b && vite build", "lint": "eslint .", "preview": "vite preview", diff --git a/src/generated/branches.ts b/src/generated/branches.ts index 7a56c3b..8645f9e 100644 --- a/src/generated/branches.ts +++ b/src/generated/branches.ts @@ -2,170 +2,42 @@ import type { BranchData } from "../types"; const data: BranchData = { - "generatedAt": "2026-04-26T22:06:42.722Z", - "currentBranch": "", + "generatedAt": "2026-05-25T08:33:12.872Z", + "currentBranch": "master", "mainBranch": "master", "branches": [ { "name": "master", "parentBranch": null, - "shortHash": "", - "lastCommitMessage": "", - "isMergedIntoParent": false, - "isCurrent": false - }, - { - "name": "diamond", - "parentBranch": "master", - "shortHash": "234", - "lastCommitMessage": "diamond", - "isMergedIntoParent": false, - "isCurrent": false - }, - { - "name": "red", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", - "isMergedIntoParent": false, - "isCurrent": false - }, - { - "name": "miri", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "miri", - "isMergedIntoParent": false, - "isCurrent": false - }, - { - "name": "roch", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", - "isMergedIntoParent": false, - "isCurrent": false - }, - { - "name": "roch", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "shortHash": "0c10217", + "lastCommitMessage": "fix: instructions branch names", "isMergedIntoParent": false, - "isCurrent": false - }, - { - "name": "avi nos", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", - "isMergedIntoParent": true, - "isCurrent": false + "isCurrent": true }, { - "name": "shia cjss s", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "stars", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "blue", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "stars-green", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "red", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "stars-green-bat-sheva-bloch", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, - "isCurrent": true - }, - { - "name": "star", - "parentBranch": "master", - "shortHash": "23454", - "lastCommitMessage": "yos", - "isMergedIntoParent": true, - "isCurrent": false - }, - { - "name": "green", - "parentBranch": "star", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, - "isCurrent": false - }, - { - "name": "tut", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, - "isCurrent": false - }, - { - "name": "brach", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, - "isCurrent": false - }, - { - "name": "yochi", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, "isCurrent": false - }, - { - "name": "sjn cjknd", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, - "isCurrent": false - }, - { - "name": "yellow", - "parentBranch": "star", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, - "isCurrent": false - }, - { - "name": "hjdf df", - "parentBranch": "yellow", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, - "isCurrent": false - }, - { - "name": "gfkj dfkn", - "parentBranch": "yellow", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, - "isCurrent": false - }, - { - "name": "fldngk df", - "parentBranch": "yellow", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, - "isCurrent": false - }, + } ] }; diff --git a/src/students/index.ts b/src/students/index.ts index 3268995..6d32e9c 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -5,10 +5,13 @@ import DanaDuviJokePage from "./dana-duvi/JokePage"; import ChaniChanzinCard from "./chani-chanzin/Card"; import ChaniChanzinJokePage from "./chani-chanzin/JokePage"; +import YaelCard from "./yael-malka/Card"; +import YaelJokePage from "./yael-malka/JokePage"; import HadarJokePage from "./hadar-jerafi/JokePage"; import HadarCard from "./hadar-jerafi/Card"; + // ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה. // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. // אסור להשתמש בפונקציית-sort! @@ -28,6 +31,13 @@ const students: Student[] = [ JokePageComponent: ChaniChanzinJokePage, }, { + id: "yael-malka", + name: "יעל מלכא", + jokeTitle: "מורה ותלמיד", + CardComponent: YaelCard, + JokePageComponent: YaelJokePage, + }, + { id: "hadar", name: "הדר ג'ראפי", jokeTitle: "הבדיחה המשעשעת שלי", diff --git a/src/students/yael-malka/Card.tsx b/src/students/yael-malka/Card.tsx new file mode 100644 index 0000000..6b78292 --- /dev/null +++ b/src/students/yael-malka/Card.tsx @@ -0,0 +1,11 @@ +import styles from "./styles.module.css"; +import { CardProps } from "../../types"; + +export default function YaelCard({ student, onClick }: CardProps) { + return ( +
{student.name}
+מורה שואלת תלמיד:
+
+"אם יש לך 10 שקלים ואתה מבקש מאמא עוד 10 — כמה יש לך?"
+התלמיד עונה: "10."
+המורה: "אתה לא יודע חשבון?"
+התלמיד: "את לא מכירה את אמא שלי..." 😄