From d183e0a4b6369261770a3d56ceab89432c151817 Mon Sep 17 00:00:00 2001 From: Ryan Kegel Date: Fri, 13 Feb 2026 16:43:57 -0500 Subject: [PATCH] - First round of fixes for RC1 --- .gitea/workflows/build.yaml | 6 ++++++ backend/config/version.py | 2 +- backend/main.py | 3 ++- docker-compose.test.yml | 5 +++-- frontend/vue-app/src/assets/colors.css | 2 +- frontend/vue-app/src/components/auth/Signup.vue | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5cba7cf..2f2bba2 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -58,6 +58,9 @@ jobs: if [ "${{ gitea.ref }}" == "refs/heads/master" ]; then docker tag git.ryankegel.com:3000/ryan/backend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/backend:latest docker push git.ryankegel.com:3000/ryan/backend:latest + elif [ "${{ gitea.ref }}" == "refs/heads/next" ]; then + docker tag git.ryankegel.com:3000/ryan/backend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/backend:next + docker push git.ryankegel.com:3000/ryan/backend:next fi - name: Push Frontend Image to Gitea Registry @@ -79,6 +82,9 @@ jobs: if [ "${{ gitea.ref }}" == "refs/heads/master" ]; then docker tag git.ryankegel.com:3000/ryan/frontend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/frontend:latest docker push git.ryankegel.com:3000/ryan/frontend:latest + elif [ "${{ gitea.ref }}" == "refs/heads/next" ]; then + docker tag git.ryankegel.com:3000/ryan/frontend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/frontend:next + docker push git.ryankegel.com:3000/ryan/frontend:next fi - name: Deploy Test Environment diff --git a/backend/config/version.py b/backend/config/version.py index 821b588..53511e0 100644 --- a/backend/config/version.py +++ b/backend/config/version.py @@ -2,7 +2,7 @@ # file: config/version.py import os -BASE_VERSION = "1.0.4" # update manually when releasing features +BASE_VERSION = "1.0.4RC2" # update manually when releasing features def get_full_version() -> str: """ diff --git a/backend/main.py b/backend/main.py index e097a3a..3398648 100644 --- a/backend/main.py +++ b/backend/main.py @@ -1,5 +1,6 @@ import logging import sys +import os from flask import Flask, request, jsonify from flask_cors import CORS @@ -49,7 +50,7 @@ app.config.update( MAIL_USERNAME='ryan.kegel@gmail.com', MAIL_PASSWORD='ruyj hxjf nmrz buar', MAIL_DEFAULT_SENDER='ryan.kegel@gmail.com', - FRONTEND_URL='https://localhost:5173', # Adjust as needed + FRONTEND_URL=os.environ.get('FRONTEND_URL', 'https://localhost:5173'), # Dynamic via env var, defaults to localhost SECRET_KEY='supersecretkey' # Replace with a secure key in production ) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 39bad6a..f931eb5 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -3,15 +3,16 @@ version: "3.8" services: chore-test-app-backend: # Test backend service name - image: git.ryankegel.com:3000/ryan/backend:next-1.0.4-20260211 # Use dev tag + image: git.ryankegel.com:3000/ryan/backend:next # Use latest next tag ports: - "5004:5000" # Host 5004 -> Container 5000 environment: - FLASK_ENV=development + - FRONTEND_URL=https://devserver.lan:446 # Add this for test env # Add volumes, networks, etc., as needed chore-test-app-frontend: # Test frontend service name - image: git.ryankegel.com:3000/ryan/frontend:next-1.0.4-20260211 # Use dev tag + image: git.ryankegel.com:3000/ryan/frontend:next # Use latest next tag ports: - "446:443" # Host 446 -> Container 443 (HTTPS) environment: diff --git a/frontend/vue-app/src/assets/colors.css b/frontend/vue-app/src/assets/colors.css index 83099f7..247e319 100644 --- a/frontend/vue-app/src/assets/colors.css +++ b/frontend/vue-app/src/assets/colors.css @@ -74,7 +74,7 @@ --fab-hover-bg: #5a67d8; --fab-active-bg: #4c51bf; --message-block-color: #fdfdfd; - --sub-message-color: #c1d0f1; + --sub-message-color: #9eaac4; --sign-in-btn-bg: #fff; --sign-in-btn-color: #2563eb; --sign-in-btn-border: #2563eb; diff --git a/frontend/vue-app/src/components/auth/Signup.vue b/frontend/vue-app/src/components/auth/Signup.vue index 8dc8051..c763731 100644 --- a/frontend/vue-app/src/components/auth/Signup.vue +++ b/frontend/vue-app/src/components/auth/Signup.vue @@ -136,7 +136,7 @@ >. Please open the email and follow the instructions to verify your account.

- +