feat: 1752 kurono badges (#1767)

* feat: Upgrade Kubernetes to 1.26

* hack :)

* Merge master

* use new badges service

* change out dir

* undo out dir

* add worksheet 2 badges

* clean up

* merge from main

* call deployment

* Merge branch 'master' into 1747_kurono_badges

* fix: formatting

* Update badge 2:2 title and message (compromise)

* Make typescript a full dependency

* fix: node and use env var

* remove tests

* use older syntax

* disable minify and cache

Co-Authored-By: faucomte97 <f.aucomte@hotmail.co.uk>

aimmo-game/service.py

@@ -53,6 +53,7 @@ def setup_socketIO_server(application, async_handlers=True):
         async_handlers=async_handlers,
         cors_allowed_origins=[
             "http://localhost:8000",
+            "http://localhost:8080",
             "https://dev-dot-decent-digit-629.appspot.com",
             "https://staging-dot-decent-digit-629.appspot.com",
             "https://www.codeforlife.education",

game_frontend/djangoBundler.js

@@ -11,9 +11,9 @@ const options = {
   outFile: 'index.html',
   publicUrl: '/static/react/',
   watch: process.env.NODE_ENV !== 'production',
-  minify: process.env.NODE_ENV === 'production',
+  minify: false, // process.env.NODE_ENV === 'production',
   target: 'browser',
-  cache: process.env.NODE_ENV === 'production',
+  cache: false // process.env.NODE_ENV === 'production',
 }
 
 const templateFolder = Path.resolve(Path.join(__dirname, '../aimmo/templates/players'))

game_frontend/package.json

@@ -50,8 +50,7 @@
     "prettier": "2.7.1",
     "prettier-standard": "^16.3.0",
     "react-test-renderer": "^16.6.3",
-    "redux-mock-store": "^1.5.3",
-    "typescript": "^3.5.3"
+    "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
     "@material-ui/core": "^4.1.0",
@@ -65,6 +64,7 @@
     "immer": "^9.0.6",
     "js-cookie": "^2.2.1",
     "lodash.isequal": "^4.5.0",
+    "node-fetch": "^2.0.0",
     "parcel-bundler": "^1.12.5",
     "react": "^16.8.6",
     "react-ace": "^9.0.0",
@@ -78,6 +78,7 @@
     "socket.io-client": "^4.0.0",
     "styled-components": "^5.2.0",
     "threads": "^1.7.0",
+    "typescript": "^3.5.3",
     "webfontloader": "^1.6.28"
   },
   "esLintConfig": {

game_frontend/src/components/Badge/badges.js

@@ -1,6 +1,9 @@
 import ChangeDirectionBadge from 'img/1_change_direction.svg'
 import RandomDirectionsBadge from 'img/1_random_directions.svg'
 import InvestigateBadge from 'img/1_investigate.svg'
+import AvoidBadge from 'img/2_avoid.svg';
+import PickupBadge from 'img/2_pick_up.svg';
+
 
 export const badgeInfo = {
   '1:1': {
@@ -21,4 +24,16 @@ export const badgeInfo = {
     img: InvestigateBadge,
     name: 'Investigate location',
   },
+  '2:1': {
+    title: 'Amazing job!',
+    message: 'You created your first subroutine!',
+    img: AvoidBadge,
+    name: 'Create subroutine'
+  },
+  '2:2': {
+    title: 'You\'re an explorer!',
+    message: 'You\'re ready to pick up your first artefact!',
+    img: PickupBadge,
+    name: 'Pickup artefact'
+  },
 }