diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 8fd8cbab9..3599f6890 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -69,32 +69,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - name: Deploy - env: - PRIVATE_KEY: ${{ secrets.XSERVER_SSH_KEY }} - USER_NAME: ${{ secrets.XSERVER_USER_NAME }} - HOST_NAME: ${{ secrets.XSERVER_HOST_NAME }} - run: | - echo "$PRIVATE_KEY" > private_key && chmod 600 private_key && \ - ssh -vT -p 10022 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o TCPKeepAlive=yes -F /dev/null -i private_key ${USER_NAME}@${HOST_NAME} ' - cd ~/uu-circles.com/work/api-stg && \ - mkdir ${{ github.run_number }} && \ - cd ${{ github.run_number }} && \ - git clone https://github.com/UU-PlatHome/uu-circles.git && \ - cd uu-circles/api && \ - git reset --hard origin/develop/stg && \ - cp ../../../.env .env && \ - cp ../../../credentials.json credentials.json && \ - composer install && \ - php artisan migrate --force && \ - php artisan cache:clear && \ - php artisan config:cache && \ - php artisan route:cache && \ - php artisan view:cache - cd ~/uu-circles.com && \ - ln -nfs ~/uu-circles.com/work/api-stg/${{ github.run_number }} ~/uu-circles.com/work/api-stg/current - ' + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ secrets.XSERVER_HOST_NAME }} + username: ${{ secrets.XSERVER_USER_NAME }} + key: ${{ secrets.XSERVER_SSH_KEY }} + port: 10022 + script: | + whoami + pwd + ls -la deploy: if: github.ref == 'refs/heads/develop/production' diff --git a/admin/__tests__/lib/enum/api/DemoCircleNewjoyType.spec.ts b/admin/__tests__/lib/enum/api/DemoCircleNewjoyType.spec.ts deleted file mode 100644 index 3eef913d5..000000000 --- a/admin/__tests__/lib/enum/api/DemoCircleNewjoyType.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import * as TestFunc from '@/src/lib/enum/api/DemoCircleNewjoyType' - -describe('Enum DemoCircleNewjoyType', () => { - it('isNow', () => { - expect(TestFunc.DemoCircleNewjoyType.NOW).toBe('NOW') - expect(TestFunc.isDemoCircleNewjoyType('NOW')).toBeTruthy() - expect(TestFunc.isNow('NOW')).toBeTruthy() - expect(TestFunc.isNow('aaaaabbbbcccc')).toBeFalsy() - }) - it('isToday', () => { - expect(TestFunc.DemoCircleNewjoyType.TODAY).toBe('TODAY') - expect(TestFunc.isDemoCircleNewjoyType('TODAY')).toBeTruthy() - expect(TestFunc.isToday('TODAY')).toBeTruthy() - expect(TestFunc.isToday('aaaaabbbbcccc')).toBeFalsy() - }) - it('isFuture', () => { - expect(TestFunc.DemoCircleNewjoyType.FUTURE).toBe('FUTURE') - expect(TestFunc.isDemoCircleNewjoyType('FUTURE')).toBeTruthy() - expect(TestFunc.isFuture('FUTURE')).toBeTruthy() - expect(TestFunc.isFuture('aaaaabbbbcccc')).toBeFalsy() - }) -}) diff --git a/admin/src/components/atoms/bunner/DangerBunner.tsx b/admin/src/components/atoms/bunner/DangerBunner.tsx index 3554388ef..fa82943e1 100644 --- a/admin/src/components/atoms/bunner/DangerBunner.tsx +++ b/admin/src/components/atoms/bunner/DangerBunner.tsx @@ -7,7 +7,7 @@ type Props = { } const DangerBunner: FC = ({ text }) => { return ( -
+

{text}

diff --git a/admin/src/components/atoms/bunner/SuccessBunner.tsx b/admin/src/components/atoms/bunner/SuccessBunner.tsx index 3f2939053..3a5d7e223 100644 --- a/admin/src/components/atoms/bunner/SuccessBunner.tsx +++ b/admin/src/components/atoms/bunner/SuccessBunner.tsx @@ -7,7 +7,7 @@ type Props = { } const SuccessBunner: FC = ({ text }) => { return ( -
+

{text}

diff --git a/admin/src/components/atoms/buttons/BlueButton.tsx b/admin/src/components/atoms/buttons/BlueButton.tsx index 0080e3fe9..eb906e568 100644 --- a/admin/src/components/atoms/buttons/BlueButton.tsx +++ b/admin/src/components/atoms/buttons/BlueButton.tsx @@ -8,7 +8,7 @@ type Props = { const BlueButton: React.FC = ({ children, onClick, type }) => { return (