Merge pull request #9 from Turtle-Hwan/feat/samehost

Feat/samehost

Author: Turtle-Hwan

dist/index.css

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "LinKU",
   "description": "건국대학교 학생들을 위한 건국대, 건대 교내외 페이지 모음 링쿠, LinKU",
-  "version": "1.1.45",
+  "version": "1.2.10",
   "action": {
     "default_popup": "index.html"
   },
@@ -12,5 +12,9 @@
     "48": "assets/icon48.png",
     "64": "assets/icon64.png",
     "128": "assets/icon128.png"
-  }
+  },
+  "permissions": [
+    "activeTab",
+    "scripting"
+  ]
 }

dist/index.js

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "LinKU",
   "description": "건국대학교 학생들을 위한 건국대, 건대 교내외 페이지 모음 링쿠, LinKU",
-  "version": "1.1.45",
+  "version": "1.2.10",
   "action": {
     "default_popup": "index.html"
   },
@@ -12,5 +12,9 @@
     "48": "assets/icon48.png",
     "64": "assets/icon64.png",
     "128": "assets/icon128.png"
-  }
+  },
+  "permissions": [
+    "activeTab",
+    "scripting"
+  ]
 }

dist/manifest.json

@@ -1,10 +1,10 @@
 import { Search, Settings } from "lucide-react";
 import { Input } from "@/components/ui/input";
 import { LinkuLogoSvg } from "@/assets";
-import React, { Suspense } from "react";
+import React, { Suspense, use } from "react";
 import ImageCarousel from "./ImageCarousel";
 import { LinkList, LinkList_long } from "@/constants/LinkList";
-// import { getCurrentTab } from "@/utils/chrome";
+import { getCurrentTab } from "@/utils/chrome";
 
 const LinkGroup = () => {
   return (
@@ -64,12 +64,11 @@ const Header = () => {
   );
 };
 
+const tabPromise = getCurrentTab();
+
 const Grid = () => {
-  // const HOSTNAME = "localhost";
-  // console.log(window.location.hostname);
-  // getCurrentTab().then((tab) => {
-  //   console.log(tab);
-  // });
+  const tab = use(tabPromise);
+  const tabHostname = new URL(tab.url ?? "").hostname;
 
   return (
     <div className="Link__Grid grid grid-cols-6 gap-4 p-4">
@@ -80,11 +79,7 @@ const Grid = () => {
               <LinkGroup.GridItemLong key={idx} item={item} />
             ))}
 
-          {/* {idx === 7 && <LinkGroup.GridItemSameHost key={idx} item={item} />}
-          <LinkGroup.GridItem key={idx} item={item} /> */}
-
-          {new URL(item.link).hostname === window.location.hostname &&
-          item.samehost ? (
+          {new URL(item.link).hostname === tabHostname && item.samehost ? (
             <LinkGroup.GridItemSameHost key={idx} item={item} />
           ) : (
             <LinkGroup.GridItem key={idx} item={item} />
@@ -143,8 +138,11 @@ const GridItemSameHost = ({ item }) => {
   console.log(item);
   return (
     <div className="col-span-2 flex flex-row items-center justify-start rounded-lg hover:bg-gray-100 transition-colors border border-gray-200">
-      <button className="w-full h-full py-2 px-4 bg-[#00913A] text-white rounded-lg hover:bg-[#007a30] transition-colors cursor-pointer">
-        {item.samehost}
+      <button
+        className="w-full h-full py-2 px-4 bg-[#00913A] text-white rounded-lg hover:bg-[#007a30] transition-colors cursor-pointer text-sm"
+        onClick={item.samehost.onClick}
+      >
+        {item.samehost.content}
       </button>
 
       {/* <button

public/manifest.json

@@ -1,4 +1,6 @@
 import { HelloLmsPng } from "@/assets";
+import { executeScript, getCurrentTab, updateTabUrl } from "@/utils/chrome";
+import { sugangRefreshBtn } from "@/utils/sugang";
 import {
   BellRing,
   University,
@@ -23,6 +25,12 @@ export const LinkList = [
     icon: University,
     label: "홈페이지",
     link: "https://www.konkuk.ac.kr/konkuk/index.do",
+    samehost: {
+      content: "상용 SW 대여",
+      onClick: () => {
+        updateTabUrl("https://grad.konkuk.ac.kr/kuinc/15905/subview.do");
+      },
+    },
   },
   {
     icon: BellRing,
@@ -37,14 +45,40 @@ export const LinkList = [
   },
 
   //
-  { icon: Trophy, label: "위인전", link: "https://wein.konkuk.ac.kr" },
+  {
+    icon: Trophy,
+    label: "위인전",
+    link: "https://wein.konkuk.ac.kr",
+    samehost: {
+      content: "K-Cube 대여",
+      onClick: () => {
+        updateTabUrl(
+          "https://wein.konkuk.ac.kr/ptfol/cmnt/cube/findCubeResveStep1.do"
+        );
+      },
+    },
+  },
 
-  { icon: Clock, label: "수강신청", link: "https://sugang.konkuk.ac.kr" },
+  {
+    icon: Clock,
+    label: "수강신청",
+    link: "https://sugang.konkuk.ac.kr",
+    samehost: {
+      content: "수강인원 새로고침",
+      onClick: () => {
+        getCurrentTab().then((tab) => {
+          executeScript(tab.id ?? 0, sugangRefreshBtn);
+        });
+      },
+    },
+  },
   {
     icon: MapPinned,
     label: "캠퍼스맵",
     link: "https://research.konkuk.ac.kr/campusMap/konkuk/view.do#this",
-    samehost: "종강 == 법학관",
+    samehost: {
+      content: "종강 == 법학관",
+    },
   },
 
   //
@@ -112,5 +146,3 @@ export const LinkList_long = [
     link: "https://library.konkuk.ac.kr/",
   },
 ];
-
-// 정보통신처 상용 소프트웨어 무료 대여 https://grad.konkuk.ac.kr/kuinc/15905/subview.do

src/components/LinkGroup.tsx

@@ -1,33 +1,38 @@
-export async function getCurrentTab() {
-  const queryOptions = { active: true, lastFocusedWindow: true };
+// activeTab permission
+export const getCurrentTab = async () => {
+  const queryOptions = { active: true, currentWindow: true };
   const [tab] = await chrome.tabs.query(queryOptions);
   return tab;
-}
+};
 
-export async function executeScript(tabId: number, func: () => void) {
+export const updateTabUrl = (url: string) => {
+  chrome.tabs.update({ url: url });
+};
+
+export const executeScript = async (tabId: number, func: () => void) => {
   try {
     const result = await chrome.scripting.executeScript({
       target: { tabId, allFrames: true },
-      func,
+      func: func,
     });
-    console.log("Injection Success", result);
+    // console.log("Injection Success", result);
     return result;
   } catch (err) {
     console.log("err", err);
     throw err;
   }
-}
+};
 
-export async function executeScriptFile(tabId: number, files: string[]) {
+export const executeScriptFile = async (tabId: number, files: string[]) => {
   try {
     const result = await chrome.scripting.executeScript({
       target: { tabId, allFrames: true },
       files,
     });
-    console.log("Injection Success", result);
+    // console.log("Injection Success", result);
     return result;
   } catch (err) {
     console.log("err", err);
     throw err;
   }
-}
+};

src/constants/LinkList.ts

@@ -2,8 +2,6 @@ export function sugangRefreshBtn() {
   const refreshBtn = document.querySelectorAll<HTMLButtonElement>(
     "#btnRefresh.btn-sm.btn-sub.btn-mode"
   );
-  console.log("sugangRefresh Btn func : ", refreshBtn);
-
   refreshBtn.forEach((btn) => {
     btn.click();
   });