From 742c8bcf8a411a05e4b9ec55a3dc1efb30259d83 Mon Sep 17 00:00:00 2001
From: andy <andy@sarsoo.xyz>
Date: Mon, 8 Feb 2021 00:19:29 +0000
Subject: [PATCH] using sass action instead of installing

---
 .github/workflows/ci.yml |  7 +++++--
 .gitignore               |  1 +
 admin.py                 |  3 +--
 main.py                  |  6 ------
 package-lock.json        | 12 +++++++++++-
 5 files changed, 18 insertions(+), 11 deletions(-)
 delete mode 100644 main.py

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f22fb43..189143a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,8 +81,11 @@ jobs:
           node-version: 14
 
       # JS for compiling scss
-      - name: Install Sass
-        run: npm install -g sass
+      - name: Compile Sass
+        uses: gha-utilities/sass-build@v0.3.5
+        with:
+          source: src/scss/style.scss
+          destination: build/style.css
 
       # JS install from lock.json 
       - name: Install Node Packages
diff --git a/.gitignore b/.gitignore
index 93587b0..e16f0a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 scratch.py
 service.json
 requirements.txt
+main.py
 
 *~*
 *#
diff --git a/admin.py b/admin.py
index 9935cc5..ee15227 100755
--- a/admin.py
+++ b/admin.py
@@ -49,7 +49,6 @@ class Admin(Cmd):
 
     def prepare_frontend(self):
         print('>> building css')
-        print(f'sass --style=compressed {scss_rel_path} {css_rel_path}')
         subprocess.check_call(['sass', '--style=compressed', str(scss_rel_path), str(css_rel_path)], shell=True)
 
         print('>> building javascript')
@@ -71,7 +70,7 @@ class Admin(Cmd):
         )
 
     def do_all(self, args):
-        self.prepare_frontend()
+        # self.prepare_frontend()
         self.prepare_stage()
 
         self.prepare_main('api')
diff --git a/main.py b/main.py
deleted file mode 100644
index e0c10a8..0000000
--- a/main.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from music.music import create_app
-
-app = create_app()
-
-if __name__ == '__main__':
-    app.run(host='127.0.0.1', port=8080, debug=True)
diff --git a/package-lock.json b/package-lock.json
index e6e9857..73589e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4185,6 +4185,13 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "nan": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "dev": true,
+      "optional": true
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -5912,7 +5919,10 @@
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "nan": "^2.12.1"
+          }
         }
       }
     },