Skip to content

Commit c616a0a

Browse files
mrfrase3mrfrase3
authored
Merge pull request #24 from duinoapp/develop
Develop
2 parents 53d2cd0 + 492bd0b commit c616a0a

File tree

14 files changed

+112
-51
lines changed

14 files changed

+112
-51
lines changed

‎.env‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ node_modules
55
# local env files
66
.env.local
77
.env.*.local
8+
.env
89

910
# Log files
1011
npm-debug.log*

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "duinoapp-client",
3-
"version": "3.2.0",
3+
"version": "3.2.2",
44
"author": "Fraser Bullock",
55
"license": "GPL-3.0",
66
"private": true,

‎service-worker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
workbox.core.setCacheNameDetails({ prefix: 'd4' });
44

55
// Do not touch this line
6-
const LATEST_VERSION = '3.2.0';
6+
const LATEST_VERSION = '3.2.2';
77

88
self.addEventListener('activate', (event) => {
99
console.log(`%c ${LATEST_VERSION} `, 'background: #ddd; color: #0000ff');

‎src/App.vue‎

Lines changed: 65 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
<v-icon left>mdi-code-braces</v-icon>
1616
Code
1717
</v-btn>
18+
<v-btn text dense to="/tools/libraries" class="mx-1">
19+
<v-icon left>mdi-book-open-variant</v-icon>
20+
Libraries
21+
</v-btn>
1822
<v-btn text dense to="/tools" class="mx-1">
1923
<v-icon left>mdi-wrench</v-icon>
2024
Tools
@@ -76,21 +80,66 @@
7680
<v-footer dense app style="z-index: 10">
7781
<v-row style="display: contents;">
7882
<div style="line-height: 28px;">
79-
Duino.App &copy; {{ new Date().getFullYear() }}
83+
<small>
84+
Duino App
85+
&copy;
86+
{{ (new Date()).getFullYear() }}
87+
&dash;
88+
v{{version}}
89+
</small>
8090
</div>
81-
<div class="ml-2">
82-
<v-btn href="https://github.com/duinoapp/duinoapp-client/issues" target="_blank" rel="noopener noreferrer" text small>
83-
<v-icon small left>mdi-bug-outline</v-icon>
84-
Issues
85-
</v-btn>
86-
<v-btn href="https://github.com/duinoapp/duinoapp-client/wiki/Privacy-Policy" target="_blank" rel="noopener noreferrer" text small>
87-
<v-icon small left>mdi-incognito</v-icon>
88-
Privacy
89-
</v-btn>
90-
<v-btn href="https://github.com/duinoapp/duinoapp-client/wiki/Terms-of-Service" target="_blank" rel="noopener noreferrer" text small>
91-
<v-icon small left>mdi-scale-balance</v-icon>
92-
Terms
93-
</v-btn>
91+
<div :class="{ 'ml-2': true, 'mr-auto': $vuetify.breakpoint.mdAndDown }">
92+
<v-tooltip top>
93+
<template #activator="{ on }">
94+
<v-btn
95+
href="https://github.com/duinoapp/duinoapp-client/issues"
96+
target="_blank"
97+
rel="noopener noreferrer"
98+
:text="!$vuetify.breakpoint.mdAndDown"
99+
:icon="$vuetify.breakpoint.mdAndDown"
100+
small
101+
v-on="on"
102+
>
103+
<v-icon small left>mdi-bug-outline</v-icon>
104+
{{ !$vuetify.breakpoint.mdAndDown ? 'Issues' : '' }}
105+
</v-btn>
106+
</template>
107+
<span>Report an Issue/Bug</span>
108+
</v-tooltip>
109+
<v-tooltip top>
110+
<template #activator="{ on }">
111+
<v-btn
112+
href="https://github.com/duinoapp/duinoapp-client/wiki/Privacy-Policy"
113+
target="_blank"
114+
rel="noopener noreferrer"
115+
:text="!$vuetify.breakpoint.mdAndDown"
116+
:icon="$vuetify.breakpoint.mdAndDown"
117+
small
118+
v-on="on"
119+
>
120+
<v-icon small left>mdi-incognito</v-icon>
121+
{{ !$vuetify.breakpoint.mdAndDown ? 'Privacy' : '' }}
122+
</v-btn>
123+
</template>
124+
<span>Privacy Policy</span>
125+
</v-tooltip>
126+
<v-tooltip top>
127+
<template #activator="{ on }">
128+
<v-btn
129+
href="https://github.com/duinoapp/duinoapp-client/wiki/Terms-of-Service"
130+
target="_blank"
131+
rel="noopener noreferrer"
132+
:text="!$vuetify.breakpoint.mdAndDown"
133+
:icon="$vuetify.breakpoint.mdAndDown"
134+
small
135+
v-on="on"
136+
>
137+
<v-icon small left>mdi-scale-balance</v-icon>
138+
{{ !$vuetify.breakpoint.mdAndDown ? 'Terms' : '' }}
139+
</v-btn>
140+
</template>
141+
<span>Terms of Service</span>
142+
</v-tooltip>
94143
</div>
95144
<v-spacer/>
96145
<serial-footer v-if="serialReady" />
@@ -117,6 +166,7 @@ import UploadBtn from './components/program/upload.vue';
117166
import CompileConsole from './components/program/console.vue';
118167
import Coffee from './components/coffee.vue';
119168
import ImportantUpdate from './components/general/important-update.vue';
169+
import { version } from '../package.json';
120170
121171
export default {
122172
name: 'App',
@@ -137,6 +187,7 @@ export default {
137187
return {
138188
serialReady: false,
139189
tab: 'program',
190+
version,
140191
};
141192
},
142193
methods: {

‎src/components/boards/footer-btn.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<v-tooltip top v-if="currentBoard">
44
<template v-slot:activator="{ on }">
55
<v-btn text dense small v-on="on" to="/tools/boards">
6-
Board: {{currentBoard.fqbn.split(':').shift()}} {{currentBoard.fqbn.split(':').pop()}}
6+
<v-icon v-show="$vuetify.breakpoint.mdAndDown" small left>mdi-chip</v-icon>
7+
<span v-show="!$vuetify.breakpoint.mdAndDown">Board:</span>
8+
{{currentBoard.fqbn.split(':').shift()}} {{currentBoard.fqbn.split(':').pop()}}
79
</v-btn>
810
</template>
911
<span>{{currentBoard.name}}</span>

‎src/components/projects/save-project.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
v-if="importProject"
2727
v-model="file"
2828
:rules="[
29-
(val) => !val || val.type === 'application/zip' || 'File must be a .zip',
29+
(val) => !val || /^application\/(x-)?zip/.test(val.type) || 'File must be a .zip',
3030
]"
3131
:error-messages="[unzipError, inoError].filter(v => v)"
3232
label="Upload Project Zip"
33-
accept="application/zip"
33+
accept=".zip,application/zip,application/x-zip,application/x-zip-compressed"
3434
outlined
3535
show-size
3636
/>
@@ -113,7 +113,7 @@ export default {
113113
},
114114
valid() {
115115
return !!this.name.trim()
116-
&& (!this.importProject || this.file?.type === 'application/zip')
116+
&& (!this.importProject || /^application\/(x-)?zip/.test(this.file.type))
117117
&& !this.unzipError
118118
&& !this.inoError;
119119
},

‎src/components/serial/footer-btn.vue‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<!-- eslint-disable-next-line vue/no-unused-vars -->
44
<template #activator="{ on }">
55
<v-btn text dense small @click="activate(on)" v-if="currentDevice">
6-
Serial: {{deviceName}}
6+
<v-icon v-show="$vuetify.breakpoint.mdAndDown" small left>mdi-usb-port</v-icon>
7+
<span v-show="!$vuetify.breakpoint.mdAndDown">Serial:</span>
8+
{{deviceName}}
79
</v-btn>
8-
<v-btn text dense small @click="activate" v-else>Select Device Port</v-btn>
10+
<v-btn text dense small @click="activate" v-else>Select Device</v-btn>
911
</template>
1012
<v-list dense :style="{ padding: '0' }">
1113
<v-list-item

‎src/components/servers/footer-btn.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<v-tooltip top v-if="currentServer">
44
<template v-slot:activator="{ on }">
55
<v-btn text dense small to="/tools/servers" v-on="on">
6-
Server:
6+
<v-icon v-show="$vuetify.breakpoint.mdAndDown" small left>mdi-server</v-icon>
7+
<span v-show="!$vuetify.breakpoint.mdAndDown">Server:</span>
78
<v-chip
89
:color="currentServer.valid ? 'success' : 'error'"
910
class="mx-1"
1011
x-small
1112
>
1213
{{currentServer.valid ? 'Online' : 'Offline'}}
1314
</v-chip>
14-
{{flag}}
1515
</v-btn>
1616
</template>
17-
<span>{{currentServer.name}} ({{currentServer.country}})</span>
17+
<span>{{flag}} {{currentServer.name}}</span>
1818
</v-tooltip>
1919
<v-btn v-else text dense small to="/tools/servers">Select Server</v-btn>
2020
</div>

‎src/plugins/serial/base-serial.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ class BaseSerial extends EventEmitter {
3434
this.connected = false;
3535
this.implementation = 'basic';
3636
this.serial = null;
37-
this.DEBUG = true;
37+
this.DEBUG = !!process.env.VUE_APP_DEBUG;
38+
// eslint-disable-next-line no-console
39+
// console.log('debug', this.DEBUG);
3840
}
3941

4042
install(Vue) {

0 commit comments

Comments
 (0)