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

localization #781

Open
wants to merge 111 commits into
base: gh-pages
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
f8417c6
tests/cypress-02-1. disabling video
aablatov Mar 1, 2023
123b247
Merge pull request #767 from aablatov/tests/cypress-02-1
Areso Mar 1, 2023
a611cdf
sum textz
Mar 1, 2023
4be2a9a
Merge pull request #769 from Obie-Wan/master
Areso Mar 1, 2023
c6805ab
fixed
Areso Mar 1, 2023
249f19e
fix #768
Areso Mar 1, 2023
b34eaed
fixed #765
Areso Mar 2, 2023
a6adb78
tests/cypress-01-1. rules htmlvalidate
aablatov Mar 2, 2023
f72b627
Merge branch 'master' into tests/cypress-01-1
aablatov Mar 2, 2023
161488b
tests/cypress-01-1. add
aablatov Mar 2, 2023
8f393f0
tests/cypress-01-1. extends : recommended
aablatov Mar 2, 2023
a9fbb9a
continued with localizations
Areso Mar 2, 2023
a2ff730
hotfix
Areso Mar 2, 2023
882744e
hotfix
Areso Mar 2, 2023
c1799eb
Merge pull request #770 from aablatov/tests/cypress-01-1
Areso Mar 2, 2023
a6f9ceb
localizations rewritten 196/376
Areso Mar 5, 2023
d6ef60e
fix stats issue in Night mode thus fix #773
Areso Mar 6, 2023
c56430a
Fixed layouts for displaying buttons and text when selecting a hero
aablatov Mar 7, 2023
261dd80
Merge pull request #774 from aablatov/btnHireHero
Areso Mar 7, 2023
9e2e190
tests/cypress-03. Verification of authorization and loading of the save
aablatov Mar 7, 2023
8d5c6d9
tests/cypress-03. rename yml
aablatov Mar 7, 2023
eb3986f
tests/Cypress-03. added verification of the login
aablatov Mar 9, 2023
3c0af1f
tests/Cypress-03. Exceptions in the HTMLvalidate
aablatov Mar 9, 2023
cce55bf
Merge pull request #775 from aablatov/tests/Cypress-03
Areso Mar 10, 2023
3d08c37
tests/Cypress-04. Verification the registration
aablatov Mar 10, 2023
ccc43f7
tests/Cypress-04
aablatov Mar 10, 2023
4051ae2
tests/Cypress-04. Add check authorization
aablatov Mar 10, 2023
f6e8c21
220/378 done
Areso Mar 10, 2023
723aaaa
Merge pull request #778 from aablatov/tests/Cypress-04
Areso Mar 11, 2023
176bccc
274/378
Areso Mar 11, 2023
efb522e
tests/Cypress-04-1. add clear test data
aablatov Mar 11, 2023
fbba673
tests/Cypress-04-1. add retries tests
aablatov Mar 11, 2023
16e2eb8
tests/Cypress-04-1. increasing stability
aablatov Mar 11, 2023
4c331ec
304/378
Areso Mar 12, 2023
e17f187
fixed formatting
Areso Mar 12, 2023
a02dd5a
Merge pull request #779 from aablatov/tests/Cypress-04-1
Areso Mar 12, 2023
db9f895
made startFire autotest-aware
Areso Mar 13, 2023
fe1ad99
python_localhost
aablatov Mar 14, 2023
6124c34
runs-on: was windows, now ubuntu
Areso Mar 14, 2023
cf88af3
reversed to Windows; deleted curl
Areso Mar 14, 2023
0bc8b19
chrom driver path
aablatov Mar 14, 2023
e03f985
switched to ubuntu
Areso Mar 14, 2023
82323ad
Merge branch 'python_localhost' of https://github.com/aablatov/1255-b…
aablatov Mar 14, 2023
9394111
where is chromedriver? english, do you speak it?
Areso Mar 14, 2023
f292ae1
chrom driver foreve
aablatov Mar 14, 2023
2889723
chrom driver foreve 2
aablatov Mar 14, 2023
9dcb6be
chromedriver
Areso Mar 14, 2023
5e6012f
chrom driver foreve 3
aablatov Mar 14, 2023
246f978
deleted debug commands
Areso Mar 14, 2023
cb21a58
didn't help
Areso Mar 14, 2023
760016a
Update conftest.py
Areso Mar 14, 2023
6b5b24a
Update conftest.py
Areso Mar 14, 2023
818b0d4
Merge pull request #782 from aablatov/python_localhost
Areso Mar 14, 2023
7af2d11
correction validateHTML and index.html
aablatov Mar 15, 2023
f2bd29c
tests/Cypress-05. Check langn en-US
aablatov Mar 15, 2023
83e187b
add
aablatov Mar 17, 2023
90c4c22
Merge pull request #783 from aablatov/tests/Cypress-01-2
Areso Mar 18, 2023
2118c51
add
aablatov Mar 18, 2023
ecc3a1b
Merge branch 'master' into tests/Cypress-05
aablatov Mar 18, 2023
0876b03
add yml
aablatov Mar 18, 2023
c447f36
add name job
aablatov Mar 18, 2023
a4b21fc
resolved merge conflict
Areso Mar 18, 2023
817beaa
fix #785
Areso Mar 19, 2023
45af3c5
Merge pull request #786 from aablatov/tests/Cypress-05
Areso Mar 19, 2023
e8e777e
fix #784
Areso Mar 19, 2023
2a8793d
saveCloudErrLocale
aablatov Mar 19, 2023
6b7a450
WIP new blackmarket
Areso Mar 19, 2023
9523ccc
added new template
Areso Mar 19, 2023
d2afa4f
Merge pull request #787 from aablatov/saveCloudErrLocale
Areso Mar 19, 2023
d644203
:(
Areso Mar 21, 2023
f432c4c
one more attemp, WIP
Areso Mar 21, 2023
42a054f
an idea
Areso Mar 21, 2023
dd4f8ca
refactoring content About
aablatov Mar 21, 2023
bf58228
add args
aablatov Mar 22, 2023
81696cc
correction
aablatov Mar 22, 2023
b63f7da
Merge pull request #789 from aablatov/ref_About
Areso Mar 22, 2023
5a97a81
buying is somewhat working WIP
Areso Mar 26, 2023
f81f7f4
buying almost done; WIP recalc stats
Areso Mar 26, 2023
06d006a
copypaste error fix
Areso Mar 26, 2023
9d40059
moved from the game scope sound settings DOM work
Areso Mar 26, 2023
b61319c
tests/Cypress-05-1. Acceleration of tests.
aablatov Mar 26, 2023
dfc865d
python tests repair
aablatov Mar 27, 2023
eea507d
tests cypress save repair
aablatov Mar 27, 2023
e7cf925
Merge pull request #793 from aablatov/master
Areso Mar 27, 2023
356f028
tests/Cypress-06. Сhecking object properties
aablatov Mar 27, 2023
e22aeaa
Merge pull request #794 from aablatov/tests/Cypress-06
Areso Mar 28, 2023
7588f8a
add check objects_technology_tree
aablatov Mar 28, 2023
21182fa
Merge pull request #795 from aablatov/tests/Cypress-06
Areso Mar 28, 2023
f9f0465
Few icons for game
Mar 31, 2023
2511637
Old pop icons
Mar 31, 2023
3318cb3
Merge pull request #796 from Voldus/master
Areso Mar 31, 2023
cc65652
add valid schemas
aablatov Apr 1, 2023
fbd15d1
add
aablatov Apr 1, 2023
ef537ae
iniate flush
Areso Apr 1, 2023
99bac4f
update import JSON in unit test
aablatov Apr 2, 2023
4009ede
delete url
aablatov Apr 2, 2023
a1ba0d8
Merge pull request #797 from aablatov/tests/Cypress-07
Areso Apr 2, 2023
bcd7982
update jsonpoiter ver 5.0.1 in package-lock.json
aablatov Apr 11, 2023
a1e75ab
Merge pull request #798 from aablatov/update-jsonpoiter
Areso Apr 12, 2023
f42f2a3
Building tab styles upd
Jun 22, 2023
40f2b9e
Merge branch 'Areso:master' into master
Voldus Jun 22, 2023
f6c3585
added design document
Areso Jun 24, 2023
59882a2
Merge pull request #800 from Voldus/master
Areso Jun 25, 2023
e8b5c6e
fixed Discord link
Areso Sep 14, 2023
ee3287e
fixed Discord Link
Areso Sep 14, 2023
439f97d
added Graveyard
Areso Sep 19, 2023
99de1dc
Bump get-func-name from 2.0.0 to 2.0.2 in /tests/tests_cypress/unit
dependabot[bot] Sep 27, 2023
f0ea122
Merge pull request #801 from Areso/dependabot/npm_and_yarn/tests/test…
Areso Oct 8, 2023
205cce1
customizations
sharma-shray Apr 1, 2024
d8fdec8
some
sharma-shray Apr 1, 2024
a8ebb11
Merge pull request #812 from sharma-shray/view
Areso Apr 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE/proposal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
name: Proposal
about: Create a proposal to help us improve
title: ''
labels: question/proposal
assignees: Areso

---

1. Describe what you want to improve (if it is already here)
OR
2. Describe what you want to add (if it is not yet presented)
3. You could add schemas, images, drafts, anything drawn digital or manually (photo taken of that)
22 changes: 22 additions & 0 deletions .github/workflows/cypress_SP.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: "PROD Check save Game"

on:
pull_request:
push:
workflow_call:
workflow_dispatch:

jobs:
smoke_job:
name: Cypress PROD Check save Game
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: cypress run
uses: cypress-io/github-action@v5
with:
working-directory: tests/tests_cypress/smoke_prod
start: npm run start
23 changes: 23 additions & 0 deletions .github/workflows/cypress_unit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: "Unit tests"

on:
pull_request:
push:
workflow_call:
workflow_dispatch:

jobs:
smoke_job:
name: Cypress unit tests
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: cypress run
uses: cypress-io/github-action@v5
with:
working-directory: tests/tests_cypress/unit
run: npm install chai-json-schema
start: npm run start
31 changes: 31 additions & 0 deletions .github/workflows/cypress_verificationLang.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: "Verification language"

on:
pull_request:
push:
workflow_call:
workflow_dispatch:

jobs:
smoke_job:
name: Cypress Verification language
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: run server with the front of the game
run: python3 -m http.server 8080 &

- name: check whether game is UP
run: |
curl -X GET "http://localhost:8080/"

- name: cypress run
uses: cypress-io/github-action@v5
with:
working-directory: tests/tests_cypress/check_langs
start: |
npm install --save-dev html-validate cypress-html-validate
npm run start
11 changes: 9 additions & 2 deletions .github/workflows/seleinium-pytest-smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,19 @@ on:
jobs:
smoke_job:
name: Smoke tests
runs-on: windows-latest
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3


- name: run server with the front of the game
run: python3 -m http.server 8080 &

- name: check whether game is UP
run: |
curl -X GET "http://localhost:8080/"

- name: Install python requirements
run: pip install -r ./tests/selenium/requirements.txt

Expand Down
7,626 changes: 7,625 additions & 1 deletion .gitignore

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions .htmlvalidate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"extends": [
"html-validate:recommended"
],
"rules": {
"element-required-attributes": [
"warn",
{
"exclude": [
"html lang"
]
}
],
"require-sri": "warn",
"script-type": "warn",
"wcag/h30": "warn",
"wcag/h37": "warn",
"heading-level": "warn",
"element-permitted-content": "warn",
"input-missing-label": "warn",
"no-deprecated-attr": "warn",
"attribute-allowed-values": "warn",
"element-name": "warn",
"attribute-boolean-style": "warn",
"no-inline-style": "warn",
"valid-id": "warn",
"void-style": "warn"
},
"elements": [
"html5"
]
}
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<img src="https://img.shields.io/github/issues/Areso/1255-burgomaster">
<img src="https://img.shields.io/github/issues-closed/Areso/1255-burgomaster">
<img src="https://img.shields.io/github/commit-activity/m/Areso/1255-burgomaster?foo=bar">
<a href="https://discord.com/invite/gHzurTMa?utm_source=Discord%20Widget&utm_medium=Connect">
<a href="https://discord.com/invite/YQXV2ZXyUX?utm_source=Discord%20Widget&utm_medium=Connect">
<img src="https://img.shields.io/discord/564554640755130409?label=Discord&logo=Discord"></a>
<h2>Play the game</h2><br>
<!--<a href="https://areso.github.io/1255-burgomaster">Play the game in web</a><br>-->
Expand Down Expand Up @@ -69,5 +69,19 @@
ALL GRAPHIC AND SOUND ASSETS UNDER PROPRIETARY LICENSE.<br>
YOU MAY NOT REDISTRIBUTE THE GAME WITH THE ASSETS VIA PUBLISHING IN INTERNET, STORES, OR ANY OTHER WAY<br>
YOU MAY USE ASSETS ONLY FOR LOCAL RUNNING<br>
<br>
<h2>The Graveyard list</h2><br>
Here lie projects, which started around the same time (or later) and already dead:<br>
<ul>
<li>Babylon's Fall publisher Square Enix (2022, March 3 - 2023, February 27)</li>
<li>Hyper Scape publisher Ubisoft (2020 Aug - 2022, April 28) </li>
<li>Crowfall (2021-2022, November 22)</li>
<li>Super Bomberman R Online by Konami (2021 June-2022, December 1)</li>
<li>Scavangers by Behaviour Interactive (2021-2022, December 16)</li>
<li>Fuser (2020, November - 2022, December 19)</li>
<li>Dead and Buried II publisher Facebook (2019-2023)</li>
<li>Bogo publisher Facebook (2019-2023)</li>
</ul><br>
Only open sourced games could run as long as at least one of their fun exists
</body>
<html>
58 changes: 47 additions & 11 deletions css/game.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,29 @@ body {
padding: 4px;
}

#loadGameButton:hover,
#saveGameButton:hover {
transition: 0.4s;
cursor: pointer;
background-color: #555;
color: #fff;
border-color: #fff;
}

#saveGameButton {
top:150px;
font-weight: bold;
transition: 0.4s;
width: 140px;
height: 30px;
bottom:20px;
left: 20px
}

#loadGameButton {
top:210px;
font-weight: bold;
width: 140px;
height: 30px;
bottom: 60px;
left: 20px;
display: none;
}
Expand Down Expand Up @@ -197,6 +213,7 @@ body {
.building-wrapper {
flex: 0 0 80%;
overflow-y: auto;
background-color: #FFFEF5;
}

.building-list {
Expand All @@ -211,15 +228,18 @@ body {
.building-card {
max-width: 184px;
width: 100%;
height: 182px;
height: 200px;
margin-bottom: 10px;
display: flex;
flex-direction: column;
}

.building-card__img {
height: 124px;
background-color: #f7f7f7;
border: 1px solid #999;
display: flex;
flex: 1;
background-color: #EAE9E1;
display: flex;
border-radius: 30px 30px 0 0;
}

.building-card__img > img {
Expand All @@ -228,9 +248,9 @@ body {

.building-card__action {
height: 56px;
margin-top: 3px;
border: 1px solid #999;
background-color: #f7f7f7;
border-radius: 0 0 30px 30px;
overflow: hidden;
background-color: #d1cfbd;
}

#lbl_online {
Expand All @@ -241,6 +261,13 @@ body {
width: 100%;
height: 100%;
border: none;
background: #627CDD;
color: #fff;
line-height: 1.2;
}

.building-card__action > button:hover {
background-color: #4b6ad8;
}


Expand Down Expand Up @@ -285,6 +312,7 @@ body {
position: absolute;
left: 20px;
top: 100px;
border-radius: 0.3rem;
border: 1px solid #333;
display:none;
}
Expand Down Expand Up @@ -336,8 +364,8 @@ body {
align-self: center;
}

#marketList,
#heroMarketList {
#tabBlackMarketTraderGoods,
#tabBlackMarketHeroGoods {
overflow-y: auto;
height: 100%;
max-height: 175px;
Expand Down Expand Up @@ -414,6 +442,14 @@ body {
overflow-y: auto;
}

.dynamicCellsNight {
color: #c1c1c1;
}

.dynamicCellsDay {
color: #000000;
}

#lblGoodsForSale,
#lblGoodsForBuying {
margin-bottom: 12px;
Expand Down
Loading
Loading