Skip to content

Commit

Permalink
Merge pull request #14 from Holo-Host/rc-v0.1.3
Browse files Browse the repository at this point in the history
Rc v0.1.3
  • Loading branch information
robbiecarlton authored Feb 18, 2021
2 parents 5067bab + 7574a20 commit 8b3f11c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 6 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## unreleased

## [0.1.2]
## [0.1.3] - 2021-02-18
### Changed
- Edit device name disabled and pencil icon grayed out
### Fixed
- Correct version number shown on login page

## [0.1.2] - 2021-02-18
### Added
- Mock Hpos Api server, for use as both as a standalone server (via npm package scripts) and as a customizable test mock. This is specifically useful for testing auth.
- Implementation of login and auth logic
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "host-console",
"version": "0.1.2",
"version": "0.1.3",
"private": true,
"scripts": {
"serve": "VUE_APP_UI_VERSION=$npm_package_version vue-cli-service serve",
Expand Down
7 changes: 6 additions & 1 deletion src/pages/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div class="reminder-text reminder-text-padding">
<a class="reminder-text" href="https://holo.host/control-your-data" target="_blank" rel="noopener noreferrer">Learn more</a> about controlling your own data.
</div>
<div class="reminder-text reminder-text-padding">UI v0.1.1</div>
<div class="reminder-text reminder-text-padding">Host Console version {{ uiVersion }}</div>
</div>
</template>

Expand Down Expand Up @@ -100,6 +100,11 @@ export default {
return false
}
},
computed: {
uiVersion () {
return process.env.VUE_APP_UI_VERSION
}
},
watch: {
email (email) {
this.banner = ''
Expand Down
6 changes: 4 additions & 2 deletions src/pages/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ export default {
},
methods: {
editDeviceName () {
this.editedDeviceName = this.settings.deviceName
this.isEditingDeviceName = true
// temporarily disabled until hpos bug is fixed
// this.editedDeviceName = this.settings.deviceName
// this.isEditingDeviceName = true
},
saveDeviceName () {
HposInterface.updateSettings({
Expand Down Expand Up @@ -179,6 +180,7 @@ export default {
.pencil {
margin-left: 5px;
cursor: pointer;
opacity: 0.2;
}
.filled-check {
margin-left: 5px;
Expand Down
3 changes: 2 additions & 1 deletion src/pages/__tests__/Settings.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ describe('Settings page', () => {
await waitFor(() => getAllByText(defaultSettings.holoportos.network))
})

it('handles devicename interactions correctly', async () => {
// this is skipped until the hpos config update is fixed. See also Settings.vue
it.skip('handles devicename interactions correctly', async () => {
axios.put.mockImplementationOnce(() => Promise.resolve(defaultSettingsResult))

const newDeviceName = "Sean's HP"
Expand Down

0 comments on commit 8b3f11c

Please sign in to comment.