IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4219 from Ocelot-Social-Community/resolve-websockets-env-problem

Browse Source 
chore: 🍰 Resolve WEBSOCKETS_URI .env Problem
This commit is contained in:
Ulf Gebhardt 2021-02-15 20:27:56 +01:00 committed by GitHub
commit 28dd310aa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 204 additions and 13885 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14080
CHANGELOG.md
View File

File diff suppressed because it is too large Load Diff

2
backend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "ocelot-social-backend",
"version": "0.6.10",
"version": "0.6.11",
"description": "GraphQL Backend for ocelot.social",
"repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
"author": "ocelot.social Community",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ocelot-social",
"version": "0.6.10",
"version": "0.6.11",
"description": "Fullstack and API tests with cypress and cucumber for ocelot.social",
"author": "ocelot.social Community",
"license": "MIT",

1
webapp/config/index.js
View File

@ -18,6 +18,7 @@ const environment = {
const server = {
GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000',
BACKEND_TOKEN: process.env.BACKEND_TOKEN || 'NULL',
WEBSOCKETS_URI: process.env.WEBSOCKETS_URI || 'ws://localhost:4000/graphql',
}
const sentry = {

2
webapp/package.json
View File

@ -1,6 +1,6 @@
{
"name": "ocelot-social-webapp",
"version": "0.6.10",
"version": "0.6.11",
"description": "ocelot.social Frontend",
"repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
"author": "ocelot.social Community",

2
webapp/plugins/apollo-config.js
View File

@ -11,7 +11,7 @@ export default ({ req, nuxtState }) => {
const backendUrl = env.GRAPHQL_URI || 'http://localhost:4000'
return {
wsEndpoint: env.WEBSOCKETS_URI || 'ws://localhost:4000/graphql',
wsEndpoint: env.WEBSOCKETS_URI,
httpEndpoint: process.server ? backendUrl : '/api',
httpLinkOptions: {
credentials: 'same-origin',