From 9c35b6d22315da1ddfbe4be10657d601145b4f9d Mon Sep 17 00:00:00 2001
From: paidge <paidge_cs@hotmail.com>
Date: Wed, 2 Nov 2022 03:36:06 +0100
Subject: [PATCH] correcting bugs
---
README.md | 2 +-
components/apollo/List.vue | 10 +++-------
components/navigation/menu/Sidebar.vue | 2 +-
graphql/cache.js | 5 +++--
graphql/config.js | 17 -----------------
graphql/endpoints.js | 4 ----
graphql/endpoints/coindufeu.js | 26 ++++++++++++++++++++++++++
graphql/endpoints/trentesaux.js | 26 ++++++++++++++++++++++++++
graphql/schemaQuery.js | 3 +--
nuxt.config.js | 8 ++++++--
package.json | 2 +-
pages/favoris.vue | 2 +-
pages/index.vue | 2 +-
pages/membre.vue | 2 +-
pages/membres/index.vue | 2 +-
pages/parametres.vue | 2 +-
pages/previsions/futures_entrees.vue | 2 +-
pages/previsions/futures_sorties.vue | 2 +-
plugins/getApolloClient.js | 18 ++++++++++++------
web-ext/manifest.json | 2 +-
20 files changed, 88 insertions(+), 51 deletions(-)
delete mode 100644 graphql/config.js
delete mode 100644 graphql/endpoints.js
create mode 100644 graphql/endpoints/coindufeu.js
create mode 100644 graphql/endpoints/trentesaux.js
diff --git a/README.md b/README.md
index 5f4ef49..8f28066 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ The schema documentation is stored in the `./graphql/doc/graphQLschema.txt` file
In `queries.js` you'll find all queries.
-If you want to add a 2nd graphQL server, edit `./graphql/endpoints.js` to put your URL.
+If you want to add a graphQL server, add a file in `./graphql/endpoints/` and edit `./nuxt.config.js` to add an entry in `apollo.clientConfigs` for your file.
### Special Directories
diff --git a/components/apollo/List.vue b/components/apollo/List.vue
index 2962f04..ad1b759 100644
--- a/components/apollo/List.vue
+++ b/components/apollo/List.vue
@@ -4,7 +4,7 @@
class="form-select"
id="selectClient"
@change="setClient($event)"
- v-model="currentClient">
+ v-model="getApolloClient">
<option
:value="clientName"
v-for="(clientObject, clientName) in $nuxt.$apolloProvider.clients"
@@ -23,15 +23,11 @@
<script>
export default {
- data() {
- return {
- currentClient: this.$getApolloClient()
- }
- },
methods: {
setClient(e) {
localStorage.setItem("apollo-client", e.target.value)
- location.assign(this.$i18n.locale + "/index.html")
+ window.location =
+ window.location.origin + "/" + this.$i18n.locale + "/index.html"
}
}
}
diff --git a/components/navigation/menu/Sidebar.vue b/components/navigation/menu/Sidebar.vue
index 9d7af85..d9a79ee 100644
--- a/components/navigation/menu/Sidebar.vue
+++ b/components/navigation/menu/Sidebar.vue
@@ -82,7 +82,7 @@ export default {
},
apollo: {
$client() {
- return this.$getApolloClient()
+ return this.getApolloClient
},
countMax: {
query: LAST_BLOCK
diff --git a/graphql/cache.js b/graphql/cache.js
index 80866f3..435b892 100644
--- a/graphql/cache.js
+++ b/graphql/cache.js
@@ -1,4 +1,5 @@
import {
+ InMemoryCache,
IntrospectionFragmentMatcher,
defaultDataIdFromObject
} from "apollo-cache-inmemory"
@@ -9,7 +10,7 @@ const fragmentMatcher = new IntrospectionFragmentMatcher({
})
// Apparemment il faut utiliser la syntaxe Apollo v2
-export const cache = {
+export const cache = new InMemoryCache({
addTypename: false,
fragmentMatcher,
dataIdFromObject: (object) => {
@@ -34,4 +35,4 @@ export const cache = {
return defaultDataIdFromObject(object) // fall back to default handling
}
}
-}
+})
diff --git a/graphql/config.js b/graphql/config.js
deleted file mode 100644
index db4b788..0000000
--- a/graphql/config.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { cache } from "./cache"
-import * as endpoints from "./endpoints"
-
-let clientConfigs = {}
-
-for (const key in endpoints) {
- if (key != "default")
- clientConfigs[key] = {
- httpEndpoint: endpoints[key],
- inMemoryCacheOptions: cache,
- httpLinkOptions: {
- credentials: "same-origin"
- }
- }
-}
-
-export default { clientConfigs }
diff --git a/graphql/endpoints.js b/graphql/endpoints.js
deleted file mode 100644
index 959aeb9..0000000
--- a/graphql/endpoints.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
- coindufEu: "https://wwgql.coinduf.eu",
- trentesauxFr: "https://gql.wotwizard.trentesaux.fr/"
-}
diff --git a/graphql/endpoints/coindufeu.js b/graphql/endpoints/coindufeu.js
new file mode 100644
index 0000000..a7d1801
--- /dev/null
+++ b/graphql/endpoints/coindufeu.js
@@ -0,0 +1,26 @@
+import { HttpLink } from "apollo-link-http"
+import { setContext } from "apollo-link-context"
+import { from } from "apollo-link"
+import { cache } from "../cache"
+
+export default (ctx) => {
+ const ssrMiddleware = setContext((_, { headers }) => {
+ if (process.client) return headers
+ return {
+ headers
+ }
+ })
+
+ const httpLink = new HttpLink({
+ uri: "https://wwgql.coinduf.eu"
+ })
+
+ const link = from([ssrMiddleware, httpLink])
+
+ return {
+ link,
+ cache,
+ // https://github.com/nuxt-community/apollo-module/issues/306#issuecomment-607225431
+ defaultHttpLink: false
+ }
+}
diff --git a/graphql/endpoints/trentesaux.js b/graphql/endpoints/trentesaux.js
new file mode 100644
index 0000000..464caf4
--- /dev/null
+++ b/graphql/endpoints/trentesaux.js
@@ -0,0 +1,26 @@
+import { HttpLink } from "apollo-link-http"
+import { setContext } from "apollo-link-context"
+import { from } from "apollo-link"
+import { cache } from "../cache"
+
+export default (ctx) => {
+ const ssrMiddleware = setContext((_, { headers }) => {
+ if (process.client) return headers
+ return {
+ headers
+ }
+ })
+
+ const httpLink = new HttpLink({
+ uri: "https://gql.wotwizard.trentesaux.fr/"
+ })
+
+ const link = from([ssrMiddleware, httpLink])
+
+ return {
+ link,
+ cache,
+ // https://github.com/nuxt-community/apollo-module/issues/306#issuecomment-607225431
+ defaultHttpLink: false
+ }
+}
diff --git a/graphql/schemaQuery.js b/graphql/schemaQuery.js
index 31c2bba..a3f48ac 100644
--- a/graphql/schemaQuery.js
+++ b/graphql/schemaQuery.js
@@ -1,8 +1,7 @@
-const endpoints = require("./endpoints")
const fetch = require("node-fetch")
const fs = require("fs")
-fetch(Object.values(endpoints)[0], {
+fetch("https://gql.wotwizard.trentesaux.fr/", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
diff --git a/nuxt.config.js b/nuxt.config.js
index 00ceac7..316cd0a 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,5 +1,4 @@
import i18n from "./i18n"
-import APOLLO_CONFIG from "./graphql/config"
export default {
// Disable server-side rendering: https://go.nuxtjs.dev/ssr-mode
@@ -126,7 +125,12 @@ export default {
}
},
- apollo: APOLLO_CONFIG,
+ apollo: {
+ clientConfigs: {
+ coindufeu: "~/graphql/endpoints/coindufeu",
+ trentesaux: "~/graphql/endpoints/trentesaux"
+ }
+ },
router: {
linkExactActiveClass: "active"
diff --git a/package.json b/package.json
index 4ba640f..56449c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wotwizard-ui",
- "version": "2.4.1",
+ "version": "2.4.2",
"private": true,
"scripts": {
"dev": "nuxt",
diff --git a/pages/favoris.vue b/pages/favoris.vue
index 18a1e12..34af878 100644
--- a/pages/favoris.vue
+++ b/pages/favoris.vue
@@ -75,7 +75,7 @@ export default {
},
apollo: {
$client() {
- return this.$getApolloClient()
+ return this.getApolloClient
},
favoris: {
query: FAVORIS,
diff --git a/pages/index.vue b/pages/index.vue
index 66febf5..40c2126 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -78,7 +78,7 @@ export default {
},
apollo: {
$client() {
- return this.$getApolloClient()
+ return this.getApolloClient
},
newMembers: {
query: LAST_EVENTS,
diff --git a/pages/membre.vue b/pages/membre.vue
index 4cd4918..fd0c819 100644
--- a/pages/membre.vue
+++ b/pages/membre.vue
@@ -45,7 +45,7 @@ export default {
},
apollo: {
$client() {
- return this.$getApolloClient()
+ return this.getApolloClient
},
idFromHash: {
query: SEARCH_MEMBER,
diff --git a/pages/membres/index.vue b/pages/membres/index.vue
index 6fc26c0..18e0157 100644
--- a/pages/membres/index.vue
+++ b/pages/membres/index.vue
@@ -59,7 +59,7 @@ export default {
},
apollo: {
$client() {
- return this.$getApolloClient()
+ return this.getApolloClient
},
idSearch: {
query: SEARCH_MEMBERS,
diff --git a/pages/parametres.vue b/pages/parametres.vue
index 8e17fba..62ebdac 100644
--- a/pages/parametres.vue
+++ b/pages/parametres.vue
@@ -88,7 +88,7 @@ export default {
},
apollo: {
$client() {
- return this.$getApolloClient()
+ return this.getApolloClient
},
allParameters: {
query: PARAMS,
diff --git a/pages/previsions/futures_entrees.vue b/pages/previsions/futures_entrees.vue
index 927726b..a6d1155 100644
--- a/pages/previsions/futures_entrees.vue
+++ b/pages/previsions/futures_entrees.vue
@@ -199,7 +199,7 @@ export default {
},
apollo: {
$client() {
- return this.$getApolloClient()
+ return this.getApolloClient
},
wwResult: {
query: NEWCOMERS,
diff --git a/pages/previsions/futures_sorties.vue b/pages/previsions/futures_sorties.vue
index 3786db6..c5d5218 100644
--- a/pages/previsions/futures_sorties.vue
+++ b/pages/previsions/futures_sorties.vue
@@ -89,7 +89,7 @@ export default {
},
apollo: {
$client() {
- return this.$getApolloClient()
+ return this.getApolloClient
},
memEnds: {
query: NEXT_EXITS,
diff --git a/plugins/getApolloClient.js b/plugins/getApolloClient.js
index 6eb01de..0ce8066 100644
--- a/plugins/getApolloClient.js
+++ b/plugins/getApolloClient.js
@@ -1,8 +1,14 @@
-import * as endpoints from "../graphql/endpoints"
+import Vue from "vue"
-export default ({ app }, inject) => {
- inject(
- "getApolloClient",
- () => localStorage.getItem("apollo-client") || Object.keys(endpoints)[0]
- )
+let mixin = {
+ computed: {
+ getApolloClient() {
+ return (
+ localStorage.getItem("apollo-client") ||
+ Object.keys($nuxt.$apolloProvider.clients)[0]
+ )
+ }
+ }
}
+
+Vue.mixin(mixin)
diff --git a/web-ext/manifest.json b/web-ext/manifest.json
index 923fe9f..68b4a39 100644
--- a/web-ext/manifest.json
+++ b/web-ext/manifest.json
@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "Wotwizard UI",
"description": "Le magicien de la toile de confiance",
- "version": "2.4.1",
+ "version": "2.4.2",
"homepage_url": "https://wotwizard.axiom-team.fr",
"browser_action": {
"browser_style": true,
--
GitLab