Skip to content

Commit

Permalink
Version 2.0.0-RC2
Browse files Browse the repository at this point in the history
Fixed password login on remote machines
Movement buttons control relative+absolute position again
Invalid password notification is now hidden if the no password is used
Updated package.json
  • Loading branch information
chrishamm committed Dec 25, 2018
1 parent 9c714ab commit 706e30d
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 9 deletions.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"name": "duetwebcontrol",
"version": "2.0.0",
"private": true,
"repository": "github:chrishamm/DuetWebControl#next",
"homepage": "https://forum.duet3d.com/category/27/duet-web-control",
"license": "GPL-3.0",
"author": "Christian Hammacher <[email protected]> (https://chrishamm.io)",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialogs/ConnectDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<v-card-text>
{{ $t('dialog.connect.prompt') }}
<v-text-field v-show="!mustConnect" ref="hostname" :placeholder="$t('dialog.connect.hostPlaceholder')" v-model="hostname" :rules="[v => !!v || $t('dialog.connect.hostRequired')]" required></v-text-field>
<v-text-field v-if="!mustConnect" ref="hostname" :placeholder="$t('dialog.connect.hostPlaceholder')" v-model="hostname" :rules="[v => !!v || $t('dialog.connect.hostRequired')]" required></v-text-field>
<v-text-field ref="password" type="password" :placeholder="$t(passwordRequired ? 'dialog.connect.passwordPlaceholder' : 'dialog.connect.passwordPlaceholderOptional')" v-model="password" :rules="[v => !!v || !passwordRequired || $t('dialog.connect.passwordRequired')]" :required="passwordRequired"></v-text-field>
</v-card-text>

Expand Down
4 changes: 2 additions & 2 deletions src/components/dialogs/MessageBoxDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<v-flex v-for="index in numMoveSteps" :key="-index" :class="getMoveCellClass(index - 1)">
<v-layout column>
<v-flex v-for="axis in displayedAxes" :key="axis.letter">
<code-btn :code="`G1 ${axis.letter}${-moveSteps(axis.letter)[index - 1]} F${moveFeedrate}`" block>
<code-btn :code="`G91\nG1 ${axis.letter}${-moveSteps(axis.letter)[index - 1]} F${moveFeedrate}\nG90`" block>
<v-icon>keyboard_arrow_left</v-icon> {{ axis.letter + -moveSteps(axis.letter)[index - 1] }}
</code-btn>
</v-flex>
Expand All @@ -35,7 +35,7 @@
<v-flex v-for="index in numMoveSteps" :key="index" :class="getMoveCellClass(numMoveSteps - index)">
<v-layout column>
<v-flex v-for="axis in displayedAxes" :key="axis.letter">
<code-btn :code="`G1 ${axis.letter}${moveSteps(axis.letter)[numMoveSteps - index]} F${moveFeedrate}`" block>
<code-btn :code="`G91\nG1 ${axis.letter}${moveSteps(axis.letter)[numMoveSteps - index]} F${moveFeedrate}\nG90`" block>
{{ axis.letter + '+' + moveSteps(axis.letter)[numMoveSteps - index] }} <v-icon>keyboard_arrow_right</v-icon>
</code-btn>
</v-flex>
Expand Down
2 changes: 1 addition & 1 deletion src/components/panels/AboutPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</v-card-title>

<v-card-text class="pt-0">
Duet Web Control 2.0.0-RC1 {{ electronics.firmware.version ? `/ RepRapFirmware ${electronics.firmware.version}` : '' }}
Duet Web Control 2.0.0-RC2 {{ electronics.firmware.version ? `/ RepRapFirmware ${electronics.firmware.version}` : '' }}
<br/><br/>
Web Interface developed by <a href="mailto:[email protected]">Christian Hammacher</a> for <a href="https://www.duet3d.com" target="_blank">Duet3D</a>
<br/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/panels/MovementPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<v-flex v-for="index in numMoveSteps" :key="-index" :class="getMoveCellClass(index - 1)">
<v-layout column>
<v-flex v-for="axis in displayedAxes" :key="axis.letter">
<code-btn :code="`G1 ${axis.letter}${-moveSteps(axis.letter)[index - 1]} F${Math.round(moveFeedrate * 60)}`" @contextmenu.prevent="showMoveStepDialog(axis.letter, index - 1)" block class="move-btn">
<code-btn :code="`G91\nG1 ${axis.letter}${-moveSteps(axis.letter)[index - 1]} F${Math.round(moveFeedrate * 60)}\nG90`" @contextmenu.prevent="showMoveStepDialog(axis.letter, index - 1)" block class="move-btn">
<v-icon>keyboard_arrow_left</v-icon> {{ axis.letter + -moveSteps(axis.letter)[index - 1] }}
</code-btn>
</v-flex>
Expand All @@ -129,7 +129,7 @@
<v-flex v-for="index in numMoveSteps" :key="index" :class="getMoveCellClass(numMoveSteps - index)">
<v-layout column>
<v-flex v-for="axis in displayedAxes" :key="axis.letter">
<code-btn :code="`G1 ${axis.letter}${moveSteps(axis.letter)[numMoveSteps - index]} F${Math.round(moveFeedrate * 60)}`" @contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - index)" block class="move-btn">
<code-btn :code="`G91\nG1 ${axis.letter}${moveSteps(axis.letter)[numMoveSteps - index]} F${Math.round(moveFeedrate * 60)}\nG90`" @contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - index)" block class="move-btn">
{{ axis.letter + '+' + moveSteps(axis.letter)[numMoveSteps - index] }} <v-icon>keyboard_arrow_right</v-icon>
</code-btn>
</v-flex>
Expand Down
4 changes: 3 additions & 1 deletion src/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ const store = new Vuex.Store({
await dispatch('machine/settings/load');
await dispatch('machine/cache/load');
} catch (e) {
logGlobal('error', i18n.t('error.connect', [hostname]), e.message);
if (!(e instanceof InvalidPasswordError) || password !== defaultPassword) {
logGlobal('error', i18n.t('error.connect', [hostname]), e.message);
}
if (e instanceof InvalidPasswordError) {
commit('askForPassword');
}
Expand Down
2 changes: 1 addition & 1 deletion src/store/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Path from '../utils/path.js'
export default {
namespaced: true,
state: {
lastHostname: '',
lastHostname: location.hostname,
darkTheme: false,
useBinaryPrefix: true,
settingsStorageLocal: false,
Expand Down

0 comments on commit 706e30d

Please sign in to comment.