Skip to content

add yael malka code #35

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

Open
YaelMalka wants to merge 2 commits into
base: Vcomm_2
Choose a base branch
from
Open

add yael malka code #35

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
6d6bca2
add yael malka code
May 25, 2026
f453e77
Merge branch 'Vcomm_2' into yael-malka-fixed
YaelMalka May 25, 2026
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
164 changes: 18 additions & 146 deletions src/generated/branches.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
}
]
};

Expand Down
10 changes: 10 additions & 0 deletions src/students/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand All @@ -28,6 +31,13 @@ const students: Student[] = [
JokePageComponent: ChaniChanzinJokePage,
},
{
id: "yael-malka",
name: "יעל מלכא",
jokeTitle: "מורה ותלמיד",
CardComponent: YaelCard,
JokePageComponent: YaelJokePage,
},
{
id: "hadar",
name: "הדר ג'ראפי",
jokeTitle: "הבדיחה המשעשעת שלי",
Expand Down
11 changes: 11 additions & 0 deletions src/students/yael-malka/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import styles from "./styles.module.css";
import { CardProps } from "../../types";

export default function YaelCard({ student, onClick }: CardProps) {
return (
<div onClick={onClick} className={`joke-card ${styles.card}`}>
<h2 className={styles.title}>{student.jokeTitle}</h2>
<p className={styles.name}>{student.name}</p>
</div>
);
}
16 changes: 16 additions & 0 deletions src/students/yael-malka/JokePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import styles from "./styles.module.css";
import { PageProps } from "../../types";

export default function YaelJokePage({ onBack }: PageProps) {
return (
<div className={`joke-page ${styles.jokePage}`}>
<p> מורה שואלת תלמיד:</p>
<p>
"אם יש לך 10 שקלים ואתה מבקש מאמא עוד 10 — כמה יש לך?"<br/>
התלמיד עונה: "10."<br/>
המורה: "אתה לא יודע חשבון?"<br/>
התלמיד: "את לא מכירה את אמא שלי..." 😄</p><br/>
<button onClick={onBack}>← חזרה</button>
</div>
);
}
Loading