Merge pull request #38 from CMU-17313Q/p4-translation-integration

P4A Checkpoint: Integrating provided UI code

Author: prodiggy8

.github/workflows/VM Deploy.yml

@@ -1,36 +1,36 @@
-name: VM Deploy NodeBB
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-    
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  build-and-deploy:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Node.js version
-        uses: actions/setup-node@v3
-        with:
-          node-version: '20.17.0'
-      
-      - name: Deploy via SSH
-        uses: appleboy/ssh-action@v1.2.1
-        with:
-          host: ${{ secrets.SERVER_IP }}
-          username: ${{ secrets.SERVER_ADMIN }}
-          password: ${{ secrets.ADMIN_PASSWORD }}
-          script: | 
-            cd code/${{ secrets.REPO_NAME }}
-            git pull origin main
-            docker compose down
-            docker compose --profile redis up --build -d
+name: VM Deploy NodeBB
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+    
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build-and-deploy:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js version
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20.17.0'
+      
+      - name: Deploy via SSH
+        uses: appleboy/ssh-action@v1.2.1
+        with:
+          host: ${{ secrets.SERVER_IP }}
+          username: ${{ secrets.SERVER_ADMIN }}
+          password: ${{ secrets.ADMIN_PASSWORD }}
+          script: | 
+            cd code/${{ secrets.REPO_NAME }}
+            git pull origin main
+            docker compose down
+            docker compose --profile redis up --build -d

.gitignore

@@ -1,80 +1,80 @@
-dump.rdb
-
-dist/
-yarn.lock
-npm-debug.log
-node_modules/
-sftp-config.json
-config.json
-jsconfig.json
-public/src/nodebb.min.js
-!src/views/config.json
-public/css/*.css
-*.sublime-project
-*.sublime-workspace
-.project
-*.swp
-Vagrantfile
-.vagrant
-provision.sh
-*.komodoproject
-.DS_Store
-feeds/recent.rss
-.eslintcache
-.svn
-
-logs/
-
-pidfile
-
-# templates
-/public/templates
-
-/public/uploads
-/test/uploads
-
-# compiled files
-/public/stylesheet.css
-/public/admin.css
-/public/nodebb.min.js
-/public/nodebb.min.js.map
-/public/acp.min.js
-/public/acp.min.js.map
-/public/installer.css
-/public/installer.min.js
-/public/bootstrap.min.css
-/public/logo.png
-
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
-*.iml
-
-## Directory-based project format:
-.idea/
-.vscode/
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Transifex
-tx.exe
-.transifexrc
-
-##Coverage output
-coverage
-.nyc_output
-
-*.log
-test/files/normalise.jpg.png
-test/files/normalise-resized.jpg
-package-lock.json
-/package.json
-*.mongodb
-link-plugins.sh
-test.sh
-
-.docker/**
-!**/.gitkeep
-
-#tests
+dump.rdb
+
+dist/
+yarn.lock
+npm-debug.log
+node_modules/
+sftp-config.json
+config.json
+jsconfig.json
+public/src/nodebb.min.js
+!src/views/config.json
+public/css/*.css
+*.sublime-project
+*.sublime-workspace
+.project
+*.swp
+Vagrantfile
+.vagrant
+provision.sh
+*.komodoproject
+.DS_Store
+feeds/recent.rss
+.eslintcache
+.svn
+
+logs/
+
+pidfile
+
+# templates
+/public/templates
+
+/public/uploads
+/test/uploads
+
+# compiled files
+/public/stylesheet.css
+/public/admin.css
+/public/nodebb.min.js
+/public/nodebb.min.js.map
+/public/acp.min.js
+/public/acp.min.js.map
+/public/installer.css
+/public/installer.min.js
+/public/bootstrap.min.css
+/public/logo.png
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+*.iml
+
+## Directory-based project format:
+.idea/
+.vscode/
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Transifex
+tx.exe
+.transifexrc
+
+##Coverage output
+coverage
+.nyc_output
+
+*.log
+test/files/normalise.jpg.png
+test/files/normalise-resized.jpg
+package-lock.json
+/package.json
+*.mongodb
+link-plugins.sh
+test.sh
+
+.docker/**
+!**/.gitkeep
+
+#tests
 /test/utils.js