[Bug]: Fix local dev

client/app.ts → client.ts

@@ -1,13 +1,10 @@
 import { createReadStream } from 'node:fs';
 
-import * as dotenv from 'dotenv';
 import Koa from 'koa';
 import serve from 'koa-static';
 
-dotenv.config();
-
 const app = new Koa();
-const port = 3000;
+const port = 8080;
 const redirect = 'docs';
 const subdir = 'public';
 
@@ -33,6 +30,6 @@ app
       context.body = createReadStream(`${redirect}/404.html`);
     }
   })
-  .listen(port, () => console.log(`Koa is listening port: ${port}`));
+  .listen(port, () => console.log(`Client port: ${port}`));
 
 export default app;

client/routes/requests/languages.ts

@@ -1,18 +1,22 @@
 import axios from 'axios';
 
-import router from '../../../local';
-
-const localToken = process.env.GH_PAT;
+const { protocol, hostname } = window.location;
+const isLocal = hostname !== 'gitlang';
+console.log('hostname:', hostname);
 
 const localApi = async (owner: string, repos: string[]) => {
   try {
-    const allLanguages = JSON.parse(
-      await router.langs(owner, repos, localToken),
+    const allLanguages: { data: { [key: string]: number }[] } = await axios.get(
+      `${protocol}//${hostname}:3000/gitlang/github/langs`,
+      {
+        params: {
+          owner,
+          repos: JSON.stringify(repos),
+        },
+      },
     );
-
-    if (allLanguages && allLanguages.length > 0) {
-      return allLanguages;
-    }
+    if (allLanguages && allLanguages.data && allLanguages.data.length > 0)
+      return allLanguages.data;
     return [];
   } catch (error) {
     console.error('Error getting token from auth api', error);
@@ -40,6 +44,6 @@ const serverApi = async (owner: string, repos: string[]) => {
   }
 };
 
-const languages = localToken ? localApi : serverApi;
+const languages = isLocal ? localApi : serverApi;
 
 export default languages;

client/routes/requests/repositories.ts

@@ -1,14 +1,19 @@
 import axios from 'axios';
 
-import router from '../../../local';
-
-const localToken = process.env.GH_PAT;
+const { protocol, hostname } = window.location;
+const isLocal = hostname !== 'gitlang';
+console.log('hostname:', hostname);
 
 const localApi = async (username: string) => {
   try {
-    const allRepos = JSON.parse(await router.repos(username, localToken));
-    if (allRepos && allRepos.length > 0) {
-      return allRepos;
+    const allRepos: { data: [] } = await axios.get(
+      `${protocol}//${hostname}:3000/gitlang/github/repos`,
+      {
+        params: { username },
+      },
+    );
+    if (allRepos && allRepos.data && allRepos.data.length > 0) {
+      return allRepos.data;
     }
     return [];
   } catch (error) {
@@ -35,6 +40,6 @@ const serverApi = async (username: string) => {
   }
 };
 
-const repositories = localToken ? localApi : serverApi;
+const repositories = isLocal ? localApi : serverApi;
 
 export default repositories;

gitlangRoutes/helpers/github/languages.ts

@@ -2,7 +2,7 @@ import { Octokit } from '@octokit/rest';
 
 let octokit: Octokit;
 
-const fetchLanguage = async (owner: string, repo: string, token?: string) => {
+const fetchLanguage = async (owner: string, repo: string, token: string) => {
   try {
     if (!octokit) {
       if (!token) {
@@ -20,7 +20,7 @@ const fetchLanguage = async (owner: string, repo: string, token?: string) => {
   }
 };
 
-const languages = async (owner: string, names: string[], token?: string) => {
+const languages = async (owner: string, names: string[], token: string) => {
   const langs = [];
   for (const repo of names) {
     langs.push(await fetchLanguage(owner, repo, token));

gitlangRoutes/helpers/github/repositories.ts

@@ -2,7 +2,7 @@ import { Octokit } from '@octokit/rest';
 
 let octokit: Octokit;
 
-const repositories = async (username: string, token?: string) => {
+const repositories = async (username: string, token: string) => {
   try {
     if (!octokit) {
       if (!token) {

gitlangRoutes/requests/gitlangRouter.ts

@@ -4,6 +4,8 @@ import auth from '../helpers/github/auth';
 import languages from '../helpers/github/languages';
 import repositories from '../helpers/github/repositories';
 
+const environmentToken = process.env.GH_PAT;
+
 const router = new Router({ prefix: '/github' });
 
 router.get(
@@ -13,7 +15,7 @@ router.get(
     response: { status: number; body: string };
   }) => {
     try {
-      const token = await auth();
+      const token = environmentToken || (await auth());
       const { owner } = context.request.query;
       const { repos } = context.request.query;
       const repoList = JSON.parse(repos) as string[];
@@ -39,7 +41,7 @@ router.get(
     response: { status: number; body: string };
   }) => {
     try {
-      const token = await auth();
+      const token = environmentToken || (await auth());
       const { username } = context.request.query;
       const response = await repositories(username, token);
       if (response && response.length > 0) {