kopia lustrzana https://github.com/nextcloud/social
vue issues
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>pull/925/head
Maxence Lange
rodzic
23f15042d7
commit
600dc4a008
|
|
@ -50,8 +50,6 @@ module.exports = {
|
|||
// es6 import/export and require
|
||||
'node/no-unpublished-require': ['off'],
|
||||
'node/no-unsupported-features/es-syntax': ['off'],
|
||||
// kebab case components for vuejs
|
||||
'vue/component-name-in-template-casing': ['error', 'kebab-case'],
|
||||
// space before self-closing elements
|
||||
'vue/html-closing-bracket-spacing': 'error',
|
||||
// newline before closing bracket
|
||||
|
|
|
|||
|
|
@ -16,3 +16,9 @@ img.emoji {
|
|||
width: 16px;
|
||||
vertical-align: text-bottom;
|
||||
}
|
||||
|
||||
|
||||
// quick fix - TODO - remove this and fix the left panel
|
||||
ul.app-navigation__list {
|
||||
display: none !important;
|
||||
}
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
15
package.json
15
package.json
|
|
@ -27,11 +27,11 @@
|
|||
"test:coverage": "jest --coverage"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.7.1",
|
||||
"@babel/runtime": "^7.10.3",
|
||||
"@nextcloud/auth": "^1.3.0",
|
||||
"@nextcloud/axios": "^0.5.0",
|
||||
"@nextcloud/logger": "^0.1.0",
|
||||
"@nextcloud/vue": "^1.1.0",
|
||||
"@nextcloud/vue": "^2.1.0",
|
||||
"he": "^1.2.0",
|
||||
"linkifyjs": "^2.1.8",
|
||||
"tributejs": "^3.7.3",
|
||||
|
|
@ -47,8 +47,8 @@
|
|||
"vue-router": "^3.1.3",
|
||||
"vue-tribute": "^1.0.3",
|
||||
"vue-twemoji": "^1.0.1",
|
||||
"vuex": "^3.4.0",
|
||||
"vuetrend": "^0.3.4",
|
||||
"vuex": "^3.4.0",
|
||||
"vuex-router-sync": "^5.0.0"
|
||||
},
|
||||
"browserslist": [
|
||||
|
|
@ -61,8 +61,11 @@
|
|||
"devDependencies": {
|
||||
"@babel/core": "^7.10.3",
|
||||
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
||||
"@babel/preset-env": "^7.10.2",
|
||||
"@babel/preset-env": "^7.10.3",
|
||||
"@vue/test-utils": "^1.0.0-beta.29",
|
||||
"@nextcloud/browserslist-config": "^1.0.0",
|
||||
"@nextcloud/eslint-config": "^2.0.0",
|
||||
"@nextcloud/eslint-plugin": "^1.4.0",
|
||||
"acorn": "^7.1.1",
|
||||
"babel-eslint": "^10.0.3",
|
||||
"babel-jest": "^24.9.0",
|
||||
|
|
@ -78,7 +81,7 @@
|
|||
"eslint-plugin-standard": "^4.0.1",
|
||||
"eslint-plugin-vue": "^6.2.2",
|
||||
"file-loader": "^6.0.0",
|
||||
"jest": "^26.0.1",
|
||||
"jest": "^26.1.0",
|
||||
"jest-serializer-vue": "^2.0.2",
|
||||
"node-sass": "^4.14.1",
|
||||
"prettier-eslint": "^11.0.0",
|
||||
|
|
@ -88,7 +91,7 @@
|
|||
"stylelint-config-recommended-scss": "^3.3.0",
|
||||
"stylelint-webpack-plugin": "^0.10.5",
|
||||
"vue-jest": "^3.0.5",
|
||||
"vue-loader": "^15.9.2",
|
||||
"vue-loader": "^15.9.3",
|
||||
"vue-style-loader": "^4.1.1",
|
||||
"vue-template-compiler": "^2.6.10",
|
||||
"webpack": "^4.43.0",
|
||||
|
|
|
|||
32
src/App.vue
32
src/App.vue
|
|
@ -1,26 +1,24 @@
|
|||
<template>
|
||||
<div v-if="!serverData.setup" id="app-social" :class="{public: serverData.public}">
|
||||
<app-navigation v-if="!serverData.public" id="app-navigation">
|
||||
<ul id="app-social-navigation">
|
||||
<app-navigation-item v-for="item in menu.items" :key="item.key" :to="item.to"
|
||||
:title="item.title"
|
||||
:icon="item.icon"
|
||||
:exact="true" />
|
||||
</ul>
|
||||
</app-navigation>
|
||||
<AppNavigation v-if="!serverData.public" id="app-navigation">
|
||||
<AppNavigationItem v-for="item in menu.items" :key="item.key" :to="item.to"
|
||||
:title="item.title" :icon="item.icon" :exact="true" />
|
||||
</AppNavigation>
|
||||
<div id="app-content">
|
||||
<div v-if="serverData.isAdmin && !serverData.checks.success" class="setup social__wrapper">
|
||||
<h3 v-if="!serverData.checks.checks.wellknown">
|
||||
{{ t('social', '.well-known/webfinger isn\'t properly set up!') }}
|
||||
</h3>
|
||||
<p v-if="!serverData.checks.checks.wellknown">
|
||||
{{ t('social', 'Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can\'t configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: ') }}<a class="external_link" href="https://docs.nextcloud.com/server/15/go.php?to=admin-setup-well-known-URL" target="_blank"
|
||||
{{ t('social', 'Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can\'t configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: ') }}<a class="external_link"
|
||||
href="https://docs.nextcloud.com/server/15/go.php?to=admin-setup-well-known-URL"
|
||||
target="_blank"
|
||||
rel="noreferrer noopener">
|
||||
{{ t('social', 'Open documentation') }} ↗
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
<search v-if="searchTerm !== ''" :term="searchTerm" />
|
||||
<Search v-if="searchTerm !== ''" :term="searchTerm" />
|
||||
<router-view v-if="searchTerm === ''" :key="$route.fullPath" />
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -33,7 +31,9 @@
|
|||
<label class="hidden">
|
||||
{{ t('social', 'ActivityPub URL base') }}
|
||||
</label>
|
||||
<input v-model="cloudAddress" :placeholder="serverData.cliUrl" type="url"
|
||||
<input v-model="cloudAddress"
|
||||
:placeholder="serverData.cliUrl"
|
||||
type="url"
|
||||
required>
|
||||
<input :value="t('social', 'Finish setup')" type="submit" class="primary">
|
||||
</p>
|
||||
|
|
@ -42,7 +42,9 @@
|
|||
{{ t('social', '.well-known/webfinger isn\'t properly set up!') }}
|
||||
</h3>
|
||||
<p v-if="!serverData.checks.checks.wellknown">
|
||||
{{ t('social', 'Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can\'t configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: ') }}<a class="external_link" href="https://docs.nextcloud.com/server/15/go.php?to=admin-setup-well-known-URL" target="_blank"
|
||||
{{ t('social', 'Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can\'t configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: ') }}<a class="external_link"
|
||||
href="https://docs.nextcloud.com/server/15/go.php?to=admin-setup-well-known-URL"
|
||||
target="_blank"
|
||||
rel="noreferrer noopener">
|
||||
{{ t('social', 'Open documentation') }} ↗
|
||||
</a>
|
||||
|
|
@ -95,8 +97,8 @@
|
|||
</style>
|
||||
|
||||
<script>
|
||||
import { AppNavigation } from '@nextcloud/vue/dist/Components/AppNavigation'
|
||||
import { AppNavigationItem } from '@nextcloud/vue/dist/Components/AppNavigationItem'
|
||||
import { AppNavigation, AppNavigationItem } from '@nextcloud/vue'
|
||||
|
||||
import axios from '@nextcloud/axios'
|
||||
import Search from './components/Search.vue'
|
||||
import currentuserMixin from './mixins/currentUserMixin'
|
||||
|
|
@ -122,7 +124,7 @@ export default {
|
|||
return this.$store.getters.getTimeline
|
||||
},
|
||||
menu: function() {
|
||||
let defaultCategories = [
|
||||
const defaultCategories = [
|
||||
{
|
||||
id: 'social-timeline',
|
||||
icon: 'icon-home',
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue