Merge pull request #12 from lewis-wow/pr/forms-fix

Pr/forms fix

src/lib/Components/Forms/NumberForm.svelte

@@ -4,7 +4,7 @@
 	import parseQuestion from '$lib/utils/parseQuestion'
 
 	export let gameData
-	let answers = parseQuestion(gameData.question.answer, gameData.question.type)
+	let answer = parseQuestion(gameData.question.answer, gameData.question.type)
 	let myAnswer = ''
 
 	export let nextQuestion
@@ -18,7 +18,7 @@
 		myAnswer = ''
 	}}
 	{control}
-	on:submit={() => (control = myAnswer !== '' ? myAnswer === answers.answer : null)}
+	on:submit={() => (control = myAnswer !== '' ? myAnswer == answer : null)}
 >
 	<span slot="title">{gameData.name}</span>
 	<span slot="about">{@html gameData.question.question}</span>

src/lib/Components/Forms/Renderer.svelte

@@ -38,14 +38,13 @@
 	export let gameData = {} //data
 
 	$: answers = parseQuestion(gameData.questions[clientAnswers.pos].answer, gameData.questions[clientAnswers.pos].type) //delete
-
+	let page
+	$: page = components[gameData.questions[clientAnswers.pos].type]
 	let clientAnswers = {
 		pos: 0,
 		end: gameData.questions.length, //kolik otázek
 		points: 0, //body
 	}
-	let page
-	$: page = components[gameData.questions[clientAnswers.pos].type]
 
 	/*jen pro tedkon, pozdeji vymazat az bude singlechoise a multichoise oddelene*/
 	$: page = gameData.questions[clientAnswers.pos].type === 'CHOICE' ? components[vals()] : page

src/lib/Components/Forms/SingleChoiceForm.svelte

@@ -10,10 +10,11 @@
 	export let control = null
 	export let nextQuestion
 
-	const rightAnswer = () =>
+	const rightAnswer = () => {
-		answers.map((item) => {
+		return answers.filter((item) => {
 			if (item.value) return item.label
-		})
+		})[0].label
+	}
 </script>
 
 <Layout

src/lib/Components/Forms/TextForm.svelte

@@ -4,7 +4,7 @@
 	import parseQuestion from '$lib/utils/parseQuestion'
 
 	export let gameData
-	let answers = parseQuestion(gameData.question.answer, gameData.question.type)
+	let answer = parseQuestion(gameData.question.answer, gameData.question.type)
 	let myAnswer = ''
 
 	export let control = null
@@ -22,7 +22,7 @@
 		nextQuestion()
 		myAnswer = ''
 	}}
-	on:submit={() => (control = myAnswer !== '' ? compare(myAnswer, answers.answer) : null)}
+	on:submit={() => (control = myAnswer !== '' ? compare(myAnswer, answer) : null)}
 >
 	<span slot="title">{gameData.name}</span>
 	<span slot="about">{@html gameData.question.question}</span>

src/lib/Components/game/Map/Circle.svelte

@@ -2,14 +2,16 @@
 	import { Marker } from '@beyonk/svelte-mapbox'
 	import { createEventDispatcher, getContext } from 'svelte'
 
-	export let lat, lng
+	export let lat = null
-	export let width = 0.004
+	export let lng = null
+	export let round = (1 / 110.574 / 1000) * 12 //cca 12m nutno pozměnit!!!!!!!!!! tento komentář nemazat
+	console.log({ round, lat, lng })
 	export let user = { lat: 0, lng: 0 }
 
 	const dispatch = createEventDispatcher()
 
-	let Mlat = [lat - width, lat + width]
+	const Mlat = [lat - round, lat + round]
-	let Mlng = [lng - width, lng + width]
+	const Mlng = [lng - round, lng + round]
 
 	$: isIn = user ? user.lat > Mlat[0] && user.lat < Mlat[1] && user.lng > Mlng[0] && user.lng < Mlng[1] : null