diff --git a/.github/workflows/osmit-build.yml b/.github/workflows/osmit-build.yml new file mode 100644 index 0000000000..0ac7506632 --- /dev/null +++ b/.github/workflows/osmit-build.yml @@ -0,0 +1,43 @@ +name: CI + +on: + push: + branches: + - osm-ita + tags: + - v* + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: 'Checkout GitHub Action' + uses: actions/checkout@main + + - name: 'Login to GitHub Container Registry' + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{github.actor}} + password: ${{secrets.GITHUB_TOKEN}} + - name: Set output + id: vars + run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT + - name: 'Build Backend Image' + env: + RELEASE_VERSION: ${{ steps.vars.outputs.tag }} + run: | + docker build . -f ./scripts/docker/Dockerfile.backend --tag ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-backend:$GITHUB_SHA --tag ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-backend:$RELEASE_VERSION + docker push ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-backend:$GITHUB_SHA + docker push ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-backend:$RELEASE_VERSION + - name: 'Build Frontend Image' + env: + RELEASE_VERSION: ${{ steps.vars.outputs.tag }} + FRONTEND_ENV: ${{ vars.FRONTEND_ENV }} + run: | + echo "$FRONTEND_ENV" > tasking-manager.env + docker build . -f ./scripts/docker/Dockerfile.frontend --tag ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-frontend:$GITHUB_SHA --tag ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-frontend:$RELEASE_VERSION + docker push ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-frontend:$GITHUB_SHA + docker push ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/osmit-tm-frontend:$RELEASE_VERSION + + \ No newline at end of file diff --git a/backend/__init__.py b/backend/__init__.py index 2fc585d103..adc4051bd5 100644 --- a/backend/__init__.py +++ b/backend/__init__.py @@ -1,3 +1,6 @@ +import gevent.monkey +gevent.monkey.patch_ssl() + import logging import os from logging.handlers import RotatingFileHandler diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 86f7d7ce89..8e4a84267a 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -12,6 +12,9 @@ services: <<: *backend volumes: - .:/usr/src/app + labels: + - traefik.http.routers.backend.rule=Host(`localhost`) && PathPrefix(`/api/`) + - traefik.http.services.backend.loadbalancer.server.port=5000 # Migration service migration: diff --git a/docker-compose.yml b/docker-compose.yml index 1032c4b914..96c689b0cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.4" x-backend-config: &backend - image: hotosm-tasking-manager:backend + image: ghcr.io/osmitalia/osmit-tm-backend:v4.5.4-osmit env_file: ${ENV_FILE:-tasking-manager.env} depends_on: - postgresql @@ -18,7 +18,7 @@ services: container_name: backend restart: always labels: - - traefik.http.routers.backend.rule=Host(`localhost`) && PathPrefix(`/api/`) + - traefik.http.routers.backend.rule=Host(`osmit-tm4.wmcloud.org`) && PathPrefix(`/api/`) - traefik.http.services.backend.loadbalancer.server.port=5000 migration: @@ -28,12 +28,12 @@ services: command: python manage.py db upgrade frontend: - image: hotosm-tasking-manager:frontend + image: ghcr.io/osmitalia/osmit-tm-frontend:v4.5.4-osmit restart: always networks: - tm-web labels: - - traefik.http.routers.frontend.rule=Host(`localhost`) + - traefik.http.routers.frontend.rule=Host(`osmit-tm4.wmcloud.org`) - traefik.http.services.frontend.loadbalancer.server.port=80 postgresql: @@ -43,6 +43,8 @@ services: env_file: ${ENV_FILE:-tasking-manager.env} networks: - tm-web + volumes: + - /srv/postgresql:/var/lib/postgresql/data traefik: image: traefik:v2.3 diff --git a/frontend/public/assets/high.jpeg b/frontend/public/assets/high.jpeg new file mode 100644 index 0000000000..c626ded593 Binary files /dev/null and b/frontend/public/assets/high.jpeg differ diff --git a/frontend/public/assets/logo.svg b/frontend/public/assets/logo.svg new file mode 100644 index 0000000000..5f3b5c18b5 --- /dev/null +++ b/frontend/public/assets/logo.svg @@ -0,0 +1,2309 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Aury88 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 010110010011010110010011 + 010110010011010110010011 + + + + + diff --git a/frontend/src/assets/img/footer.jpg b/frontend/src/assets/img/footer.jpg index 6d66eaa0dd..6dca9a3ec4 100644 Binary files a/frontend/src/assets/img/footer.jpg and b/frontend/src/assets/img/footer.jpg differ diff --git a/frontend/src/assets/styles/_extra.scss b/frontend/src/assets/styles/_extra.scss index ef5718148d..7ff6d8ea1f 100644 --- a/frontend/src/assets/styles/_extra.scss +++ b/frontend/src/assets/styles/_extra.scss @@ -89,7 +89,7 @@ html { @media screen and (min-width: 60em) { .bg-split-blue-white { - background: linear-gradient(to right, $blue-dark, $blue-dark 80%, $white 20%, $white); + background: linear-gradient(to right, $red-light, $red-light 80%, $white 20%, $white); } .f-4rem-l { @@ -112,7 +112,7 @@ html { } .bg-split-blue-white { - background: linear-gradient(to bottom, $blue-dark, $blue-dark 80%, $white 20%, $white); + background: linear-gradient(to bottom, $red-light, $red-light 80%, $white 20%, $white); } } diff --git a/frontend/src/assets/styles/_variables.scss b/frontend/src/assets/styles/_variables.scss index 5253d90567..05d77b5963 100644 --- a/frontend/src/assets/styles/_variables.scss +++ b/frontend/src/assets/styles/_variables.scss @@ -1,7 +1,7 @@ /* Color palette */ -$red: #d73f3f; -$red-light: #ffeded; -$orange: #faa71e; +$red: #990000; +$red-light: #006699; +$orange: #7ebc6f; $blue-dark: #2c3038; $blue-light: #929db3; $blue-grey: #68707f; diff --git a/frontend/src/components/footer/index.js b/frontend/src/components/footer/index.js index b524a84889..63d466c153 100644 --- a/frontend/src/components/footer/index.js +++ b/frontend/src/components/footer/index.js @@ -59,7 +59,7 @@ export function Footer() { return null; } else { return ( -