Skip to content

Commit

Permalink
Move services and CodeFactor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
UnchartedBull committed Oct 14, 2019
1 parent 16b2c22 commit 8ed7fec
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 24 deletions.
3 changes: 1 addition & 2 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ const dev = args.some(val => val === '--serve');
const big = args.some(val => val === '--big')

let window;
let config;

function createWindow() {
config = store.get("config");
store.onDidChange("config", (newValue, _) => {
store.onDidChange("config", (newValue, {}) => {
config = newValue
})
const {
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-no-autostart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ elif [ -d "/home/pi/oprint" ]; then
DIRECTORY="/home/pi/oprint"
else
echo "Neither /home/pi/OctoPrint/venv nor /home/pi/oprint can be found. Please specify OctoPrints full virtualenv path manually (no trailing slash):"
read DIRECTORY
read -r DIRECTORY
fi;

"$DIRECTORY"/bin/pip install -q "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip"
Expand Down
2 changes: 1 addition & 1 deletion scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ elif [ -d "/home/pi/oprint" ]; then
DIRECTORY="/home/pi/oprint"
else
echo "Neither /home/pi/OctoPrint/venv nor /home/pi/oprint can be found. Please specify OctoPrints full virtualenv path manually (no trailing slash):"
read DIRECTORY
read -r DIRECTORY
fi;

"$DIRECTORY"/bin/pip install -q "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip"
Expand Down
2 changes: 1 addition & 1 deletion src/app/bottom-bar/bottom-bar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { ConfigService } from '../config/config.service';
import { PrinterService, PrinterStatusAPI } from '../printer.service';
import { Subscription } from 'rxjs';
import { EnclosureService } from '../enclosure.service';
import { EnclosureService } from '../plugin-service/enclosure.service';

@Component({
selector: 'app-bottom-bar',
Expand Down
2 changes: 1 addition & 1 deletion src/app/config/no-config/no-config.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
height: 4vh;
border-radius: 2vh;
background-color: #44bd32;
width: 0vw;
width: 0;
transition: width .7s ease-in-out;

&-wrapper {
Expand Down
1 change: 0 additions & 1 deletion src/app/files/files.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
white-space: nowrap;
text-overflow: ellipsis;
display: block;
white-space: nowrap;
}

&__icon {
Expand Down
2 changes: 1 addition & 1 deletion src/app/layer-progress/layer-progress.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { LayerProgressService, DisplayLayerProgressAPI } from './layer-progress.service';
import { LayerProgressService, DisplayLayerProgressAPI } from '../plugin-service/layer-progress.service';
import { Subscription } from 'rxjs';

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
import { ConfigService } from './config/config.service';
import { NotificationService } from './notification/notification.service';
import { ConfigService } from '../config/config.service';
import { NotificationService } from '../notification/notification.service';
import { Observable, Observer, timer, Subscription } from 'rxjs';
import { OctoprintSettingsAPI } from './octoprint-api/settingsAPI';
import { PrinterStatusAPI } from './printer.service';
import { OctoprintSettingsAPI } from '../octoprint-api/settingsAPI';
import { PrinterStatusAPI } from '../printer.service';
import { shareReplay } from 'rxjs/operators';
import { TemperatureReading } from './bottom-bar/bottom-bar.component';
import { TemperatureReading } from '../bottom-bar/bottom-bar.component';

@Injectable({
providedIn: 'root'
Expand Down
2 changes: 1 addition & 1 deletion src/app/printer-status/printer-status.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { PrinterService, PrinterStatusAPI, PrinterValue } from '../printer.service';
import { LayerProgressService, DisplayLayerProgressAPI } from '../layer-progress/layer-progress.service';
import { LayerProgressService, DisplayLayerProgressAPI } from '../plugin-service/layer-progress.service';
import { Subscription } from 'rxjs';

@Component({
Expand Down
1 change: 1 addition & 0 deletions src/assets/reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ table {
input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
-moz-appearance: none;
margin: 0;
}

Expand Down
10 changes: 0 additions & 10 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,6 @@ app-root {
background-color: #353b48;
padding: 3.5vh 2vw;
}
}

.help {
position: fixed;
left: 0;
top: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, .85);
z-index: 1000;

&__close {
display: block;
Expand Down

0 comments on commit 8ed7fec

Please sign in to comment.