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/README.md b/README.md
index 25dabc03d..4f9391634 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
``` bash
# install all dependencies
$ cd styleguide && yarn install && cd ..
-$ yarn run styleguide:build
+$ yarn styleguide:build
$ yarn install
```
@@ -22,6 +22,7 @@ $ yarn dev
### Build for production
``` bash
# build for production and launch server
+$ yarn styleguide:build
$ yarn build
$ yarn start
```
@@ -35,10 +36,4 @@ All reusable Components (for example avatar) should be done inside the styleguid
### To show the styleguide
``` bash
$ yarn styleguide
-```
-
-if you changed design tokens or other styles inside the styleguide, run the refresh command to build the styleguide as a lib
-
-``` bash
-$ yarn styleguide:build
-```
+```
\ No newline at end of file
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 84de685f1..9f00a6566 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 59f3ca73c..8a34f66ba 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -4,7 +4,8 @@
+ href="/"
+ >
@@ -15,26 +16,33 @@
placement="bottom-end"
trigger="manual"
offset="10"
- style="float: right">
+ style="float: right"
+ >
+ @click.prevent="toggleMenu()"
+ >
+ size="42"
+ />
+ @mouseleave="popoveMouseLeave"
+ >
Hallo {{ user.name }}
+ style="margin-left: -15px; margin-right: -15px; padding-top: 1rem; padding-bottom: 1rem;"
+ />
- Logout
+
+ Logout
+
@@ -43,7 +51,7 @@
-
+
diff --git a/package.json b/package.json
index e64eca33e..07e97795c 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
"nuxt-env": "^0.0.4",
"v-tooltip": "^2.0.0-rc.33",
"vue-count-to": "^1.0.13",
- "vue-izitoast": "git://github.com/arthurvasconcelos/vue-izitoast.git"
+ "vue-izitoast": "1.1.2"
},
"devDependencies": {
"@vue/eslint-config-prettier": "^4.0.1",
@@ -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 13f4b6705..6ce9ca5a1 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 0a68ff8e9..77e69c780 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 3bb4d6c89..e66ad2fef 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -12,54 +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 fbb185c9e..240815eb9 100644
--- a/pages/post/_slug/index.vue
+++ b/pages/post/_slug/index.vue
@@ -3,38 +3,48 @@
v-if="post"
:image="post.image"
:header="post.title"
- class="post-card">
+ class="post-card"
+ >
+ v-html="post.content"
+ />
+ :post-id="post.id"
+ />
{{ category.name }}
+ :key="category.id"
+ >
+ {{ category.name }}
+
-
+
{{ tag.name }}
+ :key="tag.id"
+ >
+ {{ tag.name }}
+
-
+
+ slot="footer"
+ >
@@ -42,7 +52,8 @@
v-if="post.commentsCount"
style="transform: scale(.8); margin-top: -4px; margin-left: -12px; position: absolute;"
color="primary"
- round>
+ round
+ >
{{ post.commentsCount }}
Comments
@@ -51,27 +62,35 @@
-
NO COMMENTS
+
+ NO COMMENTS
+
diff --git a/pages/post/_slug/more-info.vue b/pages/post/_slug/more-info.vue
index f111f3d32..a44c54e7d 100644
--- a/pages/post/_slug/more-info.vue
+++ b/pages/post/_slug/more-info.vue
@@ -1,37 +1,48 @@
- Mehr Informationen
+
+ Mehr Informationen
+
Hier findest du weitere infos zum Thema.
-
+
Themenkategorien
{{ category.name }}
+ :key="category.id"
+ >
+ {{ category.name }}
+
Schlagwörter
{{ 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 1873fee26..43ad88416 100644
--- a/pages/profile/_slug.vue
+++ b/pages/profile/_slug.vue
@@ -3,35 +3,43 @@
PROFILE IMAGE
-
+
+ gutter="base"
+ >
+ size="120px"
+ />
{{ user.name }}
+ no-margin
+ >
+ {{ user.name }}
+
+ size="small"
+ >
Mitglied seid {{ user.createdAt | date('MMMM yyyy') }}
+ margin="x-small"
+ >
+ :badges="user.badges"
+ />
@@ -39,7 +47,8 @@
+ :end-val="followedByCount"
+ />
@@ -48,33 +57,39 @@
+ :end-val="Number(user.followingCount) || 0"
+ />
+ margin="small"
+ >
+ @update="voted = true && fetchUser()"
+ />
-
+
+ style="text-align: center; margin-bottom: 10px;"
+ >
Netzwerk
+ margin="x-small"
+ >
+ color="soft"
+ >
Wem folgt {{ user.name | truncate(15) }}?
@@ -82,34 +97,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) }}?
@@ -117,31 +142,40 @@
+ 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 }}
+
+ gutter="small"
+ >
@@ -152,7 +186,8 @@
+ :end-val="user.contributionsCount"
+ />
@@ -164,7 +199,8 @@
+ :end-val="user.commentsCount"
+ />
@@ -176,7 +212,8 @@
+ :end-val="user.shoutedCount"
+ />
@@ -186,17 +223,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/yarn.lock b/yarn.lock
index 52f106fdf..26b3e9c4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -50,7 +50,7 @@
semver "^5.4.1"
source-map "^0.5.0"
-"@babel/generator@^7.1.6":
+"@babel/generator@^7.0.0", "@babel/generator@^7.1.6":
version "7.1.6"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.6.tgz#001303cf87a5b9d093494a4bf251d7b5d03d3999"
integrity sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==
@@ -238,7 +238,7 @@
version "7.1.2"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.2.tgz#85c5c47af6d244fab77bce6b9bd830e38c978409"
-"@babel/parser@^7.1.2", "@babel/parser@^7.1.6":
+"@babel/parser@^7.1.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.6":
version "7.1.6"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.6.tgz#16e97aca1ec1062324a01c5a6a7d0df8dd189854"
integrity sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==
@@ -1359,13 +1359,6 @@ acorn-globals@^4.1.0:
acorn "^6.0.1"
acorn-walk "^6.0.1"
-acorn-jsx@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
- integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
- dependencies:
- acorn "^3.0.4"
-
acorn-jsx@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
@@ -1376,12 +1369,7 @@ acorn-walk@^6.0.1:
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
-acorn@^3.0.4:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
- integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
-
-acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2, acorn@^5.7.3:
+acorn@^5.0.0, acorn@^5.5.3, acorn@^5.6.2, acorn@^5.7.3:
version "5.7.3"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
@@ -4213,12 +4201,12 @@ eslint-plugin-prettier@3.0.0, eslint-plugin-prettier@^3.0.0:
dependencies:
prettier-linter-helpers "^1.0.0"
-eslint-plugin-vue@^4.0.0:
- version "4.7.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz#c829b9fc62582c1897b5a0b94afd44ecca511e63"
- integrity sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==
+eslint-plugin-vue@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0.tgz#4a2cc1c0e71ea45e1bd9c1a60f925bfe68bb5710"
+ integrity sha512-mSv2Ebz3RaPP+XJO/mu7F+SdR9lrMyGISSExnarLFqqf3pF5wTmwWNrhHW1o9zKzKI811UVTIIkWJJvgO6SsUQ==
dependencies:
- vue-eslint-parser "^2.0.3"
+ vue-eslint-parser "^4.0.2"
eslint-scope@3.7.1:
version "3.7.1"
@@ -4228,14 +4216,6 @@ eslint-scope@3.7.1:
esrecurse "^4.1.0"
estraverse "^4.1.1"
-eslint-scope@^3.7.1:
- version "3.7.3"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
- integrity sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==
- dependencies:
- esrecurse "^4.1.0"
- estraverse "^4.1.1"
-
eslint-scope@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
@@ -4303,15 +4283,7 @@ esm@^3.0.84:
resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.84.tgz#bb108989f4673b32d4f62406869c28eed3815a63"
integrity sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw==
-espree@^3.5.2:
- version "3.5.4"
- resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
- integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==
- dependencies:
- acorn "^5.5.0"
- acorn-jsx "^3.0.0"
-
-espree@^4.0.0:
+espree@^4.0.0, espree@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f"
integrity sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==
@@ -4330,7 +4302,7 @@ esprima@^4.0.0:
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-esquery@^1.0.0, esquery@^1.0.1:
+esquery@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
@@ -10536,26 +10508,27 @@ vue-count-to@^1.0.13:
resolved "https://registry.yarnpkg.com/vue-count-to/-/vue-count-to-1.0.13.tgz#3e7573ea6e64c2b2972f64e0a2ab2e23c7590ff3"
integrity sha512-6R4OVBVNtQTlcbXu6SJ8ENR35M2/CdWt3Jmv57jOUM+1ojiFmjVGvZPH8DfHpMDSA+ITs+EW5V6qthADxeyYOQ==
-vue-eslint-parser@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
- integrity sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==
+vue-eslint-parser@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-4.0.2.tgz#7d10ec5b67d9b2ef240cac0f0e8b2f03773d810e"
+ integrity sha512-A+teFdsAVtVawd4rtLsv8q6uuj2MYt3Uw+GCodqEkjozB3g20G91hbukz60yWa9IUx/yFz+JzKBu/3Djkod36g==
dependencies:
- debug "^3.1.0"
- eslint-scope "^3.7.1"
+ debug "^4.1.0"
+ eslint-scope "^4.0.0"
eslint-visitor-keys "^1.0.0"
- espree "^3.5.2"
- esquery "^1.0.0"
- lodash "^4.17.4"
+ espree "^4.1.0"
+ esquery "^1.0.1"
+ lodash "^4.17.11"
vue-hot-reload-api@^2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2"
integrity sha512-AA86yKZ5uOKz87/q1UpngEXhbRkaYg1b7HMMVRobNV1IVKqZe8oLIzo6iMocVwZXnYitlGwf2k4ZRLOZlS8oPQ==
-"vue-izitoast@git://github.com/arthurvasconcelos/vue-izitoast.git":
- version "1.1.1"
- resolved "git://github.com/arthurvasconcelos/vue-izitoast.git#2f7c1792f6a67fa73849c5060aa45cea9f8ad778"
+vue-izitoast@1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/vue-izitoast/-/vue-izitoast-1.1.2.tgz#0cf8290f045f8a389ccce4c238836c75a130eb03"
+ integrity sha512-/sNVrYhFg7Moyny5tFNt2e7TTmgPB1xyy04BChKQJkN5r9/D/6vYI7KQWEtG+v9VofnIVg5Em7HXtOL8IOeT7w==
dependencies:
izitoast "^1.3.0"