diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index b95c992c..b95c3c0e 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -20,6 +20,9 @@ "global_btn_goBack": { "message": "Go back" }, + "global_btn_setToken": { + "message": "set token" + }, "global_developer": { "message": "Develpoer" }, diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json index 2e655f76..fb2c3bd2 100644 --- a/src/_locales/zh_CN/messages.json +++ b/src/_locales/zh_CN/messages.json @@ -20,6 +20,9 @@ "global_btn_goBack": { "message": "返回" }, + "global_btn_setToken": { + "message": "设置token" + }, "global_developer": { "message": "开发者" }, diff --git a/src/api/github.ts b/src/api/github.ts index 70566ebd..1775824d 100644 --- a/src/api/github.ts +++ b/src/api/github.ts @@ -1,7 +1,15 @@ import { Octokit } from "@octokit/core"; +import { loadMetaData } from '../utils/metadata'; export const getConfigFromGithub = async (owner: string, repo: string) => { - const octokit = new Octokit(); + const metaData=await loadMetaData(); + let octokit; + if(metaData.token!==""){ + octokit = new Octokit({ auth:metaData.token }); + } + else{ + octokit = new Octokit(); + } try { const response = await octokit.request('GET /repos/{owner}/{repo}/contents/.github/hypertrons.json', { owner, repo }); const res = response.data as any; diff --git a/src/components/OptionsPage/index.tsx b/src/components/OptionsPage/index.tsx index 8928e9be..0a84d8e5 100644 --- a/src/components/OptionsPage/index.tsx +++ b/src/components/OptionsPage/index.tsx @@ -47,7 +47,6 @@ const OptionsPage: React.FC = () => { if(temp.token!==""){ setToken(temp.token); } - console.log("init meta") } initMetaData(); }, []); @@ -301,7 +300,7 @@ const OptionsPage: React.FC = () => { width:120 }} > - 设置token + {getMessageI18n("global_btn_setToken")} diff --git a/src/components/PopupPage/index.tsx b/src/components/PopupPage/index.tsx index 73a456ff..67ac11d1 100644 --- a/src/components/PopupPage/index.tsx +++ b/src/components/PopupPage/index.tsx @@ -1,27 +1,39 @@ import React, { useEffect, useState } from 'react'; import { - Stack + DefaultButton, + Image, ImageFit, PivotItem, + Stack, Text, } from 'office-ui-fabric-react'; import { initializeIcons } from '@uifabric/icons'; import './index.css'; import Settings,{ loadSettings } from '../../utils/settings'; +import MetaData, { loadMetaData } from '../../utils/metadata'; +import { getMessageI18n } from '../../utils/utils'; initializeIcons(); const PopupPage: React.FC = () => { const [settings,setSettings]= useState(new Settings()); + const [metaData, setMetaData] = useState(new MetaData()); const [inited, setInited] = useState(false); useEffect(() => { const initSettings=async ()=> { const temp=await loadSettings(); setSettings(temp); - setInited(true); } initSettings(); },[settings]); + useEffect(() => { + const initMetaData = async () => { + const temp=await loadMetaData(); + setMetaData(temp); + setInited(true); + } + initMetaData(); + }, []); if(!inited){ return (
); @@ -30,6 +42,54 @@ const PopupPage: React.FC = () => { return(