diff --git a/.eslintignore b/.eslintignore
index 69d9ce171..70c6bda91 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,4 @@
node_modules
build
.nuxt
-cypress/
styleguide/
diff --git a/.eslintrc.js b/.eslintrc.js
index 25a4edfe4..fdc9bfb5e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -19,6 +19,7 @@ module.exports = {
// add your custom rules here
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
- 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+ 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+ 'vue/component-name-in-template-casing': ['error', 'kebab-case']
}
}
diff --git a/.travis.yml b/.travis.yml
index da827f262..bbd211c18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,3 +28,19 @@ after_failure:
- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
- chmod +x send.sh
- ./send.sh failure $WEBHOOK_URL
+
+deploy:
+ - provider: script
+ script: scripts/deploy.sh nitro.human-connection.org
+ on:
+ branch: master
+ tags: true
+ - provider: script
+ script: scripts/deploy.sh nitro-staging.human-connection.org
+ on:
+ branch: master
+ - provider: script
+ script: scripts/deploy.sh "nitro-$(git rev-parse --short HEAD).human-connection.org"
+ on:
+ tags: true
+ all_branches: true
diff --git a/components/Author.vue b/components/Author.vue
index f307bc19b..53379afa8 100644
--- a/components/Author.vue
+++ b/components/Author.vue
@@ -5,29 +5,36 @@
:open-group="Math.random().toString()"
placement="top-start"
trigger="manual"
- offset="0">
+ offset="0"
+ >
+ @mouseleave="popoveMouseLeave"
+ >
+ size="32px"
+ />
{{ author.name | truncate(trunc, 18) }}
+ style="vertical-align: middle;"
+ >
+ {{ author.name | truncate(trunc, 18) }}
+
+ color="soft"
+ >
{{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }}
@@ -37,7 +44,8 @@
slot="popover"
style="min-width: 250px;"
@mouseover="popoverMouseEnter"
- @mouseleave="popoveMouseLeave">
+ @mouseleave="popoveMouseLeave"
+ >
+ :show-author-popover="showAuthorPopover"
+ />
diff --git a/components/ShoutButton.vue b/components/ShoutButton.vue
index 011b30f38..075006b2e 100644
--- a/components/ShoutButton.vue
+++ b/components/ShoutButton.vue
@@ -1,18 +1,23 @@
+ style="text-align: center"
+ >
+ @click="shout"
+ />
{{ shoutedCount }}x Empfohlen
+ tag="h3"
+ >
+ {{ shoutedCount }}x
+ Empfohlen
diff --git a/layouts/blank.vue b/layouts/blank.vue
index a8fa6eaa9..827b1aaf7 100644
--- a/layouts/blank.vue
+++ b/layouts/blank.vue
@@ -2,7 +2,7 @@
diff --git a/layouts/default.vue b/layouts/default.vue
index 700f30abc..6e893e28e 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -4,7 +4,8 @@
+ href="/"
+ >
@@ -15,27 +16,34 @@
placement="bottom-end"
trigger="manual"
offset="10"
- style="float: right">
+ style="float: right"
+ >
+ @click.prevent="toggleMenu()"
+ >
+ size="42"
+ />
+ @mouseleave="popoveMouseLeave"
+ >
Hallo {{ user.name }}
+ @click.native="toggleMenu"
+ />
- Logout
+
+ Logout
+
@@ -44,7 +52,7 @@
-
+
diff --git a/package.json b/package.json
index ce7e25f4d..07e97795c 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
"eslint-config-prettier": "^3.1.0",
"eslint-loader": "^2.0.0",
"eslint-plugin-prettier": "3.0.0",
- "eslint-plugin-vue": "^4.0.0",
+ "eslint-plugin-vue": "^5.0.0",
"jest": "^23.6.0",
"node-sass": "^4.9.3",
"nodemon": "^1.11.0",
diff --git a/pages/admin.vue b/pages/admin.vue
index 48250e000..8d2286ae6 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -10,7 +10,8 @@
+ appear
+ >
diff --git a/pages/admin/index.vue b/pages/admin/index.vue
index 995b438c1..ac9acf648 100644
--- a/pages/admin/index.vue
+++ b/pages/admin/index.vue
@@ -9,11 +9,13 @@
:count="0"
label="Users"
size="x-large"
- uppercase>
+ uppercase
+ >
+ :end-val="statistics.countUsers || 0"
+ />
@@ -24,11 +26,13 @@
:count="0"
label="Posts"
size="x-large"
- uppercase>
+ uppercase
+ >
+ :end-val="statistics.countPosts || 0"
+ />
@@ -39,11 +43,13 @@
:count="0"
label="Comments"
size="x-large"
- uppercase>
+ uppercase
+ >
+ :end-val="statistics.countComments || 0"
+ />
@@ -54,11 +60,13 @@
:count="0"
label="Notifications"
size="x-large"
- uppercase>
+ uppercase
+ >
+ :end-val="statistics.countNotifications || 0"
+ />
@@ -69,11 +77,13 @@
:count="0"
label="Organization"
size="x-large"
- uppercase>
+ uppercase
+ >
+ :end-val="statistics.countOrganizations || 0"
+ />
@@ -84,11 +94,13 @@
:count="0"
label="Projects"
size="x-large"
- uppercase>
+ uppercase
+ >
+ :end-val="statistics.countProjects || 0"
+ />
@@ -99,11 +111,13 @@
:count="0"
label="Open Invites"
size="x-large"
- uppercase>
+ uppercase
+ >
+ :end-val="statistics.countInvites || 0"
+ />
@@ -114,11 +128,13 @@
:count="0"
label="Follows"
size="x-large"
- uppercase>
+ uppercase
+ >
+ :end-val="statistics.countFollows || 0"
+ />
@@ -129,11 +145,13 @@
:count="0"
label="Shouts"
size="x-large"
- uppercase>
+ uppercase
+ >
+ :end-val="statistics.countShouts || 0"
+ />
diff --git a/pages/index.vue b/pages/index.vue
index ed5a2f7d3..ca4ebc03c 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -3,18 +3,21 @@
+ gutter="base"
+ >
+ >
+ @click="showMoreContributions"
+ />
diff --git a/pages/login.vue b/pages/login.vue
index 9084163f2..e66ad2fef 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -12,50 +12,67 @@
+ center
+ >
+ center
+ >
+ alt="Human Connection"
+ >
+ center
+ >
- Wenn Du ein Konto bei Human Connection hast, melde Dich bitte hier an.
+
+ Wenn Du ein Konto bei Human Connection hast, melde Dich bitte hier an.
+
diff --git a/pages/logout.vue b/pages/logout.vue
index 7927be45f..483e28270 100644
--- a/pages/logout.vue
+++ b/pages/logout.vue
@@ -3,25 +3,32 @@
+ center
+ >
+ center
+ >
+ alt="Human Connection"
+ >
+ center
+ >
Logging out...
+ soft
+ >
+ Logging out...
+
diff --git a/pages/post/_slug.vue b/pages/post/_slug.vue
index c3022b8a3..b3e6e2ea8 100644
--- a/pages/post/_slug.vue
+++ b/pages/post/_slug.vue
@@ -4,7 +4,8 @@
+ appear
+ >
diff --git a/pages/post/_slug/index.vue b/pages/post/_slug/index.vue
index c1d55204e..01ef2ffce 100644
--- a/pages/post/_slug/index.vue
+++ b/pages/post/_slug/index.vue
@@ -3,19 +3,22 @@
v-if="post"
:image="post.image"
:header="post.title"
- class="post-card">
+ class="post-card"
+ >
+ v-html="post.content"
+ />
+ :post-id="post.id"
+ />
-->
-
+
{{ tag.name }}
+ :key="tag.id"
+ >
+ {{ tag.name }}
+
-
+
+ slot="footer"
+ >
@@ -49,7 +56,8 @@
v-if="post.commentsCount"
style="transform: scale(.8); margin-top: -4px; margin-left: -12px; position: absolute;"
color="primary"
- round>
+ round
+ >
{{ post.commentsCount }}
Comments
@@ -58,27 +66,35 @@
-
NO COMMENTS
+
+ NO COMMENTS
+
diff --git a/pages/post/_slug/more-info.vue b/pages/post/_slug/more-info.vue
index f4f2312e1..9a8421908 100644
--- a/pages/post/_slug/more-info.vue
+++ b/pages/post/_slug/more-info.vue
@@ -1,8 +1,10 @@
- Mehr Informationen
+
+ Mehr Informationen
+
Hier findest du weitere infos zum Thema.
-
+
Themenkategorien
{{ tag.name }}
+ :key="tag.id"
+ >
+ {{ tag.name }}
+
Verwandte Beiträge
+ gutter="small"
+ >
+ :width="{ base: '50%' }"
+ >
+ style="text-align: center; padding-top: 2em; opacity: .6;"
+ >
No related Posts
diff --git a/pages/profile/_slug.vue b/pages/profile/_slug.vue
index e405cdd25..fcce234a4 100644
--- a/pages/profile/_slug.vue
+++ b/pages/profile/_slug.vue
@@ -3,23 +3,28 @@
PROFILE IMAGE
-
+
+ gutter="base"
+ >
+ size="120px"
+ />
{{ user.name }}
+ no-margin
+ >
+ {{ user.name }}
+
+ margin="x-small"
+ >
+ :badges="user.badges"
+ />
@@ -46,7 +53,8 @@
+ :end-val="followedByCount"
+ />
@@ -55,17 +63,20 @@
+ :end-val="Number(user.followingCount) || 0"
+ />
+ margin="small"
+ >
+ @update="voted = true && fetchUser()"
+ />
@@ -80,20 +91,23 @@
-
+
+ style="text-align: center; margin-bottom: 10px;"
+ >
Netzwerk
+ margin="x-small"
+ >
+ color="soft"
+ >
Wem folgt {{ user.name | truncate(15) }}?
@@ -101,34 +115,44 @@
+ margin="x-small"
+ >
+ :trunc="15"
+ />
+ margin="small"
+ >
und {{ user.followingCount - user.following.length }} weitere
+ color="softer"
+ >
+ und {{ user.followingCount - user.following.length }} weitere
+
- {{ user.name }} folgt niemandem
+
+ {{ user.name }} folgt niemandem
+
-
+
+ margin="x-small"
+ >
+ color="soft"
+ >
Wer folgt {{ user.name | truncate(15) }}?
@@ -136,24 +160,32 @@
+ margin="x-small"
+ >
+ :trunc="15"
+ />
+ margin="small"
+ >
und {{ user.followedByCount - user.followedBy.length }} weitere
+ color="softer"
+ >
+ und {{ user.followedByCount - user.followedBy.length }} weitere
+
- niemand folgt {{ user.name }}
+
+ niemand folgt {{ user.name }}
+
@@ -171,7 +203,8 @@
+ :end-val="user.contributionsCount"
+ />
@@ -183,7 +216,8 @@
+ :end-val="user.commentsCount"
+ />
@@ -195,7 +229,8 @@
+ :end-val="user.shoutedCount"
+ />
@@ -205,17 +240,20 @@
+ >
+ :show-author-popover="false"
+ />
+ @click="showMoreContributions"
+ />
diff --git a/pages/settings.vue b/pages/settings.vue
index 7b625e742..cf93cbfa4 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -10,7 +10,8 @@
+ appear
+ >
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
new file mode 100755
index 000000000..b66b63a77
--- /dev/null
+++ b/scripts/deploy.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "See me deployed at $1 :)"
+
diff --git a/styleguide/src/system/components/data-input/Input/Input.vue b/styleguide/src/system/components/data-input/Input/Input.vue
index 56f2d33e9..0b99ce98e 100755
--- a/styleguide/src/system/components/data-input/Input/Input.vue
+++ b/styleguide/src/system/components/data-input/Input/Input.vue
@@ -64,6 +64,13 @@ export default {
type: String,
default: null
},
+ /**
+ * The name of the field for better accessibility
+ */
+ name: {
+ type: String,
+ default: null
+ },
/**
* Whether the input should be automatically focused
*/
diff --git a/styleguide/src/system/components/navigation/Button/Button.vue b/styleguide/src/system/components/navigation/Button/Button.vue
index 208e3269d..d806a9d6e 100644
--- a/styleguide/src/system/components/navigation/Button/Button.vue
+++ b/styleguide/src/system/components/navigation/Button/Button.vue
@@ -13,6 +13,7 @@
fullWidth && `ds-button-full-width`,
loading && `ds-button-loading`
]"
+ :name="name"
v-bind="bindings"
:is="linkTag">