Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bring up to date #1

Merged
merged 35 commits into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3b77c36
fix sweetAlert background
Lenni009 Feb 3, 2023
e9479c2
fix readme dev server command
Lenni009 Feb 3, 2023
263ad0a
Merge branch 'darkmode-title-modal' of https://github.com/Lenni009/As…
Lenni009 Feb 3, 2023
e2f8701
make dialog dark (checked checkboxes missing)
Lenni009 Feb 5, 2023
0fd5391
Merge pull request #36 from Lenni009/darkmode-title-modal
Lenni009 Feb 5, 2023
71af716
💄 Change checkboxes in darkmode
Khaoz-Topsy Feb 5, 2023
c39d328
Merge pull request #37 from AssistantNMS/darkmode-title-modal
Khaoz-Topsy Feb 5, 2023
b3e65f0
📦 Regenerate data
Khaoz-Topsy Feb 5, 2023
3accb16
📦 Regenerate lang
Khaoz-Topsy Feb 5, 2023
5cffb2a
🔖 0.28.0
Khaoz-Topsy Feb 5, 2023
debb997
Merge pull request #38 from AssistantNMS/develop
Khaoz-Topsy Feb 17, 2023
c6db3f0
🐛 Add trim to search
Khaoz-Topsy Feb 17, 2023
73046ba
📦 regen for 4.1
Khaoz-Topsy Feb 22, 2023
e4c5754
🔖 0.29.0
Khaoz-Topsy Feb 22, 2023
b8605b1
📦 Regenerate Expedition data
Khaoz-Topsy Feb 22, 2023
a9b686a
Merge pull request #39 from AssistantNMS/develop
Khaoz-Topsy Feb 22, 2023
354f138
📦 regen for 4.1
Khaoz-Topsy Feb 22, 2023
731b19c
Merge pull request #40 from AssistantNMS/develop
Khaoz-Topsy Feb 22, 2023
088aca6
🪝 Add gitHooks
Khaoz-Topsy Mar 5, 2023
7d8de3a
✨ Add the rewardFromCreatures | Closes #41
Khaoz-Topsy Mar 5, 2023
983fe52
📦 Generate data for update 4.20
Khaoz-Topsy Apr 5, 2023
77782f7
🔖 0.30.0
Khaoz-Topsy Apr 5, 2023
daf7dfc
Merge pull request #42 from AssistantNMS/develop
Khaoz-Topsy Apr 5, 2023
21ad408
🔖 0.31.0
Khaoz-Topsy Apr 16, 2023
731deda
Merge pull request #43 from AssistantNMS/develop
Khaoz-Topsy Apr 17, 2023
8ef6209
💚 Fix CI
Khaoz-Topsy Apr 15, 2023
b406090
Merge pull request #44 from AssistantNMS/develop
Khaoz-Topsy Apr 17, 2023
6e728b6
📦 Generated data
Khaoz-Topsy May 12, 2023
5950102
🌐 Translations
Khaoz-Topsy May 13, 2023
e3d0fae
📦 Generated data
Khaoz-Topsy May 14, 2023
b71d6f3
🔖 0.32.0
Khaoz-Topsy May 15, 2023
842d639
⚡️ Fix power stats
Khaoz-Topsy May 15, 2023
e1bb1a2
Merge pull request #45 from AssistantNMS/develop
Khaoz-Topsy May 16, 2023
934792e
Merge branch 'main' of https://github.com/Lenni009/AssistantNMSWebApp
Lenni009 May 19, 2023
39bb63d
fix package.json
Lenni009 May 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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