Compare commits
2 Commits
029fbae471
...
360244dc08
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
360244dc08 | ||
|
|
39accae46e |
1
.env
1
.env
@@ -1,3 +1,2 @@
|
||||
VITE_COUCHDB=https://couch.apoena.dev
|
||||
VITE_MAP_KEY=AnLDo_m_IGvMsQPLuBak9igWj3gNYvqBodj0esZZ7VfI1OkqVWvg04eTZ4U9R0Y2
|
||||
VITE_MAPBOX_KEY=pk.eyJ1IjoiamNhbGl4dGUiLCJhIjoiY2s3cmo1aHhlMDZ3dDNtc2Z0OXl3M3c5dSJ9.rkkIAZ4lKSJZssoFvH7Fpw
|
||||
|
||||
@@ -36,5 +36,4 @@ Create `.env` (gitignored) with:
|
||||
```
|
||||
VITE_COUCHDB=https://your-couchdb-host
|
||||
VITE_MAPBOX_KEY=pk.your-mapbox-token
|
||||
VITE_MAP_KEY=your-bing-maps-key
|
||||
```
|
||||
|
||||
@@ -15,8 +15,6 @@ export default [
|
||||
{ name: 'Swiss franc', code: 'CHF' },
|
||||
{ name: 'Icelandic krona', code: 'ISK', symbol: 'kr' },
|
||||
{ name: 'Norwegian krone', code: 'NOK', symbol: 'øre' },
|
||||
{ name: 'Croatian kuna', code: 'HRK', symbol: 'kn' },
|
||||
{ name: 'Russian rouble', code: 'RUB' },
|
||||
{ name: 'Turkish lira', code: 'TRY' },
|
||||
{ name: 'Australian dollar', code: 'AUD', symbol: 'A$' },
|
||||
{ name: 'Brazilian real', code: 'BRL', symbol: 'R$' },
|
||||
|
||||
@@ -1,44 +1,11 @@
|
||||
export default interface ILocationQuery {
|
||||
authenticationResultCode: string
|
||||
brandLogoUri: string
|
||||
copyright: string
|
||||
resourceSets: [
|
||||
{
|
||||
estimatedTotal: number
|
||||
resources: [
|
||||
{
|
||||
__type: string
|
||||
bbox: number[]
|
||||
name: string
|
||||
point: {
|
||||
type: string
|
||||
coordinates: number[]
|
||||
}
|
||||
address: {
|
||||
addressLine: string
|
||||
adminDistrict: string
|
||||
adminDistrict2: string
|
||||
countryRegion: string
|
||||
formattedAddress: string
|
||||
locality: string
|
||||
postalCode: string
|
||||
}
|
||||
confidence: string
|
||||
entityType: string
|
||||
geocodePoints: [
|
||||
{
|
||||
type: string
|
||||
coordinates: number[]
|
||||
calculationMethod: string
|
||||
usageTypes: string[]
|
||||
}
|
||||
]
|
||||
matchCodes: string[]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
statusCode: number
|
||||
statusDescription: string
|
||||
traceId: string
|
||||
type: string
|
||||
features: Array<{
|
||||
id: string
|
||||
type: string
|
||||
place_type: string[]
|
||||
text: string
|
||||
place_name: string
|
||||
center: number[]
|
||||
}>
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import couchService from '@/services/CouchService'
|
||||
import formatDate from '@/utils/format-date'
|
||||
|
||||
class ExchangeService {
|
||||
private baseUrl: string = 'https://api.exchangeratesapi.io/'
|
||||
private baseUrl: string = 'https://api.frankfurter.dev/v1/'
|
||||
|
||||
/**
|
||||
* Get an exchange with defined date and desired currencies
|
||||
@@ -42,12 +42,16 @@ class ExchangeService {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const url = new URL(
|
||||
date ? `${this.baseUrl}${formattedDate}` : 'latest'
|
||||
)
|
||||
const url = new URL(`${this.baseUrl}${date ? formattedDate : 'latest'}`)
|
||||
if (base) {
|
||||
url.searchParams.append('base', base)
|
||||
}
|
||||
if (rates.length) {
|
||||
url.searchParams.append(
|
||||
'symbols',
|
||||
rates.filter((r) => r !== base).join(',')
|
||||
)
|
||||
}
|
||||
const response = await fetch(url.toString())
|
||||
if (response.ok) {
|
||||
exchange = await response.json()
|
||||
|
||||
@@ -2,7 +2,7 @@ import ILocation from '@/models/ILocation'
|
||||
import ILocationQuery from '@/models/ILocationQuery'
|
||||
|
||||
class MapService {
|
||||
private key: string = import.meta.env.VITE_MAP_KEY || ''
|
||||
private token: string = import.meta.env.VITE_MAPBOX_KEY || ''
|
||||
|
||||
public async getPosition(): Promise<ILocation | null> {
|
||||
const position = await this.getCurrentPosition()
|
||||
@@ -28,20 +28,11 @@ class MapService {
|
||||
return ''
|
||||
}
|
||||
const json: ILocationQuery = await result.json()
|
||||
if (
|
||||
!json ||
|
||||
!json.resourceSets ||
|
||||
!json.resourceSets.length ||
|
||||
!json.resourceSets[0].resources.length
|
||||
) {
|
||||
return ''
|
||||
}
|
||||
const address = json.resourceSets[0].resources[0].address
|
||||
return address ? address.locality : ''
|
||||
return json?.features?.[0]?.text ?? ''
|
||||
}
|
||||
|
||||
private url(latitude: number, longitude: number) {
|
||||
return `https://dev.virtualearth.net/REST/v1/Locations/${latitude},${longitude}?key=${this.key}`
|
||||
return `https://api.mapbox.com/geocoding/v5/mapbox.places/${longitude},${latitude}.json?types=place&limit=1&access_token=${this.token}`
|
||||
}
|
||||
|
||||
private getCurrentPosition(): Promise<GeolocationPosition | null> {
|
||||
|
||||
Reference in New Issue
Block a user