Skip to content

Commit

Permalink
Merge branch 'dev' into 95-accept-invite
Browse files Browse the repository at this point in the history
  • Loading branch information
francisli committed Aug 15, 2024
2 parents cd13add + 35ace79 commit 795dfc9
Show file tree
Hide file tree
Showing 10 changed files with 9,355 additions and 13,060 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
ci:
name: CI
runs-on: ubuntu-latest
container: node:20.11.0-bookworm
container: node:20.16.0-bookworm
services:
db:
image: postgres:15.5
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.11.0-bookworm
FROM node:20.16.0-bookworm

# Set an env variable for the location of the app files
ENV APP_HOME=/opt/node/app
Expand Down
2 changes: 1 addition & 1 deletion client/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
settings: { react: { version: '18.2' } },
settings: { react: { version: 'detect' } },
plugins: ['react-refresh'],
rules: {
'no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
Expand Down
2 changes: 0 additions & 2 deletions client/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ const config = {
getAbsolutePath('@storybook/addon-onboarding'),
getAbsolutePath('@storybook/addon-interactions'),
getAbsolutePath('storybook-dark-mode'),
getAbsolutePath('@storybook/addon-mdx-gfm'),
getAbsolutePath('@storybook/addon-mdx-gfm'),
getAbsolutePath('@chromatic-com/storybook'),
getAbsolutePath('@storybook/addon-mdx-gfm'),
],
Expand Down
2 changes: 1 addition & 1 deletion client/.storybook/preview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const preview = {
},
},
},
tags: ['autodocs', 'autodocs'],
tags: ['autodocs'],
};

export default preview;
156 changes: 78 additions & 78 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,96 +10,96 @@
"format:check": "prettier --check --ignore-unknown .",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"storybook": "storybook dev -p 6006",
"storybook": "storybook dev -p 6006 --no-open",
"build-storybook": "storybook build",
"test": ""
},
"dependencies": {
"@mantine/core": "^7.5.3",
"@mantine/form": "^7.11.2",
"@mantine/hooks": "^7.5.3",
"@mantine/notifications": "^7.12.0",
"@tabler/core": "^1.0.0-beta20",
"@tabler/icons-react": "^3.3.0",
"@tanstack/react-query": "^5.18.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"@mantine/core": "^7.12.1",
"@mantine/form": "^7.12.1",
"@mantine/hooks": "^7.12.1",
"@mantine/notifications": "^7.12.1",
"@tabler/icons-react": "^3.12.0",
"@tanstack/react-query": "^5.51.23",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-qrcode-logo": "^3.0.0",
"react-router-dom": "^6.22.1"
"react-router-dom": "^6.26.0"
},
"devDependencies": {
"@chromatic-com/storybook": "^1.4.0",
"@storybook/addon-essentials": "^8.1.9",
"@storybook/addon-interactions": "^8.1.9",
"@storybook/addon-links": "^8.1.9",
"@storybook/addon-mdx-gfm": "^8.1.9",
"@storybook/addon-onboarding": "^8.1.9",
"@storybook/blocks": "^8.1.9",
"@storybook/react": "^8.1.9",
"@storybook/react-vite": "^8.1.9",
"@storybook/test": "^8.1.9",
"@types/react": "^18.2.58",
"@types/react-dom": "^18.2.19",
"@vitejs/plugin-react-swc": "^3.6.0",
"@chromatic-com/storybook": "^1.6.1",
"@storybook/addon-essentials": "^8.2.9",
"@storybook/addon-interactions": "^8.2.9",
"@storybook/addon-links": "^8.2.9",
"@storybook/addon-mdx-gfm": "^8.2.9",
"@storybook/addon-onboarding": "^8.2.9",
"@storybook/blocks": "^8.2.9",
"@storybook/preview-api": "^8.2.9",
"@storybook/react": "^8.2.9",
"@storybook/react-vite": "^8.2.9",
"@storybook/test": "^8.2.9",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react-swc": "^3.7.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jsdoc": "^48.2.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"eslint-plugin-jsdoc": "^50.2.2",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.9",
"eslint-plugin-storybook": "^0.8.0",
"prettier": "^3.2.4",
"prettier": "^3.3.3",
"prop-types": "^15.8.1",
"storybook": "^8.1.9",
"storybook-dark-mode": "^4.0.1",
"vite": "^5.2.8"
"storybook": "^8.2.9",
"storybook-dark-mode": "^4.0.2",
"vite": "^5.4.0"
},
"optionalDependencies": {
"@esbuild/aix-ppc64": "0.20.2",
"@esbuild/android-arm": "0.20.2",
"@esbuild/android-arm64": "0.20.2",
"@esbuild/android-x64": "0.20.2",
"@esbuild/darwin-arm64": "0.20.2",
"@esbuild/darwin-x64": "0.20.2",
"@esbuild/freebsd-arm64": "0.20.2",
"@esbuild/freebsd-x64": "0.20.2",
"@esbuild/linux-arm": "0.20.2",
"@esbuild/linux-arm64": "0.20.2",
"@esbuild/linux-ia32": "0.20.2",
"@esbuild/linux-loong64": "0.20.2",
"@esbuild/linux-mips64el": "0.20.2",
"@esbuild/linux-ppc64": "0.20.2",
"@esbuild/linux-riscv64": "0.20.2",
"@esbuild/linux-s390x": "0.20.2",
"@esbuild/linux-x64": "0.20.2",
"@esbuild/netbsd-x64": "0.20.2",
"@esbuild/openbsd-x64": "0.20.2",
"@esbuild/sunos-x64": "0.20.2",
"@esbuild/win32-arm64": "0.20.2",
"@esbuild/win32-ia32": "0.20.2",
"@esbuild/win32-x64": "0.20.2",
"@rollup/rollup-android-arm-eabi": "4.14.0",
"@rollup/rollup-android-arm64": "4.14.0",
"@rollup/rollup-darwin-arm64": "4.14.0",
"@rollup/rollup-darwin-x64": "4.14.0",
"@rollup/rollup-linux-arm-gnueabihf": "4.14.0",
"@rollup/rollup-linux-arm64-gnu": "4.14.0",
"@rollup/rollup-linux-arm64-musl": "4.14.0",
"@rollup/rollup-linux-riscv64-gnu": "4.14.0",
"@rollup/rollup-linux-x64-gnu": "4.14.0",
"@rollup/rollup-linux-x64-musl": "4.14.0",
"@rollup/rollup-win32-arm64-msvc": "4.14.0",
"@rollup/rollup-win32-ia32-msvc": "4.14.0",
"@rollup/rollup-win32-x64-msvc": "4.14.0",
"@swc/core-darwin-arm64": "1.4.2",
"@swc/core-darwin-x64": "1.4.2",
"@swc/core-linux-arm-gnueabihf": "1.4.2",
"@swc/core-linux-arm64-gnu": "1.4.2",
"@swc/core-linux-arm64-musl": "1.4.2",
"@swc/core-linux-x64-gnu": "1.4.2",
"@swc/core-linux-x64-musl": "1.4.2",
"@swc/core-win32-arm64-msvc": "1.4.2",
"@swc/core-win32-ia32-msvc": "1.4.2",
"@swc/core-win32-x64-msvc": "1.4.2"
"@esbuild/aix-ppc64": "0.23.0",
"@esbuild/android-arm": "0.23.0",
"@esbuild/android-arm64": "0.23.0",
"@esbuild/android-x64": "0.23.0",
"@esbuild/darwin-arm64": "0.23.0",
"@esbuild/darwin-x64": "0.23.0",
"@esbuild/freebsd-arm64": "0.23.0",
"@esbuild/freebsd-x64": "0.23.0",
"@esbuild/linux-arm": "0.23.0",
"@esbuild/linux-arm64": "0.23.0",
"@esbuild/linux-ia32": "0.23.0",
"@esbuild/linux-loong64": "0.23.0",
"@esbuild/linux-mips64el": "0.23.0",
"@esbuild/linux-ppc64": "0.23.0",
"@esbuild/linux-riscv64": "0.23.0",
"@esbuild/linux-s390x": "0.23.0",
"@esbuild/linux-x64": "0.23.0",
"@esbuild/netbsd-x64": "0.23.0",
"@esbuild/openbsd-x64": "0.23.0",
"@esbuild/sunos-x64": "0.23.0",
"@esbuild/win32-arm64": "0.23.0",
"@esbuild/win32-ia32": "0.23.0",
"@esbuild/win32-x64": "0.23.0",
"@rollup/rollup-android-arm-eabi": "4.20.0",
"@rollup/rollup-android-arm64": "4.20.0",
"@rollup/rollup-darwin-arm64": "4.20.0",
"@rollup/rollup-darwin-x64": "4.20.0",
"@rollup/rollup-linux-arm-gnueabihf": "4.20.0",
"@rollup/rollup-linux-arm64-gnu": "4.20.0",
"@rollup/rollup-linux-arm64-musl": "4.20.0",
"@rollup/rollup-linux-riscv64-gnu": "4.20.0",
"@rollup/rollup-linux-x64-gnu": "4.20.0",
"@rollup/rollup-linux-x64-musl": "4.20.0",
"@rollup/rollup-win32-arm64-msvc": "4.20.0",
"@rollup/rollup-win32-ia32-msvc": "4.20.0",
"@rollup/rollup-win32-x64-msvc": "4.20.0",
"@swc/core-darwin-arm64": "1.7.11",
"@swc/core-darwin-x64": "1.7.11",
"@swc/core-linux-arm-gnueabihf": "1.7.11",
"@swc/core-linux-arm64-gnu": "1.7.11",
"@swc/core-linux-arm64-musl": "1.7.11",
"@swc/core-linux-x64-gnu": "1.7.11",
"@swc/core-linux-x64-musl": "1.7.11",
"@swc/core-win32-arm64-msvc": "1.7.11",
"@swc/core-win32-ia32-msvc": "1.7.11",
"@swc/core-win32-x64-msvc": "1.7.11"
}
}
Loading

0 comments on commit 795dfc9

Please sign in to comment.