Merge pull request #4 from marmelab/features/games-list-view

First ressources lists: user and game.

.env.sample

@@ -1,7 +1,8 @@
 # Configure your dev environment 
-DATABASE_PORT=<the postgrest port>
-DATABASE_USER=<your username>
-DATABASE_PASSWORD=<your password>
+DATABASE_PORT=<wanted postgres database port>
+DATABASE_USER=<wanted postgres database username>
+DATABASE_PASSWORD=<wanted postgres database password>
+
 DATABASE_NAME=connect_four_reboot_admin
 PGRST_DB_ANON_ROLE=web_anon
-PGRST_DB_SCHEMA=api
+PGRST_DB_SCHEMA=public

.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Check TypeScript types
+        run: npm run type-check
+
+      # - name: Run tests
+      #   run: npm test

.gitignore

@@ -5,6 +5,7 @@ build
 coverage/
 .vscode
 .env
+.vite/
 
 # React Router
 /.react-router/

README.md

@@ -56,6 +56,14 @@ database with:
 make create-db
 ```
 
+tips:
+
+```sh
+make run
+```
+
+this goal do all for you.
+
 ## Installation connect-four-reboot-admin frontend
 
 Install the react-admin application dependencies by running:

docker-compose.yml

@@ -6,21 +6,30 @@ services:
     depends_on:
       - database-postgres
     environment:
-      - PGRST_DB_URI=postgres://${DATABASE_USER}:${DATABASE_PASSWORD}@postgres:${DATABASE_PORT}/${DATABASE_NAME}
+      - PGRST_DB_URI=postgres://${DATABASE_USER}:${DATABASE_PASSWORD}@database-postgres:${DATABASE_PORT}/${DATABASE_NAME}
       - PGRST_DB_SCHEMA=${PGRST_DB_SCHEMA}
       - PGRST_DB_ANON_ROLE=${PGRST_DB_ANON_ROLE}
+    networks:
+      - your_network
 
   database-postgres:
     image: postgres:14
     ports:
-      - "${DATABASE_PORT}:${DATABASE_PORT}"
+      - "${DATABASE_PORT}:5432"
     environment:
       - POSTGRES_USER=${DATABASE_USER}
       - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
       - POSTGRES_DB=${DATABASE_NAME}
     volumes:
       - pgdata:/var/lib/postgresql/data
       - ./scripts:/scripts:ro
+    networks:
+      - your_network
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "${DATABASE_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 networks:
   your_network:

makefile

@@ -20,6 +20,15 @@ build : ## build the react-admin server.
 run-ra-dev: ## run the react-admin server.
 	npm run dev
 
+## Run
+########
+
+run: ## fresh run of all you need to use the app
+	make run-postgrest-docker && make create-model && make populate-db && make run-ra-dev
+
+stop: ## stop the docker
+	make stop-postgrest-docker
+
 ## Docker - postrgrest / postgres
 #################################
 
@@ -39,14 +48,19 @@ create-db: ## initialize an empty ready to use db inside the docker - use it onl
 	docker exec -i connect-four-reboot-admin-database-postgres-1 sh -c 'psql -U $(DATABASE_USER) -c "CREATE DATABASE $(DATABASE_NAME);"'
 
 drop-db: ## drop the postgres db inside the docker.
-	docker exec -i connect-four-reboot-admin-database-postgres-1 sh -c 'psql -U $(DATABASE_USER) -c "DROP DATABASE IF EXISTS $(DATABASE_NAME);"'
+	docker exec -i connect-four-reboot-admin-database-postgres-1 sh -c \
+'psql -U postgres -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '\''connect_four_reboot_admin'\'';"' && docker exec -i connect-four-reboot-admin-database-postgres-1 sh -c 'psql -U $(DATABASE_USER) -c "DROP DATABASE IF EXISTS $(DATABASE_NAME);"'
 
 create-model: ## create the connect-four-reboot-admin tables.
 	docker exec connect-four-reboot-admin-database-postgres-1 sh -c 'psql -U $(DATABASE_USER) -d $(DATABASE_NAME) -f /scripts/create_model.sql'
 
 populate-db: ## populate database with fake values
 	npx tsx tools/populateDbWithFakeData.ts
 
+reset-db: 
+	make drop-db && make create-db && make create-model && make populate-db
+
+
 ## Dev quality
 ##############
 
@@ -58,3 +72,4 @@ lint:  ## run linter
 
 format: ## run prettier
 	npm run format
+

package.json

@@ -21,6 +21,8 @@
     "@emotion/styled": "^11.14.0",
     "@mui/icons-material": "^6.4.0",
     "@mui/material": "^6.4.0",
+    "@raphiniert/ra-data-postgrest": "^2.4.1",
+    "@types/pg": "^8.11.11",
     "dotenv": "^16.4.7",
     "faker": "^6.6.6",
     "react": "^19.0.0",

scripts/create_model.sql

@@ -2,7 +2,7 @@ CREATE ROLE web_anon NOLOGIN;
 GRANT USAGE ON SCHEMA public TO web_anon;
 
 ALTER DEFAULT PRIVILEGES IN SCHEMA public
-GRANT SELECT, INSERT, UPDATE, DELETE ON tables TO web_anon;
+GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO web_anon;
 
 CREATE TABLE IF NOT EXISTS leagues (
     id SERIAL PRIMARY KEY,