Merge branch 'main' into feat/issue-1161

Author: AvivAbachi

.all-contributorsrc

@@ -245,4 +245,4 @@
       "contributions": ["code"]
     }
   ]
-}
+}

.prettierignore

@@ -1,2 +1,2 @@
 **/generated/*
-README.md
+.all-contributorsrc

.stylelintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": "stylelint-config-standard-scss",
+  "extends": ["stylelint-config-standard-scss", "stylelint-prettier/recommended"],
   "ignoreFiles": [
     "node_modules/**/*",
     "dist/**/*",

README.md

@@ -1,61 +1,69 @@
 # Open bus ranking app
 
 ## Welcome!
+
 This is the official repository of the open bus (תחב"צ פתוחה / דאטאבוס) project - also known as "ShameBus".
 [link to the project](https://open-bus-map-search.hasadna.org.il/dashboard)
 
 Please feel free to submit pull requests and contribute to the project.
 For more details about contributing, see the [CONTRIBUTING.md](CONTRIBUTING.md) file.
 
 # Running the project locally
+
 An explanation how to run the project locally you can [read here](CONTRIBUTING.md#running-the-project-on-a-local-environment).
 
 ## View video (Hebrew language):
-### The video will explain you how to contribute to the project:   
+
+### The video will explain you how to contribute to the project:
+
 [![video (hebrew) about the project](https://img.youtube.com/vi/6H6jkJCVhgk/0.jpg)](https://www.youtube.com/watch?v=6H6jkJCVhgk)
 
 # Easter eggs
+
 We've hidden a couple of fun surprises in our web app, just for you. Discovering them is as easy as typing a few magic words on your keyboard.
 
 ## How to Find the Easter Eggs
+
 1. Open our [web app](https://open-bus-map-search.hasadna.org.il/dashboard)
 2. **Unleash the Magic Words:**
    To reveal the hidden gems, use your keyboard to type the following commands:
-
    - **Type "storybook":**
      Watch the magic unfold as you type "storybook" on your keyboard. You might just stumble upon our Storybook, a treasure trove of UI components showcasing the beauty and functionality of our app.
    - **Type "geek":**
      To get some experimental charts with some additional data and aggregation
 
-
 ## deployments
 
 This app is created by the volunteers of [Public Knowledge Workshop](https://www.hasadna.org.il/)
 
 ### submitting pull requests
+
 Thanks for your willingness to invest time and help us improve!
+
 1. If you're new to GitHub, here is a [tutorial describing Pull Requests](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request). if you're familiarized with Merge Requests - it's the same concept.
 2. Please make sure that the project works on your computer
 3. Please tag one of the maintainers as reviewers
-we're here to help! feel free to join our [Slack channel](https://join.slack.com/t/hasadna/shared_invite/zt-21qipktl1-7yF4FYJVxAqXl0wE4DlMKQ) 
+   we're here to help! feel free to join our [Slack channel](https://join.slack.com/t/hasadna/shared_invite/zt-21qipktl1-7yF4FYJVxAqXl0wE4DlMKQ)
 
 ## Links for developers
-* [figma file](https://www.figma.com/file/Plw8Uuu6U96CcX5tJyRMoW/Public-Transportation-visual-informaiton?node-id=0%3A1&t=EJCQpeg5zSbVXLUx-0)
-* [data model schema](https://github.com/hasadna/open-bus-stride-db/blob/main/DATA_MODEL.md)
-* [Slack channel](https://join.slack.com/t/hasadna/shared_invite/zt-21qipktl1-7yF4FYJVxAqXl0wE4DlMKQ)
-* [Swagger](https://open-bus-stride-api.hasadna.org.il/docs)
-* [Production](https://open-bus-map-search.hasadna.org.il/dashboard)
 
-## Related Repositories 
+- [figma file](https://www.figma.com/file/Plw8Uuu6U96CcX5tJyRMoW/Public-Transportation-visual-informaiton?node-id=0%3A1&t=EJCQpeg5zSbVXLUx-0)
+- [data model schema](https://github.com/hasadna/open-bus-stride-db/blob/main/DATA_MODEL.md)
+- [Slack channel](https://join.slack.com/t/hasadna/shared_invite/zt-21qipktl1-7yF4FYJVxAqXl0wE4DlMKQ)
+- [Swagger](https://open-bus-stride-api.hasadna.org.il/docs)
+- [Production](https://open-bus-map-search.hasadna.org.il/dashboard)
+
+## Related Repositories
+
 - the API client
 - the data API
 
 ### API client
+
 The client is a JS library that provides methods and data models. for example:  
-https://github.com/hasadna/open-bus-map-search/blob/main/src/model/busStop.ts#L4   
+https://github.com/hasadna/open-bus-map-search/blob/main/src/model/busStop.ts#L4  
 [link to repo](https://github.com/iliakap/open-bus-stride-client).
 
-
 ## Contributors
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -116,7 +124,8 @@ https://github.com/hasadna/open-bus-map-search/blob/main/src/model/busStop.ts#L4
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ### data API
+
 The API is backend code that provides us with data and aggregations from the DB
-You can see it's endpoints here:   
-https://open-bus-stride-api.hasadna.org.il/docs     
-[link to repo](https://github.com/hasadna/open-bus-stride-api).
+You can see it's endpoints here:  
+https://open-bus-stride-api.hasadna.org.il/docs  
+[link to repo](https://github.com/hasadna/open-bus-stride-api).

eslint.config.js

@@ -24,10 +24,9 @@ export default [
       'test-results',
       'playwright-report',
       'storybook-static',
+      'public',
       '.nx',
-      'jest.config.ts',
       '**/*.js',
-      'public',
       'applitools.config.cjs',
     ],
   },
@@ -41,7 +40,10 @@ export default [
     },
   },
   {
-    settings: { 'import/resolver': { typescript: true }, react: { version: 'detect' } },
+    settings: {
+      'import/resolver': { typescript: true },
+      react: { version: 'detect' },
+    },
     languageOptions: {
       parser: typescriptEslintParser,
       parserOptions: {
@@ -54,34 +56,23 @@ export default [
   },
   {
     rules: {
-      ...typescriptEslintEslintPlugin.configs.recommended.rules,
-      ...typescriptEslintEslintPlugin.configs['recommended-requiring-type-checking'].rules,
-      ...eslintPluginReact.configs.recommended.rules,
+      // React
       'react-hooks/rules-of-hooks': 'error',
       'react/jsx-filename-extension': [1, { extensions: ['.tsx'] }],
       'react/react-in-jsx-scope': 'off',
+      // TypeScript
       '@typescript-eslint/no-explicit-any': 'warn',
       '@typescript-eslint/no-unsafe-call': 'off',
       '@typescript-eslint/no-unsafe-member-access': 'off',
       '@typescript-eslint/no-floating-promises': 'off',
       '@typescript-eslint/restrict-template-expressions': 'off',
       '@typescript-eslint/no-base-to-string': 'off',
       '@typescript-eslint/no-unsafe-assignment': 'off',
+      // Import
       'import/no-unused-modules': 'error',
       'import/order': 'error',
-      'prettier/prettier': [
-        'error',
-        {
-          semi: false,
-          tabWidth: 2,
-          printWidth: 100,
-          singleQuote: true,
-          trailingComma: 'all',
-          bracketSameLine: true,
-          jsxSingleQuote: false,
-          endOfLine: 'auto',
-        },
-      ],
+      // Prettier
+      'prettier/prettier': 'error',
     },
   },
 ]

package-lock.json

@@ -7,7 +7,7 @@
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
     "@mui/icons-material": "^7.1.0",
-    "@mui/material": "^7.1.1",
+    "@mui/material": "^7.1.2",
     "@mui/x-date-pickers": "^7.29.2",
     "@mui/x-tree-view": "^8.5.1",
     "@tanstack/query-sync-storage-persister": "^5.81.2",
@@ -59,8 +59,8 @@
     "test:e2e": "cross-env APPLITOOLS_BATCH_ID=`uuidgen` playwright test",
     "test:unit": "jest",
     "test:unit:ci": "jest --coverage",
-    "lint": "eslint --max-warnings 0 && stylelint '**/*.{css,scss}' --max-warnings 0",
-    "lint:fix": "eslint --fix && stylelint '**/*.{css,scss}' --fix",
+    "lint": "eslint --max-warnings 0 && stylelint '**/*.{css,scss}' --max-warnings 0 && prettier . -c -u",
+    "lint:fix": "eslint --fix && stylelint '**/*.{css,scss}' --fix && prettier . -w -u",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "nx exec -- storybook build",
     "_build": "tsc && vite build",
@@ -126,10 +126,11 @@
     "jsdom": "^26.1.0",
     "nx": "21.0.3",
     "playwright-advanced-har": "^1.3.3",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.1",
     "storybook": "^9.0.10",
     "stylelint": "^16.20.0",
     "stylelint-config-standard-scss": "^15.0.1",
+    "stylelint-prettier": "^5.0.3",
     "ts-jest": "^29.4.0",
     "ts-node": "^10.9.2",
     "typescript-eslint": "^8.32.0",

package.json

@@ -1,19 +1,22 @@
 # MOT Complaint Maker
 
 ## NOTICE
+
 this project is still under development - it won't really send any reports to the MOT website.
 
 ## Goal
+
 After searching for specific bus in one of the pages, users might wasnt to submit a complaint about a bus:
 
-* maybe the bus came too early / too late
-* maybe it didn't stop at all
-* maybe the bus driver had a yellow T-shirt
-and so on.
+- maybe the bus came too early / too late
+- maybe it didn't stop at all
+- maybe the bus driver had a yellow T-shirt
+  and so on.
 
 anyway - we would like to make complaints submission accessible and easy, instead of the dark UX we currently have.
 
 ## usefull commands
+
 build the image - `npm run docker:build`
 run the image (won't really send anything to the MOT) - `npm run docker:run`
 see the report - `npm run view-trace`

src/complaint/README.md

@@ -15,7 +15,7 @@
   "timeline_page_title": "היסטוריית נסיעות",
   "timeline_page_description": "תצוגה של זמני עצירה בתחנות לפי חברה מפעילה, מספר קו ותחנה. השוואה בין שעת העצירה בפועל לעומת שעת העצירה המתוכננת",
   "time_based_map_page_title": "מפה לפי זמן",
-  "time_based_map_page_description": "תצוגה של מיקום כל האוטובוסים בתאריך, שעה וטווח הדקות שהוכנסו ע\"י המשתמש",
+  "time_based_map_page_description": "מיקומים של כלי תחבורה ציבורית בארץ לפי תאריך ושעה. משיקולי ביצועים, הגדרנו את ברירת המחדל של הדף ליום הפאי של 2023. מוזמנים לשחק עם התאריך והשעה ולטייל בזמן ⌛🚌",
   "gaps_page_title": "נסיעות שלא בוצעו",
   "gaps_page_description": "תצוגה של כל הנסיעות שלא יצאו כמתוכנן לפי חברה מפעילה, קו, מסלול ותאריך",
   "gaps_patterns_page_title": "דפוסי נסיעות שלא בוצעו",

src/locale/he.json

@@ -86,7 +86,6 @@ const BugReportForm = () => {
         <Form
           form={form}
           name="bug-report"
-          // eslint-disable-next-line @typescript-eslint/no-misused-promises
           onFinish={onFinish}
           onFinishFailed={onFinishFailed}
           labelCol={{ span: 6 }}

src/pages/BugReportForm .tsx

@@ -49,7 +49,6 @@ let promise: Promise<void> | null = null
 
 const useTimeout = (ms: number) => {
   if (!fulfilled) {
-    // eslint-disable-next-line @typescript-eslint/only-throw-error
     throw (promise ||= new Promise((resolve) => {
       setTimeout(() => {
         fulfilled = true

src/pages/components/Preloader.stories.tsx

@@ -112,7 +112,6 @@ export function BusToolTip({ position, icon, children }: BusToolTipProps) {
               <li>
                 {`${t('sample_time')}: `}
                 <span>
-                  {/* eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion */}
                   {dayjs(position.point!.recorded_at_time as string)
                     .tz('Israel')
                     .format(`l [${t('at_time')}] LT`)}

src/pages/components/map-related/MapLayers/BusToolTip.tsx

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import * as fs from 'fs'
 import * as path from 'path'
 import * as crypto from 'crypto'