Merge pull request #179 from AndrewCS149/testWorkflow

testWorkflow

Author: The-DevBlog

.github/workflows/staging.yml

@@ -34,9 +34,9 @@ jobs:
               run: cargo install trunk
             #   if: steps.cache.outputs.cache-hit != 'true'
 
-            # - name: Build with Trunk
-            #   run: trunk build --release  
-            #   working-directory: client
+            - name: Build with Trunk
+              run: trunk build --release  
+              working-directory: client
 
             - name: Create SSH Key
               run: |
@@ -49,7 +49,9 @@ jobs:
               run: ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ${{ secrets.SSH_PRIVATE_KEY_PATH }}/known_hosts
 
             - name: Copy Files to Server
-              run: scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} -r client/dist ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ vars.DEVBLOG_ROOT_PATH }}/client
+              run: |
+                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} -r client/dist ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ vars.DEVBLOG_ROOT_PATH }}/client
+                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} docker-compose.yaml ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ vars.DEVBLOG_ROOT_PATH }}
 
             - name: Restart Container
               run: |

client/src/pages/home.rs

@@ -152,7 +152,7 @@ pub fn home() -> Html {
                 if !*loading {
                     <Post post={(*latest_post).clone()} post_number={*total_posts_count} on_post_delete={&on_post_delete}/>
                 } else {
-                    <h1>{"Loading......................."}</h1>
+                    <h1>{"Loading..."}</h1>
                 }
 
                 // youtube video

docker-compose.yaml

@@ -0,0 +1,25 @@
+services:
+  proxy:
+    image: proxy
+    build: ./proxy
+    container_name: proxy
+    depends_on:
+      - devblog_staging_client
+    volumes:
+      - /home/devmaster/app/proxy/default.conf:/etc/nginx/conf.d/default.conf
+      - /etc/ssl/certs/andrewtest.org:/etc/ssl/certs/andrewtest.org
+    restart: on-failure
+    ports:
+      - 443:443
+
+  devblog_staging_client:
+   image: andrewtest.org_client
+   build: ./client
+   container_name: andrewtest.org_client
+   restart: on-failure
+   volumes:
+     - ./client/dist:/app
+     - ./client/nginx.conf:/etc/nginx/nginx.conf
+     - /etc/ssl/certs/andrewtest.org:/etc/ssl/certs/andrewtest.org
+   ports:
+     - 8082:443