From dc4bf5aa54c28d3fc02c953d28869cefd992df27 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Tue, 26 May 2026 11:12:27 +0300 Subject: [PATCH 01/25] add: shira-carmi joke --- src/students/index.ts | 9 ++ src/students/shira-carmi/Card.tsx | 11 ++ src/students/shira-carmi/JokePage.tsx | 12 ++ src/students/shira-carmi/styles.module.css | 124 +++++++++++++++++++++ 4 files changed, 156 insertions(+) create mode 100644 src/students/shira-carmi/Card.tsx create mode 100644 src/students/shira-carmi/JokePage.tsx create mode 100644 src/students/shira-carmi/styles.module.css diff --git a/src/students/index.ts b/src/students/index.ts index 5be78e7..1ba0c18 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -5,6 +5,8 @@ import DanaDuviJokePage from "./dana-duvi/JokePage"; import ChaniChanzinCard from "./chani-chanzin/Card"; import ChaniChanzinJokePage from "./chani-chanzin/JokePage"; +import ShiraCarmiCard from "./shira-carmi/Card"; +import ShiraCarmiJokePage from "./shira-carmi/JokePage"; // ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה. // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. @@ -24,6 +26,13 @@ const students: Student[] = [ CardComponent: ChaniChanzinCard, JokePageComponent: ChaniChanzinJokePage, }, + { + id: "shira-carmi", + name: "שירה כרמי", + jokeTitle: "השועל והשועלית", + CardComponent: ShiraCarmiCard, + JokePageComponent: ShiraCarmiJokePage, +}, ]; export default students; diff --git a/src/students/shira-carmi/Card.tsx b/src/students/shira-carmi/Card.tsx new file mode 100644 index 0000000..4ee84cb --- /dev/null +++ b/src/students/shira-carmi/Card.tsx @@ -0,0 +1,11 @@ +import styles from "./styles.module.css"; +import { CardProps } from "../../types"; + +export default function ShiraCarmiCard({ student, onClick }: CardProps) { + return ( +
+

{student.jokeTitle}

+

{student.name}

+
+ ); +} \ No newline at end of file diff --git a/src/students/shira-carmi/JokePage.tsx b/src/students/shira-carmi/JokePage.tsx new file mode 100644 index 0000000..cdbe7a4 --- /dev/null +++ b/src/students/shira-carmi/JokePage.tsx @@ -0,0 +1,12 @@ +import styles from "./styles.module.css"; +import { PageProps } from "../../types"; + +export default function ShiraCarmiJokePage({ onBack }: PageProps) { + return ( +
+

joke setup

+

joke punchline

+ +
+ ); +} \ No newline at end of file diff --git a/src/students/shira-carmi/styles.module.css b/src/students/shira-carmi/styles.module.css new file mode 100644 index 0000000..ef79fb3 --- /dev/null +++ b/src/students/shira-carmi/styles.module.css @@ -0,0 +1,124 @@ +/* ========================================================================== + משתני עיצוב קבועים (CSS Variables) - מאפשר לשנות צבעים בקלות בעתיד + ========================================================================== */ +:local { + --primary-color: #4f46e5; /* כחול אינדיגו מודרני */ + --primary-hover: #4338ca; /* אינדיגו כהה יותר למצב ריחוף */ + --text-dark: #1e293b; /* אפור כהה מאוד לקריאות מקסימלית */ + --text-muted: #64748b; /* אפור משני לשם הסטודנט */ + --bg-light: #f8fafc; /* רקע דף בהיר ונקי */ + --card-bg: #ffffff; /* רקע לבן נקי לכרטיסים */ + --border-color: #e2e8f0; /* גבולות עדינים */ + --shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.1); + --shadow-md: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); + --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05); +} + +/* ========================================================================== + עיצוב רכיב: ShiraCarmiCard (כרטיס הבדיחה ברשימה) + ========================================================================== */ +.card { + background-color: var(--card-bg); + border: 1px solid var(--border-color); + border-radius: 12px; + padding: 24px; + margin: 16px 0; + box-shadow: var(--shadow-sm); + cursor: pointer; + transition: transform 0.2s ease, box-shadow 0.2s ease, border-color 0.2s ease; + direction: rtl; /* מותאם לעברית, ישתנה אוטומטית לפי הטקסט */ + text-align: right; +} + +/* אפקט ריחוף מרשים ומעודן כשהעכבר מעל הכרטיס */ +.card:hover { + transform: translateY(-4px); + box-shadow: var(--shadow-lg); + border-color: var(--primary-color); +} + +/* כותרת הבדיחה (ה-h2 בכרטיס) */ +.title { + font-size: 1.25rem; + font-weight: 600; + color: var(--text-dark); + margin: 0 0 8px 0; + line-height: 1.4; +} + +/* שם הסטודנט שכתב את הבדיחה */ +.name { + font-size: 0.9rem; + color: var(--text-muted); + margin: 0; + font-weight: 500; + display: inline-block; + position: relative; +} + +/* אלמנט עיצובי קטן (קו תחתון עדין) מתחת לשם הסטודנט בריחוף */ +.card:hover .name { + color: var(--primary-color); +} + + +/* ========================================================================== + עיצוב רכיב: ShiraCarmiJokePage (דף הצגת הבדיחה המלאה) + ========================================================================== */ +.jokePage { + background-color: var(--card-bg); + border: 1px solid var(--border-color); + border-radius: 16px; + padding: 40px; + max-width: 600px; + margin: 40px auto; + box-shadow: var(--shadow-md); + text-align: center; + direction: rtl; +} + +/* עיצוב הפסקה של ה-Setup (החלק הראשון של הבדיחה) */ +.jokePage p:first-of-type { + font-size: 1.5rem; + font-weight: 600; + color: var(--text-dark); + margin-bottom: 24px; + line-height: 1.5; +} + +/* עיצוב הפסקה של ה-Punchline (הפואנטה) */ +.jokePage p:nth-of-type(2) { + font-size: 1.3rem; + font-weight: 500; + color: var(--primary-color); + background-color: #f5f3ff; /* רקע סגלגל עדין שמדגיש את הפואנטה */ + padding: 16px 24px; + border-radius: 8px; + margin-bottom: 32px; + display: inline-block; + border-right: 4px solid var(--primary-color); /* פס הדגשה בצד */ +} + +/* עיצוב כפתור החזרה (Back Button) */ +.jokePage button { + background-color: transparent; + color: var(--text-muted); + border: 1px solid var(--border-color); + padding: 10px 20px; + font-size: 1rem; + font-weight: 500; + border-radius: 8px; + cursor: pointer; + transition: all 0.2s ease; + display: inline-flex; + align-items: center; + gap: 8px; +} + +/* אפקט ריחוף לכפתור החזרה */ +.jokePage button:hover { + background-color: #f1f5f9; + color: var(--text-dark); + border-color: var(--text-muted); + transform: translateX(2px); /* הזזה קלה ימינה באפקט החזרה */ +} \ No newline at end of file From d940bece1ed0306fb5c4abae9a403bc0252484e7 Mon Sep 17 00:00:00 2001 From: SHIFI-ZAFRANI <328518618@zzv.org.il> Date: Tue, 26 May 2026 11:14:08 +0300 Subject: [PATCH 02/25] add: Shifra joke --- src/students/Shifra-Zaafrani/Card.tsx | 11 ++ src/students/Shifra-Zaafrani/JokePage.tsx | 12 +++ .../Shifra-Zaafrani/styles.module.css | 100 ++++++++++++++++++ src/students/index.ts | 9 ++ 4 files changed, 132 insertions(+) create mode 100644 src/students/Shifra-Zaafrani/Card.tsx create mode 100644 src/students/Shifra-Zaafrani/JokePage.tsx create mode 100644 src/students/Shifra-Zaafrani/styles.module.css diff --git a/src/students/Shifra-Zaafrani/Card.tsx b/src/students/Shifra-Zaafrani/Card.tsx new file mode 100644 index 0000000..c135d4f --- /dev/null +++ b/src/students/Shifra-Zaafrani/Card.tsx @@ -0,0 +1,11 @@ +import styles from "./styles.module.css"; +import { CardProps } from "../../types"; + +export default function ShifraZaafraniCard({ student, onClick }: CardProps) { + return ( +
+

{student.jokeTitle}

+

{student.name}

+
+ ); +} \ No newline at end of file diff --git a/src/students/Shifra-Zaafrani/JokePage.tsx b/src/students/Shifra-Zaafrani/JokePage.tsx new file mode 100644 index 0000000..f6ef49e --- /dev/null +++ b/src/students/Shifra-Zaafrani/JokePage.tsx @@ -0,0 +1,12 @@ +import styles from "./styles.module.css"; +import { PageProps } from "../../types"; + +export default function ShifraZaafraniJokePage({ onBack }: PageProps) { + return ( +
+

joke setup

+

joke punchline

+ +
+ ); +} \ No newline at end of file diff --git a/src/students/Shifra-Zaafrani/styles.module.css b/src/students/Shifra-Zaafrani/styles.module.css new file mode 100644 index 0000000..a72c7d0 --- /dev/null +++ b/src/students/Shifra-Zaafrani/styles.module.css @@ -0,0 +1,100 @@ +:root { + --bg: #141e30; + --bg-secondary: #1f2a44; + --text: #f3f7ff; + --accent: #ffb347; + --accent-strong: #ff7a18; + --border: rgba(255, 255, 255, 0.15); +} + +.container { + max-width: 1100px; + margin: 0 auto; + padding: 32px; + background: linear-gradient(135deg, rgba(20, 30, 48, 0.95), rgba(31, 42, 68, 0.95)); + color: var(--text); + border-radius: 24px; + box-shadow: 0 24px 60px rgba(0, 0, 0, 0.28); +} + +.header { + font-size: clamp(2rem, 1.8rem + 1vw, 3rem); + font-weight: 700; + margin-bottom: 24px; + text-align: center; + letter-spacing: 0.03em; + text-transform: uppercase; + color: #f9fafc; +} + +.description { + max-width: 720px; + margin: 0 auto 32px; + line-height: 1.8; + color: #dbe6ff; + text-align: center; +} + +.grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(240px, 1fr)); + gap: 20px; +} + +.card { + background: rgba(255, 255, 255, 0.08); + border: 1px solid var(--border); + padding: 24px; + border-radius: 20px; + backdrop-filter: blur(12px); + transition: transform 0.25s ease, box-shadow 0.25s ease; +} + +.card:hover { + transform: translateY(-6px); + box-shadow: 0 22px 40px rgba(0, 0, 0, 0.24); +} + +.card-title { + font-size: 1.4rem; + margin-bottom: 12px; + font-weight: 700; + color: #ffffff; +} + +.card-text { + font-size: 1rem; + line-height: 1.7; + color: #c8d5ff; +} + +.button { + display: inline-flex; + align-items: center; + justify-content: center; + padding: 12px 28px; + margin-top: 18px; + background: linear-gradient(135deg, var(--accent), var(--accent-strong)); + color: #111827; + border: none; + border-radius: 999px; + text-decoration: none; + font-weight: 700; + transition: transform 0.2s ease, opacity 0.2s ease; +} + +.button:hover { + transform: translateY(-2px); + opacity: 0.95; +} + +.highlight { + color: var(--accent); +} + +.footer { + margin-top: 32px; + text-align: center; + color: #9fb4db; + font-size: 0.95rem; +} diff --git a/src/students/index.ts b/src/students/index.ts index 5be78e7..f382fab 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -5,6 +5,8 @@ import DanaDuviJokePage from "./dana-duvi/JokePage"; import ChaniChanzinCard from "./chani-chanzin/Card"; import ChaniChanzinJokePage from "./chani-chanzin/JokePage"; +import ShifraZaafraniCard from "./Shifra-Zaafrani/Card"; +import ShifraZaafraniJokePage from "./Shifra-Zaafrani/JokePage"; // ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה. // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. @@ -24,6 +26,13 @@ const students: Student[] = [ CardComponent: ChaniChanzinCard, JokePageComponent: ChaniChanzinJokePage, }, + { + id: "Shifra-Zaafrani", + name: "Shifra Zaafrani", + jokeTitle: "[Your Joke Title]", + CardComponent: ShifraZaafraniCard, + JokePageComponent: ShifraZaafraniJokePage, +}, ]; export default students; From 2aee1bb67b5d607cf0ff5c8ba2b1ce78351acd3a Mon Sep 17 00:00:00 2001 From: malka Date: Tue, 26 May 2026 11:26:20 +0300 Subject: [PATCH 03/25] add malka joke --- src/students/index.ts | 9 +++++++++ src/students/malka-gadlowitz/Card.tsx | 11 +++++++++++ src/students/malka-gadlowitz/JokePage.tsx | 12 ++++++++++++ src/students/malka-gadlowitz/styles.module.css | 1 + 4 files changed, 33 insertions(+) create mode 100644 src/students/malka-gadlowitz/Card.tsx create mode 100644 src/students/malka-gadlowitz/JokePage.tsx create mode 100644 src/students/malka-gadlowitz/styles.module.css diff --git a/src/students/index.ts b/src/students/index.ts index 5be78e7..3562f8a 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -5,6 +5,8 @@ import DanaDuviJokePage from "./dana-duvi/JokePage"; import ChaniChanzinCard from "./chani-chanzin/Card"; import ChaniChanzinJokePage from "./chani-chanzin/JokePage"; +import MalkaCard from "./malka-gadlowitz/Card"; +import MalkaJokePage from "./malka-gadlowitz/JokePage"; // ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה. // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. @@ -24,6 +26,13 @@ const students: Student[] = [ CardComponent: ChaniChanzinCard, JokePageComponent: ChaniChanzinJokePage, }, + { + id: "malka", + name: "מלכה גדלוביץ", + jokeTitle: "הבדיחה של מלכה", + CardComponent: MalkaCard, + JokePageComponent: MalkaJokePage, +}, ]; export default students; diff --git a/src/students/malka-gadlowitz/Card.tsx b/src/students/malka-gadlowitz/Card.tsx new file mode 100644 index 0000000..63acc22 --- /dev/null +++ b/src/students/malka-gadlowitz/Card.tsx @@ -0,0 +1,11 @@ +import styles from "./styles.module.css"; +import { CardProps } from "../../types"; + +export default function MalkaCard({ student, onClick }: CardProps) { + return ( +
+

{student.jokeTitle}

+

{student.name}

+
+ ); +} \ No newline at end of file diff --git a/src/students/malka-gadlowitz/JokePage.tsx b/src/students/malka-gadlowitz/JokePage.tsx new file mode 100644 index 0000000..9f9903c --- /dev/null +++ b/src/students/malka-gadlowitz/JokePage.tsx @@ -0,0 +1,12 @@ +import styles from "./styles.module.css"; +import { PageProps } from "../../types"; + +export default function MalkaJokePage({ onBack }: PageProps) { + return ( +
+

joke setup

+

joke punchline

+ +
+ ); +} \ No newline at end of file diff --git a/src/students/malka-gadlowitz/styles.module.css b/src/students/malka-gadlowitz/styles.module.css new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/students/malka-gadlowitz/styles.module.css @@ -0,0 +1 @@ + From 198b979cf61ee49d52049857ebf57004da37f37e Mon Sep 17 00:00:00 2001 From: ruti paniri Date: Tue, 26 May 2026 11:54:50 +0300 Subject: [PATCH 04/25] add: ruti-paniri joke --- src/students/index.ts | 9 + src/students/ruti-paniri/Card.tsx | 12 + src/students/ruti-paniri/JokePage.tsx | 17 ++ src/students/ruti-paniri/styles.module.css | 265 +++++++++++++++++++++ 4 files changed, 303 insertions(+) create mode 100644 src/students/ruti-paniri/Card.tsx create mode 100644 src/students/ruti-paniri/JokePage.tsx create mode 100644 src/students/ruti-paniri/styles.module.css diff --git a/src/students/index.ts b/src/students/index.ts index 5be78e7..805f1ad 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -5,6 +5,8 @@ import DanaDuviJokePage from "./dana-duvi/JokePage"; import ChaniChanzinCard from "./chani-chanzin/Card"; import ChaniChanzinJokePage from "./chani-chanzin/JokePage"; +import RutiJokePage from "./ruti-paniri/JokePage"; +import RutiCard from "./ruti-paniri/Card"; // ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה. // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. @@ -24,6 +26,13 @@ const students: Student[] = [ CardComponent: ChaniChanzinCard, JokePageComponent: ChaniChanzinJokePage, }, + { + id: "Ruti-Paniri", + name: "רותי פנירי", + jokeTitle: "המחשב העקשן", + CardComponent: RutiCard, + JokePageComponent: RutiJokePage, +}, ]; export default students; diff --git a/src/students/ruti-paniri/Card.tsx b/src/students/ruti-paniri/Card.tsx new file mode 100644 index 0000000..0898004 --- /dev/null +++ b/src/students/ruti-paniri/Card.tsx @@ -0,0 +1,12 @@ +import styles from "./styles.module.css"; +import { CardProps } from "../../types"; + +export default function RutiCard({ student, onClick }: CardProps) { + return ( +
+

{student.jokeTitle}

+

{student.name}

+ מעבר לבדיחה +
+ ); +} \ No newline at end of file diff --git a/src/students/ruti-paniri/JokePage.tsx b/src/students/ruti-paniri/JokePage.tsx new file mode 100644 index 0000000..dfb301d --- /dev/null +++ b/src/students/ruti-paniri/JokePage.tsx @@ -0,0 +1,17 @@ +import styles from "./styles.module.css"; +import { PageProps } from "../../types"; + +export default function RutiJokePage({ onBack }: PageProps) { + return ( +
+
+

המחשב העקשן

+

אדם אחד שואל את חבר שלו: "איך זה שהמחשב שלך תמיד עובד כל כך מהר?"

+

החבר עונה לו: "זה פשוט מאוד, כל פעם כשהוא מתחיל לעבוד לאט, אני מראה לו את חשבון החשמל שלי!"

+ +
+
+ ); +} \ No newline at end of file diff --git a/src/students/ruti-paniri/styles.module.css b/src/students/ruti-paniri/styles.module.css new file mode 100644 index 0000000..ee6f29b --- /dev/null +++ b/src/students/ruti-paniri/styles.module.css @@ -0,0 +1,265 @@ +.card { + background: linear-gradient(160deg, #eef7ff 0%, #cce7ff 100%); + border: 3px solid #4a90e2; + box-shadow: 0 6px 20px rgba(74, 144, 226, 0.25); + border-radius: 15px; + padding: 1.5rem; + margin: 1rem; +} + +.avatar { + font-size: 3rem; + margin-bottom: 0.5rem; +} + +.title { + font-size: 1.4rem; + color: #1a3a5a; + margin-bottom: 0.4rem; +} + +.name { + font-size: 1rem; + color: #2c5680; + margin-bottom: 1rem; +} + +.badge { + display: inline-block; + background: #4a90e2; + color: #fff; + border-radius: 20px; + padding: 0.3rem 1rem; + font-size: 0.85rem; + font-weight: bold; +} + +.jokePage { + background: linear-gradient(135deg, #e3f2fd, #bbdefb); + min-height: 100vh; + display: flex; + justify-content: center; + align-items: center; +} + +.jokeHeader { + display: flex; + flex-direction: column; + align-items: center; + gap: 0.3rem; +} + +.bigEmoji { + font-size: 5rem; +} + +.jokeCard { + background: #ffffff; + border-radius: 20px; + padding: 2rem 2.5rem; + max-width: 700px; + width: 100%; + text-align: center; + box-shadow: 0 8px 24px rgba(74, 144, 226, 0.2); + color: #1a3a5a; +} + +.jokeCard h2 { + font-size: 1.3rem; + margin-bottom: 0.6rem; +} + +.jokeCard p { + font-size: 1.4rem; + line-height: 1.6; + margin-top: 0.8rem; +} + +.backBtn { + background: #4a90e2; + color: #fff; + border: none; + border-radius: 30px; + padding: 0.7rem 2rem; + font-size: 1rem; + font-weight: bold; + cursor: pointer; + transition: background 0.3s; + margin-top: 1.5rem; +} + +.backBtn:hover { + background: #357abd; +} +.card { + background: #ffffff; + border: 2px solid #4a90e2; + border-radius: 20px; + padding: 1.5rem; + width: 300px; /* גודל קבוע לכל הכרטיסים */ + height: 200px; /* גודל קבוע לכל הכרטיסים */ + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + transition: transform 0.2s; + cursor: pointer; + box-shadow: 0 4px 10px rgba(0,0,0,0.1); +} + +.card:hover { + transform: scale(1.05); /* אפקט מגניב כשעוברים עם העכבר */ +} + +.avatar { + font-size: 3rem; /* גודל האימוג'י */ + margin-top: 0.5rem; +} +/* --- עיצוב הכרטיס המרכזי באותו סטייל של הפרויקט --- */ +.card { + background: #ffffff; + border: 2px solid #4a90e2; + border-radius: 20px; + padding: 1.5rem; + width: 300px; + height: 200px; + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + transition: all 0.3s ease; + cursor: pointer; + /* צל עדין שנותן תחושת עומק */ + box-shadow: 0 6px 12px rgba(74, 144, 226, 0.15); + position: relative; + overflow: hidden; +} + +.card:hover { + transform: translateY(-5px) scale(1.02); + box-shadow: 0 10px 20px rgba(74, 144, 226, 0.25); + border-color: #357abd; +} + +/* --- עיצוב הטקסט והתוכן --- */ +.title { + font-size: 1.3rem; + color: #1a3a5a; + margin: 0; + font-weight: 700; + text-align: center; +} + +.avatar { + font-size: 3.5rem; + margin-top: 0.5rem; +} + +.badge { + background: #eef7ff; + color: #4a90e2; + border: 1px solid #4a90e2; + border-radius: 12px; + padding: 0.4rem 1.2rem; + font-size: 0.8rem; + font-weight: bold; + text-transform: uppercase; +} + +/* --- עיצוב עמוד הבדיחה המלא --- */ +.jokePage { + background-color: #f8fbff; + min-height: 100vh; + display: flex; + justify-content: center; + align-items: center; +} + +.jokeCard { + background: #ffffff; + border-radius: 25px; + padding: 3rem; + max-width: 500px; + text-align: center; + border: 1px solid #d1e3f8; + box-shadow: 0 15px 35px rgba(74, 144, 226, 0.1); +} + +.backBtn { + background: #4a90e2; + color: #fff; + border: none; + border-radius: 25px; + padding: 0.8rem 2.5rem; + cursor: pointer; + font-weight: bold; + margin-top: 2rem; +} +.card { + background: #ffffff; + /* מסגרת עם צל פנימי עדין למראה תלת-ממדי */ + border: 2px solid #4a90e2; + border-radius: 20px; + padding: 1.5rem; + width: 300px; + height: 200px; + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + transition: all 0.4s cubic-bezier(0.175, 0.885, 0.32, 1.275); + cursor: pointer; + /* צל כפול למראה עמוק */ + box-shadow: 0 10px 20px rgba(0,0,0,0.1), 0 0 0 4px #e3f2fd; + position: relative; + overflow: hidden; +} + +/* אפקט ריחוף (Hover) מרשים */ +.card:hover { + transform: translateY(-10px) rotate(2deg); + box-shadow: 0 20px 30px rgba(74, 144, 226, 0.3); + border-color: #1a3a5a; +} + +/* הוספת "פס טכנולוגי" למעלה למראה של כרטיס משחק */ +.card::before { + content: "SYSTEM_01"; + position: absolute; + top: 10px; + left: 15px; + font-family: monospace; + font-size: 0.7rem; + color: #4a90e2; + opacity: 0.6; +} + +.title { + font-size: 1.3rem; + color: #1a3a5a; + margin-top: 15px; + font-weight: 800; + text-transform: uppercase; + letter-spacing: 1px; +} + +.avatar { + font-size: 3.5rem; + margin-top: 0.5rem; + filter: drop-shadow(0 5px 5px rgba(0,0,0,0.1)); +} + +.badge { + background: #1a3a5a; + color: #fff; + border-radius: 8px; + padding: 0.4rem 1.2rem; + font-size: 0.75rem; + font-weight: bold; + margin-bottom: 5px; + transition: background 0.3s; +} + +.card:hover .badge { + background: #4a90e2; +} From 10942bba933620d17b75c86c4ae91f926e827d48 Mon Sep 17 00:00:00 2001 From: SHIFI-ZAFRANI <328518618@zzv.org.il> Date: Tue, 26 May 2026 12:24:56 +0300 Subject: [PATCH 05/25] fix: fix joke text formatting and syntax --- src/students/Shifra-Zaafrani/JokePage.tsx | 17 ++++++++++------- src/students/index.ts | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/students/Shifra-Zaafrani/JokePage.tsx b/src/students/Shifra-Zaafrani/JokePage.tsx index f6ef49e..b46b90b 100644 --- a/src/students/Shifra-Zaafrani/JokePage.tsx +++ b/src/students/Shifra-Zaafrani/JokePage.tsx @@ -2,11 +2,14 @@ import styles from "./styles.module.css"; import { PageProps } from "../../types"; export default function ShifraZaafraniJokePage({ onBack }: PageProps) { - return ( -
-

joke setup

-

joke punchline

- -
- ); + +return ( +
+

{'איש אחד הולך ברחוב ורואה אדם יושב על המדרכה מחזיק שלט:'}

+

{'"אני קבצן, תנו לי כסף בבקשה."'}

+

{'האיש מתקרב אליו, נותן לו כסף ושואל אותו: "תגיד, למה אתה לא הולך לעבוד?"'}

+

{'הקבצן עונה לו: "אני לא יכול לעבוד, אני קבצן!"'}

+ +
+ ); } \ No newline at end of file diff --git a/src/students/index.ts b/src/students/index.ts index f382fab..0876161 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -29,7 +29,7 @@ const students: Student[] = [ { id: "Shifra-Zaafrani", name: "Shifra Zaafrani", - jokeTitle: "[Your Joke Title]", + jokeTitle: "האיש הקבצן", CardComponent: ShifraZaafraniCard, JokePageComponent: ShifraZaafraniJokePage, }, From b560d76fabea7a6e9ba1a0bac2745a08b6b9fa4f Mon Sep 17 00:00:00 2001 From: SHIFI-ZAFRANI <328518618@zzv.org.il> Date: Tue, 26 May 2026 12:32:31 +0300 Subject: [PATCH 06/25] fix: fix joke text formatting and syntax name --- src/students/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/students/index.ts b/src/students/index.ts index 0876161..6610205 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -28,7 +28,7 @@ const students: Student[] = [ }, { id: "Shifra-Zaafrani", - name: "Shifra Zaafrani", + name: "שפרה זעפרני", jokeTitle: "האיש הקבצן", CardComponent: ShifraZaafraniCard, JokePageComponent: ShifraZaafraniJokePage, From 83ec2105671435fca6895c16bb7e6eff03ebfeb1 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Tue, 26 May 2026 12:37:04 +0300 Subject: [PATCH 07/25] Update ShiraCarmiJokePage with a new joke --- package.json | 2 +- src/generated/branches.ts | 396 ++++++++++++++++++++------ src/students/shira-carmi/JokePage.tsx | 4 +- 3 files changed, 309 insertions(+), 93 deletions(-) diff --git a/package.json b/package.json index 0545857..34f69c3 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..d22ab1a 100644 --- a/src/generated/branches.ts +++ b/src/generated/branches.ts @@ -2,12 +2,180 @@ import type { BranchData } from "../types"; const data: BranchData = { - "generatedAt": "2026-04-26T22:06:42.722Z", - "currentBranch": "", + "generatedAt": "2026-05-26T07:26:53.638Z", + "currentBranch": "master", "mainBranch": "master", "branches": [ { - "name": "master", + "name": "Eti-NewJoke", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Eti-Orenbach", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Hilla_Arye", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Hilla_Arye_2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Maayan-Bukrits", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "RivkaBarashi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Shira-Shemesh", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "ShiraShemesh2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm_1", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm_2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm_3", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm_3_noaNew", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "ayala-joke2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "hadar-gerafi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "hadas-karasenti", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiter-2-RachelWeinberger", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kitera", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-1", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-1-chedvaf", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-1-efrat", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-2", "parentBranch": null, "shortHash": "", "lastCommitMessage": "", @@ -15,157 +183,205 @@ const data: BranchData = { "isCurrent": false }, { - "name": "diamond", - "parentBranch": "master", - "shortHash": "234", - "lastCommitMessage": "diamond", + "name": "kiteria-2-yehudit", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "red", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "kiteria-3", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "miri", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "miri", + "name": "kiteria-3-Ayelet", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "roch", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "kiteria-3-ester", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "roch", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "kiteria-3_RachelPanet", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "avi nos", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", - "isMergedIntoParent": true, + "name": "kiteria_chedva", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "shia cjss s", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "maayan-vecomm-1-vecomm", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "blue", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "maayan2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "red", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "master", + "parentBranch": null, + "shortHash": "0c10217", + "lastCommitMessage": "fix: instructions branch names", "isMergedIntoParent": false, "isCurrent": true }, { - "name": "star", - "parentBranch": "master", - "shortHash": "23454", - "lastCommitMessage": "yos", - "isMergedIntoParent": true, + "name": "noa_gabay", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "shani", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "shani2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "shiraGidi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "green", - "parentBranch": "star", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "stars-green-bat-sheva-bloch", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "tut", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "tamar-levi-branch", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "brach", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "team/vcomm/sub/vcomm3/noagabay", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "yochi", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "tovi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "sjn cjknd", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "vcomm/vcomm-1/ShiraShemesh", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "yellow", - "parentBranch": "star", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, + "name": "vcomm/vcomm-1/ShiraShemesh2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "hjdf df", - "parentBranch": "yellow", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, + "name": "vcomm/vcomm-1/tova", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "gfkj dfkn", - "parentBranch": "yellow", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, + "name": "vcomm/vcomm-1/tovi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "fldngk df", - "parentBranch": "yellow", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, + "name": "vcomm/vcomm-1/tovi-joke2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, + { + "name": "vcomm/vcomm3/ayalaKlein", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + } ] }; diff --git a/src/students/shira-carmi/JokePage.tsx b/src/students/shira-carmi/JokePage.tsx index cdbe7a4..b169ad1 100644 --- a/src/students/shira-carmi/JokePage.tsx +++ b/src/students/shira-carmi/JokePage.tsx @@ -4,8 +4,8 @@ import { PageProps } from "../../types"; export default function ShiraCarmiJokePage({ onBack }: PageProps) { return (
-

joke setup

-

joke punchline

+

למה מפתחים כל כך אוהבים להשתמש ב-Git?

+

כי זה המקום היחיד שבו מותר לדחוף (push) בלי לבקש סליחה!

); From 7269b05f7cd6bdc3978b03a0b1f6985b5f207906 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Tue, 26 May 2026 12:59:21 +0300 Subject: [PATCH 08/25] Update ShiraCarmiJokePage --- src/students/shira-carmi/JokePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/students/shira-carmi/JokePage.tsx b/src/students/shira-carmi/JokePage.tsx index b169ad1..b8919d2 100644 --- a/src/students/shira-carmi/JokePage.tsx +++ b/src/students/shira-carmi/JokePage.tsx @@ -4,7 +4,7 @@ import { PageProps } from "../../types"; export default function ShiraCarmiJokePage({ onBack }: PageProps) { return (
-

למה מפתחים כל כך אוהבים להשתמש ב-Git?

+

למה מפתחים כל כךg אוהבים להשתמש ב-Git?

כי זה המקום היחיד שבו מותר לדחוף (push) בלי לבקש סליחה!

From d359d06cff3ccbf51af301e6f131942a50b5e008 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Tue, 26 May 2026 13:45:20 +0300 Subject: [PATCH 09/25] add emugy --- src/students/shira-carmi/JokePage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/students/shira-carmi/JokePage.tsx b/src/students/shira-carmi/JokePage.tsx index b8919d2..6c155bd 100644 --- a/src/students/shira-carmi/JokePage.tsx +++ b/src/students/shira-carmi/JokePage.tsx @@ -6,6 +6,7 @@ export default function ShiraCarmiJokePage({ onBack }: PageProps) {

למה מפתחים כל כךg אוהבים להשתמש ב-Git?

כי זה המקום היחיד שבו מותר לדחוף (push) בלי לבקש סליחה!

+

😄

); From 885772046091ef94951ebe739e653ededc1b5cf2 Mon Sep 17 00:00:00 2001 From: SHIFI-ZAFRANI <328518618@zzv.org.il> Date: Tue, 26 May 2026 13:49:24 +0300 Subject: [PATCH 10/25] revach --- package.json | 7 +- src/generated/branches.ts | 452 +++++++++++++++++----- src/students/Shifra-Zaafrani/JokePage.tsx | 2 +- 3 files changed, 367 insertions(+), 94 deletions(-) diff --git a/package.json b/package.json index 0545857..e5c090d 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,12 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "gen-branches && vite", + + "dev": "npm run gen-branches && vite", + "gen-branches": "node scripts/gen-branches.cjs", "build": "tsc -b && vite build", "lint": "eslint .", - "preview": "vite preview", - "gen-branches": "node scripts/gen-branches.cjs" + "preview": "vite preview" }, "dependencies": { "react": "^18.3.1", diff --git a/src/generated/branches.ts b/src/generated/branches.ts index 7a56c3b..39e25b5 100644 --- a/src/generated/branches.ts +++ b/src/generated/branches.ts @@ -2,12 +2,12 @@ import type { BranchData } from "../types"; const data: BranchData = { - "generatedAt": "2026-04-26T22:06:42.722Z", - "currentBranch": "", + "generatedAt": "2026-05-26T09:22:40.749Z", + "currentBranch": "sola_sola1_shifraZ", "mainBranch": "master", "branches": [ { - "name": "master", + "name": "Eti-NewJoke", "parentBranch": null, "shortHash": "", "lastCommitMessage": "", @@ -15,157 +15,429 @@ const data: BranchData = { "isCurrent": false }, { - "name": "diamond", - "parentBranch": "master", - "shortHash": "234", - "lastCommitMessage": "diamond", + "name": "Eti-Orenbach", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "red", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "Hilla_Arye", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "miri", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "miri", + "name": "Hilla_Arye_2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "roch", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "Maayan-Bukrits", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "RivkaBarashi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "roch", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "Shira-Shemesh", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "avi nos", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", - "isMergedIntoParent": true, + "name": "ShiraShemesh2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "shia cjss s", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "Vcomm", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "blue", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "Vcomm_1", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "red", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "Vcomm_2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, - "isCurrent": true + "isCurrent": false + }, + { + "name": "Vcomm_3", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm_3_noaNew", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "ayala-joke2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "hadar-gerafi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "hadas-karasenti", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiter-2-RachelWeinberger", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kitera", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-1", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-1-chedvaf", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-1-efrat", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-2-yehudit", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-3", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-3-Ayelet", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-3-ester", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-3_RachelPanet", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false }, { - "name": "star", + "name": "kiteria_chedva", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "maayan-vecomm-1-vecomm", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "maayan2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "master", + "parentBranch": null, + "shortHash": "0c10217", + "lastCommitMessage": "fix: instructions branch names", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "noa_gabay", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "shani", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "shani2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "shiraGidi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola", + "parentBranch": null, + "shortHash": "0c10217", + "lastCommitMessage": "fix: instructions branch names", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1", + "parentBranch": null, + "shortHash": "0c10217", + "lastCommitMessage": "fix: instructions branch names", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1_malka", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1_sari", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1_shifraZ", "parentBranch": "master", - "shortHash": "23454", - "lastCommitMessage": "yos", - "isMergedIntoParent": true, + "shortHash": "d940bec", + "lastCommitMessage": "add: Shifra joke", + "isMergedIntoParent": false, + "isCurrent": true + }, + { + "name": "sola_sola2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "green", - "parentBranch": "star", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "stars", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "tut", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "stars-green", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "brach", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "stars-green-bat-sheva-bloch", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "yochi", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "stars-green-jonny-update-miryam-dahari", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "sjn cjknd", - "parentBranch": "green", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "tamar-levi-branch", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "yellow", - "parentBranch": "star", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, + "name": "team/vcomm/sub/vcomm3/noagabay", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "hjdf df", - "parentBranch": "yellow", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, + "name": "tovi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "gfkj dfkn", - "parentBranch": "yellow", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, + "name": "vcomm/vcomm-1/ShiraShemesh", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "fldngk df", - "parentBranch": "yellow", - "shortHash": "23454", - "lastCommitMessage": "yellow fkgnlfg df", - "isMergedIntoParent": true, + "name": "vcomm/vcomm-1/ShiraShemesh2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, + { + "name": "vcomm/vcomm-1/tova", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "vcomm/vcomm-1/tovi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "vcomm/vcomm-1/tovi-joke2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "vcomm/vcomm3/ayalaKlein", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + } ] }; diff --git a/src/students/Shifra-Zaafrani/JokePage.tsx b/src/students/Shifra-Zaafrani/JokePage.tsx index b46b90b..650cf8c 100644 --- a/src/students/Shifra-Zaafrani/JokePage.tsx +++ b/src/students/Shifra-Zaafrani/JokePage.tsx @@ -6,7 +6,7 @@ export default function ShifraZaafraniJokePage({ onBack }: PageProps) { return (

{'איש אחד הולך ברחוב ורואה אדם יושב על המדרכה מחזיק שלט:'}

-

{'"אני קבצן, תנו לי כסף בבקשה."'}

+

{'"אני קבצן , תנו לי כסף בבקשה."'}

{'האיש מתקרב אליו, נותן לו כסף ושואל אותו: "תגיד, למה אתה לא הולך לעבוד?"'}

{'הקבצן עונה לו: "אני לא יכול לעבוד, אני קבצן!"'}

From bcaee8e3b6a75ba269b8c5f1b08a2ac47f590927 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Tue, 26 May 2026 13:57:52 +0300 Subject: [PATCH 11/25] commit2 --- src/students/shira-carmi/JokePage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/students/shira-carmi/JokePage.tsx b/src/students/shira-carmi/JokePage.tsx index 6c155bd..37da94a 100644 --- a/src/students/shira-carmi/JokePage.tsx +++ b/src/students/shira-carmi/JokePage.tsx @@ -7,6 +7,7 @@ export default function ShiraCarmiJokePage({ onBack }: PageProps) {

למה מפתחים כל כךg אוהבים להשתמש ב-Git?

כי זה המקום היחיד שבו מותר לדחוף (push) בלי לבקש סליחה!

😄

+

מקור הבדיחה: Reddit - Programmer Humor

); From 9c55a1b00fab776e485faa4bae6c2d1034606252 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Tue, 26 May 2026 14:13:29 +0300 Subject: [PATCH 12/25] commit3 --- src/students/shira-carmi/JokePage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/students/shira-carmi/JokePage.tsx b/src/students/shira-carmi/JokePage.tsx index 37da94a..11b45d0 100644 --- a/src/students/shira-carmi/JokePage.tsx +++ b/src/students/shira-carmi/JokePage.tsx @@ -7,6 +7,7 @@ export default function ShiraCarmiJokePage({ onBack }: PageProps) {

למה מפתחים כל כךg אוהבים להשתמש ב-Git?

כי זה המקום היחיד שבו מותר לדחוף (push) בלי לבקש סליחה!

😄

+

הסבר הבדיחה: ב-Git, "push" הוא הפקודה שמשמשת לשלוח שינויים מהמערכת המקומית שלך למערכת המרכזית (repository). המילה "push" באנגלית יכולה להתפרש גם כ"דחיפה", ולכן הבדיחה משחקת על הכפילות הזו - מפתחים יכולים "לדחוף" את השינויים שלהם ל-Git בלי לחשוש מתגובה שלילית, בניגוד לדחיפה במציאות שבה אנשים עשויים להתנגד.

מקור הבדיחה: Reddit - Programmer Humor

From ffa6ea0200dc518dff8c87ec6854974c96986ac4 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Tue, 26 May 2026 14:14:33 +0300 Subject: [PATCH 13/25] commit4 --- src/students/shira-carmi/JokePage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/students/shira-carmi/JokePage.tsx b/src/students/shira-carmi/JokePage.tsx index 11b45d0..04bdd07 100644 --- a/src/students/shira-carmi/JokePage.tsx +++ b/src/students/shira-carmi/JokePage.tsx @@ -7,6 +7,7 @@ export default function ShiraCarmiJokePage({ onBack }: PageProps) {

למה מפתחים כל כךg אוהבים להשתמש ב-Git?

כי זה המקום היחיד שבו מותר לדחוף (push) בלי לבקש סליחה!

😄

+

חחחחח

הסבר הבדיחה: ב-Git, "push" הוא הפקודה שמשמשת לשלוח שינויים מהמערכת המקומית שלך למערכת המרכזית (repository). המילה "push" באנגלית יכולה להתפרש גם כ"דחיפה", ולכן הבדיחה משחקת על הכפילות הזו - מפתחים יכולים "לדחוף" את השינויים שלהם ל-Git בלי לחשוש מתגובה שלילית, בניגוד לדחיפה במציאות שבה אנשים עשויים להתנגד.

מקור הבדיחה: Reddit - Programmer Humor

From 47acaf143560ce91583353cecd8d825274cf23d5 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Tue, 26 May 2026 14:16:49 +0300 Subject: [PATCH 14/25] commit5 --- src/students/shira-carmi/JokePage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/students/shira-carmi/JokePage.tsx b/src/students/shira-carmi/JokePage.tsx index 37da94a..776ace3 100644 --- a/src/students/shira-carmi/JokePage.tsx +++ b/src/students/shira-carmi/JokePage.tsx @@ -7,6 +7,7 @@ export default function ShiraCarmiJokePage({ onBack }: PageProps) {

למה מפתחים כל כךg אוהבים להשתמש ב-Git?

כי זה המקום היחיד שבו מותר לדחוף (push) בלי לבקש סליחה!

😄

+

ממש מצחיקק

מקור הבדיחה: Reddit - Programmer Humor

From 3276b606afc9d250688343f82c9de25c807c3a07 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Tue, 26 May 2026 14:17:22 +0300 Subject: [PATCH 15/25] commit6 --- src/students/shira-carmi/JokePage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/students/shira-carmi/JokePage.tsx b/src/students/shira-carmi/JokePage.tsx index 776ace3..5079c4a 100644 --- a/src/students/shira-carmi/JokePage.tsx +++ b/src/students/shira-carmi/JokePage.tsx @@ -8,6 +8,7 @@ export default function ShiraCarmiJokePage({ onBack }: PageProps) {

כי זה המקום היחיד שבו מותר לדחוף (push) בלי לבקש סליחה!

😄

ממש מצחיקק

+

לאא נצחיק

מקור הבדיחה: Reddit - Programmer Humor

From 3fbfdaa065fa6e32a05a1c990d45232e7f1fd855 Mon Sep 17 00:00:00 2001 From: SHIFI-ZAFRANI <328518618@zzv.org.il> Date: Tue, 26 May 2026 15:42:00 +0300 Subject: [PATCH 16/25] fix: move punctuation marks inside string brackets --- src/students/Shifra-Zaafrani/JokePage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/students/Shifra-Zaafrani/JokePage.tsx b/src/students/Shifra-Zaafrani/JokePage.tsx index 650cf8c..14b63d5 100644 --- a/src/students/Shifra-Zaafrani/JokePage.tsx +++ b/src/students/Shifra-Zaafrani/JokePage.tsx @@ -6,10 +6,10 @@ export default function ShifraZaafraniJokePage({ onBack }: PageProps) { return (

{'איש אחד הולך ברחוב ורואה אדם יושב על המדרכה מחזיק שלט:'}

-

{'"אני קבצן , תנו לי כסף בבקשה."'}

+

{'"אני קבצן, תנו לי כסף בבקשה."'}

{'האיש מתקרב אליו, נותן לו כסף ושואל אותו: "תגיד, למה אתה לא הולך לעבוד?"'}

{'הקבצן עונה לו: "אני לא יכול לעבוד, אני קבצן!"'}

- ); + );git add . } \ No newline at end of file From 4e3bc3e7fb1127a4de77c1c1ba979cfe0a3894eb Mon Sep 17 00:00:00 2001 From: SHIFI-ZAFRANI <328518618@zzv.org.il> Date: Tue, 26 May 2026 15:42:33 +0300 Subject: [PATCH 17/25] fix: move punctuation marks inside string brackets1 --- src/students/Shifra-Zaafrani/JokePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/students/Shifra-Zaafrani/JokePage.tsx b/src/students/Shifra-Zaafrani/JokePage.tsx index 14b63d5..b46b90b 100644 --- a/src/students/Shifra-Zaafrani/JokePage.tsx +++ b/src/students/Shifra-Zaafrani/JokePage.tsx @@ -11,5 +11,5 @@ return (

{'הקבצן עונה לו: "אני לא יכול לעבוד, אני קבצן!"'}

- );git add . + ); } \ No newline at end of file From 6ea2ffe24ef8564170ee0f82d7dc7fa441a42452 Mon Sep 17 00:00:00 2001 From: SHIFI-ZAFRANI <328518618@zzv.org.il> Date: Tue, 26 May 2026 15:45:15 +0300 Subject: [PATCH 18/25] fix: cleanup system files to pass github actions --- package.json | 5 +- src/generated/branches.ts | 308 +++++++++++++++++++++++++++++++------- 2 files changed, 261 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 1ff9ac8..34f69c3 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,11 @@ "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" + "preview": "vite preview", + "gen-branches": "node scripts/gen-branches.cjs" }, "dependencies": { "react": "^18.3.1", diff --git a/src/generated/branches.ts b/src/generated/branches.ts index 090350f..d22ab1a 100644 --- a/src/generated/branches.ts +++ b/src/generated/branches.ts @@ -2,12 +2,140 @@ import type { BranchData } from "../types"; const data: BranchData = { - "generatedAt": "2026-04-26T22:06:42.722Z", - "currentBranch": "", + "generatedAt": "2026-05-26T07:26:53.638Z", + "currentBranch": "master", "mainBranch": "master", "branches": [ { - "name": "master", + "name": "Eti-NewJoke", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Eti-Orenbach", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Hilla_Arye", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Hilla_Arye_2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Maayan-Bukrits", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "RivkaBarashi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Shira-Shemesh", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "ShiraShemesh2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm_1", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm_2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm_3", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "Vcomm_3_noaNew", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "ayala-joke2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "hadar-gerafi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "hadas-karasenti", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiter-2-RachelWeinberger", "parentBranch": null, "shortHash": "", "lastCommitMessage": "", @@ -15,91 +143,171 @@ const data: BranchData = { "isCurrent": false }, { - "name": "diamond", - "parentBranch": "master", - "shortHash": "234", - "lastCommitMessage": "diamond", + "name": "kitera", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "red", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "kiteria-1", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "miri", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "miri", + "name": "kiteria-1-chedvaf", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "roch", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "kiteria-1-efrat", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "roch", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "kiteria-2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "avi nos", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", - "isMergedIntoParent": true, + "name": "kiteria-2-yehudit", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "shia cjss s", - "parentBranch": "red", - "shortHash": "23444", - "lastCommitMessage": "roch ", + "name": "kiteria-3", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "blue", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "kiteria-3-Ayelet", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria-3-ester", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false }, { - "name": "red", - "parentBranch": "diamond", - "shortHash": "23444", - "lastCommitMessage": "moshe", + "name": "kiteria-3_RachelPanet", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "kiteria_chedva", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "maayan-vecomm-1-vecomm", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "maayan2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "master", + "parentBranch": null, + "shortHash": "0c10217", + "lastCommitMessage": "fix: instructions branch names", "isMergedIntoParent": false, "isCurrent": true }, { - "name": "star", - "parentBranch": "master", - "shortHash": "23454", - "lastCommitMessage": "yos", - "isMergedIntoParent": true, + "name": "noa_gabay", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "shani", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "shani2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "shiraGidi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { - "name": "green", - "parentBranch": "star", - "shortHash": "23454", - "lastCommitMessage": "green", - "isMergedIntoParent": true, + "name": "stars", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-bat-sheva-bloch", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, "isCurrent": false }, { From b48d0cc390707e3581c50ec3f94705055debd7dd Mon Sep 17 00:00:00 2001 From: SHIFI-ZAFRANI <328518618@zzv.org.il> Date: Tue, 26 May 2026 16:00:25 +0300 Subject: [PATCH 19/25] fix: restore index.ts and apply correct code version --- src/generated/branches.ts | 342 +++++++++++++++++++++++++++++++++++++- src/students/index.ts | 10 +- 2 files changed, 348 insertions(+), 4 deletions(-) diff --git a/src/generated/branches.ts b/src/generated/branches.ts index d22ab1a..5dae704 100644 --- a/src/generated/branches.ts +++ b/src/generated/branches.ts @@ -2,8 +2,8 @@ import type { BranchData } from "../types"; const data: BranchData = { - "generatedAt": "2026-05-26T07:26:53.638Z", - "currentBranch": "master", + "generatedAt": "2026-05-26T12:54:20.347Z", + "currentBranch": "sola_sola1_shifraZ", "mainBranch": "master", "branches": [ { @@ -46,6 +46,14 @@ const data: BranchData = { "isMergedIntoParent": false, "isCurrent": false }, + { + "name": "MaayanBaba", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, { "name": "RivkaBarashi", "parentBranch": null, @@ -118,6 +126,22 @@ const data: BranchData = { "isMergedIntoParent": false, "isCurrent": false }, + { + "name": "ayala-oshri-stars-green-johnny-update-team1", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "ayala-samson", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, { "name": "hadar-gerafi", "parentBranch": null, @@ -134,6 +158,22 @@ const data: BranchData = { "isMergedIntoParent": false, "isCurrent": false }, + { + "name": "johnny-update-3", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "johnny-update-team3-Eti_Munk", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, { "name": "kiter-2-RachelWeinberger", "parentBranch": null, @@ -252,7 +292,55 @@ const data: BranchData = { "shortHash": "0c10217", "lastCommitMessage": "fix: instructions branch names", "isMergedIntoParent": false, - "isCurrent": true + "isCurrent": false + }, + { + "name": "mayanSJoke", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "newBSHIFRA1", + "parentBranch": null, + "shortHash": "0c10217", + "lastCommitMessage": "fix: instructions branch names", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "newNew", + "parentBranch": "new_branch_SHIFRA1", + "shortHash": "21756af", + "lastCommitMessage": "commit6", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "new_branch_SHIFRA1", + "parentBranch": "new_branch_SHIFRA3", + "shortHash": "21452fd", + "lastCommitMessage": "commit4", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "new_branch_SHIFRA2", + "parentBranch": "new_branch_SHIFRA3", + "shortHash": "21452fd", + "lastCommitMessage": "commit4", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "new_branch_SHIFRA3", + "parentBranch": "newNew", + "shortHash": "2985d97", + "lastCommitMessage": "commit5", + "isMergedIntoParent": false, + "isCurrent": false }, { "name": "noa_gabay", @@ -286,6 +374,158 @@ const data: BranchData = { "isMergedIntoParent": false, "isCurrent": false }, + { + "name": "sola", + "parentBranch": null, + "shortHash": "0c10217", + "lastCommitMessage": "fix: instructions branch names", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola3", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola4", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1", + "parentBranch": null, + "shortHash": "0c10217", + "lastCommitMessage": "fix: instructions branch names", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1_carmi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1_malka", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1_ruti", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1_sari", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola1_shifraZ", + "parentBranch": "newNew", + "shortHash": "6ea2ffe", + "lastCommitMessage": "fix: cleanup system files to pass github actions", + "isMergedIntoParent": false, + "isCurrent": true + }, + { + "name": "sola_sola2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola2-Tamar", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola2_gili", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola2_hadas", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola2_tamarD", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola2_yehudit", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola3_Efrat_Madmon", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola3_saralevin", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola3_yaeli", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "sola_sola3_yehudit", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, { "name": "stars", "parentBranch": null, @@ -310,6 +550,86 @@ const data: BranchData = { "isMergedIntoParent": false, "isCurrent": false }, + { + "name": "stars-green-johnny-update-team1", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-johnny-update-team1-Tamar", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-johnny-update-team1-Yael", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-johnny-update-team1-bracha", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-johnny-update-team2", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-johnny-update-team2-LitalShamanov", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-johnny-update-team3", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-johnny-update-team3-Zehavi", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-johnny-update-team3-chanaMoshayev", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "stars-green-jonny-update-miryam-dahari", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, { "name": "tamar-levi-branch", "parentBranch": null, @@ -381,6 +701,22 @@ const data: BranchData = { "lastCommitMessage": "", "isMergedIntoParent": false, "isCurrent": false + }, + { + "name": "yonny", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false + }, + { + "name": "yonny-update-saraRafalowitz", + "parentBranch": null, + "shortHash": "", + "lastCommitMessage": "", + "isMergedIntoParent": false, + "isCurrent": false } ] }; diff --git a/src/students/index.ts b/src/students/index.ts index 5be78e7..0ac53c9 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -5,7 +5,8 @@ import DanaDuviJokePage from "./dana-duvi/JokePage"; import ChaniChanzinCard from "./chani-chanzin/Card"; import ChaniChanzinJokePage from "./chani-chanzin/JokePage"; - +import ShifraZaafraniCard from "./Shifra-Zaafrani/Card"; +import ShifraZaafraniJokePage from "./Shifra-Zaafrani/JokePage"; // ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה. // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. // אסור להשתמש בפונקציית-sort! @@ -24,6 +25,13 @@ const students: Student[] = [ CardComponent: ChaniChanzinCard, JokePageComponent: ChaniChanzinJokePage, }, + { + id: "Shifra-Zaafrani", + name: "שפרה זעפרני", + jokeTitle: " הקבצן והאיש ברחוב", + CardComponent: ShifraZaafraniCard, + JokePageComponent: ShifraZaafraniJokePage, + }, ]; export default students; From 93d1410d064048860b5b1c331502038f30ca908a Mon Sep 17 00:00:00 2001 From: ruti paniri Date: Wed, 27 May 2026 10:36:55 +0300 Subject: [PATCH 20/25] Update index.ts with latest team changes --- src/students/index.ts | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/students/index.ts b/src/students/index.ts index 0ac53c9..67490d9 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -5,8 +5,9 @@ import DanaDuviJokePage from "./dana-duvi/JokePage"; import ChaniChanzinCard from "./chani-chanzin/Card"; import ChaniChanzinJokePage from "./chani-chanzin/JokePage"; -import ShifraZaafraniCard from "./Shifra-Zaafrani/Card"; -import ShifraZaafraniJokePage from "./Shifra-Zaafrani/JokePage"; +import RutiCard from "./ruti-paniri/Card"; +import RutiJokePage from "./ruti-paniri/JokePage"; + // ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה. // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. // אסור להשתמש בפונקציית-sort! @@ -25,13 +26,14 @@ const students: Student[] = [ CardComponent: ChaniChanzinCard, JokePageComponent: ChaniChanzinJokePage, }, - { - id: "Shifra-Zaafrani", - name: "שפרה זעפרני", - jokeTitle: " הקבצן והאיש ברחוב", - CardComponent: ShifraZaafraniCard, - JokePageComponent: ShifraZaafraniJokePage, - }, + { + id: "Ruti-Paniri", + name: "רותי פנירי", + jokeTitle: "המחשב העקשן", + CardComponent: RutiCard, + JokePageComponent: RutiJokePage, +}, + ]; export default students; From 0738e70343ccce4efeaf79135b001f0119c71ac7 Mon Sep 17 00:00:00 2001 From: shira carmi Date: Wed, 27 May 2026 11:33:21 +0300 Subject: [PATCH 21/25] Add Shira Carmi to students list --- src/students/index.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/students/index.ts b/src/students/index.ts index 67490d9..855e72b 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -5,9 +5,13 @@ import DanaDuviJokePage from "./dana-duvi/JokePage"; import ChaniChanzinCard from "./chani-chanzin/Card"; import ChaniChanzinJokePage from "./chani-chanzin/JokePage"; + import RutiCard from "./ruti-paniri/Card"; import RutiJokePage from "./ruti-paniri/JokePage"; +import ShiraCarmiJokePage from "./shira-carmi/JokePage"; +import ShiraCarmiCard from "./shira-carmi/Card"; + // ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה. // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. // אסור להשתמש בפונקציית-sort! @@ -26,6 +30,13 @@ const students: Student[] = [ CardComponent: ChaniChanzinCard, JokePageComponent: ChaniChanzinJokePage, }, + { + id: "shira-carmi", + name: "שירה כרמי", + jokeTitle: "המפתחים וה-Git", + CardComponent: ShiraCarmiCard, + JokePageComponent: ShiraCarmiJokePage, + }, { id: "Ruti-Paniri", name: "רותי פנירי", From d1e1b5a1d6837f6e423d073242a8cc136d11d6ec Mon Sep 17 00:00:00 2001 From: ruti paniri Date: Wed, 27 May 2026 12:17:52 +0300 Subject: [PATCH 22/25] =?UTF-8?q?=D7=94=D7=95=D7=A1=D7=A4=D7=AA=D7=99=20?= =?UTF-8?q?=D7=A8=D7=95=D7=95=D7=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/students/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/students/index.ts b/src/students/index.ts index 855e72b..01de9f2 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -38,7 +38,7 @@ const students: Student[] = [ JokePageComponent: ShiraCarmiJokePage, }, { - id: "Ruti-Paniri", + id: "Ruti-Paniri", name: "רותי פנירי", jokeTitle: "המחשב העקשן", CardComponent: RutiCard, From 96b32ea35fec195d4917035574a47334600507cd Mon Sep 17 00:00:00 2001 From: SHIFI-ZAFRANI <328518618@zzv.org.il> Date: Wed, 27 May 2026 12:20:39 +0300 Subject: [PATCH 23/25] Update index.ts with my details --- src/students/index.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/students/index.ts b/src/students/index.ts index 855e72b..bcdf80d 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -12,6 +12,10 @@ import RutiJokePage from "./ruti-paniri/JokePage"; import ShiraCarmiJokePage from "./shira-carmi/JokePage"; import ShiraCarmiCard from "./shira-carmi/Card"; +import ShifraZaafraniCard from "./Shifra-Zaafrani/Card"; +import ShifraZaafraniJokePage from "./Shifra-Zaafrani/JokePage"; + + // ⚠️ סדר הרשימה חייב להיות לפי סדר האלף-בית העברי לפי שם המשפחה. // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. // אסור להשתמש בפונקציית-sort! @@ -30,6 +34,14 @@ const students: Student[] = [ CardComponent: ChaniChanzinCard, JokePageComponent: ChaniChanzinJokePage, }, + { + id: "Shifra-Zaafrani", + name: "שפרה זעפרני", + jokeTitle: "הקבצן ברחוב", + CardComponent: ShifraZaafraniCard, + JokePageComponent: ShifraZaafraniJokePage, + }, + { id: "shira-carmi", name: "שירה כרמי", From 070c645920e720d2f75b77b16cd3f96e52466f16 Mon Sep 17 00:00:00 2001 From: malka Date: Thu, 28 May 2026 00:44:39 +0300 Subject: [PATCH 24/25] update --- src/students/index.ts | 2 +- src/students/malka-gadlowitz/Card.tsx | 2 +- src/students/malka-gadlowitz/JokePage.tsx | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/students/index.ts b/src/students/index.ts index 3562f8a..aeb2dbf 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -29,7 +29,7 @@ const students: Student[] = [ { id: "malka", name: "מלכה גדלוביץ", - jokeTitle: "הבדיחה של מלכה", + jokeTitle: "המתכנת והקפה", CardComponent: MalkaCard, JokePageComponent: MalkaJokePage, }, diff --git a/src/students/malka-gadlowitz/Card.tsx b/src/students/malka-gadlowitz/Card.tsx index 63acc22..b74d4ff 100644 --- a/src/students/malka-gadlowitz/Card.tsx +++ b/src/students/malka-gadlowitz/Card.tsx @@ -8,4 +8,4 @@ export default function MalkaCard({ student, onClick }: CardProps) {

{student.name}

); -} \ No newline at end of file +} diff --git a/src/students/malka-gadlowitz/JokePage.tsx b/src/students/malka-gadlowitz/JokePage.tsx index 9f9903c..05dcb67 100644 --- a/src/students/malka-gadlowitz/JokePage.tsx +++ b/src/students/malka-gadlowitz/JokePage.tsx @@ -4,8 +4,10 @@ import { PageProps } from "../../types"; export default function MalkaJokePage({ onBack }: PageProps) { return (
-

joke setup

-

joke punchline

+

למה מתכנתים שותים קפה? + כי בלי Java הם לא רצים. +

+
); From 8ad3f68c0023ce36ccc209f4fabf583b1654979f Mon Sep 17 00:00:00 2001 From: malka Date: Thu, 28 May 2026 01:47:25 +0300 Subject: [PATCH 25/25] resolve --- src/students/index.ts | 56 +++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/src/students/index.ts b/src/students/index.ts index 839af2f..d547554 100644 --- a/src/students/index.ts +++ b/src/students/index.ts @@ -22,34 +22,44 @@ import MalkaJokePage from "./malka-gadlowitz/JokePage"; // כל תלמידה מוסיפה את עצמה במקום הנכון ידנית. // אסור להשתמש בפונקציית-sort! const students: Student[] = [ + { + id: "malka-gedelovitz", + name: "מלכה גדלוביץ", + jokeTitle: "המתכנת והקפה", + CardComponent: MalkaCard, + JokePageComponent: MalkaJokePage, +}, + { + id: "dana-duvi", + name: "דנה דובי", + jokeTitle: "הדוב הפחדן", + CardComponent: DanaDuviCard, + JokePageComponent: DanaDuviJokePage, + }, { - id: "shira-carmi", - name: "שירה כרמי", - jokeTitle: "המפתחים וה-Git", - CardComponent: ShiraCarmiCard, - JokePageComponent: ShiraCarmiJokePage, + id: "Shifra-Zaafrani", + name: "שפרה זעפרני", + jokeTitle: "הקבצן ברחוב", + CardComponent: ShifraZaafraniCard, + JokePageComponent: ShifraZaafraniJokePage, }, - { + { id: "chani-chanzin", name: "חני חנזין", jokeTitle: "התנין והתנינה", CardComponent: ChaniChanzinCard, JokePageComponent: ChaniChanzinJokePage, }, - { - id: "dana-duvi", - name: "דנה דובי", - jokeTitle: "הדוב הפחדן", - CardComponent: DanaDuviCard, - JokePageComponent: DanaDuviJokePage, + { + id: "shira-carmi", + name: "שירה כרמי", + jokeTitle: "המפתחים וה-Git", + CardComponent: ShiraCarmiCard, + JokePageComponent: ShiraCarmiJokePage, }, - { - id: "malka-gedelovitz", - name: "מלכה גדלוביץ", - jokeTitle: "המתכנת והקפה", - CardComponent: MalkaCard, - JokePageComponent: MalkaJokePage, -}, + + + { id: "Ruti-Paniri", name: "רותי פנירי", @@ -57,13 +67,7 @@ const students: Student[] = [ CardComponent: RutiCard, JokePageComponent: RutiJokePage, }, - { - id: "Shifra-Zaafrani", - name: "שפרה זעפרני", - jokeTitle: "הקבצן ברחוב", - CardComponent: ShifraZaafraniCard, - JokePageComponent: ShifraZaafraniJokePage, - }, +