Merge pull request #434 from Human-Connection/2019/kw15/hide_all_unfuctional_content

2019/kw15/hide_all_unfuctional_content
This commit is contained in:
Ulf Gebhardt 2019-04-10 14:17:58 +02:00 committed by GitHub
commit d28ef3e7c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 66 additions and 62 deletions

View File

@ -32,22 +32,26 @@ export default {
name: this.$t('admin.dashboard.name'),
path: `/admin`
},
{
// TODO implement
/* {
name: this.$t('admin.users.name'),
path: `/admin/users`
},
{
}, */
// TODO implement
/* {
name: this.$t('admin.organizations.name'),
path: `/admin/organizations`
},
{
}, */
// TODO implement
/* {
name: this.$t('admin.pages.name'),
path: `/admin/pages`
},
{
}, */
// TODO implement
/* {
name: this.$t('admin.notifications.name'),
path: `/admin/notifications`
},
}, */
{
name: this.$t('admin.categories.name'),
path: `/admin/categories`
@ -55,11 +59,12 @@ export default {
{
name: this.$t('admin.tags.name'),
path: `/admin/tags`
},
{
}
// TODO implement
/* {
name: this.$t('admin.settings.name'),
path: `/admin/settings`
}
} */
]
}
}

View File

@ -58,25 +58,28 @@ export default {
{
name: this.$t('common.comment', null, 2),
path: `/post/${id}/${slug}#comments`
},
{
}
// TODO implement
/* {
name: this.$t('common.letsTalk'),
path: `/post/${id}/${slug}#lets-talk`
},
{
}, */
// TODO implement
/* {
name: this.$t('common.versus'),
path: `/post/${id}/${slug}#versus`
}
} */
]
},
{
name: this.$t('common.moreInfo'),
path: `/post/${id}/${slug}/more-info`
},
{
}
// TODO implement
/* {
name: this.$t('common.takeAction'),
path: `/post/${id}/${slug}/take-action`
}
} */
]
}
}

View File

@ -62,16 +62,18 @@
>
{{ category.name }}
</ds-tag>
</div>-->
</div>-->
<!-- Tags -->
<template v-if="post.tags && post.tags.length">
<ds-space margin="xx-small" />
<div class="tags">
<ds-icon name="tags" /> <ds-tag
<ds-icon name="tags" />
<ds-tag
v-for="tag in post.tags"
:key="tag.id"
>
<ds-icon name="tag" /> {{ tag.name }}
<ds-icon name="tag" />
{{ tag.name }}
</ds-tag>
</div>
</template>
@ -87,9 +89,7 @@
color="primary"
size="small"
round
>
{{ post.commentsCount }}
</ds-tag> &nbsp; Comments
>{{ post.commentsCount }}</ds-tag>&nbsp; Comments
</span>
</h3>
<ds-space margin-bottom="large" />

View File

@ -42,7 +42,8 @@
color="soft"
size="small"
>
<ds-icon name="map-marker" /> {{ user.location.name }}
<ds-icon name="map-marker" />
{{ user.location.name }}
</ds-text>
<ds-text
align="center"
@ -56,9 +57,7 @@
v-if="user.badges && user.badges.length"
margin="x-small"
>
<hc-badges
:badges="user.badges"
/>
<hc-badges :badges="user.badges" />
</ds-space>
<ds-flex>
<ds-flex-item>
@ -82,9 +81,7 @@
</no-ssr>
</ds-flex-item>
</ds-flex>
<ds-space
margin="small"
>
<ds-space margin="small">
<hc-follow-button
v-if="!myProfile"
:follow-id="user.id"
@ -227,32 +224,28 @@
</no-ssr>
</ds-space>
</ds-flex-item>
<ds-flex-item class="ds-tab-nav-item">
<ds-space margin="small">
<!-- TODO: find better solution for rendering errors -->
<!--<ds-flex-item class="ds-tab-nav-item">
<ds-space margin="small">-->
<!-- TODO: find better solution for rendering errors -->
<!--
<no-ssr>
<ds-number :label="$t('profile.commented')">
<hc-count-to
slot="count"
:end-val="user.commentsCount"
/>
<hc-count-to slot="count" :end-val="user.commentsCount"/>
</ds-number>
</no-ssr>
</ds-space>
</ds-flex-item>
<ds-flex-item class="ds-tab-nav-item">
<ds-space margin="small">
<!-- TODO: find better solution for rendering errors -->
<no-ssr>
-->
<!--<ds-flex-item class="ds-tab-nav-item">
<ds-space margin="small">-->
<!-- TODO: find better solution for rendering errors -->
<!--<no-ssr>
<ds-number :label="$t('profile.shouted')">
<hc-count-to
slot="count"
:end-val="user.shoutedCount"
/>
<hc-count-to slot="count" :end-val="user.shoutedCount"/>
</ds-number>
</no-ssr>
</ds-space>
</ds-flex-item>
</ds-flex-item>-->
</ds-flex>
</ds-card>
</ds-flex-item>
@ -273,9 +266,7 @@
:key="post.id"
:width="{ base: '100%', md: '100%', xl: '50%' }"
>
<hc-post-card
:post="post"
/>
<hc-post-card :post="post" />
</ds-flex-item>
</template>
<template v-else>

View File

@ -34,27 +34,32 @@ export default {
{
name: this.$t('settings.security.name'),
path: `/settings/security`
},
{
}
// TODO implement
/* {
name: this.$t('settings.invites.name'),
path: `/settings/invites`
},
{
}, */
// TODO implement
/* {
name: this.$t('settings.download.name'),
path: `/settings/data-download`
},
{
}, */
// TODO implement
/* {
name: this.$t('settings.delete.name'),
path: `/settings/delete-account`
},
{
}, */
// TODO implement
/* {
name: this.$t('settings.organizations.name'),
path: `/settings/my-organizations`
},
{
}, */
// TODO implement
/* {
name: this.$t('settings.languages.name'),
path: `/settings/languages`
}
} */
]
}
}