Skip to content

Commit 3bb77e6

Browse files
committed
Map Dark Mode
1 parent 2079946 commit 3bb77e6

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

api/map.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = (req, res) => {
1616
}
1717

1818
// 使用 req.query 获取参数
19-
const { latitude, longitude, language } = req.query;
19+
const { latitude, longitude, language, CanvasMode } = req.query;
2020

2121
if (!latitude || !longitude || !language) {
2222
return res.status(400).json({ error: 'Missing latitude, longitude, or language' });
@@ -28,7 +28,7 @@ module.exports = (req, res) => {
2828
const dpi = 'Large';
2929
const apiKey = process.env.BING_MAP_API_KEY;
3030

31-
const url = `https://dev.virtualearth.net/REST/v1/Imagery/Map/Road/${latitude},${longitude}/5?mapSize=${mapSize}&pp=${pp}&key=${apiKey}&fmt=${fmt}&dpi=${dpi}&c=${language}`;
31+
const url = `https://dev.virtualearth.net/REST/v1/Imagery/Map/${CanvasMode}/${latitude},${longitude}/5?mapSize=${mapSize}&pp=${pp}&key=${apiKey}&fmt=${fmt}&dpi=${dpi}&c=${language}`;
3232

3333
https.get(url, apiRes => {
3434
apiRes.pipe(res);

public/contents/ipDataCards.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export default [
1111
asn: "",
1212
asnlink: "",
1313
mapUrl: "res/img/defaultMap.jpg",
14+
mapUrl_dark: "res/img/defaultMap_dark.jpg",
1415
showMap: false,
1516
source: "Taobao",
1617
},
@@ -26,6 +27,7 @@ export default [
2627
asn: "",
2728
asnlink: "",
2829
mapUrl: "res/img/defaultMap.jpg",
30+
mapUrl_dark: "res/img/defaultMap_dark.jpg",
2931
showMap: false,
3032
source: "Special",
3133
},
@@ -41,6 +43,7 @@ export default [
4143
asn: "",
4244
asnlink: "",
4345
mapUrl: "res/img/defaultMap.jpg",
46+
mapUrl_dark: "res/img/defaultMap_dark.jpg",
4447
showMap: false,
4548
source: "Cloudflare IPv4",
4649
},
@@ -56,6 +59,7 @@ export default [
5659
asn: "",
5760
asnlink: "",
5861
mapUrl: "res/img/defaultMap.jpg",
62+
mapUrl_dark: "res/img/defaultMap_dark.jpg",
5963
showMap: false,
6064
source: "Cloudflare IPv6",
6165
},
@@ -71,6 +75,7 @@ export default [
7175
asn: "",
7276
asnlink: "",
7377
mapUrl: "res/img/defaultMap.jpg",
78+
mapUrl_dark: "res/img/defaultMap_dark.jpg",
7479
showMap: false,
7580
source: "IPify IPv4",
7681
},
@@ -86,6 +91,7 @@ export default [
8691
asn: "",
8792
asnlink: "",
8893
mapUrl: "res/img/defaultMap.jpg",
94+
mapUrl_dark: "res/img/defaultMap_dark.jpg",
8995
showMap: false,
9096
source: "IPify IPv6",
9197
},

public/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ <h2 id="IPInfo" class="col-4" :class="{'mobile-h2' : isMobile }">🕵️
138138
<i class="bi bi-arrow-clockwise"></i></button>
139139
</div>
140140

141-
<img v-if="isMapShown" v-if="!isMobile" :src="card.mapUrl" class="card-img-top jn-map-image"
142-
alt="Map">
141+
<img v-if="isMapShown && !isMobile" :src="isDarkMode ? card.mapUrl_dark : card.mapUrl"
142+
class="card-img-top jn-map-image" alt="Map">
143143
<div class="card-body">
144144
<ul class="list-group list-group-flush">
145145
<li class="list-group-item jn-list-group-item" :class="{ 'dark-mode': isDarkMode }"><span
@@ -485,7 +485,7 @@ <h5 class="modal-title" id="helpModal">{{currentTexts.helpModal.Title}}</h5>
485485
});
486486
}
487487
</script>
488-
488+
489489

490490
</body>
491491

public/res/app.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ new Vue({
3030
data: {
3131

3232
isEnvBingMapKey: false,
33+
BingMapCanvasMode: "CanvasLight",
3334
currentLanguage: "en",
3435
currentTexts: {},
3536

@@ -261,7 +262,8 @@ new Vue({
261262
isp: data.org || "",
262263
asn: data.asn || "",
263264
asnlink: data.asn ? `https://radar.cloudflare.com/traffic/${data.asn}` : false,
264-
mapUrl: data.latitude && data.longitude ? `/api/map?latitude=${data.latitude}&longitude=${data.longitude}&language=${this.bingMapLanguage}` : ""
265+
mapUrl: data.latitude && data.longitude ? `/api/map?latitude=${data.latitude}&longitude=${data.longitude}&language=${this.bingMapLanguage}&CanvasMode=CanvasLight` : "",
266+
mapUrl_dark: data.latitude && data.longitude ? `/api/map?latitude=${data.latitude}&longitude=${data.longitude}&language=${this.bingMapLanguage}&CanvasMode=CanvasDark` : ""
265267
};
266268
},
267269

@@ -307,6 +309,7 @@ new Vue({
307309
card.asn = "";
308310
card.isp = "";
309311
card.mapUrl = "res/img/defaultMap.jpg";
312+
card.mapUrl_dark = "res/img/defaultMap_dark.jpg";
310313
},
311314

312315
toggleMaps() {
@@ -773,6 +776,7 @@ new Vue({
773776
card.isp = "Google LLC";
774777
card.asn = "AS15169";
775778
card.mapUrl = "res/img/defaultMap.jpg";
779+
card.mapUrl_dark = "res/img/defaultMap_dark.jpg";
776780
});
777781
this.leakTest.forEach((server) => {
778782
server.geo = "United States";

public/res/img/defaultMap.jpg

-109 KB
Loading

public/res/img/defaultMap_dark.jpg

248 KB
Loading

0 commit comments

Comments
 (0)