Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
database:
image: 'postgres:13'
image: 'postgres:14'
restart: 'always'
ports:
- '5432:5432'
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@
},
"devDependencies": {
"@coderscamp/eslint-plugin": "0.0.1",
"@types/jest": "27.0.1",
"@types/jest": "27.0.2",
"@types/shelljs": "0.8.9",
"@typescript-eslint/eslint-plugin": "4.31.1",
"@typescript-eslint/parser": "4.31.1",
"concurrently": "6.2.1",
"@typescript-eslint/eslint-plugin": "5.1.0",
"@typescript-eslint/parser": "5.1.0",
"concurrently": "6.3.0",
"cross-env": "7.0.3",
"del": "6.0.0",
"eslint": "7.32.0",
"eslint": "8.1.0",
"eslint-config-airbnb": "18.2.1",
"eslint-config-airbnb-typescript": "14.0.0",
"eslint-config-airbnb-typescript": "14.0.1",
"eslint-config-prettier": "8.3.0",
"eslint-config-react": "1.1.7",
"eslint-import-resolver-typescript": "2.5.0",
"eslint-plugin-import": "2.24.2",
"eslint-plugin-jest": "24.4.2",
"eslint-plugin-import": "2.25.2",
"eslint-plugin-jest": "25.2.2",
"eslint-plugin-jest-dom": "3.9.2",
"eslint-plugin-jest-formatting": "3.0.0",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-react": "7.25.2",
"eslint-plugin-react": "7.26.1",
"eslint-plugin-react-hooks": "4.2.0",
"eslint-plugin-simple-import-sort": "7.0.0",
"eslint-plugin-testing-library": "4.12.2",
"jest": "27.2.0",
"eslint-plugin-testing-library": "4.12.4",
"jest": "27.3.1",
"jest-transform-stub": "2.0.0",
"prettier": "2.4.1",
"rimraf": "3.0.2",
"serve": "12.0.1",
"shelljs": "0.8.4",
"ts-jest": "27.0.5",
"ts-node": "10.2.1",
"typescript": "4.4.3"
"ts-jest": "27.0.7",
"ts-node": "10.4.0",
"typescript": "4.4.4"
},
"packageManager": "yarn@3.0.2"
}
38 changes: 19 additions & 19 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
},
"dependencies": {
"@coderscamp/shared": "0.0.1",
"@nestjs/common": "8.0.6",
"@nestjs/core": "8.0.6",
"@nestjs/common": "8.1.1",
"@nestjs/core": "8.1.1",
"@nestjs/cqrs": "8.0.0",
"@nestjs/event-emitter": "1.0.0",
"@nestjs/jwt": "8.0.0",
"@nestjs/passport": "8.0.1",
"@nestjs/platform-express": "8.0.6",
"@nestjs/platform-express": "8.1.1",
"@nestjs/serve-static": "2.2.2",
"@nestjs/swagger": "5.0.9",
"@prisma/client": "3.0.2",
"@nestjs/swagger": "5.1.4",
"@prisma/client": "3.3.0",
"app-root-path": "3.0.0",
"class-transformer": "0.4.0",
"class-validator": "0.13.1",
Expand All @@ -39,41 +39,41 @@
"express": "4.17.1",
"leaked-handles": "5.2.0",
"lodash": "4.17.21",
"nodemailer": "6.6.3",
"passport": "0.4.1",
"nodemailer": "6.7.0",
"passport": "0.5.0",
"passport-github2": "0.1.12",
"passport-jwt": "4.0.0",
"passport-local": "1.0.0",
"puppeteer": "10.2.0",
"puppeteer": "10.4.0",
"reflect-metadata": "0.1.13",
"rxjs": "7.3.0",
"rxjs": "7.4.0",
"swagger-ui-express": "4.1.6",
"ts-retry-promise": "0.6.0",
"type-fest": "2.3.3",
"type-fest": "2.5.1",
"uuid": "8.3.2",
"yamljs": "0.3.0"
},
"devDependencies": {
"@nestjs/cli": "8.1.1",
"@nestjs/schematics": "8.0.3",
"@nestjs/testing": "8.0.6",
"@nestjs/cli": "8.1.4",
"@nestjs/schematics": "8.0.4",
"@nestjs/testing": "8.1.1",
"@types/app-root-path": "1.2.4",
"@types/cookie-parser": "1.4.2",
"@types/dotenv": "8.2.0",
"@types/express": "4.17.13",
"@types/node": "16.9.2",
"@types/node": "16.11.4",
"@types/passport-github2": "1.2.5",
"@types/passport-jwt": "3.0.6",
"@types/passport-local": "1.0.34",
"@types/supertest": "2.0.11",
"@types/uuid": "8.3.1",
"@types/yamljs": "0.2.31",
"jest-openapi": "0.14.0",
"node-mocks-http": "1.10.1",
"prisma": "3.0.2",
"jest-openapi": "0.14.1",
"node-mocks-http": "1.11.0",
"prisma": "3.3.0",
"supertest": "6.1.6",
"ts-loader": "9.2.5",
"ts-node": "10.2.1",
"ts-loader": "9.2.6",
"ts-node": "10.4.0",
"tsconfig-paths": "3.11.0",
"wait-for-expect": "3.0.2"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"invoke": "rimraf dist && tsc && node dist/cli/src/index.js"
},
"dependencies": {
"@supabase/supabase-js": "1.24.0",
"@supabase/supabase-js": "1.25.0",
"class-transformer": "0.4.0",
"class-validator": "0.13.1",
"commander": "8.2.0",
"commander": "8.3.0",
"csv-parse": "4.16.3",
"dotenv": "10.0.0",
"generate-password": "1.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@docusaurus/core": "2.0.0-beta.6",
"@docusaurus/preset-classic": "2.0.0-beta.6",
"@docusaurus/core": "2.0.0-beta.8",
"@docusaurus/preset-classic": "2.0.0-beta.8",
"@mdx-js/react": "1.6.22",
"@svgr/webpack": "5.5.0",
"clsx": "1.1.1",
Expand Down
20 changes: 10 additions & 10 deletions packages/panel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@
"dependencies": {
"@coderscamp/shared": "0.0.1",
"@coderscamp/ui": "0.0.1",
"@hookform/resolvers": "2.8.0",
"@reduxjs/toolkit": "1.6.1",
"@hookform/resolvers": "2.8.2",
"@reduxjs/toolkit": "1.6.2",
"@toast-ui/react-calendar": "1.0.5",
"axios": "0.21.4",
"axios": "0.23.0",
"class-transformer": "0.4.0",
"class-validator": "0.13.1",
"dotenv": "10.0.0",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "7.15.3",
"react-hook-form": "7.17.5",
"react-redux": "7.2.5",
"react-router-dom": "5.3.0",
"react-use": "17.3.1",
"redux-saga": "1.1.3",
"reflect-metadata": "0.1.13",
"tui-calendar": "1.14.1"
"tui-calendar": "1.15.0"
},
"devDependencies": {
"@types/react": "17.0.21",
"@types/react-dom": "17.0.9",
"@types/react-router-dom": "5.1.9",
"@types/react": "17.0.31",
"@types/react-dom": "17.0.10",
"@types/react-router-dom": "5.3.1",
"@vitejs/plugin-react-refresh": "1.3.6",
"msw": "0.35.0",
"vite": "2.5.8",
"vite-tsconfig-paths": "3.3.14"
"vite": "2.6.10",
"vite-tsconfig-paths": "3.3.17"
}
}
6 changes: 4 additions & 2 deletions packages/panel/src/services/api/httpClient.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import type { SerializedError } from '@reduxjs/toolkit';
import axios from 'axios';
import axios, { AxiosError } from 'axios';

export const httpClient = axios.create({
baseURL: '/api',
withCredentials: true,
});

const isAxiosError = (value: unknown): value is AxiosError<{ message: string }, unknown> => axios.isAxiosError(value);

httpClient.interceptors.response.use(
(response) => response,
(error) => {
if (axios.isAxiosError(error)) {
if (isAxiosError(error)) {
const serializedError: SerializedError = {
name: error.response?.statusText,
code: String(error.response?.status),
Expand Down
30 changes: 15 additions & 15 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@
"react": "17.0.2"
},
"dependencies": {
"@chakra-ui/react": "1.6.7",
"@chakra-ui/theme-tools": "1.2.0",
"@emotion/react": "11.4.1",
"@chakra-ui/react": "1.6.10",
"@chakra-ui/theme-tools": "1.2.2",
"@emotion/react": "11.5.0",
"@emotion/styled": "11.3.0",
"@types/react-router-dom": "5.1.9",
"@types/react-router-dom": "5.3.1",
"@types/storybook-react-router": "1.0.1",
"framer-motion": "4.1.17",
"react-router-dom": "5.3.0"
},
"devDependencies": {
"@chakra-ui/cli": "1.5.0",
"@storybook/addon-actions": "6.3.8",
"@storybook/addon-docs": "6.3.8",
"@storybook/addon-essentials": "6.3.8",
"@storybook/addon-links": "6.3.8",
"@storybook/react": "6.3.8",
"@chakra-ui/cli": "1.5.3",
"@storybook/addon-actions": "6.3.12",
"@storybook/addon-docs": "6.3.12",
"@storybook/addon-essentials": "6.3.12",
"@storybook/addon-links": "6.3.12",
"@storybook/react": "6.3.12",
"@svgr/cli": "5.5.0",
"@testing-library/dom": "8.5.0",
"@testing-library/dom": "8.10.1",
"@testing-library/jest-dom": "5.14.1",
"@testing-library/react": "12.1.0",
"@testing-library/react": "12.1.2",
"@testing-library/react-hooks": "7.0.2",
"@testing-library/user-event": "13.2.1",
"@types/react": "17.0.21",
"@types/react-dom": "17.0.9",
"@testing-library/user-event": "13.5.0",
"@types/react": "17.0.31",
"@types/react-dom": "17.0.10",
"react": "17.0.2",
"storybook-react-router": "1.0.8"
}
Expand Down
4 changes: 3 additions & 1 deletion packages/ui/src/components/Sidebar/Sidebar.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import { Sidebar } from './Sidebar';

describe('Sidebar', () => {
it('renders correctly', () => {
render(<Sidebar data-testid="sidebar" width="256px" />, { wrapper: MemoryRouter });
render(<Sidebar data-testid="sidebar" width="256px" />, {
wrapper: ({ children }) => <MemoryRouter>{children}</MemoryRouter>,
});

const getSidebar = screen.getByTestId('sidebar');

Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/SidebarItem/SidebarItem.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('SidebarItem', () => {
<SidebarItem path="/" icon={<OutlinedDashboardIcon />} iconSelected={<SolidDashboardIcon />} count={2021}>
Dashboard
</SidebarItem>,
{ wrapper: MemoryRouter },
{ wrapper: ({ children }) => <MemoryRouter>{children}</MemoryRouter> },
);

const sidebarItem = screen.getByRole('group');
Expand All @@ -28,7 +28,7 @@ describe('SidebarItem', () => {
<SidebarItem path="/" disabled>
Dashboard
</SidebarItem>,
{ wrapper: MemoryRouter },
{ wrapper: ({ children }) => <MemoryRouter>{children}</MemoryRouter> },
);

const sidebarItem = screen.getByRole(/group/i);
Expand Down
14 changes: 7 additions & 7 deletions packages/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
"dependencies": {
"@coderscamp/ui": "0.0.1",
"@next/bundle-analyzer": "11.1.2",
"@supabase/supabase-js": "1.22.6",
"@supabase/supabase-js": "1.25.0",
"next": "11.1.2",
"nodemailer": "6.6.3",
"preact": "10.5.14",
"nodemailer": "6.7.0",
"preact": "10.5.15",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-headroom": "3.1.1",
"react-hook-form": "7.15.3",
"swiper": "7.0.6"
"react-headroom": "3.2.0",
"react-hook-form": "7.17.5",
"swiper": "7.0.9"
},
"devDependencies": {
"@types/nodemailer": "6.4.4",
"@types/react": "17.0.21",
"@types/react": "17.0.31",
"@types/react-headroom": "2.2.2",
"next-compose-plugins": "2.2.1",
"next-transpile-modules": "8.0.0"
Expand Down
Loading