From e986acf570bef7d05cc665a2ce3fa60152169471 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 10 Aug 2026 10:44:50 +0000 Subject: [PATCH 1/4] Add contact page with mail-based submission and file attachments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps client/shared and server/shared to pull in the new public /contact page (ContactPage.jsx) and the matching server POST /contact endpoint, which emails submissions to yomanet.office@gmail.com. Wires a '\''צור קשר'\'' menu item into the sidebar for logged-in users; anonymous users reach the same page via links on the login/home pages. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01RHpQm3g8f6DWciZTjNG7Fr --- client/shared | 2 +- client/src/GeneralLayout.jsx | 5 +++++ client/src/roadmapFeatures.js | 1 + server/shared | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/shared b/client/shared index 0bff0764..2ee2f8f7 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit 0bff07649f7dd76ea51932fce750666ff9deb0d0 +Subproject commit 2ee2f8f71f9aef8196f2e89b8f985f1d01846b73 diff --git a/client/src/GeneralLayout.jsx b/client/src/GeneralLayout.jsx index 81c73e7e..b588c486 100644 --- a/client/src/GeneralLayout.jsx +++ b/client/src/GeneralLayout.jsx @@ -16,6 +16,7 @@ import PercentIcon from '@mui/icons-material/PercentOutlined'; import FileUploadIcon from '@mui/icons-material/FileUploadOutlined'; import ViewListIcon from '@mui/icons-material/ViewListOutlined'; import GridOnIcon from '@mui/icons-material/GridOnOutlined'; +import ContactMailIcon from '@mui/icons-material/ContactMailOutlined'; import BaseLayout from '@shared/components/layout/Layout'; import BaseDashboard from '@shared/components/views/Dashboard'; @@ -101,6 +102,10 @@ const customMenuItems = [ isStandardView(permissions) && ( } /> ), + ({ permissions }) => + isStandardView(permissions) && ( + } /> + ), ]; const menuGroups = [ diff --git a/client/src/roadmapFeatures.js b/client/src/roadmapFeatures.js index 5ac1b34c..ab128048 100644 --- a/client/src/roadmapFeatures.js +++ b/client/src/roadmapFeatures.js @@ -27,6 +27,7 @@ export default [ { html: 'הקראת שם התלמידה ואישור לפני שמירת חיסור בדיווח נוכחות בטלפון', status: 'בוצע', statusColor: 'success' }, { html: 'הוספת אפשרות למנהלת להתקשר ולשמוע אילו מורות דיווחו נוכחות היום', status: 'בוצע', statusColor: 'success' }, { html: 'הוספת דוח המציג אילו מורות דיווחו נוכחות בתאריך נבחר', status: 'בוצע', statusColor: 'success' }, + { html: 'הוספת דף "צור קשר" לשליחת פנייה עם קבצים מצורפים', status: 'בוצע', statusColor: 'success' }, // { html: 'הגדרת תקופת זמן לפי תאריכים', status: 'בקרוב', statusColor: 'warning' }, // { html: 'הגדרת תקופת זמן לפי יום בשבוע', status: 'בוצע', statusColor: 'success' }, diff --git a/server/shared b/server/shared index 8eb4b429..561a1d7a 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit 8eb4b429a60efdf0abcb2079902a961a251f5d6d +Subproject commit 561a1d7a687ac9a6a91fb019b5013288e8b346bc From 0738b5c80833744b5c60f199a00ce61dc7a3aae9 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 10 Aug 2026 15:28:45 +0000 Subject: [PATCH 2/4] Bump client/shared for the noLayout route list refactor Internal refactor only (PUBLIC_ROUTE_PATHS extracted to utils/publicRoutes.js) - no consumer action needed. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01RHpQm3g8f6DWciZTjNG7Fr --- client/shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/shared b/client/shared index 2ee2f8f7..f508a9c9 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit 2ee2f8f71f9aef8196f2e89b8f985f1d01846b73 +Subproject commit f508a9c9e5a1401e6cbc94e6bb416a4dd9c4a4cd From 8c418ce4b28e59b12fda2041780f1c3bd037811b Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 11 Aug 2026 09:58:13 +0000 Subject: [PATCH 3/4] Bump client/shared and server/shared to merged main Points both submodules at their merged main commits (nra-client PR #38, nra-server PR #31) now that the shared contact-page/endpoint change has landed on main, instead of the feature branch. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01RHpQm3g8f6DWciZTjNG7Fr --- client/shared | 2 +- server/shared | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/shared b/client/shared index f508a9c9..fa2feeb8 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit f508a9c9e5a1401e6cbc94e6bb416a4dd9c4a4cd +Subproject commit fa2feeb8f7d0dfe44d073d0d308940f5821b341c diff --git a/server/shared b/server/shared index 561a1d7a..6cfe6fb4 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit 561a1d7a687ac9a6a91fb019b5013288e8b346bc +Subproject commit 6cfe6fb4c70655fe0544da7d2b94055f00555cf0 From 39352cf9f574b8b2cb39bd6ee23526378bffca39 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 11 Aug 2026 10:10:29 +0000 Subject: [PATCH 4/4] Grant paths-filter pull-requests:read so PR CI can list changed files dorny/paths-filter queries the GitHub API to list a PR's changed files; without pull-requests:read the default GITHUB_TOKEN gets 'Resource not accessible by integration'. dnd-management-nra's workflow already has this permissions block - mirrors it here. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01RHpQm3g8f6DWciZTjNG7Fr --- .github/workflows/run-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 46409518..123bc8e4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,6 +9,9 @@ jobs: prepare: name: Prepare changes runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: read outputs: client: ${{ steps.changes.outputs.client }} server: ${{ steps.changes.outputs.server }}