Skip to content

Commit

Permalink
Merge pull request #61 from mostafaznv/dev
Browse files Browse the repository at this point in the history
feat: support nova 5
  • Loading branch information
mostafaznv authored Dec 20, 2024
2 parents fb2381a + f43659b commit 0028dd3
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"require": {
"php": "^8.1",
"illuminate/support": "^10.0|^11.0",
"laravel/nova": "^4.0",
"laravel/nova": "^4.0|^5.0",
"matanyadaev/laravel-eloquent-spatial": "^4.2"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion dist/field.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/field.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* Copyright 2015-2021 Esri. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @preserve */

/*!
* ol-contextmenu - v5.4.0
* ol-contextmenu - v5.5.0
* https://github.com/jonataswalker/ol-contextmenu
* Built: Fri Mar 08 2024 12:11:47 GMT+0000 (Coordinated Universal Time)
* Built: Wed Aug 07 2024 12:29:18 GMT+0000 (Coordinated Universal Time)
*/

/*!
Expand All @@ -20,10 +20,10 @@
*/

/*!
* ol-geocoder - v4.3.1
* A geocoder extension compatible with OpenLayers v6.x, v7.x & v8.x
* ol-geocoder - v4.3.3
* A geocoder extension compatible with OpenLayers v6.x to v9.0
* https://github.com/Dominique92/ol-geocoder
* Built: 15/09/2023 16:57:41
* Built: 15/03/2024 08:57:04
*/

/*!
Expand All @@ -47,7 +47,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
***************************************************************************** */

/*! @license DOMPurify 2.4.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.5/LICENSE */
/*! @license DOMPurify 2.4.7 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.7/LICENSE */

/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

Expand Down
2 changes: 1 addition & 1 deletion dist/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"/field.css": "/field.css?id=4407e68d56833eb40018d94d3aab447d",
"/field.js": "/field.js?id=ef01f0a9612a4e10a026783848bc5bb7",
"/field.js": "/field.js?id=85c64d10a38eaf193490d41f30aa6ae1",
"/vendor/nova-map-field/dist/images/ic-pin-1.png": "/vendor/nova-map-field/dist/images/ic-pin-1.png?id=400bb8273d9fe0a31d86e144ef534856",
"/vendor/nova-map-field/dist/images/ic-pin-2.png": "/vendor/nova-map-field/dist/images/ic-pin-2.png?id=e084fdbb00a78f7e6d53819e518e64ec",
"/vendor/nova-map-field/dist/images/ic-pin-3.png": "/vendor/nova-map-field/dist/images/ic-pin-3.png?id=19780e69e0b6125989e3209759e51997"
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"@vue/compiler-sfc": "^3.4.21",
"cross-env": "^7.0.3",
"laravel-mix": "^6.0.49",
"laravel-nova-ui": "^0.4.12",
"ol": "^9.0.0",
"ol-contextmenu": "^5.4.0",
"ol-ext": "^4.0.17",
Expand Down
9 changes: 7 additions & 2 deletions resources/js/components/other/LocationDetailModal.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<div>
<DefaultButton @click="showModal" dusk="open-preview-button">
<Button @click="showModal" variant="outline" dusk="open-preview-button">
{{ __('Show Details') }}
</DefaultButton>
</Button>

<Modal
@close-via-escape="closeModal"
Expand Down Expand Up @@ -30,8 +30,13 @@
</template>

<script>
import {Button} from 'laravel-nova-ui'
export default {
name: 'LocationDetailModal',
components: {
Button
},
data() {
return {
modal: false
Expand Down
6 changes: 3 additions & 3 deletions resources/js/components/other/MapExport.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
ref="map"
:field="currentField"
:exportable="true"
:key="key"
:key="'point-' + key"
/>

<polygon-form-field
v-else-if="currentField.mapType === 'POLYGON'"
ref="map"
:field="currentField"
:exportable="true"
:key="key"
:key="'polygon' + key"
/>

<multi-polygon-form-field
v-else-if="currentField.mapType === 'MULTI_POLYGON'"
ref="map"
:field="currentField"
:exportable="true"
:key="key"
:key="'multi-polygon' + key"
/>
</div>
</template>
Expand Down

0 comments on commit 0028dd3

Please sign in to comment.