merges remaining changes from main.

Author: lmcdonough

README.md

@@ -54,63 +54,14 @@ The platform itself is useful for professional independent coaches, informal men
 
    Please note that the script assumes that the password for the new PostgreSQL user is `password`. If you want to use a different password, you'll need to modify the script accordingly.
 
-<<<<<<< HEAD
-### Set Up Database Manually
-
-Note: these are commands meant to run against a real PostgreSQL server with an admin-level user.
-
-```sql
--- create new database `refactor_platform`
-CREATE DATABASE refactor_platform;
-```
-
-Change to the `refactor_platform` DB visually if using an app like Postico, otherwise change using the PostgreSQL CLI:
-
-```sh
-\c refactor_platform
-```
-
-```sql
--- create new database user `refactor`
-CREATE USER refactor WITH PASSWORD 'password';
--- create a new schema owned by user `refactor`
-CREATE SCHEMA IF NOT EXISTS refactor_platform AUTHORIZATION refactor;
--- check to see that the schema `refactor_platform` exists in the results
-SELECT schema_name FROM information_schema.schemata;
--- grant all privileges on schema `refactor_platform` to user `refactor`
-GRANT ALL PRIVILEGES ON SCHEMA refactor_platform TO refactor;
-```
-
-### Run Migrations
-
-Note: this assumes a database name of `refactor_platform`.
-
-```bash
-DATABASE_URL=postgres://refactor:password@localhost:5432/refactor_platform sea-orm-cli migrate up -s refactor_platform
-```
-
-### Generate a New Entity from Database
-
-Note that to generate a new entity using the CLI you must ignore all other tables using the `--ignore-tables` option. You must add the option for _each_ table you are ignoring.
-
-```bash
-DATABASE_URL=postgres://refactor:password@localhost:5432/refactor_platform sea-orm-cli generate entity -s refactor_platform -o entity/src -v --with-serde both --serde-skip-deserializing-primary-key --ignore-tables {table to ignore} --ignore-tables {other table to ignore}
-```
-
-=======
->>>>>>> main
 ## Starting the Backend
 
 To run the backend directly outside of a container:
 
 The first example will start the backend with log level DEBUG and attempt to connect to a Postgres DB server on the same machine with user `refactor` and password `password` on port `5432` and selecting the database named `refactor_platform`.
 
 ```bash
-<<<<<<< HEAD
-cargo run -- -l DEBUG -d postgres://refactor:password@localhost:5432/refactor_platform
-=======
 cargo run --  --tiptap-url https://<TIPTAP_APP_ID>.collab.tiptap.cloud --tiptap-auth-key=<TIPTAP_API_SECRET> --tiptap-jwt-signing-key=<TIPTAP_CLOUD_APP_SECRET> --tiptap-app-id=<TIPTAP_APP_ID>
->>>>>>> main
 ```
 
 To run with a custom Postgresql connection string:
@@ -131,13 +82,9 @@ cargo run -- --allowed-origins="http://192.168.1.2:3000,https://192.168.1.2:3000
 
 _This Rust-based backend/web API connects to a PostgreSQL database. It uses Docker and Docker Compose for local development and deployment, including utilities for database management and migrations. You can run PostgreSQL locally (via Docker) or remotely by configuring environment variables._
 
-<<<<<<< HEAD
-### Quickstart
-=======
 ---
 
 ### Building and Running Locally or Remotely in Containers
->>>>>>> main
 
 1. **Install Prerequisites**:
    - [Docker](https://www.docker.com/products/docker-desktop) (20+)
@@ -316,17 +263,6 @@ Remember to replace `<your-github-username>` with your actual GitHub username.
 
 ## Project Directory Structure
 
-<<<<<<< HEAD
-- `docs` - project documentation including architectural records, DB schema, API docs, etc.
-- `domain` - layer of abstraction above `entity_api` and intended to encapsulate most business logic. Ex. interactions between `entity_api` and network calls to the outside world.
-- `entity_api` - data operations on the various `Entity` models
-- `entity` - shape of the data models and the relationships to each other
-- `migration` - relational DB SQL migrations
-- `scripts` - contains handy developer-related scripts that make working with this codebase more straightforward
-- `service` - CLI flags, environment variables, config handling, and backend daemon setup
-- `src` - contains a main function that initializes logging and calls all sub-services
-- `web` - API endpoint definition, routing, handling of request/responses, controllers
-=======
 `docs` - project documentation including architectural records, DB schema, API docs, etc
 
 `domain` - Layer of abstraction above `entity_api` and intended to encapsulate most business logic. Ex. interactions between `entity_api` and network calls to the outside world.
@@ -391,4 +327,3 @@ Note that to generate a new Entity using the CLI you must ignore all other table
 ```bash
  DATABASE_URL=postgres://refactor:password@localhost:5432/refactor_platform sea-orm-cli generate entity  -s refactor_platform -o entity/src -v --with-serde both --serde-skip-deserializing-primary-key --ignore-tables {table to ignore} --ignore-tables {other table to ignore}
 ```
->>>>>>> main

entity_api/Cargo.toml

@@ -14,15 +14,10 @@ log = "0.4.22"
 axum-login = "0.17.0"
 async-trait = "0.1.83"
 password-auth = "1.0.0"
-<<<<<<< HEAD
-sqlx = { version = "0.8.3", features = ["time", "runtime-tokio"] }
-utoipa = { version = "5.3.1", features = ["axum_extras", "uuid"] }
-=======
 slugify = "0.1.0"
 sqlx = { version = "0.8.2", features = ["time", "runtime-tokio"] }
 sqlx-sqlite = { version = "0.8.2" }
 utoipa = { version = "4.2.0", features = ["axum_extras", "uuid"] }
->>>>>>> main
 
 [dependencies.sea-orm]
 version = "1.1.0"                                                       # sea-orm version

web/Cargo.toml

@@ -9,14 +9,9 @@ edition = "2021"
 domain = { path = "../domain" }
 service = { path = "../service" }
 
-<<<<<<< HEAD
-axum = "0.8.1"
-axum-login = "0.17.0"
-=======
 axum = "0.7.7"
 axum-login = "0.16.0"
 chrono = { version = "0.4.38", features = ["serde"] }
->>>>>>> main
 log = "0.4.22"
 tower-http = { version = "0.6.1", features = ["fs", "cors"] }
 serde_json = "1.0.128"