Merge branch 'main' into chore/local-i18n

TUM-Dev · Nov 2, 2023 · 8a38cb5 · 8a38cb5
2 parents 64056d0 + c523b10
commit 8a38cb5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/resources/documentation/Dependencys.md b/resources/documentation/Dependencys.md
@@ -78,16 +78,5 @@ We use NodeJS for the webclient.
 Setting NodeJS up is a bit more complicated than setting up python/rust, but it is still pretty easy.
 
 - On linux, you can get it through your favorite package manager.
-  You normally should need to install `nodejs` and `npm`.
-- On WSL, use [this guide](https://learn.microsoft.com/en-us/windows/dev-environment/javascript/nodejs-on-wsl)
-
-#### Gulp
-
-We (current) use Gulp to build the webclient. gulp is a task runner, which is used to automate tasks.
-Gulp needs to be installed globally, so that it can be used from the command line.
-
-Installing _Gulp_ with npm:
-
-```bash
-sudo npm install -g gulp
-```
+  You normally should need to install `nodejs` and `pnpm`.
+- On WSL, use [this guide](https://learn.microsoft.com/en-us/windows/dev-environment/javascript/nodejs-on-wsl) and [this guide](https://pnpm.io/installation) 
diff --git a/webclient/README.md b/webclient/README.md
@@ -24,7 +24,7 @@ Please follow the [system dependencys docs](/resources/documentation/Dependencys
 ### Installing Dependency's
 
 ```bash
-npm install
+pnpm install
 ```
 
 ## Run
@@ -46,19 +46,19 @@ By default, the webclient will connect to the server on `http://localhost:8080`.
 If you want to connect to the public API instead, change `VITE_APP_URL` in [`env/.env`](./env/.env) to `https://nav.tum.de`.
 
 ```sh
-npm run dev
+pnpm run dev
 ```
 
 ### Type-Check, Compile and Minify for Production
 
 ```sh
-npm run build
+pnpm run build
 ```
 
 ### Linting with [ESLint](https://eslint.org/)
 
 ```sh
-npm run lint
+pnpm run lint
 ```
 
 ### Update the API's type definitions
@@ -67,7 +67,7 @@ From the folder of this README, run:
 
 ```sh
 npx openapi-typescript ../openapi.yaml --output ./src/api_types/index.ts --export-type --immutable-types --support-array-length
-npm run lint
+pnpm run lint
 ```
 
 ## Build files & Serving release build
@@ -135,7 +135,7 @@ There are a few ways of running cypress
 For running headless, it is assumed, that you are on a normal machine (not a mac) and have [Chrome](https://www.google.com/intl/de/chrome/) + [Firefox Developer Edition](https://www.mozilla.org/de/firefox/developer/) installed.
 
 ```bash
-npm run test
+pnpm run test
 ```
 
 There are also some subtargets preconfigured like `cy:run:chrome` and `cy:run:firefox`, but likely for debugging you want the second mode.
@@ -145,7 +145,7 @@ There are also some subtargets preconfigured like `cy:run:chrome` and `cy:run:fi
 The interface for interacting with cypress can be opened via
 
 ```bash
-npm run cy:open
+pnpm run cy:open
 ```
 
 ### Writing Tests

diff --git a/webclient/src/components/feedback/TokenBasedModal.vue b/webclient/src/components/feedback/TokenBasedModal.vue
@@ -80,7 +80,7 @@ function sendForm() {
 
   // validate the foreign form
   if (global.feedback.data.subject.length < 3) {
-    error.message = t("error.too_short_subject");
+    error.message = t("error.form.too_short_subject");
     return;
   }
   if (global.feedback.data.body.length < 10) {

diff --git a/webclient/src/main.ts b/webclient/src/main.ts
@@ -31,7 +31,7 @@ if (import.meta.env.PROD) {
     ],
     replaysSessionSampleRate: 0,
     replaysOnErrorSampleRate: 1.0,
-    tracesSampleRate: 1.0, // 1.0 =>  capturing 100% of transactions
+    tracesSampleRate: 1.0,// 1.0 =>  capturing 100% of transactions
     tracePropagationTargets: ["nav.tum.de"],
   });
 }