Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates

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)

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",

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 },

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",
@@ -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": {

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,
     }
   },
 }

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%;
       }
     }
 

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",

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",

yarn.lock

@@ -5274,10 +5274,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"