From 923e8598b033ff1d9fc78b357e4d6390897630c4 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Fri, 25 May 2018 13:25:58 +0200
Subject: Fix app store and sidebar view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
settings/src/components/appDetails.vue | 11 ++++++++++-
settings/src/components/appList/appItem.vue | 7 ++++---
settings/src/components/appList/appScore.vue | 2 +-
settings/src/views/Apps.vue | 5 ++---
4 files changed, 17 insertions(+), 8 deletions(-)
(limited to 'settings/src')
diff --git a/settings/src/components/appDetails.vue b/settings/src/components/appDetails.vue
index 5518fd04860..5467b1ffb10 100644
--- a/settings/src/components/appDetails.vue
+++ b/settings/src/components/appDetails.vue
@@ -22,6 +22,7 @@
<template>
<div id="app-details-view" style="padding: 20px;">
+ <a class="close icon-close" href="#" v-on:click="hideAppDetails"><span class="hidden-visually">Close</span></a>
<h2>{{ app.name }}</h2>
<img :src="app.preview" width="100%" />
<app-score v-if="app.ratingNumThresholdReached" :score="app.score"></app-score>
@@ -66,11 +67,19 @@ import Multiselect from 'vue-multiselect';
import AppScore from './appList/appScore';
export default {
name: 'appDetails',
- props: ['app'],
+ props: ['category', 'app'],
components: {
Multiselect,
AppScore
},
+ methods: {
+ hideAppDetails() {
+ this.$router.push({
+ name: 'apps-category',
+ params: {category: this.category}
+ });
+ },
+ },
computed: {
licence() {
return this.app.license + t('settings', '-licensed');
diff --git a/settings/src/components/appList/appItem.vue b/settings/src/components/appList/appItem.vue
index 13325f6462d..8797fd88bd9 100644
--- a/settings/src/components/appList/appItem.vue
+++ b/settings/src/components/appList/appItem.vue
@@ -33,14 +33,16 @@
<div class="app-name" v-on:click="showAppDetails">
{{ app.name }}
</div>
- <div class="app-version">{{ app.version }}</div>
- <div class="app-score" v-if="!listView"><app-score :score="app.score"></app-score> </div>
<div class="app-summary" v-if="!listView">{{ app.summary }}</div>
+ <div class="app-version" v-if="listView">{{ app.version }}</div>
+
<div class="app-level">
<span class="official icon-checkmark" v-if="app.level === 200">{{ t('settings', 'Official') }}</span>
+ <app-score v-if="!listView" :score="app.score"></app-score>
<a :href="appstoreUrl" v-if="!app.internal && listView">Im Store anzeigen ↗</a>
</div>
+
<div class="app-groups" v-if="listView">
<div class="groups-enable" v-if="app.active && canLimitToGroups(app)">
<input type="checkbox" :value="app.id" v-model="groupCheckedAppsData" v-on:change="setGroupLimit" class="groups-enable__checkbox checkbox" :id="prefix('groups_enable', app.id)">
@@ -119,7 +121,6 @@
},
methods: {
showAppDetails() {
- console.log(this.app.id);
this.$router.push({
name: 'apps-details',
params: {category: this.category, id: this.app.id}
diff --git a/settings/src/components/appList/appScore.vue b/settings/src/components/appList/appScore.vue
index 8b099f5e3d9..bf04c688186 100644
--- a/settings/src/components/appList/appScore.vue
+++ b/settings/src/components/appList/appScore.vue
@@ -21,7 +21,7 @@
-->
<template>
- <img :src="scoreImage" />
+ <img :src="scoreImage" class="app-score-image" />
</template>
<script>
export default {
diff --git a/settings/src/views/Apps.vue b/settings/src/views/Apps.vue
index 07147d10c61..b24123e4aff 100644
--- a/settings/src/views/Apps.vue
+++ b/settings/src/views/Apps.vue
@@ -24,9 +24,8 @@
<div id="app">
<app-navigation :menu="menu" />
<app-list :category="category" :app="currentApp" :search="search"></app-list>
- <div id="app-sidebar" v-if="currentApp">
- {{ search }}
- <app-details :app="currentApp"></app-details>
+ <div id="app-sidebar" v-if="id">
+ <app-details :category="category" :app="currentApp"></app-details>
</div>
</div>
</template>
--
cgit v1.2.3