Skip to content

Commit

Permalink
add support to load keymaps from url (qmk#403)
Browse files Browse the repository at this point in the history
* add support to load keymaps from url

* adding modal

* review

* CSS style the modal box (qmk#1)

- remove min-height from .input-url-modal to not waste space
- apply full border declaration to .input-url-modal
- apply padding to .input-url-modal
- apply CSS rules to .input-url-modal's child elements
  - makes the modal's appearance more consistent with main UI
- swap positions of Load and Cancel buttons

* css fix
  • Loading branch information
zekth authored and yanfali committed Jun 9, 2019
1 parent 76227b5 commit f179c76
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 6 deletions.
1 change: 1 addition & 0 deletions public/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ a img {
#source,
#export,
#import,
#import-url,
#settings,
#printkeymaps,
#testkeys,
Expand Down
103 changes: 97 additions & 6 deletions src/components/ControllerBottom.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
<template>
<div id="controller-bottom" class="botctrl">
<Veil :isVisible="isVeilOpened">
<template #contents>
<div class="input-url-modal">
<div>
<label for="url-import-field">Url:</label>
<input
ref="urlimport"
id="url-import-field"
type="text"
v-model="urlImport"
/>
</div>
<div>
<button @click="importUrlkeymap">Load</button>
<button @click="closeVeil">cancel</button>
</div>
</div>
</template>
</Veil>
<div class="botctrl-1-1">
<button
class="fixed-size"
Expand Down Expand Up @@ -28,31 +47,36 @@
>
<font-awesome-icon icon="download" size="lg" fixed-width />
</button>
<span class="label-button">
{{ $t('message.downloadJSON.label') }}
</span>
<span class="label-button">{{ $t('message.downloadJSON.label') }}</span>
<button
id="import"
:title="$t('message.importJSON.title')"
@click="importKeymap"
>
<font-awesome-icon icon="upload" size="lg" fixed-width />
</button>
<button
id="import-url"
:title="$t('message.importUrlJSON.title')"
@click="openVeil"
>
<font-awesome-icon icon="cloud-upload-alt" size="lg" fixed-width />
</button>
<button
id="printkeymaps"
:title="$t('message.printKeymap.title')"
@click="printKeymaps"
>
<font-awesome-icon icon="print" size="lg" fixed-width />
<span class="hide-small"> {{ $t('message.printKeymap.label') }}</span>
<span class="hide-small">{{ $t('message.printKeymap.label') }}</span>
</button>
<button
id="testkeys"
:title="$t('message.testKeys.title')"
@click="testKeys"
>
<font-awesome-icon icon="keyboard" size="lg" fixed-width />
<span class="hide-small"> {{ $t('message.testKeys.label') }}</span>
<span class="hide-small">{{ $t('message.testKeys.label') }}</span>
</button>
<input
id="fileImport"
Expand Down Expand Up @@ -90,6 +114,7 @@
</div>
</template>
<script>
import axios from 'axios';
import Vue from 'vue';
import { createNamespacedHelpers } from 'vuex';
const { mapMutations, mapState, mapGetters } = createNamespacedHelpers('app');
Expand Down Expand Up @@ -149,7 +174,36 @@ export default {
}
},
methods: {
...mapMutations(['dismissPreview']),
...mapMutations(['dismissPreview', 'stopListening', 'startListening']),
importUrlkeymap: function() {
const url = this.urlImport;
axios
.get(url)
.then(r => {
this.reader = new FileReader();
this.reader.onload = this.importJSONOnLoad;
const b = new Blob([JSON.stringify(r.data)], {
type: 'application/json'
});
this.reader.readAsText(b);
})
.catch(() => {
alert('Seems like there is an issue trying to get the file');
});
this.closeVeil();
},
openVeil: function() {
this.isVeilOpened = true;
this.stopListening();
Vue.nextTick(() => {
this.$refs.urlimport.focus();
});
},
closeVeil: function() {
this.startListening();
this.urlImport = '';
this.isVeilOpened = false;
},
exportJSON() {
//Squashes the keymaps to the api payload format, might look into making this a function
let layers = this.$store.getters['keymap/exportLayers']({
Expand Down Expand Up @@ -357,15 +411,27 @@ export default {
},
data: () => {
return {
isVeilOpened: false,
downloadElementEnabled: false,
urlEncodedData: '',
filename: '',
urlImport: '',
reader: undefined
};
}
};
</script>
<style scoped>
#controller-bottom button {
margin-top: 4px;
}
.input-url-modal {
background-color: #eee;
padding: 5px;
border: 1px solid #ccc;
border-radius: 5px;
width: 400px;
}
.fixed-size {
min-width: 150px;
}
Expand All @@ -376,6 +442,31 @@ export default {
#import {
border-radius: 0 4px 4px 0;
}
#import-url {
border-radius: 4px;
}
.input-url-modal label {
padding-right: 5px;
}
.input-url-modal div:nth-child(2) {
margin-top: 5px;
}
.input-url-modal button {
background-color: #49ad4c;
color: #fff;
line-height: 120%;
padding: 6px 12px;
border-width: 0;
border-radius: 3px;
margin: 0 0 0 4px;
cursor: pointer;
}
#url-import-field {
width: 340px;
padding: 7px;
border: 1px solid #cdcdcd;
border-radius: 4px;
}
.label-button {
line-height: 155%;
vertical-align: middle;
Expand Down
3 changes: 3 additions & 0 deletions src/i18n/en/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ export default {
importJSON: {
title: 'Import QMK Keymap JSON file'
},
importUrlJSON: {
title: 'Import QMK Keymap JSON from URL'
},
printKeymap: {
title: 'Print Keymap Layers',
label: 'Print Keymap'
Expand Down
2 changes: 2 additions & 0 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
faArrowRight,
faExclamationTriangle,
faCog,
faCloudUploadAlt,
faKeyboard,
faChevronLeft,
faPrint,
Expand All @@ -49,6 +50,7 @@ Vue.component('font-awesome-icon', FontAwesomeIcon);
Vue.use(VueSlideoutPanel);

library.add(faDownload);
library.add(faCloudUploadAlt);
library.add(faUpload);
library.add(faArrowUp);
library.add(faArrowDown);
Expand Down

0 comments on commit f179c76

Please sign in to comment.