Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4771-refactor-social-media-list-with-slots

2025-12-13 07:45:56 +00:00 · 2022-05-04 09:36:06 +02:00 · 2022-05-04 09:36:06 +02:00 · e4b695a486
commit e4b695a486
parent 0d1e8b82af f348ace473
20 changed files with 86 additions and 39 deletions
--- a/.nvmrc
+++ b/.nvmrc
@ -0,0 +1 @@
+v17.9.0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,8 +4,27 @@ 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).

+#### [1.0.7](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.0.6...1.0.7)
+
+- Bump rosie from 2.0.1 to 2.1.0 [`#4520`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4520)
+- fix: 🍰 Renew JWT In Decode Test [`#4798`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4798)
+- docs: 🍰 Refine Main README.md With Test Tech Stack And Video Link [`#4772`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4772)
+- docs: 🍰 Change README.md DB Commands For Docker [`#4765`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4765)
+- Bump date-fns from 2.23.0 to 2.25.0 [`#4753`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4753)
+- Bump neo4j-driver from 4.0.2 to 4.3.4 [`#4729`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4729)
+- chore: 🍰 Update Neode To v0.4.7 [`#4751`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4751)
+- doc: 🍰 Update README.md Etc. [`#4733`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4733)
+- feat: 🍰 New CSS For Internal Pages [`#4741`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4741)
+- fix: 🍰 Change Notification E-Mails Settings Page Link [`#4742`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4742)
+- Refactor internal pages to new CSS [`acad80c`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/acad80c3c8262934dd2e38961c08c0fde769099a)
+- Renew JWT in decode test [`46eb6b8`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/46eb6b82ea802d4d6ca7294cd32d1fe16425bfea)
+- Revert "Renew JWT in decode test" only for changing the Neode version [`a0d92b4`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/a0d92b4853d09d725c1fb7886cbfed2a00e1f05c)
+
 #### [1.0.6](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.0.5...1.0.6)

+> 4 October 2021
+
+- chore: 🍰 Set 'sendNotification' Emails Init Admin [`#4690`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4690)
 - feat: 🍰 Send Notification E-Mail [`#4623`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4623)
 - feat: 🍰 Implement Progress Bar Again [`#4357`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4357)
 - Bump nodemailer-html-to-text from 3.1.0 to 3.2.0 in /backend [`#4531`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4531)
--- a/backend/.nvmrc
+++ b/backend/.nvmrc
@ -0,0 +1 @@
+v12.19.0
--- a/backend/package.json
+++ b/backend/package.json
@ -1,6 +1,6 @@
 {
  "name": "ocelot-social-backend",
-  "version": "1.0.6",
+  "version": "1.0.7",
  "description": "GraphQL Backend for ocelot.social",
  "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
  "author": "ocelot.social Community",
@ -66,7 +66,6 @@
    "debug": "~4.1.1",
    "dotenv": "~8.2.0",
    "express": "^4.17.1",
-    "faker": "Marak/faker.js#master",
    "graphql": "^14.6.0",
    "graphql-custom-directives": "~0.2.14",
    "graphql-iso-date": "~3.6.1",
@ -120,6 +119,7 @@
    "xregexp": "^4.3.0"
  },
  "devDependencies": {
+    "@faker-js/faker": "5.1.0",
    "apollo-server-testing": "~2.11.0",
    "chai": "~4.2.0",
    "cucumber": "~6.0.5",
--- a/backend/src/db/factories.js
+++ b/backend/src/db/factories.js
@ -1,11 +1,12 @@
 import { v4 as uuid } from 'uuid'
-import faker from 'faker'
 import slugify from 'slug'
 import { hashSync } from 'bcryptjs'
 import { Factory } from 'rosie'
 import { getDriver, getNeode } from './neo4j'
 import CONFIG from '../config/index.js'
 import generateInviteCode from '../schema/resolvers/helpers/generateInviteCode.js'
+// import faker from 'faker' // this import is not working, why?
+const faker = require('@faker-js/faker')

 const neode = getNeode()

--- a/backend/src/db/migrations/20210506150512-add-donations-node.js
+++ b/backend/src/db/migrations/20210506150512-add-donations-node.js
@ -19,8 +19,8 @@ export async function up(next) {
        SET donationInfo.createdAt = toString(datetime())
        SET donationInfo.updatedAt = donationInfo.createdAt
        SET donationInfo.showDonations = false
-        SET donationInfo.goal = 15000
-        SET donationInfo.progress = 1200
+        SET donationInfo.goal = 15000.0
+        SET donationInfo.progress = 1200.0
        RETURN donationInfo {.*}
      `,
      { donationId },
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@ -1,10 +1,11 @@
-import faker from 'faker'
 import sample from 'lodash/sample'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'
 import Factory from '../db/factories'
 import { getNeode, getDriver } from '../db/neo4j'
 import { gql } from '../helpers/jest'
+// import faker from 'faker' // this import is not working, why?
+const faker = require('@faker-js/faker')

 const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']

--- a/backend/src/schema/resolvers/users/location.spec.js
+++ b/backend/src/schema/resolvers/users/location.spec.js
@ -38,8 +38,8 @@ const newlyCreatedNodesWithLocales = [
      nameRU: 'Вельцхайм',
      nameNL: 'Welzheim',
      namePL: 'Welzheim',
-      lng: 9.63444,
-      lat: 48.87472,
+      lng: 9.634741,
+      lat: 48.874924,
    },
    state: {
      id: expect.stringContaining('region'),
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@ -963,6 +963,11 @@
    exec-sh "^0.3.2"
    minimist "^1.2.0"

+"@faker-js/faker@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.1.0.tgz#cee1d77ada0d0dbbe77201d18b1ebabf432d9c0f"
+  integrity sha512-0VonSKh7fBCqvY+V2FLN2ZW4pR4ZtWJalWmwSaiaB7yK7y4qp8vDfuaq9QdLjf/cdZGx3M7Wc4Q+x4fZHxI21Q==
+
 "@graphql-toolkit/common@0.10.4":
  version "0.10.4"
  resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.10.4.tgz#7785f2a3f14559d0778859c49f4442078c196695"
@ -4587,10 +4592,6 @@ extsprintf@^1.2.0:
  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=

-faker@Marak/faker.js#master:
-  version "4.1.0"
-  resolved "https://codeload.github.com/Marak/faker.js/tar.gz/3b2fa4aebccee52ae1bafc15d575061fb30c3cf1"
-
 fast-deep-equal@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ocelot-social",
-  "version": "1.0.6",
+  "version": "1.0.7",
  "description": "Free and open source software program code available to run social networks.",
  "author": "ocelot.social Community",
  "license": "MIT",
@ -36,7 +36,7 @@
    "date-fns": "^2.25.0",
    "dotenv": "^8.2.0",
    "expect": "^25.3.0",
-    "faker": "Marak/faker.js#master",
+    "@faker-js/faker": "5.1.0",
    "graphql-request": "^2.0.0",
    "import": "^0.0.6",
    "jsonwebtoken": "^8.5.1",
@ -44,7 +44,7 @@
    "neo4j-driver": "^4.3.4",
    "neode": "^0.4.7",
    "npm-run-all": "^4.1.5",
-    "rosie": "^2.0.1",
+    "rosie": "^2.1.0",
    "slug": "^5.1.0"
  },
  "resolutions": {
--- a/webapp/.nvmrc
+++ b/webapp/.nvmrc
@ -0,0 +1 @@
+v12.19.0
--- a/webapp/components/CommentList/CommentList.story.js
+++ b/webapp/components/CommentList/CommentList.story.js
@ -2,7 +2,8 @@ import { storiesOf } from '@storybook/vue'
 import { withA11y } from '@storybook/addon-a11y'
 import HcCommentList from './CommentList.vue'
 import helpers from '~/storybook/helpers'
-import faker from 'faker'
+// import faker from 'faker' // this import is not working, why?
+const faker = require('@faker-js/faker')

 helpers.init()

--- a/webapp/components/Editor/MenuLegend.vue
+++ b/webapp/components/Editor/MenuLegend.vue
@ -3,12 +3,16 @@
    <template #default="{ openMenu, closeMenu }">
      <slot name="button">
        <menu-bar-button
+          class="legend-question-button"
          icon="question-circle"
          circle
          ghost
-          class="legend-question-button"
-          @mouseover.native="openMenu()"
-          @mouseleave.native="closeMenu()"
+          :onClick="
+            () => {
+              isDropdownOpen ? closeMenu() : openMenu()
+              isDropdownOpen = !isDropdownOpen
+            }
+          "
        />
      </slot>
    </template>
@ -60,6 +64,7 @@ export default {
        { iconName: 'quote-right', name: `editor.legend.quote`, shortcut: '> + space' },
        { iconName: 'minus', name: `editor.legend.ruler`, shortcut: '---' },
      ],
+      isDropdownOpen: false,
    }
  },
 }
--- a/webapp/components/Embed/EmbedComponent.vue
+++ b/webapp/components/Embed/EmbedComponent.vue
@ -179,10 +179,24 @@ export default {
    }

    .html {
-      width: 100%;
+      // width: 100%;
+      // height: 100%;
+
+      // see this working solution here: https://stackoverflow.com/questions/35814653/automatic-height-when-embedding-a-youtube-video
+      position: relative;
+      padding-bottom: 56.25%; /* 16:9 */
+      height: 0;

      iframe {
+        // width: 100%;
+        // height: auto;
+
+        // same solution example as above
+        position: absolute;
+        top: 0;
+        left: 0;
        width: 100%;
+        height: 100%;
      }
    }

--- a/webapp/components/_new/generic/TabNavigation/TabNavigator.story.js
+++ b/webapp/components/_new/generic/TabNavigation/TabNavigator.story.js
@ -8,9 +8,10 @@ import TabNavigation from '~/components/_new/generic/TabNavigation/TabNavigation
 import UserTeaser from '~/components/UserTeaser/UserTeaser'
 import HcHashtag from '~/components/Hashtag/Hashtag'
 import helpers from '~/storybook/helpers'
-import faker from 'faker'
 import { post } from '~/components/PostTeaser/PostTeaser.story.js'
 import { user } from '~/components/UserTeaser/UserTeaser.story.js'
+// import faker from 'faker' // this import is not working, why?
+const faker = require('@faker-js/faker')

 helpers.init()

--- a/webapp/maintenance/source/package.json
+++ b/webapp/maintenance/source/package.json
@ -1,6 +1,6 @@
 {
  "name": "@ocelot-social/maintenance",
-  "version": "1.0.6",
+  "version": "1.0.7",
  "description": "Maintenance page for ocelot.social",
  "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
  "author": "ocelot.social Community",
--- a/webapp/package.json
+++ b/webapp/package.json
@ -1,6 +1,6 @@
 {
  "name": "ocelot-social-webapp",
-  "version": "1.0.6",
+  "version": "1.0.7",
  "description": "ocelot.social Frontend",
  "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
  "author": "ocelot.social Community",
@ -108,6 +108,7 @@
    "@babel/core": "~7.12.3",
    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
    "@babel/preset-env": "~7.9.0",
+    "@faker-js/faker": "5.1.0",
    "@storybook/addon-a11y": "^6.3.6",
    "@storybook/addon-actions": "^5.3.21",
    "@storybook/addon-notes": "^5.3.18",
@ -136,7 +137,6 @@
    "eslint-plugin-promise": "~4.3.1",
    "eslint-plugin-standard": "~5.0.0",
    "eslint-plugin-vue": "~6.2.2",
-    "faker": "^5.1.0",
    "flush-promises": "^1.0.2",
    "identity-obj-proxy": "^3.0.0",
    "jest": "~26.6.3",
--- a/webapp/storybook/helpers.js
+++ b/webapp/storybook/helpers.js
@ -1,6 +1,5 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import faker from 'faker'
 import vuexI18n from 'vuex-i18n/dist/vuex-i18n.umd.js'
 import Styleguide from '@human-connection/styleguide'
 import Filters from '~/plugins/vue-filters'
@ -8,8 +7,9 @@ import Directives from '~/plugins/vue-directives'
 import IziToast from '~/plugins/izi-toast'
 import layout from './layout.vue'
 import locales from '~/locales/index.js'
-
 import '~/plugins/v-tooltip'
+// import faker from 'faker' // this import is not working, why?
+const faker = require('@faker-js/faker')

 const helpers = {
  init(options = {}) {
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@ -2379,6 +2379,11 @@
    ts-node "^8"
    tslib "^1"

+"@faker-js/faker@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.1.0.tgz#cee1d77ada0d0dbbe77201d18b1ebabf432d9c0f"
+  integrity sha512-0VonSKh7fBCqvY+V2FLN2ZW4pR4ZtWJalWmwSaiaB7yK7y4qp8vDfuaq9QdLjf/cdZGx3M7Wc4Q+x4fZHxI21Q==
+
 "@hapi/address@2.x.x":
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.0.0.tgz#9f05469c88cb2fd3dcd624776b54ee95c312126a"
@ -10235,11 +10240,6 @@ fake-tag@^1.0.0:
  resolved "https://registry.yarnpkg.com/fake-tag/-/fake-tag-1.0.1.tgz#1d59da482240a02bd83500ca98976530ed154b0d"
  integrity sha512-qmewZoBpa71mM+y6oxXYW/d1xOYQmeIvnEXAt1oCmdP0sqcogWYLepR87QL1jQVLSVMVYDq2cjY6ec/Wu8/4pg==

-faker@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/faker/-/faker-5.1.0.tgz#e10fa1dec4502551aee0eb771617a7e7b94692e8"
-  integrity sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==
-
 fast-deep-equal@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
--- a/yarn.lock
+++ b/yarn.lock
@ -1248,6 +1248,11 @@
    debug "^3.1.0"
    lodash.once "^4.1.1"

+"@faker-js/faker@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.1.0.tgz#cee1d77ada0d0dbbe77201d18b1ebabf432d9c0f"
+  integrity sha512-0VonSKh7fBCqvY+V2FLN2ZW4pR4ZtWJalWmwSaiaB7yK7y4qp8vDfuaq9QdLjf/cdZGx3M7Wc4Q+x4fZHxI21Q==
+
 "@hapi/address@2.x.x":
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.0.0.tgz#9f05469c88cb2fd3dcd624776b54ee95c312126a"
@ -3058,10 +3063,6 @@ extsprintf@^1.2.0:
  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=

-faker@Marak/faker.js#master:
-  version "5.1.0"
-  resolved "https://codeload.github.com/Marak/faker.js/tar.gz/91dc8a3372426bc691be56153b33e81a16459f49"
-
 fast-deep-equal@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@ -5274,10 +5275,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
    hash-base "^3.0.0"
    inherits "^2.0.1"

-rosie@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/rosie/-/rosie-2.0.1.tgz#c250c4787ce450b72aa9eff26509f68589814fa2"
-  integrity sha1-wlDEeHzkULcqqe/yZQn2hYmBT6I=
+rosie@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/rosie/-/rosie-2.1.0.tgz#0213a9d2b0401a2549cbce5f1cd914caffa22358"
+  integrity sha512-Dbzdc+prLXZuB/suRptDnBUY29SdGvND3bLg6cll8n7PNqzuyCxSlRfrkn8PqjS9n4QVsiM7RCvxCkKAkTQRjA==

 rxjs@^6.3.3, rxjs@^6.6.3:
  version "6.6.7"