Merge branch 'master' into dutch-translations

The-Creative-Programming-Group · Mar 8, 2024 · 33d7e24 · 33d7e24
2 parents 4a392d0 + 0d955aa
commit 33d7e24
Show file tree

Hide file tree

Showing 19 changed files with 860 additions and 523 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,9 @@ This will install all the dependencies for the project.
 <br> <br>
 Next you will have to fill the `.env` file with your own API keys, following the `.env.example` file as a guide.
 <br> <br>
-After that you can run the following command, to look at the current state (with your own changes) of the project:
+After that you have to go into the city-data dir (`cd packages/city-data`), execute this command and follow all Convex setup instructions: `pnpm dlx convex dev`
+<br> <br>
+After that you can run the following command, to look at the current state (with your own changes) of the project by executing this command at the root directory:
 `pnpm dev`
 
 ## What's next? Which technologies are used?

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -16,7 +16,7 @@
     "@ducanh2912/next-pwa": "^10.2.5",
     "@hookform/resolvers": "^3.3.4",
     "@legendapp/state": "^2.1.8",
-    "@next/bundle-analyzer": "^14.1.0",
+    "@next/bundle-analyzer": "^14.1.3",
     "@t3-oss/env-nextjs": "^0.9.2",
     "@tanstack/react-query": "^4.36.1",
     "@tanstack/react-query-devtools": "^4.36.1",
@@ -31,36 +31,36 @@
     "@weatherio/types": "workspace:^0.1.0",
     "@weatherio/ui": "workspace:^0.1.0",
     "classnames": "^2.5.1",
-    "convex": "^1.9.1",
+    "convex": "^1.10.0",
     "dayjs": "^1.11.10",
-    "next": "^14.1.0",
+    "next": "^14.1.3",
     "next-axiom": "^1.1.1",
     "next-international": "^1.2.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-hook-form": "^7.50.1",
+    "react-hook-form": "^7.51.0",
     "react-html-parser": "^2.0.2",
     "react-icons": "^5.0.1",
     "react-spinners": "^0.13.8",
     "sharp": "0.33.2",
-    "sonner": "^1.4.2",
+    "sonner": "^1.4.3",
     "superjson": "2.2.1",
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@types/node": "^20.11.20",
-    "@types/react": "^18.2.58",
-    "@types/react-dom": "^18.2.19",
+    "@types/node": "^20.11.25",
+    "@types/react": "^18.2.64",
+    "@types/react-dom": "^18.2.21",
     "@types/react-html-parser": "^2.0.6",
     "@weatherio/eslint-config": "workspace:^0.2.0",
     "@weatherio/prettier-config": "workspace:^0.1.0",
     "@weatherio/tailwind-config": "workspace:^0.1.0",
     "@weatherio/tsconfig": "workspace:^0.1.0",
-    "dotenv-cli": "^7.3.0",
+    "dotenv-cli": "^7.4.0",
     "eslint": "^8.57.0",
     "prettier": "^3.2.5",
     "tailwindcss": "^3.4.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   },
   "eslintConfig": {
     "root": true,

diff --git a/apps/web/src/pages/locationsettings/index.tsx b/apps/web/src/pages/locationsettings/index.tsx
@@ -166,11 +166,10 @@ const LocationSettings = observer(() => {
         .get()
         .find(
           (value: ICity) =>
-            value.name === city!.name &&
-            (value.id.toString().length > 15 ||
-              city!.id.toString().length > 15),
+            value.name === city.name &&
+            (value.id.toString().length > 15 || city.id.toString().length > 15),
         );
-      if (addedCities$.get().find((value: ICity) => value.id === city!.id)) {
+      if (addedCities$.get().find((value: ICity) => value.id === city.id)) {
         activeCity$.set(city);
         toast.success(translationLocationSettings("switched to city toast"));
       } else if (existingCity) {

diff --git a/apps/web/src/pages/search/index.tsx b/apps/web/src/pages/search/index.tsx
@@ -151,8 +151,8 @@ const Search = () => {
     if (city) {
       const existingCity = addedCities$
         .get()
-        .find((value: ICity) => value.name === city!.name);
-      if (addedCities$.get().find((value: ICity) => value.id === city!.id)) {
+        .find((value: ICity) => value.name === city.name);
+      if (addedCities$.get().find((value: ICity) => value.id === city.id)) {
         activeCity$.set(city);
         void router.push("/home");
       } else if (existingCity) {

diff --git a/package.json b/package.json
@@ -24,13 +24,13 @@
     "e2e:test": "turbo e2e:test"
   },
   "devDependencies": {
-    "@playwright/test": "^1.41.2",
+    "@playwright/test": "^1.42.1",
     "@total-typescript/ts-reset": "^0.5.1",
-    "@turbo/gen": "^1.12.4",
+    "@turbo/gen": "^1.12.5",
     "@weatherio/prettier-config": "workspace:^0.1.0",
     "prettier": "^3.2.5",
-    "turbo": "^1.12.4",
-    "typescript": "^5.3.3"
+    "turbo": "^1.12.5",
+    "typescript": "^5.4.2"
   },
   "prettier": "@weatherio/prettier-config"
 }
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -33,7 +33,7 @@
     "@weatherio/tsconfig": "workspace:^0.1.0",
     "eslint": "^8.57.0",
     "prettier": "^3.2.5",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   },
   "eslintConfig": {
     "root": true,

diff --git a/packages/city-data/convex/_generated/api.d.ts b/packages/city-data/convex/_generated/api.d.ts
@@ -4,7 +4,7 @@
  *
  * THIS CODE IS AUTOMATICALLY GENERATED.
  *
- * Generated by convex@1.9.1.
+ * Generated by convex@1.10.0.
  * To regenerate, run `npx convex dev`.
  * @module
  */

diff --git a/packages/city-data/convex/_generated/api.js b/packages/city-data/convex/_generated/api.js
@@ -4,7 +4,7 @@
  *
  * THIS CODE IS AUTOMATICALLY GENERATED.
  *
- * Generated by convex@1.9.1.
+ * Generated by convex@1.10.0.
  * To regenerate, run `npx convex dev`.
  * @module
  */

diff --git a/packages/city-data/convex/_generated/dataModel.d.ts b/packages/city-data/convex/_generated/dataModel.d.ts
@@ -4,7 +4,7 @@
  *
  * THIS CODE IS AUTOMATICALLY GENERATED.
  *
- * Generated by convex@1.9.1.
+ * Generated by convex@1.10.0.
  * To regenerate, run `npx convex dev`.
  * @module
  */

diff --git a/packages/city-data/convex/_generated/server.d.ts b/packages/city-data/convex/_generated/server.d.ts
@@ -4,7 +4,7 @@
  *
  * THIS CODE IS AUTOMATICALLY GENERATED.
  *
- * Generated by convex@1.9.1.
+ * Generated by convex@1.10.0.
  * To regenerate, run `npx convex dev`.
  * @module
  */

diff --git a/packages/city-data/convex/_generated/server.js b/packages/city-data/convex/_generated/server.js
@@ -4,7 +4,7 @@
  *
  * THIS CODE IS AUTOMATICALLY GENERATED.
  *
- * Generated by convex@1.9.1.
+ * Generated by convex@1.10.0.
  * To regenerate, run `npx convex dev`.
  * @module
  */

diff --git a/packages/city-data/package.json b/packages/city-data/package.json
@@ -28,10 +28,10 @@
   },
   "prettier": "@weatherio/prettier-config",
   "dependencies": {
-    "convex": "^1.9.1",
+    "convex": "^1.10.0",
     "jsonfile": "^6.1.0",
     "jsonl": "^1.1.2",
-    "yauzl": "^3.1.0",
+    "yauzl": "^3.1.2",
     "zod": "^3.22.4"
   },
   "devDependencies": {
@@ -42,6 +42,6 @@
     "@weatherio/tsconfig": "workspace:^0.1.0",
     "eslint": "^8.57.0",
     "prettier": "^3.2.5",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   }
 }
diff --git a/packages/e2e-web-tests/package.json b/packages/e2e-web-tests/package.json
@@ -25,13 +25,13 @@
     "start-server-and-test": "^2.0.3"
   },
   "devDependencies": {
-    "@types/node": "^20.11.20",
+    "@types/node": "^20.11.25",
     "@weatherio/eslint-config": "workspace:^0.2.0",
     "@weatherio/prettier-config": "workspace:^0.1.0",
     "@weatherio/tsconfig": "workspace:^0.1.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.57.0",
     "prettier": "^3.2.5",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   }
 }
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -26,6 +26,6 @@
     "@weatherio/tsconfig": "workspace:^0.1.0",
     "eslint": "^8.57.0",
     "prettier": "^3.2.5",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   }
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -32,22 +32,22 @@
     "next-themes": "^0.2.1",
     "react": "18.2.0",
     "react-leaflet": "^4.2.1",
-    "sonner": "^1.4.2",
+    "sonner": "^1.4.3",
     "tailwind-merge": "^2.2.1",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
     "@types/leaflet": "^1.9.8",
-    "@types/node": "^20.11.20",
-    "@types/react": "^18.2.58",
+    "@types/node": "^20.11.25",
+    "@types/react": "^18.2.64",
     "@weatherio/eslint-config": "workspace:^0.2.0",
     "@weatherio/prettier-config": "workspace:^0.1.0",
     "@weatherio/tailwind-config": "workspace:^0.1.0",
     "@weatherio/tsconfig": "workspace:^0.1.0",
     "eslint": "^8.57.0",
     "prettier": "^3.2.5",
     "tailwindcss": "^3.4.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   },
   "eslintConfig": {
     "extends": [