ccfc65ca9b
* refactor(profile): comment out change role feature * refactor(orders): update OrderServices and ServiceSelect components to utilize ServiceCard, and enhance service fields with duration in GraphQL types * refactor(schedule): implement forbidden order states to disable editing slots with active orders * fix(deploy): update SSH configuration to use dynamic port from secrets for improved flexibility * refactor(api/orders): simplify order creation logic by removing unnecessary validations and improving error handling * refactor(contact-row): replace role display logic with useIsMaster hook for improved clarity * refactor(profile/orders-list): update header text from "Общие записи" to "Недавние записи" for better clarity gql: GetOrders add sort slot.date:desc * refactor(profile/orders-list): enhance OrderCard component by adding avatarSource prop based on user role * feat(order-form): implement date selection with event highlighting and monthly view for available time slots * refactor(i18n/config): update timeZone from 'Europe/Amsterdam' to 'Europe/Moscow' * refactor(order-form/datetime-select): enhance date selection logic to include slot availability check * refactor(datetime-format): integrate dayjs timezone support with default Moscow timezone for date and time formatting * fix(contact-row): replace useIsMaster hook with isCustomerMaster utility for role display logic * refactor(service-card): replace formatTime with getMinutes for duration display * refactor(order-datetime): update date and time handling to use datetime_start and datetime_end for improved consistency * refactor(profile): streamline profile and slot pages by integrating session user retrieval and updating booking logic with BookButton component * fix(navigation): append query parameter to bottom-nav links and enhance back navigation logic in success page
103 lines
3.7 KiB
YAML
103 lines
3.7 KiB
YAML
name: Build & Deploy Web & Bot
|
|
|
|
on:
|
|
push:
|
|
branches:
|
|
- main
|
|
|
|
jobs:
|
|
build-and-push:
|
|
name: Build and Push to Docker Hub
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: Checkout code
|
|
uses: actions/checkout@v3
|
|
|
|
- name: Create fake .env file for build
|
|
run: |
|
|
echo "BOT_TOKEN=fake" > .env
|
|
echo "LOGIN_GRAPHQL=fake" >> .env
|
|
echo "PASSWORD_GRAPHQL=fake" >> .env
|
|
echo "URL_GRAPHQL=http://localhost/graphql" >> .env
|
|
echo "EMAIL_GRAPHQL=fake@example.com" >> .env
|
|
echo "NEXTAUTH_SECRET=fakesecret" >> .env
|
|
echo "BOT_URL=http://localhost:3000" >> .env
|
|
|
|
- name: Login to Docker Hub
|
|
run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
|
|
|
|
- name: Build web image
|
|
run: |
|
|
docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-web:latest -f ./apps/web/Dockerfile .
|
|
|
|
- name: Push web image to Docker Hub
|
|
run: |
|
|
docker push ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-web:latest
|
|
|
|
- name: Build bot image
|
|
run: |
|
|
docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-bot:latest -f ./apps/bot/Dockerfile .
|
|
|
|
- name: Push bot image to Docker Hub
|
|
run: |
|
|
docker push ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-bot:latest
|
|
|
|
deploy:
|
|
name: Deploy to VPS
|
|
needs: build-and-push
|
|
runs-on: ubuntu-latest
|
|
environment: production
|
|
steps:
|
|
- name: Checkout code
|
|
uses: actions/checkout@v3
|
|
|
|
- name: Setup SSH key
|
|
run: |
|
|
mkdir -p ~/.ssh
|
|
echo "${{ secrets.VPS_SSH_KEY }}" > ~/.ssh/id_rsa
|
|
chmod 600 ~/.ssh/id_rsa
|
|
ssh-keyscan -p ${{ secrets.VPS_PORT }} -H ${{ secrets.VPS_HOST }} >> ~/.ssh/known_hosts
|
|
|
|
- name: Ensure zapishis directory exists on VPS
|
|
run: |
|
|
ssh -i ~/.ssh/id_rsa -p ${{ secrets.VPS_PORT }} -o StrictHostKeyChecking=no ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} "mkdir -p /home/${{ secrets.VPS_USER }}/zapishis"
|
|
|
|
- name: Create real .env file for production
|
|
run: |
|
|
echo "BOT_TOKEN=${{ secrets.BOT_TOKEN }}" > .env
|
|
echo "LOGIN_GRAPHQL=${{ secrets.LOGIN_GRAPHQL }}" >> .env
|
|
echo "PASSWORD_GRAPHQL=${{ secrets.PASSWORD_GRAPHQL }}" >> .env
|
|
echo "URL_GRAPHQL=${{ secrets.URL_GRAPHQL }}" >> .env
|
|
echo "EMAIL_GRAPHQL=${{ secrets.EMAIL_GRAPHQL }}" >> .env
|
|
echo "NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }}" >> .env
|
|
echo "BOT_URL=${{ secrets.BOT_URL }}" >> .env
|
|
|
|
- name: Copy .env to VPS via SCP
|
|
uses: appleboy/scp-action@master
|
|
with:
|
|
host: ${{ secrets.VPS_HOST }}
|
|
username: ${{ secrets.VPS_USER }}
|
|
key: ${{ secrets.VPS_SSH_KEY }}
|
|
port: ${{ secrets.VPS_PORT }}
|
|
source: '.env'
|
|
target: '/home/${{ secrets.VPS_USER }}/zapishis/'
|
|
|
|
- name: Copy docker-compose.yml to VPS via SCP
|
|
uses: appleboy/scp-action@master
|
|
with:
|
|
host: ${{ secrets.VPS_HOST }}
|
|
username: ${{ secrets.VPS_USER }}
|
|
key: ${{ secrets.VPS_SSH_KEY }}
|
|
port: ${{ secrets.VPS_PORT }}
|
|
source: 'docker-compose.yml'
|
|
target: '/home/${{ secrets.VPS_USER }}/zapishis/'
|
|
|
|
- name: Login and deploy on VPS
|
|
run: |
|
|
ssh -i ~/.ssh/id_rsa -p ${{ secrets.VPS_PORT }} -o StrictHostKeyChecking=no ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} "
|
|
cd /home/${{ secrets.VPS_USER }}/zapishis && \
|
|
docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }} && \
|
|
docker compose pull && \
|
|
docker compose up -d
|
|
"
|