From 5cfb73572ea304c3d61c42752f43440791ea08c9 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 16 Nov 2020 09:43:15 +0100 Subject: [PATCH] further rebranding --- backend/package.json | 5 ++- .../middleware/email/templates/layout.html | 3 +- webapp/README.md | 2 +- .../ContributionForm/ContributionForm.vue | 16 ++++----- .../DonationInfo/DonationInfo.spec.js | 6 ++-- webapp/components/Editor/ContextMenu.vue | 4 +-- webapp/components/Editor/Editor.story.js | 4 +-- webapp/locales/it.json | 34 +------------------ webapp/locales/pt.json | 2 +- webapp/maintenance/source/package.json | 6 ++-- webapp/nuxt.config.js | 2 +- webapp/package.json | 5 ++- webapp/plugins/apollo-config.js | 2 +- webapp/testing.md | 2 +- 14 files changed, 30 insertions(+), 63 deletions(-) diff --git a/backend/package.json b/backend/package.json index 164e8c9b1..95ae9799f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,7 +1,7 @@ { - "name": "human-connection-backend", + "name": "ocelot-social-backend", "version": "0.6.3", - "description": "GraphQL Backend for Human Connection", + "description": "GraphQL Backend for ocelot.social", "main": "src/index.js", "scripts": { "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", @@ -18,7 +18,6 @@ "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js", "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js --date-format 'yyyymmddHHmmss' create" }, - "author": "Human Connection gGmbH", "license": "MIT", "jest": { "verbose": true, diff --git a/backend/src/middleware/email/templates/layout.html b/backend/src/middleware/email/templates/layout.html index a5731395d..cf024ab06 100644 --- a/backend/src/middleware/email/templates/layout.html +++ b/backend/src/middleware/email/templates/layout.html @@ -170,8 +170,7 @@

- {{ORGANIZATION_NAME}}
Bahnhofstraße 11, 73235 Weilheim / - Teck
Germany + {{ORGANIZATION_NAME}}

diff --git a/webapp/README.md b/webapp/README.md index 7a9d578e1..3af1ea806 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -98,7 +98,7 @@ You can then visit the Storybook playground on `http://localhost:3002` ## Styleguide Migration -We are currently in the process of migrating our styleguide components and design tokens from the [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) into the main [Human Connection repository](https://github.com/Human-Connection/Human-Connection) and refactoring our components in the process. During this migration, our new components will live in a `_new/` folder to separate them from the old, yet untouched components. +We are currently in the process of migrating our styleguide components and design tokens from the [Nitro Styleguide](https://github.com/Ocelot-Social-Community/HC-Styleguide-20201003) into the main [ocelot.social repository](https://github.com/Ocelot-Social-Community/Ocelot-Social) and refactoring our components in the process. During this migration, our new components will live in a `_new/` folder to separate them from the old, yet untouched components. ### Folder Structure diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index 20c9c2388..caf2e9062 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -24,14 +24,14 @@
- - {{ $t('contribution.inappropriatePictureText') }} - - +
{ const Wrapper = () => mount(DonationInfo, { mocks, localVue }) - it('includes a link to the Human Connection donations website', () => { - expect(Wrapper().find('a').attributes('href')).toBe('https://human-connection.org/spenden/') + it('includes a link to the ocelot.social donations website', () => { + expect(Wrapper().find('a').attributes('href')).toBe( + 'https://ocelot-social.herokuapp.com/donations', + ) }) it('displays a call to action button', () => { diff --git a/webapp/components/Editor/ContextMenu.vue b/webapp/components/Editor/ContextMenu.vue index 616686bd3..b04add6cc 100644 --- a/webapp/components/Editor/ContextMenu.vue +++ b/webapp/components/Editor/ContextMenu.vue @@ -25,7 +25,7 @@ export default { interactive: true, placement, showOnInit, - theme: 'human-connection', + theme: 'ocelot-social', trigger, onMount(instance) { const input = instance.popper.querySelector('input') @@ -65,7 +65,7 @@ export default {