Skip to content

Commit

Permalink
Merge branch 'dev' into 23-24-25-database-seeds
Browse files Browse the repository at this point in the history
  • Loading branch information
francisli committed Mar 7, 2024
2 parents ad3ed01 + 6e7c195 commit 6226f03
Show file tree
Hide file tree
Showing 20 changed files with 3,049 additions and 2,120 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: CI
on: [push]
jobs:
ci:
name: CI
runs-on: ubuntu-latest
container: node:20.11.0-bookworm
services:
db:
image: postgres:15.5
env:
POSTGRES_HOST_AUTH_METHOD: trust
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
steps:
- name: Check out repository code
uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- name: Set up npm cache
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
- name: Install Dependencies
run: npm ci
- name: Check Formatting
run: npm run format:check
- name: Run ESLint
run: npm run lint --workspaces
- name: Initialize database, generate Prisma client
run: cd server; npx prisma migrate reset --force
env:
DATABASE_URL: postgresql://postgres@db/app
- name: Run Tests
if: ${{ false }}
run: npm test
env:
DATABASE_URL: postgresql://postgres@db/app
1 change: 1 addition & 0 deletions client/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module.exports = {
settings: { react: { version: '18.2' } },
plugins: ['react-refresh'],
rules: {
'no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
Expand Down
37 changes: 19 additions & 18 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,37 @@
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
"build-storybook": "storybook build",
"test": ""
},
"dependencies": {
"@mantine/core": "^7.4.2",
"@mantine/hooks": "^7.4.2",
"@mantine/core": "^7.5.3",
"@mantine/hooks": "^7.5.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.3"
"react-router-dom": "^6.22.1"
},
"devDependencies": {
"@storybook/addon-essentials": "^7.6.12",
"@storybook/addon-interactions": "^7.6.12",
"@storybook/addon-links": "^7.6.12",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-interactions": "^7.6.17",
"@storybook/addon-links": "^7.6.17",
"@storybook/addon-onboarding": "^1.0.11",
"@storybook/blocks": "^7.6.12",
"@storybook/react": "^7.6.12",
"@storybook/react-vite": "^7.6.12",
"@storybook/test": "^7.6.12",
"@types/react": "^18.2.43",
"@types/react-dom": "^18.2.17",
"@vitejs/plugin-react-swc": "^3.5.0",
"eslint": "^8.55.0",
"@storybook/blocks": "^7.6.17",
"@storybook/react": "^7.6.17",
"@storybook/react-vite": "^7.6.17",
"@storybook/test": "^7.6.17",
"@types/react": "^18.2.58",
"@types/react-dom": "^18.2.19",
"@vitejs/plugin-react-swc": "^3.6.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"eslint-plugin-storybook": "^0.6.15",
"eslint-plugin-storybook": "^0.8.0",
"prop-types": "^15.8.1",
"storybook": "^7.6.12",
"storybook": "^7.6.17",
"storybook-dark-mode": "^3.0.3",
"vite": "^5.0.8"
"vite": "^5.1.4"
}
}
2 changes: 1 addition & 1 deletion client/src/stories/Page/Page.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const Page = () => {
<ul>
<li>
Use a higher-level connected component. Storybook helps you compose
such data from the "args" of child component stories
such data from the &quot;args&quot; of child component stories
</li>
<li>
Assemble data in the page component from your services. You can mock
Expand Down
Loading

0 comments on commit 6226f03

Please sign in to comment.