diff --git a/.devcontainer/python-3.10/devcontainer.json b/.devcontainer/python-3.10/devcontainer.json index 0aae5e78..678f383f 100644 --- a/.devcontainer/python-3.10/devcontainer.json +++ b/.devcontainer/python-3.10/devcontainer.json @@ -4,12 +4,12 @@ "dockerComposeFile": [ "./docker-compose.yml" ], - "service": "python-3.10-fastagencyapi", + "service": "python-3.10-fastagency", "forwardPorts": [ - "${containerEnv:CONTAINER_PREFIX}-nats-py310-fastagencyapi:9222" + "${containerEnv:CONTAINER_PREFIX}-nats-py310-fastagency:9222" ], "shutdownAction": "stopCompose", - "workspaceFolder": "/workspaces/fastagencyapi", + "workspaceFolder": "/workspaces/fastagency", // "runArgs": [], "remoteEnv": {}, "features": { diff --git a/.devcontainer/python-3.10/docker-compose.yml b/.devcontainer/python-3.10/docker-compose.yml index a195c86c..9659a03a 100644 --- a/.devcontainer/python-3.10/docker-compose.yml +++ b/.devcontainer/python-3.10/docker-compose.yml @@ -1,23 +1,23 @@ version: '3' services: - python-3.10-fastagencyapi: # nosemgrep + python-3.10-fastagency: # nosemgrep image: mcr.microsoft.com/devcontainers/python:3.10 - container_name: $USER-python-3.10-fastagencyapi + container_name: $USER-python-3.10-fastagency volumes: - - ../../:/workspaces/fastagencyapi:cached + - ../../:/workspaces/fastagency:cached command: sleep infinity environment: - - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py310-fastagencyapi:5432/fastagency - - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py310-fastagencyapi:5432/pyfastagency - - NATS_URL=nats://${USER}-nats-py310-fastagencyapi:4222 + - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py310-fastagency:5432/fastagency + - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py310-fastagency:5432/pyfastagency + - NATS_URL=nats://${USER}-nats-py310-fastagency:4222 env_file: - ../devcontainer.env networks: - - fastagencyapi-network - nats-fastagencyapi: # nosemgrep + - fastagency-network + nats-fastagency: # nosemgrep image: nats:latest - container_name: $USER-nats-py310-fastagencyapi + container_name: $USER-nats-py310-fastagency # ports: # - "${PORT_PREFIX}4222:4222" # - "${PORT_PREFIX}9222:9222" @@ -27,10 +27,10 @@ services: env_file: - ../devcontainer.env networks: - - fastagencyapi-network - postgres-fastagencyapi: # nosemgrep + - fastagency-network + postgres-fastagency: # nosemgrep image: postgres:latest - container_name: $USER-postgres-py310-fastagencyapi + container_name: $USER-postgres-py310-fastagency environment: POSTGRES_USER: admin POSTGRES_PASSWORD: password # pragma: allowlist secret @@ -38,8 +38,8 @@ services: # ports: # - "${PORT_PREFIX}5432:5432" networks: - - fastagencyapi-network + - fastagency-network networks: - fastagencyapi-network: - name: "${USER}-fastagencyapi-network" + fastagency-network: + name: "${USER}-fastagency-network" diff --git a/.devcontainer/python-3.11/devcontainer.json b/.devcontainer/python-3.11/devcontainer.json index 06e1926f..796577d3 100644 --- a/.devcontainer/python-3.11/devcontainer.json +++ b/.devcontainer/python-3.11/devcontainer.json @@ -3,12 +3,12 @@ "dockerComposeFile": [ "./docker-compose.yml" ], - "service": "python-3.11-fastagencyapi", + "service": "python-3.11-fastagency", "forwardPorts": [ - "${containerEnv:CONTAINER_PREFIX}-nats-py311-fastagencyapi:9222" + "${containerEnv:CONTAINER_PREFIX}-nats-py311-fastagency:9222" ], "shutdownAction": "stopCompose", - "workspaceFolder": "/workspaces/fastagencyapi", + "workspaceFolder": "/workspaces/fastagency", // "runArgs": [], "remoteEnv": {}, "features": { diff --git a/.devcontainer/python-3.11/docker-compose.yml b/.devcontainer/python-3.11/docker-compose.yml index e9dfdcf1..a7521a01 100644 --- a/.devcontainer/python-3.11/docker-compose.yml +++ b/.devcontainer/python-3.11/docker-compose.yml @@ -1,23 +1,23 @@ version: '3' services: - python-3.11-fastagencyapi: # nosemgrep + python-3.11-fastagency: # nosemgrep image: mcr.microsoft.com/devcontainers/python:3.11 - container_name: $USER-python-3.11-fastagencyapi + container_name: $USER-python-3.11-fastagency volumes: - - ../../:/workspaces/fastagencyapi:cached + - ../../:/workspaces/fastagency:cached command: sleep infinity environment: - - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py311-fastagencyapi:5432/fastagency - - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py311-fastagencyapi:5432/pyfastagency - - NATS_URL=nats://${USER}-nats-py311-fastagencyapi:4222 + - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py311-fastagency:5432/fastagency + - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py311-fastagency:5432/pyfastagency + - NATS_URL=nats://${USER}-nats-py311-fastagency:4222 env_file: - ../devcontainer.env networks: - - fastagencyapi-network - nats-fastagencyapi: # nosemgrep + - fastagency-network + nats-fastagency: # nosemgrep image: nats:latest - container_name: $USER-nats-py311-fastagencyapi + container_name: $USER-nats-py311-fastagency # ports: # - "${PORT_PREFIX}4222:4222" # - "${PORT_PREFIX}9222:9222" @@ -27,10 +27,10 @@ services: env_file: - ../devcontainer.env networks: - - fastagencyapi-network - postgres-fastagencyapi: # nosemgrep + - fastagency-network + postgres-fastagency: # nosemgrep image: postgres:latest - container_name: $USER-postgres-py311-fastagencyapi + container_name: $USER-postgres-py311-fastagency environment: POSTGRES_USER: admin POSTGRES_PASSWORD: password # pragma: allowlist secret @@ -38,8 +38,8 @@ services: # ports: # - "${PORT_PREFIX}5432:5432" networks: - - fastagencyapi-network + - fastagency-network networks: - fastagencyapi-network: - name: "${USER}-fastagencyapi-network" + fastagency-network: + name: "${USER}-fastagency-network" diff --git a/.devcontainer/python-3.12/devcontainer.json b/.devcontainer/python-3.12/devcontainer.json index b94689c5..0fa777f1 100644 --- a/.devcontainer/python-3.12/devcontainer.json +++ b/.devcontainer/python-3.12/devcontainer.json @@ -4,12 +4,12 @@ "dockerComposeFile": [ "./docker-compose.yml" ], - "service": "python-3.12-fastagencyapi", + "service": "python-3.12-fastagency", "forwardPorts": [ - "${containerEnv:CONTAINER_PREFIX}-nats-py312-fastagencyapi:9222" + "${containerEnv:CONTAINER_PREFIX}-nats-py312-fastagency:9222" ], "shutdownAction": "stopCompose", - "workspaceFolder": "/workspaces/fastagencyapi", + "workspaceFolder": "/workspaces/fastagency", // "runArgs": [], "remoteEnv": {}, "features": { diff --git a/.devcontainer/python-3.12/docker-compose.yml b/.devcontainer/python-3.12/docker-compose.yml index edc4a20e..f5059b3a 100644 --- a/.devcontainer/python-3.12/docker-compose.yml +++ b/.devcontainer/python-3.12/docker-compose.yml @@ -1,23 +1,23 @@ version: '3' services: - python-3.12-fastagencyapi: # nosemgrep + python-3.12-fastagency: # nosemgrep image: mcr.microsoft.com/devcontainers/python:3.12 - container_name: $USER-python-3.12-fastagencyapi + container_name: $USER-python-3.12-fastagency volumes: - - ../../:/workspaces/fastagencyapi:cached + - ../../:/workspaces/fastagency:cached command: sleep infinity environment: - - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py312-fastagencyapi:5432/fastagency - - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py312-fastagencyapi:5432/pyfastagency - - NATS_URL=nats://${USER}-nats-py312-fastagencyapi:4222 + - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py312-fastagency:5432/fastagency + - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py312-fastagency:5432/pyfastagency + - NATS_URL=nats://${USER}-nats-py312-fastagency:4222 env_file: - ../devcontainer.env networks: - - fastagencyapi-network - nats-fastagencyapi: # nosemgrep + - fastagency-network + nats-fastagency: # nosemgrep image: nats:latest - container_name: $USER-nats-py312-fastagencyapi + container_name: $USER-nats-py312-fastagency # ports: # - "${PORT_PREFIX}4222:4222" # - "${PORT_PREFIX}9222:9222" @@ -27,10 +27,10 @@ services: env_file: - ../devcontainer.env networks: - - fastagencyapi-network - postgres-fastagencyapi: # nosemgrep + - fastagency-network + postgres-fastagency: # nosemgrep image: postgres:latest - container_name: $USER-postgres-py312-fastagencyapi + container_name: $USER-postgres-py312-fastagency environment: POSTGRES_USER: admin POSTGRES_PASSWORD: password # pragma: allowlist secret @@ -38,8 +38,8 @@ services: # ports: # - "${PORT_PREFIX}5432:5432" networks: - - fastagencyapi-network + - fastagency-network networks: - fastagencyapi-network: - name: "${USER}-fastagencyapi-network" + fastagency-network: + name: "${USER}-fastagency-network" diff --git a/.devcontainer/python-3.9/devcontainer.json b/.devcontainer/python-3.9/devcontainer.json index 880843a2..c9f4276f 100644 --- a/.devcontainer/python-3.9/devcontainer.json +++ b/.devcontainer/python-3.9/devcontainer.json @@ -4,12 +4,12 @@ "dockerComposeFile": [ "./docker-compose.yml" ], - "service": "python-3.9-fastagencyapi", + "service": "python-3.9-fastagency", "forwardPorts": [ - "${containerEnv:CONTAINER_PREFIX}-nats-py39-fastagencyapi:9222" + "${containerEnv:CONTAINER_PREFIX}-nats-py39-fastagency:9222" ], "shutdownAction": "stopCompose", - "workspaceFolder": "/workspaces/fastagencyapi", + "workspaceFolder": "/workspaces/fastagency", // "runArgs": [], "remoteEnv": {}, "features": { diff --git a/.devcontainer/python-3.9/docker-compose.yml b/.devcontainer/python-3.9/docker-compose.yml index 39da7f25..edf211a3 100644 --- a/.devcontainer/python-3.9/docker-compose.yml +++ b/.devcontainer/python-3.9/docker-compose.yml @@ -1,23 +1,23 @@ version: '3' services: - python-3.9-fastagencyapi: # nosemgrep + python-3.9-fastagency: # nosemgrep image: mcr.microsoft.com/devcontainers/python:3.9 - container_name: $USER-python-3.9-fastagencyapi + container_name: $USER-python-3.9-fastagency volumes: - - ../../:/workspaces/fastagencyapi:cached + - ../../:/workspaces/fastagency:cached command: sleep infinity environment: - - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py39-fastagencyapi:5432/fastagency - - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py39-fastagencyapi:5432/pyfastagency - - NATS_URL=nats://${USER}-nats-py39-fastagencyapi:4222 + - DATABASE_URL=postgresql://admin:password@${USER}-postgres-py39-fastagency:5432/fastagency + - PY_DATABASE_URL=postgresql://admin:password@${USER}-postgres-py39-fastagency:5432/pyfastagency + - NATS_URL=nats://${USER}-nats-py39-fastagency:4222 env_file: - ../devcontainer.env networks: - - fastagencyapi-network - nats-fastagencyapi: # nosemgrep + - fastagency-network + nats-fastagency: # nosemgrep image: nats:latest - container_name: $USER-nats-py39-fastagencyapi + container_name: $USER-nats-py39-fastagency # ports: # - "${PORT_PREFIX}4222:4222" # - "${PORT_PREFIX}9222:9222" @@ -27,10 +27,10 @@ services: env_file: - ../devcontainer.env networks: - - fastagencyapi-network - postgres-fastagencyapi: # nosemgrep + - fastagency-network + postgres-fastagency: # nosemgrep image: postgres:latest - container_name: $USER-postgres-py39-fastagencyapi + container_name: $USER-postgres-py39-fastagency environment: POSTGRES_USER: admin POSTGRES_PASSWORD: password # pragma: allowlist secret @@ -38,8 +38,8 @@ services: # ports: # - "${PORT_PREFIX}5432:5432" networks: - - fastagencyapi-network + - fastagency-network networks: - fastagencyapi-network: - name: "${USER}-fastagencyapi-network" + fastagency-network: + name: "${USER}-fastagency-network" diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index f227dfe1..d21e0475 100644 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -14,7 +14,3 @@ cd app && wasp db migrate-dev && cd .. prisma migrate deploy --schema=schema.prisma prisma generate --schema=schema.prisma --generator=pyclient - -# Install packages for auth callout -cd auth_callout && pnpm install && cd .. -cd auth_callout && pnpx prisma generate --schema=packages/auth-service/schema.prisma && cd .. diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e7c1bd06..a72abdca 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,8 +15,3 @@ updates: directory: "/" # Location of package manifests schedule: interval: "weekly" - # Pnpm - - package-ecosystem: "npm" - directory: "/auth_callout" - schedule: - interval: "weekly" diff --git a/app/src/client/static/avatar-placeholder.png b/app/src/client/static/avatar-placeholder.png index 7acc8864..dca5d439 100644 Binary files a/app/src/client/static/avatar-placeholder.png and b/app/src/client/static/avatar-placeholder.png differ diff --git a/app/src/client/static/da-boi.png b/app/src/client/static/da-boi.png index 0f9227e0..0e1560c8 100644 Binary files a/app/src/client/static/da-boi.png and b/app/src/client/static/da-boi.png differ diff --git a/app/src/client/static/open-saas-banner.png b/app/src/client/static/open-saas-banner.png index 0d6f6eeb..8c12c992 100644 Binary files a/app/src/client/static/open-saas-banner.png and b/app/src/client/static/open-saas-banner.png differ diff --git a/docs/docs/assets/img/FA-Secondary-LOGO.jpg b/docs/docs/assets/img/FA-Secondary-LOGO.jpg index f7964803..999958da 100644 Binary files a/docs/docs/assets/img/FA-Secondary-LOGO.jpg and b/docs/docs/assets/img/FA-Secondary-LOGO.jpg differ