Merge pull request #80 from DDMAL/auto-format

Add workflow for code format check
DDMAL · Jul 1, 2024 · dc34a4b · dc34a4b
2 parents 3e4ede2 + 9b5d5cb
commit dc34a4b
Show file tree

Hide file tree

Showing 22 changed files with 152 additions and 121 deletions.
diff --git a/.github/workflows/code-format.yml b/.github/workflows/code-format.yml
@@ -1,7 +1,5 @@
 name: check-format
-on:
-  pull_request:
-    types: [push, pull_request]
+on: [push, pull_request]
 jobs:
   format-test:
     runs-on: ubuntu-latest

diff --git a/assets/css/style.css b/assets/css/style.css
@@ -579,7 +579,6 @@ a:hover {
   zoom: 0.9;
 }
 
-
 /* ----------------------- */
 /* Section: Image Cell
 /* ----------------------- */
@@ -620,7 +619,9 @@ a:hover {
   align-items: center;
   justify-content: center;
   cursor: pointer;
-  transition: background-color 0.3s ease, border-color 0.3s ease;
+  transition:
+    background-color 0.3s ease,
+    border-color 0.3s ease;
 }
 
 .upload-img-btn:hover {

diff --git a/assets/template.html b/assets/template.html
@@ -3,24 +3,32 @@
 </div>
 <nav class="navbar is-light">
   <div class="navbar-brand">
-      <!-- Image src attributes are ste programatically because paths are not the same in dev and prod -->
+    <!-- Image src attributes are ste programatically because paths are not the same in dev and prod -->
     <a class="navbar-home-btn" id="home-link" href="./index.html">
-      <img id="cress-main-icon">
+      <img id="cress-main-icon" />
     </a>
-    <a class="navbar-burger" id="burgerMenu" role="button" aria-label="menu" aria-expanded="false">
+    <a
+      class="navbar-burger"
+      id="burgerMenu"
+      role="button"
+      aria-label="menu"
+      aria-expanded="false"
+    >
       <span aria-hidden="true"></span>
       <span aria-hidden="true"></span>
       <span aria-hidden="true"></span>
     </a>
   </div>
   <div class="navbar-menu" id="navMenu">
-
     <div class="navbar-start">
-
       <div class="navbar-main-content-container-top">
         <div class="navbar-element" id="filename"></div>
         <div id="unsaved-changes-container">
-          <img class="navbar-element" id="file-saved" alt="Your work is saved">
+          <img
+            class="navbar-element"
+            id="file-saved"
+            alt="Your work is saved"
+          />
         </div>
         <div class="navbar-element" id="file-status">
           <div id="validation_status_container">
@@ -31,7 +39,6 @@
       </div>
 
       <div class="navbar-main-content-container-bottom">
-
         <div class="navbar-item has-dropdown is-hoverable">
           <div class="navbar-element navbar-btn">
             <div class="navbar-btn-text">File</div>
@@ -45,7 +52,7 @@
               <div class="navbar-dropdown-item-text">Export to CSV</div>
             </div>
             <a id="export-to-excel" class="navbar-dropdown-item">
-             <div class="navbar-dropdown-item-text">Export to Excel</div>
+              <div class="navbar-dropdown-item-text">Export to Excel</div>
             </a>
           </div>
         </div>
@@ -55,9 +62,13 @@
             <div class="navbar-btn-text">Help</div>
           </div>
           <div class="navbar-dropdown">
-            <a class="navbar-dropdown-item" href="//ddmal.music.mcgill.ca" target="_blank">
+            <a
+              class="navbar-dropdown-item"
+              href="//ddmal.music.mcgill.ca"
+              target="_blank"
+            >
               DDMAL
-              <img class="external-link-icon">
+              <img class="external-link-icon" />
             </a>
             <div class="navbar-dropdown-item">
               <div id="navbar-item-hotkeys">Hotkeys</div>
@@ -68,24 +79,27 @@
     </div>
 
     <div class="navbar-end">
-      <a class="navbar-element navbar-btn" id="feedback-form-btn-container" href="https://forms.gle/vGUpvZKZxGX5QGJZ9" target="_blank">
+      <a
+        class="navbar-element navbar-btn"
+        id="feedback-form-btn-container"
+        href="https://forms.gle/vGUpvZKZxGX5QGJZ9"
+        target="_blank"
+      >
         Feedback Form
-        <img class="external-link-icon">
+        <img class="external-link-icon" />
       </a>
     </div>
   </div>
 </nav>
 
 <div id="editor-body-container">
-  <div id="notification-content" style="display:none;"></div>
+  <div id="notification-content" style="display: none"></div>
   <div id="hot-container" class="hot-container"></div>
 </div>
 
-
 <!-- Cress modal window -->
 <div id="cress-modal-window-container">
   <div tabindex="0" id="cress-modal-window">
-
     <div id="cress-modal-window-header">
       <div id="cress-modal-window-header-title"></div>
       <div id="cress-modal-window-header-close">x</div>
@@ -94,6 +108,4 @@
     <!-- Cress modal window content section -->
     <div id="cress-modal-window-content-container"></div>
   </div>
-
-
 </div>
diff --git a/deployment/scripts/editor.ts b/deployment/scripts/editor.ts
@@ -1,5 +1,5 @@
 import CressView from '../../src/CressView';
-import { parseWORD } from '../../src/Dashboard/Storage';  
+import { parseWORD } from '../../src/Dashboard/Storage';
 import { IEntry, IFolder } from '../../src/Dashboard/FileSystem';
 import { CressDoc, Doc, GlyphArray } from '../../src/Types';
 import PouchDB from 'pouchdb';

diff --git a/deployment/server/dashboard.html b/deployment/server/dashboard.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>Cress</title>

diff --git a/deployment/server/editor.html b/deployment/server/editor.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width" />

diff --git a/deployment/server/index.html b/deployment/server/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>Cress</title>

diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "hard-source-webpack-plugin": "^0.13.1",
     "papaparse": "^5.4.1",
     "pouchdb-core": "^8.0.1",
+    "prettier": "^3.3.2",
     "ts-loader": "8.4.0",
     "typescript": "^5.4.2",
     "webpack": "4.47.0",