Skip to content

Commit

Permalink
Merge branch 'main' into profile_page_1
Browse files Browse the repository at this point in the history
  • Loading branch information
VSciFlight authored Nov 13, 2023
2 parents 7be1cd5 + 33e83cf commit 4d2fea3
Show file tree
Hide file tree
Showing 81 changed files with 17,252 additions and 5,891 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
"plugin:prettier/recommended",
"plugin:storybook/recommended"
],
"overrides": [],
"parser": "@typescript-eslint/parser",
Expand All @@ -23,6 +24,8 @@
"plugins": ["react", "@typescript-eslint"],
"rules": {
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unused-vars": "error",
"react/react-in-jsx-scope": "off",
"prettier/prettier": [
"error",
{
Expand Down
5 changes: 2 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Description
Please describe the suggested changes
<Please describe the suggested changes>

## screenshots
<-- paste here -->

<paste here>
36 changes: 36 additions & 0 deletions .github/workflows/clean_tree.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Test Clean Tree
on:
pull_request:
jobs:
git-clean-tree-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install
- name: make sure package.lock does not exist
run: rm -f package-lock.json
- name: Git Check Clean Tree
uses: ArkadiK94/[email protected]
with:
error-reason: 'removing package-lock.json file'
- name: Install dependencies
run: yarn
- name: Git Check Clean Tree
uses: ArkadiK94/[email protected]
with:
error-reason: 'yarn'
- name: Build
run: yarn build
- name: Git Check Clean Tree
uses: ArkadiK94/[email protected]
with:
error-reason: 'yarn build'
- name: Clean up
if: always()
run: npm uninstall -g yarn
20 changes: 12 additions & 8 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Install dependencies
run: yarn
- name: Run lint
run: yarn lint
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install
- name: Run lint
run: yarn lint
- name: find circular dependencies
run: yarn madge --extensions js,ts --circular .
78 changes: 40 additions & 38 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,47 @@ jobs:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Install dependencies
run: yarn
- name: Install Playwright Browsers
run: yarn playwright install --with-deps
- name: Run Playwright tests
run: yarn playwright test
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30\
- uses: shallwefootball/s3-upload-action@master
name: Upload report to S3
if: always()
id: s3-report
continue-on-error: true
with:
aws_key_id: ${{ secrets.AWS_KEY_ID }}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
aws_bucket: noam-gaash.co.il
source_dir: playwright-report
destination_dir: ${{ github.run_id }}/open-bus/playwright-report
- name: output link to report to the summary
if: always() && steps.s3-report.outcome == 'success'
run: echo "link to report - https://s3.amazonaws.com/noam-gaash.co.il/$GITHUB_RUN_ID/open-bus/playwright-report/index.html" >> $GITHUB_STEP_SUMMARY
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install
- name: Install Playwright Browsers
run: yarn playwright install --with-deps
- name: Run Playwright tests
run: yarn playwright test
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30\
- uses: shallwefootball/s3-upload-action@master
name: Upload report to S3
if: always()
id: s3-report
continue-on-error: true
with:
aws_key_id: ${{ secrets.AWS_KEY_ID }}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
aws_bucket: noam-gaash.co.il
source_dir: playwright-report
destination_dir: ${{ github.run_id }}/open-bus/playwright-report
- name: output link to report to the summary
if: always() && steps.s3-report.outcome == 'success'
run: echo "link to report - https://s3.amazonaws.com/noam-gaash.co.il/$GITHUB_RUN_ID/open-bus/playwright-report/index.html" >> $GITHUB_STEP_SUMMARY

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Install dependencies
run: yarn
- name: Build
run: yarn build
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Install dependencies
run: yarn
- name: Build
run: yarn build
18 changes: 10 additions & 8 deletions .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ jobs:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
- name: Install dependencies
run: yarn
- name: run the tests
run: yarn test:unit
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install
- name: run the tests
run: yarn test:unit
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,12 @@ yarn-error.log*

**/traces
**/node_modules

# yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
19 changes: 19 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import type { StorybookConfig } from '@storybook/react-vite'

const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-onboarding',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/react-vite',
options: {},
},
docs: {
autodocs: 'tag',
},
}
export default config
23 changes: 23 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import type { Preview } from '@storybook/react'
import React from 'react'

const preview: Preview = {
parameters: {
actions: { argTypesRegex: '^on[A-Z].*' },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
decorators: [
(Story) => (
<div style={{ direction: 'rtl' }}>
<Story />
</div>
),
],
}

export default preview
Loading

0 comments on commit 4d2fea3

Please sign in to comment.