diff --git a/CHANGELOG.md b/CHANGELOG.md index 842838f83..8067daad4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,67 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [v0.3.1](https://github.com/Human-Connection/Human-Connection/compare/v0.3.0...v0.3.1) + +> 10 February 2020 + +- fix: Display unblock feature only for blocking user [`#3034`](https://github.com/Human-Connection/Human-Connection/pull/3034) +- refactor(factories): Refactor test factories with rosie.js [`#2921`](https://github.com/Human-Connection/Human-Connection/pull/2921) +- build(deps-dev): bump @vue/cli-shared-utils from 4.1.2 to 4.2.2 in /webapp [`#3031`](https://github.com/Human-Connection/Human-Connection/pull/3031) +- build(deps): bump graphql-shield from 7.0.10 to 7.0.11 in /backend [`#3028`](https://github.com/Human-Connection/Human-Connection/pull/3028) +- build(deps-dev): bump codecov from 3.6.4 to 3.6.5 [`#3027`](https://github.com/Human-Connection/Human-Connection/pull/3027) +- chore: Add DevOps issue template [`#2999`](https://github.com/Human-Connection/Human-Connection/pull/2999) +- fix: Error pages can be translated [`#2826`](https://github.com/Human-Connection/Human-Connection/pull/2826) +- build(deps-dev): bump apollo-server-testing from 2.9.16 to 2.10.0 in /backend [`#3020`](https://github.com/Human-Connection/Human-Connection/pull/3020) +- build(deps): bump apollo-server from 2.9.16 to 2.10.0 in /backend [`#3019`](https://github.com/Human-Connection/Human-Connection/pull/3019) +- build(deps): bump graphql-tag from 2.10.2 to 2.10.3 in /backend [`#3011`](https://github.com/Human-Connection/Human-Connection/pull/3011) +- build(deps): bump graphql-shield from 7.0.9 to 7.0.10 in /backend [`#3010`](https://github.com/Human-Connection/Human-Connection/pull/3010) +- build(deps-dev): bump @storybook/addon-actions from 5.3.10 to 5.3.12 in /webapp [`#2998`](https://github.com/Human-Connection/Human-Connection/pull/2998) +- build(deps-dev): bump @storybook/addon-notes from 5.3.10 to 5.3.12 in /webapp [`#2997`](https://github.com/Human-Connection/Human-Connection/pull/2997) +- build(deps-dev): bump @storybook/addon-a11y from 5.3.10 to 5.3.12 in /webapp [`#2996`](https://github.com/Human-Connection/Human-Connection/pull/2996) +- build(deps): bump metascraper-author from 5.10.6 to 5.10.7 in /backend [`#2994`](https://github.com/Human-Connection/Human-Connection/pull/2994) +- build(deps): bump metascraper-title from 5.10.6 to 5.10.7 in /backend [`#2978`](https://github.com/Human-Connection/Human-Connection/pull/2978) +- build(deps-dev): bump @storybook/vue from 5.3.10 to 5.3.12 in /webapp [`#2995`](https://github.com/Human-Connection/Human-Connection/pull/2995) +- build(deps): bump metascraper-audio from 5.10.6 to 5.10.7 in /backend [`#2993`](https://github.com/Human-Connection/Human-Connection/pull/2993) +- build(deps): bump graphql-tag from 2.10.1 to 2.10.2 in /backend [`#2992`](https://github.com/Human-Connection/Human-Connection/pull/2992) +- build(deps): bump metascraper-url from 5.10.6 to 5.10.7 in /backend [`#2991`](https://github.com/Human-Connection/Human-Connection/pull/2991) +- build(deps): bump @sentry/node from 5.12.0 to 5.12.3 in /backend [`#2990`](https://github.com/Human-Connection/Human-Connection/pull/2990) +- build(deps-dev): bump @storybook/addon-notes from 5.3.9 to 5.3.10 in /webapp [`#2951`](https://github.com/Human-Connection/Human-Connection/pull/2951) +- build(deps): bump metascraper from 5.10.6 to 5.11.0 in /backend [`#2976`](https://github.com/Human-Connection/Human-Connection/pull/2976) +- build(deps): bump metascraper-logo from 5.10.6 to 5.10.7 in /backend [`#2975`](https://github.com/Human-Connection/Human-Connection/pull/2975) +- chore: Add issue template for Refactoring tickets [`#2983`](https://github.com/Human-Connection/Human-Connection/pull/2983) +- build(deps): bump @nuxtjs/sentry from 3.1.0 to 3.2.2 in /webapp [`#2974`](https://github.com/Human-Connection/Human-Connection/pull/2974) +- build(deps): bump metascraper-video from 5.10.6 to 5.10.7 in /backend [`#2952`](https://github.com/Human-Connection/Human-Connection/pull/2952) +- build(deps): bump metascraper-lang from 5.10.6 to 5.10.7 in /backend [`#2950`](https://github.com/Human-Connection/Human-Connection/pull/2950) +- build(deps): bump metascraper-description from 5.10.6 to 5.11.0 in /backend [`#2948`](https://github.com/Human-Connection/Human-Connection/pull/2948) +- build(deps): bump @sentry/node from 5.11.2 to 5.12.0 in /backend [`#2977`](https://github.com/Human-Connection/Human-Connection/pull/2977) +- build(deps): bump @nuxtjs/pwa from 3.0.0-beta.19 to 3.0.0-beta.20 in /webapp [`#2959`](https://github.com/Human-Connection/Human-Connection/pull/2959) +- build(deps-dev): bump @storybook/addon-a11y from 5.3.9 to 5.3.10 in /webapp [`#2956`](https://github.com/Human-Connection/Human-Connection/pull/2956) +- build(deps-dev): bump eslint-plugin-import from 2.20.0 to 2.20.1 in /webapp [`#2949`](https://github.com/Human-Connection/Human-Connection/pull/2949) +- build(deps): bump metascraper-soundcloud from 5.10.6 to 5.10.7 in /backend [`#2945`](https://github.com/Human-Connection/Human-Connection/pull/2945) +- build(deps): bump metascraper-date from 5.10.6 to 5.10.7 in /backend [`#2944`](https://github.com/Human-Connection/Human-Connection/pull/2944) +- build(deps-dev): bump codecov from 3.6.2 to 3.6.4 [`#2943`](https://github.com/Human-Connection/Human-Connection/pull/2943) +- build(deps-dev): bump @storybook/addon-actions in /webapp [`#2953`](https://github.com/Human-Connection/Human-Connection/pull/2953) +- build(deps): bump metascraper-publisher in /backend [`#2954`](https://github.com/Human-Connection/Human-Connection/pull/2954) +- build(deps-dev): bump eslint-plugin-import in /backend [`#2955`](https://github.com/Human-Connection/Human-Connection/pull/2955) +- build(deps): bump metascraper-youtube from 5.10.6 to 5.10.7 in /backend [`#2957`](https://github.com/Human-Connection/Human-Connection/pull/2957) +- build(deps): bump metascraper-image from 5.10.6 to 5.10.7 in /backend [`#2960`](https://github.com/Human-Connection/Human-Connection/pull/2960) +- build(deps-dev): bump @storybook/vue from 5.3.9 to 5.3.10 in /webapp [`#2961`](https://github.com/Human-Connection/Human-Connection/pull/2961) +- build(deps): bump @nuxtjs/axios from 5.9.4 to 5.9.5 in /webapp [`#2962`](https://github.com/Human-Connection/Human-Connection/pull/2962) +- fix: Update mute/unmute icon to unused icon [`#2973`](https://github.com/Human-Connection/Human-Connection/pull/2973) +- fix: Remove github release script breaking build [`#2971`](https://github.com/Human-Connection/Human-Connection/pull/2971) +- Use original createdAt for merged users/emails [`#2969`](https://github.com/Human-Connection/Human-Connection/pull/2969) +- Fix typo [`#2966`](https://github.com/Human-Connection/Human-Connection/pull/2966) +- chore: Update to v0.3.0 [`#2941`](https://github.com/Human-Connection/Human-Connection/pull/2941) +- Replace buildList with array of Promises [`46edc3f`](https://github.com/Human-Connection/Human-Connection/commit/46edc3fdd5b83c2f00506f595b1254d7597767e0) +- build(deps-dev): bump @storybook/addon-notes in /webapp [`75137ce`](https://github.com/Human-Connection/Human-Connection/commit/75137ce716dadcc6f0ceeed6a2b0fe5c50fa7b8f) +- Update to v0.3.0 [`dbe2c4c`](https://github.com/Human-Connection/Human-Connection/commit/dbe2c4cdd5bab2195c6369b84989507b9f7da768) + #### [v0.3.0](https://github.com/Human-Connection/Human-Connection/compare/v0.2.1...v0.3.0) > 31 January 2020 +- build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /webapp [`#2939`](https://github.com/Human-Connection/Human-Connection/pull/2939) - feat: 🍰 Direct Reply On Comment [`#2608`](https://github.com/Human-Connection/Human-Connection/pull/2608) - build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /backend [`#2938`](https://github.com/Human-Connection/Human-Connection/pull/2938) - fix: deploy script with new naming convention [`#2930`](https://github.com/Human-Connection/Human-Connection/pull/2930) @@ -181,9 +238,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - refactor(modules): Various import fixes [`#2773`](https://github.com/Human-Connection/Human-Connection/issues/2773) [`#2774`](https://github.com/Human-Connection/Human-Connection/issues/2774) - feat(webapp): Display deployed version in footer [`#1831`](https://github.com/Human-Connection/Human-Connection/issues/1831) - fix #2229 [`#2229`](https://github.com/Human-Connection/Human-Connection/issues/2229) -- refactor: Make `db:setup` init stage of `migrate` [`b063847`](https://github.com/Human-Connection/Human-Connection/commit/b063847849a84db885337dc8e84e75ddaf87011f) -- Improve styling per @alina-beck review [`bcc1ab1`](https://github.com/Human-Connection/Human-Connection/commit/bcc1ab167e8b1dfdac1ec0a05a0c14e8234bcabc) -- test(cypress): Cover "Pinned post" feature [`d49afc2`](https://github.com/Human-Connection/Human-Connection/commit/d49afc25cfa1c1f98ed04f78dd3ff826cd85ae25) +- Get rid of different factory files [`fc36729`](https://github.com/Human-Connection/Human-Connection/commit/fc367297e3e054f09b7f8f31788ab68d87f6babf) +- Refactor factory for comments [`2fc71d7`](https://github.com/Human-Connection/Human-Connection/commit/2fc71d75a5d5eab9c3467e94e00257ef6dd7d8a0) +- Refactor user factory [`2a79c53`](https://github.com/Human-Connection/Human-Connection/commit/2a79c53765b73f9b91691eb75f55cf8c9e48306e) #### [v0.2.1](https://github.com/Human-Connection/Human-Connection/compare/v0.2.0...v0.2.1) diff --git a/backend/package.json b/backend/package.json index 98672be83..188681945 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "human-connection-backend", - "version": "0.2.2", + "version": "0.3.1", "description": "GraphQL Backend for Human Connection", "main": "src/index.js", "scripts": { @@ -95,7 +95,7 @@ "nodemailer": "^6.4.2", "nodemailer-html-to-text": "^3.1.0", "npm-run-all": "~4.1.5", - "request": "~2.88.0", + "request": "~2.88.2", "sanitize-html": "~1.21.1", "slug": "~2.1.1", "subscriptions-transport-ws": "^0.9.16", @@ -132,5 +132,8 @@ "prettier": "~1.19.1", "rosie": "^2.0.1", "supertest": "~4.0.2" + }, + "resolutions": { + "fs-capacitor": "6.0.0" } } diff --git a/backend/src/server.js b/backend/src/server.js index d64ee72f1..4df73559d 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -11,6 +11,7 @@ import webfinger from './activitypub/routes/webfinger' import { RedisPubSub } from 'graphql-redis-subscriptions' import { PubSub } from 'graphql-subscriptions' import Redis from 'ioredis' +import bodyParser from 'body-parser' export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED' const { REDIS_DOMAIN, REDIS_PORT, REDIS_PASSWORD } = CONFIG @@ -82,6 +83,8 @@ const createServer = options => { app.use(helmet()) app.use('/.well-known/', webfinger()) app.use(express.static('public')) + app.use(bodyParser.json({ limit: '10mb' })) + app.use(bodyParser.urlencoded({ limit: '10mb', extended: true })) server.applyMiddleware({ app, path: '/' }) const httpServer = http.createServer(app) server.installSubscriptionHandlers(httpServer) diff --git a/backend/yarn.lock b/backend/yarn.lock index 466dc9bdc..8d9d8e42d 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -4212,10 +4212,10 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= -fs-capacitor@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-2.0.4.tgz#5a22e72d40ae5078b4fe64fe4d08c0d3fc88ad3c" - integrity sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA== +fs-capacitor@6.0.0, fs-capacitor@^2.0.4: + version "6.0.0" + resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-6.0.0.tgz#b4b89e3281d61df1c573e788d9ee6ec4c7c94da4" + integrity sha512-I+jZLV2q+ivQK/+Mu5FIYAECHgjoo8GBYJsBBQbNeU0aW1m25LU4E+MkLNq0kcJBjrp8Z6fhxpSeS8SyJyGkrw== fs-minipass@^1.2.5: version "1.2.6" @@ -4554,7 +4554,7 @@ har-schema@^2.0.0: resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= -har-validator@~5.1.0: +har-validator@~5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== @@ -6369,24 +6369,12 @@ migrate@^1.6.2: mkdirp "^0.5.1" slug "^0.9.2" -mime-db@1.40.0: - version "1.40.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" - integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== - mime-db@1.43.0: version "1.43.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== -mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.22, mime-types@~2.1.24: - version "2.1.24" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" - integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== - dependencies: - mime-db "1.40.0" - -mime-types@~2.1.26: +mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.22, mime-types@~2.1.24, mime-types@~2.1.26: 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== @@ -7372,7 +7360,7 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -psl@^1.1.24, psl@^1.1.28: +psl@^1.1.28: version "1.3.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.3.0.tgz#e1ebf6a3b5564fa8376f3da2275da76d875ca1bd" integrity sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag== @@ -7395,11 +7383,6 @@ punycode2@~1.0.0: resolved "https://registry.yarnpkg.com/punycode2/-/punycode2-1.0.0.tgz#e2b4b9a9a8ff157d0b84438e203181ee7892dfd8" integrity sha1-4rS5qaj/FX0LhEOOIDGB7niS39g= -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" @@ -7689,10 +7672,10 @@ 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.0: - version "2.88.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" - integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== +request@^2.88.0, 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== dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -7701,7 +7684,7 @@ request@^2.88.0, request@~2.88.0: extend "~3.0.2" forever-agent "~0.6.1" form-data "~2.3.2" - har-validator "~5.1.0" + har-validator "~5.1.3" http-signature "~1.2.0" is-typedarray "~1.0.0" isstream "~0.1.2" @@ -7711,7 +7694,7 @@ request@^2.88.0, request@~2.88.0: performance-now "^2.1.0" qs "~6.5.2" safe-buffer "^5.1.2" - tough-cookie "~2.4.3" + tough-cookie "~2.5.0" tunnel-agent "^0.6.0" uuid "^3.3.2" @@ -7984,6 +7967,11 @@ serve-static@1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" @@ -8739,7 +8727,7 @@ touch@^3.1.0: dependencies: nopt "~1.0.10" -tough-cookie@^2.3.3: +tough-cookie@^2.3.3, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -8756,14 +8744,6 @@ tough-cookie@^3.0.1: psl "^1.1.28" punycode "^2.1.1" -tough-cookie@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== - dependencies: - psl "^1.1.24" - punycode "^1.4.1" - tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" diff --git a/deployment/.gitignore b/deployment/.gitignore index 14cfa18ed..61e591624 100644 --- a/deployment/.gitignore +++ b/deployment/.gitignore @@ -2,3 +2,5 @@ secrets.yaml configmap.yaml **/secrets.yaml **/configmap.yaml +**/staging-values.yaml +**/production-values.yaml \ No newline at end of file diff --git a/deployment/README.md b/deployment/README.md index 0615ccf9b..09dcd5f00 100644 --- a/deployment/README.md +++ b/deployment/README.md @@ -1,11 +1,10 @@ # Human-Connection Nitro \| Deployment Configuration -We deploy with [kubernetes](https://kubernetes.io/). In order to deploy your own -network you have to [install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) -and get a kubernetes cluster. +There are a couple different ways we have tested to deploy an instance of Human Connection, with [kubernetes](https://kubernetes.io/) and via [Helm](https://helm.sh/docs/). In order to manage your own +network, you have to [install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/), [install Helm](https://helm.sh/docs/intro/install/) (optional, but the preferred way), +and set up a kubernetes cluster. Since there are many different options to host your cluster, we won't go into specifics here. We have tested two different kubernetes providers: [Minikube](./minikube/README.md) and [Digital Ocean](./digital-ocean/README.md). -Check out the specific documentation for your provider. After that, learn how -to apply the specific kubernetes configuration for [Human Connection](./human-connection/README.md). +Check out the specific documentation for your provider. After that, choose whether you want to go with the recommended deploy option [Helm](./helm/README.md), or use kubernetes to apply the configuration for [Human Connection](./human-connection/README.md). diff --git a/deployment/helm/human-connection/.helmignore b/deployment/helm/human-connection/.helmignore new file mode 100644 index 000000000..50af03172 --- /dev/null +++ b/deployment/helm/human-connection/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/human-connection/Chart.yaml new file mode 100644 index 000000000..525d5a8e8 --- /dev/null +++ b/deployment/helm/human-connection/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +appVersion: "0.3.1" +description: A Helm chart for Human Connection +name: human-connection +version: 0.1.0 diff --git a/deployment/helm/human-connection/README.md b/deployment/helm/human-connection/README.md new file mode 100644 index 000000000..444f9da15 --- /dev/null +++ b/deployment/helm/human-connection/README.md @@ -0,0 +1,72 @@ +# Helm installation of Human Connection + +Deploying Human Connection with Helm is very straight forward. All you have to +do is to change certain parameters, like domain names and API keys, then you +just install our provided Helm chart to your cluster. + +## Configuration + +You can customize the network with your configuration by changing the `values.yaml`, all variables will be available as +environment variables in your deployed kubernetes pods. + +Probably you want to change this environment variable to your actual domain: + +```bash +# in folder /deployment/helm +CLIENT_URI: "https://develop.human-connection.org" +``` + +If you want to edit secrets, you have to `base64` encode them. See [kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/secret/#creating-a-secret-manually). You can also use `helm-secrets`, but we have yet to test it. + +```bash +# example how to base64 a string: +$ echo -n 'admin' | base64 +YWRtaW4= +``` +Those secrets get `base64` decoded and are available as environment variables in +your deployed kubernetes pods. + +# https +If you start with setting up the `https`, when you install the app, it will automatically take care of the certificates for you. + +First check that you are using `Helm v3`, this is important since it removes the need for `Tiller`. See, [FAQ](https://helm.sh/docs/faq/#removal-of-tiller) + +```bash +$ helm version +# output should look similar to this: +#version.BuildInfo{Version:"v3.0.2", GitCommit:"19e47ee3283ae98139d98460de796c1be1e3975f", GitTreeState:"clean", GoVersion:"go1.13.5"} +``` + +Apply cert-manager CRDs before installing (or it will fail) + +```bash +$ kubectl apply --validate=false -f https://raw.githubusercontent.com/jetstack/cert-manager/release-0.13.0/deploy/manifests/00-crds.yaml +``` + +Next, create the `cert-manager` namespace +```bash +$ kubectl create namespace cert-manager +``` +Add the `jetstack` repo and update + +```bash +$ helm repo add jetstack https://charts.jetstack.io +$ helm repo update +``` + +Install cert-manager +```bash +$ helm install cert-manager --namespace cert-manager --version v0.13.0 jetstack/cert-manager +``` + +# Deploy + +Once you are satisfied with the configuration, you can install the app. + +```bash +# in folder /deployment/helm/human-connection +$ helm install develop ./ --namespace human-connection +``` +Where `develop` is the release name, in this case develop for our develop server and `human-connection` is the namespace, again customize for your needs. The release name can be anything you want. Just keep in mind that it is used in the templates to prepend the `CLIENT_URI` and other places. + +This will set up everything you need for the network, including `deployments`, and their `pods`, `services`, `ingress`, `volumes`(PersitentVolumes), `PersistentVolumeClaims`, and even `ClusterIssuers` for https certificates. diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml new file mode 100644 index 000000000..ac11e76b8 --- /dev/null +++ b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml @@ -0,0 +1,20 @@ +apiVersion: cert-manager.io/v1alpha2 +kind: ClusterIssuer +metadata: + name: letsencrypt-prod + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + acme: + server: https://acme-v02.api.letsencrypt.org/directory + email: {{ .Values.supportEmail }} + privateKeySecretRef: + name: letsencrypt-prod + solvers: + - http01: + ingress: + class: nginx diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml new file mode 100644 index 000000000..cc9d9fdd7 --- /dev/null +++ b/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml @@ -0,0 +1,20 @@ +apiVersion: cert-manager.io/v1alpha2 +kind: ClusterIssuer +metadata: + name: letsencrypt-staging + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + acme: + server: https://acme-staging-v02.api.letsencrypt.org/directory + email: {{ .Values.supportEmail }} + privateKeySecretRef: + name: letsencrypt-staging + solvers: + - http01: + ingress: + class: nginx diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml new file mode 100644 index 000000000..33aa8a0e0 --- /dev/null +++ b/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml @@ -0,0 +1,58 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }}-backend + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + replicas: 1 + minReadySeconds: 15 + progressDeadlineSeconds: 60 + strategy: + rollingUpdate: + maxSurge: 0 + maxUnavailable: "100%" + selector: + matchLabels: + human-connection.org/selector: deployment-backend + template: + metadata: + name: deployment-backend + annotations: + backup.velero.io/backup-volumes: uploads + labels: + human-connection.org/commit: {{ .Values.commit }} + human-connection.org/selector: deployment-backend + spec: + containers: + - name: backend + image: "{{ .Values.backendImage }}:{{ .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + envFrom: + - configMapRef: + name: {{ .Release.Name }}-configmap + - secretRef: + name: {{ .Release.Name }}-secrets + ports: + - containerPort: 4000 + protocol: TCP + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /nitro-backend/public/uploads + name: uploads + dnsPolicy: ClusterFirst + restartPolicy: Always + schedulerName: default-scheduler + securityContext: {} + terminationGracePeriodSeconds: 30 + volumes: + - name: uploads + persistentVolumeClaim: + claimName: uploads-claim +status: {} diff --git a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml new file mode 100644 index 000000000..85c587197 --- /dev/null +++ b/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml @@ -0,0 +1,40 @@ +{{- if .Values.developmentMailserverDomain }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }}-mailserver + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + replicas: 1 + minReadySeconds: 15 + progressDeadlineSeconds: 60 + selector: + matchLabels: + human-connection.org/selector: deployment-mailserver + template: + metadata: + labels: + human-connection.org/selector: deployment-mailserver + name: mailserver + spec: + containers: + - name: mailserver + image: djfarrelly/maildev + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - containerPort: 80 + - containerPort: 25 + envFrom: + - configMapRef: + name: {{ .Release.Name }}-configmap + - secretRef: + name: {{ .Release.Name }}-secrets + restartPolicy: Always + terminationGracePeriodSeconds: 30 +status: {} +{{- end}} diff --git a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml new file mode 100644 index 000000000..b12069f7e --- /dev/null +++ b/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml @@ -0,0 +1,32 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }}-maintenance + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + selector: + matchLabels: + human-connection.org/selector: deployment-maintenance + template: + metadata: + labels: + human-connection.org/commit: {{ .Values.commit }} + human-connection.org/selector: deployment-maintenance + name: maintenance + spec: + containers: + - name: maintenance + env: + - name: HOST + value: 0.0.0.0 + image: "{{ .Values.maintenanceImage }}:{{ .Chart.AppVersion }}" + ports: + - containerPort: 80 + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 diff --git a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml new file mode 100644 index 000000000..ae244fdce --- /dev/null +++ b/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml @@ -0,0 +1,52 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }}-neo4j + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + replicas: 1 + strategy: + rollingUpdate: + maxSurge: 0 + maxUnavailable: "100%" + selector: + matchLabels: + human-connection.org/selector: deployment-neo4j + template: + metadata: + name: neo4j + annotations: + backup.velero.io/backup-volumes: neo4j-data + labels: + human-connection.org/commit: {{ .Values.commit }} + human-connection.org/selector: deployment-neo4j + spec: + containers: + - name: neo4j + image: "{{ .Values.neo4jImage }}:{{ .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - containerPort: 7687 + - containerPort: 7474 + resources: + requests: + memory: {{ .Values.neo4jResourceRequestsMemory | default "1G" | quote }} + limits: + memory: {{ .Values.neo4jResourceLimitsMemory | default "1G" | quote }} + envFrom: + - configMapRef: + name: {{ .Release.Name }}-configmap + volumeMounts: + - mountPath: /data/ + name: neo4j-data + volumes: + - name: neo4j-data + persistentVolumeClaim: + claimName: neo4j-data-claim + restartPolicy: Always + terminationGracePeriodSeconds: 30 diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml new file mode 100644 index 000000000..3314f7ec0 --- /dev/null +++ b/deployment/helm/human-connection/templates/deployments/deployment-web.yaml @@ -0,0 +1,43 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }}-webapp + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + replicas: 2 + minReadySeconds: 15 + progressDeadlineSeconds: 60 + selector: + matchLabels: + human-connection.org/selector: deployment-webapp + template: + metadata: + name: webapp + labels: + human-connection.org/commit: {{ .Values.commit }} + human-connection.org/selector: deployment-webapp + spec: + containers: + - name: webapp + image: "{{ .Values.webappImage }}:{{ .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + envFrom: + - configMapRef: + name: {{ .Release.Name }}-configmap + - secretRef: + name: {{ .Release.Name }}-secrets + env: + - name: HOST + value: 0.0.0.0 + ports: + - containerPort: 3000 + resources: {} + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 +status: {} diff --git a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml new file mode 100644 index 000000000..eb8dd65be --- /dev/null +++ b/deployment/helm/human-connection/templates/ingress/ingress.template.yaml @@ -0,0 +1,36 @@ +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: {{ .Release.Name }}-ingress + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + annotations: + kubernetes.io/ingress.class: "nginx" + cert-manager.io/cluster-issuer: {{ .Values.letsencryptIssuer }} + nginx.ingress.kubernetes.io/proxy-body-size: 10m +spec: + tls: + - hosts: + - {{ .Values.domain }} + secretName: tls + rules: + - host: {{ .Values.domain }} + http: + paths: + - path: / + backend: + serviceName: {{ .Release.Name }}-webapp + servicePort: 3000 +{{- if .Values.developmentMailserverDomain }} + - host: {{ .Values.developmentMailserverDomain }} + http: + paths: + - path: / + backend: + serviceName: {{ .Release.Name }}-mailserver + servicePort: 80 +{{- end }} diff --git a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml new file mode 100644 index 000000000..8a924f44b --- /dev/null +++ b/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml @@ -0,0 +1,29 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ .Release.Name }}-db-migrations + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + annotations: + "helm.sh/hook": post-upgrade + "helm.sh/hook-weight": "5" + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed +spec: + template: + metadata: + name: {{ .Release.Name }} + spec: + restartPolicy: Never + containers: + - name: db-migrations-job + image: "{{ .Values.backendImage }}:latest" + command: ["/bin/sh", "-c", "{{ .Values.dbMigrations }}"] + envFrom: + - configMapRef: + name: {{ .Release.Name }}-configmap + - secretRef: + name: {{ .Release.Name }}-secrets \ No newline at end of file diff --git a/deployment/helm/human-connection/templates/services/service-backend.yaml b/deployment/helm/human-connection/templates/services/service-backend.yaml new file mode 100644 index 000000000..af23e6910 --- /dev/null +++ b/deployment/helm/human-connection/templates/services/service-backend.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-backend + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + ports: + - name: graphql + port: 4000 + targetPort: 4000 + selector: + human-connection.org/selector: deployment-backend diff --git a/deployment/helm/human-connection/templates/services/service-mailserver.yaml b/deployment/helm/human-connection/templates/services/service-mailserver.yaml new file mode 100644 index 000000000..685becb1d --- /dev/null +++ b/deployment/helm/human-connection/templates/services/service-mailserver.yaml @@ -0,0 +1,22 @@ +{{- if .Values.developmentMailserverDomain }} +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-mailserver + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + ports: + - name: web + port: 80 + targetPort: 80 + - name: smtp + port: 25 + targetPort: 25 + selector: + human-connection.org/selector: deployment-mailserver +{{- end}} diff --git a/deployment/helm/human-connection/templates/services/service-maintenance.yaml b/deployment/helm/human-connection/templates/services/service-maintenance.yaml new file mode 100644 index 000000000..d641ca8ba --- /dev/null +++ b/deployment/helm/human-connection/templates/services/service-maintenance.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-maintenance + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + ports: + - name: web + port: 80 + targetPort: 80 + selector: + human-connection.org/selector: deployment-maintenance diff --git a/deployment/helm/human-connection/templates/services/service-neo4j.yaml b/deployment/helm/human-connection/templates/services/service-neo4j.yaml new file mode 100644 index 000000000..f5c7d5b38 --- /dev/null +++ b/deployment/helm/human-connection/templates/services/service-neo4j.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-neo4j + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + ports: + - name: bolt + port: 7687 + targetPort: 7687 + - name: web + port: 7474 + targetPort: 7474 + selector: + human-connection.org/selector: deployment-neo4j diff --git a/deployment/helm/human-connection/templates/services/service-webapp.yaml b/deployment/helm/human-connection/templates/services/service-webapp.yaml new file mode 100644 index 000000000..d762c2a55 --- /dev/null +++ b/deployment/helm/human-connection/templates/services/service-webapp.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-webapp + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: human-connection + app.kubernetes.io/version: {{ .Chart.AppVersion }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" +spec: + ports: + - name: {{ .Release.Name }}-webapp + port: 3000 + protocol: TCP + targetPort: 3000 + selector: + human-connection.org/selector: deployment-webapp diff --git a/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml b/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml new file mode 100644 index 000000000..3f85d3ae8 --- /dev/null +++ b/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: neo4j-data-claim +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: {{ .Values.neo4jStorage }} diff --git a/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml b/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml new file mode 100644 index 000000000..7eb81135b --- /dev/null +++ b/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml @@ -0,0 +1,16 @@ + +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: uploads-claim +spec: + dataSource: + name: uploads-snapshot + kind: VolumeSnapshot + apiGroup: snapshot.storage.k8s.io + accessModes: + - ReadWriteOnce + resources: + requests: + storage: {{ .Values.uploadsStorage }} + diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml new file mode 100644 index 000000000..f30704f89 --- /dev/null +++ b/deployment/helm/human-connection/values.yaml @@ -0,0 +1,53 @@ +# domain is the user-facing domain. +domain: develop.human-connection.org +# commit is the latest github commit deployed. +commit: 889a7cdd24dda04a139b2b77d626e984d6db6781 +# dbInitialization runs the database initializations in a post-install hook. +dbInitializion: "yarn prod:migrate init" +# dbMigrations runs the database migrations in a post-upgrade hook. +dbMigrations: "yarn prod:migrate up" +# bakendImage is the docker image for the backend deployment +backendImage: humanconnection/nitro-backend +# maintenanceImage is the docker image for the maintenance deployment +maintenanceImage: humanconnection/maintenance +# neo4jImage is the docker image for the neo4j deployment +neo4jImage: humanconnection/neo4j +# webappImage is the docker image for the webapp deployment +webappImage: humanconnection/nitro-web +# image configures pullPolicy related to the docker images +image: + # pullPolicy indicates when, if ever, pods pull a new image from docker hub. + pullPolicy: IfNotPresent +# letsencryptIssuer is used by cert-manager to set up certificates with the given provider. +letsencryptIssuer: "letsencrypt-prod" +# neo4jConfig changes any default neo4j config/adds it. +neo4jConfig: + # acceptLicenseAgreement is used to agree to the license agreement for neo4j's enterprise edition. + acceptLicenseAgreement: \"yes\" + # apocImportFileEnabled enables the import of files to neo4j using the plugin apoc + apocImportFileEnabled: \"true\" + # dbmsMemoryHeapInitialSize configures initial heap size. By default, it is calculated based on available system resources.(valid units are `k`, `K`, `m`, `M`, `g`, `G`) + dbmsMemoryHeapInitialSize: "500M" + # dbmsMemoryHeapMaxSize configures maximum heap size. By default it is calculated based on available system resources.(valid units are `k`, `K`, `m`, `M`, `g`, `G`) + dbmsMemoryHeapMaxSize: "500M" + # dbmsMemoryPagecacheSize configures the amount of memory to use for mapping the store files, in bytes (or 'k', 'm', and 'g') + dbmsMemoryPagecacheSize: "490M" +# neo4jResourceLimitsMemory configures the memory limits available. +neo4jResourceLimitsMemory: "2G" +# neo4jResourceLimitsMemory configures the memory available for requests. +neo4jResourceRequestsMemory: "1G" +# supportEmail is used for letsencrypt certs. +supportEmail: "devcom@human-connection.org" +# smtpHost is the host for the mailserver. +smtpHost: "mailserver.human-connection.org" +# smtpPort is the port to be used for the mailserver. +smtpPort: \"25\" +# jwtSecret is used to encode/decode a user's JWT for authentication +jwtSecret: "Yi8mJjdiNzhCRiZmdi9WZA==" +# privateKeyPassphrase is used for activity pub +privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4" +# mapboxToken is used for the Mapbox API, geolocalization. +mapboxToken: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1E=" +uploadsStorage: "25Gi" +neo4jStorage: "5Gi" +developmentMailserverDomain: nitro-mailserver.human-connection.org \ No newline at end of file diff --git a/deployment/human-connection/deployment-backend.yaml b/deployment/human-connection/deployment-backend.yaml index 0f75127e5..00aab9ffd 100644 --- a/deployment/human-connection/deployment-backend.yaml +++ b/deployment/human-connection/deployment-backend.yaml @@ -38,7 +38,7 @@ spec: name: human-connection image: humanconnection/nitro-backend:latest imagePullPolicy: Always - name: nitro-backend + name: backend ports: - containerPort: 4000 protocol: TCP diff --git a/deployment/volumes/neo4j-data.yaml b/deployment/volumes/neo4j-data.yaml index 1f453a684..c060750ec 100644 --- a/deployment/volumes/neo4j-data.yaml +++ b/deployment/volumes/neo4j-data.yaml @@ -9,4 +9,4 @@ - ReadWriteOnce resources: requests: - storage: 5Gi + storage: {{ .Values.neo4jStorage }} diff --git a/deployment/volumes/uploads.yaml b/deployment/volumes/uploads.yaml index 2bd64c9ee..c174bf2cb 100644 --- a/deployment/volumes/uploads.yaml +++ b/deployment/volumes/uploads.yaml @@ -9,4 +9,4 @@ - ReadWriteOnce resources: requests: - storage: 25Gi + storage: {{ .Values.uploadsStorage }} diff --git a/deployment/volumes/volume-snapshots/snapshot.yaml b/deployment/volumes/volume-snapshots/snapshot.yaml index 3c3487e14..10a22daf5 100644 --- a/deployment/volumes/volume-snapshots/snapshot.yaml +++ b/deployment/volumes/volume-snapshots/snapshot.yaml @@ -2,9 +2,9 @@ apiVersion: snapshot.storage.k8s.io/v1alpha1 kind: VolumeSnapshot metadata: - name: neo4j-data-snapshot + name: uploads-snapshot namespace: human-connection spec: source: - name: neo4j-data-claim + name: uploads-claim kind: PersistentVolumeClaim diff --git a/package.json b/package.json index f50c1dadf..ec54cdb7e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "human-connection", - "version": "0.3.0", + "version": "0.3.1", "description": "Fullstack and API tests with cypress and cucumber for Human Connection", "author": "Human Connection gGmbh", "license": "MIT", diff --git a/webapp/package.json b/webapp/package.json index 0d36bef1d..50f68c868 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,6 @@ { "name": "human-connection-webapp", - "version": "0.2.2", + "version": "0.3.1", "description": "Human Connection Frontend", "authors": [ "Grzegorz Leoniec (appinteractive)", @@ -99,10 +99,10 @@ "@babel/core": "~7.8.4", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/preset-env": "~7.8.4", - "@storybook/addon-a11y": "^5.3.12", + "@storybook/addon-a11y": "^5.3.13", "@storybook/addon-actions": "^5.3.12", - "@storybook/addon-notes": "^5.3.12", - "@storybook/vue": "~5.3.12", + "@storybook/addon-notes": "^5.3.13", + "@storybook/vue": "~5.3.13", "@vue/cli-shared-utils": "~4.2.2", "@vue/eslint-config-prettier": "~6.0.0", "@vue/server-test-utils": "~1.0.0-beta.31", @@ -142,7 +142,7 @@ "style-resources-loader": "~1.3.3", "vue-jest": "~3.0.5", "vue-loader": "~15.8.3", - "vue-svg-loader": "~0.15.0", + "vue-svg-loader": "~0.16.0", "vue-template-compiler": "^2.6.11" } } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index d5d6cf14b..abe5d0f6a 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2103,17 +2103,17 @@ dependencies: type-detect "4.0.8" -"@storybook/addon-a11y@^5.3.12": - version "5.3.12" - resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.12.tgz#859470d07296bd950aa867e4e1d9ce5b2c668437" - integrity sha512-jqm0y8e50rHtkkIi8EoWyxIgCPFnQJs8fOQHZlYPhOuZ+bnsSPVprFQ9gLqAuY13rF26NZwWCPVyR7v9VR9vPw== +"@storybook/addon-a11y@^5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.13.tgz#7c2c9b89428a7881ab9dfe2912817767d9cd5753" + integrity sha512-wq9943/EETV+KZtdtGN5cMYwlAb4cMU4jelCpqNFUkGQ2ScMH6aOqUb8hP1coCXPZN0s86yPZp6tCmPTmkjhdA== dependencies: - "@storybook/addons" "5.3.12" - "@storybook/api" "5.3.12" - "@storybook/client-logger" "5.3.12" - "@storybook/components" "5.3.12" - "@storybook/core-events" "5.3.12" - "@storybook/theming" "5.3.12" + "@storybook/addons" "5.3.13" + "@storybook/api" "5.3.13" + "@storybook/client-logger" "5.3.13" + "@storybook/components" "5.3.13" + "@storybook/core-events" "5.3.13" + "@storybook/theming" "5.3.13" axe-core "^3.3.2" core-js "^3.0.1" global "^4.3.2" @@ -2145,18 +2145,18 @@ react-inspector "^4.0.0" uuid "^3.3.2" -"@storybook/addon-notes@^5.3.12": - version "5.3.12" - resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.12.tgz#979aa20d701f4b4a8a2e411a55b183648fea5cac" - integrity sha512-j00wcQLb/a/f95OzYTN12rO54SvaIvpZEy5a4B+ZxmeH2/krd908tdqKMfJq4IoQv8v/WfbYCUXVaSL6Kgqhiw== +"@storybook/addon-notes@^5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.13.tgz#aea8fc9eb95a397cdf13dfeea3bb401608f0f5c6" + integrity sha512-DKM4ih3Ns+vGira4PUsjRg7LAyzhsYmq/Rr4yOkOqO0o8Z/ElWw/uMcygvKEfTqJGm7n8kaCzZVz/YmRkAbfJA== dependencies: - "@storybook/addons" "5.3.12" - "@storybook/api" "5.3.12" - "@storybook/client-logger" "5.3.12" - "@storybook/components" "5.3.12" - "@storybook/core-events" "5.3.12" - "@storybook/router" "5.3.12" - "@storybook/theming" "5.3.12" + "@storybook/addons" "5.3.13" + "@storybook/api" "5.3.13" + "@storybook/client-logger" "5.3.13" + "@storybook/components" "5.3.13" + "@storybook/core-events" "5.3.13" + "@storybook/router" "5.3.13" + "@storybook/theming" "5.3.13" core-js "^3.0.1" global "^4.3.2" markdown-to-jsx "^6.10.3" @@ -2190,6 +2190,19 @@ global "^4.3.2" util-deprecate "^1.0.2" +"@storybook/addons@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.13.tgz#8c16fbab1142e2cd4bdfb93ffcb35a883dac2866" + integrity sha512-Yjn8PXhSYw4bnB/l8ybhMw3eqpJlV3HlwMECYhRtVm+wTqal9OQlZkam5xclWm6PF/6DhyiPCt6vlXN3vfVGPA== + dependencies: + "@storybook/api" "5.3.13" + "@storybook/channels" "5.3.13" + "@storybook/client-logger" "5.3.13" + "@storybook/core-events" "5.3.13" + core-js "^3.0.1" + global "^4.3.2" + util-deprecate "^1.0.2" + "@storybook/api@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f" @@ -2239,6 +2252,32 @@ telejson "^3.2.0" util-deprecate "^1.0.2" +"@storybook/api@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.13.tgz#51cbdb461ff2ee8468a3c54411f42f07aa307f5d" + integrity sha512-ZOBUOz0aRPD7w8UngcVOjwcXt417Zboi0ERW+Atn22ZUYqI3zri8M9EerLHvyKw7J42/gEIqQqg5PyfPcLJmeQ== + dependencies: + "@reach/router" "^1.2.1" + "@storybook/channels" "5.3.13" + "@storybook/client-logger" "5.3.13" + "@storybook/core-events" "5.3.13" + "@storybook/csf" "0.0.1" + "@storybook/router" "5.3.13" + "@storybook/theming" "5.3.13" + "@types/reach__router" "^1.2.3" + core-js "^3.0.1" + fast-deep-equal "^2.0.1" + global "^4.3.2" + lodash "^4.17.15" + memoizerific "^1.11.3" + prop-types "^15.6.2" + react "^16.8.3" + semver "^6.0.0" + shallow-equal "^1.1.0" + store2 "^2.7.1" + telejson "^3.2.0" + util-deprecate "^1.0.2" + "@storybook/channel-postmessage@5.3.12": version "5.3.12" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.12.tgz#945c9702f335018f6224af3159bf4d33c66a131e" @@ -2250,6 +2289,17 @@ global "^4.3.2" telejson "^3.2.0" +"@storybook/channel-postmessage@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.13.tgz#80cf8136bf4b96b2f9b291d3cc81e5d02abecc98" + integrity sha512-FMrl49ipHPXB0XPuwXm/2GWM5b53iFFz9V4/SQC1s31kxAU99QFmWXWvRKbM29FpAVHvTdjQllIiOWgdTH8jAA== + dependencies: + "@storybook/channels" "5.3.13" + "@storybook/client-logger" "5.3.13" + core-js "^3.0.1" + global "^4.3.2" + telejson "^3.2.0" + "@storybook/channels@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202" @@ -2264,6 +2314,13 @@ dependencies: core-js "^3.0.1" +"@storybook/channels@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.13.tgz#2adf4595988e2586f1a360cf4760f16338ffec26" + integrity sha512-lD4HXmfoKJAnAlAYwQJ5dDXG3WnW7jpW3wJieRwvQGDFHQSXdJ3Lv5/zv2y+TM06Jx8O2esaepNw+VzjMw3/Qg== + dependencies: + core-js "^3.0.1" + "@storybook/client-api@5.3.12": version "5.3.12" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.12.tgz#7c18921d0290b30b020ad7d41fbda170009780bd" @@ -2287,6 +2344,29 @@ ts-dedent "^1.1.0" util-deprecate "^1.0.2" +"@storybook/client-api@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.13.tgz#0d41ae3846a6ae2ebbbeef0ca945c3ee6448ba2e" + integrity sha512-GZCFtpU764X8TW+RYRNybIGHKJOa2fYW28I0hEPXXE0J4BeU4Z++SCeNhVBa+0tPoQ3jbsdA7M4Q5Q5UeaG2Nw== + dependencies: + "@storybook/addons" "5.3.13" + "@storybook/channel-postmessage" "5.3.13" + "@storybook/channels" "5.3.13" + "@storybook/client-logger" "5.3.13" + "@storybook/core-events" "5.3.13" + "@storybook/csf" "0.0.1" + "@types/webpack-env" "^1.15.0" + core-js "^3.0.1" + eventemitter3 "^4.0.0" + global "^4.3.2" + is-plain-object "^3.0.0" + lodash "^4.17.15" + memoizerific "^1.11.3" + qs "^6.6.0" + stable "^0.1.8" + ts-dedent "^1.1.0" + util-deprecate "^1.0.2" + "@storybook/client-logger@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779" @@ -2301,6 +2381,13 @@ dependencies: core-js "^3.0.1" +"@storybook/client-logger@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.13.tgz#1c2abf0fc53009cf159eb76e30cf32ce2b9327b1" + integrity sha512-unfhCgsGWWqNpM8t8S5coDcTgpWtOq3Kj4LEHivNjdHZFdf8WMLidW79ZTiyk/Nzx7RvZKgkvf7f6EtZniD55w== + dependencies: + core-js "^3.0.1" + "@storybook/components@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99" @@ -2353,6 +2440,33 @@ simplebar-react "^1.0.0-alpha.6" ts-dedent "^1.1.0" +"@storybook/components@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.13.tgz#646f8347ffa38298e3f9c1d15866c2167f577027" + integrity sha512-AwMnLCStwqLWsBzXp7m/QXuJin//0l4FH+OXmnD/6GC8qEy4JuutEOPW35IE/Mp9KAvbapHcnPTRMmDohUsTcw== + dependencies: + "@storybook/client-logger" "5.3.13" + "@storybook/theming" "5.3.13" + "@types/react-syntax-highlighter" "11.0.2" + "@types/react-textarea-autosize" "^4.3.3" + core-js "^3.0.1" + global "^4.3.2" + lodash "^4.17.15" + markdown-to-jsx "^6.9.1" + memoizerific "^1.11.3" + polished "^3.3.1" + popper.js "^1.14.7" + prop-types "^15.7.2" + react "^16.8.3" + react-dom "^16.8.3" + react-focus-lock "^2.1.0" + react-helmet-async "^1.0.2" + react-popper-tooltip "^2.8.3" + react-syntax-highlighter "^11.0.2" + react-textarea-autosize "^7.1.0" + simplebar-react "^1.0.0-alpha.6" + ts-dedent "^1.1.0" + "@storybook/core-events@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4" @@ -2367,26 +2481,33 @@ dependencies: core-js "^3.0.1" -"@storybook/core@5.3.12": - version "5.3.12" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.12.tgz#972cec3c7ee3e78a628a017c0b72bb6a52d9146d" - integrity sha512-oqffKLyMEVREeOC8O1RVO+xn68zk4wZkjWN9KbhbMoP3zdxM1gdvpsemdVE1C008mZfe1A/KBwuuEmcn9EBTNw== +"@storybook/core-events@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.13.tgz#df74d2ffe29a1924557dc67e46d5d399893b2b11" + integrity sha512-RAnQe/I+1Ri+aYGhaNn07467cyespNX9R9i1AzFT/baBOQF2N+998mfgRu4/i/Q9YuOXIyHhw1a7JHbE/8e1lw== + dependencies: + core-js "^3.0.1" + +"@storybook/core@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.13.tgz#a6653befc867aa46bb53b43c1f4b8c51a9aa5845" + integrity sha512-HS//95j14XOb9ChYJBDHyZKAqFD2WsUh1q7sMMynSpKgHJjyfYI12rwxH5vDIrJ7CLBQbrMWrgOITjB9/cLJKA== dependencies: "@babel/plugin-proposal-class-properties" "^7.7.0" "@babel/plugin-proposal-object-rest-spread" "^7.6.2" "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/plugin-transform-react-constant-elements" "^7.2.0" "@babel/preset-env" "^7.4.5" - "@storybook/addons" "5.3.12" - "@storybook/channel-postmessage" "5.3.12" - "@storybook/client-api" "5.3.12" - "@storybook/client-logger" "5.3.12" - "@storybook/core-events" "5.3.12" + "@storybook/addons" "5.3.13" + "@storybook/channel-postmessage" "5.3.13" + "@storybook/client-api" "5.3.13" + "@storybook/client-logger" "5.3.13" + "@storybook/core-events" "5.3.13" "@storybook/csf" "0.0.1" - "@storybook/node-logger" "5.3.12" - "@storybook/router" "5.3.12" - "@storybook/theming" "5.3.12" - "@storybook/ui" "5.3.12" + "@storybook/node-logger" "5.3.13" + "@storybook/router" "5.3.13" + "@storybook/theming" "5.3.13" + "@storybook/ui" "5.3.13" airbnb-js-shims "^2.2.1" ansi-to-html "^0.6.11" autoprefixer "^9.7.2" @@ -2453,10 +2574,10 @@ dependencies: lodash "^4.17.15" -"@storybook/node-logger@5.3.12": - version "5.3.12" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.12.tgz#df25b725583cb5aa799b6c5b8103a8ea0921d3ba" - integrity sha512-ytIqS1Lx+gWFBNxwWOK7F63702YYsoU90UFQNUMC44lC1L7tOI9BQXtGIWTvmXJYns+O5pHHOVKkHLT9EGX2OA== +"@storybook/node-logger@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.13.tgz#f41c611c3b200add8d85777f19970bdabaa94634" + integrity sha512-ZpuyKALHq/ZyynXnsW254JaULWZLPBFw007tkJhE5z/CLy059cIVovQhX/8Ivt3FG3qwWmcqQ0ISHFi0dJpqnA== dependencies: "@types/npmlog" "^4.1.2" chalk "^3.0.0" @@ -2493,6 +2614,21 @@ qs "^6.6.0" util-deprecate "^1.0.2" +"@storybook/router@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.13.tgz#1ef971488036083ee284323fe8814b8795f94626" + integrity sha512-C6PNKHxKwpNHPeQkd9ZfsIBfSBTEhWEbn9cVMPSTrUyjfaGWxbKBP8zuBIXhezIv8B2gv2bQrT62hrmsXUcCVg== + dependencies: + "@reach/router" "^1.2.1" + "@storybook/csf" "0.0.1" + "@types/reach__router" "^1.2.3" + core-js "^3.0.1" + global "^4.3.2" + lodash "^4.17.15" + memoizerific "^1.11.3" + qs "^6.6.0" + util-deprecate "^1.0.2" + "@storybook/theming@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.8.tgz#a4c9e0e9a5789c1aa71e4fcb7a8ee86efe3dadcf" @@ -2529,20 +2665,38 @@ resolve-from "^5.0.0" ts-dedent "^1.1.0" -"@storybook/ui@5.3.12": - version "5.3.12" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.12.tgz#c66f6a1302d2ff80a8b94402d95648d1b28066f8" - integrity sha512-dVYJJkwjfGkz3u0lnfawnT6hqBRnANVlKEYirKYZyQ/RouCN3naNh9Sagrpg7hJHYib4Ny6J/pyaNdfdieDS+w== +"@storybook/theming@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.13.tgz#17e8101e2d3ad3fb6245b2cb15b07e9f2a9881cd" + integrity sha512-Zb07pDt8Sv5uq+xDW3TsiTXS9IGwUNwpkR6UQgKILFJ7HX2q4Tt9r+wIi1QCwozcROx4w/bP/8MAKpEAT212lw== dependencies: "@emotion/core" "^10.0.20" - "@storybook/addons" "5.3.12" - "@storybook/api" "5.3.12" - "@storybook/channels" "5.3.12" - "@storybook/client-logger" "5.3.12" - "@storybook/components" "5.3.12" - "@storybook/core-events" "5.3.12" - "@storybook/router" "5.3.12" - "@storybook/theming" "5.3.12" + "@emotion/styled" "^10.0.17" + "@storybook/client-logger" "5.3.13" + core-js "^3.0.1" + deep-object-diff "^1.1.0" + emotion-theming "^10.0.19" + global "^4.3.2" + memoizerific "^1.11.3" + polished "^3.3.1" + prop-types "^15.7.2" + resolve-from "^5.0.0" + ts-dedent "^1.1.0" + +"@storybook/ui@5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.13.tgz#c829bc1cbcd0995e4888056a9f43fbf8a7c22ee4" + integrity sha512-pEXWFPF097OjvbgwvMjLsjLsDViu6yBMmUcL+nd3jvtxyxkuzv5X+2J14N8Nz0veJysbp+5+5A8kKGTO+spZfA== + dependencies: + "@emotion/core" "^10.0.20" + "@storybook/addons" "5.3.13" + "@storybook/api" "5.3.13" + "@storybook/channels" "5.3.13" + "@storybook/client-logger" "5.3.13" + "@storybook/components" "5.3.13" + "@storybook/core-events" "5.3.13" + "@storybook/router" "5.3.13" + "@storybook/theming" "5.3.13" copy-to-clipboard "^3.0.8" core-js "^3.0.1" core-js-pure "^3.0.1" @@ -2569,13 +2723,13 @@ telejson "^3.2.0" util-deprecate "^1.0.2" -"@storybook/vue@~5.3.12": - version "5.3.12" - resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.12.tgz#95d50d55475eea243c466b512ff1b040d09aae34" - integrity sha512-lwQxiI8ZBiP/jYAultvi9b89/7l/aJCcwopvcFPFFUeskFBhgDr/7BwAuuwWaUDAi5oPCJ7xXYh/mNnCKUzGiA== +"@storybook/vue@~5.3.13": + version "5.3.13" + resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.13.tgz#5dde7cc6419cc2c577a9574b71b09bfc66aad832" + integrity sha512-8XbMMQZ3gbor7JXqoVH/DSNbCchQP0VxyUBCszrNtEleWX/l5a79Bx4+uo4mmKUGbvbhkzHqEsT9pouwKVbFhg== dependencies: - "@storybook/addons" "5.3.12" - "@storybook/core" "5.3.12" + "@storybook/addons" "5.3.13" + "@storybook/core" "5.3.13" "@types/webpack-env" "^1.15.0" core-js "^3.0.1" global "^4.3.2" @@ -15361,10 +15515,10 @@ svg-tags@^1.0.0: resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= -svg-to-vue@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/svg-to-vue/-/svg-to-vue-0.6.0.tgz#d5de9ec7126ac3c11adf8cfad013a6264ef57184" - integrity sha512-SYGJMBq5EHt/nIJxZ4kA9A6bilaFXtOPFJRoMQ2ml/jFP4N9L7HVFTm+5WCFN3QFnEUXtH6BHzpoOlwP1/5+2A== +svg-to-vue@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/svg-to-vue/-/svg-to-vue-0.7.0.tgz#ec86deb1742be38319462e36703af1dfa2f9fad9" + integrity sha512-Tg2nMmf3BQorYCAjxbtTkYyWPVSeox5AZUFvfy4MoWK/5tuQlnA/h3LAlTjV3sEvOC5FtUNovRSj3p784l4KOA== dependencies: svgo "^1.3.2" @@ -16554,13 +16708,13 @@ vue-style-loader@^4.1.0: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-svg-loader@~0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vue-svg-loader/-/vue-svg-loader-0.15.0.tgz#09bb9929c3f8955a246ea80909e26139badc0509" - integrity sha512-698GfXu9k2wPxI382Qf7MfrtBXjIjThqmOsksVKHqeTvVO+Ary9q69SVzA6EEJmj5vmF5u1KRVb/I1BDh4fPTQ== +vue-svg-loader@~0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vue-svg-loader/-/vue-svg-loader-0.16.0.tgz#adccbdc9aca90132bde9c9d96cd49f74efecd345" + integrity sha512-2RtFXlTCYWm8YAEO2qAOZ2SuIF2NvLutB5muc3KDYoZq5ZeCHf8ggzSan3ksbbca7CJ/Aw57ZnDF4B7W/AkGtw== dependencies: loader-utils "^1.2.3" - svg-to-vue "^0.6.0" + svg-to-vue "^0.7.0" vue-sweetalert-icons@~4.2.0: version "4.2.0"