Merge pull request #27 from Tech-With-Tim/dependabot/npm_and_yarn/next-11.1.1

Bump next from 11.1.0 to 11.1.1

Author: mohamed040406

.devcontainer/docker-compose.yml

@@ -2,17 +2,21 @@ version: "3.7"
 
 services:
   api:
-    image: techwithtim/twt_api:latest
+    image: ghcr.io/tech-with-tim/api:latest
+    ports:
+      - 5000:5000
     env_file: .env
     restart: unless-stopped
     environment:
       SECRET_KEY: key
-      DB_URI: postgres://api:api@api:5432/api
+      POSTGRES_URI: postgresql://api:api@db:5432/api
 
   cdn:
     image: techwithtim/cdn:latest
     env_file: .env
     restart: unless-stopped
+    ports:
+      - 8000:5000
     environment:
       POSTGRES_USER: api
       POSTGRES_PASSWORD: api
@@ -22,6 +26,26 @@ services:
       SECRET_KEY: key
       MAX_FILE_SIZE: "30"
 
+  redis:
+    image: redis:6.2.5-alpine
+
+  websockets:
+    image: techwithtim/websockets:latest
+    restart: unless-stopped
+    ports:
+      - 5001:5000
+    environment:
+      POSTGRES_USER: api
+      POSTGRES_PASSWORD: api
+      DB_NAME: api
+      DB_HOST: db
+      DB_PORT: "5432"
+      SECRET_KEY: key
+      REDIS_HOST: redis
+      REDIS_USERNAME: ""
+      REDIS_PASS: ""
+      REDIS_DB: "0"
+
   workspace:
     build:
       context: .
@@ -31,7 +55,7 @@ services:
       - ..:/workspace
 
   db:
-    image: postgres
+    image: postgres:13-alpine
     restart: unless-stopped
     environment:
       POSTGRES_USERNAME: api

.github/workflows/lint-and-test.yml

@@ -2,31 +2,9 @@ name: Lint & Test
 
 on:
   push:
-    paths:
-      - "src/**"
-      - ".github/workflows/**"
-      - "public/**"
-      - ".eslintrc.json"
-      - "prettierrc.json"
-      - ".yarnrc.yml"
-      - "next-env.d.ts"
-      - "next.config.js"
-      - "package.json"
-      - "tsconfig.json"
-      - "yarn.lock"
-  pull_request:
-    paths:
-      - ".github/workflows/**"
-      - "src/**"
-      - "public/**"
-      - ".eslintrc.json"
-      - "prettierrc.json"
-      - ".yarnrc.yml"
-      - "next-env.d.ts"
-      - "next.config.js"
-      - "package.json"
-      - "tsconfig.json"
-      - "yarn.lock"
+    branches:
+      - main
+  pull_request: 
 
 jobs:
   packages:

.husky/.gitignore

@@ -0,0 +1 @@
+_

.yarn/releases/yarn-2.4.2.cjs

@@ -8,4 +8,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
     spec: "@yarnpkg/plugin-typescript"
 
-yarnPath: .yarn/releases/yarn-2.4.2.cjs
+yarnPath: .yarn/releases/yarn-3.0.2.cjs

.yarn/releases/yarn-3.0.2.cjs

@@ -6,18 +6,22 @@
     "@storybook/addons": "^6.2.7",
     "@storybook/theming": "^6.2.7",
     "@tailwindcss/jit": "^0.1.18",
+    "autoprefixer": "^10.2.6",
     "axios": "^0.21.1",
     "classnames": "^2.2.6",
     "eslint": "^7.11.0",
     "husky": "^6.0.0",
     "lint-staged": "^10.5.4",
-    "next": "11.1.0",
+    "next": "11.1.1",
+    "postcss": "^8.3.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-is": "^17.0.2",
     "react-query": "^3.13.6",
     "sass": "^1.34.1",
     "styled-components": "^5.2.1",
+    "tailwindcss": "^2.1.4",
+    "typescript": "^4.4.2",
     "zustand": "^3.4.1"
   },
   "scripts": {
@@ -38,39 +42,31 @@
     }
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.14.5",
+    "@babel/eslint-parser": "^7.15.4",
     "@storybook/addon-actions": "^6.2.7",
     "@storybook/addon-essentials": "^6.2.7",
     "@storybook/addon-links": "^6.2.7",
     "@storybook/node-logger": "^6.2.7",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.2.7",
     "@tailwindcss/postcss7-compat": "^2.1.0",
-    "@types/axios": "^0.14.0",
     "@types/classnames": "^2.2.11",
     "@types/jest": "^26.0.18",
     "@types/node": "^15.12.2",
     "@types/react": "^17.0.11",
     "@types/react-dom": "^17.0.0",
-    "@types/react-router-dom": "^5.1.7",
     "@types/styled-components": "^5.1.7",
     "@typescript-eslint/eslint-plugin": "^4.5.0",
     "@typescript-eslint/parser": "^4.5.0",
-    "autoprefixer": "^10.2.6",
     "eslint-config-prettier": "^8.2.0",
     "eslint-config-react-app": "^6.0.0",
-    "eslint-loader": "^4.0.2",
     "eslint-plugin-flowtype": "^5.7.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "jest-dom": "^4.0.0",
-    "postcss": "^8.3.0",
-    "prettier": "^2.3.1",
-    "tailwindcss": "^2.1.4",
-    "typescript": "^4.3.2"
+    "prettier": "^2.3.1"
   },
   "jest": {
     "collectCoverageFrom": [