data fetch refatoring and markdown from arweave

src/lib/graphdata.js

@@ -0,0 +1,28 @@
+export const graphdata = async (tag) => {
+    const docrequest = await fetch('https://arweave.net/graphql', {
+        method: 'POST',
+        headers: {
+            'Accept-Encoding': 'gzip, deflate, br',
+            'Content-Type': 'application/json',
+            'Accept': 'application/json',
+            'Connection': 'keep-alive',
+            'DNT': '1',
+            'Origin': 'https://arweave.net'
+        },
+        body: JSON.stringify({
+            'query': 'query getData($tag: String!) {\n  transactions(\n    tags: [\n      { name: "AppName", values: "ETHBrno" }\n      { name: "DataTag", values: [$tag] }\n    ]\n    first: 1\n  ) {\n    edges {\n      node {\n        id  \n      }\n    }\n  }\n}\n',
+            'variables': {
+                'tag': tag
+            }
+        })
+    }).then(r => r.json());
+    const {
+        data: {
+            transactions: { edges }
+        }
+    } = docrequest;
+    if (edges.length < 0) return null;
+    const response = await fetch(`https://arweave.net/${edges[0].node.id}`);
+    return (tag === "json" ? await response.json() : await response.text());
+
+};

src/routes/contributors/[...type]/+page.svelte

@@ -1,7 +1,6 @@
 <script>
-	//import { contributors, contributorTypes } from '$lib/data.json';
-	import { base } from '$app/paths';
 	import { onMount } from 'svelte';
+	import { graphdata } from '$lib/graphdata';
 	export let data;
 	function wrapContributor(c) {
 		if (c.twitter) {
@@ -11,32 +10,9 @@
 	}
 
 	onMount(async () => {
-		const docrequest = await fetch('https://arweave.net/graphql', {
-			method: 'POST',
-			headers: {
-				'Accept-Encoding': 'gzip, deflate, br',
-				'Content-Type': 'application/json',
-				Accept: 'application/json',
-				Connection: 'keep-alive',
-				DNT: '1',
-				Origin: 'https://arweave.net'
-			},
-			body: JSON.stringify({
-				query:
-					'query {\n  transactions(\n    tags: [\n      { name: "AppName", values: "ETHBrno" }\n      { name: "DataTag", values: "json" }\n    ]\n    first: 1\n  ) {\n    edges {\n      node {\n        id\n      }\n    }\n  }\n}\n'
-			})
-		}).then((r) => r.json());
-		const {
-			data: {
-				transactions: { edges }
-			}
-		} = docrequest;
-		//console.log(edges[0].node.id);
-		if (edges.length < 0) return;
-		const response = await fetch(`https://arweave.net/${edges[0].node.id}`);
-		const result = await response.json();
-		data.contributors = result.contributors;
-		console.log(data.contributors);
+		const result = await graphdata('json');
+		if (result) data.contributors = result.contributors;
+		//console.log(data.contributors);
 	});
 
 	$: filteredContributors = data.contributors

src/routes/manual/+page.svelte

@@ -1,14 +1,12 @@
 <script>
-	import { base } from '$app/paths';
 	import { onMount } from 'svelte';
-	//import snarkdown from 'snarkdown';
+	import { graphdata } from '$lib/graphdata';
 	import parse from '$lib/vsnarkdown';
 	export let data;
 	onMount(async () => {
-		const response = await fetch(`${base}/hacker-manual.md`);
-		const result = await response.text();
-		data.content = await parse(result);
-		//console.log(data.contributors);
+		const result = await graphdata('markdown');
+		if (result) data.content = await parse(result);
+		//console.log(data.content);
 	});
 </script>