IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1188-Delete_teaser_image

Browse Source
This commit is contained in:
Alexander Friedland 2019-12-19 18:26:05 +01:00 committed by GitHub
commit d38a1f089f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 1081 additions and 984 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.vscode/settings.json vendored
View File

@ -8,5 +8,4 @@
} }
], ],
"editor.formatOnSave": false, "editor.formatOnSave": false,
"eslint.autoFixOnSave": true
} }

14
backend/package.json
View File

@ -67,19 +67,19 @@
"metascraper-author": "^5.8.12", "metascraper-author": "^5.8.12",
"metascraper-clearbit-logo": "^5.3.0", "metascraper-clearbit-logo": "^5.3.0",
"metascraper-date": "^5.8.12", "metascraper-date": "^5.8.12",
"metascraper-description": "^5.8.10", "metascraper-description": "^5.8.12",
"metascraper-image": "^5.8.10", "metascraper-image": "^5.8.12",
"metascraper-lang": "^5.8.10", "metascraper-lang": "^5.8.10",
"metascraper-lang-detector": "^4.10.2", "metascraper-lang-detector": "^4.10.2",
"metascraper-logo": "^5.8.12", "metascraper-logo": "^5.8.12",
"metascraper-publisher": "^5.8.7", "metascraper-publisher": "^5.8.7",
"metascraper-soundcloud": "^5.8.12", "metascraper-soundcloud": "^5.8.12",
"metascraper-title": "^5.8.10", "metascraper-title": "^5.8.12",
"metascraper-url": "^5.8.7", "metascraper-url": "^5.8.7",
"metascraper-video": "^5.8.12", "metascraper-video": "^5.8.12",
"metascraper-youtube": "^5.8.12", "metascraper-youtube": "^5.8.12",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"mustache": "^3.1.0", "mustache": "^3.2.0",
"neo4j-driver": "~1.7.6", "neo4j-driver": "~1.7.6",
"neo4j-graphql-js": "^2.10.2", "neo4j-graphql-js": "^2.10.2",
"neode": "^0.3.6", "neode": "^0.3.6",
@ -97,13 +97,13 @@
"xregexp": "^4.2.4" "xregexp": "^4.2.4"
}, },
"devDependencies": { "devDependencies": {
"@babel/cli": "~7.7.5", "@babel/cli": "~7.7.7",
"@babel/core": "~7.7.5", "@babel/core": "~7.7.5",
"@babel/node": "~7.7.4", "@babel/node": "~7.7.7",
"@babel/plugin-proposal-throw-expressions": "^7.7.4", "@babel/plugin-proposal-throw-expressions": "^7.7.4",
"@babel/preset-env": "~7.7.6", "@babel/preset-env": "~7.7.6",
"@babel/register": "~7.7.0", "@babel/register": "~7.7.0",
"apollo-server-testing": "~2.9.13", "apollo-server-testing": "~2.9.14",
"babel-core": "~7.0.0-0", "babel-core": "~7.0.0-0",
"babel-eslint": "~10.0.3", "babel-eslint": "~10.0.3",
"babel-jest": "~24.9.0", "babel-jest": "~24.9.0",

1
backend/src/models/Post.js
View File

@ -39,5 +39,6 @@ module.exports = {
default: () => new Date().toISOString(), default: () => new Date().toISOString(),
}, },
language: { type: 'string', allow: [null] }, language: { type: 'string', allow: [null] },
imageBlurred: { type: 'boolean', default: false },
imageAspectRatio: { type: 'float', default: 1.0 }, imageAspectRatio: { type: 'float', default: 1.0 },
} }

1
backend/src/schema/resolvers/posts.js
View File

@ -341,6 +341,7 @@ export default {
'language', 'language',
'pinnedAt', 'pinnedAt',
'pinned', 'pinned',
'imageBlurred',
'imageAspectRatio', 'imageAspectRatio',
], ],
hasMany: { hasMany: {

6
backend/src/schema/types/type/Post.gql
View File

@ -82,6 +82,7 @@ input _PostFilter {
emotions_none: _PostEMOTEDFilter emotions_none: _PostEMOTEDFilter
emotions_single: _PostEMOTEDFilter emotions_single: _PostEMOTEDFilter
emotions_every: _PostEMOTEDFilter emotions_every: _PostEMOTEDFilter
imageBlurred: Boolean
} }
enum _PostOrdering { enum _PostOrdering {
@ -127,6 +128,7 @@ type Post {
createdAt: String createdAt: String
updatedAt: String updatedAt: String
language: String language: String
imageBlurred: Boolean
pinnedAt: String @cypher( pinnedAt: String @cypher(
statement: "MATCH (this)<-[pinned:PINNED]-(:User) WHERE NOT this.deleted = true AND NOT this.disabled = true RETURN pinned.createdAt" statement: "MATCH (this)<-[pinned:PINNED]-(:User) WHERE NOT this.deleted = true AND NOT this.disabled = true RETURN pinned.createdAt"
) )
@ -140,7 +142,6 @@ type Post {
LIMIT 10 LIMIT 10
""" """
) )
tags: [Tag]! @relation(name: "TAGGED", direction: "OUT") tags: [Tag]! @relation(name: "TAGGED", direction: "OUT")
categories: [Category]! @relation(name: "CATEGORIZED", direction: "OUT") categories: [Category]! @relation(name: "CATEGORIZED", direction: "OUT")
@ -183,6 +184,7 @@ type Mutation {
language: String language: String
categoryIds: [ID] categoryIds: [ID]
contentExcerpt: String contentExcerpt: String
imageBlurred: Boolean
imageAspectRatio: Float imageAspectRatio: Float
): Post ): Post
UpdatePost( UpdatePost(
@ -196,6 +198,7 @@ type Mutation {
visibility: Visibility visibility: Visibility
language: String language: String
categoryIds: [ID] categoryIds: [ID]
imageBlurred: Boolean
imageAspectRatio: Float imageAspectRatio: Float
): Post ): Post
DeletePost(id: ID!): Post DeletePost(id: ID!): Post
@ -217,6 +220,7 @@ type Query {
createdAt: String createdAt: String
updatedAt: String updatedAt: String
language: String language: String
imageBlurred: Boolean
first: Int first: Int
offset: Int offset: Int
orderBy: [_PostOrdering] orderBy: [_PostOrdering]

1
backend/src/seed/factories/posts.js
View File

@ -19,6 +19,7 @@ export default function create() {
visibility: 'public', visibility: 'public',
deleted: false, deleted: false,
categoryIds: [], categoryIds: [],
imageBlurred: false,
imageAspectRatio: 1.333, imageAspectRatio: 1.333,
} }
args = { args = {

4
backend/src/seed/seed-db.js
View File

@ -352,6 +352,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
language: sample(languages), language: sample(languages),
image: faker.image.unsplash.food(300, 169), image: faker.image.unsplash.food(300, 169),
categoryIds: ['cat16'], categoryIds: ['cat16'],
imageBlurred: true,
imageAspectRatio: 300 / 169, imageAspectRatio: 300 / 169,
}), }),
factory.create('Post', { factory.create('Post', {
@ -398,6 +399,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
author: dewey, author: dewey,
id: 'p10', id: 'p10',
categoryIds: ['cat10'], categoryIds: ['cat10'],
imageBlurred: true,
}), }),
factory.create('Post', { factory.create('Post', {
author: louie, author: louie,
@ -444,6 +446,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
$title: String! $title: String!
$content: String! $content: String!
$categoryIds: [ID] $categoryIds: [ID]
$imageBlurred: Boolean
$imageAspectRatio: Float $imageAspectRatio: Float
) { ) {
CreatePost( CreatePost(
@ -451,6 +454,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
title: $title title: $title
content: $content content: $content
categoryIds: $categoryIds categoryIds: $categoryIds
imageBlurred: $imageBlurred
imageAspectRatio: $imageAspectRatio imageAspectRatio: $imageAspectRatio
) { ) {
id id

83
backend/yarn.lock
View File

@ -33,10 +33,10 @@
resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz#3ce939cb127fb8aaa3ffc1e90dff9b8af9f2e3dc" resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz#3ce939cb127fb8aaa3ffc1e90dff9b8af9f2e3dc"
integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ== integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==
"@babel/cli@~7.7.5": "@babel/cli@~7.7.7":
version "7.7.5" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.7.5.tgz#25702cc65418efc06989af3727897b9f4c8690b6" resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.7.7.tgz#56849acbf81d1a970dd3d1b3097c8ebf5da3f534"
integrity sha512-y2YrMGXM3NUyu1Myg0pxg+Lx6g8XhEyvLHYNRwTBV6fDek3H7Io6b7N/LXscLs4HWn4HxMdy7f2rM1rTMp2mFg== integrity sha512-XQw5KyCZyu/M8/0rYiZyuwbgIQNzOrJzs9dDLX+MieSgBwTLvTj4QVbLmxJACAIvQIDT7PtyHN2sC48EOWTgaA==
dependencies: dependencies:
commander "^4.0.1" commander "^4.0.1"
convert-source-map "^1.1.0" convert-source-map "^1.1.0"
@ -279,17 +279,18 @@
esutils "^2.0.2" esutils "^2.0.2"
js-tokens "^4.0.0" js-tokens "^4.0.0"
"@babel/node@~7.7.4": "@babel/node@~7.7.7":
version "7.7.4" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.7.4.tgz#de1cc9c67b335a19e4f71208554779bc63719f5a" resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.7.7.tgz#10c488ca36da07670be0131679c4e22f9d7795d4"
integrity sha512-Vhhq2kK+BpsR2tW35zP8yOJZ7ONMVBwCD9fmNeRTU3MNNpcJDrrtVP5NK8ZX4nQAs0GSq6ky8noyn6MCVgL08g== integrity sha512-QWWbQ6AyDffz6mA2mF0jixb/3IyRlqWgz5JNa2F6kSYe4vhPEytwuGmanx0NQJxBufDjffm/jYPuIfKfAyVzuA==
dependencies: dependencies:
"@babel/register" "^7.7.4" "@babel/register" "^7.7.7"
commander "^2.8.1" commander "^2.8.1"
core-js "^3.2.1" core-js "^3.2.1"
lodash "^4.17.13" lodash "^4.17.13"
node-environment-flags "^1.0.5" node-environment-flags "^1.0.5"
regenerator-runtime "^0.13.3" regenerator-runtime "^0.13.3"
resolve "^1.13.1"
v8flags "^3.1.1" v8flags "^3.1.1"
"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.4", "@babel/parser@^7.7.5": "@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.4", "@babel/parser@^7.7.5":
@ -704,10 +705,10 @@
js-levenshtein "^1.1.3" js-levenshtein "^1.1.3"
semver "^5.5.0" semver "^5.5.0"
"@babel/register@^7.7.4", "@babel/register@~7.7.0": "@babel/register@^7.7.7", "@babel/register@~7.7.0":
version "7.7.4" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.4.tgz#45a4956471a9df3b012b747f5781cc084ee8f128" resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.7.tgz#46910c4d1926b9c6096421b23d1f9e159c1dcee1"
integrity sha512-/fmONZqL6ZMl9KJUYajetCrID6m0xmL4odX7v+Xvoxcv0DdbP/oO0TWIeLUCHqczQ6L6njDMqmqHFy2cp3FFsA== integrity sha512-S2mv9a5dc2pcpg/ConlKZx/6wXaEwHeqfo7x/QbXsdCAZm+WJC1ekVvL1TVxNsedTs5y/gG63MhJTEsmwmjtiA==
dependencies: dependencies:
find-cache-dir "^2.0.0" find-cache-dir "^2.0.0"
lodash "^4.17.13" lodash "^4.17.13"
@ -1812,12 +1813,12 @@ apollo-server-plugin-base@^0.6.9:
dependencies: dependencies:
apollo-server-types "^0.2.9" apollo-server-types "^0.2.9"
apollo-server-testing@~2.9.13: apollo-server-testing@~2.9.14:
version "2.9.13" version "2.9.14"
resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.13.tgz#7a4efc0eb01d7297716f089121c7440a620bb640" resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.14.tgz#3b442a22b109c7ef7758bc1749dc0ab9923eb605"
integrity sha512-c1xl4g5KhMfPpL5xdzxPJLY53+yK/kMAWxIASthRrOSZNgStTe7pCAJ06Nk3NB8M5GwfJK3cJiVkLfZRSt9+jQ== integrity sha512-An9T0kUpqPOJnuoqGRIbx/c5iy/WRyZnVrfbCjQ0ux9n1reAoMzhmIdDDCIkl8+tu4UfTcjuNl4af5WRY6Lakw==
dependencies: dependencies:
apollo-server-core "^2.9.13" apollo-server-core "^2.9.14"
apollo-server-types@^0.2.9: apollo-server-types@^0.2.9:
version "0.2.9" version "0.2.9"
@ -5834,19 +5835,19 @@ metascraper-date@^5.8.12:
dependencies: dependencies:
"@metascraper/helpers" "^5.8.12" "@metascraper/helpers" "^5.8.12"
metascraper-description@^5.8.10: metascraper-description@^5.8.12:
version "5.8.10" version "5.8.12"
resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.8.10.tgz#1b69f59fa76263fcd2c15f8ce73052b81900177a" resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.8.12.tgz#fa6d5a0f8f050ad19b6205529af68c6e6ed1ca2f"
integrity sha512-0stYkl5OPpM0yM6Dl3WcXxLjl2gY5k77E4seeHOqHAUx1EKXNgrSrtO0I3PX9p6vcxP+WBtK6zlqHYU4qAMlSA== integrity sha512-KEB5+urIcdqZGbLx/JULw3sjuzlfkagoEnTsOfZSCj5J6hUKpFHA5B44o9gNtNCm9miR5gfbYtbFP1XCnYji+Q==
dependencies: dependencies:
"@metascraper/helpers" "^5.8.10" "@metascraper/helpers" "^5.8.12"
metascraper-image@^5.8.10: metascraper-image@^5.8.12:
version "5.8.10" version "5.8.12"
resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.8.10.tgz#fe21811ca88eef13e64812462fb5a21ee48933dc" resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.8.12.tgz#a4b9c1cef08e86a1c5c36c0c6e132cad409a3d0b"
integrity sha512-WOPnTupaDEl58iZp0M6kFlUcRSRQFSPWATPUi3AeW31VJM2sepxmJlqc5qVFTen/Lm+kI23firrvEg5N8tFUVA== integrity sha512-mxzCYEKFknEG4MrRkk3KHN/LxqVnvRFwKOrfNHeRdXWSOI7ANM9SGe+5tYuXrNsONhXfMZp32PJswVqAlWsSLA==
dependencies: dependencies:
"@metascraper/helpers" "^5.8.10" "@metascraper/helpers" "^5.8.12"
metascraper-lang-detector@^4.10.2: metascraper-lang-detector@^4.10.2:
version "4.10.2" version "4.10.2"
@ -5886,12 +5887,12 @@ metascraper-soundcloud@^5.8.12:
"@metascraper/helpers" "^5.8.12" "@metascraper/helpers" "^5.8.12"
tldts "~5.6.2" tldts "~5.6.2"
metascraper-title@^5.8.10: metascraper-title@^5.8.12:
version "5.8.10" version "5.8.12"
resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.8.10.tgz#c25dc8e8ad7073c18c8d25db0b855f62d3d986bd" resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.8.12.tgz#1d57da4d0dd4566e622170630ba9b65fe26a4536"
integrity sha512-CauBJmLYtS+AZ9KJfnfJHp/tzUTo9yup56P/7aaOBcfVA5PWg3xdI1lVXJegmiTsBCyDEzWRVJ41f/ZlMjbAsg== integrity sha512-JJzJIp6O+BVFdxnYiz4lUGtzqeDLAxE5dz/Z0kj8iwJl6z/szdYTeFuI4Sc872GxN14xAgxNe1LJs2gAlZuHsg==
dependencies: dependencies:
"@metascraper/helpers" "^5.8.10" "@metascraper/helpers" "^5.8.12"
lodash "~4.17.15" lodash "~4.17.15"
metascraper-url@^5.8.7: metascraper-url@^5.8.7:
@ -6077,10 +6078,10 @@ ms@^2.1.1:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
mustache@^3.1.0: mustache@^3.2.0:
version "3.1.0" version "3.2.0"
resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.1.0.tgz#9fba26e7aefc5709f07ff585abb7e0abced6c372" resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.0.tgz#1c68e0bf77817a92e8a9216e35c53bbb342345f6"
integrity sha512-3Bxq1R5LBZp7fbFPZzFe5WN4s0q3+gxZaZuZVY+QctYJiCiVgXHOTIC0/HgZuOPFt/6BQcx5u0H2CUOxT/RoGQ== integrity sha512-n5de2nQ1g2iz3PO9cmq/ZZx3W7glqjf0kavThtqfuNlZRllgU2a2Q0jWoQy3BloT5A6no7sjCTHBVn1rEKjx1Q==
mute-stream@0.0.8: mute-stream@0.0.8:
version "0.0.8" version "0.0.8"
@ -7311,10 +7312,10 @@ resolve@1.1.7:
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0: resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0:
version "1.12.0" version "1.14.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.1.tgz#9e018c540fcf0c427d678b9931cbf45e984bcaff"
integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== integrity sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==
dependencies: dependencies:
path-parse "^1.0.6" path-parse "^1.0.6"

4
package.json
View File

@ -21,8 +21,8 @@
"version": "auto-changelog -p" "version": "auto-changelog -p"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.7.5", "@babel/core": "^7.7.7",
"@babel/preset-env": "^7.7.6", "@babel/preset-env": "^7.7.7",
"@babel/register": "^7.7.4", "@babel/register": "^7.7.4",
"auto-changelog": "^1.16.2", "auto-changelog": "^1.16.2",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",

2
webapp/Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:13.3.0-alpine as base FROM node:13.4.0-alpine as base
LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
EXPOSE 3000 EXPOSE 3000

2
webapp/Dockerfile.maintenance
View File

@ -1,4 +1,4 @@
FROM node:13.3.0-alpine as build FROM node:13.4.0-alpine as build
LABEL Description="Maintenance page of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" LABEL Description="Maintenance page of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
EXPOSE 3000 EXPOSE 3000

1
webapp/components/ContributionForm/ContributionForm.spec.js
View File

@ -200,6 +200,7 @@ describe('ContributionForm.vue', () => {
imageUpload: null, imageUpload: null,
imageAspectRatio: null, imageAspectRatio: null,
image: null, image: null,
imageBlurred: false,
}, },
} }
postTitleInput = wrapper.find('.ds-input') postTitleInput = wrapper.find('.ds-input')

71
webapp/components/ContributionForm/ContributionForm.vue
View File

@ -16,6 +16,7 @@
<hc-teaser-image <hc-teaser-image
:contribution="contribution" :contribution="contribution"
@addTeaserImage="addTeaserImage" @addTeaserImage="addTeaserImage"
:class="{ '--blur-image': form.blurImage }"
@addImageAspectRatio="addImageAspectRatio" @addImageAspectRatio="addImageAspectRatio"
> >
<img <img
@ -24,7 +25,23 @@
:src="contribution.image | proxyApiUrl" :src="contribution.image | proxyApiUrl"
/> />
</hc-teaser-image> </hc-teaser-image>
<ds-card> <ds-card>
<div class="blur-toggle">
<label for="blur-img">{{ $t('contribution.inappropriatePicture') }}</label>
<input type="checkbox" id="blur-img" v-model="form.blurImage" />
<p>
<a
href="https://support.human-connection.org/kb/faq.php?id=113"
target="_blank"
class="link"
>
{{ $t('contribution.inappropriatePictureText') }}
<ds-icon name="question-circle" />
</a>
</p>
</div>
<ds-space /> <ds-space />
<client-only> <client-only>
<hc-user :user="currentUser" :trunc="35" /> <hc-user :user="currentUser" :trunc="35" />
@ -86,6 +103,7 @@
<ds-icon name="warning"></ds-icon> <ds-icon name="warning"></ds-icon>
</ds-chip> </ds-chip>
</ds-text> </ds-text>
<ds-space /> <ds-space />
<div slot="footer" style="text-align: right"> <div slot="footer" style="text-align: right">
<ds-button <ds-button
@ -140,7 +158,9 @@ export default {
image: null, image: null,
language: null, language: null,
categoryIds: [], categoryIds: [],
blurImage: false,
} }
let id = null let id = null
let slug = null let slug = null
const form = { ...formDefaults } const form = { ...formDefaults }
@ -155,7 +175,9 @@ export default {
? languageOptions.find(o => this.contribution.language === o.value) ? languageOptions.find(o => this.contribution.language === o.value)
: null : null
form.categoryIds = this.categoryIds(this.contribution.categories) form.categoryIds = this.categoryIds(this.contribution.categories)
form.blurImage = this.contribution.imageBlurred
} }
return { return {
form, form,
formSchema: { formSchema: {
@ -173,6 +195,7 @@ export default {
}, },
}, },
language: { required: true }, language: { required: true },
blurImage: { required: false },
}, },
languageOptions, languageOptions,
id, id,
@ -182,6 +205,7 @@ export default {
contentMin: 3, contentMin: 3,
hashtags: [], hashtags: [],
showDeleteButton: this.contribution ? this.contribution.image : false, showDeleteButton: this.contribution ? this.contribution.image : false,
elem: null,
} }
}, },
computed: { computed: {
@ -202,6 +226,7 @@ export default {
teaserImage, teaserImage,
imageAspectRatio, imageAspectRatio,
categoryIds, categoryIds,
blurImage,
} = this.form } = this.form
this.loading = true this.loading = true
this.$apollo this.$apollo
@ -215,6 +240,7 @@ export default {
language, language,
image, image,
imageUpload: teaserImage, imageUpload: teaserImage,
imageBlurred: blurImage,
imageAspectRatio, imageAspectRatio,
}, },
}) })
@ -285,29 +311,36 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.smallTag {
width: 100%;
position: relative;
left: 90%;
}
.post-title {
margin-top: $space-x-small;
margin-bottom: $space-xx-small;
input {
border: 0;
font-size: $font-size-x-large;
font-weight: bold;
padding-left: 0;
padding-right: 0;
}
}
.contribution-form { .contribution-form {
.ds-card-image.--blur-image img {
filter: blur(32px);
}
.blur-toggle {
text-align: right;
> .link {
display: block;
}
}
.ds-chip { .ds-chip {
cursor: default; cursor: default;
} }
.post-title {
margin-top: $space-x-small;
margin-bottom: $space-xx-small;
input {
border: 0;
font-size: $font-size-x-large;
font-weight: bold;
padding-left: 0;
padding-right: 0;
}
}
} }
.delete-image { .delete-image {
right: 3px; right: 3px;

42
webapp/components/PostCard/PostCard.vue
View File

@ -2,7 +2,12 @@
<ds-card <ds-card
:lang="post.language" :lang="post.language"
:image="post.image | proxyApiUrl" :image="post.image | proxyApiUrl"
:class="{ 'post-card': true, 'disabled-content': post.disabled, 'post--pinned': isPinned }" :class="{
'post-card': true,
'disabled-content': post.disabled,
'--pinned': isPinned,
'--blur-image': post.imageBlurred,
}"
> >
<!-- Post Link Target --> <!-- Post Link Target -->
<nuxt-link <nuxt-link
@ -151,23 +156,26 @@ export default {
}, },
} }
</script> </script>
<style lang="scss">
<style scoped lang="scss">
.ds-card-image img {
width: 100%;
max-height: 2000px;
object-fit: contain;
-o-object-fit: cover;
object-fit: cover;
-o-object-position: center;
object-position: center;
}
.post-card { .post-card {
cursor: pointer; justify-content: space-between;
position: relative; position: relative;
z-index: 1; z-index: 1;
justify-content: space-between; cursor: pointer;
&.--pinned {
border: 1px solid $color-warning;
}
&.--blur-image > .ds-card-image img {
filter: blur(22px);
}
> .ds-card-image img {
width: 100%;
max-height: 2000px;
object-fit: contain;
}
> .ds-card-content { > .ds-card-content {
flex-grow: 0; flex-grow: 0;
@ -200,8 +208,4 @@ export default {
text-indent: -999999px; text-indent: -999999px;
} }
} }
.post--pinned {
border: 1px solid $color-warning;
}
</style> </style>

2
webapp/components/TeaserImage/TeaserImage.vue
View File

@ -141,7 +141,7 @@ export default {
<style lang="scss"> <style lang="scss">
#postdropzone { #postdropzone {
width: 100%; width: 100%;
min-height: 500px; min-height: 400px;
background-color: $background-color-softest; background-color: $background-color-softest;
} }

4
webapp/graphql/Fragments.js
View File

@ -45,6 +45,10 @@ export const postFragment = gql`
slug slug
image image
language language
imageBlurred
author {
...user
}
pinnedAt pinnedAt
imageAspectRatio imageAspectRatio
} }

6
webapp/graphql/PostMutations.js
View File

@ -9,6 +9,7 @@ export default () => {
$language: String $language: String
$categoryIds: [ID] $categoryIds: [ID]
$imageUpload: Upload $imageUpload: Upload
$imageBlurred: Boolean
$imageAspectRatio: Float $imageAspectRatio: Float
) { ) {
CreatePost( CreatePost(
@ -17,6 +18,7 @@ export default () => {
language: $language language: $language
categoryIds: $categoryIds categoryIds: $categoryIds
imageUpload: $imageUpload imageUpload: $imageUpload
imageBlurred: $imageBlurred
imageAspectRatio: $imageAspectRatio imageAspectRatio: $imageAspectRatio
) { ) {
title title
@ -24,6 +26,7 @@ export default () => {
content content
contentExcerpt contentExcerpt
language language
imageBlurred
} }
} }
`, `,
@ -36,6 +39,7 @@ export default () => {
$imageUpload: Upload $imageUpload: Upload
$categoryIds: [ID] $categoryIds: [ID]
$image: String $image: String
$imageBlurred: Boolean
$imageAspectRatio: Float $imageAspectRatio: Float
) { ) {
UpdatePost( UpdatePost(
@ -46,6 +50,7 @@ export default () => {
imageUpload: $imageUpload imageUpload: $imageUpload
categoryIds: $categoryIds categoryIds: $categoryIds
image: $image image: $image
imageBlurred: $imageBlurred
imageAspectRatio: $imageAspectRatio imageAspectRatio: $imageAspectRatio
) { ) {
id id
@ -54,6 +59,7 @@ export default () => {
content content
contentExcerpt contentExcerpt
language language
imageBlurred
pinnedBy { pinnedBy {
id id
name name

6
webapp/locales/de.json
View File

@ -452,6 +452,7 @@
"filterALL": "Alle Beiträge anzeigen", "filterALL": "Alle Beiträge anzeigen",
"success": "Gespeichert!", "success": "Gespeichert!",
"languageSelectLabel": "Sprache", "languageSelectLabel": "Sprache",
"languageSelectText": "Sprache wählen",
"categories": { "categories": {
"infoSelectedNoOfMaxCategories": "{chosen} von {max} Kategorien ausgewählt" "infoSelectedNoOfMaxCategories": "{chosen} von {max} Kategorien ausgewählt"
}, },
@ -484,8 +485,9 @@
}, },
"teaserImage": { "teaserImage": {
"cropperConfirm": "Bestätigen" "cropperConfirm": "Bestätigen"
}, },
"languageSelectText": "Sprache wählen" "inappropriatePicture" : "Dieses Bild kann für einige Menschen unangemessen sein.",
"inappropriatePictureText" : "Wann soll ein Foto versteckt werden"
}, },
"comment": { "comment": {
"edit": "Kommentar bearbeiten", "edit": "Kommentar bearbeiten",

5
webapp/locales/en.json
View File

@ -702,7 +702,9 @@
}, },
"teaserImage": { "teaserImage": {
"cropperConfirm": "Confirm" "cropperConfirm": "Confirm"
} },
"inappropriatePicture" : "This image may be inappropriate for some people.",
"inappropriatePictureText" : "When should my picture be blurred"
}, },
"code-of-conduct": { "code-of-conduct": {
"subheader": "for the social network of the Human Connection gGmbH", "subheader": "for the social network of the Human Connection gGmbH",
@ -802,4 +804,3 @@

1616
webapp/locales/ru.json
View File

File diff suppressed because it is too large Load Diff

2
webapp/package.json
View File

@ -139,7 +139,7 @@
"storybook-design-token": "^0.4.1", "storybook-design-token": "^0.4.1",
"storybook-vue-router": "^1.0.7", "storybook-vue-router": "^1.0.7",
"style-loader": "~0.23.1", "style-loader": "~0.23.1",
"style-resources-loader": "~1.3.2", "style-resources-loader": "~1.3.3",
"vue-jest": "~3.0.5", "vue-jest": "~3.0.5",
"vue-loader": "~15.8.3", "vue-loader": "~15.8.3",
"vue-svg-loader": "~0.15.0", "vue-svg-loader": "~0.15.0",

86
webapp/pages/post/_id/_slug/index.vue
View File

@ -4,9 +4,16 @@
:lang="post.language" :lang="post.language"
v-if="post && ready" v-if="post && ready"
:image="post.image | proxyApiUrl" :image="post.image | proxyApiUrl"
:class="{ 'post-card': true, 'disabled-content': post.disabled }" :class="{
'post-page': true,
'disabled-content': post.disabled,
'--blur-image': blurred,
}"
> >
<ds-space margin-bottom="small" /> <aside v-show="post.imageBlurred" class="blur-toggle">
<img v-show="blurred" :src="post.image | proxyApiUrl" class="preview" />
<ds-button :icon="blurred ? 'eye' : 'eye-slash'" primary @click="blurred = !blurred" />
</aside>
<hc-user :user="post.author" :date-time="post.createdAt"> <hc-user :user="post.author" :date-time="post.createdAt">
<template v-slot:dateTime> <template v-slot:dateTime>
<ds-text v-if="post.createdAt !== post.updatedAt">({{ $t('post.edited') }})</ds-text> <ds-text v-if="post.createdAt !== post.updatedAt">({{ $t('post.edited') }})</ds-text>
@ -125,12 +132,14 @@ export default {
ready: false, ready: false,
title: 'loading', title: 'loading',
showNewCommentForm: true, showNewCommentForm: true,
blurred: false,
} }
}, },
watch: { watch: {
Post(post) { Post(post) {
this.post = post[0] || {} this.post = post[0] || {}
this.title = this.post.title this.title = this.post.title
this.blurred = this.post.imageBlurred
}, },
}, },
mounted() { mounted() {
@ -206,49 +215,70 @@ export default {
}, },
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.page-name-post-id-slug { .post-page {
&.--blur-image > .ds-card-image img {
filter: blur(22px);
}
.ds-card-content {
position: relative;
padding-top: 24px;
}
.blur-toggle {
position: absolute;
top: -80px;
right: 0;
display: flex;
align-items: center;
height: 80px;
padding: 12px;
.preview {
height: 100%;
margin-right: 12px;
}
}
.content-menu { .content-menu {
float: right; float: right;
margin-right: -$space-x-small; margin-right: -$space-x-small;
margin-top: -$space-large; margin-top: -$space-large;
} }
.post-card { .comments {
margin: auto; margin-top: $space-small;
cursor: auto;
.comments { .comment {
margin-top: $space-small; margin-top: $space-small;
position: relative;
.comment {
margin-top: $space-small;
position: relative;
}
.ProseMirror {
min-height: 0px;
}
} }
.ds-card-image { .ProseMirror {
img { min-height: 0px;
max-height: 2000px;
object-fit: contain;
object-position: center;
}
} }
}
.ds-card-footer { .ds-card-image {
padding: 0; img {
max-height: 2000px;
object-fit: contain;
object-position: center;
}
}
.ds-section { .ds-card-footer {
padding: $space-base; padding: 0;
}
.ds-section {
padding: $space-base;
} }
} }
} }
@media only screen and (max-width: 960px) { @media only screen and (max-width: 960px) {
.shout-button { .shout-button {
float: left; float: left;

12
webapp/yarn.lock
View File

@ -14172,7 +14172,7 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0" ajv-errors "^1.0.0"
ajv-keywords "^3.1.0" ajv-keywords "^3.1.0"
schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.1.0, schema-utils@^2.4.1, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1: schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.1.0, schema-utils@^2.4.1, schema-utils@^2.6.0, schema-utils@^2.6.1:
version "2.6.1" version "2.6.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f"
integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg== integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==
@ -15197,15 +15197,15 @@ style-loader@^0.23.1, style-loader@~0.23.1:
loader-utils "^1.1.0" loader-utils "^1.1.0"
schema-utils "^1.0.0" schema-utils "^1.0.0"
style-resources-loader@^1.2.1, style-resources-loader@~1.3.2: style-resources-loader@^1.2.1, style-resources-loader@~1.3.3:
version "1.3.2" version "1.3.3"
resolved "https://registry.yarnpkg.com/style-resources-loader/-/style-resources-loader-1.3.2.tgz#dee034e33e84060ded0b1980f866453e98589873" resolved "https://registry.yarnpkg.com/style-resources-loader/-/style-resources-loader-1.3.3.tgz#e4b3ab93e7c3d1606e86f9549522a0b5c4ad6812"
integrity sha512-UIwyrl/OZGO+ptyeNyeDnNE+2RqD0AKqjAuxBxhce0YlHMx2DbZ48g0Mx9buKuiNSgBUXYQtbwilKcYeJlVsog== integrity sha512-vDD2HyG6On8H9gWUN9O9q1eXR/JnXpCkNvpusvgFsRQ9JZGF9drzvwKEigR9vqlmUbXO2t/vIIabpYMmis0eAQ==
dependencies: dependencies:
glob "^7.1.6" glob "^7.1.6"
is-promise "^2.1.0" is-promise "^2.1.0"
loader-utils "^1.2.3" loader-utils "^1.2.3"
schema-utils "^2.5.0" schema-utils "^2.6.1"
stylehacks@^4.0.0: stylehacks@^4.0.0:
version "4.0.3" version "4.0.3"

93
yarn.lock
View File

@ -29,15 +29,15 @@
semver "^5.4.1" semver "^5.4.1"
source-map "^0.5.0" source-map "^0.5.0"
"@babel/core@^7.7.5": "@babel/core@^7.7.7":
version "7.7.5" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.7.tgz#ee155d2e12300bcc0cff6a8ad46f2af5063803e9"
integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw== integrity sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==
dependencies: dependencies:
"@babel/code-frame" "^7.5.5" "@babel/code-frame" "^7.5.5"
"@babel/generator" "^7.7.4" "@babel/generator" "^7.7.7"
"@babel/helpers" "^7.7.4" "@babel/helpers" "^7.7.4"
"@babel/parser" "^7.7.5" "@babel/parser" "^7.7.7"
"@babel/template" "^7.7.4" "@babel/template" "^7.7.4"
"@babel/traverse" "^7.7.4" "@babel/traverse" "^7.7.4"
"@babel/types" "^7.7.4" "@babel/types" "^7.7.4"
@ -49,10 +49,10 @@
semver "^5.4.1" semver "^5.4.1"
source-map "^0.5.0" source-map "^0.5.0"
"@babel/generator@^7.4.4", "@babel/generator@^7.7.4": "@babel/generator@^7.4.4", "@babel/generator@^7.7.4", "@babel/generator@^7.7.7":
version "7.7.4" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.7.tgz#859ac733c44c74148e1a72980a64ec84b85f4f45"
integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg== integrity sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==
dependencies: dependencies:
"@babel/types" "^7.7.4" "@babel/types" "^7.7.4"
jsesc "^2.5.1" jsesc "^2.5.1"
@ -326,10 +326,10 @@
esutils "^2.0.2" esutils "^2.0.2"
js-tokens "^4.0.0" js-tokens "^4.0.0"
"@babel/parser@^7.4.5", "@babel/parser@^7.7.4", "@babel/parser@^7.7.5": "@babel/parser@^7.4.5", "@babel/parser@^7.7.4", "@babel/parser@^7.7.7":
version "7.7.5" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.7.tgz#1b886595419cf92d811316d5b715a53ff38b4937"
integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig== integrity sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==
"@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.7.4": "@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.7.4":
version "7.7.4" version "7.7.4"
@ -372,10 +372,10 @@
"@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-object-rest-spread" "^7.2.0" "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
"@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.7.4": "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.7.7":
version "7.7.4" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz#9f27075004ab99be08c5c1bd653a2985813cb370"
integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ== integrity sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ==
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-object-rest-spread" "^7.7.4" "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
@ -388,10 +388,10 @@
"@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-optional-catch-binding" "^7.7.4" "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.7.4": "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.7.7":
version "7.7.4" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz#433fa9dac64f953c12578b29633f456b68831c4e"
integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA== integrity sha512-80PbkKyORBUVm1fbTLrHpYdJxMThzM1UqFGh0ALEhO9TYbG86Ah9zQYAB/84axz2vcxefDLdZwWwZNlYARlu9w==
dependencies: dependencies:
"@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-create-regexp-features-plugin" "^7.7.4"
"@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0"
@ -504,10 +504,10 @@
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.7.4": "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.7.7":
version "7.7.4" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.7.tgz#3e9713f1b69f339e87fa796b097d73ded16b937b"
integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw== integrity sha512-b4in+YlTeE/QmTgrllnb3bHA0HntYvjz8O3Mcbx75UBPJA2xhb5A8nle498VhxSXJHQefjtQxpnLPehDJ4TRlg==
dependencies: dependencies:
"@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-create-regexp-features-plugin" "^7.7.4"
"@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0"
@ -614,10 +614,10 @@
"@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-replace-supers" "^7.7.4" "@babel/helper-replace-supers" "^7.7.4"
"@babel/plugin-transform-parameters@^7.4.4", "@babel/plugin-transform-parameters@^7.7.4": "@babel/plugin-transform-parameters@^7.4.4", "@babel/plugin-transform-parameters@^7.7.7":
version "7.7.4" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz#7a884b2460164dc5f194f668332736584c760007"
integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw== integrity sha512-OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew==
dependencies: dependencies:
"@babel/helper-call-delegate" "^7.7.4" "@babel/helper-call-delegate" "^7.7.4"
"@babel/helper-get-function-arity" "^7.7.4" "@babel/helper-get-function-arity" "^7.7.4"
@ -785,19 +785,19 @@
js-levenshtein "^1.1.3" js-levenshtein "^1.1.3"
semver "^5.5.0" semver "^5.5.0"
"@babel/preset-env@^7.7.6": "@babel/preset-env@^7.7.7":
version "7.7.6" version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.7.tgz#c294167b91e53e7e36d820e943ece8d0c7fe46ac"
integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ== integrity sha512-pCu0hrSSDVI7kCVUOdcMNQEbOPJ52E+LrQ14sN8uL2ALfSqePZQlKrOy+tM4uhEdYlCHi4imr8Zz2cZe9oSdIg==
dependencies: dependencies:
"@babel/helper-module-imports" "^7.7.4" "@babel/helper-module-imports" "^7.7.4"
"@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-proposal-async-generator-functions" "^7.7.4" "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
"@babel/plugin-proposal-dynamic-import" "^7.7.4" "@babel/plugin-proposal-dynamic-import" "^7.7.4"
"@babel/plugin-proposal-json-strings" "^7.7.4" "@babel/plugin-proposal-json-strings" "^7.7.4"
"@babel/plugin-proposal-object-rest-spread" "^7.7.4" "@babel/plugin-proposal-object-rest-spread" "^7.7.7"
"@babel/plugin-proposal-optional-catch-binding" "^7.7.4" "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
"@babel/plugin-proposal-unicode-property-regex" "^7.7.4" "@babel/plugin-proposal-unicode-property-regex" "^7.7.7"
"@babel/plugin-syntax-async-generators" "^7.7.4" "@babel/plugin-syntax-async-generators" "^7.7.4"
"@babel/plugin-syntax-dynamic-import" "^7.7.4" "@babel/plugin-syntax-dynamic-import" "^7.7.4"
"@babel/plugin-syntax-json-strings" "^7.7.4" "@babel/plugin-syntax-json-strings" "^7.7.4"
@ -811,7 +811,7 @@
"@babel/plugin-transform-classes" "^7.7.4" "@babel/plugin-transform-classes" "^7.7.4"
"@babel/plugin-transform-computed-properties" "^7.7.4" "@babel/plugin-transform-computed-properties" "^7.7.4"
"@babel/plugin-transform-destructuring" "^7.7.4" "@babel/plugin-transform-destructuring" "^7.7.4"
"@babel/plugin-transform-dotall-regex" "^7.7.4" "@babel/plugin-transform-dotall-regex" "^7.7.7"
"@babel/plugin-transform-duplicate-keys" "^7.7.4" "@babel/plugin-transform-duplicate-keys" "^7.7.4"
"@babel/plugin-transform-exponentiation-operator" "^7.7.4" "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
"@babel/plugin-transform-for-of" "^7.7.4" "@babel/plugin-transform-for-of" "^7.7.4"
@ -825,7 +825,7 @@
"@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4" "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
"@babel/plugin-transform-new-target" "^7.7.4" "@babel/plugin-transform-new-target" "^7.7.4"
"@babel/plugin-transform-object-super" "^7.7.4" "@babel/plugin-transform-object-super" "^7.7.4"
"@babel/plugin-transform-parameters" "^7.7.4" "@babel/plugin-transform-parameters" "^7.7.7"
"@babel/plugin-transform-property-literals" "^7.7.4" "@babel/plugin-transform-property-literals" "^7.7.4"
"@babel/plugin-transform-regenerator" "^7.7.5" "@babel/plugin-transform-regenerator" "^7.7.5"
"@babel/plugin-transform-reserved-words" "^7.7.4" "@babel/plugin-transform-reserved-words" "^7.7.4"
@ -837,7 +837,7 @@
"@babel/plugin-transform-unicode-regex" "^7.7.4" "@babel/plugin-transform-unicode-regex" "^7.7.4"
"@babel/types" "^7.7.4" "@babel/types" "^7.7.4"
browserslist "^4.6.0" browserslist "^4.6.0"
core-js-compat "^3.4.7" core-js-compat "^3.6.0"
invariant "^2.2.2" invariant "^2.2.2"
js-levenshtein "^1.1.3" js-levenshtein "^1.1.3"
semver "^5.5.0" semver "^5.5.0"
@ -1988,13 +1988,13 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
core-js-compat@^3.1.1, core-js-compat@^3.4.7: core-js-compat@^3.1.1, core-js-compat@^3.6.0:
version "3.4.8" version "3.6.0"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.8.tgz#f72e6a4ed76437ea710928f44615f926a81607d5" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.0.tgz#4eb6cb69d03d99159ed7c860cd5fcf7d23a62ea9"
integrity sha512-l3WTmnXHV2Sfu5VuD7EHE2w7y+K68+kULKt5RJg8ZJk3YhHF1qLD4O8v8AmNq+8vbOwnPFFDvds25/AoEvMqlQ== integrity sha512-Z3eCNjGgoYluH89Jt4wVkfYsc/VdLrA2/woX5lm0isO/pCT+P+Y+o65bOuEnjDJLthdwTBxbCVzptTXtc18fJg==
dependencies: dependencies:
browserslist "^4.8.2" browserslist "^4.8.2"
semver "^6.3.0" semver "7.0.0"
core-js@^2.4.0: core-js@^2.4.0:
version "2.6.5" version "2.6.5"
@ -4809,6 +4809,11 @@ seed-random@~2.2.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
semver@7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
semver@^6.3.0: semver@^6.3.0:
version "6.3.0" version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"