-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: use new IPAddress component (#49)
* feat: use new IPAddress component * chore: export * chore: ts
- Loading branch information
Showing
20 changed files
with
272 additions
and
222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import Extend from 'flarum/common/extenders'; | ||
|
|
||
| import { default as commonExtend } from '../common/extend'; | ||
|
|
||
| export default [...commonExtend]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import Extend from 'flarum/common/extenders'; | ||
|
|
||
| export default []; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,31 @@ | ||
| import app from 'flarum/forum/app'; | ||
| import Component from 'flarum/common/Component'; | ||
| import Component, { ComponentAttrs } from 'flarum/common/Component'; | ||
| import LoadingIndicator from 'flarum/common/components/LoadingIndicator'; | ||
| // @ts-expect-error | ||
| import load from 'external-load'; | ||
| import type Mithril from 'mithril'; | ||
| import IPInfo from '../models/IPInfo'; | ||
|
|
||
| let addedResources = false; | ||
| const addResources = async () => { | ||
| if (addedResources) return; | ||
| const leafletCDN = 'https://unpkg.com/[email protected]/dist/'; | ||
|
|
||
| await load.css('https://unpkg.com/[email protected]/dist/leaflet.css'); | ||
| await load.js('https://unpkg.com/[email protected]/dist/leaflet.js'); | ||
| export interface ZipCodeMapAttrs extends ComponentAttrs { | ||
| ipInfo: IPInfo; | ||
| } | ||
|
|
||
| addedResources = true; | ||
| }; | ||
| export default class ZipCodeMap extends Component<ZipCodeMapAttrs> { | ||
| ipInfo!: IPInfo; | ||
| loading = false; | ||
| map: any; | ||
| data: any; | ||
| addedResources = false; | ||
|
|
||
| export default class ZipCodeMap extends Component { | ||
| oninit(vnode) { | ||
| oninit(vnode: Mithril.Vnode<ZipCodeMapAttrs, this>) { | ||
| super.oninit(vnode); | ||
|
|
||
| this.ipInfo = this.attrs.ipInfo; | ||
|
|
||
| this.addResources(); | ||
|
|
||
| this.data = null; | ||
|
|
||
| if (this.ipInfo.latitude() && this.ipInfo.longitude()) { | ||
|
|
@@ -30,6 +37,15 @@ export default class ZipCodeMap extends Component { | |
| } | ||
| } | ||
|
|
||
| async addResources() { | ||
| if (this.addedResources) return; | ||
|
|
||
| await load.css(leafletCDN + 'leaflet.css'); | ||
| await load.js(leafletCDN + 'leaflet.js'); | ||
|
|
||
| this.addedResources = true; | ||
| } | ||
|
|
||
| view() { | ||
| if (this.loading) { | ||
| return <LoadingIndicator size="medium" />; | ||
|
|
@@ -42,58 +58,50 @@ export default class ZipCodeMap extends Component { | |
| return <div id="geoip-map" oncreate={this.configMap.bind(this)} />; | ||
| } | ||
|
|
||
| searchLatLon() { | ||
| async searchLatLon() { | ||
| if (this.loading) return; | ||
|
|
||
| this.loading = true; | ||
|
|
||
| return addResources().then( | ||
| app | ||
| .request({ | ||
| url: `https://nominatim.openstreetmap.org/reverse`, | ||
| method: 'GET', | ||
| params: { | ||
| lat: this.ipInfo.latitude(), | ||
| lon: this.ipInfo.longitude(), | ||
| format: 'json', | ||
| }, | ||
| }) | ||
| .then((data) => { | ||
| this.data = data; | ||
| this.loading = false; | ||
|
|
||
| m.redraw(); | ||
| }) | ||
| ); | ||
| const data = await app.request<any>({ | ||
| url: `https://nominatim.openstreetmap.org/reverse`, | ||
| method: 'GET', | ||
| params: { | ||
| lat: this.ipInfo.latitude(), | ||
| lon: this.ipInfo.longitude(), | ||
| format: 'json', | ||
| }, | ||
| }); | ||
|
|
||
| this.data = data; | ||
| this.loading = false; | ||
|
|
||
| m.redraw(); | ||
| } | ||
|
|
||
| searchZip() { | ||
| async searchZip() { | ||
| if (this.loading) return; | ||
|
|
||
| this.loading = true; | ||
|
|
||
| return addResources().then( | ||
| app | ||
| .request({ | ||
| url: `https://nominatim.openstreetmap.org/search`, | ||
| method: 'GET', | ||
| params: { | ||
| q: this.ipInfo.zipCode(), | ||
| countrycodes: this.ipInfo.countryCode(), | ||
| limit: 1, | ||
| format: 'json', | ||
| }, | ||
| }) | ||
| .then((data) => { | ||
| this.data = data[0]; | ||
| this.loading = false; | ||
|
|
||
| m.redraw(); | ||
| }) | ||
| ); | ||
| const data = await app.request<any>({ | ||
| url: `https://nominatim.openstreetmap.org/search`, | ||
| method: 'GET', | ||
| params: { | ||
| q: this.ipInfo.zipCode(), | ||
| countrycodes: this.ipInfo.countryCode(), | ||
| limit: 1, | ||
| format: 'json', | ||
| }, | ||
| }); | ||
|
|
||
| this.data = data[0]; | ||
| this.loading = false; | ||
|
|
||
| m.redraw(); | ||
| } | ||
|
|
||
| configMap(vnode) { | ||
| configMap(vnode: Mithril.VnodeDOM) { | ||
| if (!this.data) return; | ||
|
|
||
| const { boundingbox: bounding, display_name: displayName } = this.data; | ||
|
|
@@ -110,13 +118,16 @@ export default class ZipCodeMap extends Component { | |
|
|
||
| const zoomLevel = 5; // Set your preferred zoom level here | ||
|
|
||
| // @ts-expect-error | ||
| this.map = L.map(vnode.dom).setView([centerLat, centerLon], zoomLevel); | ||
|
|
||
| // @ts-expect-error | ||
| L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', { | ||
| attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors', | ||
| }).addTo(this.map); | ||
|
|
||
| // Set a marker at the center of the bounding box | ||
| // @ts-expect-error | ||
| L.marker([centerLat, centerLon]).addTo(this.map).bindPopup(displayName).openPopup(); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| import MapModal from './MapModal'; | ||
| import ZipCodeMap from './ZipCodeMap'; | ||
|
|
||
| export const components = { | ||
| MapModal, | ||
| ZipCodeMap, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.