Feature/content delivery

.github/workflows/delete_all_workflow_runs.sh

@@ -0,0 +1,11 @@
+REPO="MeasureOneCodeTwice/Finus"
+
+# Optional: count runs first
+gh api --paginate "/repos/$REPO/actions/runs?per_page=100" --jq '.workflow_runs[].id' | wc -l
+
+# Delete everything
+gh api --paginate "/repos/$REPO/actions/runs?per_page=100" --jq '.workflow_runs[].id' \
+| while read -r RUN_ID; do
+    echo "Deleting run $RUN_ID"
+    gh api -X DELETE "/repos/$REPO/actions/runs/$RUN_ID" >/dev/null
+  done

.github/workflows/docker_compose_publish.yml

@@ -36,6 +36,14 @@ jobs:
           docker compose build
           echo "Pushing images..."
           docker compose push
+
+          echo RELEASE_VERSION=latest                   >  .env
+          echo DOCKER_HUB_USERNAME=$DOCKER_HUB_USERNAME >> .env
+          echo "Re-building with lastest tag..."
+          docker compose build
+          echo "Pushing images..."
+          docker compose push
+
         env:
           DOCKER_HUB_USERNAME: ${{ inputs.DOCKER_HUB_USERNAME }}
 

app/client/.env

@@ -3,4 +3,4 @@
 
 #docker-file
 DOCKER_HUB_USERNAME=measureonecodetwice
-RELEASE_VERSION=0.0.1
+RELEASE_VERSION=latest

app/client/docker-compose.yml

@@ -6,9 +6,9 @@ services:
 
   webserver:
     image: $DOCKER_HUB_USERNAME/finus-webserver:$RELEASE_VERSION
-    build: 
+    build:
       dockerfile: Dockerfile
     ports:
       - "80:80"
-    depends_on: 
+    depends_on:
       - webserver-base

app/client/src/App.tsx

@@ -13,10 +13,7 @@ import DashboardPage from "./pages/DashboardPage.tsx";
 import MarketsPage from "./pages/MarketsPage";
 import AppLayout from "./components/AppLayout.tsx";
 import ProjectionPage from "./pages/ProjectionPage.tsx";
-
-const SESSION_STORAGE_KEY = "finus-session";
-const API_BASE_URL =
-  import.meta.env.VITE_API_BASE_URL ?? "http://localhost:3000";
+import { BASE_URL, SESSION_STORAGE_KEY } from "@/utils/constants";
 
 function isValidAuthUser(value: unknown): value is AuthUser {
   if (!value || typeof value !== "object") {
@@ -104,7 +101,7 @@ async function requestAuth(
   payload: Record<string, unknown>,
 ): Promise<AuthApiResponse> {
   try {
-    const response = await fetch(`${API_BASE_URL}${path}`, {
+    const response = await fetch(`${BASE_URL}${path}`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",

app/client/src/api/Account.ts

@@ -1,8 +1,9 @@
 import type { updateResponse } from "../types/responseTypes";
 import type { Account } from "../types/AccountType";
 import type { AuthSession } from "@/types/authTypes";
+import { BASE_URL } from "@/utils/constants";
 
-const requestUrl = "http://localhost:3000/api/accounts";
+const requestUrl = `${BASE_URL}/api/accounts`;
 
 //Sends a request to get different accounts the user has
 export async function getUserAccounts(

app/client/src/api/AuthAPI.ts

@@ -1,12 +1,12 @@
 import type { AuthApiResponse } from "@/types/authTypes";
-import { API_BASE_URL } from "@/utils/constants";
+import { BASE_URL } from "@/utils/constants";
 
 export async function requestAuth(
   path: string,
   payload: Record<string, unknown>,
 ): Promise<AuthApiResponse> {
   try {
-    const response = await fetch(`${API_BASE_URL}${path}`, {
+    const response = await fetch(`${BASE_URL}${path}`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",

app/client/src/api/Income.ts

@@ -1,8 +1,9 @@
 import type { updateResponse } from "../types/responseTypes";
 import { type Income } from "../types/IncomeType";
 import type { AuthSession } from "@/types/authTypes";
+import { BASE_URL } from "@/utils/constants";
 
-const requestUrl = "http://localhost:3000/api/income";
+const requestUrl = `${BASE_URL}/api/income`;
 
 export async function getIncome(session: AuthSession): Promise<Income[]> {
   try {

app/client/src/api/Market.ts

@@ -19,10 +19,7 @@ type MarketHistoryResponse = {
   points: MarketHistoryPoint[];
 };
 
-function toMarketApiError(
-  error: unknown,
-  fallbackMessage: string,
-): Error {
+function toMarketApiError(error: unknown, fallbackMessage: string): Error {
   if (axios.isAxiosError(error)) {
     const detail = error.response?.data?.detail;
     if (typeof detail === "string" && detail.length > 0) {

app/client/src/api/Transaction.ts

@@ -2,8 +2,9 @@ import type { AuthSession } from "@/types/authTypes";
 import type { updateResponse } from "../types/responseTypes";
 import type { Transaction } from "../types/Transaction";
 import type { TransactionDraft } from "@/utils/ConvertTransaction";
+import { BASE_URL } from "@/utils/constants";
 
-const requestUrl = "http://localhost:3000/api/transactions";
+const requestUrl = `${BASE_URL}/api/transactions`;
 
 //Sends a GET request to get the list of user transactions for the account
 export async function getTransactions(

app/client/src/utils/constants.ts

@@ -1,7 +1,3 @@
-export const BASE_URL = "http://localhost:3000"; //change this to the public link once microservices are hosted on AWS
-
-export const SIDEBAR_WIDTH = 260;
-
+export const BASE_URL = "http://3.150.23.72:3000";
 export const SESSION_STORAGE_KEY = "finus-session";
-export const API_BASE_URL =
-  import.meta.env.VITE_API_BASE_URL ?? "http://localhost:3000";
+export const SIDEBAR_WIDTH = 260;

app/server/services/python/analytics/src/main.py

@@ -23,7 +23,15 @@
 app = FastAPI()
 
 # CORS setup
-origins = ["http://localhost:8080", "http://localhost:3000", "http://127.0.0.1:8080", "http://127.0.0.1:3000"]
+origins = [
+        "http://localhost:8080",
+        "http://localhost:3000",
+        "http://127.0.0.1:8080",
+        "http://127.0.0.1:3000",
+        "http://18.190.215.135", #prod webserver
+        "http://3.142.125.202",  #dev webserver
+]
+
 app.add_middleware(
     CORSMiddleware,
     allow_origins=origins,

app/server/services/ts/auth/src/index.ts

@@ -9,8 +9,8 @@ import { getConnectionPool, getDatabaseStatus } from "@/sqlUtil";
 
 const pool = getConnectionPool();
 const app = express();
-app.use(express.json());
 app.use(buildCorsConfig());
+app.use(express.json());
 
 app.post("/signup", async (req, res) => {
   let body: SignupBody;

app/server/services/ts/common/expressUtils.ts

@@ -1,13 +1,16 @@
 import cors from "cors";
 
-const defaultMethods = ["GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS"];
-const defaultOrigins = ["http://localhost", "http://localhost:8080"];
-export function buildCorsConfig(opts?: {
-  origins?: string | string[];
-  methods?: string[];
-}) {
+const defaultMethods = ["GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"];
+const origins = [
+  "http://localhost",
+  "http://localhost:8080",
+  "http://18.190.215.135", //prod webserver
+  "http://3.142.125.202", //dev webserver
+];
+
+export function buildCorsConfig(opts?: { methods?: string[] }) {
   return cors({
-    origin: opts?.origin ?? defaultOrigins,
+    origin: origins,
     methods: opts?.methods ?? defaultMethods,
     credentials: true,
     allowedHeaders: ["Content-Type", "Authorization"],
@@ -21,7 +24,7 @@ export async function handleServerError(
 ) {
   await func().catch((e) =>
     res.status(500).json({
-      message: message ?? e.message,
+      message: e.message ?? message,
     }),
   );
 }