diff --git a/CHANGELOG.md b/CHANGELOG.md index ca7a9a2ee..cb3b6a9a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,23 @@ 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.6](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.0.5...1.0.6) + +- 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) +- Bump codecov from 3.7.1 to 3.8.2 [`#4401`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4401) +- Centered the login-form [`#4660`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4660) +- Spelling Change [`#4654`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4654) +- suggested solutions [`5699620`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/5699620c858925101f561f315034c57fae878964) +- Implement or move sort by date filter in filter menu [`16d8a42`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/16d8a42d9b4f90e8a1c22da0637f95adb25b4e8f) +- Translate order by [`245be52`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/245be52ac8d9e41998da10cf2d1a752bbefc0c0c) + #### [1.0.5](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.0.4...1.0.5) +> 12 August 2021 + +- chore: 💥 Release v1.0.5 [`#4629`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4629) - feat: 🍰 Landing Page And Other Internal Pages [`#4599`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4599) - Bump eslint-plugin-prettier from 3.1.4 to 3.4.0 in /webapp [`#4577`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4577) - Bump vue-scrollto from 2.17.1 to 2.20.0 in /webapp [`#4592`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4592) diff --git a/backend/package.json b/backend/package.json index e9abefc46..594761b47 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social-backend", - "version": "1.0.5", + "version": "1.0.6", "description": "GraphQL Backend for ocelot.social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js index f3f2e5c93..6173238ae 100644 --- a/backend/src/db/factories.js +++ b/backend/src/db/factories.js @@ -200,7 +200,7 @@ Factory.define('donations') .attr('id', uuid) .attr('showDonations', true) .attr('goal', 15000) - .attr('progress', 0) + .attr('progress', 7000) .after((buildObject, options) => { return neode.create('Donations', buildObject) }) diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js index 5d39fb82c..377caf0b0 100644 --- a/backend/src/db/migrate/store.js +++ b/backend/src/db/migrate/store.js @@ -35,6 +35,9 @@ const createDefaultAdminUser = async (session) => { id: "${defaultAdmin.id}", slug: "${defaultAdmin.slug}", createdAt: toString(datetime()), + allowEmbedIframes: false, + showShoutsPublicly: false, + sendNotificationEmails: true, deleted: false, disabled: false })-[:PRIMARY_EMAIL]->(e)`, diff --git a/backend/src/schema/resolvers/donations.spec.js b/backend/src/schema/resolvers/donations.spec.js index 982150d00..a9210f6a5 100644 --- a/backend/src/schema/resolvers/donations.spec.js +++ b/backend/src/schema/resolvers/donations.spec.js @@ -88,7 +88,7 @@ describe('donations', () => { it('returns the current Donations info', async () => { await expect(query({ query: donationsQuery, variables })).resolves.toMatchObject({ - data: { Donations: { showDonations: true, goal: 15000, progress: 0 } }, + data: { Donations: { showDonations: true, goal: 15000, progress: 7000 } }, errors: undefined, }) }) diff --git a/backend/src/schema/resolvers/registration.js b/backend/src/schema/resolvers/registration.js index fc504f7cd..ea420bc2a 100644 --- a/backend/src/schema/resolvers/registration.js +++ b/backend/src/schema/resolvers/registration.js @@ -91,9 +91,9 @@ const signupCypher = (inviteCode) => { SET user.role = 'user' SET user.createdAt = toString(datetime()) SET user.updatedAt = toString(datetime()) - SET user.allowEmbedIframes = FALSE - SET user.showShoutsPublicly = FALSE - SET user.sendNotificationEmails = TRUE + SET user.allowEmbedIframes = false + SET user.showShoutsPublicly = false + SET user.sendNotificationEmails = true SET email.verifiedAt = toString(datetime()) RETURN user {.*} ` diff --git a/package.json b/package.json index c3a9d2eda..1eef32b79 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social", - "version": "1.0.5", + "version": "1.0.6", "description": "Fullstack and API tests with cypress and cucumber for ocelot.social", "author": "ocelot.social Community", "license": "MIT", @@ -19,7 +19,7 @@ "cypress:open": "cypress open --browser electron --config-file ./cypress/cypress.json", "cucumber:setup": "cd backend && yarn run dev", "cucumber": "wait-on tcp:4000 && cucumber-js --require-module @babel/register --exit", - "release": "yarn version --no-git-tag-version --no-commit-hooks --no-commit && auto-changelog --latest-version $(node -p -e \"require('./package.json').version\") && cd backend && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../package.json').version\") && cd ../webapp && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../package.json').version\")" + "release": "yarn version --no-git-tag-version --no-commit-hooks --no-commit && auto-changelog --latest-version $(node -p -e \"require('./package.json').version\") && cd backend && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../package.json').version\") && cd ../webapp && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../package.json').version\") && cd ../webapp/maintenance/source && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../../../package.json').version\")" }, "devDependencies": { "@babel/core": "^7.9.0", diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json index 711d5c618..2391b5c91 100644 --- a/webapp/maintenance/source/package.json +++ b/webapp/maintenance/source/package.json @@ -1,6 +1,6 @@ { "name": "@ocelot-social/maintenance", - "version": "1.0.5", + "version": "1.0.6", "description": "Maintenance page for ocelot.social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", diff --git a/webapp/package.json b/webapp/package.json index f314662b3..0df821b44 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social-webapp", - "version": "1.0.5", + "version": "1.0.6", "description": "ocelot.social Frontend", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", diff --git a/webapp/pages/admin/donations.spec.js b/webapp/pages/admin/donations.spec.js index 41b80a83d..57e28ff41 100644 --- a/webapp/pages/admin/donations.spec.js +++ b/webapp/pages/admin/donations.spec.js @@ -1,5 +1,4 @@ import { mount } from '@vue/test-utils' -import flushPromises from 'flush-promises' import Vue from 'vue' import Donations from './donations.vue' @@ -143,14 +142,16 @@ describe('donations.vue', () => { it('calls mutation with input values once', async () => { wrapper.find('#showDonations').trigger('click') // set to true + await wrapper.vm.$nextTick() wrapper.find('#donations-goal').setValue('20000') await wrapper.vm.$nextTick() + wrapper.find('#donations-progress').setValue('10000') + await wrapper.vm.$nextTick() wrapper.find('.donations-info-button').trigger('submit') await wrapper.vm.$nextTick() - await flushPromises() expect(mocks.$apollo.mutate).toHaveBeenCalledWith( expect.objectContaining({ - variables: { showDonations: true, goal: 15000, progress: 0 }, + variables: { showDonations: true, goal: 20000, progress: 10000 }, }), ) }) @@ -161,7 +162,7 @@ describe('donations.vue', () => { expect(wrapper.vm.showDonations).toBe(false) // wrapper.find('.donations-info-button').trigger('submit') // await mocks.$apollo.mutate - // expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining({variables: { showDonations: false, goal: 15000, progress: 0 }})) + // expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining({variables: { showDonations: false, goal: 15000, progress: 7000 }})) // expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1) }) diff --git a/webapp/pages/admin/donations.vue b/webapp/pages/admin/donations.vue index 26920e050..1caedb9e1 100644 --- a/webapp/pages/admin/donations.vue +++ b/webapp/pages/admin/donations.vue @@ -24,6 +24,7 @@ data-test="donations-goal" />