Merge branch 'dev' into ui-adjustments

msi-se · Apr 17, 2024 · fe58b01 · fe58b01
2 parents 403b63d + fe39ff1
commit fe58b01
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 13 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -0,0 +1,21 @@
+name: deploy-dev
+on:
+  push:
+    branches:
+      - dev
+jobs:
+  deploy-via-ssh:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup SSH
+        run: |
+          mkdir -p ~/.ssh/
+          echo "${{ secrets.SSH_PRIV_KEY_DEV }}" > ~/.ssh/id_rsa
+          echo "${{ secrets.SSH_PUB_KEY_DEV }}" > ~/.ssh/id_rsa.pub
+          chmod 600 ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa.pub
+          touch ~/.ssh/known_hosts
+          ssh-keyscan -H ${{ secrets.IP_DEV }} >> ~/.ssh/known_hosts
+      - name: Deploy via SSH
+        run: |
+          ssh ${{ secrets.USER_AND_IP_DEV }} 'cd /home/loco/team-learning && git pull && docker compose -f traefik.docker-compose.yml up -d'
diff --git a/frontend/lib/components/general/quiz/choose_alias.dart b/frontend/lib/components/general/quiz/choose_alias.dart
@@ -93,19 +93,23 @@ class _ChooseAliasState extends State<ChooseAlias> {
                         ),
                       ),
                     ),
-                    ElevatedButton(
-                      onPressed: () {
-                        _onSubmit();
-                      },
-                      style: ElevatedButton.styleFrom(
-                        padding: EdgeInsets.zero,
-                        shape: const CircleBorder(),
-                        fixedSize: const Size(50, 50),
-                        backgroundColor: colors.primary,
-                      ),
-                      child: Icon(
-                        Icons.arrow_forward,
-                        color: colors.background,
+                    SizedBox(
+                      width: 50,
+                      height: 50,
+                      child: ElevatedButton(
+                        onPressed: () {
+                          _onSubmit();
+                        },
+                        style: ElevatedButton.styleFrom(
+                          padding: EdgeInsets.zero,
+                          shape: const CircleBorder(),
+                          fixedSize: const Size(50, 50),
+                          backgroundColor: colors.primary,
+                        ),
+                        child: Icon(
+                          Icons.arrow_forward,
+                          color: colors.background,
+                        ),
                       ),
                     ),
                   ],