feat: implement dockerfiles and improve cors configuration

.gitignore

@@ -1,4 +1,5 @@
 # ---> Node
+build
 # Logs
 logs
 *.log

backend/Dockerfile

@@ -0,0 +1,34 @@
+##### Builder stage ###########################################################
+FROM node:18-slim AS builder
+WORKDIR /app
+
+# Install dependencies (dev + prod) so we can build TypeScript
+COPY package.json yarn.lock ormconfig.json ./
+RUN yarn install --frozen-lockfile
+
+# Build TypeScript -> dist
+COPY . .
+RUN yarn build
+
+# Prune to production dependencies only (keeps sqlite3 from dependencies)
+RUN yarn install --frozen-lockfile --production
+
+##### Runtime stage ###########################################################
+FROM node:18-slim
+WORKDIR /app
+
+ENV NODE_ENV=production
+ENV PORT=3101
+
+# Copy compiled app and production node_modules from builder
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/ormconfig.json ./
+
+RUN mkdir -p /app/uploads /app/database
+
+# Include the sqlite database that migrations already prepared
+COPY --from=builder /app/src/database/database.sqlite ./database/
+
+EXPOSE 3101
+CMD ["node", "dist/server.js"]

backend/ormconfig.json

@@ -0,0 +1,15 @@
+{
+    "type": "sqlite",
+    "database": "./database/database.sqlite",
+    "migrations": [
+        "./dist/database/migrations/*.js",
+        "./src/database/migrations/*.ts"
+    ],
+    "entities": [
+        "./dist/models/*.js",
+        "./src/models/*.ts"
+    ],
+    "cli": {
+        "migrationsDir": "./src/database/migrations"
+    }
+}

backend/package.json

@@ -0,0 +1,29 @@
+{
+  "name": "backend",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "scripts": {
+    "dev": "ts-node-dev --transpile-only --ignore-watch node_modules src/server.ts",
+    "typeorm": "ts-node-dev ./node_modules/typeorm/cli.js",
+    "build": "tsc"
+  },
+  "dependencies": {
+    "cors": "^2.8.5",
+    "dotenv": "^16.5.0",
+    "express": "^4.17.1",
+    "express-async-errors": "^3.1.1",
+    "multer": "^1.4.2",
+    "sqlite3": "^5.1.7",
+    "typeorm": "^0.2.29",
+    "yup": "^0.32.9"
+  },
+  "devDependencies": {
+    "@types/cors": "^2.8.10",
+    "@types/express": "^4.17.8",
+    "@types/multer": "^1.4.5",
+    "ts-node": "^10.9.2",
+    "ts-node-dev": "^2.0.0",
+    "typescript": "^5.8.3"
+  }
+}

backend/src/config/upload.ts

@@ -3,7 +3,7 @@ import path from 'path';
 
 export default {
     storage: multer.diskStorage({
-        destination: path.join(__dirname, '..','..','uploads'),
+        destination: path.join(process.cwd(), 'uploads'),
         filename: (request, file, cb) => {
             const fileName = `${Date.now()}_${file.originalname}`;
 

backend/src/routes.ts

@@ -16,6 +16,4 @@ routes.post('/orphanages', upload.array('images'), OrphanagesController.create);
 routes.get('/orphanages', OrphanagesController.getAll);
 routes.get('/orphanages/:id', OrphanagesController.getIndex);
 
-
-
 export default routes;

backend/src/server.ts

@@ -4,19 +4,27 @@ import path from 'path';
 import 'express-async-errors';
 import cors from 'cors';
 
-import './database/connection'; // This line now automatically runs the connection
+import './database/connection';
 import errorHandler from './errors/handler';
 import routes from './routes';
 
 const app = express();
 
-app.use(cors());
+const allowedOrigins = (process.env.CORS_ORIGIN || 'http://localhost:3000')
+    .split(',')
+    .map(origin => origin.trim());
+
+app.use(cors({ origin: allowedOrigins }));
 app.use(express.json());
-app.use('/uploads', express.static(path.join(__dirname, '..', 'uploads')));
+
+app.use('/api', routes);
+const uploadsPath = path.join(process.cwd(), 'uploads');
+app.use('/uploads', express.static(uploadsPath));
 app.use(routes);
 app.use(errorHandler);
 
 app.listen(process.env.PORT || 3101, () => {
+    console.log(`Serving static files for /uploads from: ${uploadsPath}`);
     console.log('Server is running on http://localhost:' + (process.env.PORT || 3101));
     console.log('Environment:', process.env.NODE_ENV || 'development');
 });

backend/src/views/images_view.ts

@@ -5,7 +5,7 @@ export default {
     render(image: Image) {
         return {
             id: image.id,
-            url: `${process.env.BACKEND_URL}/uploads/${image.path}`
+            url: `${process.env.REACT_APP_BACKEND_URL}/uploads/${image.path}`
         };
     },
 

backend/tsconfig.json

@@ -0,0 +1,70 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+    "outDir": "./dist",
+
+    /* Basic Options */
+    // "incremental": true,                   /* Enable incremental compilation */
+    "target": "es2017",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    // "outDir": "./",                        /* Redirect output structure to the directory. */
+    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true,                           /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+     "strictPropertyInitialization": false,   /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+     "experimentalDecorators": true,          /* Enables experimental support for ES7 decorators. */
+     "emitDecoratorMetadata": true,           /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
+    "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */
+  }
+}

web/Dockerfile

@@ -0,0 +1,16 @@
+# Builder stage
+FROM node:16-alpine AS builder
+WORKDIR /app
+COPY package.json yarn.lock ./
+RUN yarn install --production --frozen-lockfile
+COPY . .
+RUN yarn build
+
+# Runtime stage
+FROM node:16-alpine
+WORKDIR /app
+COPY --from=builder /app/build ./build
+RUN yarn global add serve
+ENV PORT=3000
+EXPOSE 3000
+CMD ["sh", "-c", "serve -s build -l ${PORT}"]

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "private": true,
   "dependencies": {
     "@react-google-maps/api": "^2.1.1",

web/src/services/api.ts

@@ -1,7 +1,7 @@
 import axios from 'axios';
 
 const api = axios.create({
-  baseURL: process.env.BACKEND_URL || 'http://localhost:3101',
+  baseURL: process.env.REACT_APP_BACKEND_URL || 'http://localhost:3101/api',
 });
 
 export default api;