Merge pull request #192 from Artur-Galstyan/v2.0

V2.0
KGQA · Sep 26, 2023 · 81d1571 · 81d1571
2 parents 7dfe233 + f30d469
commit 81d1571
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/frontend/src/lib/constants.ts b/frontend/src/lib/constants.ts
@@ -1,4 +1,4 @@
-export const PUBLIC_REPO_URL = 'Artur-Galstyan/leaderboard';
+export const PUBLIC_REPO_URL = 'KGQA/leaderboard';
 
 export const NUMERIC_FIELDS = [
 	'Accuracy',

diff --git a/frontend/src/lib/utils/githubUrlBuilder.ts b/frontend/src/lib/utils/githubUrlBuilder.ts
@@ -1,13 +1,13 @@
-export function getRawGitHubContent(repo: string, path: string, branch: string = 'main'): string {
+export function getRawGitHubContent(repo: string, path: string, branch: string = 'v2.0'): string {
 	const url = `https://raw.githubusercontent.com/${repo}/${branch}/${path}`;
 	return url;
 }
 
 export function getGitHubFilesInFolder(
 	repo: string,
 	path: string,
-	branch: string = 'main',
-	githubUser: string = 'Artur-Galstyan'
+	branch: string = 'v2.0',
+	githubUser: string = 'KGQA'
 ): string {
 	const url = `https://api.github.com/repos/${githubUser}/${repo}/contents/${path}?ref=${branch}`;
 

diff --git a/frontend/src/lib/utils/utils.ts b/frontend/src/lib/utils/utils.ts
@@ -1,4 +1,4 @@
-import { NUMERIC_FIELDS } from '$lib/constants';
+import { NUMERIC_FIELDS, PUBLIC_REPO_URL } from '$lib/constants';
 import matter from 'gray-matter';
 import { marked } from 'marked';
 import { getRawGitHubContent } from '$lib/utils/githubUrlBuilder';
@@ -197,7 +197,7 @@ async function loadFromGithub(db: string | null, dataset: string | null, systems
 	let headerPath = systems ? `^systems_updated.md` : `${db}/^${dataset}.md`;
 	let footerPath = systems ? `$systems_updated.md` : `${db}/$${dataset}.md`;
 	try {
-		const githubUrl = getRawGitHubContent(`Artur-Galstyan/leaderboard`, mainPath);
+		const githubUrl = getRawGitHubContent(PUBLIC_REPO_URL, mainPath);
 		const githubUrlReq = await fetch(githubUrl);
 		const githubMarkdownText = await githubUrlReq.text();
 		const parsed = matter(githubMarkdownText);
@@ -209,15 +209,15 @@ async function loadFromGithub(db: string | null, dataset: string | null, systems
 		const htmlContent = marked.parse(parsed.content, { mangle: false, headerIds: false });
 		const parsedTable = htmlToJson.parse(htmlContent).results[0];
 
-		const githubUrlInfo = getRawGitHubContent(`Artur-Galstyan/leaderboard`, headerPath);
+		const githubUrlInfo = getRawGitHubContent(PUBLIC_REPO_URL, headerPath);
 		const githubUrlInfoReq = await fetch(githubUrlInfo);
 		const githubMarkdownTextInfo = await githubUrlInfoReq.text();
 		const parsedInfo = matter(githubMarkdownTextInfo);
 		const htmlContentInfo = marked.parse(parsedInfo.content, { mangle: false, headerIds: false });
 
 		let htmlFooter = undefined;
 		try {
-			const githubUrlFooter = getRawGitHubContent(`Artur-Galstyan/leaderboard`, footerPath);
+			const githubUrlFooter = getRawGitHubContent(PUBLIC_REPO_URL, footerPath);
 			const githubUrlFooterReq = await fetch(githubUrlFooter);
 			if (githubUrlFooterReq.status == 404) {
 				throw Error('Not found');

diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { base } from '$app/paths';
 	import { page } from '$app/stores';
+	import { PUBLIC_REPO_URL } from '$lib/constants';
 	import { getRawGitHubContent } from '$lib/utils/githubUrlBuilder';
 	import Fuse from 'fuse.js';
 	import matter from 'gray-matter';
@@ -17,7 +18,7 @@
 
 	async function load() {
 		try {
-			const githubUrl = getRawGitHubContent(`Artur-Galstyan/leaderboard/`, 'README.md');
+			const githubUrl = getRawGitHubContent(PUBLIC_REPO_URL, 'README.md');
 
 			const githubMarkdownTextReq = await fetch(githubUrl);
 			const githubMarkdownText = await githubMarkdownTextReq.text();

diff --git a/frontend/src/routes/datasets/[db]/+page.svelte b/frontend/src/routes/datasets/[db]/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { page } from '$app/stores';
 	import KnowledgeGraphNavbar from '$lib/components/KnowledgeGraphNavbar.svelte';
+	import { PUBLIC_REPO_URL } from '$lib/constants';
 	import { getGitHubFilesInFolder, getRawGitHubContent } from '$lib/utils/githubUrlBuilder';
 	import { marked } from 'marked';
 	import { onMount } from 'svelte';
@@ -11,7 +12,7 @@
 
 	async function load(params: any) {
 		try {
-			const githubUrl = getRawGitHubContent(`Artur-Galstyan/leaderboard`, `${params.db}/README.md`);
+			const githubUrl = getRawGitHubContent(PUBLIC_REPO_URL, `${params.db}/README.md`);
 
 			const githubMarkdownTextReq = await fetch(githubUrl);
 			const githubMarkdownText = await githubMarkdownTextReq.text();