Merge pull request #16 from AIObjectives/brandon-nextjs2

Repo rearchitecture to add nextjs server

Author: colleenm

.gitignore

@@ -3,4 +3,6 @@ node_modules/
 .DS_Store
 google-credentials.json
 .env*
-.vscode/
+.vscode/
+.next
+dist

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run format

.prettierignore

@@ -0,0 +1,6 @@
+# Ignore artifacts:
+build
+coverage
+dist
+fixtures
+node_modules

.prettierrc

@@ -0,0 +1 @@
+{}

Dockerfile

@@ -5,18 +5,37 @@ FROM node:16-slim
 # Create and change to the app directory.
 WORKDIR /usr/src/app
 
-# Copy application dependency manifests to the container image.
-# A wildcard is used to ensure both package.json AND package-lock.json are copied.
-COPY package*.json ./
+# copy the packages from common and express
+COPY ./common/package*.json ./common/
+COPY ./express-pipeline/package*.json ./express-pipeline/
 
-# Install production dependencies.
+# npm install common before express
+WORKDIR /usr/src/app/common
 RUN npm install --only=production
 
-# Copy local code to the container image.
-COPY . .
+# move contents of common into docker image before express
+WORKDIR /usr/src/app
+COPY ./common ./common
+
+# build common
+WORKDIR /usr/src/app/common
+RUN npm run build
+
+# install express packages
+WORKDIR /usr/src/app/express-pipeline
+RUN npm install --only-production
+
+# copy express contents 
+WORKDIR /usr/src/app
+COPY ./express-pipeline ./express-pipeline
+
+# build express app
+WORKDIR /usr/src/app/express-pipeline
+RUN npm run build
 
-# Expose port 8080 to the Docker daemon, since Cloud Run only listens on this port.
+# # Expose port 8080 to the Docker daemon, since Cloud Run only listens on this port.
 EXPOSE 8080
 
-# Run the web service on container startup.
+WORKDIR /usr/src/app/express-pipeline
+# # Run the web service on container startup.
 CMD [ "npm", "start" ]

bin/docker-build-gcloud.sh

@@ -1,6 +1,6 @@
 # get current project id from gcloud
 PROJECT_ID=$(gcloud config get-value project)
 # build for linux platform
-docker build --platform=linux/amd64 -t gcr.io/$PROJECT_ID/ttc-light-js-app .
+docker build --platform=linux/amd64 -t gcr.io/$PROJECT_ID/ttc-light-js-app ..
 # push to google cloud registry 
 docker push gcr.io/$PROJECT_ID/ttc-light-js-app

bin/docker-build-local.sh

@@ -1 +1 @@
-docker build -t tttc-light-js .
+docker build -t tttc-light-js ..

common/api.ts

@@ -0,0 +1,10 @@
+import { z } from "zod";
+
+export const generateApiReponse = z.object({
+  message: z.string(),
+  filename: z.string().min(1),
+  jsonUrl: z.string().url(),
+  reportUrl: z.string().url(),
+});
+
+export type GenerateApiResponse = z.infer<typeof generateApiReponse>;

common/package-lock.json

@@ -0,0 +1,22 @@
+{
+  "name": "tttc-common",
+  "version": "1.0.0",
+  "description": "Shares common code across monorepo",
+  "main": "index.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "npx tsc",
+    "watch": "npx tsc --watch --outDir ./dist"
+  },
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "@types/react": "^18.2.67",
+    "typescript": "^5.3.3"
+  }
+}