Improvements

ixleo · May 14, 2024 · 6285042 · 6285042
1 parent a853d75
commit 6285042
Show file tree

Hide file tree

Showing 38 changed files with 47 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # 🧰 MyIP - A Better IP Toolbox
 
-![IPCheck.ing Banner](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/gh_banner.png)
+![IPCheck.ing Banner](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/github/gh_banner.png)
 
 ![GitHub Repo stars](https://img.shields.io/github/stars/jason5ng32/MyIP)
 ![GitHub forks](https://img.shields.io/github/forks/jason5ng32/myip)
@@ -23,8 +23,8 @@
 
 Notes: You can use my demo for free, and you can also deploy it yourself.
 
-[![Deploy with Vercel](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/Vercel.svg)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fjason5ng32%2FMyIP&project-name=MyIP&repository-name=MyIP)
-[![Deploy with Docker](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/Docker.svg)](https://hub.docker.com/r/jason5ng32/myip)
+[![Deploy with Vercel](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/github/Vercel.svg)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fjason5ng32%2FMyIP&project-name=MyIP&repository-name=MyIP)
+[![Deploy with Docker](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/github/Docker.svg)](https://hub.docker.com/r/jason5ng32/myip)
 
 ## 👀 Main Features
 

diff --git a/README_FR.md b/README_FR.md
@@ -1,6 +1,6 @@
 # 🧰 MyIP - Une meilleure boîte à outils IP
 
-![IPCheck.ing Banner](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/gh_banner.png)
+![IPCheck.ing Banner](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/github/gh_banner.png)
 
 ![GitHub Repo stars](https://img.shields.io/github/stars/jason5ng32/MyIP)
 ![GitHub forks](https://img.shields.io/github/forks/jason5ng32/myip)
@@ -23,8 +23,8 @@
 
 Notes: Vous pouvez utiliser ma démo gratuitement et vous pouvez également la déployer vous-même.
 
-[![Deploy with Vercel](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/Vercel.svg)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fjason5ng32%2FMyIP&project-name=MyIP&repository-name=MyIP)
-[![Deploy with Docker](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/Docker.svg)](https://hub.docker.com/r/jason5ng32/myip)
+[![Deploy with Vercel](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/github/Vercel.svg)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fjason5ng32%2FMyIP&project-name=MyIP&repository-name=MyIP)
+[![Deploy with Docker](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/github/Docker.svg)](https://hub.docker.com/r/jason5ng32/myip)
 
 ## 👀 Principales fonctionnalités
 

diff --git a/README_ZH.md b/README_ZH.md
@@ -1,6 +1,6 @@
 # 🧰 IP 工具箱
 
-![IPCheck.ing Banner](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/gh_banner.png)
+![IPCheck.ing Banner](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/github/gh_banner.png)
 
 ![GitHub Repo stars](https://img.shields.io/github/stars/jason5ng32/MyIP)
 ![GitHub forks](https://img.shields.io/github/forks/jason5ng32/myip)
@@ -23,8 +23,8 @@
 
 备注：你可以直接用我已经搭建好的服务，也可以自行搭建。
 
-[![Deploy with Vercel](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/Vercel.svg)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fjason5ng32%2FMyIP&project-name=MyIP&repository-name=MyIP)
-[![Deploy with Docker](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/Docker.svg)](https://hub.docker.com/r/jason5ng32/myip)
+[![Deploy with Vercel](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/github/Vercel.svg)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fjason5ng32%2FMyIP&project-name=MyIP&repository-name=MyIP)
+[![Deploy with Docker](https://raw.githubusercontent.com/jason5ng32/MyIP/main/public/github/Docker.svg)](https://hub.docker.com/r/jason5ng32/myip)
 
 这是我第一次用 Vue.js 练手的项目。我……只是一个普通的产品经理。
 

diff --git a/api/cfradar.js b/api/cfradar.js
@@ -1,6 +1,6 @@
 
 import { parse } from 'dotenv';
-import { refererCheck } from '../lib/referer-check.js';
+import { refererCheck } from '../common/referer-check.js';
 
 // 创建一个用于设置 headers 的通用函数
 function createFetchOptions() {

diff --git a/api/configs.js b/api/configs.js
@@ -1,4 +1,4 @@
-import { refererCheck } from '../lib/referer-check.js';
+import { refererCheck } from '../common/referer-check.js';
 
 // 验证环境变量是否存在，以进行前端功能的开启和关闭
 export default (req, res) => {

diff --git a/api/dnsresolver.js b/api/dnsresolver.js
@@ -1,7 +1,7 @@
 // api/dnsresolver.js
 import { Resolver } from 'dns';
 import { promisify } from 'util';
-import { refererCheck } from '../lib/referer-check.js';
+import { refererCheck } from '../common/referer-check.js';
 
 // 普通 DNS 服务器列表
 const dnsServers = {

diff --git a/api/invisibilitytest.js b/api/invisibilitytest.js
@@ -1,5 +1,5 @@
 import { get } from 'https';
-import { refererCheck } from '../lib/referer-check.js';
+import { refererCheck } from '../common/referer-check.js';
 
 // 如果长度不等于 28 且不是字母与数字的组合，则返回 false
 function isValidUserID(userID) {

diff --git a/api/ipapicom.js b/api/ipapicom.js
@@ -1,6 +1,6 @@
 import { get } from 'http';
-import { isValidIP } from '../lib/valid-ip.js';
-import { refererCheck } from '../lib/referer-check.js';
+import { isValidIP } from '../common/valid-ip.js';
+import { refererCheck } from '../common/referer-check.js';
 
 export default (req, res) => {
     // 限制只能从指定域名访问

diff --git a/api/ipapiis.js b/api/ipapiis.js
@@ -1,6 +1,6 @@
 import { get } from 'https';
-import { isValidIP } from '../lib/valid-ip.js';
-import { refererCheck } from '../lib/referer-check.js';
+import { isValidIP } from '../common/valid-ip.js';
+import { refererCheck } from '../common/referer-check.js';
 
 export default (req, res) => {
     // 限制只能从指定域名访问

diff --git a/api/ipchecking.js b/api/ipchecking.js
@@ -1,6 +1,6 @@
 import { get } from 'https';
-import { isValidIP } from '../lib/valid-ip.js';
-import { refererCheck } from '../lib/referer-check.js';
+import { isValidIP } from '../common/valid-ip.js';
+import { refererCheck } from '../common/referer-check.js';
 
 export default (req, res) => {
 

diff --git a/api/ipinfo.js b/api/ipinfo.js
@@ -1,6 +1,6 @@
 import { get } from 'https';
-import { isValidIP } from '../lib/valid-ip.js';
-import { refererCheck } from '../lib/referer-check.js';
+import { isValidIP } from '../common/valid-ip.js';
+import { refererCheck } from '../common/referer-check.js';
 
 // 国家代码
 async function loadCountryCodes() {

diff --git a/api/ipsb.js b/api/ipsb.js
@@ -1,6 +1,6 @@
 import { get } from 'https';
-import { isValidIP } from '../lib/valid-ip.js';
-import { refererCheck } from '../lib/referer-check.js';
+import { isValidIP } from '../common/valid-ip.js';
+import { refererCheck } from '../common/referer-check.js';
 
 export default (req, res) => {
 

diff --git a/api/keycdn.js b/api/keycdn.js
@@ -1,6 +1,6 @@
 import { get } from 'https';
-import { isValidIP } from '../lib/valid-ip.js';
-import { refererCheck } from '../lib/referer-check.js';
+import { isValidIP } from '../common/valid-ip.js';
+import { refererCheck } from '../common/referer-check.js';
 
 export default (req, res) => {
     // 限制只能从指定域名访问

diff --git a/api/map.js b/api/map.js
@@ -1,5 +1,5 @@
 import { get } from 'https';
-import { refererCheck } from '../lib/referer-check.js';
+import { refererCheck } from '../common/referer-check.js';
 
 // 验证请求合法性
 

diff --git a/api/whois.js b/api/whois.js
@@ -1,6 +1,6 @@
 import whoiser from 'whoiser';
-import { isValidIP } from '../lib/valid-ip.js';
-import { refererCheck } from '../lib/referer-check.js';
+import { isValidIP } from '../common/valid-ip.js';
+import { refererCheck } from '../common/referer-check.js';
 
 function isValidDomain(domain) {
     const domainPattern = /^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$/i;

diff --git a/lib/referer-check.js → common/referer-check.js b/lib/referer-check.js → common/referer-check.js
diff --git a/lib/valid-ip.js → common/valid-ip.js b/lib/valid-ip.js → common/valid-ip.js
diff --git a/frontend/components/IpInfos.vue b/frontend/components/IpInfos.vue
@@ -238,8 +238,8 @@ const createDefaultCard = () => ({
   isp: "",
   asn: "",
   asnlink: "",
-  mapUrl: '/defaultMap.webp',
-  mapUrl_dark: '/defaultMap_dark.webp',
+  mapUrl: '/res/defaultMap.webp',
+  mapUrl_dark: '/res/defaultMap_dark.webp',
   showMap: false,
   showASNInfo: false,
 });

diff --git a/frontend/utils/masked-info.js b/frontend/utils/masked-info.js
@@ -14,8 +14,8 @@ function maskedInfo(t) {
     fakecard.isp = "Google LLC";
     fakecard.asn = "AS15169";
     fakecard.asnlink = "https://radar.cloudflare.com/AS15169",
-    fakecard.mapUrl = '/defaultMap.webp';
-    fakecard.mapUrl_dark = '/defaultMap_dark.webp';
+    fakecard.mapUrl = '/res/defaultMap.webp';
+    fakecard.mapUrl_dark = '/res/defaultMap_dark.webp';
     fakecard.showASNInfo = false;
     fakecard.isProxy = t('ipInfos.proxyDetect.no');
     fakecard.type = t('ipInfos.proxyDetect.type.Business');

diff --git a/index.html b/index.html
@@ -11,9 +11,10 @@
   <meta name="theme-color" content="#f8f9fa">
   <meta name="background-color" content="#ffffff">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="apple-touch-icon" href="/ios-logo-512.png">
+  <link rel="apple-touch-icon" href="logos/ios-logo-512.png">
   <title>IPCheck.ing - Check My IP Address and Geolocation - Check WebRTC Connection IP - DNS Leak Test - Speed Test - Ping/MTR Test - Jason Ng Open Source </title>
-  <link rel="icon" href="logo.svg">
+  <link rel="icon" href="logos/logo.svg">
+  <link rel="icon" type="image/svg+xml" href="favicon.svg">
 
   <style>
     .jn-spinner {

diff --git a/public/defaultMap.webp b/public/defaultMap.webp
diff --git a/public/defaultMap_dark.webp b/public/defaultMap_dark.webp
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/logo.svg → public/favicon.svg b/public/logo.svg → public/favicon.svg
diff --git a/public/Docker.svg → public/github/Docker.svg b/public/Docker.svg → public/github/Docker.svg
diff --git a/public/Vercel.svg → public/github/Vercel.svg b/public/Vercel.svg → public/github/Vercel.svg
diff --git a/public/gh_banner.png → public/github/gh_banner.png b/public/gh_banner.png → public/github/gh_banner.png
diff --git a/public/logos/favicon.ico b/public/logos/favicon.ico
diff --git a/public/ios-logo-144.png → public/logos/ios-logo-144.png b/public/ios-logo-144.png → public/logos/ios-logo-144.png
diff --git a/public/ios-logo-192.png → public/logos/ios-logo-192.png b/public/ios-logo-192.png → public/logos/ios-logo-192.png
diff --git a/public/ios-logo-256.png → public/logos/ios-logo-256.png b/public/ios-logo-256.png → public/logos/ios-logo-256.png
diff --git a/public/ios-logo-512.png → public/logos/ios-logo-512.png b/public/ios-logo-512.png → public/logos/ios-logo-512.png
diff --git a/public/logo-144.webp → public/logos/logo-144.webp b/public/logo-144.webp → public/logos/logo-144.webp
diff --git a/public/logo-192.webp → public/logos/logo-192.webp b/public/logo-192.webp → public/logos/logo-192.webp
diff --git a/public/logo-256.webp → public/logos/logo-256.webp b/public/logo-256.webp → public/logos/logo-256.webp
diff --git a/public/logo-512.webp → public/logos/logo-512.webp b/public/logo-512.webp → public/logos/logo-512.webp
diff --git a/public/logos/logo.svg b/public/logos/logo.svg
diff --git a/vite.config.js b/vite.config.js
@@ -36,18 +36,18 @@ export default defineConfig({
         description: 'All in one IP Toolbox',
         icons: [
           {
-            src: '/logo-192.webp',
+            src: '/logos/logo-192.webp',
             sizes: '192x192',
             type: 'image/webp',
             purpose: 'maskable'
           },
           {
-            src: '/ios-logo-192.png',
+            src: '/logos/ios-logo-192.png',
             sizes: '192x192',
             type: 'image/png',
           },
           {
-            src: '/ios-logo-512.png',
+            src: '/logos/ios-logo-512.png',
             sizes: '512x512',
             type: 'image/png',
           },