Merge branch 'v4-dev' into v4-dev

Author: Tam

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 4.0.1 - 2022-05-18
+### Fixed
+- Fix Geo Location Token only allowing string (Fixes #343)
+
+## 4.0.0 - 2022-05-10
+### Fixed
+- Mostly functional, only slightly buggy, Craft 4 Support
+
 ## 3.9.3 - 2022-01-17
 ### Fixed
 - Fix Mapbox Forbidden issue (Fixes #218, via @Saboteur777)

resources/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "PORT=8080 vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },

resources/vue.config.js

@@ -5,6 +5,7 @@ module.exports = {
 		https: true,
 		headers: { "Access-Control-Allow-Origin": "*" },
 		disableHostCheck: true,
+		port: 8080,
 	},
 	configureWebpack: config => {
 		config.output.library = 'EtherMaps';

src/fields/Map.php

@@ -103,11 +103,11 @@ public static function getQueryInputDefinitions (): array
 
 	public static function getType (): Type
 	{
-		if ($type = GqlEntityRegistry::getEntity(static::class))
+		if ($type = GqlEntityRegistry::getEntity(static::getName()))
 			return $type;
 
 		return GqlEntityRegistry::createEntity(
-			static::class,
+			static::getName(),
 			new ObjectType([
 				'name' => static::getName(),
 				'fields' => static::class . '::getFieldDefinitions',

src/integrations/graphql/MapType.php

@@ -24,20 +24,20 @@ abstract class BaseLocation extends Model
 	// Properties
 	// =========================================================================
 
-	/** @var float */
-	public float $lat;
+	/** @var float|null */
+	public ?float $lat = null;
 
-	/** @var float */
-	public float $lng;
+	/** @var float|null */
+	public ?float $lng = null;
 
-	/** @var string */
-	public string $address;
+	/** @var string|null */
+	public ?string $address = null;
 
-	/** @var Parts */
-	public mixed $parts;
+	/** @var PartsLegacy|Parts|array|null */
+	public PartsLegacy|Parts|array|null $parts = null;
 
-	/** @var string */
-	public mixed $what3words;
+	/** @var string|null */
+	public ?string $what3words = null;
 
 	// Constructor
 	// =========================================================================

src/models/BaseLocation.php

@@ -27,22 +27,22 @@ class Map extends BaseLocation
 	// Properties
 	// =========================================================================
 
-	/** @var int */
-	public int $id;
+	/** @var int|null */
+	public ?int $id = null;
 
-	/** @var int */
-	public int $ownerId;
+	/** @var int|null */
+	public ?int $ownerId = null;
 
-	/** @var int */
-	public int $ownerSiteId;
+	/** @var int|null */
+	public ?int $ownerSiteId = null;
 
-	/** @var int */
-	public int $fieldId;
+	/** @var int|null */
+	public ?int $fieldId = null;
 
 	/** @var int */
 	public int $zoom = 15;
 
-	/** @var float|null */
+	/** @var int|float|null */
 	public int|null|float $distance = null;
 
 	// Constructor

src/models/Map.php

@@ -77,8 +77,8 @@ class Settings extends Model
 	/** @var string The geo-location service */
 	public string $geoLocationService = GeoLocationService::None;
 
-	/** @var string The token for the geo-location service */
-	public string $geoLocationToken = '';
+	/** @var string|array The token for the geo-location service */
+	public string|array $geoLocationToken = '';
 
 	/** @var string|int How long to cache IP look-ups for (set to 0 to disable caching) */
 	public string|int $geoLocationCacheDuration = 'P2M';

src/models/Settings.php

@@ -60,15 +60,17 @@
 	</header>
 
 	<section class="maps-map">
-		{% for key, label in mapTileOptions if key != '0' and key != '1' %}
-			{% set x1 = craft.app.assetManager.getPublishedUrl('@simplemapimages/' ~ (key|replace({'.':'-','/':'-'})) ~ '-1x.jpg', true) %}
-			{% set x2 = craft.app.assetManager.getPublishedUrl('@simplemapimages/' ~ (key|replace({'.':'-','/':'-'})) ~ '.jpg', true) %}
-			<image-fade-on-load
-				src="{{ x1 }}"
-				srcset="{{ x1 }} 1x, {{ x2 }} 2x"
-				alt="{{ label is iterable ? label.label : label }}"
-				:show="mapTiles === '{{ key }}'"
-			></image-fade-on-load>
+		{% for key, label in mapTileOptions %}
+			{% if key != '0' and key != '1' %}
+				{% set x1 = craft.app.assetManager.getPublishedUrl('@simplemapimages/' ~ (key|replace({'.':'-','/':'-'})) ~ '-1x.jpg', true) %}
+				{% set x2 = craft.app.assetManager.getPublishedUrl('@simplemapimages/' ~ (key|replace({'.':'-','/':'-'})) ~ '.jpg', true) %}
+				<image-fade-on-load
+					src="{{ x1 }}"
+					srcset="{{ x1 }} 1x, {{ x2 }} 2x"
+					alt="{{ label is iterable ? label.label : label }}"
+					:show="mapTiles === '{{ key }}'"
+				></image-fade-on-load>
+			{% endif %}
 		{% endfor %}
 
 		{% namespace 'settings' %}
@@ -593,12 +595,13 @@ hr {
 }
 
 .maps-header h1 {
+	display: flex;
+	align-items: center;
 	font-size: 0;
 	margin-bottom: 0;
 }
 .maps-header svg {
 	position: relative;
-	top: -3px;
 	width: 30px;
 	height: 30px;
 	vertical-align: bottom;
@@ -748,6 +751,7 @@ hr {
 }
 .maps-style select {
 	width: 100%;
+	height: 80px;
 	padding: 32px 40px 13px 20px;
 	font-size: 24px;