Skip to content
Open
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
Empty file added git
Empty file.
11 changes: 11 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 40 additions & 8 deletions src/generated/branches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import type { BranchData } from "../types";

const data: BranchData = {
"generatedAt": "2026-05-26T11:17:34.307Z",
"currentBranch": "stars-green-johnny-update-team3-chanaMoshayev",
"generatedAt": "2026-05-27T08:00:52.317Z",
"currentBranch": "avigail_jobke",
"mainBranch": "master",
"branches": [
{
Expand Down Expand Up @@ -126,6 +126,14 @@ const data: BranchData = {
"isMergedIntoParent": false,
"isCurrent": false
},
{
"name": "avigail_jobke",
"parentBranch": "master",
"shortHash": "1be8974",
"lastCommitMessage": "Merge stars-green-johnny-update-team3 and resolve conflicts",
"isMergedIntoParent": false,
"isCurrent": true
},
{
"name": "ayala-joke2",
"parentBranch": null,
Expand All @@ -142,6 +150,14 @@ const data: BranchData = {
"isMergedIntoParent": false,
"isCurrent": false
},
{
"name": "ayala-samson",
"parentBranch": null,
"shortHash": "",
"lastCommitMessage": "",
"isMergedIntoParent": false,
"isCurrent": false
},
{
"name": "hadar-gerafi",
"parentBranch": null,
Expand Down Expand Up @@ -310,6 +326,14 @@ const data: BranchData = {
"isMergedIntoParent": false,
"isCurrent": false
},
{
"name": "ruth_jokes",
"parentBranch": null,
"shortHash": "",
"lastCommitMessage": "",
"isMergedIntoParent": false,
"isCurrent": false
},
{
"name": "shani",
"parentBranch": null,
Expand Down Expand Up @@ -478,6 +502,14 @@ const data: BranchData = {
"isMergedIntoParent": false,
"isCurrent": false
},
{
"name": "sola_sola3_yehudit",
"parentBranch": null,
"shortHash": "",
"lastCommitMessage": "",
"isMergedIntoParent": false,
"isCurrent": false
},
{
"name": "stars",
"parentBranch": null,
Expand Down Expand Up @@ -553,8 +585,8 @@ const data: BranchData = {
{
"name": "stars-green-johnny-update-team3",
"parentBranch": null,
"shortHash": "0c10217",
"lastCommitMessage": "fix: instructions branch names",
"shortHash": "",
"lastCommitMessage": "",
"isMergedIntoParent": false,
"isCurrent": false
},
Expand All @@ -568,11 +600,11 @@ const data: BranchData = {
},
{
"name": "stars-green-johnny-update-team3-chanaMoshayev",
"parentBranch": "master",
"shortHash": "b000af7",
"lastCommitMessage": "chana: update dev script and generated branches",
"parentBranch": null,
"shortHash": "",
"lastCommitMessage": "",
"isMergedIntoParent": false,
"isCurrent": true
"isCurrent": false
},
{
"name": "stars-green-jonny-update-miryam-dahari",
Expand Down
11 changes: 11 additions & 0 deletions src/students/Avigail/Card.tsx
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 avigailCard({ 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>
);
}
33 changes: 33 additions & 0 deletions src/students/Avigail/JokePage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import styles from "./styles.module.css";
import { PageProps } from "../../types";

export default function avigailJokePage({ onBack }: PageProps) {
return (
<div className={`joke-page ${styles.jokePage}`}>
<p> החתול המדבר</p>
<p>ילד נכנס לחנות חיות ושואל:
"יש לכם חתול שמדבר?"

המוכר מצביע על חתול בפינה.

הילד מתקרב ושואל:
"אתה באמת יודע לדבר?"

החתול עונה:
"ברור. אפילו עבדתי פעם כסוכן חשאי."

הילד המופתע שואל:
"באמת?!"

החתול אומר:
"כן, טיילתי בכל העולם, האזנתי לשיחות סודיות ואף אחד לא חשד בי כי הייתי רק חתול."

הילד רץ למוכר:
"וואו! למה אתם מוכרים חתול כזה מיוחד?"

המוכר מחייך ואומר:
"כי הוא ממציא סיפורים כל היום..." 😸</p>
<button onClick={onBack}>← חזרה</button>
</div>
);
}
60 changes: 60 additions & 0 deletions src/students/Avigail/styles.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
.card {
background: #f5f0ff;
border: 2px solid #c4b5fd;
box-shadow: 0 4px 12px rgba(124, 58, 237, 0.12);
}

.card::before {
content: "🐱";
display: block;
font-size: 2rem;
margin-bottom: 0.4rem;
}

.title {
font-size: 1.2rem;
color: #5b21b6;
margin-bottom: 0.25rem;
}

.name {
font-size: 0.95rem;
color: #7c3aed;
}
.jokePage {
background: linear-gradient(160deg, #ede9fe 0%, #f5f0ff 100%);
}

.jokePage > p:first-child {
font-size: 1.35rem;
font-weight: 700;
color: #5b21b6;
}

.jokePage > p:nth-child(2) {
background: #fff;
border: 2px solid #c4b5fd;
border-radius: 16px;
padding: 1.25rem 1.5rem;
max-width: 520px;
line-height: 1.75;
color: #3b0764;
white-space: pre-line;
box-shadow: 0 6px 18px rgba(124, 58, 237, 0.12);
}

.jokePage > button {
background: #7c3aed;
color: #fff;
border: none;
border-radius: 24px;
padding: 0.65rem 1.6rem;
font-size: 1rem;
font-weight: 600;
cursor: pointer;
transition: background 0.2s;
}

.jokePage > button:hover {
background: #6d28d9;
}
25 changes: 18 additions & 7 deletions src/students/index.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
import { Student } from "../types";

import MaayanCard from "./Maayan-Babahanov/Card";
import MaayanJokePage from "./Maayan-Babahanov/JokePage";

import zehaviCard from "./zehavi-gerlitz/card";
import zehaviJokePage from "./zehavi-gerlitz/JokePage";

import DanaDuviCard from "./dana-duvi/Card";
import DanaDuviJokePage from "./dana-duvi/JokePage";

import avigailCard from "./Avigail/Card";
import avigailJokePage from "./Avigail/JokePage";

import ChaniChanzinCard from "./chani-chanzin/Card";
import ChaniChanzinJokePage from "./chani-chanzin/JokePage";

import EtiMunkCard from "./Eti-Munk/Card";
import EtiMunkJokePage from "./Eti-Munk/JokePage";
import ChanaMoshayevJokePage from "./chanaMoshayev/JokePage";
import chanaMoshayevCard from "./chanaMoshayev/Card";

import MaayanCard from "./Maayan-Babahanov/Card";
import MaayanJokePage from "./Maayan-Babahanov/JokePage";

import zehaviJokePage from "./zehavi-gerlitz/JokePage";
import zehaviCard from "./zehavi-gerlitz/card";
import chanaMoshayevCard from "./chanaMoshayev/Card";
import ChanaMoshayevJokePage from "./chanaMoshayev/JokePage";

// ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה.
// כל תלמידה מוסיפה את עצמה במקום הנכון ידנית.
Expand All @@ -42,6 +46,13 @@ const students: Student[] = [
CardComponent: DanaDuviCard,
JokePageComponent: DanaDuviJokePage,
},
{
id: "avigail-hagoli",
name: "אביגיל חגולי",
jokeTitle: "החתול המדבר",
CardComponent: avigailCard,
JokePageComponent: avigailJokePage,
},
{
id: "chani-chanzin",
name: "חני חנזין",
Expand Down