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

Update mirror to latest from source #5

Merged
merged 642 commits into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
642 commits
Select commit Hold shift + click to select a range
bc86a68
Add cypress workflow github action.
tchalvak Oct 6, 2023
8967ffa
Merge pull request #1560 from BitLucid/feat/cypress-2
tchalvak Oct 6, 2023
7b5547f
chore(deps): update actions/checkout action to v4
renovate[bot] Oct 6, 2023
621a1d2
Clarify workflow as being just the functional tests,
tchalvak Oct 6, 2023
a4e6175
Merge pull request #1561 from BitLucid/renovate/actions-checkout-4.x
tchalvak Oct 6, 2023
e8727a3
Update with recommended paralellized GA.
tchalvak Oct 6, 2023
c96f5a0
Tests for fight, map, skills,
tchalvak Oct 7, 2023
151fd62
style: format code with PHP CS Fixer
deepsource-autofix[bot] Oct 7, 2023
6be303e
Change thief test boundaries.
tchalvak Oct 7, 2023
3a6bcc1
Fix minor loop intensivity,
tchalvak Oct 7, 2023
3b670b9
Allow direct attacks of npcs,
tchalvak Oct 7, 2023
ce1e208
Better signup + login f test.
tchalvak Oct 7, 2023
7c3c817
Replace the lingua article call with just
tchalvak Oct 7, 2023
00a6790
style: format code with PHP CS Fixer
deepsource-autofix[bot] Oct 7, 2023
d1f182c
Provide github access token to workflow.
tchalvak Oct 7, 2023
de7f6c7
Merge branch 'master' into tests/skills-page
tchalvak Oct 7, 2023
be03d19
Use www.ninjawars.net in cypress.
tchalvak Oct 7, 2023
f491543
Merge pull request #1563 from BitLucid/tests/skills-page
tchalvak Oct 7, 2023
ec78033
Update configure for node hydrogen
tchalvak Oct 7, 2023
b389f29
Update cypress.yml to configure
tchalvak Oct 7, 2023
8c4b210
Merge pull request #1565 from BitLucid/tchalvak-patch-1-1
tchalvak Oct 7, 2023
7625275
Update cypress.yml
tchalvak Oct 7, 2023
191aba9
Remove shell from thief inventory.
tchalvak Oct 7, 2023
54ec8f1
Update cypress.yml
tchalvak Oct 7, 2023
81b6a3b
Update cypress.yml
tchalvak Oct 8, 2023
649634a
Merge pull request #1566 from BitLucid/feat/server-start-simplified
tchalvak Oct 8, 2023
b8aa1b9
Update cypress vars.
tchalvak Oct 8, 2023
3786067
Merge pull request #1564 from BitLucid/tchalvak-patch-1
tchalvak Oct 8, 2023
b3d658b
chore(deps): update dependency node to v18.18.1
renovate[bot] Oct 10, 2023
fd2a0d0
Update the splash page h1 color.
tchalvak Oct 13, 2023
75d3ef8
Merge pull request #1568 from BitLucid/logo-updates
tchalvak Oct 13, 2023
da02d23
Merge pull request #1567 from BitLucid/renovate/node-18.x
tchalvak Oct 13, 2023
c3e9aa7
Hide chat input for unsigned-up-users.
tchalvak Oct 13, 2023
4a3d2f0
Merge pull request #1570 from BitLucid/feat/hp
tchalvak Oct 13, 2023
fb9159c
chore(deps): update dependency node to v18.18.2
renovate[bot] Oct 13, 2023
69644a6
Minor validation fixes.
tchalvak Oct 17, 2023
b9e7419
Add yarn lock as a binary, essentially.
tchalvak Oct 17, 2023
844162a
Don't list in PRs changes to .min js or css files.
tchalvak Oct 17, 2023
9126db4
Merge pull request #1571 from BitLucid/renovate/node-18.x
tchalvak Oct 17, 2023
074df7e
Merge pull request #1572 from BitLucid/feat/hopa
tchalvak Oct 17, 2023
04e373a
chore(deps): update dependency urllib3 to v2.0.7 [security]
renovate[bot] Oct 17, 2023
5948382
New Game/Continue language for signup/login,
tchalvak Oct 18, 2023
5456af9
Merge pull request #1575 from BitLucid/renovate/pypi-urllib3-vulnerab…
tchalvak Oct 18, 2023
bcfc380
Merge pull request #1576 from BitLucid/feat/hopa
tchalvak Oct 18, 2023
e7fec2d
chore(deps): update dependency sinon to v17
renovate[bot] Oct 20, 2023
dd766aa
Add recent travellers, also
tchalvak Oct 20, 2023
02126da
Merge pull request #1578 from BitLucid/feat/recent-travellers
tchalvak Oct 20, 2023
4c4acaf
Merge pull request #1577 from BitLucid/renovate/sinon-17.x
tchalvak Oct 20, 2023
941d576
chore(deps): update shivammathur/setup-php action to v2.27.0
renovate[bot] Nov 1, 2023
c8a1241
Merge pull request #1582 from BitLucid/renovate/shivammathur-setup-ph…
tchalvak Nov 4, 2023
f78e530
chore(deps): update dependency mako to v1.3.0
renovate[bot] Nov 8, 2023
15c3578
chore(deps): update dependency urllib3 to v2.1.0
renovate[bot] Nov 13, 2023
e9b87fe
chore(deps): update yarn to v3.7.0
renovate[bot] Nov 14, 2023
10e3b5c
Update signup to show/hide proceed/signup button.
tchalvak Nov 19, 2023
be60b92
Update PR template ever so slightly.
tchalvak Nov 19, 2023
aba9b2d
Fix cypress test selectors in the signup suite.
tchalvak Nov 19, 2023
f92a910
Minor change to login / signup to be continue / new game.
tchalvak Nov 28, 2023
5a77310
Merge pull request #1590 from BitLucid/feat/new-game-continue
tchalvak Dec 1, 2023
0ca5c20
style: format code with PHP CS Fixer
deepsource-autofix[bot] Dec 1, 2023
b0de56e
Revert "Feat/new game continue"
tchalvak Dec 1, 2023
43ab6c1
Merge pull request #1594 from BitLucid/revert-1590-feat/new-game-cont…
tchalvak Dec 1, 2023
c931e9e
Revert "Revert "Feat/new game continue""
tchalvak Dec 1, 2023
0533790
Merge pull request #1595 from BitLucid/revert-1594-revert-1590-feat/n…
tchalvak Dec 1, 2023
7cc4b0d
Merge pull request #1593 from BitLucid/deepsource-transform-6d10cb6f
tchalvak Dec 1, 2023
240a78e
Artifact creation makefile commands.
tchalvak Dec 1, 2023
94d55b0
Merge pull request #1596 from BitLucid/feat/create-artifacts
tchalvak Dec 1, 2023
2c475bd
Allow for simpler deactivation in ninjamaster.
tchalvak Dec 2, 2023
cae5946
Merge pull request #1585 from BitLucid/renovate/urllib3-2.x
tchalvak Dec 3, 2023
bc81c46
Merge pull request #1584 from BitLucid/renovate/mako-1.x
tchalvak Dec 3, 2023
31bc747
chore(deps): update shivammathur/setup-php action to v2.28.0
renovate[bot] Dec 3, 2023
de74fc7
Batch deac clicking.
tchalvak Dec 7, 2023
2b52437
chore(deps): update dependency certifi to v2023.11.17
renovate[bot] Dec 7, 2023
62e6a74
Merge pull request #1583 from BitLucid/renovate/shivammathur-setup-ph…
tchalvak Dec 7, 2023
32f6667
Signup testing additions and test harness alternations.
tchalvak Dec 7, 2023
a80f74c
style: format code with PHP CS Fixer
deepsource-autofix[bot] Dec 7, 2023
36d8930
Merge pull request #1598 from BitLucid/feat/batch-deac
tchalvak Dec 7, 2023
596aa19
Artifact creation makefile commands.
tchalvak Dec 1, 2023
7248a82
chore(deps): update dependency urllib3 to v2.1.0
renovate[bot] Nov 13, 2023
6647ced
chore(deps): update dependency mako to v1.3.0
renovate[bot] Nov 8, 2023
a5fa44b
chore(deps): update shivammathur/setup-php action to v2.28.0
renovate[bot] Dec 3, 2023
02746ea
Remove debug call.
tchalvak Dec 7, 2023
98fb29b
Test consistency cleanup work.
tchalvak Dec 7, 2023
3a7ee11
Move to ecmaVersion 2020 for eslint.
tchalvak Dec 8, 2023
0364505
Ninjamaster js uses optional chaining.
tchalvak Dec 8, 2023
dfc56d2
Some typing for player member variables.
tchalvak Dec 8, 2023
f5ab0de
style: format code with PHP CS Fixer
deepsource-autofix[bot] Dec 8, 2023
da8f626
Type the player description.
tchalvak Dec 8, 2023
b55d4d4
Updates to set confirmed on accounts in the right way.
tchalvak Dec 9, 2023
9a3e466
Update to the test account creation methodology.
tchalvak Dec 9, 2023
a854f17
Fix likely tyop in statusTest.
tchalvak Dec 9, 2023
34d0d0e
Try resurrecting after fighting in cypress.
tchalvak Dec 9, 2023
b14c75e
Add fight template visual epic.
tchalvak Aug 20, 2023
0b7eb07
Add filter_string_polyfill.
tchalvak Aug 28, 2023
3a6dfe8
Additional filtering to filter toSimple.
tchalvak Aug 28, 2023
4f26e59
Merge pull request #1597 from BitLucid/feat/signup-testing-improve
tchalvak Dec 9, 2023
df2868a
Merge branch 'feat/filtering-html' into feat/signup-testing-improve
tchalvak Dec 9, 2023
ff6ded7
Add FilterTest file.
tchalvak Dec 9, 2023
b13c7c5
Retroactively apply the toSimple filter.
tchalvak Dec 9, 2023
0cd6486
style: format code with PHP CS Fixer
deepsource-autofix[bot] Dec 9, 2023
9d67383
Fix up signup and defaults when creating.
tchalvak Dec 9, 2023
a5af078
style: format code with PHP CS Fixer
deepsource-autofix[bot] Dec 9, 2023
f6d868f
Merge pull request #1599 from BitLucid/feat/signup-testing-improve
tchalvak Dec 9, 2023
6e84d37
Npm package updates.
tchalvak Dec 9, 2023
6befcd1
Merge pull request #1587 from BitLucid/renovate/certifi-2023.x
tchalvak Dec 9, 2023
96231c1
Merge pull request #1600 from BitLucid/feat/updates
tchalvak Dec 9, 2023
78b4fce
Merge pull request #1586 from BitLucid/renovate/yarn-monorepo
tchalvak Dec 9, 2023
c06ed35
Yarn and node version updates.
tchalvak Dec 9, 2023
647387e
More yarn dep updates.
tchalvak Dec 9, 2023
cd880c6
Additional upgrade steps.
tchalvak Dec 9, 2023
e7f2aa9
More yarn main version updates.
tchalvak Dec 9, 2023
75f8229
Merge pull request #1601 from BitLucid/feat/update-yarn-version-to-4
tchalvak Dec 9, 2023
f66e2dc
Minor typehint change for status test.
tchalvak Dec 9, 2023
485919e
Merge pull request #1602 from BitLucid/feat/status-test
tchalvak Dec 9, 2023
2653089
Minor test tweaks and clarifications.
tchalvak Dec 9, 2023
611717d
style: format code with PHP CS Fixer
deepsource-autofix[bot] Dec 9, 2023
79dd4a4
Merge pull request #1603 from BitLucid/feat/status-test
tchalvak Dec 9, 2023
45c055e
chore(deps): update dependency prettier to v3.1.1
renovate[bot] Dec 10, 2023
1fc7fcc
chore(deps): update dependency lxml to v4.9.4
renovate[bot] Dec 20, 2023
68c88da
fix(deps): update dependency aws/aws-sdk-php to v3.288.1 [security]
renovate[bot] Dec 22, 2023
488d307
Merge pull request #1607 from BitLucid/renovate/packagist-aws/aws-sdk…
tchalvak Dec 23, 2023
d2f94f1
Merge pull request #1605 from BitLucid/renovate/lxml-4.x
tchalvak Dec 23, 2023
abc1688
Merge pull request #1604 from BitLucid/renovate/prettier-3.x
tchalvak Dec 23, 2023
46b5d45
Add ads.txt file.
tchalvak Dec 26, 2023
41cfb48
Merge pull request #1608 from BitLucid/feat/adsense
tchalvak Dec 26, 2023
094b854
Redact html comment from main page.
tchalvak Dec 29, 2023
e93a219
Bump version number for html homepage display.
tchalvak Dec 29, 2023
b6fe84f
Add newer google ads,
tchalvak Dec 29, 2023
5fe58b4
Update to allow additional adsense domain.
tchalvak Dec 29, 2023
7a4f699
Merge pull request #1609 from BitLucid/feat/template-comment
tchalvak Dec 29, 2023
c2c938c
Ninjamaster links and validation fixes.
tchalvak Dec 29, 2023
ec38e05
Merge pull request #1610 from BitLucid/feat/recap
tchalvak Dec 29, 2023
74ffa90
Partial recaptcha signup changes.
tchalvak Dec 29, 2023
6d8120d
Recaptcha signup prep.
tchalvak Dec 29, 2023
ac37719
Remove seldom-used resources.template.php
tchalvak Dec 29, 2023
28f1aef
Recaptcha WIP, not fully working.
tchalvak Dec 30, 2023
a534c31
chore(deps): update dependency attrs to v23.2.0
renovate[bot] Jan 1, 2024
0e2918c
Basic recaptcha protection in place.
tchalvak Jan 2, 2024
cabf230
style: format code with PHP CS Fixer
deepsource-autofix[bot] Jan 2, 2024
d705308
Merge pull request #1614 from BitLucid/feat/recap
tchalvak Jan 2, 2024
e71c153
Subtlize the recaptcha.
tchalvak Jan 2, 2024
a69956f
completed v3.
tchalvak Jan 3, 2024
72578a0
Remove extra comment line.
tchalvak Jan 3, 2024
653f9a2
Merge pull request #1615 from BitLucid/feat/recap
tchalvak Jan 3, 2024
cef411d
Remove revive bowl sound for now.
tchalvak Jan 3, 2024
498ec28
Merge pull request #1616 from BitLucid/fix/use-item-ssl
tchalvak Jan 3, 2024
1541e9e
Merge pull request #1612 from BitLucid/renovate/attrs-23.x
tchalvak Jan 3, 2024
b3e12f4
Update aws sdk.
tchalvak Jan 4, 2024
da61239
yarn updates.
tchalvak Jan 4, 2024
8b1677f
Images for signup styles for the 4 ninja types.
tchalvak Jan 4, 2024
0739b78
Move to the jagged identicon icons
tchalvak Jan 4, 2024
2028c21
Merge pull request #1619 from BitLucid/feat/signup-characters
tchalvak Jan 4, 2024
f16c1e7
Cleanup signup ninja class code a bit.
tchalvak Jan 4, 2024
25c066f
Better epic for signup, oni,
tchalvak Jan 4, 2024
d4d8265
Npcs cleanup and consolidation.
tchalvak Jan 4, 2024
b40c26b
Fix html/css .money unclosed tag.
tchalvak Jan 4, 2024
fb6246a
style: format code with PHP CS Fixer
deepsource-autofix[bot] Jan 4, 2024
bd5816e
Merge pull request #1617 from BitLucid/feat/updates
tchalvak Jan 4, 2024
223b3d3
Merge pull request #1618 from BitLucid/feat/update-node-packages
tchalvak Jan 4, 2024
31c148a
Merge pull request #1620 from BitLucid/feat/signup-characters
tchalvak Jan 4, 2024
4e4fd53
Removed old amazon ad.
tchalvak Jan 4, 2024
4755440
Merge pull request #1621 from BitLucid/feat/signup-characters
tchalvak Jan 4, 2024
ec0bf74
Add images for npcs.
tchalvak Jan 4, 2024
233e07f
Npc updates, hitodama, fight.js reconfigured.
tchalvak Jan 4, 2024
d30d336
Merge pull request #1622 from BitLucid/feat/npcs
tchalvak Jan 4, 2024
a008b7f
Cleanup of npc display area.
tchalvak Jan 7, 2024
9ec58f0
Merge pull request #1625 from BitLucid/feat/npcs-alt
tchalvak Jan 7, 2024
30a6a5b
Improve ninjamaster readability to...
tchalvak Jan 7, 2024
de84fa3
Merge pull request #1626 from BitLucid/feat/npcs-alt
tchalvak Jan 7, 2024
aa9e270
Reflect server nginx config.
tchalvak Jan 7, 2024
5e0efc0
Style changes for errors, notices, profile area cleanup.
tchalvak Jan 7, 2024
76594b2
More expansive fight profile area.
tchalvak Jan 8, 2024
1eeb97b
Npc image changes and resurrect sound and image.
tchalvak Jan 8, 2024
6d345e4
More minor ui fixes.
tchalvak Jan 8, 2024
ec09d33
Merge pull request #1627 from BitLucid/feat/ninja-fight
tchalvak Jan 8, 2024
5dc1d39
Allow fontawesome in ssl config.
tchalvak Jan 8, 2024
2d938fa
Improved fight and item use area.
tchalvak Jan 8, 2024
6cd7afa
Add Sword svg template.
tchalvak Jan 8, 2024
c30f3a0
Drop the lower border on player page.
tchalvak Jan 8, 2024
661776b
Add ninjamaster clan section...
tchalvak Jan 8, 2024
cedfe1f
Additional clan list changes.
tchalvak Jan 8, 2024
8cc0cdb
Merge pull request #1628 from BitLucid/feat/font-awesome-next
tchalvak Jan 8, 2024
344fb8f
Reup GA analytics tag.
tchalvak Jan 9, 2024
bbf5af5
Merge pull request #1630 from BitLucid/feat/analytics
tchalvak Jan 9, 2024
3fa0693
Update nodes.php
tchalvak Jan 10, 2024
05ba38f
Bump follow-redirects from 1.15.1 to 1.15.4
dependabot[bot] Jan 10, 2024
cf22643
Additional ui epics and clan comp.
tchalvak Jan 10, 2024
aee344a
Merge pull request #1636 from BitLucid/feat/analytics
tchalvak Jan 10, 2024
cfe7d7b
Merge pull request #1635 from BitLucid/dependabot/npm_and_yarn/follow…
tchalvak Jan 10, 2024
4cfe374
Merge pull request #1633 from BitLucid/fix/icon-data
tchalvak Jan 10, 2024
06012ba
Clan and staff page visuals,
tchalvak Jan 10, 2024
16fe449
Fix a typehinting mismatch in signupController.
tchalvak Jan 10, 2024
cab8376
Add the various new visual images.
tchalvak Jan 10, 2024
8b79131
Make semaphore install immutable-cache.
tchalvak Jan 10, 2024
30615e1
Clan area cleanup and tweaks.
tchalvak Jan 10, 2024
c8157a0
Merge pull request #1637 from BitLucid/feat/vis
tchalvak Jan 10, 2024
eef41ed
Merge pull request #1638 from BitLucid/feat/vis2
tchalvak Jan 10, 2024
6cc0741
Add pixel logo to homepage,
tchalvak Jan 10, 2024
30f8700
Casino and field imagery.
tchalvak Jan 10, 2024
81d47b3
style: format code with PHP CS Fixer
deepsource-autofix[bot] Jan 10, 2024
be3ed79
enemies X overlap fix.
tchalvak Jan 10, 2024
0b875a2
Merge pull request #1639 from BitLucid/feat/vis2
tchalvak Jan 10, 2024
5095f76
Fix for deprecated native functions
tchalvak Jan 11, 2024
e01fa1d
Use to_integer smarty modifier.
tchalvak Jan 11, 2024
c3870df
Add weaponsmith image to the shop.
tchalvak Jan 11, 2024
17075f1
Ui tweaks.
tchalvak Jan 11, 2024
51519d0
Merge pull request #1640 from BitLucid/feat/vis4
tchalvak Jan 11, 2024
8ab5c02
Dojo and bath-house visuals updated.
tchalvak Jan 11, 2024
23c83b0
Merge pull request #1641 from BitLucid/feat/vis4
tchalvak Jan 11, 2024
fe9acbf
chore(deps): update dependency prettier to v3.2.2
renovate[bot] Jan 14, 2024
d6148b1
chore(deps): update shivammathur/setup-php action to v2.29.0
renovate[bot] Jan 15, 2024
928f4b0
Merge pull request #1645 from BitLucid/renovate/shivammathur-setup-ph…
tchalvak Jan 15, 2024
a40ba20
Merge pull request #1644 from BitLucid/renovate/prettier-3.x
tchalvak Jan 15, 2024
d8ca6d4
chore(deps): update dependency prettier to v3.2.4
renovate[bot] Jan 17, 2024
f7b26fe
chore(deps): update actions/cache action to v4
renovate[bot] Jan 17, 2024
d1102eb
Minor bath house and dojo stylistic changes.
tchalvak Jan 11, 2024
cc5e8f9
Typo fix.
tchalvak Jan 18, 2024
d327696
Merge pull request #1649 from BitLucid/feat/vis5
tchalvak Jan 18, 2024
4ae006c
Merge pull request #1648 from BitLucid/renovate/actions-cache-4.x
tchalvak Jan 19, 2024
bd4166b
Merge pull request #1647 from BitLucid/renovate/prettier-3.x
tchalvak Jan 19, 2024
388bb9d
Update searching in list
tchalvak Jan 22, 2024
42b93ef
Merge pull request #1651 from BitLucid/fix/search
tchalvak Jan 24, 2024
30b002e
chore(deps): update dependency pytest to v8
renovate[bot] Jan 28, 2024
dfd0888
chore(deps): update dependency urllib3 to v2.2.0
renovate[bot] Jan 30, 2024
e9ce5c0
chore(deps): update dependency markupsafe to v2.1.5
renovate[bot] Feb 3, 2024
52169bc
chore(deps): update dependency certifi to v2024
renovate[bot] Feb 3, 2024
92d6fff
Merge pull request #1655 from BitLucid/renovate/pytest-8.x
tchalvak Feb 3, 2024
881f2a0
Merge branch 'master' into renovate/markupsafe-2.x
tchalvak Feb 3, 2024
c454bc1
chore(deps): update dependency puppeteer to v22
renovate[bot] Feb 5, 2024
1ab7c43
Update intro.tpl
tchalvak Jan 30, 2024
09a73ba
Intro styling updates.
tchalvak Feb 9, 2024
3c2015b
Merge pull request #1658 from BitLucid/feat/intro-text-refine
tchalvak Feb 9, 2024
b6efcec
Change the logout text slightly, and hide the ads,
tchalvak Feb 9, 2024
b4717fd
Merge pull request #1666 from BitLucid/feat/loutout-text-tweak
tchalvak Feb 9, 2024
efc22be
Improvements to bathhouse template,
tchalvak Jan 19, 2024
cd86000
Merge pull request #1667 from BitLucid/feat/bathhouse
tchalvak Feb 9, 2024
7fdf77b
Improve styling of dojo level reminder.
tchalvak Jan 24, 2024
1308b52
Merge pull request #1669 from BitLucid/feat/dojo-reminder
tchalvak Feb 9, 2024
ed7d91f
Update signup_email_body.tpl
tchalvak Feb 10, 2024
d8551e6
Merge pull request #1670 from BitLucid/fix/signup-language
tchalvak Feb 10, 2024
2c1c08b
Spacing helper for dead when attacking npc.
tchalvak Feb 11, 2024
04b1f02
Merge branch 'master' into renovate/puppeteer-22.x
tchalvak Feb 11, 2024
eb20ae8
Merge branch 'master' into renovate/certifi-2024.x
tchalvak Feb 11, 2024
dabeedc
Merge branch 'master' into renovate/markupsafe-2.x
tchalvak Feb 11, 2024
2bc9f22
Merge pull request #1650 from BitLucid/renovate/markupsafe-2.x
tchalvak Feb 11, 2024
432bcb8
Merge branch 'master' into renovate/urllib3-2.x
tchalvak Feb 11, 2024
5568002
Merge pull request #1664 from BitLucid/renovate/puppeteer-22.x
tchalvak Feb 11, 2024
ef95f13
Merge branch 'master' into feat/attack-another-spacing
tchalvak Feb 11, 2024
4290451
Merge pull request #1661 from BitLucid/renovate/certifi-2024.x
tchalvak Feb 11, 2024
174564f
Merge pull request #1659 from BitLucid/renovate/urllib3-2.x
tchalvak Feb 11, 2024
73ece66
Merge pull request #1672 from BitLucid/feat/attack-another-spacing
tchalvak Feb 11, 2024
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
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .deepsource.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ enabled = true
[analyzers.meta]
environment = [
"jquery",
"jest"
"jest",
"nodejs"
]

[[analyzers]]
Expand Down
8 changes: 4 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = {
ecmaFeatures: {
jsx: true,
},
ecmaVersion: 2018,
ecmaVersion: 2020,
sourceType: 'module',
},
plugins: ['react'],
Expand All @@ -30,15 +30,15 @@ module.exports = {
],
'max-lines': [
'error',
100,
103,
],
'max-lines-per-function': [
'error',
50,
53,
],
'max-statements': [
'error',
17,
23,
],
},
};
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/.yarn/releases/** binary
/.yarn/plugins/** binary
/.yarn/cache/** binary
/yarn.lock binary
/deploy/www/css/*.min.css binary
/deploy/www/js/*.min.js binary
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package.json @tchalvak
composer.json @tchalvak
yarn.lock @tchalvak
deploy/resources.template.php @tchalvak
deploy/resources.build.php @tchalvak
amplify.yml @tchalvak
amplify/ @tchalvak
Expand Down
7 changes: 3 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# Purpose of PR:

> ---
-
-
-
>

## Before

## After

## For Non-Hotfixes:

## _Attached Screenshot of my change:_

## _Things that make review take longer:_
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/checks.yml

This file was deleted.

46 changes: 46 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Functional Tests
env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
on:
push:
branches: [master]
pull_request:
branches: [master]
jobs:
cypress-run:
runs-on: ubuntu-latest
# Runs tests in parallel with matrix strategy https://docs.cypress.io/guides/guides/parallelization
# https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
# Also see warning here https://github.com/cypress-io/github-action#parallel
env:
CYPRESS_TEST_USERNAME: ${{ vars.CYPRESS_TEST_USERNAME }}
CYPRESS_TEST_FIRST_NAME: ${{ vars.CYPRESS_TEST_FIRST_NAME }}
CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
CYPRESS_TEST_PASSWORD: ${{ secrets.CYPRESS_TEST_PASSWORD }} # Secret, not env var
strategy:
fail-fast: false # https://github.com/cypress-io/github-action/issues/48
matrix:
containers: [1, 2] # Uses 2 parallel instances
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Chrome
# Uses the official Cypress GitHub action https://github.com/cypress-io/github-action
uses: cypress-io/github-action@v6
with:
# Starts web server for E2E tests - replace with your own server invocation
# https://docs.cypress.io/guides/continuous-integration/introduction#Boot-your-server
start: echo "No-op for now"
wait-on: 'http://www.ninjawars.net' # Waits for above
# Records to Cypress Cloud
# https://docs.cypress.io/guides/cloud/projects#Set-up-a-project-to-record
record: true
parallel: true # Runs test in parallel using settings above
env:
# For recording and parallelization to work you must set your CYPRESS_RECORD_KEY
# in GitHub repo → Settings → Secrets → Actions
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
# Creating a token https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111 changes: 58 additions & 53 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -1,62 +1,67 @@
name: PHP Composer
name: PHP NW Run
env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/[email protected]
with:
php-version: '8.0'
extensions: mbstring, intl, pgsql, xml
ini-values: post_max_size=256M, max_execution_time=180
coverage: xdebug
tools: php-cs-fixer, phpunit

- name: Setup problem matchers for PHP
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"

- name: Setup problem matchers for PHPUnit
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Validate composer.json and composer.lock
run: ./composer.phar validate

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
if: steps.composer-cache.outputs.cache-hit != 'true'
run: ./composer.phar install --prefer-dist --no-progress --no-suggest

- name: Create autoload file if necessary
if: steps.composer-cache.outputs.cache-hit == 'true'
run: |
ls -halt ./vendor/
./composer.phar dump-autoload

# Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
# Docs: https://getcomposer.org/doc/articles/scripts.md

- name: Run test suite
run: |
ln -s ./resources.build.php ./deploy/resources.php
./composer.phar run-script unit-test
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/[email protected]
with:
php-version: "8.2.4"
extensions: mbstring, intl, pgsql, xml
ini-values: post_max_size=256M, max_execution_time=180
coverage: xdebug
tools: php-cs-fixer, phpunit

- name: Setup problem matchers for PHP
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"

- name: Setup problem matchers for PHPUnit
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Validate composer.json and composer.lock
run: ./composer.phar validate

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies and create autoload
if: steps.composer-cache.outputs.cache-hit != 'true'
run: |
chmod ug+x ./configure
./configure
make create-structure
make preconfig
make link-vendor
make build
# ./composer.phar install --verbose --prefer-dist --no-progress --no-interaction --no-dev --optimize-autoloader
- name: Run unit test suite
run: |
ln -sf ./resources.build.php ./deploy/resources.php
./composer.phar run-script unit-test
- name: Run test-check suite
run: |
ln -sf ./resources.build.php ./deploy/resources.php
./composer.phar run-script test-checkbase
# make db-init-all
#./composer.phar run-script test-cron
20 changes: 15 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# ignore project specific files
deploy/resources.php

# ignore composer installed files
vendor/
vendor/*
deploy/vendor/*
deploy/vendor
deploy/www/js/jquery*
deploy/www/js/bootstrap*
deploy/www/css/bootstrap*
Expand All @@ -14,6 +18,14 @@ deploy/model/orm/*
!deploy/model/orm/.gitkeep
!deploy/sql/.gitkeep

# Static Built files
deploy/www/index.html
deploy/www/intro.html

# build artifacts
deploy/artifacts/
nw-artifact/

#ignore developer specific GNU make configuration for this project
CONFIG

Expand All @@ -23,9 +35,6 @@ CONFIG
unclean
archive

# ignore composer installed files
vendor/

# Ignore vim autogenerated files
[._]*.s[a-w][a-z]
[._]s[a-w][a-z]
Expand Down Expand Up @@ -89,6 +98,7 @@ Icon
!.yarn/releases
!.yarn/sdks
!.yarn/versions
# See https://github.com/yarnpkg/berry/issues/454

node_modules/

Expand All @@ -98,5 +108,5 @@ deploy/.env
karma.conf.js
.phpunit.result.cache
.php-cs-fixer.cache
deploy/www/index.html
deploy/www/intro.html
cypress/local.json
cypress.config.js
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.18.1
20.10.0
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

$config = new PhpCsFixer\Config();
return $config->setRules([
'@PSR12' => true,
'@PSR12' => true, // This contains a ton of rules here: https://mlocati.github.io/php-cs-fixer-configurator/#version:2.16|fixer:psr12
// 'strict_param' => true,
'array_syntax' => ['syntax' => 'short'],
'braces' => [
Expand Down
1 change: 1 addition & 0 deletions .phpver
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8.2.5
Loading
Loading