Skip to content

Commit d380480

Browse files
vtm9vtm9
committed
Merge master
1 parent 84ab8f1 commit d380480

34 files changed

Lines changed: 1180 additions & 473 deletions

File tree

‎.github/workflows/master.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
services:
1313
db:
14-
image: postgres:10.11
14+
image: postgres:10.11-alpine
1515
ports: ['5432:5432']
1616
options: >-
1717
--health-cmd pg_isready

‎.github/workflows/pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
services:
1212
db:
13-
image: postgres:10.11
13+
image: postgres:10.11-alpine
1414
ports: ['5432:5432']
1515
options: >-
1616
--health-cmd pg_isready

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ test-code-checkers:
1818
make -C ./services/app/ test-code-checkers
1919

2020
terraform-vars-generate:
21-
docker run -it -v $(CURDIR):/app -w /app williamyeh/ansible:ubuntu18.04 ansible-playbook ansible/terraform.yml -i ansible/production -vv --vault-password-file=tmp/ansible-vault-password
21+
docker run --rm -it -v $(CURDIR):/app -w /app williamyeh/ansible:alpine3 ansible-playbook ansible/terraform.yml -i ansible/production -vv --vault-password-file=tmp/ansible-vault-password
2222

2323
setup: setup-env compose-setup
2424

2525
setup-env:
26-
docker run -v $(CURDIR):/app -w /app williamyeh/ansible:ubuntu18.04 ansible-playbook ansible/development.yml -i ansible/development -vv
26+
docker run --rm -v $(CURDIR):/app -w /app williamyeh/ansible:alpine3 ansible-playbook ansible/development.yml -i ansible/development -vv
2727

2828
setup-env-local:
2929
ansible-playbook ansible/development.yml -i ansible/development -vv
@@ -32,7 +32,7 @@ ansible-edit-secrets:
3232
ansible-vault edit --vault-password-file tmp/ansible-vault-password ansible/production/group_vars/all/vault.yml
3333

3434
ansible-vault-edit-production:
35-
docker run -v $(CURDIR):/app -it -w /app williamyeh/ansible:ubuntu18.04 ansible-vault edit --vault-password-file tmp/ansible-vault-password ansible/production/group_vars/all/vault.yml
35+
docker run --rm -it -v $(CURDIR):/app -w /app williamyeh/ansible:alpine3 ansible-vault edit --vault-password-file tmp/ansible-vault-password ansible/production/group_vars/all/vault.yml
3636

3737
release:
3838
make -C services/app release

‎README.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Codebattle - is an open source game being developed by the Hexlet community.
99
The current version of the application is available at [codebattle.hexlet.io](https://codebattle.hexlet.io).
10-
We also have [chrome extension](https://chrome.google.com/webstore/detail/codebattle-web-extension/embfhnfkfobkdohleknckodkmhgmpdli). Which allow subscribe on last game updates.
10+
We also have [chrome extension](https://chrome.google.com/webstore/detail/codebattle-web-extension/embfhnfkfobkdohleknckodkmhgmpdli). Which allow to subscribe on last game updates.
1111
### Requirements
1212

1313
- Mac / Linux
@@ -117,3 +117,10 @@ Add your user to the docker group.
117117
sudo usermod -aG docker $USER
118118
```
119119

120+
---
121+
122+
[![Hexlet Ltd. logo](https://raw.githubusercontent.com/Hexlet/assets/master/images/hexlet_logo128.png)](https://hexlet.io?utm_source=github&utm_medium=link&utm_campaign=codebattle)
123+
124+
This repository is created and maintained by the team and the community of Hexlet, an educational project. [Read more about Hexlet](https://hexlet.io?utm_source=github&utm_medium=link&utm_campaign=codebattle).
125+
126+
See most active contributors on [hexlet-friends](https://friends.hexlet.io/).

‎docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ services:
2323
- db
2424

2525
db:
26-
image: postgres:10.11
26+
image: postgres:10.11-alpine
2727
environment:
2828
POSTGRES_USER: ${CODEBATTLE_DB_USERNAME}
2929
volumes:
3030
- pg_data:/var/lib/postgresql/data
3131

3232
# same db but forwards port to host
3333
db-local:
34-
image: postgres:10.11
34+
image: postgres:10.11-alpine
3535
ports:
3636
- "5432:${CODEBATTLE_DB_PORT}"
3737
environment:

‎k8s/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PWD:=$(shell pwd)
22

3-
kb-%: export KUBECONFIG=$(PWD)/kubeconfig.yml
4-
helm-%: export KUBECONFIG=$(PWD)/kubeconfig.yml
3+
kb-%: export KUBECONFIG=$(PWD)/../.kube/config
4+
helm-%: export KUBECONFIG=$(PWD)/../.kube/config
55
kb-app-%: POD_NAME = $(shell kubectl get pod -l "app.kubernetes.io/instance=app" -o name --kubeconfig=$(KUBECONFIG))
66

77
kb-get-pods:
@@ -13,7 +13,7 @@ kb-get-nodes:
1313
helm-init: helm-install-app
1414

1515
helm-upgrade-app:
16-
helm upgrade --install --kubeconfig=../.kube/config app $(PWD)/app-chart
16+
helm upgrade --install app $(PWD)/app-chart
1717

1818
helm-rollback-app:
1919
helm rollback app 108

‎make-compose.mk‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ compose-down:
1313
docker-compose down -v || true
1414

1515
compose-test-code-checkers:
16-
docker-compose run app mix test test/code_check
16+
docker-compose run --rm --name codebattle_app app mix test test/code_check
1717

1818
compose-test-yarn:
19-
docker-compose run app yarn test
19+
docker-compose run --rm --name codebattle_app app yarn test
2020

2121
compose-test:
22-
docker-compose run app mix test --exclude code_check
22+
docker-compose run --rm --name codebattle_app app mix test --exclude code_check
2323

2424
compose-kill:
2525
docker-compose kill
@@ -28,36 +28,36 @@ compose-bash:
2828
docker-compose run app bash
2929

3030
compose-install-mix:
31-
docker-compose run app mix deps.get
31+
docker-compose run --rm --name codebattle_app app mix deps.get
3232

3333
compose-install-yarn:
34-
docker-compose run app yarn
34+
docker-compose run --rm --name codebattle_app app yarn
3535

3636
compose-install: compose-install-mix compose-install-yarn
3737

3838
compose-setup: compose-down compose-build compose-install compose-db-init
3939

4040
compose-db-init:
41-
docker-compose run app mix ecto.create
42-
docker-compose run app mix ecto.migrate
43-
docker-compose run app mix run priv/repo/seeds.exs
41+
docker-compose run --rm --name codebattle_app app mix ecto.create
42+
docker-compose run --rm --name codebattle_app app mix ecto.migrate
43+
docker-compose run --rm --name codebattle_app app mix run priv/repo/seeds.exs
4444

4545
compose-db-migrate:
46-
docker-compose run app mix ecto.migrate
46+
docker-compose run --rm --name codebattle_app app mix ecto.migrate
4747

48-
compose-lint: compose-mix-format compose-mix-credo compose-lint-js-fix
48+
compose-lint: compose-mix-format compose-mix-credo compose-lint-js-fix
4949

5050
compose-mix-format:
51-
docker-compose run app mix format
51+
docker-compose run --rm --name codebattle_app app mix format
5252

5353
compose-mix-credo:
5454
docker-compose run app mix credo
5555

5656
compose-lint-js-fix:
57-
docker-compose run app yarn lint --fix
57+
docker-compose run --rm --name codebattle_app app yarn lint --fix
5858

5959
compose-console:
60-
docker-compose run app iex -S mix
60+
docker-compose run --rm --name codebattle_app app iex -S mix
6161

6262
compose-restart:
6363
docker-compose restart
@@ -72,13 +72,13 @@ compose-upload-asserts:
7272
rm -rf $(ASSERTS_PATH)
7373
git clone "https://github.com/hexlet-codebattle/battle_asserts.git" $(ASSERTS_PATH)
7474
cd $(ASSERTS_PATH) && make generate-from-docker
75-
docker-compose run --rm -v $(CURDIR)/tmp:/app/tmp app mix issues.upload $(ASSERTS_PATH)/issues
75+
docker-compose run --rm --name codebattle_app -v $(CURDIR)/tmp:/app/tmp app mix issues.upload $(ASSERTS_PATH)/issues
7676

7777
compose-build-dockers:
78-
docker-compose run app mix dockers.build ${lang}
78+
docker-compose run --rm --name codebattle_app app mix dockers.build ${lang}
7979

8080
compose-pull-dockers:
81-
docker-compose run app mix dockers.pull ${lang}
81+
docker-compose run --rm --name codebattle_app app mix dockers.pull ${lang}
8282

8383
compose-push-dockers:
84-
docker-compose run app mix dockers.push ${lang}
84+
docker-compose run --rm --name codebattle_app app mix dockers.push ${lang}

‎services/app/assets/css/style.scss‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ $body-bg: #e5e5e5;
22
$success: #82b792;
33
$secondary: #477591;
44
$link-color: black;
5+
$error: #dc3545;
56
$orange: rgba(238, 55, 55, 0.76);
67
$link-hover-color: $orange;
78
$border-radius-sm: 0%;
@@ -270,6 +271,40 @@ a {
270271
max-width: 350px;
271272
}
272273

274+
.cb-check-result-bar {
275+
width: 144px;
276+
height: 9px;
277+
background: white;
278+
position: relative;
279+
border-radius: 10px;
280+
281+
& > .cb-asserts-progress {
282+
position: absolute;
283+
height: 100%;
284+
border-radius: 10px;
285+
background: #809b88;
286+
}
287+
&.failure {
288+
& > .cb-asserts-progress {
289+
background: $success;
290+
}
291+
}
292+
&.error {
293+
& > .cb-asserts-progress {
294+
background: $error;
295+
width: 100% !important;
296+
}
297+
}
298+
&.started {
299+
background: #bebebe;
300+
}
301+
}
302+
303+
.cb-player-loading {
304+
position: absolute;
305+
left: 55px;
306+
}
307+
273308
.cb-polyglot {
274309
width: 50px;
275310
height: 50px;
@@ -386,6 +421,10 @@ a {
386421
opacity: 0;
387422
}
388423

424+
.cb-opacity-50 {
425+
opacity: 0.5;
426+
}
427+
389428
.x-bg-gray {
390429
background-color: $gray-300 !important;
391430
}

‎services/app/assets/js/widgets/components/PlayerLoading.jsx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import React from 'react';
2+
import ReactLoading from 'react-loading';
3+
4+
const PlayerLoading = ({ small = false, show = false }) => {
5+
const size = small ? 30 : 50;
6+
return (
7+
<ReactLoading className={`cb-player-loading ${!show && 'invisible'}`} type="spin" color="#6c757d" height={size} width={size} />
8+
);
9+
};
10+
11+
export default PlayerLoading;

‎services/app/assets/js/widgets/config/hashLinkNames.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export default {
2+
default: '',
3+
lobby: '#lobby',
4+
tournaments: '#tournaments',
5+
completedGames: '#completedGames',
6+
};

0 commit comments

Comments
 (0)