Skip to content

Commit

Permalink
Bump ODS to v12, update UI & extension config, fix web-config docs
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalwengerter committed Feb 24, 2022
1 parent edc8ef1 commit cc8c658
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 29 deletions.
6 changes: 6 additions & 0 deletions changelog/unreleased/update-ui.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Update UI

Updated the user interface to reflect changes in the ownCloud design system and the web UI that the hello extensions gets rendered into.
Also updated the web config in the documentation.

https://github.com/owncloud/ocis-hello/pull/130
17 changes: 9 additions & 8 deletions docs/extensions/hello/running.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,25 @@ No matter which way you choose, we need to create a configuration file for ownCl
"response_type": "code",
"scope": "openid profile email"
},
"apps": ["files", "media-viewer"],
"apps": [
"files",
"media-viewer",
"search"
],
"external_apps": [
{
"id": "settings",
"path": "/settings.js"
"path": "https://localhost:9200/settings.js"
},
{
"id": "accounts",
"path": "/accounts.js"
"path": "https://localhost:9200/accounts.js"
},
{
"id": "hello",
"path": "/hello.js"
"path": "https://localhost:9200/hello.js"
}
],
"options": {
"hideSearchBar": true
}
]
}

```
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@
"not dead"
],
"peerDependencies": {
"owncloud-design-system": "^9.3.0"
"owncloud-design-system": "^12.0.0"
}
}
6 changes: 3 additions & 3 deletions pkg/assets/embed.go

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions ui/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,22 @@ import store from './store'
const appInfo = {
name: 'Hello',
id: 'hello',
icon: 'info',
isFileEditor: false,
extensions: []
icon: 'chat-smile',
isFileEditor: false
}

const routes = [
{
name: 'hello',
path: '/',
components: {
app: App
}
component: App
}
]

const navItems = [
{
name: 'Hello',
iconMaterial: appInfo.icon,
icon: appInfo.icon,
route: {
name: 'hello',
path: `/${appInfo.id}/`
Expand Down
13 changes: 4 additions & 9 deletions ui/components/App.vue
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
<template>
<div class="uk-flex uk-flex-column uk-flex-middle uk-margin-xlarge-top">
<h1>
Hello, tell us your name
</h1>

<div class="oc-flex oc-flex-column oc-flex-middle oc-p-l">
<h1>Hello, tell us your name</h1>
<form v-on:submit.prevent="submitName(name)" action="#" method="post">
<oc-text-input v-model="name" placeholder="Your name" />

<oc-button variation="primary" class="uk-width-1-1 uk-margin-top">
<oc-button variation="primary" class="oc-width-1-1 oc-mt-m">
Submit
</oc-button>
</form>

<p class="uk-text-lead" v-if="message" v-text="message" />
<p class="oc-text-lead" v-if="message" v-text="message" />
</div>
</template>

Expand Down
2 changes: 1 addition & 1 deletion ui/tests/acceptance/pageobjects/helloPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = {
locateStrategy: 'xpath'
},
helloText: {
selector: "//*[@class='uk-text-lead']",
selector: "//*[@class='oc-text-lead']",
locateStrategy: 'xpath'
}
}
Expand Down

0 comments on commit cc8c658

Please sign in to comment.