added docker-compose with mongo and calchat-server

.drone.yml

@@ -12,8 +12,8 @@ steps:
   - name: build_server
     image: node
     commands:
-      - npm ci -w @calchat/shared
+      - npm ci
-      - npm ci -w @calchat/server
+      - npm run build -w @calchat/shared
       - npm run build -w @calchat/server
 
   - name: jest_server

apps/client/src/Themes.tsx

@@ -20,8 +20,8 @@ export type Theme = {
 
 export const THEMES = {
   defaultLight: {
-    // chatBot: "#DE6C20",
+    chatBot: "#DE6C20",
-    chatBot: "#724121",
+    // chatBot: "#324121",
     primeFg: "#3B3329",
     primeBg: "#FFEEDE",
     secondaryBg: "#FFFFFF",

apps/client/src/app/(tabs)/settings.tsx

@@ -215,7 +215,11 @@ const Settings = () => {
     <BaseBackground>
       <SimpleHeader text="Settings" />
       <View className="flex items-center mt-4">
-        <SettingsButton testID="settings-logout-button" onPress={handleLogout} solid={true}>
+        <SettingsButton
+          testID="settings-logout-button"
+          onPress={handleLogout}
+          solid={true}
+        >
           <Ionicons name="log-out-outline" size={24} color={theme.primeFg} />{" "}
           Logout
         </SettingsButton>

apps/client/src/components/AuthButton.tsx

@@ -8,7 +8,12 @@ interface AuthButtonProps {
   testID?: string;
 }
 
-const AuthButton = ({ title, onPress, isLoading = false, testID }: AuthButtonProps) => {
+const AuthButton = ({
+  title,
+  onPress,
+  isLoading = false,
+  testID,
+}: AuthButtonProps) => {
   const { theme } = useThemeStore();
   return (
     <Pressable

apps/server/docker/Dockerfile

@@ -2,16 +2,15 @@ FROM node:alpine AS build
 
 WORKDIR /app
 
-COPY package.json package-lock.json tsconfig.json ./
+COPY package.json package-lock.json ./
-COPY packages/shared/package.json ./packages/shared/
+COPY packages/shared/ ./packages/shared/
 COPY apps/server/package.json ./apps/server/
 
 RUN npm ci -w @calchat/server -w @calchat/shared --include-workspace-root
 
-COPY packages/shared/ packages/shared/
 COPY apps/server/ apps/server/
 
-RUN npm run build -w @calchat/shared && npm run build -w @calchat/server
+RUN npm run build -w @calchat/server
 
 FROM node:alpine
 
@@ -21,7 +20,7 @@ COPY --from=build /app/package.json /app/package-lock.json ./
 COPY --from=build /app/packages/shared/package.json packages/shared/
 COPY --from=build /app/apps/server/package.json apps/server/
 
-RUN npm ci --omit=dev -w @calchat/server -w @calchat/shared
+RUN npm ci --omit=dev --ignore-scripts -w @calchat/server -w @calchat/shared
 
 COPY --from=build /app/packages/shared/dist/ packages/shared/dist/
 COPY --from=build /app/apps/server/dist/ apps/server/dist/

apps/server/docker/calchat-mongo/docker-compose.yml

@@ -0,0 +1,43 @@
+services:
+  mongo:
+    image: mongo:8
+    restart: always
+    ports:
+      - "27017:27017"
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: mongoose
+    volumes:
+      - mongo-data:/data/db
+    healthcheck:
+      test: mongosh --eval "db.adminCommand('ping')"
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  mongo-express:
+    image: mongo-express:latest
+    restart: always
+    ports:
+      - "8083:8081"
+    environment:
+      ME_CONFIG_MONGODB_URL: mongodb://root:mongoose@mongo:27017/
+      ME_CONFIG_BASICAUTH_ENABLED: true
+      ME_CONFIG_BASICAUTH_USERNAME: admin
+      ME_CONFIG_BASICAUTH_PASSWORD: admin
+    depends_on:
+      mongo:
+        condition: service_healthy
+
+  calchat-server:
+    image: gitea.gilmour109.de/gilmour109/calchat-server:latest
+    restart: always
+    env_file: .env
+    ports:
+      - "3001:3001"
+    depends_on:
+      mongo:
+        condition: service_healthy
+
+volumes:
+  mongo-data:

apps/server/src/app.ts

@@ -87,6 +87,10 @@ app.get("/health", (_, res) => {
   res.json({ status: "ok" });
 });
 
+app.get("/deploy", (_, res) => {
+  res.json({ status: "deploy" });
+});
+
 // Version endpoint
 app.get("/version", (_, res) => {
   res.json({

apps/server/tsconfig.json

@@ -1,5 +1,4 @@
 {
-  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "target": "ES2020",
     "module": "CommonJS",

scripts/e2e-test.sh

@@ -164,10 +164,10 @@ cleanup() {
   echo "--- Cleanup ---"
   # [[ -n "$APPIUM_PID" ]] && kill -9 "$APPIUM_PID" 2>/dev/null || true
   # [[ -n "$EXPO_PID" ]] && kill -9 "$EXPO_PID" 2>/dev/null || true
-  [[ -n "$EMU_PID" ]] && kill -9 "$EMU_PID" 2>/dev/null || true
+  # [[ -n "$EMU_PID" ]] && kill -9 "$EMU_PID" 2>/dev/null || true
-  adb emu kill 2>/dev/null || true
+  # adb emu kill 2>/dev/null || true
   # Kill any remaining child processes
-  pkill -9 -P $$ 2>/dev/null || true
+  # pkill -9 -P $$ 2>/dev/null || true
 }
 
 main() {
@@ -181,9 +181,9 @@ main() {
       install_dependencies
     fi
 
-    start_emulator
+    # start_emulator
-    wait_for_emulator
+    # wait_for_emulator
-    disable_animations
+    # disable_animations
     # start_expo
     # wait_for_app
     # dismiss_expo_banner