Display layer progress (#97)

* Update scripts

* Update API Endpoint (needs testing)

* Fixed API call

package.json

@@ -33,15 +33,13 @@
             "output": "package"
         },
         "linux": {
-            "target": [
-                {
-                    "target": "deb",
-                    "arch": [
-                        "armv7l",
-                        "arm64"
-                    ]
-                }
-            ],
+            "target": [{
+                "target": "deb",
+                "arch": [
+                    "armv7l",
+                    "arm64"
+                ]
+            }],
             "category": "Utility"
         }
     },

scripts/install-no-autostart.sh

@@ -4,7 +4,7 @@ release=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/
 dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 gir1.2-gnomekeyring-1.0"
 
 echo "Installing OctoPrint Plugins"
-~/OctoPrint/venv/bin/pip install -q "https://github.com/UnchartedBull/OctoPrint-DisplayLayerProgress/archive/master.zip"
+~/OctoPrint/venv/bin/pip install -q "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip"
 if [[ $* == *--ptg* ]]
 then
     ~/OctoPrint/venv/bin/pip install -q "https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip"

scripts/install.sh

@@ -4,7 +4,7 @@ release=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/
 dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 gir1.2-gnomekeyring-1.0"
 
 echo "Installing OctoPrint Plugins"
-~/OctoPrint/venv/bin/pip install -q "https://github.com/UnchartedBull/OctoPrint-DisplayLayerProgress/archive/master.zip"
+~/OctoPrint/venv/bin/pip install -q "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip"
 if [[ $* == *--ptg* ]]
 then
     ~/OctoPrint/venv/bin/pip install -q "https://github.com/eyal0/OctoPrint-PrintTimeGenius/archive/master.zip"

src/app/files/files.component.scss

@@ -0,0 +1 @@
+

src/app/layer-progress/layer-progress.service.ts

@@ -20,12 +20,12 @@ export class LayerProgressService {
         if (this.httpRequest) {
           this.httpRequest.unsubscribe();
         }
-        this.httpRequest = this.http.get(this.configService.getURL('plugin/DisplayLayerProgress'),
+        this.httpRequest = this.http.get(this.configService.getURL('plugin/DisplayLayerProgress/values').replace('/api', ''),
           this.configService.getHTTPHeaders()).subscribe(
             (data: OctoprintLayerProgressAPI) => {
               observer.next({
-                current: data.layer.current === '-' ? 0 : data.layer.current,
-                total: data.layer.total === '-' ? 0 : data.layer.total,
+                current: data.layer.current === '-' ? 0 : data.layer.current + 1,
+                total: data.layer.total === '-' ? 0 : data.layer.total + 1,
                 fanSpeed: data.fanSpeed === '-' ? 0 : data.fanSpeed === 'Off' ? 0 : data.fanSpeed.replace('%', '')
               });
             }, (error: HttpErrorResponse) => {