Feat/move to poker

.github/workflows/build-and-test.yml

@@ -11,6 +11,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
       - name: Build and Test
         uses: actions-rs/tarpaulin@v0.1
         with:

.gitignore

@@ -1,6 +1,6 @@
 # Backend
 backend/target/
-backend/watch-target/
+backend/*-target/
 backend/.sled/
 backend/tarpaulin-report.html
 

Dockerfile

@@ -1,7 +1,7 @@
 # Image based on https://shaneutt.com/blog/rust-fast-small-docker-image-builds/
 
 # Backend-Builder
-FROM rust:latest as be-builder
+FROM rust:1.50-slim as be-builder
 WORKDIR /usr/src/secret_clan
 COPY backend/Cargo.lock Cargo.lock
 COPY backend/Cargo.toml Cargo.toml

Makefile

@@ -1,27 +1,39 @@
 watch-fe:
 	cd frontend && npm run watch
-
 watch-be:
 	cd backend && LOG_LEVEL=info cargo watch -x 'run --target-dir watch-target' -w 'src' -c -i 'src/model/proto'
 
 test-be:
-	cd backend && cargo tarpaulin --out Html --exclude-files src/model/proto/*
+	cd backend && cargo tarpaulin --out Html --exclude-files src/model/proto/*  --target-dir test-target
 
 bench:
 	cd backend && cargo bench
 
 build-fe:
 	cd frontend && npm run build
-
 build-be:
 	cd backend && cargo build
-
 build:
-	DOCKER_BUILDKIT=1 docker build -t secret_clan .
+	DOCKER_BUILDKIT=1 docker build -t floric/neuland .
+
+lint-fe:
+	cd frontend && npm run lint
+lint-be:
+	cd backend && cargo clippy
+lint:
+	lint-be
+	line-fe
 
 run:
-	docker run --rm -it -p 3333:3333 secret_clan
+	docker run --rm -it -p 3333:3333 floric/neuland
+
+release:
+	docker push floric/neuland
 
-protoc:
+proto:
 	protoc --proto_path=./schema message.proto --plugin=./frontend/node_modules/.bin/protoc-gen-ts_proto --ts_proto_opt=env=browser --ts_proto_opt=useOptionals=true --ts_proto_opt=oneof=unions --ts_proto_out=./frontend/src/types/proto message.proto
-	protoc --proto_path=./schema --rust_out=./backend/src/model/proto message.proto
+	protoc --proto_path=./schema --rust_out=./backend/src/model/proto message.proto
+	protoc --proto_path=./schema --rust_out=./backend/src/model/proto game.proto
+	protoc --proto_path=./schema --rust_out=./backend/src/model/proto player.proto
+	protoc --proto_path=./schema --rust_out=./backend/src/model/proto card.proto
+	protoc --proto_path=./schema --rust_out=./backend/src/model/proto task.proto