diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..18b01a1d9 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,46 @@ +name: CI + +on: [push] + +jobs: + build: + name: Continuous Integration + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Check translation files + run: | + scripts/translations/sort.sh + scripts/translations/missing-keys.sh + + - name: Build neo4j image + uses: docker/build-push-action@v1.1.0 + with: + repository: ocelotsocialnetwork/neo4j + tags: latest + path: neo4j/ + push: false + - name: Build backend base image + uses: docker/build-push-action@v1.1.0 + with: + repository: ocelotsocialnetwork/backend + tags: build-and-test + target: build-and-test + path: backend/ + push: false + - name: Build webapp base image + uses: docker/build-push-action@v1.1.0 + with: + repository: ocelotsocialnetwork/webapp + tags: build-and-test + target: build-and-test + path: webapp/ + push: false + + - name: Lint backend + run: docker run --rm ocelotsocialnetwork/backend:build-and-test yarn run lint + - name: Lint webapp + run: docker run --rm ocelotsocialnetwork/webapp:build-and-test yarn run lint + diff --git a/backend/.env.template b/backend/.env.template index c0a39799f..fc9766478 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -23,3 +23,6 @@ AWS_SECRET_ACCESS_KEY= AWS_ENDPOINT= AWS_REGION= AWS_BUCKET= + +EMAIL_DEFAULT_SENDER="devops@ocelot.social" +EMAIL_SUPPORT="devops@ocelot.social" diff --git a/backend/Dockerfile b/backend/Dockerfile index ec44a1990..6d3def015 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ -FROM node:15.3.0-alpine3.10 as base -LABEL Description="Backend of the Social Network Human-Connection.org" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)" +FROM node:12.19.0-alpine3.10 as base +LABEL Description="Backend of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)" EXPOSE 4000 CMD ["yarn", "run", "start"] diff --git a/backend/graphql-playground.png b/backend/graphql-playground.png deleted file mode 100644 index 32396a577..000000000 Binary files a/backend/graphql-playground.png and /dev/null differ diff --git a/backend/humanconnection.png b/backend/humanconnection.png deleted file mode 100644 index f0576413f..000000000 Binary files a/backend/humanconnection.png and /dev/null differ diff --git a/backend/package.json b/backend/package.json index 1b144c31e..37007575e 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/snapshots/embeds/pr3934.html b/backend/snapshots/embeds/pr3934.html new file mode 100644 index 000000000..03d7c3ee5 --- /dev/null +++ b/backend/snapshots/embeds/pr3934.html @@ -0,0 +1,5504 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + feat: [WIP] 🍰 Rebranding And White-Labeling by Mogge · Pull Request #3934 · Ocelot-Social-Community/Ocelot-Social + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Skip to content + + + + + + + + + +
+ +
+ + + + + +
+ + + +
+ + + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + +
+ +
+ +
+

+ + + / + + Ocelot-Social + + +

+ + +
+ +
    + +
  • +
    + +
    + + + Unwatch + + + +
    + Notifications +
    +
    + + + + + + + +
    +     +
    + +
    +
    • + +
  • +
    +
    + + +
    +
    + + +
    + +
    • + +
  • +
    +
    + + + Fork + + + +
    + +

    Fork Ocelot-Social

    +
    + +
    + + +

    If this dialog fails to load, you can visit the fork page directly.

    +     +
    + +     +
    +
    + + +
    • +
+ +
+ + +
+ + +
+
+ + + +
+ + + + +
+ + +
+ + + + +
+
+
+
+ + +
+ + Open with + + + + +
+
+
+
+
+
+ + + +
+ + +
+ Jump to bottom +
+
+ +

+ + feat: [WIP] 🍰 Rebranding And White-Labeling + + #3934 +

+
+
+ +
+
+ +
+ + +
+
+
+
+
+ + Open + + +
+ + +
+ + + wants to merge + 39 + commits into + + + + + +
+
+ + base: + master + + + + + + +
+
+ +
+ +from + + + + + +
+
+ + +
+
+
+
+
+ + Open + + +
+
+

+ feat: [WIP] 🍰 Rebranding And White-Labeling + #3934 +

+ +
+ + + wants to merge + 39 + commits into + + + + + +from + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+ + + +1,364 + + + −1,229 + + + + + +
+ + +
+ + + +

Conversation

+
+ +
+ +
+
+
+ + +
+ + +
+ @Mogge + +
+ +
+
+ + + +
+
+ + + + + + + + + + + + + + + + + + + +
+ + + + + +
+

+ Pick your reaction +

+ +
+ +
+ + + + + + + + + + +
+
 + +
+ + + + +
+ + + + + + Copy link + + + + +
+ + + +
+ + + Report content + + + +
+ +
+ +
+ + + + + + + + Member + + + + + +
+ +

+ + + @Mogge + + + + + Mogge + + + + + + commented + + + 6 days ago + + + + +

+
+ + +
+ + + + + + + + + +
+

cake Pullrequest

+

Have all the information for the brand in separate config files. Set these defaults to ocelot.social

+
+ + + + +
+ + +
+ + + + + +
+

+ Pick your reaction +

+ +
+ +
+ + + + + + + + + + +
+
 + +
+
+ +
+ +
+
+ + +
+ + +
+ +
+ +
+ + + +
+ + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + +
+ +
+ + + + + + + + + + +
+ + + + + + +
+ Select a reply + ctrl . +
+ + + + + + +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + +
+ +

+ The content you are editing has changed. + Please copy your edits and refresh the page. +

+ + + + +
+ + + + + + + + + + + + + + + + + + +
+ + +
+
+
+

Nothing to preview

+
+
+ +
+ +
+ + +
+ + +
+
+ + +
+ +
+
+
+ +
+ + + + +
+ + + + +
+ +
+
+
+ +
+
+ + roschaefer + + added 30 commits + + on Jun 4 + +
+
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Rename dockerhub organizations + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + 23ae569 + +
+
+
+
+ 
..plus get rid of obsolete prefix `nitro-`.
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + feat: Avoid new builds on base docker-compose.yml + + + +
+ +
+ + +
+ +
+
+ + +
+ + 2c4c9ab + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Merge pull request #6 from The-Schools-in-Motion-Network/avoid_builds… + + + + + + +
+ +
+ +
+ + Verified + +
+
+
+
+ +
+
+ This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. +
+
+ + +
+ GPG key ID: 4AEE18F83AFDEB23 + Learn about signing commits +
+
+
+
+ +
+ +
+
+ + +
+ + d7d31e0 + +
+
+
+
+ 
…_on_production
+
+feat: Avoid new builds on base docker-compose.yml
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Silly copy+paste error + + + +
+ +
+ + +
+ +
+
+ + +
+ + 9360181 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Silly fix of copy+paste error + + + +
+ +
+ + +
+ +
+
+ + +
+ + 73c1f3c + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Remove labels from Dockerfiles + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + a741721 + +
+
+
+
+ 
Version was out of date anyways
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + refactor: Image paths + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + bc70e8b + +
+
+
+
+ 
* removed obsolete images
+* moved all overwritable images to a location webapp/static/img/custom/
+* better names
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Add tags and APPLICATION_NAME env variable + + + +
+ +
+ + +
+ +
+
+ + +
+ + 0ee3a30 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Paramterize all emails + + + +
+ +
+ + +
+ +
+
+ + +
+ + 3a21622 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Replace example link + + + +
+ +
+ + +
+ +
+
+ + +
+ + 92fba41 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + backend: Ignore if .env file cannot be found + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + 063200b + +
+
+
+
+ 
fix: #7
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Parameterize emails in backend + + + +
+ +
+ + +
+ +
+
+ + +
+ + 16c7be1 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Remove inappropriate picture help link + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + 4ea0d65 + +
+
+
+
+ 
This link is helpful but points to Human Connection, so unfortunately I
+have to remove it.
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Parameterize links + + + +
+ +
+ + +
+ +
+
+ + +
+ + 387ea64 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + fix: Remove broken moreInfoURL + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + 193f977 + +
+
+
+
+ 
The links specified in the locales were pointing to the English site and
+were mostly broken anyways.
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Parameterize manifest + + + +
+ +
+ + +
+ +
+
+ + +
+ + 37b3014 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + refactor: Avoid html in translation files + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + 36679da + +
+
+
+
+ 
I removed it. We cannot parameterize localizations with absolute urls
+properly.
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Fix Italian translation + + + +
+ +
+ + +
+ +
+
+ + +
+ + 3fa0723 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Add CI workflow + + + +
+ +
+ + +
+ +
+
+ + +
+ + 92920fe + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Fix image tags + + + +
+ +
+ + +
+ +
+
+ + +
+ + 811027f + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Run lint --fix + + + +
+ +
+ + +
+ +
+
+ + +
+ + d171d78 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Replace name Human Connection from locales + + + +
+ +
+ + +
+ +
+
+ + +
+ + 0d5cf7a + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Parameterize entire html of terms+conditions + + + +
+ +
+ + +
+ +
+
+ + +
+ + 4a91066 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Make four static pages + + + + + + +
+ +
+ + +
+ +
+
+ + +
+ + 77b0310 + +
+
+
+
+ 
* imprint
+* data privacy
+* terms of service
+* code of conduct
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Replace welcome image in email templates + + + +
+ +
+ + +
+ +
+
+ + +
+ + dd09dfa + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Remove name "Human Connection" in email templates + + + +
+ +
+ + +
+ +
+
+ + +
+ + 9bb827a + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Fix lint + + + +
+ +
+ + +
+ +
+
+ + +
+ + 68c5f0d + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Remove obsolete env var + + + +
+ +
+ + +
+ +
+
+ + +
+ + a20aebc + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Install raw-loader node module + + + +
+ +
+ + +
+ +
+
+ + +
+ + 1d98f58 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + fix image path + + + +
+ +
+ + +
+ +
+
+ + +
+ + d78e181 + +
+
+
+
+ + +
+
+
+
+ + +
+ + + + + +
+ +
+
+
+ +
+
+ + roschaefer + and others + added 7 commits + + on Jun 16 + +
+
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + refactor: Move Logo out of styleguide + + + +
+ +
+ + +
+ +
+
+ + +
+ + c2d9288 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Remove "Human Connection" from translations + + + +
+ +
+ + +
+ +
+
+ + +
+ + 650b3ce + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @roschaefer +
+
+ + +
+ + Parameterize page titles + + + +
+ +
+ + +
+ +
+
+ + +
+ + 906ab2d + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @Mogge +
+
+ + +
+ + merged conflicts + + + +
+ +
+ + +
+ +
+ +
+ + + +
+ +
+
Loading status checks…
+ +
+
+ +
+ + +
+ + 5fc24a3 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @Mogge +
+
+ + +
+ + merging rebranding branch from / + + + +
+ +
+ + +
+ +
+ +
+ + + +
+ +
+
Loading status checks…
+ +
+
+ +
+ + +
+ + bd962bb + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @Mogge +
+
+ + +
+ + Starting rebranding to ocelot.social + + + +
+ +
+ + +
+ +
+ +
+ + + +
+ +
+
Loading status checks…
+ +
+
+ +
+ + +
+ + ecb0bb3 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @Mogge +
+
+ + +
+ + logos changed. SVG should be in better quality + + + +
+ +
+ + +
+ +
+ +
+ + + +
+ +
+
Loading status checks…
+ +
+
+ +
+ + +
+ + 128e1f0 + +
+
+
+
+ + +
+
+
+
+ + +
+ + + +
+ +
+
+ +
+
+ + + + @Tirokk +Tirokk + + + + + + + assigned + Mogge + + 4 days ago + +
+
+ + +
+
+ +
+
+ + + + @Tirokk +Tirokk + + + + + +changed the title +feat: Rebranding and White-Labeling + +feat: [WIP] 🍰 Rebranding And White-Labeling + + + 4 days ago + +
+
+ + + + +
+ + + +
+ +
+
+
+ +
+
+ + Mogge + + added 2 commits + + 3 hours ago + +
+
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @Mogge +
+
+ + +
+ + further rebranding + + + +
+ +
+ + +
+ +
+ +
+ + + +
+ +
+
Loading status checks…
+ +
+
+ +
+ + +
+ + 5cfb735 + +
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+ + @Mogge +
+
+ + +
+ + define volumes + + + +
+ +
+ + +
+ +
+ +
+ + + +
+ +
+
Loading status checks…
+ +
+
+ +
+ + +
+ + 78f9e20 + +
+
+
+
+ + +
+
+
+
+ + +
+ + + + + +
+
+ +
+ + +
+ +
+ + + +
+ +

Merge state

+
+

Add more commits by pushing to the white-labeling branch on Ocelot-Social-Community/Ocelot-Social.

+ + + + +
+ +
+ + + +
+
+ +
+
+ +
+ + +

+ Review required +

+ + + At least 1 approving review is required by reviewers with write access. + Learn more. + + + +
+ + +
+
+ +
+ +
+ + +

All checks have passed

+ 2 successful checks +
+ +
+
+
+ +
+ + + @github-actions + + + +
+ + CI / Continuous Integration (push) + + + Successful in 8m + +
+ +
+ + Details +
+ +
+
+
+ +
+ + + @travis-ci + + + +
+ + Travis CI - Branch + + + Successful in 20m + + — + Build Passed +
+ +
+ + Details +
+ +
+ +
+
+ + +
+ + + Resolve conflicts + + +
+ +
+

This branch has conflicts that must be resolved

+ + Use the web editor or the to resolve conflicts. + + +
+

Conflicting files

+
+ neo4j/Dockerfile +
+ +
+
+ + + + +
+ + +
+ + +
+
+ + + + + + + +
+
+ + +

+ + or view + . +

+ + + + +

Checkout via command line

+

+ If you cannot merge a pull request automatically here, you have the option + of checking it out via command line to resolve conflicts and perform a + manual merge. +

+ +
+
+
+ +
+ +
+
+ +
+
+ + + + + + +
+
+
+ +

Step 1: From your project repository, bring in the changes and test.

+
+
+ + + +
+ 
git fetch origin
+git checkout -b white-labeling origin/white-labeling
+git merge master
+
+ +

Step 2: Merge the changes and update on GitHub.

+
+
+ + + +
+ 
git checkout master
+git merge --no-ff white-labeling
+git push origin master
+
+ + +
+
+ +
+
+
+ + + +
+ + @Mogge +
+
+ +
+ + + +
+ +
+ + +
+ + +
+
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
+
+
+ + +
+ +
+ + + + + + +
+ + + +
+ +

Couldn’t update branch

+

Oops, something went wrong.

+ +
+
+ +
+ +
+
+
+ @Mogge +
+ +
+ +
+ +
+ + +
+
+ + +
+ +
+ +
+ + + +
+ + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + +
+ +
+ + + + + + + + + + +
+ + + + + + +
+ Select a reply + ctrl . +
+ + + + + + +
+ + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + +
+ + + + + + + + + + + + +
+ + + + + + + + +
+
+
+ +
+
+ + +
+
+ +
+
+
+ +
+
+
+
+ Remember, contributions to this repository should follow + its + contributing guidelines + and + code of conduct. +
+ + +
+ + ProTip! + Add comments to specific lines under Files changed. +
+
+ + +
+
+
+ +
+
+ + +
+ + + +
+
+ +
+ + + + Reviewers + + + +
+ Request up to 15 reviewers + +
+ + + + + +
+ + +

Suggestions

+

+ + + + + + + + @ogerly + + ogerly + +

+

+ + + + + + + + @Tirokk + + Tirokk + +

+

+ + + + + + + + @roschaefer + + roschaefer + +

+ +

+ At least 1 approving review is required to merge this pull request. +

+ + + + + +
+ Still in progress? +
+ Convert to draft + +
+ +

Convert this pull request to draft?

+
+
+ + + People who are already subscribed will not be unsubscribed. + +
+ + +
+ +
+
+ +
+
+ + + +
+
+ + +
+ + + + Assignees + + + +
+ Assign up to 10 people to this pull request + +
+ + + + + +
+ + + + +

+ + + + @Mogge + + Mogge + +

+ + + +
+ + +
+ + + +
+ + + + Labels + + + +
+ Apply labels to this pull request + +
+
+
+ +
+
+ + + + + +
+ +
+ None yet +
+ +
+ + + +
+
+ +
+ + + + Projects + + + +
+ Projects + +
+ + + + + +
+ + + + None yet + + +
+ + + +
+
+ +
+ + + + Milestone + + + +
+ Set milestone + +
+ + + + + +
+ + No milestone + +
+ + + +
+
+ +
+ + + + Linked issues + + + +
+ Link an issue from this repository + +
+ + + + + +
+ + + +

Successfully merging this pull request may close these issues.

+ +

None yet

+ +
+
+ + +
+
+
+
+
+ +
+
Notifications
+ Customize +
+ +
+ +

+ Notification settings +

+
+ + +
+ Loading... +
+ +
+
+ +
+ + + + +

You’re receiving notifications because you’re watching this repository.

+
+ +
+ + +
+
+
+ 2 participants +
+
+ + @Mogge + + @roschaefer +
+
+
+ + + +
+
+ + + Lock conversation + + +
+
+ +

+ Lock conversation on this pull request +

+
+
+
    +
  • Other users can’t add new comments to this pull request.
    • +
  • + You and other members of teams with + write access + to this repository can still leave comments that others can see. +
    • +
  • You can always unlock this pull request again in the future.
    • +
+ +
+
+ +
+
+ +

+ Optionally, choose a reason for locking that others can see. Learn more about when + it’s appropriate to lock conversations. +

+
+
+
+
+ +
+
 +
+
+ + + + + + + + +
+ + + +
+
+
+ + + +
+ + +
+
+ + +
+
+ +
+ + + + + + +
+ + + You can’t perform that action at this time. +
+ + + + + + + + + + + + + +
\ No newline at end of file diff --git a/backend/snapshots/embeds/pr960.html b/backend/snapshots/embeds/pr960.html deleted file mode 100644 index 9b564f09a..000000000 --- a/backend/snapshots/embeds/pr960.html +++ /dev/null @@ -1,10042 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - Editor embeds merge in nitro embed by mattwr18 · Pull Request #960 · Human-Connection/Human-Connection - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Skip to content -
- - - - - - - - - - -
- -
- - -
- -
- - - -
-
-
- - - - - - - - - - - - - - - -
-
- -
    - - - - - -
  • - -
    - -
    - - - Unwatch - - -
    - Notifications -
    -
    - - - - - - - -
    -     -
    - -
    -
    • - -
  • -
    -
    - - -
    -
    - - -
    - -
    • - -
  • -
    - - Fork - -
    - -

    Fork Human-Connection

    -
    -
    - - -

    If this dialog fails to load, you can visit the fork page directly.

    -     -
    -     -
    - - -
    • -
- -

- - /Human-Connection - - - - - - - - - -
-
- - Select a Repo - - shift - + - z - - -
-
- - - -
-
- - -
- Switch repository - - - - -
- - -
-
- -
-
- - - -
- Loading your repositories... -
- - -
-
-/Nitro - - - -

- -
- - - - -
-
-
- - - -
- - - - -
- - -
- -
-
-
- - -
- -

- - Editor embeds merge in nitro embed - - #960 -

-
- -
-
- - - -
-
-
- - - Open - - - -
-
- - - wants to merge - 55 - commits into - - - - - -
-
- - base: - master - - - - - - -
-
- -
- -from - - - - - -
-
- - - -
-
- - - -
-
- - - +5,595 - - - −39 - - - - - -
- - -
- - - -

Conversation

-
- -
- -
Pipelines
- -
-
- -
- - - - Reviewers - - -
-
- Request a review - -
- - - - -
-
- -
-
- -
- You can only select 15 reviewers. -
- -
-
Nothing to show
- -
- - - -
Suggestions
-
Everyone else
-
-
- - - -
- -
-
-
- - -

Suggestions

-

- - - - - - - - @roschaefer - - roschaefer - -

-

- - - - - - - - @ulfgebhardt - - ulfgebhardt - -

-

- - - - - - - - @appinteractive - - appinteractive - -

- -

- At least 1 approving review is required to merge this pull request. -

- - - - -
- - -
-
- -
- - - - Assignees - - -
-
- Assign up to 10 people to this pull request - -
- - - - -
-
- -
-
- -
- You can only select 10 assignees. -
- -
- -
Nothing to show
- - - -
- - -
-
- - - -
- -
-
-
- - - - No one— - - -
- -
- - - -
- - - - Labels - - -
-
- Apply labels to this pull request - -
-
-
- -
-
- -
- -
-
- -
-
-
- -
- None yet -
- -
- -
-
- -
- - - - Projects - - -
-
- Projects - -
- -
- -
-
- -
-
-
- - - - None yet - - -
- -
-
- -
- - - - Milestone - - -
-
- Set milestone - -
- -
- -
-
- -
-
-
- - No milestone - -
- - - - - -
- - - No estimate yet - - -
- - - - -
-
Not inside a Release
- - - - - -
- - Not inside an Epic -
- - - - -
- -
-
- - -
-
- -
- - -
-
Notifications
- Customize -
- - - -
- -

Notification settings

-
- - -
- - -
- - - - -
-
- - -
-
- -
-
-
- -
- - - - -

You’re receiving notifications because you’re watching this repository.

-
- -
- -
-
- -
- 4 participants -
-
- - @mattwr18 - - @roschaefer - - @appinteractive - - @dependabot-bot -
-
-
- - - -
-
- - - Lock conversation - - -
-
- -

- Lock conversation on this pull request -

-
-
-
    -
  • Other users can’t add new comments to this pull request.
    • -
  • - You and other members of teams with - write access - to this repository can still leave comments that others can see. -
    • -
  • You can always unlock this pull request again in the future.
    • -
- -
-
- -
-
- -

- Optionally, choose a reason for locking that others can see. Learn more about when - it’s appropriate to lock conversations. -

-
-
-
-
- -
-
 -
-
- - - - - - -
- -
- -
-
- - -
- Move issue to another repository - - - - - -
- - - - -
-
- -
-
- - -
-
- Loading your repositories... -
-
-
-
-
-
- - - -
-
- - -
- -
-
- - -
- - - -
- @mattwr18 - -
- - -
-
- - -
-
- - - - - - - - - - - - - - - - -
- - - - - - -
-

- Pick your reaction -

- -
- -
- - - - - - - - - - -
-
 - -
- - - - -
- - - - - - Copy link - - - - -
- - - -
- - - Report abuse - - - -
- -
- - - - - Member - - - - - - -

- - - - - commented - - - 18 days ago - - - - -

-
- - -
- - - - - - - - - -
-

cake Pullrequest

- -

Issues

- - -
- - - - - -
-
- -
- -
-
- -
- - - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - -

- The content you are editing has changed. Please try again. -

- - -
- - - - - - - - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- - -
-
-
-

Nothing to preview

-
-
- -
- -
- - - - -
- - -
-
- - -
- -
-
- -
Editor embeds merge in nitro embed hasno dependencies
- - - - -
- - - - -
- - -
-

- - - - - appinteractive - and others - added some commits - - on Dec 27, 2018 - -

-
-
- - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - Inital minimal working version with graqhql, metascraper and oembed - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - cc06d53 - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - Create README.md - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 3b49e9f - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - added 404 error, better error correction for oEmbed, audio and soundc… - - - - - - 
…loud
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 18bfc85 - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - better logging and only in dev - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - f44121b - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - fix youtube start parameter - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 32fad61 - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - added sources to results from which data was aggregated - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - f8f0ff3 - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - fallback to link type where possible - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 8e71c27 - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - Improved readme - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 053cc86 - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - Added API Playground screenshot - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 9ddf89d - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - Upgraded screenshot - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - c310644 - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - Use string for extension.code instead of number "404" - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - appinteractive - Grzegorz Leoniec - -
- -
- GPG key ID: 3AA43686D4EB1377 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 296fc5a - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-bot -
-
- - - -
- - Bump got from 9.5.0 to 9.6.0 - - - - - - 
Bumps [got](https://github.com/sindresorhus/got) from 9.5.0 to 9.6.0.
-- [Release notes](https://github.com/sindresorhus/got/releases)
-- [Commits](sindresorhus/got@v9.5.0...v9.6.0)
-
-Signed-off-by: dependabot[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - dependabot-bot - Dependabot - -
- -
- GPG key ID: 4C0F2888C98CF331 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 6461a43 - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-bot -
-
- - - -
- - Bump metascraper from 4.8.5 to 4.10.3 - - - - - - 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 4.8.5 to 4.10.3.
-- [Release notes](https://github.com/microlinkhq/metascraper/releases)
-- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
-- [Commits](microlinkhq/metascraper@v4.8.5...v4.10.3)
-
-Signed-off-by: dependabot[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was signed with a verified signature. -
-
- -
- - - - - dependabot-bot - Dependabot - -
- -
- GPG key ID: 4C0F2888C98CF331 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - f228eb3 - -
-
- - - - -
- -
- -
- - -
-
- - @appinteractive -
-
- - - -
- - Update README.md - - - -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - d3624ab - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-preview -
-
- - - -
- - Bump metascraper-description from 4.8.5 to 5.5.0 - - - - - - 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 4.8.5 to 5.5.0.
-- [Release notes](https://github.com/microlinkhq/metascraper/releases)
-- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
-- [Commits](microlinkhq/metascraper@v4.8.5...v5.5.0)
-
-Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 2a81c5b - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #7 from Human-Connection/dependabot/npm_and_yarn/g… - - - - - - 
…ot-9.6.0
-
-Bump got from 9.5.0 to 9.6.0
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 2e66ee4 - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #17 from Human-Connection/dependabot/npm_and_yarn/… - - - - - - 
…metascraper-4.10.3
-
-Bump metascraper from 4.8.5 to 4.10.3
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - b7e7f22 - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-preview -
-
- - - -
- - Bump metascraper-clearbit-logo from 4.8.5 to 5.3.0 - - - - - - 
Bumps [metascraper-clearbit-logo](https://github.com/microlinkhq/metascraper-clearbit-logo) from 4.8.5 to 5.3.0.
-- [Release notes](https://github.com/microlinkhq/metascraper-clearbit-logo/releases)
-- [Commits](https://github.com/microlinkhq/metascraper-clearbit-logo/commits)
-
-Signed-off-by: dependabot[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 4ceff96 - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-preview -
-
- - - -
- - Bump metascraper-video from 4.8.5 to 5.5.0 - - - - - - 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 4.8.5 to 5.5.0.
-- [Release notes](https://github.com/microlinkhq/metascraper/releases)
-- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
-- [Commits](microlinkhq/metascraper@v4.8.5...v5.5.0)
-
-Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 69b1a25 - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-preview -
-
- - - -
- - Bump metascraper-logo from 4.8.5 to 5.5.0 - - - - - - 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 4.8.5 to 5.5.0.
-- [Release notes](https://github.com/microlinkhq/metascraper/releases)
-- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
-- [Commits](microlinkhq/metascraper@v4.8.5...v5.5.0)
-
-Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - b7ef87e - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-preview -
-
- - - -
- - Bump metascraper-audio from 4.8.5 to 5.5.0 - - - - - - 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 4.8.5 to 5.5.0.
-- [Release notes](https://github.com/microlinkhq/metascraper/releases)
-- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
-- [Commits](microlinkhq/metascraper@v4.8.5...v5.5.0)
-
-Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 82dcc99 - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-preview -
-
- - - -
- - Bump apollo-server from 2.3.1 to 2.6.7 - - - - - - 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.3.1 to 2.6.7.
-- [Release notes](https://github.com/apollographql/apollo-server/releases)
-- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
-- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.3.1...apollo-server@2.6.7)
-
-Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - af8ed1c - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-preview -
-
- - - -
- - Bump metascraper-description from 4.8.5 to 5.5.0 - - - - - - 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 4.8.5 to 5.5.0.
-- [Release notes](https://github.com/microlinkhq/metascraper/releases)
-- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
-- [Commits](microlinkhq/metascraper@v4.8.5...v5.5.0)
-
-Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - d1efdad - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-preview -
-
- - - -
- - Bump metascraper-url from 4.8.5 to 5.5.0 - - - - - - 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 4.8.5 to 5.5.0.
-- [Release notes](https://github.com/microlinkhq/metascraper/releases)
-- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
-- [Commits](microlinkhq/metascraper@v4.8.5...v5.5.0)
-
-Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - b8725f1 - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge branch 'master' of github.com:Human-Connection/Nitro-Embed into… - - - - - - 
… dependabot/npm_and_yarn/metascraper-description-5.5.0
- -
- -
- - -
- -
-
- -
- - 05db6fe - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge branch 'dependabot/npm_and_yarn/metascraper-description-5.5.0' … - - - - - - 
…of github.com:Human-Connection/Nitro-Embed into dependabot/npm_and_yarn/metascraper-description-5.5.0
- -
- -
- - -
- -
-
- -
- - bc9c21c - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #67 from Human-Connection/dependabot/npm_and_yarn/… - - - - - - 
…metascraper-description-5.5.0
-
-Bump metascraper-description from 4.8.5 to 5.5.0
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - d633331 - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #25 from Human-Connection/dependabot/npm_and_yarn/… - - - - - - 
…metascraper-clearbit-logo-5.3.0
-
-Bump metascraper-clearbit-logo from 4.8.5 to 5.3.0
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - acfc956 - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #69 from Human-Connection/dependabot/npm_and_yarn/… - - - - - - 
…metascraper-logo-5.5.0
-
-Bump metascraper-logo from 4.8.5 to 5.5.0
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - a22edd9 - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #71 from Human-Connection/dependabot/npm_and_yarn/… - - - - - - 
…metascraper-audio-5.5.0
-
-Bump metascraper-audio from 4.8.5 to 5.5.0
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 0e89f27 - -
-
- - -
-
-
- - -
- - - - - -
- - -
-

- - - - - mattwr18 - and others - added some commits - - 19 days ago - -

-
-
- - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #72 from Human-Connection/dependabot/npm_and_yarn/… - - - - - - 
…metascraper-video-5.5.0
-
-Bump metascraper-video from 4.8.5 to 5.5.0
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 46edb24 - -
-
- - - - -
- -
- -
- - -
-
- - @dependabot-preview -
-
- - - -
- - Bump metascraper-soundcloud from 4.8.5 to 5.5.3 - - - - - - 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 4.8.5 to 5.5.3.
-- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
-- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)
-
-Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 721c75e - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge branch 'master' of github.com:Human-Connection/Nitro-Embed into… - - - - - - 
… dependabot/npm_and_yarn/metascraper-url-5.5.0
- -
- -
- - -
- -
-
- -
- - 93e82de - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #73 from Human-Connection/dependabot/npm_and_yarn/… - - - - - - 
…metascraper-url-5.5.0
-
-Bump metascraper-url from 4.8.5 to 5.5.0
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 27eb5a2 - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #75 from Human-Connection/dependabot/npm_and_yarn/… - - - - - - 
…apollo-server-2.6.7
-
-Bump apollo-server from 2.3.1 to 2.6.7
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 638f1f3 - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge pull request #76 from Human-Connection/dependabot/npm_and_yarn/… - - - - - - 
…metascraper-soundcloud-5.5.3
-
-Bump metascraper-soundcloud from 4.8.5 to 5.5.3
- -
- -
- -
- - Verified - -
-
-
-
- -
-
- This commit was created on GitHub.com and signed with a verified signature using GitHub’s key. -
-
- - -
- GPG key ID: 4AEE18F83AFDEB23 - Learn about signing commits -
-
-
-
- -
- -
-
- -
- - 5091fe5 - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merging Human-Connection to master - - - -
- -
- - -
- -
-
- -
- - 089b07c - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Root commit for master branch - - - -
- -
- - -
- -
-
- -
- - cc6819e - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merging embed to master - - - -
- -
- - -
- -
-
- -
- - 7a3694a - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Merge in Nitro-Embed - - - -
- -
- - -
- -
- -
- - - -
- -
-
Loading status checks…
- -
-
- - -
- -
- - eabb58e - -
-
- - - - -
- -
- -
- - -
-
- - @mattwr18 -
-
- - - -
- - Dockerize embed, kubernetes config, add back deployment .env - - - -
- -
- - -
- -
- -
- - - -
- -
-
Loading status checks…
- -
-
- - -
- -
- - ed658e9 - -
-
- - -
-
-
- - -
- - - -
- - -
- - - -
- @codecov - -
- - - -
-
- - - - -
- -
-

- This comment has been minimized. - -

-
Show comment
-
Hide comment
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - -
- - - - - - Copy link - - - - -
- - - -
- - -
-
- - -
-
- - - Report abuse - -
- Block user - - - -
- - - - -
- -
- @codecov -
-

- - - - codecov - bot - - - - 18 days ago - -

- - - - -
-

Codecov Report

-
-

exclamation No coverage uploaded for pull request base (master@324330a). Click here to learn what that means.
-The diff coverage is n/a.

-
-
- -
-
- -
-
- -
- - - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - -

- The content you are editing has changed. Please try again. -

- - -
- - - - - - - - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- - -
-
-
-

Nothing to preview

-
-
- -
- -
- - - - -
- - -
-
- - -
- -
-
-
- - -
-
- - -
-
- - - - - - - - - - - - - - - - -
- - - - - - -
-

- Pick your reaction -

- -
- -
- - - - - - - - - - -
-
 - -
- - - - -
- - - - - - Copy link - - - - - - -
- - - Reference in new issue - - -
- -

Reference in new issue

-
- -
- -
-
-
-
-
- - - Human-Connection - - -
- Repositories -
-
-
- - - -
-
- - -
-
-
-
-
-
-
-
-
-
-
- -
- -
-
-
- - -
- -
- - - - - -
- - -
-
- - - Report abuse - -
- Block user - - - -
- - - - -
- -
- - - - - - - - -

- - - - - commented - - - 18 days ago - - - - -

-
- - -
-
- - -
- -

Choose a reason for hiding this comment

-

The reason will be displayed to describe this comment to others. Learn more.

-
- - - -
- -
- - - - - - - - - -
-

Codecov Report

-
-

exclamation No coverage uploaded for pull request base (master@324330a). Click here to learn what that means.
-The diff coverage is n/a.

-
-
- - - - - -
-
- -
- -
-
- -
- - - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - -

- The content you are editing has changed. Please try again. -

- - -
- - - - - - - - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- - -
-
-
-

Nothing to preview

-
-
- -
- -
- - - - -
- - -
-
- - -
- -
-
- - -
- - -
- - - - -
- -
-

- - - - @mattwr18 - mattwr18 - - - referenced this pull request - - 16 days ago - -

- - - - - Closed - - - - - - -

- - Editor embeds - #953 -

- - - - - - - -
- - - -
- - - -
- - -
- - - -
- @mattwr18 - -
- - - -
-
- - - - -
- -
-

- This comment has been minimized. - -

-
Show comment
-
Hide comment
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - -
- - - - - - Copy link - - - - -
- - - -
- - -
-
- - -
-
- - - Report abuse - - - -
- -
- @mattwr18 -
-

- - - - mattwr18 - - - - - 9 days ago - -

- - - Member - - - - Author - - - -
-

does this look ok @roschaefer? I used tomono, but because I already had a repo with the name Human-Connection, I needed to remove it and recreate it with the merged commit history. This caused some small issues for me locally, but I think others won't face the same.

-

The files changed and commit history look good to me

-
- -
-
- -
-
- -
- - - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - -

- The content you are editing has changed. Please try again. -

- - -
- - - - - - - - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- - -
-
-
-

Nothing to preview

-
-
- -
- -
- - - - -
- - -
-
- - -
- -
-
-
- - -
-
- - -
-
- - - - - - - - - - - - - - - - -
- - - - - - -
-

- Pick your reaction -

- -
- -
- - - - - - - - - - -
-
 - -
- - - - -
- - - - - - Copy link - - - - - - -
- - - Reference in new issue - - -
- -

Reference in new issue

-
- -
- -
-
-
-
-
- - - Human-Connection - - -
- Repositories -
-
-
- - - -
-
- - -
-
-
-
-
-
-
-
-
-
-
- -
- -
-
-
- - -
- -
- - - - - -
- - -
-
- - - Report abuse - - - -
- -
- - - - - Member - - - - - Author - - - - -

- - - - - commented - - - 9 days ago - - - - -

-
- - -
-
- - -
- -

Choose a reason for hiding this comment

-

The reason will be displayed to describe this comment to others. Learn more.

-
- - - -
- -
- - - - - - - - - -
-

does this look ok @roschaefer? I used tomono, but because I already had a repo with the name Human-Connection, I needed to remove it and recreate it with the merged commit history. This caused some small issues for me locally, but I think others won't face the same.

-

The files changed and commit history look good to me

-
- - - - - -
-
- -
- -
-
- -
- - - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - -

- The content you are editing has changed. Please try again. -

- - -
- - - - - - - - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- - -
-
-
-

Nothing to preview

-
-
- -
- -
- - - - -
- - -
-
- - -
- -
-
- - -
- - -
- - - - -
- - -
-
-
- - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Merge remote-tracking branch 'origin/master' into 256-editor-embeds-m… - - - - - - 
…erge-in-nitro-embed
- -
- -
- - -
- -
-
- -
- - b745908 - -
-
- - -
-
-
- - -
- - - -
- - -
- - - -
- @roschaefer - -
- - - -
-
- - - - -
- -
-

- This comment has been minimized. - -

-
Show comment
-
Hide comment
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - -
- - - - - - Copy link - - - - -
- - - -
- - -
-
- - -
- - -
- -
- @roschaefer -
-

- - - - roschaefer - - - - - 5 days ago - -

- - - Member - - - - -
-

@mattwr18 this looks good, but could sb. explain me why this is a separate service and not just another resolver in our backend?

-

@appinteractive maybe?

-
- -
-
- -
-
- -
- - - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - -

- The content you are editing has changed. Please try again. -

- - -
- - - - - - - - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- - -
-
-
-

Nothing to preview

-
-
- -
- -
- - - - -
- - -
-
- - -
- -
-
-
- - -
-
- - -
-
- - - - - - - - - - - - - - - - -
- - - - - - -
-

- Pick your reaction -

- -
- -
- - - - - - - - - - -
-
 - -
- - - - -
- - - - - - Copy link - - - - - - -
- - - Reference in new issue - - -
- -

Reference in new issue

-
- -
- -
-
-
-
-
- - - Human-Connection - - -
- Repositories -
-
-
- - - -
-
- - -
-
-
-
-
-
-
-
-
-
-
- -
- -
-
-
- - -
- -
- - - - - -
- - -
- - -
- -
- - - - - Member - - - - - - -

- - - - - commented - - - 5 days ago - - - - -

-
- - -
-
- - -
- -

Choose a reason for hiding this comment

-

The reason will be displayed to describe this comment to others. Learn more.

-
- - - -
- -
- - - - - - - - - -
-

@mattwr18 this looks good, but could sb. explain me why this is a separate service and not just another resolver in our backend?

-

@appinteractive maybe?

-
- - - - - -
-
- -
- -
-
- -
- - - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - -

- The content you are editing has changed. Please try again. -

- - -
- - - - - - - - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- - -
-
-
-

Nothing to preview

-
-
- -
- -
- - - - -
- - -
-
- - -
- -
-
- - -
- - -
- - - - -
- - -
- - - -
- @mattwr18 - -
- - - -
-
- - - - -
- -
-

- This comment has been minimized. - -

-
Show comment
-
Hide comment
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - -
- - - - - - Copy link - - - - -
- - - -
- - -
-
- - -
-
- - - Report abuse - - - -
- -
- @mattwr18 -
-

- - - - mattwr18 - - - - - 5 days ago - -

- - - Member - - - - Author - - - -
-

I think it could be, I thought the same thing myself @roschaefer

-
- -
-
- -
-
- -
- - - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - -

- The content you are editing has changed. Please try again. -

- - -
- - - - - - - - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- - -
-
-
-

Nothing to preview

-
-
- -
- -
- - - - -
- - -
-
- - -
- -
-
-
- - -
-
- - -
-
- - - - - - - - - - - - - - - - -
- - - - - - -
-

- Pick your reaction -

- -
- -
- - - - - - - - - - -
-
 - -
- - - - -
- - - - - - Copy link - - - - - - -
- - - Reference in new issue - - -
- -

Reference in new issue

-
- -
- -
-
-
-
-
- - - Human-Connection - - -
- Repositories -
-
-
- - - -
-
- - -
-
-
-
-
-
-
-
-
-
-
- -
- -
-
-
- - -
- -
- - - - - -
- - -
-
- - - Report abuse - - - -
- -
- - - - - Member - - - - - Author - - - - -

- - - - - commented - - - 5 days ago - - - - -

-
- - -
-
- - -
- -

Choose a reason for hiding this comment

-

The reason will be displayed to describe this comment to others. Learn more.

-
- - - -
- -
- - - - - - - - - -
-

I think it could be, I thought the same thing myself @roschaefer

-
- - - - - -
-
- -
- -
-
- -
- - - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - -

- The content you are editing has changed. Please try again. -

- - -
- - - - - - - - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- - -
-
-
-

Nothing to preview

-
-
- -
- -
- - - - -
- - -
-
- - -
- -
-
- - -
- - -
- - - - -
- - -
-

- - - - - roschaefer - - added some commits - - 2 days ago - -

-
-
- - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Merge remote-tracking branch 'origin/master' into 256-editor-embeds-m… - - - - - - 
…erge-in-nitro-embed
- -
- -
- - -
- -
-
- -
- - b3712d9 - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Merge embed service with backend - - - -
- -
- - -
- -
-
- -
- - d4c3b7a - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Replace `got` with `node-fetch` => -1 dependency - - - -
- -
- - -
- -
-
- -
- - 2e6ea62 - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Refactor scraper.js with ES6 imports - - - -
- -
- - -
- -
- -
- - - -
- -
-
Loading status checks…
- -
-
- - -
- -
- - f82b2c3 - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Remove embed service from docker-compose.yml - - - -
- -
- - -
- -
- -
- - - -
- -
-
Loading status checks…
- -
-
- - -
- -
- - 17ccbce - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Fix lint - - - -
- -
- - -
- -
- -
- - - -
- -
-
Loading status checks…
- -
-
- - -
- -
- - 73e879e - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Merge branch 'master' of github.com:Human-Connection/Human-Connection… - - - - - - 
… into 256-editor-embeds-merge-in-nitro-embed
- -
- -
- - -
- -
-
- -
- - 7a9d933 - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Remove obscure `embed` attribute and remove cache - - - - - - 
The cache is a possible memory leak: It grows over time and never gets
-cleaned.
- -
- -
- - -
- -
-
- -
- - d81c38c - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Start to mock+test embeds resolver - - - - - - 
+ Put oembed providers into a file
-+ Add test snapshots
-+ Remove unnecessary request-native dependency
- -
- -
- - -
- -
-
- -
- - f5730fc - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Re-add embed attribute as `html` - - - -
- -
- - -
- -
-
- -
- - 579ec7e - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Add npm script to run tests without http servers - - - - - - 
Remove this script once we refactored all tests to use
-`apollo-server-testing`.
- -
- -
- - -
- -
-
- -
- - d7d2c2e - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Passing jest test, not all requests stubbed out - - - -
- -
- - -
- -
- -
- - - -
- -
-
Loading status checks…
- -
-
- - -
- -
- - 75743ca - -
-
- - - - -
- -
- -
- - -
-
- - @roschaefer -
-
- - - -
- - Remove `metascraper-logo-favicon` altogether - - - - - - 
It's doing http requests which are hard to test and hard to maintain.
-Therefore let's remove it until we really need it.
- -
- -
- - -
- -
- -
- - - -
- -
-
Loading status checks…
- -
-
- - -
- -
- - 3d7a30d - -
-
- - -
-
-
- - -
- - - - - -
-
- -
- - -
- -
- - - -
- -

Merge state

-
-

Add more commits by pushing to the 256-editor-embeds-merge-in-nitro-embed branch on Human-Connection/Human-Connection.

- - - - - - -
- - - -
-
- -
-
- -
- - - Add your review - - -

- Review required -

- - - At least 1 approving review is required by reviewers with write access. - Learn more. - - - -
- - -
-
- -
- -
- - -

All checks have passed

- 4 successful checks -
- -
-
-
- -
- - - @travis-ci - - - -
- - Travis CI - Branch - - - Successful in 18m - - — - Build Passed -
- -
- Required - - Details -
- -
-
-
- -
- - - @travis-ci - - - -
- - Travis CI - Pull Request - - - Successful in 17m - - — - Build Passed -
- -
- Required - - Details -
- -
-
-
- -
- - - @codecov - - - -
- - codecov/project/backend - - - - - — - 25.29% (+1.97%) compared to d901432 -
- -
- - Details -
- -
-
-
- -
- - - @codecov - - - -
- - codecov/project/webapp - - - - - — - 45.23% remains the same compared to d901432 -
- -
- - Details -
- -
- -
-
- - -
-
- -
-
Merging is blocked
- Merging can be performed automatically with 1 approving review. -
- - - -
- - -
-
- - - -
- -
- - - -
- -
- - - -
- -
-
- -
-
-
- - -

- - - - or view . -

- - -
-

Merging via command line

-

- If you do not want to use the merge button or an automatic merge cannot be - performed, you can perform a manual merge on the command line. -

- -
-
-
- -
- -
- - - - - - - - -
-
- -

Step 1: From your project repository, bring in the changes and test.

-
-
- - - -
- 
git fetch origin
-git checkout -b 256-editor-embeds-merge-in-nitro-embed origin/256-editor-embeds-merge-in-nitro-embed
-git merge master
-
- -

Step 2: Merge the changes and update on GitHub.

-
-
- - - -
- 
git checkout master
-git merge --no-ff 256-editor-embeds-merge-in-nitro-embed
-git push origin master
-
-
- -
-
-
-
- - - - -
- - - - - -
- - - -
- -

Couldn’t update branch

-

Oops, something went wrong.

- -
-
- -

Connect this pull request with an existing issue

- -
- @roschaefer - -
- - - - -
- -
-
- - - - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - -
- - - - - -
- Select a reply - ctrl . -
- - - - -
- -
- - - -
- - - - - -
- - - - - - - -

- - - - - Attach files by dragging & dropping, selecting or pasting them. - - - Uploading your files… - - - We don’t support that file type. - - with a - GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Attaching documents requires write permission to this repository. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - We don’t support that file type. - - with a GIF, JPEG, JPG, PNG, DOCX, GZ, LOG, PDF, PPTX, TXT, XLSX or ZIP. - - - - Yowza, that’s a big file - - with a file smaller than 10MB. - - - - This file is empty. - - with a file that’s not empty. - - - - This file is hidden. - - with another file. - - - - Something went really wrong, and we can’t process that file. - - - - - - - - - - -

- -
- -
- - - -
-
-

Nothing to preview

-
-
- -
- - - - -
- -
-
- - - - - - -
- -
-
-
-
- - ProTip! - Add .patch or .diff to the end of URLs for Git’s plaintext views. -
-
- - -
-
- -
-
- - - -
- - -
-
-
- -
-
- - -
- - - - - - -
- - - You can’t perform that action at this time. -
- - - - - - - - - - - - - - -
- - - - -
\ No newline at end of file diff --git a/backend/src/activitypub/NitroDataSource.js b/backend/src/activitypub/NitroDataSource.js index 2df895f58..476c91439 100644 --- a/backend/src/activitypub/NitroDataSource.js +++ b/backend/src/activitypub/NitroDataSource.js @@ -14,7 +14,7 @@ import { InMemoryCache } from 'apollo-cache-inmemory' import fetch from 'node-fetch' import { ApolloClient } from 'apollo-client' import trunc from 'trunc-html' -const debug = require('debug')('ea:nitro-datasource') +const debug = require('debug')('ea:datasource') export default class NitroDataSource { constructor(uri) { diff --git a/backend/src/activitypub/routes/webfinger.js b/backend/src/activitypub/routes/webfinger.js index e624d306a..6b8f3e14c 100644 --- a/backend/src/activitypub/routes/webfinger.js +++ b/backend/src/activitypub/routes/webfinger.js @@ -45,7 +45,7 @@ export async function handler(req, res) { } catch (error) { debug(error) return res.status(500).json({ - error: 'Something went terribly wrong. Please contact support@human-connection.org', + error: `Something went terribly wrong. Please visit ${CONFIG.SUPPORT_URL}`, }) } finally { session.close() diff --git a/backend/src/config/index.js b/backend/src/config/index.js index 4c81bb181..9ebde6cee 100644 --- a/backend/src/config/index.js +++ b/backend/src/config/index.js @@ -1,7 +1,15 @@ import dotenv from 'dotenv' +import links from './links.js' +import metadata from './metadata.js' + if (require.resolve) { // are we in a nodejs environment? - dotenv.config({ path: require.resolve('../../.env') }) + try { + dotenv.config({ path: require.resolve('../../.env') }) + } catch (error) { + if (error.code !== 'MODULE_NOT_FOUND') throw error + console.log('WARN: No `.env` file found in /backend') // eslint-disable-line no-console + } } // eslint-disable-next-line no-undef @@ -31,6 +39,7 @@ const { REDIS_DOMAIN, REDIS_PORT, REDIS_PASSWORD, + EMAIL_DEFAULT_SENDER, } = env export const requiredConfigs = { @@ -83,6 +92,13 @@ export const s3Configs = { S3_CONFIGURED, } +export const customConfigs = { + EMAIL_DEFAULT_SENDER, + SUPPORT_URL: links.SUPPORT, + APPLICATION_NAME: metadata.APPLICATION_NAME, + ORGANIZATION_URL: links.ORGANIZATION, +} + export default { ...requiredConfigs, ...smtpConfigs, @@ -92,4 +108,5 @@ export default { ...sentryConfigs, ...redisConfigs, ...s3Configs, + ...customConfigs, } diff --git a/backend/src/config/links.js b/backend/src/config/links.js new file mode 100644 index 000000000..494e449ba --- /dev/null +++ b/backend/src/config/links.js @@ -0,0 +1,6 @@ +export default { + ORGANIZATION: 'https://ocelot.social', + DONATE: 'https://ocelot-social.herokuapp.com/donations', + FAQ: 'https://ocelot.social', + SUPPORT: 'https://ocelot.social', +} diff --git a/backend/src/config/metadata.js b/backend/src/config/metadata.js new file mode 100644 index 000000000..68d353eea --- /dev/null +++ b/backend/src/config/metadata.js @@ -0,0 +1,7 @@ +export default { + APPLICATION_NAME: 'ocelot.social', + APPLICATION_SHORT_NAME: 'ocelot', + APPLICATION_DESCRIPTION: 'ocelot.social Community Network', + ORGANIZATION_NAME: 'ocelot.social Community', + ORGANIZATION_JURISDICTION: 'City of Angels', +} diff --git a/backend/src/middleware/email/templateBuilder.js b/backend/src/middleware/email/templateBuilder.js index b4b7b78ca..6e147d752 100644 --- a/backend/src/middleware/email/templateBuilder.js +++ b/backend/src/middleware/email/templateBuilder.js @@ -3,11 +3,18 @@ import CONFIG from '../../config' import * as templates from './templates' -const from = '"Human Connection" ' -const supportUrl = 'https://human-connection.org/en/contact' +const from = CONFIG.EMAIL_DEFAULT_SENDER +const welcomeImageUrl = new URL(`/img/custom/welcome.svg`, CONFIG.CLIENT_URI) + +const defaultParams = { + supportUrl: CONFIG.SUPPORT_URL, + APPLICATION_NAME: CONFIG.APPLICATION_NAME, + ORGANIZATION_URL: CONFIG.ORGANIZATION_URL, + welcomeImageUrl, +} export const signupTemplate = ({ email, nonce }) => { - const subject = 'Willkommen, Bienvenue, Welcome to Human Connection!' + const subject = `Willkommen, Bienvenue, Welcome to ${CONFIG.APPLICATION_NAME}!` const actionUrl = new URL('/registration/create-user-account', CONFIG.CLIENT_URI) actionUrl.searchParams.set('nonce', nonce) actionUrl.searchParams.set('email', email) @@ -18,7 +25,7 @@ export const signupTemplate = ({ email, nonce }) => { subject, html: mustache.render( templates.layout, - { actionUrl, nonce, supportUrl, subject }, + { ...defaultParams, actionUrl, nonce, subject }, { content: templates.signup }, ), } @@ -36,7 +43,7 @@ export const emailVerificationTemplate = ({ email, nonce, name }) => { subject, html: mustache.render( templates.layout, - { actionUrl, name, nonce, supportUrl, subject }, + { ...defaultParams, actionUrl, name, nonce, subject }, { content: templates.emailVerification }, ), } @@ -54,7 +61,7 @@ export const resetPasswordTemplate = ({ email, nonce, name }) => { subject, html: mustache.render( templates.layout, - { actionUrl, name, nonce, supportUrl, subject }, + { ...defaultParams, actionUrl, name, nonce, subject }, { content: templates.passwordReset }, ), } @@ -70,7 +77,7 @@ export const wrongAccountTemplate = ({ email }) => { subject, html: mustache.render( templates.layout, - { actionUrl, supportUrl }, + { actionUrl, supportUrl: CONFIG.SUPPORT_URL, welcomeImageUrl }, { content: templates.wrongAccount }, ), } diff --git a/backend/src/middleware/email/templates/emailVerification.html b/backend/src/middleware/email/templates/emailVerification.html index 939ceccdb..3fc421dc5 100644 --- a/backend/src/middleware/email/templates/emailVerification.html +++ b/backend/src/middleware/email/templates/emailVerification.html @@ -6,8 +6,8 @@ Human Connection community logo @@ -74,9 +74,9 @@

Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: {{{ nonce }}}

-

Bis bald bei Human Connection!

-

– Dein Human Connection Team

+

Bis bald bei {{{APPLICATION_NAME}}}!

+

– Dein {{APPLICATION_NAME}} Team

@@ -104,8 +104,8 @@ Human Connection community logo @@ -172,9 +172,9 @@

If the above button doesn't work you can also copy the following code into your browser window: {{{ nonce }}}

-

See you soon on Human Connection!

-

– The Human Connection Team

+

See you soon on {{{APPLICATION_NAME}}}!

+

– The {{APPLICATION_NAME}} Team

diff --git a/backend/src/middleware/email/templates/layout.html b/backend/src/middleware/email/templates/layout.html index 7e1c39ace..da2053a93 100644 --- a/backend/src/middleware/email/templates/layout.html +++ b/backend/src/middleware/email/templates/layout.html @@ -170,8 +170,8 @@

- Human Connection gGmbH
Bahnhofstraße 11, 73235 Weilheim / - Teck
Germany + {{ORGANIZATION_NAME}} +
{{ORGANIZATION_URL}}


diff --git a/backend/src/middleware/email/templates/resetPassword.html b/backend/src/middleware/email/templates/resetPassword.html index 768051070..1f8c74ded 100644 --- a/backend/src/middleware/email/templates/resetPassword.html +++ b/backend/src/middleware/email/templates/resetPassword.html @@ -6,8 +6,8 @@ Human Connection community logo @@ -74,9 +74,9 @@

Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: {{{ nonce }}}

-

Bis bald bei Human Connection!

-

– Dein Human Connection Team

+

Bis bald bei {{APPLICATION_NAME}}!

+

– Dein {{APPLICATION_NAME}} Team

@@ -104,8 +104,8 @@ Human Connection community logo @@ -171,9 +171,9 @@

If the above button doesn't work you can also copy the following code into your browser window: {{{ nonce }}}

-

See you soon on Human Connection!

-

– The Human Connection Team

+

See you soon on {{APPLICATION_NAME}}!

+

– The {{APPLICATION_NAME}} Team

diff --git a/backend/src/middleware/email/templates/signup.html b/backend/src/middleware/email/templates/signup.html index ad60d9323..f4155a91e 100644 --- a/backend/src/middleware/email/templates/signup.html +++ b/backend/src/middleware/email/templates/signup.html @@ -6,8 +6,8 @@ Human Connection community logo @@ -23,7 +23,7 @@ style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">

- Willkommen bei Human Connection!

+ Willkommen bei {{APPLICATION_NAME}}!

Danke, dass Du dich angemeldet hast – wir freuen uns, Dich dabei zu haben. Jetzt fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können ... Bitte bestätige Deine E-Mail Adresse:

@@ -62,8 +62,8 @@

Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: {{{ nonce }}}

Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert hast.

-

Falls Du Dich nicht selbst bei Human Connection angemeldet hast, schau doch mal vorbei! +

Falls Du Dich nicht selbst bei {{APPLICATION_NAME}} angemeldet hast, schau doch mal vorbei! Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen.

PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese E-Mail einfach ignorieren. ;)

@@ -87,9 +87,9 @@

Melde Dich gerne bei unserem Support Team, wenn Du Fragen hast.

-

Bis bald bei Human Connection!

-

– Dein Human Connection Team

+

Bis bald bei {{APPLICATION_NAME}}!

+

– Dein {{APPLICATION_NAME}} Team

@@ -117,8 +117,8 @@ Human Connection community logo @@ -134,7 +134,7 @@ style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">

- Welcome to Human Connection!

+ Welcome to {{APPLICATION_NAME}}!

Thank you for joining our cause – it's awesome to have you on board. There's just one tiny step missing before we can start shaping the world together ... Please confirm your e-mail address by clicking the button below:

@@ -173,8 +173,8 @@

If the above button doesn't work, you can also copy the following code into your browser window: {{{ nonce }}}

However, this only works if you have registered through our website.

-

If you didn't sign up for Human Connection we recommend you to check it out! +

If you didn't sign up for {{APPLICATION_NAME}} we recommend you to check it out! It's a social network from people for people who want to connect and change the world together.

PS: If you ignore this e-mail we will not create an account for @@ -200,9 +200,9 @@

Feel free to contact our support team with any questions you have.

-

See you soon on Human Connection!

-

– The Human Connection Team

+

See you soon on {{APPLICATION_NAME}}!

+

– The {{APPLICATION_NAME}} Team

diff --git a/backend/src/middleware/email/templates/wrongAccount.html b/backend/src/middleware/email/templates/wrongAccount.html index cbf6e3cbb..cab4c91a6 100644 --- a/backend/src/middleware/email/templates/wrongAccount.html +++ b/backend/src/middleware/email/templates/wrongAccount.html @@ -6,8 +6,8 @@ Human Connection community logo @@ -55,8 +55,8 @@ @@ -74,9 +74,9 @@ style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">

Ansonsten hilft Dir unser Support Team gerne weiter.

-

Bis bald bei Human Connection!

-

– Dein Human Connection Team

+

Bis bald bei {{APPLICATION_NAME}}!

+

– Dein {{APPLICATION_NAME}} Team

@@ -104,8 +104,8 @@ @@ -152,8 +152,8 @@
-

Wenn Du noch keinen Account bei Human Connection hast oder Dein Password gar nicht ändern willst, +

Wenn Du noch keinen Account bei {{APPLICATION_NAME}} hast oder Dein Password gar nicht ändern willst, kannst Du diese E-Mail einfach ignorieren!
Human Connection community logo
@@ -171,9 +171,9 @@ style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">

Otherwise our support team will be happy to help you out.

-

See you soon on Human Connection!

-

– The Human Connection Team

+

See you soon on {{APPLICATION_NAME}}!

+

– The {{APPLICATION_NAME}} Team

-

If you don't have an account at Human Connection yet or if you didn't want to reset your password, +

If you don't have an account at {{APPLICATION_NAME}} yet or if you didn't want to reset your password, please ignore this e-mail.
diff --git a/backend/src/schema/resolvers/embeds.spec.js b/backend/src/schema/resolvers/embeds.spec.js index b8215ed72..6c034acf7 100644 --- a/backend/src/schema/resolvers/embeds.spec.js +++ b/backend/src/schema/resolvers/embeds.spec.js @@ -18,7 +18,10 @@ const HumanConnectionOrg = fs.readFileSync( path.join(__dirname, '../../../snapshots/embeds/HumanConnectionOrg.html'), 'utf8', ) -const pr960 = fs.readFileSync(path.join(__dirname, '../../../snapshots/embeds/pr960.html'), 'utf8') +const pr3934 = fs.readFileSync( + path.join(__dirname, '../../../snapshots/embeds/pr3934.html'), + 'utf8', +) const babyLovesCat = fs.readFileSync( path.join(__dirname, '../../../snapshots/embeds/babyLovesCat.html'), 'utf8', @@ -145,7 +148,7 @@ describe('Query', () => { describe('given a Github link', () => { beforeEach(() => { fetch - .mockReturnValueOnce(Promise.resolve(new Response(pr960))) + .mockReturnValueOnce(Promise.resolve(new Response(pr3934))) .mockReturnValueOnce(Promise.resolve(JSON.stringify({}))) variables = { url: 'https://github.com/Human-Connection/Human-Connection/pull/960' } }) @@ -156,14 +159,14 @@ describe('Query', () => { embed: { type: 'link', title: - 'Editor embeds merge in nitro embed by mattwr18 · Pull Request #960 · Human-Connection/Human-Connection', - author: 'Human-Connection', + 'feat: [WIP] 🍰 Rebranding And White-Labeling by Mogge · Pull Request #3934 · Ocelot-Social-Community/Ocelot-Social', + author: 'Ocelot-Social-Community', publisher: 'GitHub', date: expect.any(String), - description: '🍰 Pullrequest Issues fixes #256', - url: 'https://github.com/Human-Connection/Human-Connection/pull/960', - image: - 'https://repository-images.githubusercontent.com/112590397/52c9a000-7e11-11e9-899d-aaa55f3a3d72', + description: `🍰 Pullrequest +Have all the information for the brand in separate config files. Set these defaults to ocelot.social`, + url: 'https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3934', + image: 'https://avatars3.githubusercontent.com/u/67983243?s=400&v=4', audio: null, video: null, lang: 'en', diff --git a/deployment/helm/human-connection/.helmignore b/deployment/helm/ocelot.social/.helmignore similarity index 100% rename from deployment/helm/human-connection/.helmignore rename to deployment/helm/ocelot.social/.helmignore diff --git a/deployment/helm/human-connection/Chart.yaml b/deployment/helm/ocelot.social/Chart.yaml similarity index 100% rename from deployment/helm/human-connection/Chart.yaml rename to deployment/helm/ocelot.social/Chart.yaml diff --git a/deployment/helm/human-connection/README.md b/deployment/helm/ocelot.social/README.md similarity index 100% rename from deployment/helm/human-connection/README.md rename to deployment/helm/ocelot.social/README.md diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-prod.yaml similarity index 100% rename from deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-prod.yaml rename to deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-prod.yaml diff --git a/deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-staging.yaml similarity index 100% rename from deployment/helm/human-connection/templates/cluster-issuers/letsencrypt-staging.yaml rename to deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-staging.yaml diff --git a/deployment/helm/human-connection/templates/deployments/deployment-backend.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-backend.yaml similarity index 100% rename from deployment/helm/human-connection/templates/deployments/deployment-backend.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-backend.yaml diff --git a/deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-mailserver.yaml similarity index 100% rename from deployment/helm/human-connection/templates/deployments/deployment-mailserver.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-mailserver.yaml diff --git a/deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-maintenance.yaml similarity index 100% rename from deployment/helm/human-connection/templates/deployments/deployment-maintenance.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-maintenance.yaml diff --git a/deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-neo4j.yaml similarity index 100% rename from deployment/helm/human-connection/templates/deployments/deployment-neo4j.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-neo4j.yaml diff --git a/deployment/helm/human-connection/templates/deployments/deployment-web.yaml b/deployment/helm/ocelot.social/templates/deployments/deployment-web.yaml similarity index 100% rename from deployment/helm/human-connection/templates/deployments/deployment-web.yaml rename to deployment/helm/ocelot.social/templates/deployments/deployment-web.yaml diff --git a/deployment/helm/human-connection/templates/ingress/ingress.template.yaml b/deployment/helm/ocelot.social/templates/ingress/ingress.template.yaml similarity index 100% rename from deployment/helm/human-connection/templates/ingress/ingress.template.yaml rename to deployment/helm/ocelot.social/templates/ingress/ingress.template.yaml diff --git a/deployment/helm/human-connection/templates/jobs/job-db-migration.yaml b/deployment/helm/ocelot.social/templates/jobs/job-db-migration.yaml similarity index 100% rename from deployment/helm/human-connection/templates/jobs/job-db-migration.yaml rename to deployment/helm/ocelot.social/templates/jobs/job-db-migration.yaml diff --git a/deployment/helm/human-connection/templates/services/service-backend.yaml b/deployment/helm/ocelot.social/templates/services/service-backend.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-backend.yaml rename to deployment/helm/ocelot.social/templates/services/service-backend.yaml diff --git a/deployment/helm/human-connection/templates/services/service-mailserver.yaml b/deployment/helm/ocelot.social/templates/services/service-mailserver.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-mailserver.yaml rename to deployment/helm/ocelot.social/templates/services/service-mailserver.yaml diff --git a/deployment/helm/human-connection/templates/services/service-maintenance.yaml b/deployment/helm/ocelot.social/templates/services/service-maintenance.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-maintenance.yaml rename to deployment/helm/ocelot.social/templates/services/service-maintenance.yaml diff --git a/deployment/helm/human-connection/templates/services/service-neo4j.yaml b/deployment/helm/ocelot.social/templates/services/service-neo4j.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-neo4j.yaml rename to deployment/helm/ocelot.social/templates/services/service-neo4j.yaml diff --git a/deployment/helm/human-connection/templates/services/service-webapp.yaml b/deployment/helm/ocelot.social/templates/services/service-webapp.yaml similarity index 100% rename from deployment/helm/human-connection/templates/services/service-webapp.yaml rename to deployment/helm/ocelot.social/templates/services/service-webapp.yaml diff --git a/deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml b/deployment/helm/ocelot.social/templates/volumes/pvc-neo4j-data.yaml similarity index 100% rename from deployment/helm/human-connection/templates/volumes/pvc-neo4j-data.yaml rename to deployment/helm/ocelot.social/templates/volumes/pvc-neo4j-data.yaml diff --git a/deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml b/deployment/helm/ocelot.social/templates/volumes/pvc-uploads.yaml similarity index 100% rename from deployment/helm/human-connection/templates/volumes/pvc-uploads.yaml rename to deployment/helm/ocelot.social/templates/volumes/pvc-uploads.yaml diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/ocelot.social/values.yaml similarity index 93% rename from deployment/helm/human-connection/values.yaml rename to deployment/helm/ocelot.social/values.yaml index 792e22084..42eed0c7b 100644 --- a/deployment/helm/human-connection/values.yaml +++ b/deployment/helm/ocelot.social/values.yaml @@ -1,5 +1,5 @@ # domain is the user-facing domain. -domain: develop.human-connection.org +domain: develop-docker.ocelot.social # commit is the latest github commit deployed. commit: 889a7cdd24dda04a139b2b77d626e984d6db6781 # dbInitialization runs the database initializations in a post-install hook. @@ -37,9 +37,9 @@ neo4jResourceLimitsMemory: "2G" # neo4jResourceLimitsMemory configures the memory available for requests. neo4jResourceRequestsMemory: "1G" # supportEmail is used for letsencrypt certs. -supportEmail: "devcom@human-connection.org" +supportEmail: "devops@ocelot.social" # smtpHost is the host for the mailserver. -smtpHost: "mailserver.human-connection.org" +smtpHost: "mail.ocelot.social" # smtpPort is the port to be used for the mailserver. smtpPort: \"25\" # jwtSecret is used to encode/decode a user's JWT for authentication @@ -50,4 +50,4 @@ privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4" mapboxToken: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1E=" uploadsStorage: "25Gi" neo4jStorage: "5Gi" -developmentMailserverDomain: nitro-mailserver.human-connection.org \ No newline at end of file +developmentMailserverDomain: mail.ocelot.social diff --git a/deployment/minikube/README.md b/deployment/minikube/README.md index 499fc8290..f582007a4 100644 --- a/deployment/minikube/README.md +++ b/deployment/minikube/README.md @@ -18,8 +18,8 @@ minikube dashboard, expose the services you want on your host system. For example: ```text -$ minikube service develop-webapp --namespace=human-connection +$ minikube service develop-webapp --namespace=ocelotsocialnetwork # optionally -$ minikube service develop-backend --namespace=human-connection +$ minikube service develop-backend --namespace=ocelotsocialnetwork ``` diff --git a/deployment/volumes/neo4j-online-backup/README.md b/deployment/volumes/neo4j-online-backup/README.md index 4eaa511ef..babb68d26 100644 --- a/deployment/volumes/neo4j-online-backup/README.md +++ b/deployment/volumes/neo4j-online-backup/README.md @@ -56,4 +56,4 @@ $ kubectl --namespace=human-connection exec -it bash > exit ``` -Revert your changes to deployment `develop-neo4j` which will restart the database. \ No newline at end of file +Revert your changes to deployment `develop-neo4j` which will restart the database. diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 7ca6debeb..d950d05f8 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,13 +1,8 @@ version: "3.4" services: - mailserver: - image: djfarrelly/maildev - ports: - - 1080:80 - networks: - - hc-network webapp: + image: schoolsinmotion/webapp:build-and-test build: context: webapp target: build-and-test @@ -15,9 +10,12 @@ services: - ./webapp:/develop-webapp environment: - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/` - - PUBLIC_REGISTRATION=false + - PUBLIC_REGISTRATION=true command: yarn run dev + volumes: + - webapp_node_modules:/nitro-web/node_modules backend: + image: schoolsinmotion/backend:build-and-test build: context: backend target: build-and-test @@ -30,6 +28,12 @@ services: - SMTP_IGNORE_TLS=true - "DEBUG=${DEBUG}" - PUBLIC_REGISTRATION=false + volumes: + - backend_node_modules:/nitro-backend/node_modules + - uploads:/nitro-backend/public/uploads + neo4j: + volumes: + - neo4j_data:/data maintenance: image: ocelotsocialnetwork/develop-maintenance:latest build: @@ -39,6 +43,17 @@ services: - hc-network ports: - 3503:80 + mailserver: + image: djfarrelly/maildev + ports: + - 1080:80 + networks: + - hc-network networks: hc-network: +volumes: + webapp_node_modules: + backend_node_modules: + neo4j_data: + uploads: diff --git a/docker-compose.production.yml b/docker-compose.production.yml new file mode 100644 index 000000000..285e9f110 --- /dev/null +++ b/docker-compose.production.yml @@ -0,0 +1,20 @@ +version: "3.4" + +services: + webapp: + build: + context: webapp + target: production + args: + - "BUILD_COMMIT=${TRAVIS_COMMIT}" + backend: + build: + context: backend + target: production + args: + - "BUILD_COMMIT=${TRAVIS_COMMIT}" + neo4j: + build: + context: neo4j + args: + - "BUILD_COMMIT=${TRAVIS_COMMIT}" diff --git a/docker-compose.yml b/docker-compose.yml index ea1efab7c..ddcfd78cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,6 +45,7 @@ services: - MAPBOX_TOKEN=pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78 - "DEBUG=${DEBUG}" + - EMAIL_DEFAULT_SENDER=devops@ocelot.social neo4j: image: ocelotsocialnetwork/develop-neo4j:latest build: @@ -68,4 +69,4 @@ volumes: webapp_node_modules: backend_node_modules: neo4j_data: - uploads: + uploads: \ No newline at end of file diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile index 845748a8a..e08e482a0 100644 --- a/neo4j/Dockerfile +++ b/neo4j/Dockerfile @@ -1,7 +1,7 @@ FROM neo4j:3.5.14 +LABEL Description="Neo4J database of the Social Network ocelot.social with preinstalled database constraints and indices" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)" # community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment # FROM neo4j:3.5.14-enterprise -LABEL Description="Neo4J database of the Social Network Human-Connection.org with preinstalled database constraints and indices" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)" ARG BUILD_COMMIT ENV BUILD_COMMIT=$BUILD_COMMIT diff --git a/webapp/.dockerignore b/webapp/.dockerignore index b0b6a6d6f..2f7daf103 100644 --- a/webapp/.dockerignore +++ b/webapp/.dockerignore @@ -13,8 +13,6 @@ scripts/ cypress/ README.md -screenshot*.png -lokalise.png .editorconfig maintenance/node_modules/ diff --git a/webapp/Dockerfile b/webapp/Dockerfile index 0f0caa4db..5024ac2c6 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -1,5 +1,5 @@ -FROM node:15.3.0-alpine3.10 as base -LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" +FROM node:12.19.0-alpine3.10 as base +LABEL Description="Web Frontend of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)" EXPOSE 3000 CMD ["yarn", "run", "start"] diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index 2b02c5a68..a688e0f82 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -1,5 +1,5 @@ -FROM node:15.3.0-alpine3.10 as build -LABEL Description="Maintenance page of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" +FROM node:12.19.0-alpine3.10 as build +LABEL Description="Maintenance page of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)" EXPOSE 3000 CMD ["yarn", "run", "start"] @@ -25,6 +25,7 @@ COPY locales locales COPY mixins mixins COPY plugins/i18n.js plugins/v-tooltip.js plugins/styleguide.js plugins/ COPY static static +COPY constants constants COPY nuxt.config.js nuxt.config.js # this will also ovewrite the existing package.json 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/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue index 63c550fd3..f65c6f6cf 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.vue +++ b/webapp/components/AvatarMenu/AvatarMenu.vue @@ -20,7 +20,7 @@ {{ $t('login.hello') }} {{ userName }} diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index 20c9c2388..0cbd90563 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -24,11 +24,7 @@
- + {{ $t('contribution.inappropriatePictureText') }} @@ -92,6 +88,7 @@ import locales from '~/locales' import PostMutations from '~/graphql/PostMutations.js' import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect' import ImageUploader from '~/components/ImageUploader/ImageUploader' +import links from '~/constants/links.js' export default { components: { @@ -114,6 +111,7 @@ export default { const { sensitive: imageBlurred = false, aspectRatio: imageAspectRatio = null } = image || {} return { + links, formData: { title: title || '', content: content || '', diff --git a/webapp/components/DonationInfo/DonationInfo.spec.js b/webapp/components/DonationInfo/DonationInfo.spec.js index 12f6c7652..8d20042b0 100644 --- a/webapp/components/DonationInfo/DonationInfo.spec.js +++ b/webapp/components/DonationInfo/DonationInfo.spec.js @@ -21,8 +21,10 @@ describe('DonationInfo.vue', () => { 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/DonationInfo/DonationInfo.vue b/webapp/components/DonationInfo/DonationInfo.vue index e138bef97..b1916a6e9 100644 --- a/webapp/components/DonationInfo/DonationInfo.vue +++ b/webapp/components/DonationInfo/DonationInfo.vue @@ -1,13 +1,14 @@ diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue new file mode 100644 index 000000000..b5a2e38a5 --- /dev/null +++ b/webapp/components/Logo/Logo.vue @@ -0,0 +1,60 @@ + + + + + + + diff --git a/webapp/components/Logo/demo.md b/webapp/components/Logo/demo.md new file mode 100644 index 000000000..9cd6d0f4d --- /dev/null +++ b/webapp/components/Logo/demo.md @@ -0,0 +1,15 @@ +# Basic usage + +``` + + + +``` + +# Inverse Logo + +``` + + + +``` \ No newline at end of file diff --git a/webapp/components/Logo/style.scss b/webapp/components/Logo/style.scss new file mode 100644 index 000000000..305e907c5 --- /dev/null +++ b/webapp/components/Logo/style.scss @@ -0,0 +1,17 @@ +.ds-logo { + @include reset; + display: inline-flex; + justify-content: center; + align-items: center; + color: $text-color-primary; +} + +.ds-logo-inverse { + color: $text-color-primary-inverse; +} + +.ds-logo-svg { + width: 130px; + height: auto; + fill: currentColor; +} \ No newline at end of file diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue index fc497bdf5..9b56e29ee 100644 --- a/webapp/components/PageFooter/PageFooter.vue +++ b/webapp/components/PageFooter/PageFooter.vue @@ -1,25 +1,25 @@ diff --git a/webapp/components/PasswordReset/ChangePassword.vue b/webapp/components/PasswordReset/ChangePassword.vue index 2873505c6..5d1e02acf 100644 --- a/webapp/components/PasswordReset/ChangePassword.vue +++ b/webapp/components/PasswordReset/ChangePassword.vue @@ -49,8 +49,9 @@

{{ $t('components.password-reset.change-password.help') }} -
- support@human-connection.org +

+

+ {{ supportEmail }}

@@ -60,6 +61,7 @@ diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 960785c0a..54f209a5c 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -1,5 +1,6 @@ import path from 'path' import dotenv from 'dotenv' +import manifest from './constants/manifest.js' dotenv.config() // we want to synchronize @nuxt-dotenv and nuxt-env @@ -56,6 +57,8 @@ export default { 'terms-and-conditions', 'code-of-conduct', 'changelog', + 'imprint', + 'data-privacy', ], // pages to keep alive keepAlivePages: ['index'], @@ -64,8 +67,8 @@ export default { ** Headers of the page */ head: { - title: 'Human Connection', - titleTemplate: '%s - Human Connection', + title: manifest.name, + titleTemplate: `%s - ${manifest.name}`, meta: [ { charset: 'utf-8', @@ -211,7 +214,7 @@ export default { // Give apollo module options apollo: { - tokenName: 'human-connection-token', // optional, default: apollo-token + tokenName: 'ocelot-social-token', // optional, default: apollo-token cookieAttributes: { expires: 1, // optional, default: 7 (days) }, @@ -236,14 +239,7 @@ export default { config: additionalSentryConfig, }, - manifest: { - name: 'Human Connection', - short_name: 'HC', - homepage_url: 'https://human-connection.org/', - description: 'The free and open source social network for active citizenship', - theme_color: '#17b53f', - lang: 'en', - }, + manifest, /* ** Build configuration @@ -284,6 +280,13 @@ export default { }, ], }) + config.module.rules.push({ + enforce: 'pre', + test: /\.html$/, + loader: 'raw-loader', + exclude: /(node_modules)/, + }) + const tagAttributesForTesting = ['data-test', ':data-test', 'v-bind:data-test'] ctx.loaders.vue.compilerOptions = { modules: [ diff --git a/webapp/package.json b/webapp/package.json index 897afcf5c..2aec93ff3 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,13 +1,13 @@ { - "name": "human-connection-webapp", + "name": "ocelot-social-webapp", "version": "0.6.3", - "description": "Human Connection Frontend", + "description": "ocelot.social Frontend", "authors": [ "Grzegorz Leoniec (appinteractive)", "ulfgebhardt" ], "license": "MIT", - "author": "Human Connection gGmbH", + "author": "ocelot.social Community", "private": false, "scripts": { "dev": "nuxt", diff --git a/webapp/pages/code-of-conduct.vue b/webapp/pages/code-of-conduct.vue index e8b9ce214..7b3455934 100644 --- a/webapp/pages/code-of-conduct.vue +++ b/webapp/pages/code-of-conduct.vue @@ -2,38 +2,9 @@
{{ $t('site.code-of-conduct') }} -

{{ $t('code-of-conduct.subheader') }}

 - -
- {{ $t(`code-of-conduct.${section}.title`) }} -

{{ $t(`code-of-conduct.${section}.description`) }}

-
- -
- -
- {{ $t(`code-of-conduct.${section.key}.title`) }} -

{{ $t(`code-of-conduct.${section.key}.description`) }}

-
    -
  • - {{ $t(`code-of-conduct.${section.key}.list.${i}`) }} -
    • -
-
- -

- {{ $t('code-of-conduct.get-help') }} - - moderation@human-connection.org - -

-
+
@@ -46,24 +17,5 @@ export default { title: this.$t('site.code-of-conduct'), } }, - data() { - return { - sections: ['preamble', 'purpose'], - listSections: [ - { - key: 'expected-behaviour', - items: [...Array(4).keys()], - }, - { - key: 'unacceptable-behaviour', - items: [...Array(8).keys()], - }, - { - key: 'consequences', - items: [...Array(8).keys()], - }, - ], - } - }, } diff --git a/webapp/pages/data-privacy.vue b/webapp/pages/data-privacy.vue new file mode 100644 index 000000000..015c7b9dd --- /dev/null +++ b/webapp/pages/data-privacy.vue @@ -0,0 +1,22 @@ + + + diff --git a/webapp/pages/imprint.vue b/webapp/pages/imprint.vue new file mode 100644 index 000000000..57c9f680e --- /dev/null +++ b/webapp/pages/imprint.vue @@ -0,0 +1,22 @@ + + + diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index e6504cc7a..d8a620518 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -7,7 +7,7 @@ @@ -74,6 +74,7 @@ import { mapGetters, mapMutations } from 'vuex' import { filterPosts } from '~/graphql/PostQuery.js' import PostMutations from '~/graphql/PostMutations' import UpdateQuery from '~/components/utils/UpdateQuery' +import links from '~/constants/links.js' export default { components: { @@ -87,6 +88,7 @@ export default { data() { const { hashtag = null } = this.$route.query return { + links, posts: [], hasMore: true, // Initialize your apollo data diff --git a/webapp/pages/logout.vue b/webapp/pages/logout.vue index 88bf755a3..828f821a1 100644 --- a/webapp/pages/logout.vue +++ b/webapp/pages/logout.vue @@ -2,10 +2,10 @@ - - Human Connection + + Logging out - + Logging out... diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue index 3d19f2e35..f320bd376 100644 --- a/webapp/pages/password-reset.vue +++ b/webapp/pages/password-reset.vue @@ -2,7 +2,7 @@ - + {{ $t('profile.network.title') }} - + {{ $t('profile.socialMedia') }} {{ userName | truncate(15) }}? diff --git a/webapp/pages/registration.vue b/webapp/pages/registration.vue index 70ddbbf25..9c5ebae48 100644 --- a/webapp/pages/registration.vue +++ b/webapp/pages/registration.vue @@ -2,7 +2,7 @@ diff --git a/webapp/plugins/apollo-config.js b/webapp/plugins/apollo-config.js index 63282a341..9b669aca3 100644 --- a/webapp/plugins/apollo-config.js +++ b/webapp/plugins/apollo-config.js @@ -16,7 +16,7 @@ export default ({ req, nuxtState }) => { credentials: 'same-origin', }, credentials: true, - tokenName: 'human-connection-token', + tokenName: 'ocelot-social-token', persisting: false, websocketsOnly: false, cache: new InMemoryCache({ fragmentMatcher }), diff --git a/webapp/plugins/i18n.js b/webapp/plugins/i18n.js index c355472eb..8c64ef0c3 100644 --- a/webapp/plugins/i18n.js +++ b/webapp/plugins/i18n.js @@ -2,6 +2,13 @@ import Vue from 'vue' import vuexI18n from 'vuex-i18n/dist/vuex-i18n.umd.js' import { isEmpty, find } from 'lodash' import locales from '~/locales' +import htmlTranslations from '~/locales/html/' + +const registerTranslation = ({ Vue, locale }) => { + const translation = require(`~/locales/${locale}.json`) + translation.html = htmlTranslations[locale] + Vue.i18n.add(locale, translation) +} /** * TODO: Refactor and simplify browser detection @@ -53,9 +60,6 @@ export default ({ app, req, cookie, store }) => { }, }) - // register the fallback locales - Vue.i18n.add('en', require('~/locales/en.json')) - let userLocale = 'en' const localeCookie = app.$cookies.get(key) /* const userSettings = store.getters['auth/userSettings'] @@ -80,8 +84,10 @@ export default ({ app, req, cookie, store }) => { const availableLocales = locales.filter((lang) => !!lang.enabled) const locale = find(availableLocales, ['code', userLocale]) ? userLocale : 'en' + // register the fallback locales + registerTranslation({ Vue, locale: 'en' }) if (locale !== 'en') { - Vue.i18n.add(locale, require(`~/locales/${locale}.json`)) + registerTranslation({ Vue, locale }) } // Set the start locale to use diff --git a/webapp/screenshot-styleguide.png b/webapp/screenshot-styleguide.png deleted file mode 100644 index d8e009394..000000000 Binary files a/webapp/screenshot-styleguide.png and /dev/null differ diff --git a/webapp/screenshot.png b/webapp/screenshot.png deleted file mode 100644 index b4ff4b2f9..000000000 Binary files a/webapp/screenshot.png and /dev/null differ diff --git a/webapp/static/img/custom/Logo-Horizontal-Dark.svg b/webapp/static/img/custom/Logo-Horizontal-Dark.svg new file mode 100644 index 000000000..deba99182 --- /dev/null +++ b/webapp/static/img/custom/Logo-Horizontal-Dark.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/Logo-Horizontal.svg b/webapp/static/img/custom/Logo-Horizontal.svg new file mode 100644 index 000000000..6a86cfaff --- /dev/null +++ b/webapp/static/img/custom/Logo-Horizontal.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + o + c + elo + t + . + s + o + c + i + a + l + + diff --git a/webapp/static/img/sign-up/onourjourney.svg b/webapp/static/img/custom/logout.svg similarity index 100% rename from webapp/static/img/sign-up/onourjourney.svg rename to webapp/static/img/custom/logout.svg diff --git a/webapp/static/img/sign-up/humanconnection.svg b/webapp/static/img/custom/password-reset.svg similarity index 100% rename from webapp/static/img/sign-up/humanconnection.svg rename to webapp/static/img/custom/password-reset.svg diff --git a/webapp/static/img/sign-up/nicetomeetyou.svg b/webapp/static/img/custom/sign-up.svg similarity index 100% rename from webapp/static/img/sign-up/nicetomeetyou.svg rename to webapp/static/img/custom/sign-up.svg diff --git a/webapp/static/img/custom/under-maintenance.svg b/webapp/static/img/custom/under-maintenance.svg new file mode 100644 index 000000000..0950b7532 --- /dev/null +++ b/webapp/static/img/custom/under-maintenance.svg @@ -0,0 +1,360 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/webapp/static/img/custom/welcome.svg b/webapp/static/img/custom/welcome.svg new file mode 100644 index 000000000..279c519d0 --- /dev/null +++ b/webapp/static/img/custom/welcome.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + o + c + elo + t + . + s + o + c + i + a + l + + diff --git a/webapp/static/img/sign-up/alpha-invite.png b/webapp/static/img/sign-up/alpha-invite.png deleted file mode 100755 index ae133f55a..000000000 Binary files a/webapp/static/img/sign-up/alpha-invite.png and /dev/null differ diff --git a/webapp/static/img/sign-up/alpha-invite2x.png b/webapp/static/img/sign-up/alpha-invite2x.png deleted file mode 100755 index 2905888db..000000000 Binary files a/webapp/static/img/sign-up/alpha-invite2x.png and /dev/null differ diff --git a/webapp/static/img/sign-up/humanconnection.png b/webapp/static/img/sign-up/humanconnection.png deleted file mode 100644 index f0576413f..000000000 Binary files a/webapp/static/img/sign-up/humanconnection.png and /dev/null differ diff --git a/webapp/static/img/sign-up/nicetomeetyou.png b/webapp/static/img/sign-up/nicetomeetyou.png deleted file mode 100644 index 414288e17..000000000 Binary files a/webapp/static/img/sign-up/nicetomeetyou.png and /dev/null differ diff --git a/webapp/static/img/sign-up/onourjourney.png b/webapp/static/img/sign-up/onourjourney.png deleted file mode 100644 index 8e606fabd..000000000 Binary files a/webapp/static/img/sign-up/onourjourney.png and /dev/null differ diff --git a/webapp/testing.md b/webapp/testing.md index 60f02a5db..34ff92135 100644 --- a/webapp/testing.md +++ b/webapp/testing.md @@ -35,4 +35,4 @@ To run Storybook, first start the app, then enter the following command in a new ![Storybook output](../.gitbook/assets/storybook-output.png) -The Human Connection Storybook will then be available on `http://localhost:3002`. +The ocelot.social Storybook will then be available on `http://localhost:3002`.