got graphql server running

kmurf1999 · Dec 20, 2020 · ebcf249 · ebcf249
1 parent 4e8d7d8
commit ebcf249
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 80 deletions.
diff --git a/api/Cargo.lock b/api/Cargo.lock
diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "warp-api-starter-template"
+name = "holdemsolver-api"
 version = "0.1.0"
-authors = ["Aslam Ahammed <[email protected]>"]
+authors = ["Kyle Murphy <[email protected]>"]
 edition = "2018"
 
 # [[bin]]
@@ -13,7 +13,7 @@ anyhow = "1.0.34"
 thiserror = "1.0.20"
 clap = "3.0.0-beta.2"
 dotenv = "0.15.0"
-tracing = "0.1.15"
+tracing = "0.1.16"
 tracing-subscriber = "0.2.15"
 serde = "1.0.114"
 serde_json = "1.0.59"

diff --git a/api/migrations/1970-01-01-000000_movine_init/down.sql b/api/migrations/1970-01-01-000000_movine_init/down.sql
diff --git a/api/migrations/1970-01-01-000000_movine_init/up.sql b/api/migrations/1970-01-01-000000_movine_init/up.sql
diff --git a/api/migrations/2020-07-06-120855_create_accounts_table/down.sql b/api/migrations/2020-07-06-120855_create_accounts_table/down.sql
diff --git a/api/migrations/2020-07-06-121519_create_sessions_table/down.sql b/api/migrations/2020-07-06-121519_create_sessions_table/down.sql
diff --git a/api/scripts/run_dev.sh b/api/scripts/run_dev.sh
@@ -3,9 +3,9 @@
 # postgres is just starting up, may not accept connections right away
 sleep 5
 # Run database migration fixes
-movine init
-movine status
-movine fix
+# movine init
+# movine status
+# movine fix
 
 # Run server with cargo watch and systemfd for autoreload
 systemfd --no-pid -s http::0.0.0.0:3535 -- cargo watch -x run

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -19,9 +19,9 @@ services:
       - ./api:/api
     env_file:
       - ./.env.dev
-    # environment:
-    #   RUST_LOG: info
-    #   DATABASE_URL: postgres://mydb:changeme@db:5432/mydb
+    environment:
+      RUST_LOG: info
+      DATABASE_URL: postgres://postgres:postgres@db:5432/postgres
     #   REDIS_URL: redis://cache:6379/
     #   JWT_SECRET: ITS A SECRET
     #   ARGON_SECRET: ITS ANOTHER SECRET
@@ -38,6 +38,7 @@ services:
       - 5432:5432
     volumes:
       - ./data:/var/lib/postgresql/data
+      - ./migrations/up:/docker-entrypoint-initdb.d/
     env_file:
       - ./.env.dev
     # environment:
@@ -51,3 +52,9 @@ services:
     ports:
       - 6379:6379
     restart: always
+
+  adminer:
+    image: adminer
+    restart: always
+    ports:
+      - 8080:8080
diff --git a/...07-06-120855_create_accounts_table/up.sql → migrations/up/create_accounts.sql b/...07-06-120855_create_accounts_table/up.sql → migrations/up/create_accounts.sql
diff --git a/...07-06-121519_create_sessions_table/up.sql → migrations/up/create_sessions.sql b/...07-06-121519_create_sessions_table/up.sql → migrations/up/create_sessions.sql