Merge pull request #1653 from gettakaro/main-promotion

gettakaro · Oct 14, 2024 · d7c349f · d7c349f
2 parents 6472799 + 5f24df4
commit d7c349f
Show file tree

Hide file tree

Showing 95 changed files with 1,866 additions and 4,281 deletions.
diff --git a/containers/generic-app/Dockerfile b/containers/generic-app/Dockerfile
@@ -37,6 +37,7 @@ ENV TAKARO_VERSION=${TAKARO_VERSION}
 ENV TAKARO_COMMIT=${TAKARO_COMMIT}
 ENV TAKARO_BUILD_DATE=${TAKARO_BUILD_DATE}
 ENV TAKARO_FULL_VERSION=${TAKARO_VERSION}-${TAKARO_COMMIT}-${TAKARO_BUILD_DATE}
+ENV VITE_TAKARO_VERSION=${TAKARO_FULL_VERSION}
 
 WORKDIR /app
 

diff --git a/containers/generic-web/entrypoint.sh b/containers/generic-web/entrypoint.sh
@@ -12,6 +12,8 @@ echo "  VITE_API: \"$VITE_API\"," >>"$FILE_LOCATION"
 echo "  VITE_ORY_URL: \"$VITE_ORY_URL\"," >>"$FILE_LOCATION"
 echo "  VITE_POSTHOG_PUBLIC_API_KEY: \"$VITE_POSTHOG_PUBLIC_API_KEY\"," >>"$FILE_LOCATION"
 echo "  VITE_POSTHOG_API_URL: \"$VITE_POSTHOG_API_URL\"," >>"$FILE_LOCATION"
+echo "  VITE_TAKARO_VERSION: \"$VITE_TAKARO_VERSION\"," >>"$FILE_LOCATION"
+
 echo "}" >>"$FILE_LOCATION"
 
 nginx -g "daemon off;"
diff --git a/containers/takaro/dev.Dockerfile b/containers/takaro/dev.Dockerfile
@@ -31,5 +31,6 @@ ENV TAKARO_VERSION=${TAKARO_VERSION}
 ENV TAKARO_COMMIT=${TAKARO_COMMIT}
 ENV TAKARO_BUILD_DATE=${TAKARO_BUILD_DATE}
 ENV TAKARO_FULL_VERSION=${TAKARO_VERSION}-${TAKARO_COMMIT}-${TAKARO_BUILD_DATE}
+ENV VITE_TAKARO_VERSION=${TAKARO_FULL_VERSION}
 
 CMD ["npm", "run", "start:dev"]
diff --git a/deploy/compose/docker-compose.yml b/deploy/compose/docker-compose.yml
@@ -48,22 +48,22 @@ services:
     env_file:
       - .env 
     environment:
-      POSTGRES_HOST: postgresql      
+      POSTGRES_HOST: postgresql
   takaro_connector:
     image: ghcr.io/gettakaro/takaro-app-connector:latest
     container_name: takaro_connector
     environment:
       REDIS_HOST: "redis"
-      TAKARO_SERVICE: "app-connector"  
+      TAKARO_SERVICE: "app-connector"
       TAKARO_HOST: http://takaro_api:3000
     env_file:
-      - .env      
+      - .env
     restart: unless-stopped
 
   takaro_web:
     image: ghcr.io/gettakaro/takaro-web-main:latest
     ports:
-      - 13001:80        
+      - 13001:80
     environment:
       VITE_API: http://127.0.0.1:13000
       VITE_ORY_URL: http://127.0.0.1:4433

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app-mock-gameserver/src/lib/gameserver/index.ts b/packages/app-mock-gameserver/src/lib/gameserver/index.ts
@@ -13,6 +13,7 @@ import {
   IPosition,
   HookEvents,
   ChatChannel,
+  EventEntityKilled,
 } from '@takaro/modules';
 import { faker } from '@faker-js/faker';
 import { config } from '../../config.js';
@@ -224,6 +225,21 @@ export class MockGameserver implements IMockGameServer {
       output.success = true;
     }
 
+    if (rawCommand.startsWith('triggerKill')) {
+      const [_, playerId] = rawCommand.split(' ');
+      const player = await this.getPlayer(new IPlayerReferenceDTO({ gameId: playerId }));
+      this.emitEvent(
+        GameEvents.ENTITY_KILLED,
+        new EventEntityKilled({
+          entity: 'zombie',
+          player,
+          weapon: 'knife',
+        }),
+      );
+      output.rawResult = `Triggered kill for player ${playerId}`;
+      output.success = true;
+    }
+
     await this.sendLog(`${output.success ? '🟢' : '🔴'} Command executed: ${rawCommand}`);
 
     return output;

diff --git a/packages/lib-apiclient/src/generated/api.ts b/packages/lib-apiclient/src/generated/api.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 84bd9a7459a12a07d154f128124bdff7295ccdd6
+ * The version of the OpenAPI document: development - 5eeabec01e38f48bd1386a8c961671e8365f39dd
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/lib-apiclient/src/generated/base.ts b/packages/lib-apiclient/src/generated/base.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 84bd9a7459a12a07d154f128124bdff7295ccdd6
+ * The version of the OpenAPI document: development - 5eeabec01e38f48bd1386a8c961671e8365f39dd
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/lib-apiclient/src/generated/common.ts b/packages/lib-apiclient/src/generated/common.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 84bd9a7459a12a07d154f128124bdff7295ccdd6
+ * The version of the OpenAPI document: development - 5eeabec01e38f48bd1386a8c961671e8365f39dd
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/lib-apiclient/src/generated/configuration.ts b/packages/lib-apiclient/src/generated/configuration.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 84bd9a7459a12a07d154f128124bdff7295ccdd6
+ * The version of the OpenAPI document: development - 5eeabec01e38f48bd1386a8c961671e8365f39dd
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/lib-apiclient/src/generated/index.ts b/packages/lib-apiclient/src/generated/index.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 84bd9a7459a12a07d154f128124bdff7295ccdd6
+ * The version of the OpenAPI document: development - 5eeabec01e38f48bd1386a8c961671e8365f39dd
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/lib-components/src/components/actions/ToggleButton/ToggleButton.stories.tsx b/packages/lib-components/src/components/actions/ToggleButton/ToggleButton.stories.tsx
@@ -22,6 +22,7 @@ export default {
   args: {
     exclusive: true,
     orientation: 'horizontal',
+    defaultValue: 'left',
     fullWidth: false,
   },
 } as Meta<ToggleButtonGroupProps>;

diff --git a/packages/lib-components/src/components/actions/ToggleButton/ToggleButton.tsx b/packages/lib-components/src/components/actions/ToggleButton/ToggleButton.tsx
@@ -17,7 +17,9 @@ export const ToggleButton = forwardRef<HTMLButtonElement, ToggleButtonProps>(fun
   { selected = false, disabled = false, onClick = undefined, value, parentClickEvent = () => {}, children, tooltip },
   ref,
 ) {
-  const handleOnClick = () => {
+  const handleOnClick = (m: MouseEvent) => {
+    m.preventDefault();
+    m.stopPropagation();
     if (disabled) return;
     parentClickEvent(value);
     if (onClick) {

diff --git a/packages/lib-components/src/components/actions/ToggleButton/ToggleButtonGroup.tsx b/packages/lib-components/src/components/actions/ToggleButton/ToggleButtonGroup.tsx
@@ -47,7 +47,12 @@ export const ToggleButtonGroup: FC<ToggleButtonGroupProps> & SubComponents = ({
     const m = new Map<string, boolean>();
     Children.forEach(children, (child) => {
       if (isValidElement(child)) {
-        m.set(child.props.value, false);
+        console.log(child.props.value, defaultValue);
+        if (child.props.value === defaultValue) {
+          m.set(child.props.value, true);
+        } else {
+          m.set(child.props.value, false);
+        }
       }
     });
     return m;
@@ -65,7 +70,16 @@ export const ToggleButtonGroup: FC<ToggleButtonGroupProps> & SubComponents = ({
       }
       return setSelected(value);
     }
-    // handle case that each button has a seperate state
+
+    // In case there always has to be one value selected, the clicked value is true and there is currently only one value selected then we don't do anything
+    if (
+      !canSelectNone &&
+      (selected as Map<string, boolean>).get(value) === true &&
+      Array.from((selected as Map<string, boolean>).values()).filter(Boolean).length === 1
+    ) {
+      return;
+    }
+
     setSelected(new Map((selected as Map<string, boolean>).set(value, !(selected as Map<string, boolean>).get(value))));
   };