Skip to content

Commit

Permalink
Merge pull request #1 from Lenni009/main
Browse files Browse the repository at this point in the history
bring up to date
  • Loading branch information
Lenni009 authored May 19, 2023
2 parents 2fba79a + 39bb63d commit bf08ff4
Show file tree
Hide file tree
Showing 396 changed files with 111,424 additions and 25,984 deletions.
2 changes: 2 additions & 0 deletions .githooks/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
git config -f .gitconfig core.hooksPath .githooks

29 changes: 29 additions & 0 deletions .githooks/commit-msg

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nms-web-app",
"version": "0.27.2",
"version": "0.32.0",
"private": true,
"dependencies": {
"axios": "^0.27.2",
Expand Down
2 changes: 1 addition & 1 deletion public/assets/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"apiUrl": "https://api.nmsassistant.com",
"assistantAppsUrl": "https://api.assistantapps.com",
"assistantAppsAppGuid": "4f66c40e-07d7-4fba-973c-c514bf1e57c6",
"currentWhatIsNewGuid": "4c62d7be-e263-4447-80c6-acdc1ef03f80",
"currentWhatIsNewGuid": "5e19a68a-40b9-458b-870c-124bb56f3645",
"googleClientId": "539483681905-d4ak563l825o8i0b47inn1c7gu30abvs.apps.googleusercontent.com"
}
2 changes: 1 addition & 1 deletion public/assets/config.production.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"apiUrl": "https://api.nmsassistant.com",
"assistantAppsUrl": "https://api.assistantapps.com",
"assistantAppsAppGuid": "589405b4-e40f-4cd9-b793-6bf37944ee09",
"currentWhatIsNewGuid": "4c62d7be-e263-4447-80c6-acdc1ef03f80",
"currentWhatIsNewGuid": "5e19a68a-40b9-458b-870c-124bb56f3645",
"googleClientId": "539483681905-cg6d6d3m29kdepmv73efcehr2dia7cfq.apps.googleusercontent.com"
}
2 changes: 1 addition & 1 deletion public/assets/config.staging.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"apiUrl": "https://staging-api.nmsassistant.com",
"assistantAppsUrl": "https://api.assistantapps.com",
"assistantAppsAppGuid": "589405b4-e40f-4cd9-b793-6bf37944ee09",
"currentWhatIsNewGuid": "4c62d7be-e263-4447-80c6-acdc1ef03f80",
"currentWhatIsNewGuid": "5e19a68a-40b9-458b-870c-124bb56f3645",
"googleClientId": "539483681905-d4ak563l825o8i0b47inn1c7gu30abvs.apps.googleusercontent.com"
}
86 changes: 82 additions & 4 deletions public/assets/data/Recharge.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@
"Id": "raw23",
"Value": 2
},
{
"Id": "cook40",
"Value": 0
},
{
"Id": "raw54",
"Value": 1
Expand Down Expand Up @@ -245,6 +241,88 @@
}
]
},
{
"Id": "tech231",
"TotalChargeAmount": 200,
"ChargeBy": [
{
"Id": "raw31",
"Value": 1
},
{
"Id": "cur101",
"Value": 200
}
]
},
{
"Id": "tech232",
"TotalChargeAmount": 200,
"ChargeBy": [
{
"Id": "raw7",
"Value": 1
},
{
"Id": "cur101",
"Value": 200
}
]
},
{
"Id": "tech233",
"TotalChargeAmount": 120,
"ChargeBy": [
{
"Id": "prod17",
"Value": 24
},
{
"Id": "prod18",
"Value": 240
},
{
"Id": "cur101",
"Value": 200
}
]
},
{
"Id": "tech234",
"TotalChargeAmount": 200,
"ChargeBy": [
{
"Id": "raw12",
"Value": 2
},
{
"Id": "raw13",
"Value": 5
},
{
"Id": "cur101",
"Value": 200
}
]
},
{
"Id": "tech241",
"TotalChargeAmount": 200,
"ChargeBy": [
{
"Id": "raw1",
"Value": 1
},
{
"Id": "raw2",
"Value": 3
},
{
"Id": "raw29",
"Value": 5
}
]
},
{
"Id": "tech25",
"TotalChargeAmount": 200,
Expand Down
28 changes: 28 additions & 0 deletions public/assets/data/alphabetTranslations.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,5 +170,33 @@
{
"AppId": "build928",
"Text": "Polestar"
},
{
"AppId": "build1006",
"Text": "Rise up"
},
{
"AppId": "build1008",
"Text": "base"
},
{
"AppId": "build1011",
"Text": "Euclid moonrise"
},
{
"AppId": "build1012",
"Text": "Ship and pilot"
},
{
"AppId": "build1013",
"Text": "The black hole in the wall"
},
{
"AppId": "build1014",
"Text": "voyage"
},
{
"AppId": "build1016",
"Text": "Utopia"
}
]
Loading

0 comments on commit bf08ff4

Please sign in to comment.