Compare commits

...

11 Commits

Author SHA1 Message Date
65dfe857bf added docker-compose with mongo and calchat-server
Some checks failed
continuous-integration/drone/push Build was killed
2026-02-28 22:32:51 +01:00
b2e889a4cd formatting
All checks were successful
continuous-integration/drone/push Build is passing
2026-02-28 17:50:48 +01:00
5a74bcf81b deploy
Some checks failed
continuous-integration/drone/push Build is failing
2026-02-28 17:37:44 +01:00
0de8d9faa1 theme
All checks were successful
continuous-integration/drone/push Build is passing
2026-02-28 12:12:54 +01:00
fbfb939841 done!
All checks were successful
continuous-integration/drone/push Build is passing
2026-02-27 23:47:27 +01:00
7ce0591288 :(((((
All checks were successful
continuous-integration/drone/push Build is passing
2026-02-27 23:10:25 +01:00
2c9237a81f fixed dockerfile
Some checks failed
continuous-integration/drone/push Build was killed
2026-02-27 22:57:17 +01:00
7d3e3a7e5d fixes
Some checks failed
continuous-integration/drone/push Build is failing
2026-02-27 22:46:29 +01:00
3104eb7388 formatting
Some checks failed
continuous-integration/drone/push Build is failing
2026-02-27 22:38:41 +01:00
302cd96267 :(
Some checks failed
continuous-integration/drone/push Build is failing
2026-02-27 22:34:13 +01:00
7b6f454151 fix
Some checks failed
continuous-integration/drone/push Build is failing
2026-02-27 22:24:51 +01:00
9 changed files with 72 additions and 18 deletions

View File

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

View File

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

View File

@@ -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>

View File

@@ -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

View File

@@ -2,16 +2,15 @@ FROM node:alpine AS build
WORKDIR /app
COPY package.json package-lock.json tsconfig.json ./
COPY packages/shared/package.json ./packages/shared/
COPY package.json package-lock.json ./
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/

View File

@@ -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:

View File

@@ -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({

View File

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

View File

@@ -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
adb emu kill 2>/dev/null || true
# [[ -n "$EMU_PID" ]] && kill -9 "$EMU_PID" 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
wait_for_emulator
disable_animations
# start_emulator
# wait_for_emulator
# disable_animations
# start_expo
# wait_for_app
# dismiss_expo_banner