diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..18b01a1d9
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,46 @@
+name: CI
+
+on: [push]
+
+jobs:
+ build:
+ name: Continuous Integration
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ - name: Check translation files
+ run: |
+ scripts/translations/sort.sh
+ scripts/translations/missing-keys.sh
+
+ - name: Build neo4j image
+ uses: docker/build-push-action@v1.1.0
+ with:
+ repository: ocelotsocialnetwork/neo4j
+ tags: latest
+ path: neo4j/
+ push: false
+ - name: Build backend base image
+ uses: docker/build-push-action@v1.1.0
+ with:
+ repository: ocelotsocialnetwork/backend
+ tags: build-and-test
+ target: build-and-test
+ path: backend/
+ push: false
+ - name: Build webapp base image
+ uses: docker/build-push-action@v1.1.0
+ with:
+ repository: ocelotsocialnetwork/webapp
+ tags: build-and-test
+ target: build-and-test
+ path: webapp/
+ push: false
+
+ - name: Lint backend
+ run: docker run --rm ocelotsocialnetwork/backend:build-and-test yarn run lint
+ - name: Lint webapp
+ run: docker run --rm ocelotsocialnetwork/webapp:build-and-test yarn run lint
+
diff --git a/backend/.env.template b/backend/.env.template
index 8531e6cd7..fc9766478 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -10,7 +10,7 @@ SMTP_USERNAME=
SMTP_PASSWORD=
JWT_SECRET="b/&&7b78BF&fv/Vd"
-MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ"
+MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
PRIVATE_KEY_PASSPHRASE="a7dsf78sadg87ad87sfagsadg78"
@@ -23,3 +23,6 @@ AWS_SECRET_ACCESS_KEY=
AWS_ENDPOINT=
AWS_REGION=
AWS_BUCKET=
+
+EMAIL_DEFAULT_SENDER="devops@ocelot.social"
+EMAIL_SUPPORT="devops@ocelot.social"
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 9c32e83d5..6d3def015 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,5 +1,5 @@
FROM node:12.19.0-alpine3.10 as base
-LABEL Description="Backend 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="Backend of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)"
EXPOSE 4000
CMD ["yarn", "run", "start"]
diff --git a/backend/graphql-playground.png b/backend/graphql-playground.png
deleted file mode 100644
index 32396a577..000000000
Binary files a/backend/graphql-playground.png and /dev/null differ
diff --git a/backend/humanconnection.png b/backend/humanconnection.png
deleted file mode 100644
index f0576413f..000000000
Binary files a/backend/humanconnection.png and /dev/null differ
diff --git a/backend/package.json b/backend/package.json
index 164e8c9b1..37007575e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,7 +1,7 @@
{
- "name": "human-connection-backend",
+ "name": "ocelot-social-backend",
"version": "0.6.3",
- "description": "GraphQL Backend for Human Connection",
+ "description": "GraphQL Backend for ocelot.social",
"main": "src/index.js",
"scripts": {
"__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations",
@@ -18,7 +18,6 @@
"db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js",
"db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js --date-format 'yyyymmddHHmmss' create"
},
- "author": "Human Connection gGmbH",
"license": "MIT",
"jest": {
"verbose": true,
@@ -43,8 +42,8 @@
"apollo-client": "~2.6.8",
"apollo-link-context": "~1.0.20",
"apollo-link-http": "~1.5.17",
- "apollo-server": "~2.11.0",
- "apollo-server-express": "^2.12.0",
+ "apollo-server": "~2.14.2",
+ "apollo-server-express": "^2.14.2",
"aws-sdk": "^2.652.0",
"babel-plugin-transform-runtime": "^6.23.0",
"bcryptjs": "~2.4.3",
@@ -71,29 +70,29 @@
"lodash": "~4.17.14",
"merge-graphql-schemas": "^1.7.7",
"metascraper": "^5.11.8",
- "metascraper-audio": "^5.11.8",
- "metascraper-author": "^5.11.8",
+ "metascraper-audio": "^5.14.26",
+ "metascraper-author": "^5.14.22",
"metascraper-clearbit-logo": "^5.3.0",
"metascraper-date": "^5.11.8",
"metascraper-description": "^5.11.6",
"metascraper-image": "^5.11.8",
"metascraper-lang": "^5.11.8",
"metascraper-lang-detector": "^4.10.2",
- "metascraper-logo": "^5.11.6",
+ "metascraper-logo": "^5.14.26",
"metascraper-publisher": "^5.11.8",
"metascraper-soundcloud": "^5.11.8",
"metascraper-title": "^5.11.8",
- "metascraper-url": "^5.11.8",
+ "metascraper-url": "^5.14.26",
"metascraper-video": "^5.11.8",
"metascraper-youtube": "^5.11.8",
- "migrate": "^1.6.2",
+ "migrate": "^1.7.0",
"mime-types": "^2.1.26",
"minimatch": "^3.0.4",
"mustache": "^4.0.1",
"neo4j-driver": "^4.0.2",
"neo4j-graphql-js": "^2.11.5",
"neode": "^0.3.7",
- "node-fetch": "~2.6.0",
+ "node-fetch": "~2.6.1",
"nodemailer": "^6.4.4",
"nodemailer-html-to-text": "^3.1.0",
"npm-run-all": "~4.1.5",
@@ -131,7 +130,7 @@
"eslint-plugin-standard": "~4.0.1",
"jest": "~25.3.0",
"nodemon": "~2.0.2",
- "prettier": "~2.0.4",
+ "prettier": "~2.2.0",
"rosie": "^2.0.1",
"supertest": "~4.0.2"
},
diff --git a/backend/snapshots/embeds/pr3934.html b/backend/snapshots/embeds/pr3934.html
new file mode 100644
index 000000000..03d7c3ee5
--- /dev/null
+++ b/backend/snapshots/embeds/pr3934.html
@@ -0,0 +1,5504 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ feat: [WIP] 🍰 Rebranding And White-Labeling by Mogge · Pull Request #3934 · Ocelot-Social-Community/Ocelot-Social
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ message }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fork
+
+
+
+
+
+
+
+
+ If this dialog fails to load, you can visit the fork page directly.
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Conversation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
..plus get rid of obsolete prefix `nitro-`.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Verified
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
…_on_production
+
+feat: Avoid new builds on base docker-compose.yml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Version was out of date anyways
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
* removed obsolete images
+* moved all overwritable images to a location webapp/static/img/custom/
+* better names
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
This link is helpful but points to Human Connection, so unfortunately I
+have to remove it.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
The links specified in the locales were pointing to the English site and
+were mostly broken anyways.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
I removed it. We cannot parameterize localizations with absolute urls
+properly.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
* imprint
+* data privacy
+* terms of service
+* code of conduct
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Tirokk
+
+
+
+
+
+changed the title
+
feat: Rebranding and White-Labeling
+
+
feat: [WIP] 🍰 Rebranding And White-Labeling
+
+
+
4 days ago
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Merge state
+
+
Add more commits by pushing to the white-labeling branch on Ocelot-Social-Community/Ocelot-Social .
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Review required
+
+
+
+ At least 1 approving review is required by reviewers with write access.
+ Learn more.
+
+
+
+
+
+
+
+
+
+
+
+ Hide all checks
+ Show all checks
+
+
+
All checks have passed
+ 2 successful checks
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CI / Continuous Integration (push)
+
+
+ Successful in 8m
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Travis CI - Branch
+
+
+ Successful in 20m
+
+ —
+ Build Passed
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Resolve conflicts
+
+
+
+
This branch has conflicts that must be resolved
+
+ Use the web editor or the command line to resolve conflicts.
+
+
+
+
Conflicting files
+
+ neo4j/Dockerfile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ or view
+
+ command line instructions
+ .
+
+
+
+
+
+ Checkout via command line
+
+ If you cannot merge a pull request automatically here, you have the option
+ of checking it out via command line to resolve conflicts and perform a
+ manual merge.
+
+
+
+
+ Step 1: From your project repository, bring in the changes and test.
+
+
+
git fetch origin
+git checkout -b white-labeling origin/white-labeling
+git merge master
+
+
+ Step 2: Merge the changes and update on GitHub.
+
+
+
git checkout master
+git merge --no-ff white-labeling
+git push origin master
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Try again
+
+
Couldn’t update branch
+
Oops, something went wrong.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Add this suggestion to a batch that can be applied as a single commit.
+
This suggestion is invalid because no changes were made to the code.
+
Suggestions cannot be applied while the pull request is closed.
+
Suggestions cannot be applied while viewing a subset of changes.
+
Only one suggestion per line can be applied in a batch.
+
Add this suggestion to a batch that can be applied as a single commit.
+
Applying suggestions on deleted lines is not supported.
+
You must change the existing code in this line in order to create a valid suggestion.
+
+
This suggestion has been applied or marked resolved.
+
Suggestions cannot be applied from pending reviews.
+
Suggestions cannot be applied on multi-line comments.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ You can’t perform that action at this time.
+
+
+
+
+
+
You signed in with another tab or window. Reload to refresh your session.
+
You signed out in another tab or window. Reload to refresh your session.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ We use optional third-party analytics cookies to understand how you use GitHub.com so we can build better products.
+
+ Learn more .
+
+
+ Accept
+ Reject
+
+
+
+
+
+
+
+
+ We use optional third-party analytics cookies to understand how you use GitHub.com so we can build better products.
+
+
+ You can always update your selection by clicking Cookie Preferences at the bottom of the page.
+ For more information, see our Privacy Statement .
+
+
+
+
+
+
Essential cookies
+
We use essential cookies to perform essential website functions, e.g. they're used to log you in.
+ Learn more
+
+
+
+
Always active
+
+
+
+
+
+
Analytics cookies
+
We use analytics cookies to
+understand how you use our websites so we can make them better, e.g.
+they're used to gather information about the pages you visit and how
+many clicks you need to accomplish a task.
+ Learn more
+
+
+
+
+
+
+ Save preferences
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/snapshots/embeds/pr960.html b/backend/snapshots/embeds/pr960.html
deleted file mode 100644
index 9b564f09a..000000000
--- a/backend/snapshots/embeds/pr960.html
+++ /dev/null
@@ -1,10042 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Editor embeds merge in nitro embed by mattwr18 · Pull Request #960 · Human-Connection/Human-Connection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Conversation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Verified
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Closed
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Merge state
-
-
Add more commits by pushing to the 256-editor-embeds-merge-in-nitro-embed branch on Human-Connection/Human-Connection .
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hide all checks
- Show all checks
-
-
-
All checks have passed
- 4 successful checks
-
-
-
-
-
-
-
-
-
-
-
-
-
- Travis CI - Branch
-
-
- Successful in 18m
-
- —
- Build Passed
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Travis CI - Pull Request
-
-
- Successful in 17m
-
- —
- Build Passed
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- codecov/project/backend
-
-
-
-
- —
- 25.29% (+1.97%) compared to d901432
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- codecov/project/webapp
-
-
-
-
- —
- 45.23% remains the same compared to d901432
-
-
-
-
-
-
-
-
-
-
-
-
-
Merging is blocked
-
Merging can be performed automatically with 1 approving review.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- or view command line instructions .
-
-
-
-
-
Merging via command line
-
- If you do not want to use the merge button or an automatic merge cannot be
- performed, you can perform a manual merge on the command line.
-
-
-
-
-
Step 1: From your project repository, bring in the changes and test.
-
-
-
git fetch origin
-git checkout -b 256-editor-embeds-merge-in-nitro-embed origin/256-editor-embeds-merge-in-nitro-embed
-git merge master
-
-
-
Step 2: Merge the changes and update on GitHub.
-
-
-
git checkout master
-git merge --no-ff 256-editor-embeds-merge-in-nitro-embed
-git push origin master
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Try again
-
-
Couldn’t update branch
-
Oops, something went wrong.
-
-
-
-
-
Connect this pull request with an existing issue
-
-
-
-
-
-
-
-
-
-
-
Add this suggestion to a batch that can be applied as a single commit.
-
This suggestion is invalid because no changes were made to the code.
-
Suggestions cannot be applied while the pull request is closed.
-
Suggestions cannot be applied while viewing a subset of changes.
-
Only one suggestion per line can be applied in a batch.
-
Add this suggestion to a batch that can be applied as a single commit.
-
Applying suggestions on deleted lines is not supported.
-
You must change the existing code in this line in order to create a valid suggestion.
-
-
This suggestion has been applied or marked resolved.
-
Suggestions cannot be applied from pending reviews.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- You can’t perform that action at this time.
-
-
-
-
-
-
-
-
-
-
-
-
-
You signed in with another tab or window. Reload to refresh your session.
-
You signed out in another tab or window. Reload to refresh your session.
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/backend/src/activitypub/NitroDataSource.js b/backend/src/activitypub/NitroDataSource.js
index 2df895f58..476c91439 100644
--- a/backend/src/activitypub/NitroDataSource.js
+++ b/backend/src/activitypub/NitroDataSource.js
@@ -14,7 +14,7 @@ import { InMemoryCache } from 'apollo-cache-inmemory'
import fetch from 'node-fetch'
import { ApolloClient } from 'apollo-client'
import trunc from 'trunc-html'
-const debug = require('debug')('ea:nitro-datasource')
+const debug = require('debug')('ea:datasource')
export default class NitroDataSource {
constructor(uri) {
diff --git a/backend/src/activitypub/routes/webfinger.js b/backend/src/activitypub/routes/webfinger.js
index e624d306a..6b8f3e14c 100644
--- a/backend/src/activitypub/routes/webfinger.js
+++ b/backend/src/activitypub/routes/webfinger.js
@@ -45,7 +45,7 @@ export async function handler(req, res) {
} catch (error) {
debug(error)
return res.status(500).json({
- error: 'Something went terribly wrong. Please contact support@human-connection.org',
+ error: `Something went terribly wrong. Please visit ${CONFIG.SUPPORT_URL}`,
})
} finally {
session.close()
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index 4c81bb181..9ebde6cee 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -1,7 +1,15 @@
import dotenv from 'dotenv'
+import links from './links.js'
+import metadata from './metadata.js'
+
if (require.resolve) {
// are we in a nodejs environment?
- dotenv.config({ path: require.resolve('../../.env') })
+ try {
+ dotenv.config({ path: require.resolve('../../.env') })
+ } catch (error) {
+ if (error.code !== 'MODULE_NOT_FOUND') throw error
+ console.log('WARN: No `.env` file found in /backend') // eslint-disable-line no-console
+ }
}
// eslint-disable-next-line no-undef
@@ -31,6 +39,7 @@ const {
REDIS_DOMAIN,
REDIS_PORT,
REDIS_PASSWORD,
+ EMAIL_DEFAULT_SENDER,
} = env
export const requiredConfigs = {
@@ -83,6 +92,13 @@ export const s3Configs = {
S3_CONFIGURED,
}
+export const customConfigs = {
+ EMAIL_DEFAULT_SENDER,
+ SUPPORT_URL: links.SUPPORT,
+ APPLICATION_NAME: metadata.APPLICATION_NAME,
+ ORGANIZATION_URL: links.ORGANIZATION,
+}
+
export default {
...requiredConfigs,
...smtpConfigs,
@@ -92,4 +108,5 @@ export default {
...sentryConfigs,
...redisConfigs,
...s3Configs,
+ ...customConfigs,
}
diff --git a/backend/src/config/links.js b/backend/src/config/links.js
new file mode 100644
index 000000000..494e449ba
--- /dev/null
+++ b/backend/src/config/links.js
@@ -0,0 +1,6 @@
+export default {
+ ORGANIZATION: 'https://ocelot.social',
+ DONATE: 'https://ocelot-social.herokuapp.com/donations',
+ FAQ: 'https://ocelot.social',
+ SUPPORT: 'https://ocelot.social',
+}
diff --git a/backend/src/config/metadata.js b/backend/src/config/metadata.js
new file mode 100644
index 000000000..68d353eea
--- /dev/null
+++ b/backend/src/config/metadata.js
@@ -0,0 +1,7 @@
+export default {
+ APPLICATION_NAME: 'ocelot.social',
+ APPLICATION_SHORT_NAME: 'ocelot',
+ APPLICATION_DESCRIPTION: 'ocelot.social Community Network',
+ ORGANIZATION_NAME: 'ocelot.social Community',
+ ORGANIZATION_JURISDICTION: 'City of Angels',
+}
diff --git a/backend/src/middleware/email/templateBuilder.js b/backend/src/middleware/email/templateBuilder.js
index b4b7b78ca..6e147d752 100644
--- a/backend/src/middleware/email/templateBuilder.js
+++ b/backend/src/middleware/email/templateBuilder.js
@@ -3,11 +3,18 @@ import CONFIG from '../../config'
import * as templates from './templates'
-const from = '"Human Connection" '
-const supportUrl = 'https://human-connection.org/en/contact'
+const from = CONFIG.EMAIL_DEFAULT_SENDER
+const welcomeImageUrl = new URL(`/img/custom/welcome.svg`, CONFIG.CLIENT_URI)
+
+const defaultParams = {
+ supportUrl: CONFIG.SUPPORT_URL,
+ APPLICATION_NAME: CONFIG.APPLICATION_NAME,
+ ORGANIZATION_URL: CONFIG.ORGANIZATION_URL,
+ welcomeImageUrl,
+}
export const signupTemplate = ({ email, nonce }) => {
- const subject = 'Willkommen, Bienvenue, Welcome to Human Connection!'
+ const subject = `Willkommen, Bienvenue, Welcome to ${CONFIG.APPLICATION_NAME}!`
const actionUrl = new URL('/registration/create-user-account', CONFIG.CLIENT_URI)
actionUrl.searchParams.set('nonce', nonce)
actionUrl.searchParams.set('email', email)
@@ -18,7 +25,7 @@ export const signupTemplate = ({ email, nonce }) => {
subject,
html: mustache.render(
templates.layout,
- { actionUrl, nonce, supportUrl, subject },
+ { ...defaultParams, actionUrl, nonce, subject },
{ content: templates.signup },
),
}
@@ -36,7 +43,7 @@ export const emailVerificationTemplate = ({ email, nonce, name }) => {
subject,
html: mustache.render(
templates.layout,
- { actionUrl, name, nonce, supportUrl, subject },
+ { ...defaultParams, actionUrl, name, nonce, subject },
{ content: templates.emailVerification },
),
}
@@ -54,7 +61,7 @@ export const resetPasswordTemplate = ({ email, nonce, name }) => {
subject,
html: mustache.render(
templates.layout,
- { actionUrl, name, nonce, supportUrl, subject },
+ { ...defaultParams, actionUrl, name, nonce, subject },
{ content: templates.passwordReset },
),
}
@@ -70,7 +77,7 @@ export const wrongAccountTemplate = ({ email }) => {
subject,
html: mustache.render(
templates.layout,
- { actionUrl, supportUrl },
+ { actionUrl, supportUrl: CONFIG.SUPPORT_URL, welcomeImageUrl },
{ content: templates.wrongAccount },
),
}
diff --git a/backend/src/middleware/email/templates/emailVerification.html b/backend/src/middleware/email/templates/emailVerification.html
index 939ceccdb..3fc421dc5 100644
--- a/backend/src/middleware/email/templates/emailVerification.html
+++ b/backend/src/middleware/email/templates/emailVerification.html
@@ -6,8 +6,8 @@
@@ -74,9 +74,9 @@
Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in
Dein Browserfenster kopieren: {{{ nonce }}}
- Bis bald bei Human Connection !
- – Dein Human Connection Team
+ Bis bald bei {{{APPLICATION_NAME}}} !
+ – Dein {{APPLICATION_NAME}} Team
@@ -104,8 +104,8 @@
@@ -172,9 +172,9 @@
If the above button doesn't work you can also copy the following code into your
browser window: {{{ nonce }}}
- See you soon on Human Connection !
- – The Human Connection Team
+ See you soon on {{{APPLICATION_NAME}}} !
+ – The {{APPLICATION_NAME}} Team
diff --git a/backend/src/middleware/email/templates/layout.html b/backend/src/middleware/email/templates/layout.html
index 7e1c39ace..da2053a93 100644
--- a/backend/src/middleware/email/templates/layout.html
+++ b/backend/src/middleware/email/templates/layout.html
@@ -170,8 +170,8 @@
- Human Connection gGmbHBahnhofstraße 11, 73235 Weilheim /
- Teck Germany
+ {{ORGANIZATION_NAME}}
+ {{ORGANIZATION_URL}}
diff --git a/backend/src/middleware/email/templates/resetPassword.html b/backend/src/middleware/email/templates/resetPassword.html
index 768051070..1f8c74ded 100644
--- a/backend/src/middleware/email/templates/resetPassword.html
+++ b/backend/src/middleware/email/templates/resetPassword.html
@@ -6,8 +6,8 @@
@@ -74,9 +74,9 @@
Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in
Dein Browserfenster kopieren: {{{ nonce }}}
- Bis bald bei Human Connection !
- – Dein Human Connection Team
+ Bis bald bei {{APPLICATION_NAME}} !
+ – Dein {{APPLICATION_NAME}} Team
@@ -104,8 +104,8 @@
@@ -171,9 +171,9 @@
If the above button doesn't work you can also copy the following code into your
browser window: {{{ nonce }}}
- See you soon on Human Connection !
- – The Human Connection Team
+ See you soon on {{APPLICATION_NAME}} !
+ – The {{APPLICATION_NAME}} Team
diff --git a/backend/src/middleware/email/templates/signup.html b/backend/src/middleware/email/templates/signup.html
index ad60d9323..f4155a91e 100644
--- a/backend/src/middleware/email/templates/signup.html
+++ b/backend/src/middleware/email/templates/signup.html
@@ -6,8 +6,8 @@
@@ -23,7 +23,7 @@
style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
- Willkommen bei Human Connection!
+ Willkommen bei {{APPLICATION_NAME}}!
Danke, dass Du dich angemeldet hast – wir freuen uns, Dich dabei zu haben. Jetzt
fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können ... Bitte bestätige
Deine E-Mail Adresse:
@@ -62,8 +62,8 @@
Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: {{{ nonce }}}
Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert hast.
- Falls Du Dich nicht selbst bei Human Connection angemeldet hast, schau doch mal vorbei!
+
Falls Du Dich nicht selbst bei {{APPLICATION_NAME}} angemeldet hast, schau doch mal vorbei!
Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen.
PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese
E-Mail einfach ignorieren. ;)
@@ -87,9 +87,9 @@
Melde Dich gerne bei
unserem Support Team , wenn Du Fragen hast.
- Bis bald bei Human Connection !
- – Dein Human Connection Team
+ Bis bald bei {{APPLICATION_NAME}} !
+ – Dein {{APPLICATION_NAME}} Team
@@ -117,8 +117,8 @@
@@ -134,7 +134,7 @@
style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
- Welcome to Human Connection!
+ Welcome to {{APPLICATION_NAME}}!
Thank you for joining our cause – it's awesome to have you on board. There's
just one tiny step missing before we can start shaping the world together ... Please confirm your
e-mail address by clicking the button below:
@@ -173,8 +173,8 @@
If the above button doesn't work, you can also copy the following code into your browser window: {{{ nonce }}}
However, this only works if you have registered through our website.
- If you didn't sign up for Human Connection we recommend you to check it out!
+
If you didn't sign up for {{APPLICATION_NAME}} we recommend you to check it out!
It's a social network from people for people who want to connect and change the world together.
PS: If you ignore this e-mail we will not create an account
for
@@ -200,9 +200,9 @@
Feel free to contact our
support team with any
questions you have.
- See you soon on Human Connection !
- – The Human Connection Team
+ See you soon on {{APPLICATION_NAME}} !
+ – The {{APPLICATION_NAME}} Team
diff --git a/backend/src/middleware/email/templates/wrongAccount.html b/backend/src/middleware/email/templates/wrongAccount.html
index cbf6e3cbb..cab4c91a6 100644
--- a/backend/src/middleware/email/templates/wrongAccount.html
+++ b/backend/src/middleware/email/templates/wrongAccount.html
@@ -6,8 +6,8 @@
@@ -55,8 +55,8 @@
- Wenn Du noch keinen Account bei Human Connection hast oder Dein Password gar nicht ändern willst,
+
Wenn Du noch keinen Account bei {{APPLICATION_NAME}} hast oder Dein Password gar nicht ändern willst,
kannst Du diese E-Mail einfach ignorieren!
@@ -74,9 +74,9 @@
style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
Ansonsten hilft Dir unser
Support Team gerne weiter.
- Bis bald bei Human Connection !
- – Dein Human Connection Team
+ Bis bald bei {{APPLICATION_NAME}} !
+ – Dein {{APPLICATION_NAME}} Team
@@ -104,8 +104,8 @@
@@ -152,8 +152,8 @@
- If you don't have an account at Human Connection yet or if you didn't want to reset your password,
+
If you don't have an account at {{APPLICATION_NAME}} yet or if you didn't want to reset your password,
please ignore this e-mail.
@@ -171,9 +171,9 @@
style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
Otherwise our
support team will be happy to help you out.
- See you soon on Human Connection !
- – The Human Connection Team
+ See you soon on {{APPLICATION_NAME}} !
+ – The {{APPLICATION_NAME}} Team
diff --git a/backend/src/schema/resolvers/embeds.spec.js b/backend/src/schema/resolvers/embeds.spec.js
index b8215ed72..6c034acf7 100644
--- a/backend/src/schema/resolvers/embeds.spec.js
+++ b/backend/src/schema/resolvers/embeds.spec.js
@@ -18,7 +18,10 @@ const HumanConnectionOrg = fs.readFileSync(
path.join(__dirname, '../../../snapshots/embeds/HumanConnectionOrg.html'),
'utf8',
)
-const pr960 = fs.readFileSync(path.join(__dirname, '../../../snapshots/embeds/pr960.html'), 'utf8')
+const pr3934 = fs.readFileSync(
+ path.join(__dirname, '../../../snapshots/embeds/pr3934.html'),
+ 'utf8',
+)
const babyLovesCat = fs.readFileSync(
path.join(__dirname, '../../../snapshots/embeds/babyLovesCat.html'),
'utf8',
@@ -145,7 +148,7 @@ describe('Query', () => {
describe('given a Github link', () => {
beforeEach(() => {
fetch
- .mockReturnValueOnce(Promise.resolve(new Response(pr960)))
+ .mockReturnValueOnce(Promise.resolve(new Response(pr3934)))
.mockReturnValueOnce(Promise.resolve(JSON.stringify({})))
variables = { url: 'https://github.com/Human-Connection/Human-Connection/pull/960' }
})
@@ -156,14 +159,14 @@ describe('Query', () => {
embed: {
type: 'link',
title:
- 'Editor embeds merge in nitro embed by mattwr18 · Pull Request #960 · Human-Connection/Human-Connection',
- author: 'Human-Connection',
+ 'feat: [WIP] 🍰 Rebranding And White-Labeling by Mogge · Pull Request #3934 · Ocelot-Social-Community/Ocelot-Social',
+ author: 'Ocelot-Social-Community',
publisher: 'GitHub',
date: expect.any(String),
- description: '🍰 Pullrequest Issues fixes #256',
- url: 'https://github.com/Human-Connection/Human-Connection/pull/960',
- image:
- 'https://repository-images.githubusercontent.com/112590397/52c9a000-7e11-11e9-899d-aaa55f3a3d72',
+ description: `🍰 Pullrequest
+Have all the information for the brand in separate config files. Set these defaults to ocelot.social`,
+ url: 'https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3934',
+ image: 'https://avatars3.githubusercontent.com/u/67983243?s=400&v=4',
audio: null,
video: null,
lang: 'en',
diff --git a/backend/yarn.lock b/backend/yarn.lock
index a42c5cc64..296c006d4 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1282,30 +1282,30 @@
url-regex "~4.1.1"
video-extensions "~1.1.0"
-"@metascraper/helpers@^5.11.6", "@metascraper/helpers@^5.11.8":
- version "5.11.8"
- resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.11.8.tgz#24bf4440b4c24d1e5ba116005fbeb2ad3bf5b0cd"
- integrity sha512-e0gpI2kOnlQ7nZH5amCNztN5GXNWPkA2rAkZhZ3ckpo1W5x4aw/h7FnOMjHftuNjeSWLeIplpn8VROJ9Hb3qyw==
+"@metascraper/helpers@^5.11.6", "@metascraper/helpers@^5.11.8", "@metascraper/helpers@^5.14.22", "@metascraper/helpers@^5.14.26":
+ version "5.14.26"
+ resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.14.26.tgz#e6a10bb58d0e8a79ebe6a25696eb60feacd37f73"
+ integrity sha512-puUmJQTW5b3gyymQTWNtJZq8XyM62F3A6UrbIikWrL4jNx1O87Mlc4XyWTYLPxQiWxll9wJubNdZruKtZkELqA==
dependencies:
audio-extensions "0.0.0"
- chrono-node "~1.4.4"
+ chrono-node "2.1.10"
condense-whitespace "~2.0.0"
- entities "~2.0.0"
+ entities "~2.1.0"
file-extension "~4.0.5"
has-values "~2.0.1"
image-extensions "~1.1.0"
is-relative-url "~3.0.0"
is-uri "~1.2.0"
- iso-639-3 "~2.0.0"
+ iso-639-3 "~2.2.0"
isostring "0.0.1"
- lodash "~4.17.15"
+ lodash "~4.17.20"
memoize-one "~5.1.1"
- mime-types "~2.1.26"
- normalize-url "~5.0.0"
+ microsoft-capitalize "~1.0.3"
+ mime-types "~2.1.27"
+ normalize-url "~5.3.0"
smartquotes "~2.3.1"
- title "~3.4.2"
truncate "~2.1.0"
- url-regex "~5.0.0"
+ url-regex-safe "~1.0.2"
video-extensions "~1.1.0"
"@nodelib/fs.scandir@2.1.3":
@@ -1592,13 +1592,14 @@
"@types/qs" "*"
"@types/serve-static" "*"
-"@types/express@4.17.3":
- version "4.17.3"
- resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.3.tgz#38e4458ce2067873b09a73908df488870c303bd9"
- integrity sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==
+"@types/express@4.17.4":
+ version "4.17.4"
+ resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.4.tgz#e78bf09f3f530889575f4da8a94cd45384520aac"
+ integrity sha512-DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w==
dependencies:
"@types/body-parser" "*"
"@types/express-serve-static-core" "*"
+ "@types/qs" "*"
"@types/serve-static" "*"
"@types/fs-capacitor@*":
@@ -1909,11 +1910,6 @@ ansi-regex@^5.0.0:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-ansi-styles@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
- integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -1950,13 +1946,13 @@ anymatch@^3.0.3, anymatch@~3.1.1:
normalize-path "^3.0.0"
picomatch "^2.0.4"
-apollo-cache-control@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.11.0.tgz#7075492d04c5424e7c6769380b503e8f75b39d61"
- integrity sha512-dmRnQ9AXGw2SHahVGLzB/p4UW/taFBAJxifxubp8hqY5p9qdlSu4MPRq8zvV2ULMYf50rBtZyC4C+dZLqmHuHQ==
+apollo-cache-control@^0.11.4:
+ version "0.11.4"
+ resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.11.4.tgz#06d57d728e6f928e03b9cc3b993f6102f305c32e"
+ integrity sha512-FUKE8ASr8GxVq5rmky/tY8bsf++cleGT591lfLiqnPsP1fo3kAfgRfWA2QRHTCKFNlQxzUhVOEDv+PaysqiOjw==
dependencies:
- apollo-server-env "^2.4.4"
- apollo-server-plugin-base "^0.9.0"
+ apollo-server-env "^2.4.5"
+ apollo-server-plugin-base "^0.10.2"
apollo-cache-inmemory@~1.6.5:
version "1.6.5"
@@ -1991,20 +1987,13 @@ apollo-client@~2.6.8:
tslib "^1.10.0"
zen-observable "^0.8.0"
-apollo-datasource@^0.7.1:
- version "0.7.1"
- resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.1.tgz#0b06da999ace50b7f5fe509f2a03f7de97974334"
- integrity sha512-h++/jQAY7GA+4TBM+7ezvctFmmGNLrAPf51KsagZj+NkT9qvxp585rdsuatynVbSl59toPK2EuVmc6ilmQHf+g==
+apollo-datasource@^0.7.2:
+ version "0.7.2"
+ resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.2.tgz#1662ee93453a9b89af6f73ce561bde46b41ebf31"
+ integrity sha512-ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw==
dependencies:
- apollo-server-caching "^0.5.1"
- apollo-server-env "^2.4.4"
-
-apollo-engine-reporting-protobuf@^0.4.4:
- version "0.4.4"
- resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz#73a064f8c9f2d6605192d1673729c66ec47d9cb7"
- integrity sha512-SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w==
- dependencies:
- "@apollo/protobufjs" "^1.0.3"
+ apollo-server-caching "^0.5.2"
+ apollo-server-env "^2.4.5"
apollo-engine-reporting-protobuf@^0.5.1:
version "0.5.1"
@@ -2013,21 +2002,6 @@ apollo-engine-reporting-protobuf@^0.5.1:
dependencies:
"@apollo/protobufjs" "^1.0.3"
-apollo-engine-reporting@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-2.2.0.tgz#805399ee3d3909e01b72f1c34a3db1ad3fe16747"
- integrity sha512-FmfWTpyEATO392QHcot3PNMrxNhEJ4Kq+QiYY263vN/OBLZQ5zpkFY25iB6gVuiJoz3NUkByhxq5f/XjarJVvA==
- dependencies:
- apollo-engine-reporting-protobuf "^0.5.1"
- apollo-graphql "^0.4.0"
- apollo-server-caching "^0.5.1"
- apollo-server-env "^2.4.4"
- apollo-server-errors "^2.4.1"
- apollo-server-plugin-base "^0.9.0"
- apollo-server-types "^0.5.0"
- async-retry "^1.2.1"
- uuid "^8.0.0"
-
apollo-env@^0.6.5:
version "0.6.5"
resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.6.5.tgz#5a36e699d39e2356381f7203493187260fded9f3"
@@ -2046,10 +2020,10 @@ apollo-errors@^1.9.0:
assert "^1.4.1"
extendable-error "^0.1.5"
-apollo-graphql@^0.4.0:
- version "0.4.5"
- resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.4.5.tgz#936529335010f9be9e239619b82fb9060c70521d"
- integrity sha512-0qa7UOoq7E71kBYE7idi6mNQhHLVdMEDInWk6TNw3KsSWZE2/I68gARP84Mj+paFTO5NYuw1Dht66PVX76Cc2w==
+apollo-graphql@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.6.0.tgz#37bee7dc853213269137f4c60bfdf2ee28658669"
+ integrity sha512-BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg==
dependencies:
apollo-env "^0.6.5"
lodash.sortby "^4.7.0"
@@ -2090,6 +2064,13 @@ apollo-link@^1.0.0, apollo-link@^1.2.13, apollo-link@^1.2.14:
tslib "^1.9.3"
zen-observable-ts "^0.8.21"
+apollo-reporting-protobuf@^0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.1.tgz#09294e5f5f6b2285eb94b40621ed42113eaabea3"
+ integrity sha512-qr4DheFP154PGZsd93SSIS9RkqHnR5b6vT+eCloWjy3UIpY+yZ3cVLlttlIjYvOG4xTJ25XEwcHiAExatQo/7g==
+ dependencies:
+ "@apollo/protobufjs" "^1.0.3"
+
apollo-server-caching@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.5.1.tgz#5cd0536ad5473abb667cc82b59bc56b96fb35db6"
@@ -2097,35 +2078,46 @@ apollo-server-caching@^0.5.1:
dependencies:
lru-cache "^5.0.0"
-apollo-server-core@^2.11.0, apollo-server-core@^2.12.0:
- version "2.15.0"
- resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.15.0.tgz#a9c19028b76e7ca90a759b4421556ba7625df1d9"
- integrity sha512-PwNm/G5IXReev7E0ZaRAekQ7pN9BTuXH8c2QVgfMGMno3XiN5Dj+1DXYQthpwNJch0y5zhhLcb/JbClijgSEsA==
+apollo-server-caching@^0.5.2:
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz#bef5d5e0d48473a454927a66b7bb947a0b6eb13e"
+ integrity sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==
+ dependencies:
+ lru-cache "^5.0.0"
+
+apollo-server-core@^2.11.0, apollo-server-core@^2.14.2:
+ version "2.19.0"
+ resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.19.0.tgz#ff14e788f228c2d6739478a68cf93f46a16e5bfa"
+ integrity sha512-2aMKUVPyNbomJQaG2tkpfqvp1Tfgxgkdr7nX5zHudYNSzsPrHw+CcYlCbIVFFI/mTZsjoK9czNq1qerFRxZbJw==
dependencies:
"@apollographql/apollo-tools" "^0.4.3"
"@apollographql/graphql-playground-html" "1.6.26"
"@types/graphql-upload" "^8.0.0"
"@types/ws" "^7.0.0"
- apollo-cache-control "^0.11.0"
- apollo-datasource "^0.7.1"
- apollo-engine-reporting "^2.2.0"
- apollo-server-caching "^0.5.1"
- apollo-server-env "^2.4.4"
- apollo-server-errors "^2.4.1"
- apollo-server-plugin-base "^0.9.0"
- apollo-server-types "^0.5.0"
- apollo-tracing "^0.11.0"
+ apollo-cache-control "^0.11.4"
+ apollo-datasource "^0.7.2"
+ apollo-graphql "^0.6.0"
+ apollo-reporting-protobuf "^0.6.1"
+ apollo-server-caching "^0.5.2"
+ apollo-server-env "^2.4.5"
+ apollo-server-errors "^2.4.2"
+ apollo-server-plugin-base "^0.10.2"
+ apollo-server-types "^0.6.1"
+ apollo-tracing "^0.12.0"
+ async-retry "^1.2.1"
fast-json-stable-stringify "^2.0.0"
- graphql-extensions "^0.12.3"
+ graphql-extensions "^0.12.6"
graphql-tag "^2.9.2"
graphql-tools "^4.0.0"
graphql-upload "^8.0.2"
loglevel "^1.6.7"
+ lru-cache "^5.0.0"
sha.js "^2.4.11"
subscriptions-transport-ws "^0.9.11"
+ uuid "^8.0.0"
ws "^6.0.0"
-apollo-server-env@^2.4.3, apollo-server-env@^2.4.4:
+apollo-server-env@^2.4.4:
version "2.4.4"
resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.4.tgz#12d2d0896dcb184478cba066c7a683ab18689ca1"
integrity sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==
@@ -2133,24 +2125,32 @@ apollo-server-env@^2.4.3, apollo-server-env@^2.4.4:
node-fetch "^2.1.2"
util.promisify "^1.0.0"
-apollo-server-errors@^2.4.1:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz#16ad49de6c9134bfb2b7dede9842e73bb239dbe2"
- integrity sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg==
+apollo-server-env@^2.4.5:
+ version "2.4.5"
+ resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.5.tgz#73730b4f0439094a2272a9d0caa4079d4b661d5f"
+ integrity sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==
+ dependencies:
+ node-fetch "^2.1.2"
+ util.promisify "^1.0.0"
-apollo-server-express@^2.11.0, apollo-server-express@^2.12.0:
- version "2.12.0"
- resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.12.0.tgz#a03cef8a3aa753bff73156e6a31fd59a076dc48b"
- integrity sha512-oTBKM2SsziCoFW+ta+ubJ/ypvsc+EWrbJnyZhJ5FBYzSXPstt/jvgZHgMO+kOQgHEHrbJwugNDUuLMSm608L7A==
+apollo-server-errors@^2.4.2:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.4.2.tgz#1128738a1d14da989f58420896d70524784eabe5"
+ integrity sha512-FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ==
+
+apollo-server-express@^2.14.2:
+ version "2.14.2"
+ resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.14.2.tgz#662dfeb9c794c1eca59dd93e57e74487a8195ae6"
+ integrity sha512-iYyZm0kQqkM561i9l0WC9HbJsGZJbHP9bhnWaa1Itd+yNBS2AJFp6mRR3hQacsWXUw7ewaKAracMIggvfSH5Aw==
dependencies:
"@apollographql/graphql-playground-html" "1.6.24"
"@types/accepts" "^1.3.5"
"@types/body-parser" "1.19.0"
"@types/cors" "^2.8.4"
- "@types/express" "4.17.3"
+ "@types/express" "4.17.4"
accepts "^1.3.5"
- apollo-server-core "^2.12.0"
- apollo-server-types "^0.3.1"
+ apollo-server-core "^2.14.2"
+ apollo-server-types "^0.5.0"
body-parser "^1.18.3"
cors "^2.8.4"
express "^4.17.1"
@@ -2160,12 +2160,12 @@ apollo-server-express@^2.11.0, apollo-server-express@^2.12.0:
subscriptions-transport-ws "^0.9.16"
type-is "^1.6.16"
-apollo-server-plugin-base@^0.9.0:
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.0.tgz#777f720a1ee827a66b8c159073ca30645f8bc625"
- integrity sha512-LWcPrsy2+xqwlNseh/QaGa/MPNopS8c4qGgh0g0cAn0lZBRrJ9Yab7dq+iQ6vdUBwIhUWYN6s9dwUWCZw2SL8g==
+apollo-server-plugin-base@^0.10.2:
+ version "0.10.2"
+ resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.2.tgz#185aea98ba22afe275fb01659070edeb480a89a7"
+ integrity sha512-uM5uL1lOxbXdgvt/aEIbgs40fV9xA45Y3Mmh0VtQ/ddqq0MXR5aG92nnf8rM+URarBCUfxKJKaYzJJ/CXAnEdA==
dependencies:
- apollo-server-types "^0.5.0"
+ apollo-server-types "^0.6.1"
apollo-server-testing@~2.11.0:
version "2.11.0"
@@ -2174,15 +2174,6 @@ apollo-server-testing@~2.11.0:
dependencies:
apollo-server-core "^2.11.0"
-apollo-server-types@^0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.3.1.tgz#9456e243dad525a78b689246f124a66d7d8ac409"
- integrity sha512-6nX5VC3icOGf1RZIs7/SYQZff+Cl16LQu1FHUOIk9gAMN2XjlRCyJgCeMj5YHJzQ8Mhg4BO0weWuydEg+JxLzg==
- dependencies:
- apollo-engine-reporting-protobuf "^0.4.4"
- apollo-server-caching "^0.5.1"
- apollo-server-env "^2.4.3"
-
apollo-server-types@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.5.0.tgz#51f39c5fa610ece8b07f1fbcf63c47d4ac150340"
@@ -2192,24 +2183,33 @@ apollo-server-types@^0.5.0:
apollo-server-caching "^0.5.1"
apollo-server-env "^2.4.4"
-apollo-server@~2.11.0:
- version "2.11.0"
- resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.11.0.tgz#f901f820716716e8693be8b0e234849f5819a4ae"
- integrity sha512-UhW6RHPBMWZy1v7KhzssUnxPBxpu9fGFajtqP68vtvvP3+xa2Y2GUg0594bHcUcLK+BjdMBQQSW27i0yQ/Fz9g==
+apollo-server-types@^0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.6.1.tgz#61486980b44cacee2cb4939f0b369a0eb661a098"
+ integrity sha512-IEQ37aYvMLiTUzsySVLOSuvvhxuyYdhI05f3cnH6u2aN1HgGp7vX6bg+U3Ue8wbHfdcifcGIk5UEU+Q+QO6InA==
dependencies:
- apollo-server-core "^2.11.0"
- apollo-server-express "^2.11.0"
+ apollo-reporting-protobuf "^0.6.1"
+ apollo-server-caching "^0.5.2"
+ apollo-server-env "^2.4.5"
+
+apollo-server@~2.14.2:
+ version "2.14.2"
+ resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.14.2.tgz#65167305479d36e96e6f0d08ac201aa6c7571a44"
+ integrity sha512-H+X3HprWGxV8DIhQyXzheMheKRxSlD9/lMuzIHyW/7VPspc7rX0xsHaFcTwQGcxLz18LhM+HtMBtvzi/KlRIbA==
+ dependencies:
+ apollo-server-core "^2.14.2"
+ apollo-server-express "^2.14.2"
express "^4.0.0"
graphql-subscriptions "^1.0.0"
graphql-tools "^4.0.0"
-apollo-tracing@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.11.0.tgz#8821eb60692f77c06660fb6bc147446f600aecfe"
- integrity sha512-I9IFb/8lkBW8ZwOAi4LEojfT7dMfUSkpnV8LHQI8Rcj0HtzL9HObQ3woBmzyGHdGHLFuD/6/VHyFD67SesSrJg==
+apollo-tracing@^0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.12.0.tgz#26250d7789c28aa89d63226eb674706dd69a568a"
+ integrity sha512-cMUYGE6mOEwb9HDqhf4fiPEo2JMhjPIqEprAQEC57El76avRpRig5NM0bnqMZcYJZR5QmLlNcttNccOwf9WrNg==
dependencies:
- apollo-server-env "^2.4.4"
- apollo-server-plugin-base "^0.9.0"
+ apollo-server-env "^2.4.5"
+ apollo-server-plugin-base "^0.10.2"
apollo-utilities@1.3.3, apollo-utilities@^1.3.3:
version "1.3.3"
@@ -2833,17 +2833,6 @@ chalk@2.3.0:
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"
-chalk@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
- integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
- dependencies:
- ansi-styles "^2.2.1"
- escape-string-regexp "^1.0.2"
- has-ansi "^2.0.0"
- strip-ansi "^3.0.0"
- supports-color "^2.0.0"
-
chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -2927,6 +2916,18 @@ chownr@^1.1.1:
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
+chownr@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+ integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
+chrono-node@2.1.10:
+ version "2.1.10"
+ resolved "https://registry.yarnpkg.com/chrono-node/-/chrono-node-2.1.10.tgz#70e56c4aefd9dd1618508e8cd0495f17f58e6a82"
+ integrity sha512-Z5DeTTZB52DeMmdS4d2oqhQwuyCLxaqHGfXVHGK1a+alAscotqbmJxvtxUX5drZNCqcCjfkhaRln/vf8OBJ0ug==
+ dependencies:
+ dayjs "^1.8.29"
+
chrono-node@~1.3.11:
version "1.3.11"
resolved "https://registry.yarnpkg.com/chrono-node/-/chrono-node-1.3.11.tgz#b86a26b7e3157edcc4fe3374e1b6f90caedc8e39"
@@ -2934,13 +2935,6 @@ chrono-node@~1.3.11:
dependencies:
moment "2.21.0"
-chrono-node@~1.4.4:
- version "1.4.4"
- resolved "https://registry.yarnpkg.com/chrono-node/-/chrono-node-1.4.4.tgz#a6248257d3198996ea3d023b2bd20a268545350f"
- integrity sha512-vwsQ2Z6RhkfIsFYvcZtifa0eSQC6pl08fgXkcZXkfGAJk/OkdYAuGqM2yLhPzsuK3N+BmaKFBie/jGvLsiYMbA==
- dependencies:
- dayjs "^1.8.19"
-
ci-info@^1.5.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
@@ -3086,7 +3080,7 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"
-commander@^2.20.3, commander@^2.9.0:
+commander@^2.19.0, commander@^2.20.3:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3403,15 +3397,15 @@ date-fns@2.11.1:
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.11.1.tgz#197b8be1bbf5c5e6fe8bea817f0fe111820e7a12"
integrity sha512-3RdUoinZ43URd2MJcquzBbDQo+J87cSzB8NkXdZiN5ia1UNyep0oCyitfiL88+R7clGTeq/RniXAc16gWyAu1w==
-dateformat@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
- integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
+dateformat@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+ integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
-dayjs@^1.8.19:
- version "1.8.19"
- resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.19.tgz#5117dc390d8f8e586d53891dbff3fa308f51abfe"
- integrity sha512-7kqOoj3oQSmqbvtvGFLU5iYqies+SqUiEGNT0UtUPPxcPYgY1BrkXR0Cq2R9HYSimBXN+xHkEN4Hi399W+Ovlg==
+dayjs@^1.8.29:
+ version "1.9.6"
+ resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.9.6.tgz#6f0c77d76ac1ff63720dd1197e5cb87b67943d70"
+ integrity sha512-HngNLtPEBWRo8EFVmHFmSXAjtCX8rGNqeXQI0Gh7wCTSqwaKgPIDqu9m07wABVopNwzvOeCb+2711vQhDlcIXw==
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
version "2.6.9"
@@ -3682,9 +3676,9 @@ dont-sniff-mimetype@1.1.0:
integrity sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug==
dot-prop@^4.1.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
- integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
+ integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
dependencies:
is-obj "^1.0.0"
@@ -3693,6 +3687,11 @@ dotenv@^4.0.0:
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=
+dotenv@^6.1.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
+ integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
+
dotenv@~8.2.0:
version "8.2.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
@@ -3763,11 +3762,21 @@ entities@^1.1.1, entities@~1.1.1:
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-entities@^2.0.0, entities@~2.0.0:
+entities@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+entities@~2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+ integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
+env-paths@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
+ integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
+
error-ex@^1.2.0, error-ex@^1.3.1:
version "1.3.2"
resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -3876,7 +3885,7 @@ escape-html@~1.0.3:
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -4541,6 +4550,13 @@ fs-minipass@^1.2.5:
dependencies:
minipass "^2.2.1"
+fs-minipass@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+ integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+ dependencies:
+ minipass "^3.0.0"
+
fs-readdir-recursive@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -4777,14 +4793,14 @@ graphql-custom-directives@~0.2.14:
moment "^2.22.2"
numeral "^2.0.6"
-graphql-extensions@^0.12.3:
- version "0.12.3"
- resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.12.3.tgz#593b210d0c1ec79985056bea1b7d645e5eddfc31"
- integrity sha512-W7iT0kzlwTiZU7fXfw9IgWnsqVj7EFLd0/wVcZZRAbR8L3f4+YsGls0oxKdsrvYBnbG347BXKQmIyo6GTEk4XA==
+graphql-extensions@^0.12.6:
+ version "0.12.6"
+ resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.12.6.tgz#c66be43035662a8cfb0b8efe9df96595338bd13c"
+ integrity sha512-EUNw+OIRXYTPxToSoJjhJvS5aGa94KkdkZnL1I9DCZT64/+rzQNeLeGj+goj2RYuYvoQe1Bmcx0CNZ1GqwBhng==
dependencies:
"@apollographql/apollo-tools" "^0.4.3"
- apollo-server-env "^2.4.4"
- apollo-server-types "^0.5.0"
+ apollo-server-env "^2.4.5"
+ apollo-server-types "^0.6.1"
graphql-iso-date@~3.6.1:
version "3.6.1"
@@ -4893,13 +4909,6 @@ har-validator@~5.1.3:
ajv "^6.5.5"
har-schema "^2.0.0"
-has-ansi@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
- integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
- dependencies:
- ansi-regex "^2.0.0"
-
has-flag@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -5273,6 +5282,11 @@ insane@2.6.1:
assignment "2.0.0"
he "0.5.0"
+install-artifact-from-github@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.2.0.tgz#adcbd123c16a4337ec44ea76d0ebf253cc16b074"
+ integrity sha512-3OxCPcY55XlVM3kkfIpeCgmoSKnMsz2A3Dbhsq0RXpIknKQmrX1YiznCeW9cD2ItFmDxziA3w6Eg8d80AoL3oA==
+
invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -5638,10 +5652,10 @@ iso-639-3@~1.1.0:
resolved "https://registry.yarnpkg.com/iso-639-3/-/iso-639-3-1.1.0.tgz#83722daf55490a707c318ae18a33ba3bab06c843"
integrity sha512-l3BAnxNpyRIZA4mEzI2md/YVrxQ3hI8hiQe7TFyQknjyOh8vCzobZuAXTFHELco0FBkYRx4FkAlIqkKrHhnzgw==
-iso-639-3@~2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/iso-639-3/-/iso-639-3-2.0.0.tgz#5844c6b885cbeac3571d407de5b5fdcb92f3505f"
- integrity sha512-Pp+ctEs/pna6/rj05a5VR3qYxJHBZi95wp20C6Snf/WeghrkR/4G44LPJFqlbyo67XntkcUaxwrGmMeyY+F4mA==
+iso-639-3@~2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/iso-639-3/-/iso-639-3-2.2.0.tgz#eb01d7734d61396efec934979e8b0806550837f1"
+ integrity sha512-v9w/U4XDSfXCrXxf4E6ertGC/lTRX8MLLv7XC1j6N5oL3ympe38jp77zgeyMsn3MbufuAAoGeVzDJbOXnPTMhQ==
isobject@^2.0.0:
version "2.1.0"
@@ -6101,9 +6115,9 @@ jmespath@0.15.0:
integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
jquery@^3.3.1:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
- integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
+ integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
@@ -6450,11 +6464,16 @@ lodash.unescape@4.0.1:
resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
-lodash@4.17.15, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.11, lodash@~4.17.14, lodash@~4.17.15:
+lodash@4.17.15:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.11, lodash@~4.17.14, lodash@~4.17.15, lodash@~4.17.20:
+ version "4.17.20"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+ integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
loglevel@^1.6.7:
version "1.6.8"
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
@@ -6601,20 +6620,20 @@ merge2@^1.3.0:
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
-metascraper-audio@^5.11.8:
- version "5.11.8"
- resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.11.8.tgz#27119a3120f98c0e7cf1418423ac722a97ea8247"
- integrity sha512-Aljyf3CqT3XYRLCt0f83LEwjRBQpZpY44HziNEW95pK/fpabINBZO7+CuzjIaxWL7zr1/CuC1XD822QJcHEMIA==
+metascraper-audio@^5.14.26:
+ version "5.14.26"
+ resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.14.26.tgz#04508899aa26c60981ee545bd182533b43882af4"
+ integrity sha512-lh1EvglE0IzBz2U6ku9rgYERXzyRQ+qgYist1bIK5qpcjPys9Svkmplw68ZdLC5lUpvCKQ2s4p28s/S8pljybw==
dependencies:
- "@metascraper/helpers" "^5.11.8"
+ "@metascraper/helpers" "^5.14.26"
-metascraper-author@^5.11.8:
- version "5.11.8"
- resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.11.8.tgz#08da2f24e39916ace3fab62cd09bd8f8dcf32608"
- integrity sha512-lxIARoSdnZ4wlvDv1ILcTYd9rT3K1hJTULxrxNq+XUpYPjHsEmqW5LiTqGqpPQAvsJayVsTM7F6cidBIEY+vIA==
+metascraper-author@^5.14.22:
+ version "5.14.22"
+ resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.14.22.tgz#71d8f625bb7d077b91c9097dbe96c1606c15d58f"
+ integrity sha512-93nV2k2GEUL2GQcQRFJiHcJzjyLDf0kkZ3LiiKiJ/W6kICENRgpXCEA56rjcvcFLoNQl2CwDBB2O1pecPLodmQ==
dependencies:
- "@metascraper/helpers" "^5.11.8"
- lodash "~4.17.15"
+ "@metascraper/helpers" "^5.14.22"
+ lodash "~4.17.20"
metascraper-clearbit-logo@^5.3.0:
version "5.3.0"
@@ -6660,12 +6679,12 @@ metascraper-lang@^5.11.8:
dependencies:
"@metascraper/helpers" "^5.11.8"
-metascraper-logo@^5.11.6:
- version "5.11.6"
- resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.11.6.tgz#c0f08939fd72021d015cc16e0bb43dc41d79dc5f"
- integrity sha512-H1kumbrf+I4Ogwm7fFhSZDJU8STRMa7kg77/wnmOK+1sirH8d2NOzTrEhDdoRMmpGYiU3XNjfukvZJbqPu2mvg==
+metascraper-logo@^5.14.26:
+ version "5.14.26"
+ resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.14.26.tgz#4fe14a0ca292ae99727fcfdc17f78a07c507ce53"
+ integrity sha512-sKDqBVuF2KuxHOmYo/3I3+PMuFcTgyBBJukuflMF5mv/73CQYeAPnz7842NZBg1z63W46DB9O/c5SrlD3B41+Q==
dependencies:
- "@metascraper/helpers" "^5.11.6"
+ "@metascraper/helpers" "^5.14.26"
metascraper-publisher@^5.11.8:
version "5.11.8"
@@ -6690,12 +6709,12 @@ metascraper-title@^5.11.8:
"@metascraper/helpers" "^5.11.8"
lodash "~4.17.15"
-metascraper-url@^5.11.8:
- version "5.11.8"
- resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.11.8.tgz#2d135527e901bff8f5846d47991ae6231cfc7e20"
- integrity sha512-91eE1iE/MygDX9pLXSBrOC4w8Ilng3+Cx3NBUiAYys7OKQgmHGGnOjRUoGGBlGc9Fo9VcvJZkI8tgmV7itUyJQ==
+metascraper-url@^5.14.26:
+ version "5.14.26"
+ resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.14.26.tgz#f829cd04d8c413ebd6bb5ae76d47d9827d2979d0"
+ integrity sha512-oygnebVXypZZJh3rA/nra1jvJCKlTG1INOO0IGAAjdSJrg9H+vUWN5+HfDi4wOSwfS5wB5JF9Nu5OI3wHiPYkA==
dependencies:
- "@metascraper/helpers" "^5.11.8"
+ "@metascraper/helpers" "^5.14.26"
metascraper-video@^5.11.8:
version "5.11.8"
@@ -6758,17 +6777,22 @@ micromatch@^4.0.2:
braces "^3.0.1"
picomatch "^2.0.5"
-migrate@^1.6.2:
- version "1.6.2"
- resolved "https://registry.yarnpkg.com/migrate/-/migrate-1.6.2.tgz#8970d596780553fe9f545bdf83806df8473f025b"
- integrity sha512-XAFab+ArPTo9BHzmihKjsZ5THKRryenA+lwob0R+ax0hLDs7YzJFJT5YZE3gtntZgzdgcuFLs82EJFB/Dssr+g==
+microsoft-capitalize@~1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/microsoft-capitalize/-/microsoft-capitalize-1.0.3.tgz#53ccb40db80ad8b8948bcb9fbd56c7e77817fb28"
+ integrity sha512-2iuiSRp4JDkCQgn7UX7pt/kjyLIeB/EXBeck8pCLVpM6t8IRgl2aAr53NOiM0DACHQDkc/J1s9Zt6xLONHdC9w==
+
+migrate@^1.7.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/migrate/-/migrate-1.7.0.tgz#23fb97aa33145788030a1a91187a0ee32a49acbf"
+ integrity sha512-I63YykITgWyI+ET4KO8xGePYkR9U7CtSe/RrR13vLbZSpUcAh4/ry2GswNv7Lywcsp3BaDHj7YdjC7ihVYCFmw==
dependencies:
- chalk "^1.1.3"
- commander "^2.9.0"
- dateformat "^2.0.0"
- dotenv "^4.0.0"
+ chalk "^2.4.1"
+ commander "^2.19.0"
+ dateformat "^3.0.3"
+ dotenv "^6.1.0"
inherits "^2.0.3"
- minimatch "^3.0.3"
+ minimatch "^3.0.4"
mkdirp "^0.5.1"
slug "^0.9.2"
@@ -6782,14 +6806,14 @@ mime-db@1.44.0:
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@~2.1.27:
version "2.1.27"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
dependencies:
mime-db "1.44.0"
-mime-types@^2.1.26, mime-types@~2.1.19, mime-types@~2.1.22, mime-types@~2.1.24, mime-types@~2.1.26:
+mime-types@^2.1.26, mime-types@~2.1.19, mime-types@~2.1.22, mime-types@~2.1.24:
version "2.1.26"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
@@ -6816,7 +6840,7 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -6846,6 +6870,13 @@ minipass@^2.2.1, minipass@^2.3.5:
safe-buffer "^5.1.2"
yallist "^3.0.0"
+minipass@^3.0.0:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
+ integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+ dependencies:
+ yallist "^4.0.0"
+
minizlib@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
@@ -6853,6 +6884,14 @@ minizlib@^1.2.1:
dependencies:
minipass "^2.2.1"
+minizlib@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+ integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+ dependencies:
+ minipass "^3.0.0"
+ yallist "^4.0.0"
+
mixin-deep@^1.2.0:
version "1.3.2"
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -6868,6 +6907,11 @@ mkdirp@^0.5.0, mkdirp@^0.5.1:
dependencies:
minimist "0.0.8"
+mkdirp@^1.0.3:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+ integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
moment@2.21.0:
version "2.21.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
@@ -6922,6 +6966,11 @@ nan@^2.12.1:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+nan@^2.14.2:
+ version "2.14.2"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+ integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
+
nanomatch@^1.2.9:
version "1.2.13"
resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -7038,10 +7087,26 @@ node-environment-flags@^1.0.5:
object.getownpropertydescriptors "^2.0.3"
semver "^5.7.0"
-node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@~2.6.0:
- version "2.6.0"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
- integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@~2.6.1:
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+ integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
+node-gyp@^7.1.2:
+ version "7.1.2"
+ resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+ integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
+ dependencies:
+ env-paths "^2.2.0"
+ glob "^7.1.4"
+ graceful-fs "^4.2.3"
+ nopt "^5.0.0"
+ npmlog "^4.1.2"
+ request "^2.88.2"
+ rimraf "^3.0.2"
+ semver "^7.3.2"
+ tar "^6.0.2"
+ which "^2.0.2"
node-int64@^0.4.0:
version "0.4.0"
@@ -7123,6 +7188,13 @@ nopt@^4.0.1:
abbrev "1"
osenv "^0.1.4"
+nopt@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+ integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+ dependencies:
+ abbrev "1"
+
nopt@~1.0.10:
version "1.0.10"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
@@ -7162,10 +7234,10 @@ normalize-url@~4.2.0:
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.2.0.tgz#e747f16b58e6d7f391495fd86415fa04ec7c9897"
integrity sha512-n69+KXI+kZApR+sPwSkoAXpGlNkaiYyoHHqKOFPjJWvwZpew/EjKvuPE4+tStNgb42z5yLtdakgZCQI+LalSPg==
-normalize-url@~5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-5.0.0.tgz#f46c9dc20670495e4e18fbd1b4396e41d199f63c"
- integrity sha512-bAEm2fx8Dq/a35Z6PIRkkBBJvR56BbEJvhpNtvCZ4W9FyORSna77fn+xtYFjqk5JpBS+fMnAOG/wFgkQBmB7hw==
+normalize-url@~5.3.0:
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-5.3.0.tgz#8959b3cdaa295b61592c1f245dded34b117618dd"
+ integrity sha512-9/nOVLYYe/dO/eJeQUNaGUF4m4Z5E7cb9oNTKabH+bNf19mqj60txTcveQxL0GlcWLXCxkOu2/LwL8oW0idIDA==
npm-bundled@^1.0.1:
version "1.0.6"
@@ -7209,7 +7281,7 @@ npm-run-path@^4.0.0:
dependencies:
path-key "^3.0.0"
-npmlog@^4.0.2:
+npmlog@^4.0.2, npmlog@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -7276,9 +7348,9 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
object-path@^0.11.4:
- version "0.11.4"
- resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.4.tgz#370ae752fbf37de3ea70a861c23bba8915691949"
- integrity sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=
+ version "0.11.5"
+ resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a"
+ integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==
object-visit@^1.0.0:
version "1.0.1"
@@ -7739,10 +7811,10 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"
-prettier@~2.0.4:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef"
- integrity sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w==
+prettier@~2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b"
+ integrity sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==
pretty-format@^25.3.0:
version "25.3.0"
@@ -7887,6 +7959,15 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
+re2@^1.15.4:
+ version "1.15.9"
+ resolved "https://registry.yarnpkg.com/re2/-/re2-1.15.9.tgz#9ed16171edcb0bc4f0e239bf55229ff3f26acbe3"
+ integrity sha512-AXWEhpMTBdC+3oqbjdU07dk0pBCvxh5vbOMLERL6Y8FYBSGn4vXlLe8cYszn64Yy7H8keVMrgPzoSvOd4mePpg==
+ dependencies:
+ install-artifact-from-github "^1.2.0"
+ nan "^2.14.2"
+ node-gyp "^7.1.2"
+
react-dom@^16.4.2:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
@@ -8156,7 +8237,7 @@ request-promise-native@^1.0.7, request-promise-native@^1.0.8:
stealthy-require "^1.1.1"
tough-cookie "^2.3.3"
-request@^2.88.0, request@~2.88.2:
+request@^2.88.0, request@^2.88.2, request@~2.88.2:
version "2.88.2"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -8282,6 +8363,13 @@ rimraf@^3.0.0:
dependencies:
glob "^7.1.3"
+rimraf@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+ integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+ dependencies:
+ glob "^7.1.3"
+
rosie@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/rosie/-/rosie-2.0.1.tgz#c250c4787ce450b72aa9eff26509f68589814fa2"
@@ -8426,6 +8514,11 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^7.3.2:
+ version "7.3.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+ integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
send@0.17.1:
version "0.17.1"
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -8976,11 +9069,6 @@ supertest@~4.0.2:
methods "^1.1.2"
superagent "^3.8.3"
-supports-color@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
- integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
supports-color@^4.0.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
@@ -9055,6 +9143,18 @@ tar@^4:
safe-buffer "^5.1.2"
yallist "^3.0.3"
+tar@^6.0.2:
+ version "6.0.5"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
+ integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
+ dependencies:
+ chownr "^2.0.0"
+ fs-minipass "^2.0.0"
+ minipass "^3.0.0"
+ minizlib "^2.1.1"
+ mkdirp "^1.0.3"
+ yallist "^4.0.0"
+
term-size@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -9136,26 +9236,21 @@ title@~3.4.1:
clipboardy "1.2.2"
titleize "1.0.0"
-title@~3.4.2:
- version "3.4.2"
- resolved "https://registry.yarnpkg.com/title/-/title-3.4.2.tgz#1c0acd159c6437296cc73ec743a4b9f7510c6a6f"
- integrity sha512-cSNFZ/ChKlX2SfF+k9XvvXkjVa1JrzdGt6v/hoxVig5VaDGRmNHANfawcAdW2mfkd7y+uBHH6n9EHAxJmkO5Hw==
- dependencies:
- arg "1.0.0"
- chalk "2.3.0"
- clipboardy "1.2.2"
- titleize "1.0.0"
-
titleize@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/titleize/-/titleize-1.0.0.tgz#7d350722061830ba6617631e0cfd3ea08398d95a"
integrity sha1-fTUHIgYYMLpmF2MeDP0+oIOY2Vo=
-tlds@^1.187.0, tlds@^1.203.0:
+tlds@^1.187.0:
version "1.203.1"
resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.203.1.tgz#4dc9b02f53de3315bc98b80665e13de3edfc1dfc"
integrity sha512-7MUlYyGJ6rSitEZ3r1Q1QNV8uSIzapS8SmmhSusBuIc7uIxPPwsKllEP0GRp1NS6Ik6F+fRZvnjDWm3ecv2hDw==
+tlds@^1.209.0:
+ version "1.214.0"
+ resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.214.0.tgz#a20191443eec26fd3339a3bd98e87a0b4f3f0d89"
+ integrity sha512-+i48KYsrCkkIZnsj31cTIj9cu5NtFxKo7xlNIB7jg8kXi//b4Ertl5qaHgqFF+y+g0nFwt/k+eph2uUNQJgfwg==
+
tldts-core@^5.6.21:
version "5.6.21"
resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.21.tgz#7e40ecd3101354ed1ac714c7f77928aac579d431"
@@ -9519,6 +9614,15 @@ url-parse@^1.4.7:
querystringify "^2.1.1"
requires-port "^1.0.0"
+url-regex-safe@~1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/url-regex-safe/-/url-regex-safe-1.0.2.tgz#822cbab107d7f4f80342f0f0798acf63cac9fd1d"
+ integrity sha512-t1doIKbYDBRyqXZz7A98AXH/zimKmYapxFjBZwcz3BmqjB921rUPEUokAaShKyenaX3McOM8FbkWLvFvX3Jsyw==
+ dependencies:
+ ip-regex "^4.1.0"
+ re2 "^1.15.4"
+ tlds "^1.209.0"
+
url-regex@~4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-4.1.1.tgz#a5617b22e15e26dac57ce74c3f52088bcdfec995"
@@ -9527,14 +9631,6 @@ url-regex@~4.1.1:
ip-regex "^1.0.1"
tlds "^1.187.0"
-url-regex@~5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-5.0.0.tgz#8f5456ab83d898d18b2f91753a702649b873273a"
- integrity sha512-O08GjTiAFNsSlrUWfqF1jH0H1W3m35ZyadHrGv5krdnmPPoxP27oDTqux/579PtaroiSGm5yma6KT1mHFH6Y/g==
- dependencies:
- ip-regex "^4.1.0"
- tlds "^1.203.0"
-
url@0.10.3:
version "0.10.3"
resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
@@ -9892,6 +9988,11 @@ yallist@^3.0.2:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+yallist@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+ integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
yargs-parser@^18.1.1:
version "18.1.1"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.1.tgz#bf7407b915427fc760fcbbccc6c82b4f0ffcbd37"
diff --git a/deployment/helm/human-connection/.helmignore b/deployment/helm/ocelot.social/.helmignore
similarity index 100%
rename from deployment/helm/human-connection/.helmignore
rename to deployment/helm/ocelot.social/.helmignore
diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/ocelot.social/Chart.yaml
similarity index 100%
rename from deployment/helm/human-connection/Chart.yaml
rename to deployment/helm/ocelot.social/Chart.yaml
diff --git a/deployment/helm/human-connection/README.md b/deployment/helm/ocelot.social/README.md
similarity index 100%
rename from deployment/helm/human-connection/README.md
rename to deployment/helm/ocelot.social/README.md
diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-prod.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml
rename to deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-prod.yaml
diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-staging.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml
rename to deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-staging.yaml
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-backend.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/deployments/deployment-backend.yaml
rename to deployment/helm/ocelot.social/templates/deployments/deployment-backend.yaml
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-mailserver.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml
rename to deployment/helm/ocelot.social/templates/deployments/deployment-mailserver.yaml
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-maintenance.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml
rename to deployment/helm/ocelot.social/templates/deployments/deployment-maintenance.yaml
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-neo4j.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml
rename to deployment/helm/ocelot.social/templates/deployments/deployment-neo4j.yaml
diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-web.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/deployments/deployment-web.yaml
rename to deployment/helm/ocelot.social/templates/deployments/deployment-web.yaml
diff --git a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml b/deployment/helm/ocelot.social/templates/ingress/ingress.template.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/ingress/ingress.template.yaml
rename to deployment/helm/ocelot.social/templates/ingress/ingress.template.yaml
diff --git a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml b/deployment/helm/ocelot.social/templates/jobs/job-db-migration.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/jobs/job-db-migration.yaml
rename to deployment/helm/ocelot.social/templates/jobs/job-db-migration.yaml
diff --git a/deployment/helm/human-connection/templates/services/service-backend.yaml b/deployment/helm/ocelot.social/templates/services/service-backend.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/services/service-backend.yaml
rename to deployment/helm/ocelot.social/templates/services/service-backend.yaml
diff --git a/deployment/helm/human-connection/templates/services/service-mailserver.yaml b/deployment/helm/ocelot.social/templates/services/service-mailserver.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/services/service-mailserver.yaml
rename to deployment/helm/ocelot.social/templates/services/service-mailserver.yaml
diff --git a/deployment/helm/human-connection/templates/services/service-maintenance.yaml b/deployment/helm/ocelot.social/templates/services/service-maintenance.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/services/service-maintenance.yaml
rename to deployment/helm/ocelot.social/templates/services/service-maintenance.yaml
diff --git a/deployment/helm/human-connection/templates/services/service-neo4j.yaml b/deployment/helm/ocelot.social/templates/services/service-neo4j.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/services/service-neo4j.yaml
rename to deployment/helm/ocelot.social/templates/services/service-neo4j.yaml
diff --git a/deployment/helm/human-connection/templates/services/service-webapp.yaml b/deployment/helm/ocelot.social/templates/services/service-webapp.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/services/service-webapp.yaml
rename to deployment/helm/ocelot.social/templates/services/service-webapp.yaml
diff --git a/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml b/deployment/helm/ocelot.social/templates/volumes/pvc-neo4j-data.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml
rename to deployment/helm/ocelot.social/templates/volumes/pvc-neo4j-data.yaml
diff --git a/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml b/deployment/helm/ocelot.social/templates/volumes/pvc-uploads.yaml
similarity index 100%
rename from deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml
rename to deployment/helm/ocelot.social/templates/volumes/pvc-uploads.yaml
diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/ocelot.social/values.yaml
similarity index 93%
rename from deployment/helm/human-connection/values.yaml
rename to deployment/helm/ocelot.social/values.yaml
index 792e22084..42eed0c7b 100644
--- a/deployment/helm/human-connection/values.yaml
+++ b/deployment/helm/ocelot.social/values.yaml
@@ -1,5 +1,5 @@
# domain is the user-facing domain.
-domain: develop.human-connection.org
+domain: develop-docker.ocelot.social
# commit is the latest github commit deployed.
commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
# dbInitialization runs the database initializations in a post-install hook.
@@ -37,9 +37,9 @@ neo4jResourceLimitsMemory: "2G"
# neo4jResourceLimitsMemory configures the memory available for requests.
neo4jResourceRequestsMemory: "1G"
# supportEmail is used for letsencrypt certs.
-supportEmail: "devcom@human-connection.org"
+supportEmail: "devops@ocelot.social"
# smtpHost is the host for the mailserver.
-smtpHost: "mailserver.human-connection.org"
+smtpHost: "mail.ocelot.social"
# smtpPort is the port to be used for the mailserver.
smtpPort: \"25\"
# jwtSecret is used to encode/decode a user's JWT for authentication
@@ -50,4 +50,4 @@ privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4"
mapboxToken: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1E="
uploadsStorage: "25Gi"
neo4jStorage: "5Gi"
-developmentMailserverDomain: nitro-mailserver.human-connection.org
\ No newline at end of file
+developmentMailserverDomain: mail.ocelot.social
diff --git a/deployment/minikube/README.md b/deployment/minikube/README.md
index 499fc8290..f582007a4 100644
--- a/deployment/minikube/README.md
+++ b/deployment/minikube/README.md
@@ -18,8 +18,8 @@ minikube dashboard, expose the services you want on your host system.
For example:
```text
-$ minikube service develop-webapp --namespace=human-connection
+$ minikube service develop-webapp --namespace=ocelotsocialnetwork
# optionally
-$ minikube service develop-backend --namespace=human-connection
+$ minikube service develop-backend --namespace=ocelotsocialnetwork
```
diff --git a/deployment/volumes/neo4j-online-backup/README.md b/deployment/volumes/neo4j-online-backup/README.md
index 4eaa511ef..babb68d26 100644
--- a/deployment/volumes/neo4j-online-backup/README.md
+++ b/deployment/volumes/neo4j-online-backup/README.md
@@ -56,4 +56,4 @@ $ kubectl --namespace=human-connection exec -it bash
> exit
```
-Revert your changes to deployment `develop-neo4j` which will restart the database.
\ No newline at end of file
+Revert your changes to deployment `develop-neo4j` which will restart the database.
diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml
index e6b280826..56da9be52 100644
--- a/docker-compose.maintenance.yml
+++ b/docker-compose.maintenance.yml
@@ -18,7 +18,7 @@ services:
- GRAPHQL_URI=http://localhost:4000
- CLIENT_URI=http://localhost:3000
- JWT_SECRET=b/&&7b78BF&fv/Vd
- - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
+ - MAPBOX_TOKEN=pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g
- PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78
- NEO4J_apoc_import_file_enabled=true
- "SSH_USERNAME=${SSH_USERNAME}"
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 7ca6debeb..d950d05f8 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,13 +1,8 @@
version: "3.4"
services:
- mailserver:
- image: djfarrelly/maildev
- ports:
- - 1080:80
- networks:
- - hc-network
webapp:
+ image: schoolsinmotion/webapp:build-and-test
build:
context: webapp
target: build-and-test
@@ -15,9 +10,12 @@ services:
- ./webapp:/develop-webapp
environment:
- NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
- - PUBLIC_REGISTRATION=false
+ - PUBLIC_REGISTRATION=true
command: yarn run dev
+ volumes:
+ - webapp_node_modules:/nitro-web/node_modules
backend:
+ image: schoolsinmotion/backend:build-and-test
build:
context: backend
target: build-and-test
@@ -30,6 +28,12 @@ services:
- SMTP_IGNORE_TLS=true
- "DEBUG=${DEBUG}"
- PUBLIC_REGISTRATION=false
+ volumes:
+ - backend_node_modules:/nitro-backend/node_modules
+ - uploads:/nitro-backend/public/uploads
+ neo4j:
+ volumes:
+ - neo4j_data:/data
maintenance:
image: ocelotsocialnetwork/develop-maintenance:latest
build:
@@ -39,6 +43,17 @@ services:
- hc-network
ports:
- 3503:80
+ mailserver:
+ image: djfarrelly/maildev
+ ports:
+ - 1080:80
+ networks:
+ - hc-network
networks:
hc-network:
+volumes:
+ webapp_node_modules:
+ backend_node_modules:
+ neo4j_data:
+ uploads:
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
new file mode 100644
index 000000000..285e9f110
--- /dev/null
+++ b/docker-compose.production.yml
@@ -0,0 +1,20 @@
+version: "3.4"
+
+services:
+ webapp:
+ build:
+ context: webapp
+ target: production
+ args:
+ - "BUILD_COMMIT=${TRAVIS_COMMIT}"
+ backend:
+ build:
+ context: backend
+ target: production
+ args:
+ - "BUILD_COMMIT=${TRAVIS_COMMIT}"
+ neo4j:
+ build:
+ context: neo4j
+ args:
+ - "BUILD_COMMIT=${TRAVIS_COMMIT}"
diff --git a/docker-compose.yml b/docker-compose.yml
index 7ab71aa83..ddcfd78cd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
environment:
- HOST=0.0.0.0
- GRAPHQL_URI=http://backend:4000
- - MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.bZ8KK9l70omjXbEkkbHGsQ"
+ - MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
backend:
image: ocelotsocialnetwork/develop-backend:latest
build:
@@ -42,9 +42,10 @@ services:
- GRAPHQL_URI=http://backend:4000
- CLIENT_URI=http://localhost:3000
- JWT_SECRET=b/&&7b78BF&fv/Vd
- - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
+ - MAPBOX_TOKEN=pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g
- PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78
- "DEBUG=${DEBUG}"
+ - EMAIL_DEFAULT_SENDER=devops@ocelot.social
neo4j:
image: ocelotsocialnetwork/develop-neo4j:latest
build:
@@ -68,4 +69,4 @@ volumes:
webapp_node_modules:
backend_node_modules:
neo4j_data:
- uploads:
+ uploads:
\ No newline at end of file
diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile
index 845748a8a..e08e482a0 100644
--- a/neo4j/Dockerfile
+++ b/neo4j/Dockerfile
@@ -1,7 +1,7 @@
FROM neo4j:3.5.14
+LABEL Description="Neo4J database of the Social Network ocelot.social with preinstalled database constraints and indices" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)"
# community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment
# FROM neo4j:3.5.14-enterprise
-LABEL Description="Neo4J database of the Social Network Human-Connection.org with preinstalled database constraints and indices" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)"
ARG BUILD_COMMIT
ENV BUILD_COMMIT=$BUILD_COMMIT
diff --git a/package.json b/package.json
index 95e0880af..b20d4cb70 100644
--- a/package.json
+++ b/package.json
@@ -27,11 +27,11 @@
},
"devDependencies": {
"@babel/core": "^7.9.0",
- "@babel/preset-env": "^7.9.0",
+ "@babel/preset-env": "^7.12.7",
"@babel/register": "^7.9.0",
"auto-changelog": "^1.16.4",
"bcryptjs": "^2.4.3",
- "codecov": "^3.6.5",
+ "codecov": "^3.7.1",
"cross-env": "^7.0.2",
"cucumber": "^6.0.5",
"cypress": "^4.2.0",
@@ -51,7 +51,7 @@
"npm-run-all": "^4.1.5",
"rosie": "^2.0.1",
"slug": "^2.1.1",
- "standard-version": "^7.1.0"
+ "standard-version": "^8.0.1"
},
"resolutions": {
"set-value": "^2.0.1"
diff --git a/webapp/.dockerignore b/webapp/.dockerignore
index b0b6a6d6f..2f7daf103 100644
--- a/webapp/.dockerignore
+++ b/webapp/.dockerignore
@@ -13,8 +13,6 @@ scripts/
cypress/
README.md
-screenshot*.png
-lokalise.png
.editorconfig
maintenance/node_modules/
diff --git a/webapp/.env.template b/webapp/.env.template
index b00e6855a..198452e27 100644
--- a/webapp/.env.template
+++ b/webapp/.env.template
@@ -1,4 +1,4 @@
-MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ"
+MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
SENTRY_DSN_WEBAPP=
COMMIT=
PUBLIC_REGISTRATION=false
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index fb0489476..5024ac2c6 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,5 +1,5 @@
FROM node:12.19.0-alpine3.10 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 ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)"
EXPOSE 3000
CMD ["yarn", "run", "start"]
diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance
index dfa392b24..a688e0f82 100644
--- a/webapp/Dockerfile.maintenance
+++ b/webapp/Dockerfile.maintenance
@@ -1,5 +1,5 @@
FROM node:12.19.0-alpine3.10 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 ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)"
EXPOSE 3000
CMD ["yarn", "run", "start"]
@@ -25,6 +25,7 @@ COPY locales locales
COPY mixins mixins
COPY plugins/i18n.js plugins/v-tooltip.js plugins/styleguide.js plugins/
COPY static static
+COPY constants constants
COPY nuxt.config.js nuxt.config.js
# this will also ovewrite the existing package.json
diff --git a/webapp/README.md b/webapp/README.md
index 7a9d578e1..3af1ea806 100644
--- a/webapp/README.md
+++ b/webapp/README.md
@@ -98,7 +98,7 @@ You can then visit the Storybook playground on `http://localhost:3002`
## Styleguide Migration
-We are currently in the process of migrating our styleguide components and design tokens from the [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) into the main [Human Connection repository](https://github.com/Human-Connection/Human-Connection) and refactoring our components in the process. During this migration, our new components will live in a `_new/` folder to separate them from the old, yet untouched components.
+We are currently in the process of migrating our styleguide components and design tokens from the [Nitro Styleguide](https://github.com/Ocelot-Social-Community/HC-Styleguide-20201003) into the main [ocelot.social repository](https://github.com/Ocelot-Social-Community/Ocelot-Social) and refactoring our components in the process. During this migration, our new components will live in a `_new/` folder to separate them from the old, yet untouched components.
### Folder Structure
diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue
index 63c550fd3..f65c6f6cf 100644
--- a/webapp/components/AvatarMenu/AvatarMenu.vue
+++ b/webapp/components/AvatarMenu/AvatarMenu.vue
@@ -20,7 +20,7 @@
{{ $t('login.hello') }}
{{ userName }}
-
+
{{ user.role | camelCase }}
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 20c9c2388..0cbd90563 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -24,11 +24,7 @@
{{ $t('contribution.inappropriatePicture') }}
-
+
{{ $t('contribution.inappropriatePictureText') }}
@@ -92,6 +88,7 @@ import locales from '~/locales'
import PostMutations from '~/graphql/PostMutations.js'
import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
import ImageUploader from '~/components/ImageUploader/ImageUploader'
+import links from '~/constants/links.js'
export default {
components: {
@@ -114,6 +111,7 @@ export default {
const { sensitive: imageBlurred = false, aspectRatio: imageAspectRatio = null } = image || {}
return {
+ links,
formData: {
title: title || '',
content: content || '',
diff --git a/webapp/components/DonationInfo/DonationInfo.spec.js b/webapp/components/DonationInfo/DonationInfo.spec.js
index 12f6c7652..8d20042b0 100644
--- a/webapp/components/DonationInfo/DonationInfo.spec.js
+++ b/webapp/components/DonationInfo/DonationInfo.spec.js
@@ -21,8 +21,10 @@ describe('DonationInfo.vue', () => {
const Wrapper = () => mount(DonationInfo, { mocks, localVue })
- it('includes a link to the Human Connection donations website', () => {
- expect(Wrapper().find('a').attributes('href')).toBe('https://human-connection.org/spenden/')
+ it('includes a link to the ocelot.social donations website', () => {
+ expect(Wrapper().find('a').attributes('href')).toBe(
+ 'https://ocelot-social.herokuapp.com/donations',
+ )
})
it('displays a call to action button', () => {
diff --git a/webapp/components/DonationInfo/DonationInfo.vue b/webapp/components/DonationInfo/DonationInfo.vue
index e138bef97..b1916a6e9 100644
--- a/webapp/components/DonationInfo/DonationInfo.vue
+++ b/webapp/components/DonationInfo/DonationInfo.vue
@@ -1,13 +1,14 @@
diff --git a/webapp/components/Logo.vue b/webapp/components/Logo.vue
deleted file mode 100644
index 6c7285417..000000000
--- a/webapp/components/Logo.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue
new file mode 100644
index 000000000..b5a2e38a5
--- /dev/null
+++ b/webapp/components/Logo/Logo.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/webapp/components/Logo/demo.md b/webapp/components/Logo/demo.md
new file mode 100644
index 000000000..9cd6d0f4d
--- /dev/null
+++ b/webapp/components/Logo/demo.md
@@ -0,0 +1,15 @@
+# Basic usage
+
+```
+
+
+
+```
+
+# Inverse Logo
+
+```
+
+
+
+```
\ No newline at end of file
diff --git a/webapp/components/Logo/style.scss b/webapp/components/Logo/style.scss
new file mode 100644
index 000000000..305e907c5
--- /dev/null
+++ b/webapp/components/Logo/style.scss
@@ -0,0 +1,17 @@
+.ds-logo {
+ @include reset;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ color: $text-color-primary;
+}
+
+.ds-logo-inverse {
+ color: $text-color-primary-inverse;
+}
+
+.ds-logo-svg {
+ width: 130px;
+ height: auto;
+ fill: currentColor;
+}
\ No newline at end of file
diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
index fc497bdf5..9b56e29ee 100644
--- a/webapp/components/PageFooter/PageFooter.vue
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -1,25 +1,25 @@
+ +
+ +