Skip to content

Commit

Permalink
Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@6XGate
6XGate committed May 10, 2020
2 parents 6ebd319 + 8be0efa commit 3f08231
Show file tree
Hide file tree
Showing 11 changed files with 2,150 additions and 2,233 deletions.
13 changes: 13 additions & 0 deletions .idea/runConfigurations/Build_Debug.xml
View file

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

10 changes: 9 additions & 1 deletion build/webpack-packer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,20 @@ class Packer {
/** @type {{[string]: RuleSetUseItem}} Common configuration */
const loaders = {
esLint: {
loader: "eslint-loader",
loader: "eslint-loader",
options: {
formatter: "unix",
},
},
typeScript: {
loader: "ts-loader",
options: {
appendTsSuffixTo: [(/\.vue$/u)],
errorFormatter: (error, colors) => {
const color = error.severity === "warning" ? colors.bold.yellow : colors.bold.red;

return color(`${error.file}:${error.line}:${error.character}: ${error.content} [TS${error.code}]`);
},
},
},
vue: {
Expand Down
4,247 changes: 2,070 additions & 2,177 deletions package-lock.json
View file

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bridgecmdr",
"productName": "BridgeCmdr",
"version": "1.1.1",
"version": "1.2.0",
"description": "Professional Raspberry Pi A/V switch and monitor controller for retro gaming",
"main": "dist/main/index.js",
"scripts": {
Expand Down Expand Up @@ -38,66 +38,66 @@
},
"homepage": "https://github.com/6XGate/bridgecmdr#readme",
"devDependencies": {
"@mdi/font": "^4.7.95",
"@mdi/svg": "^4.7.95",
"@mdi/font": "^5.1.45",
"@mdi/svg": "^5.1.45",
"@types/electron-devtools-installer": "^2.2.0",
"@types/lodash": "^4.14.149",
"@types/lodash": "^4.14.150",
"@types/pouchdb": "^6.4.0",
"@types/serialport": "^7.0.4",
"@types/uuid": "^3.4.6",
"@typescript-eslint/eslint-plugin": "^2.16.0",
"@typescript-eslint/parser": "^2.16.0",
"@vue/eslint-config-typescript": "^5.0.1",
"axios": "^0.19.1",
"@types/serialport": "^8.0.0",
"@types/uuid": "^7.0.3",
"@typescript-eslint/eslint-plugin": "^2.31.0",
"@typescript-eslint/parser": "^2.31.0",
"@vue/eslint-config-typescript": "^5.0.2",
"axios": "^0.19.2",
"copy-webpack-plugin": "^5.1.1",
"cross-env": "^6.0.3",
"css-loader": "^3.4.2",
"electron": "^7.1.9",
"electron-devtools-installer": "^2.2.4",
"electron-installer-debian": "^2.0.1",
"electron-packager": "^14.2.0",
"electron-rebuild": "^1.8.8",
"cross-env": "^7.0.2",
"css-loader": "^3.5.3",
"electron": "^8.2.5",
"electron-devtools-installer": "^3.0.0",
"electron-installer-debian": "^3.0.0",
"electron-packager": "^14.2.1",
"electron-rebuild": "^1.10.1",
"electron-unhandled": "^3.0.2",
"eslint": "^6.8.0",
"eslint-config-standard": "^14.1.0",
"eslint-loader": "^3.0.3",
"eslint-plugin-import": "^2.20.0",
"eslint-plugin-node": "^11.0.0",
"eslint-config-standard": "^14.1.1",
"eslint-loader": "^4.0.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.1.2",
"fibers": "^4.0.2",
"file-loader": "^5.0.2",
"eslint-plugin-vue": "^6.2.2",
"fibers": "^5.0.0",
"file-loader": "^6.0.0",
"friendly-errors-webpack-plugin": "^1.7.0",
"html-webpack-plugin": "^3.2.0",
"html-webpack-plugin": "^4.3.0",
"lodash": "^4.17.15",
"mini-css-extract-plugin": "^0.9.0",
"moment": "^2.24.0",
"pouchdb-browser": "^7.1.1",
"pouchdb-find": "^7.1.1",
"moment": "^2.25.3",
"pouchdb-browser": "^7.2.1",
"pouchdb-find": "^7.2.1",
"read-package-json": "^2.1.1",
"resolve-url-loader": "^3.1.1",
"sass": "^1.24.4",
"sass": "^1.26.5",
"sass-loader": "^8.0.2",
"style-loader": "^1.1.2",
"ts-loader": "^6.2.1",
"typescript": "^3.7.4",
"url-loader": "^3.0.0",
"uuid": "^3.3.3",
"vee-validate": "^3.2.1",
"style-loader": "^1.2.1",
"ts-loader": "^7.0.3",
"typescript": "^3.8.3",
"url-loader": "^4.1.0",
"uuid": "^8.0.0",
"vee-validate": "^3.3.0",
"vue": "^2.6.11",
"vue-loader": "^15.8.3",
"vue-loader": "^15.9.2",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.11",
"vue-typed-mixins": "^0.2.0",
"vuetify": "^2.2.3",
"vuetify": "^2.2.27",
"vuetify-loader": "^1.4.3",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack-node-externals": "^1.7.2",
"xdg-basedir": "^4.0.0"
},
"dependencies": {
"serialport": "^8.0.6"
"serialport": "^8.0.8"
}
}
10 changes: 7 additions & 3 deletions render/app/Application.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
<v-row justify="start" no-gutters>
<v-card v-for="button of buttons" :key="button.key" class="ma-1" :class="button.classes"
tile @click="() => button.activate()">
<v-img :src="button.image" width="128px" height="128px"/>
<v-img :src="button.image" width="128px" height="128px" contain/>
</v-card>
</v-row>
</v-col>
</v-row>
</v-container>
</v-content>
<v-layout row class="ma-3 text-right fab-container">
<v-layout row class="ma-3 fab-container d-flex flex-row justify-end align-center">
<span class="white--text font-weight-thin mx-2">{{ productName }} {{ version }}</span>
<v-btn color="red" class="mx-2 secondaryText--text" fab @click="powerOff">
<v-icon>mdi-power</v-icon>
</v-btn>
Expand Down Expand Up @@ -64,6 +65,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
ConfirmModal,
ConfirmModalOptions,
} from "../components/modals";
import packageInfo from "../../package.json";
type References = {
alert: AlertModal;
Expand All @@ -77,7 +79,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
},
data: function () {
return {
buttons: [] as Button[],
productName: packageInfo.productName,
version: packageInfo.version,
buttons: [] as Button[],
};
},
methods: {
Expand Down
4 changes: 2 additions & 2 deletions render/app/pages/settings/SourceEditor.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
<v-row>
<v-col cols="2">
<v-card tile>
<v-img v-show="image" max-width="128px" max-height="128px"
:class="imageClasses" :src="image"/>
<v-img v-show="image" width="128px" height="128px"
:class="imageClasses" :src="image" contain/>
</v-card>
</v-col>
</v-row>
Expand Down
2 changes: 1 addition & 1 deletion render/app/pages/settings/SourceList.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
<v-list>
<v-list-item v-for="row of sources" :key="row._id" @click="open(row)">
<v-list-item-avatar>
<v-img :src="images[row._id]"/>
<v-img :src="images[row._id]" contain/>
</v-list-item-avatar>
<v-list-item-content v-text="row.title"/>
<v-list-item-action>
Expand Down
2 changes: 1 addition & 1 deletion render/app/pages/settings/SourcePage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
<v-list-item-title class="headline">{{ subject.title }}</v-list-item-title>
<v-list-item-subtitle>Source</v-list-item-subtitle>
</v-list-item-content>
<v-list-item-avatar size="64" tile><v-img :src="image"/></v-list-item-avatar>
<v-list-item-avatar size="64" tile><v-img :src="image" contain/></v-list-item-avatar>
</v-list-item>
<!-- The ties -->
<v-list-item v-for="row of ties" :key="row._id" two-line @click="edit(row)">
Expand Down
4 changes: 2 additions & 2 deletions render/foundation/store.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

import _ from "lodash";
import _ from "lodash";
import PouchDB from "pouchdb-browser";
import uuid from "uuid/v4";
import { v4 as uuid } from "uuid";

type IndexFields = Array<string>;
type IndexList = Array<IndexFields>;
Expand Down
1 change: 0 additions & 1 deletion render/index.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
</head>
<body>
<!--
TODO: Possibly pre-commit hooks for ESLint
TODO: Electron Packager with Electron Installer Debian.
-->
<div id="root"></div>
Expand Down
10 changes: 5 additions & 5 deletions render/support/switch-editing.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ export enum DeviceLocation {

export function generateLabel(port: SerialPort.PortInfo): string {
if (!port.pnpId) {
return port.comName;
return port.path;
}

let labelParts = port.pnpId.split("-");
if (labelParts.length < 3) {
return port.comName;
return port.path;
}

for (;;) {
Expand All @@ -53,7 +53,7 @@ export function generateLabel(port: SerialPort.PortInfo): string {

labelParts = _.tail(labelParts);
if (labelParts.length === 0) {
return port.comName;
return port.path;
}

return labelParts.join("-").replace(/_/gu, " ");
Expand All @@ -70,8 +70,8 @@ export async function makeSerialDeviceList(): Promise<SerialDevice[]> {
device.path = `/dev/serial/by-id/${port.pnpId}`;
} else {
// Just use the port path for the label and path.
device.label = port.comName;
device.path = port.comName;
device.label = port.path;
device.path = port.path;
}

devices.push(device);
Expand Down

0 comments on commit 3f08231

Please sign in to comment.