Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/touch callout #249

Merged
merged 5 commits into from
Oct 23, 2019
Merged

Feature/touch callout #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55edcb5
Disable some chrome functionality
UnchartedBull Oct 23, 2019
7630f93
wip
UnchartedBull Oct 23, 2019
845eaab
Ripple working on control
UnchartedBull Oct 23, 2019
09db4ac
Ripple effect finished
UnchartedBull Oct 23, 2019
f4fdcfe
fix codefactor issues
UnchartedBull Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

206 changes: 104 additions & 102 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,110 @@
{
"name": "octodash",
"description": "OctoDash is a simple, but beautiful dashboard for Octoprint.",
"version": "1.3.1",
"license": "Apache 2.0",
"homepage": "https://github.com/UnchartedBull/OctoDash",
"author": {
"name": "Timon Gaebelein",
"email": "[email protected]"
"name": "octodash",
"description": "OctoDash is a simple, but beautiful dashboard for Octoprint.",
"version": "1.3.1",
"license": "Apache 2.0",
"homepage": "https://github.com/UnchartedBull/OctoDash",
"author": {
"name": "Timon Gaebelein",
"email": "[email protected]"
},
"main": "main.js",
"files": [
"main.js",
"node_modules",
"dist",
"!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
"!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}",
"!**/node_modules/*.d.ts",
"!**/node_modules/.bin",
"!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}",
"!.editorconfig",
"!**/._*",
"!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}",
"!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}",
"!**/{appveyor.yml,.travis.yml,circle.yml}",
"!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}"
],
"build": {
"appId": "octodash",
"productName": "OctoDash",
"directories": {
"output": "package"
},
"main": "main.js",
"files": [
"main.js",
"node_modules",
"dist",
"!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
"!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}",
"!**/node_modules/*.d.ts",
"!**/node_modules/.bin",
"!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}",
"!.editorconfig",
"!**/._*",
"!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}",
"!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}",
"!**/{appveyor.yml,.travis.yml,circle.yml}",
"!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}"
],
"build": {
"appId": "octodash",
"productName": "OctoDash",
"directories": {
"output": "package"
"linux": {
"target": [
{
"target": "deb",
"arch": [
"armv7l",
"arm64",
"x64"
]
},
"linux": {
"target": [
{
"target": "deb",
"arch": [
"armv7l",
"arm64",
"x64"
]
},
{
"target": "apk"
}
],
"category": "Utility"
{
"target": "apk"
}
},
"scripts": {
"ng": "ng",
"start": "npm-run-all -p ng:serve electron:serve electron:serve:big",
"start:big": "npm-run-all -p ng:serve electron:serve:big",
"build": "npm run ng:build && electron .",
"test": "",
"lint": "ng lint",
"e2e": "ng e2e",
"electron": "electron .",
"electron:serve": "wait-on http-get://localhost:4200/ && electron . --serve",
"electron:serve:big": "wait-on http-get://localhost:4200/ && electron . --serve --big",
"pack": "npm run ng:build && electron-builder build -l",
"pack:mac": "npm run ng:build && electron-builder build -m",
"ng:serve": "ng serve",
"ng:build": "ng build --prod"
},
"private": true,
"dependencies": {
"@angular/animations": "~8.2.2",
"@angular/common": "~8.2.2",
"@angular/compiler": "~8.2.2",
"@angular/core": "~8.2.2",
"@angular/forms": "~8.2.2",
"@angular/platform-browser": "~8.2.2",
"@angular/platform-browser-dynamic": "~8.2.2",
"@angular/router": "~8.2.11",
"@fortawesome/angular-fontawesome": "^0.5.0",
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/free-solid-svg-icons": "^5.11.2",
"ajv": "^6.10.2",
"angular-svg-round-progressbar": "^3.0.1",
"electron-store": "^5.0.0",
"hammerjs": "^2.0.8",
"lodash": "^4.17.15",
"ngx-spinner": "^8.0.3",
"rxjs": "~6.5.3",
"tslib": "^1.9.0",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.13",
"@angular/cli": "~8.3.13",
"@angular/compiler-cli": "^8.2.2",
"@angular/language-service": "~8.2.11",
"@types/ajv": "^1.0.0",
"@types/lodash": "^4.14.144",
"@types/node": "~12.11.5",
"codelyzer": "^5.2.0",
"electron": "^7.0.0",
"electron-builder": "^21.2.0",
"electron-reload": "^1.5.0",
"npm-run-all": "^4.1.5",
"ts-node": "~8.4.1",
"tslint": "~5.20.0",
"typescript": "~3.5.3",
"wait-on": "^3.3.0"
],
"category": "Utility"
}
},
"scripts": {
"ng": "ng",
"start": "npm-run-all -p ng:serve electron:serve electron:serve:big",
"start:big": "npm-run-all -p ng:serve electron:serve:big",
"build": "npm run ng:build && electron .",
"test": "",
"lint": "ng lint",
"e2e": "ng e2e",
"electron": "electron .",
"electron:serve": "wait-on http-get://localhost:4200/ && electron . --serve",
"electron:serve:big": "wait-on http-get://localhost:4200/ && electron . --serve --big",
"pack": "npm run ng:build && electron-builder build -l",
"pack:mac": "npm run ng:build && electron-builder build -m",
"ng:serve": "ng serve",
"ng:build": "ng build --prod"
},
"private": true,
"dependencies": {
"@angular/animations": "~8.2.2",
"@angular/cdk": "^8.2.3",
"@angular/common": "~8.2.2",
"@angular/compiler": "~8.2.2",
"@angular/core": "~8.2.2",
"@angular/forms": "~8.2.2",
"@angular/material": "^8.2.3",
"@angular/platform-browser": "~8.2.2",
"@angular/platform-browser-dynamic": "~8.2.2",
"@angular/router": "~8.2.11",
"@fortawesome/angular-fontawesome": "^0.5.0",
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/free-solid-svg-icons": "^5.11.2",
"ajv": "^6.10.2",
"angular-svg-round-progressbar": "^3.0.1",
"electron-store": "^5.0.0",
"hammerjs": "^2.0.8",
"lodash": "^4.17.15",
"ngx-spinner": "^8.0.3",
"rxjs": "~6.5.3",
"tslib": "^1.9.0",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.13",
"@angular/cli": "~8.3.13",
"@angular/compiler-cli": "^8.2.2",
"@angular/language-service": "~8.2.11",
"@types/ajv": "^1.0.0",
"@types/lodash": "^4.14.144",
"@types/node": "~12.11.5",
"codelyzer": "^5.2.0",
"electron": "^7.0.0",
"electron-builder": "^21.2.0",
"electron-reload": "^1.5.0",
"npm-run-all": "^4.1.5",
"ts-node": "~8.4.1",
"tslint": "~5.20.0",
"typescript": "~3.5.3",
"wait-on": "^3.3.0"
}
}
17 changes: 10 additions & 7 deletions src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { BrowserModule, HammerGestureConfig, HAMMER_GESTURE_CONFIG } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { RoundProgressModule, ROUND_PROGRESS_DEFAULTS } from 'angular-svg-round-progressbar';

import { AppRoutingModule } from './app.routing.module';
import { MatRippleModule } from '@angular/material/core';

import { AppComponent } from './app.component';
import { AppRoutingModule } from './app.routing.module';
import { BottomBarComponent } from './bottom-bar/bottom-bar.component';
import { ControlComponent } from './control/control.component';
import { NotificationComponent } from './notification/notification.component';
import { FilamentComponent } from './filament/filament.component';
import { FilesComponent } from './files/files.component';
import { InvalidConfigComponent } from './config/invalid-config/invalid-config.component';
Expand All @@ -19,8 +18,11 @@ import { MainMenuComponent } from './main-menu/main-menu.component';
import { MainScreenComponent } from './main-screen/main-screen.component';
import { MainScreenNoTouchComponent } from './main-screen/no-touch/main-screen-no-touch.component';
import { NoConfigComponent } from './config/no-config/no-config.component';
import { NotificationComponent } from './notification/notification.component';
import { PrintControlComponent } from './print-control/print-control.component';
import { PrinterStatusComponent } from './printer-status/printer-status.component';
import { SettingsComponent } from './settings/settings.component';
import { StandbyComponent } from './standby/standby.component';

import { AppService } from './app.service';
import { ConfigService } from './config/config.service';
Expand All @@ -34,10 +36,9 @@ import { fas } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
import { NgxSpinnerModule } from 'ngx-spinner';


import * as Hammer from 'hammerjs';
import { SettingsComponent } from './settings/settings.component';
import { StandbyComponent } from './standby/standby.component';
import { RoundProgressModule } from 'angular-svg-round-progressbar';


export class MyHammerConfig extends HammerGestureConfig {
overrides = {
Expand Down Expand Up @@ -95,6 +96,8 @@ export class HammerConfig extends HammerGestureConfig {
FormsModule,
FontAwesomeModule,
NgxSpinnerModule,
BrowserAnimationsModule,
MatRippleModule
],
providers: [
AppService,
Expand Down
35 changes: 20 additions & 15 deletions src/app/control/control.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@
<table class="top-bar">
<tr>
<td class="top-bar__back" routerLink="/main-screen">
<img src="assets/back.svg" class="top-bar__back-icon" />back
<span matRipple [matRippleUnbounded]="true" [matRippleCentered]="true">
<img src="assets/back.svg" class="top-bar__back-icon" />back
</span>
</td>
<td class="top-bar__center">
<img src="assets/control.svg" class="top-bar__center-icon">
</td>
<td class="top-bar__next" (click)="showHelp = true">
<img src="assets/help.svg" class="top-bar__next-icon">
<span matRipple [matRippleUnbounded]="false" [matRippleCentered]="true">
<img src="assets/help.svg" class="top-bar__next-icon">
</span>
</td>
</tr>
</table>
Expand All @@ -34,29 +38,30 @@
<div class="control">
<div class="control__XY">
<div class="control__XY-wrapper">
<fa-icon [icon]="['fas', 'angle-up']" class="control__icon control__icon-1" (click)="moveAxis('y', '-')">
</fa-icon>
<fa-icon [icon]="['fas', 'angle-left']" class="control__icon control__icon-2" (click)="moveAxis('x', '-')">
</fa-icon>
<fa-icon [icon]="['fas', 'angle-right']" class="control__icon control__icon-3" (click)="moveAxis('x', '+')">
</fa-icon>
<fa-icon [icon]="['fas', 'angle-down']" class="control__icon control__icon-4" (click)="moveAxis('y', '+')">
</fa-icon>
<fa-icon [icon]="['fas', 'angle-up']" class="control__icon control__icon-1" (click)="moveAxis('y', '-')"
matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"></fa-icon>
<fa-icon [icon]="['fas', 'angle-left']" class="control__icon control__icon-2" (click)="moveAxis('x', '-')"
matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"></fa-icon>
<fa-icon [icon]="['fas', 'angle-right']" class="control__icon control__icon-3" (click)="moveAxis('x', '+')"
matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"></fa-icon>
<fa-icon [icon]="['fas', 'angle-down']" class="control__icon control__icon-4" (click)="moveAxis('y', '+')"
matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"></fa-icon>
</div>
<span class="control__heading">X / Y</span>
</div>
<div class="control__Z">
<div class="control__Z-wrapper">
<fa-icon [icon]="['fas', 'angle-up']" class="control__icon control__icon-5" (click)="moveAxis('z', '+')">
</fa-icon>
<fa-icon [icon]="['fas', 'angle-down']" class="control__icon control__icon-6" (click)="moveAxis('z', '-')">
</fa-icon>
<fa-icon [icon]="['fas', 'angle-up']" class="control__icon control__icon-5" (click)="moveAxis('z', '+')"
matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"></fa-icon>
<fa-icon [icon]="['fas', 'angle-down']" class="control__icon control__icon-6" (click)="moveAxis('z', '-')"
matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"></fa-icon>
</div>
<span class="control__heading">Z</span>
</div>
<div class="control__custom">
<div class="control__custom-action" *ngFor="let customAction of customActions"
[style.border-color]="customAction.color" (click)="executeGCode(customAction.command)">
[style.border-color]="customAction.color" (click)="executeGCode(customAction.command)" matRipple
[matRippleUnbounded]="false">
<fa-icon [icon]="['fas', customAction.icon]" class="control__custom-action-icon"
[styles]="{color: customAction.color}">
</fa-icon>
Expand Down
Loading