From 3581c95a8ed349a6f09b96a914d42901a3b7637c Mon Sep 17 00:00:00 2001 From: dx-tan Date: Tue, 5 Mar 2024 16:15:59 +0700 Subject: [PATCH] Fix: #64 --- cope2n-fe/src/utils/time.ts | 4 ++-- docker-compose-dev.yml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cope2n-fe/src/utils/time.ts b/cope2n-fe/src/utils/time.ts index 51bc88c..870ef53 100644 --- a/cope2n-fe/src/utils/time.ts +++ b/cope2n-fe/src/utils/time.ts @@ -4,6 +4,6 @@ export function datetimeStrToDate(dateTimeStr: string, targetTimeZone: string): } const options: Intl.DateTimeFormatOptions = { timeZone: targetTimeZone, year: 'numeric', month: '2-digit', day: '2-digit' }; const date = new Date(dateTimeStr); - const convertedDateTimeStr = date.toLocaleDateString('en-US', options).split('/').reverse().join('-'); - return convertedDateTimeStr; + const convertedDateTimeStr = date.toLocaleDateString('en-US', options).split('/').reverse(); + return convertedDateTimeStr[0] + "-" + convertedDateTimeStr[2] + "-" + convertedDateTimeStr[1]; } \ No newline at end of file diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 3426a9d..ffb2d60 100755 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -89,12 +89,12 @@ services: depends_on: db-sbt: condition: service_started - # command: sh -c "chmod -R 777 /app; sleep 5; python manage.py collectstatic --no-input && - # python manage.py makemigrations && - # python manage.py migrate && - # python manage.py compilemessages && - # gunicorn fwd.asgi:application -k uvicorn.workers.UvicornWorker --timeout 300 -b 0.0.0.0:9000" # pre-makemigrations on prod - command: bash -c "tail -f > /dev/null" + command: sh -c "chmod -R 777 /app; sleep 5; python manage.py collectstatic --no-input && + python manage.py makemigrations && + python manage.py migrate && + python manage.py compilemessages && + gunicorn fwd.asgi:application -k uvicorn.workers.UvicornWorker --timeout 300 -b 0.0.0.0:9000" # pre-makemigrations on prod + # command: bash -c "tail -f > /dev/null" minio: image: minio/minio @@ -179,8 +179,8 @@ services: - ./cope2n-api:/app working_dir: /app - # command: sh -c "celery -A fwd_api.celery_worker.worker worker -l INFO -c 5" - command: bash -c "tail -f > /dev/null" + command: sh -c "celery -A fwd_api.celery_worker.worker worker -l INFO -c 5" + # command: bash -c "tail -f > /dev/null" # Back-end persistent db-sbt: