Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"ionic:serve": "ionic-app-scripts serve"
},
"dependencies": {
"@angular/common": "4.0.2",
"@angular/compiler": "4.0.2",
"@angular/compiler-cli": "4.0.2",
"@angular/core": "4.0.2",
"@angular/forms": "4.0.2",
"@angular/http": "4.0.2",
"@angular/platform-browser": "4.0.2",
"@angular/platform-browser-dynamic": "4.0.2",
"@angular/common": "4.1.0",
"@angular/compiler": "4.1.0",
"@angular/compiler-cli": "4.1.0",
"@angular/core": "4.1.0",
"@angular/forms": "4.1.0",
"@angular/http": "4.1.0",
"@angular/platform-browser": "4.1.0",
"@angular/platform-browser-dynamic": "4.1.0",
"@ionic-native/core": "^3.6.1",
"@ionic-native/network": "^3.6.1",
"@ionic-native/splash-screen": "3.4.2",
Expand All @@ -29,16 +29,16 @@
"@ngx-translate/http-loader": "0.0.3",
"d3": "^4.7.1",
"install": "^0.8.8",
"ionic-angular": "3.1.1",
"ionic-angular": "3.2.0",
"ionicons": "3.0.0",
"rxjs": "5.1.1",
"sw-toolbox": "3.4.0",
"zone.js": "^0.8.5"
"sw-toolbox": "3.6.0",
"zone.js": "^0.8.10"
},
"devDependencies": {
"@ionic/app-scripts": "1.3.6",
"@ionic/cli-plugin-cordova": "1.0.0",
"@ionic/cli-plugin-ionic-angular": "1.0.0",
"@ionic/app-scripts": "^1.3.7",
"@ionic/cli-plugin-cordova": "^1.1.2",
"@ionic/cli-plugin-ionic-angular": "^1.1.2",
"@types/d3": "^4.7.0",
"typescript": "~2.2.1"
},
Expand Down
Binary file added resources/icon-favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
191 changes: 191 additions & 0 deletions resources/icon-favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { HomePage } from '../pages/home/home';
import { BanksPage } from '../pages/banks/banks';
import { ConfigurationsPage } from '../pages/configurations/configurations';
import { ConnectionPage } from '../pages/connection/connection';
import { DeviceConfigurationsPage } from '../pages/configurations/device/device';
import { PedalboardDrawerPage } from '../pages/pedalboard-drawer/pedalboard-drawer';
import { PedalboardParametersPage } from '../pages/pedalboard-parameters/pedalboard-parameters';
import { PedalboardsPage } from '../pages/pedalboards/pedalboards';
Expand Down Expand Up @@ -67,6 +68,7 @@ export function createTranslateLoader(http: Http) {
BanksPage,
ConfigurationsPage,
ConnectionPage,
DeviceConfigurationsPage,
PedalboardDrawerPage,
PedalboardParametersPage,
PedalboardsPage,
Expand Down Expand Up @@ -110,6 +112,7 @@ export function createTranslateLoader(http: Http) {
BanksPage,
ConfigurationsPage,
ConnectionPage,
DeviceConfigurationsPage,
PedalboardDrawerPage,
PedalboardParametersPage,
PedalboardsPage,
Expand Down
9 changes: 8 additions & 1 deletion src/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,12 @@
"MANAGE_NETWORK": "Netzwerkeinstellungen",

"TRANSLATIONS": "Übersetzungen",
"TRANSLATIONS_THANKS": "Besonderer Dank geht an diejenigen, die diese Anwendung übersetzt."
"TRANSLATIONS_THANKS": "Besonderer Dank geht an diejenigen, die diese Anwendung übersetzt.",

"INCERTO": "-------------------------------------------------",
"DEVICE_CONFIGURATIONS": "Geräteeinstellungen",
"NAME": "Name",
"PASSWORD": "Passwort",
"ADDRESS": "Adresse",
"RENAME_DEVICE": "Umbenennen Gerät"
}
8 changes: 7 additions & 1 deletion src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,11 @@
"MANAGE_NETWORK": "Manage network",

"TRANSLATIONS": "Translations",
"TRANSLATIONS_THANKS": "Special thanks to those who assisted in the translation of this application."
"TRANSLATIONS_THANKS": "Special thanks to those who assisted in the translation of this application.",

"DEVICE_CONFIGURATIONS": "Device configurations",
"NAME": "Name",
"PASSWORD": "Password",
"ADDRESS": "Address",
"RENAME_DEVICE": "Rename device"
}
9 changes: 8 additions & 1 deletion src/assets/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,12 @@
"MANAGE_NETWORK": "Configuración de red",

"TRANSLATIONS": "Traducciones",
"TRANSLATIONS_THANKS": "Agradecimientos especiales para aquellos que colaboraron en la traducción de esta aplicación."
"TRANSLATIONS_THANKS": "Agradecimientos especiales para aquellos que colaboraron en la traducción de esta aplicación.",

"INCERTO": "-------------------------------------------------",
"DEVICE_CONFIGURATIONS": "Ajustes de dispositivo",
"NAME": "Nombre",
"PASSWORD": "Contrasenã",
"ADDRESS": "Dirección",
"RENAME_DEVICE": "Cambiar nombre de dipositivo"
}
8 changes: 7 additions & 1 deletion src/assets/i18n/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,11 @@
"MANAGE_NETWORK": "Configurações de rede",

"TRANSLATIONS": "Traduções",
"TRANSLATIONS_THANKS": "Agradecimentos especiais àqueles que colaboraram na tradução deste aplicativo."
"TRANSLATIONS_THANKS": "Agradecimentos especiais àqueles que colaboraram na tradução deste aplicativo.",

"DEVICE_CONFIGURATIONS": "Configurações do dispositivo",
"NAME": "Nome",
"PASSWORD": "Senha",
"ADDRESS": "Endereço",
"RENAME_DEVICE": "Renomear dispositivo"
}
8 changes: 3 additions & 5 deletions src/pages/configurations/configurations.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

<ion-content class="base-block">
<ion-list class="center-block">
<button ion-item (click)="connection()">
<button ion-item (click)="goToDevice()">
<ion-label>{{ 'DEVICE' | translate }}</ion-label>
<span item-right>{{device}}</span>
<span item-right>{{deviceName}} <small>({{deviceAddress}})</small></span>
</button>

<ion-item>
Expand All @@ -39,9 +39,7 @@
</ion-list>

<!--
<ion-navbar [color]="connectedColor">
<h3 ion-text color="light">Device info</h3>
</ion-navbar>


<ion-list hidden="true">
<ion-item inset padding>
Expand Down
16 changes: 13 additions & 3 deletions src/pages/configurations/configurations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {JsonService} from '../../providers/json/json-service';
import {DataService} from '../../providers/data/data-service';
import {WebSocketService} from '../../providers/websocket/web-socket-service';

import {DeviceConfigurationsPage} from './device/device';

import {AboutPage} from '../about/about';


Expand All @@ -25,6 +27,10 @@ export class ConfigurationsPage {
cssClass: 'flags-translate'
};

get configurations() {
return this.jsonService.configurations;
}

get connectedColor() {
return this.ws.connected ? "#08AE97" : "danger";
}
Expand All @@ -33,11 +39,15 @@ export class ConfigurationsPage {
this.nav.push(AboutPage);
}

connection() {
this.ws.view.showConnectionModal();
goToDevice() {
this.nav.push(DeviceConfigurationsPage);
}

get deviceName() {
return this.data.remote.configurations.device.name;
}

get device() {
get deviceAddress() {
return this.jsonService.webServer;
}

Expand Down
Loading