josh/dashy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ IP address widget used ipapi.co by default (#437)

Browse Source
This commit is contained in:
Alicia Sykes
2022-01-24 12:37:47 +00:00
parent 5b6e75766d
commit edbd770a2d
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/Widgets/PublicIp.vue
View File

@@ -24,6 +24,8 @@ export default {
endpoint() {
if (this.provider === 'ipgeolocation') {
return `${widgetApiEndpoints.publicIp2}?apiKey=${this.apiKey}`;
} else if (this.provider === 'ipapi') {
return widgetApiEndpoints.publicIp3;
}
return widgetApiEndpoints.publicIp;
},
@@ -32,8 +34,8 @@ export default {
return this.options.apiKey;
},
provider() {
// Can be either `ip-api` or `ipgeolocation`
return this.options.provider || 'ip-api';
// Can be either `ip-api`, `ipapi.co` or `ipgeolocation`
return this.options.provider || 'ipapi.co';
},
},
data() {
@@ -52,18 +54,26 @@ export default {
},
/* Assign data variables to the returned data */
processData(ipInfo) {
if (this.provider === 'ip-api') {
if (this.provider === 'ipapi.co') {
this.ipAddr = ipInfo.ip;
this.ispName = ipInfo.org;
this.location = `${ipInfo.city}, ${ipInfo.region}`;
this.flagImg = getCountryFlag(ipInfo.country_code);
this.mapsUrl = getMapUrl({ lat: ipInfo.latitude, lon: ipInfo.longitude });
} else if (this.provider === 'ipgeolocation') {
this.ipAddr = ipInfo.ip;
this.ispName = ipInfo.organization || ipInfo.isp;
this.location = `${ipInfo.city}, ${ipInfo.country_name}`;
this.flagImg = ipInfo.country_flag;
this.mapsUrl = getMapUrl({ lat: ipInfo.latitude, lon: ipInfo.longitude });
} else if (this.provider === 'ip-api') {
this.ipAddr = ipInfo.query;
this.ispName = ipInfo.isp;
this.location = `${ipInfo.city}, ${ipInfo.regionName}`;
this.flagImg = getCountryFlag(ipInfo.countryCode);
this.mapsUrl = getMapUrl({ lat: ipInfo.lat, lon: ipInfo.lon });
} else if (this.provider === 'ipgeolocation') {
this.ipAddr = ipInfo.ip;
this.ispName = ipInfo.organization || ipInfo.isp;
this.flagImg = ipInfo.country_flag;
this.location = `${ipInfo.city}, ${ipInfo.country_name}`;
this.mapsUrl = getMapUrl({ lat: ipInfo.latitude, lon: ipInfo.longitude });
} else {
this.error('Unknown API provider fo IP address');
}
},
},

3
src/utils/defaults.js
View File

@@ -222,8 +222,9 @@ module.exports = {
holidays: 'https://kayaposoft.com/enrico/json/v2.0/?action=getHolidaysForDateRange',
jokes: 'https://v2.jokeapi.dev/joke/',
news: 'https://api.currentsapi.services/v1/latest-news',
publicIp: 'http://ip-api.com/json',
publicIp: 'https://ipapi.co/json',
publicIp2: 'https://api.ipgeolocation.io/ipgeo',
publicIp3: 'http://ip-api.com/json',
readMeStats: 'https://github-readme-stats.vercel.app/api',
rssToJson: 'https://api.rss2json.com/v1/api.json',
sportsScores: 'https://www.thesportsdb.com/api/v1/json',