Merge pull request AssistantNMS#60 from AssistantNMS/develop

🔖 0.38.0
Lenni009 · Dec 18, 2023 · 2aeb6a0 · 2aeb6a0
2 parents 8577878 + 5f326f2
commit 2aeb6a0
Show file tree

Hide file tree

Showing 78 changed files with 68,786 additions and 11,111 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nms-web-app",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "private": true,
   "scripts": {
     "start": "env-cmd --file ./.env.development react-scripts start",
@@ -18,7 +18,7 @@
     "framer-motion": "^6.3.10",
     "i18next": "^21.8.8",
     "object-hash": "^3.0.0",
-    "react": "^18.1.0",
+    "react": "^18.2.0",
     "react-dom": "^18.1.0",
     "react-ga": "^3.3.0",
     "react-helmet": "^6.1.0",
@@ -35,6 +35,7 @@
     "react-toastify": "^9.0.3",
     "react-vertical-timeline-component": "^3.5.2",
     "redux": "^4.2.0",
+    "sass": "^1.69.5",
     "sweetalert2": "^11.4.17"
   },
   "devDependencies": {
@@ -47,7 +48,6 @@
     "@types/react-redux": "^7.1.24",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-vertical-timeline-component": "^3.3.3",
-    "node-sass": "^7.0.1",
     "typescript": "^4.7.3"
   },
   "eslintConfig": {
@@ -65,4 +65,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
diff --git a/public/assets/config.json b/public/assets/config.json
@@ -5,6 +5,6 @@
     "apiUrl": "https://api.nmsassistant.com",
     "assistantAppsUrl": "https://api.assistantapps.com",
     "assistantAppsAppGuid": "4f66c40e-07d7-4fba-973c-c514bf1e57c6",
-    "currentWhatIsNewGuid": "b13604b7-3dbb-4644-b341-733e46865afb",
+    "currentWhatIsNewGuid": "36a4e064-05dc-435b-a11f-fe7efb20e51e",
     "googleClientId": "539483681905-d4ak563l825o8i0b47inn1c7gu30abvs.apps.googleusercontent.com"
 }
diff --git a/public/assets/config.production.json b/public/assets/config.production.json
@@ -5,6 +5,6 @@
     "apiUrl": "https://api.nmsassistant.com",
     "assistantAppsUrl": "https://api.assistantapps.com",
     "assistantAppsAppGuid": "589405b4-e40f-4cd9-b793-6bf37944ee09",
-    "currentWhatIsNewGuid": "b13604b7-3dbb-4644-b341-733e46865afb",
+    "currentWhatIsNewGuid": "36a4e064-05dc-435b-a11f-fe7efb20e51e",
     "googleClientId": "539483681905-cg6d6d3m29kdepmv73efcehr2dia7cfq.apps.googleusercontent.com"
 }
diff --git a/public/assets/config.staging.json b/public/assets/config.staging.json
@@ -5,6 +5,6 @@
     "apiUrl": "https://staging-api.nmsassistant.com",
     "assistantAppsUrl": "https://api.assistantapps.com",
     "assistantAppsAppGuid": "589405b4-e40f-4cd9-b793-6bf37944ee09",
-    "currentWhatIsNewGuid": "b13604b7-3dbb-4644-b341-733e46865afb",
+    "currentWhatIsNewGuid": "36a4e064-05dc-435b-a11f-fe7efb20e51e",
     "googleClientId": "539483681905-d4ak563l825o8i0b47inn1c7gu30abvs.apps.googleusercontent.com"
 }