dokončené Finish, oprava chyb.... hotové
This commit is contained in:
commit
79fc7c87e5
|
@ -2613,22 +2613,24 @@
|
||||||
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
|
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
<<<<<<< HEAD
|
||||||
"xtend": {
|
"xtend": {
|
||||||
"version": "4.0.2",
|
"version": "4.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
|
||||||
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
|
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
=======
|
||||||
"yallist": {
|
"yallist": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
|
||||||
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
|
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
|
||||||
},
|
>>>>>>> master
|
||||||
"yaml": {
|
},
|
||||||
"version": "2.1.1",
|
"yaml": {
|
||||||
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
|
"version": "2.1.1",
|
||||||
"integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
|
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
|
||||||
"dev": true
|
"integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
|
||||||
|
"dev": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
|
|
||||||
<main>
|
<main>
|
||||||
<Router>
|
<Router>
|
||||||
<Route path="/game">
|
<Route path="/">
|
||||||
<Renderer {gameData} />
|
<Renderer />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path="*">
|
<Route path="/game/:gameurl" let:params>
|
||||||
<Game bind:gameData />
|
<Game gameurl={params.gameurl} />
|
||||||
</Route>
|
</Route>
|
||||||
</Router>
|
</Router>
|
||||||
</main>
|
</main>
|
||||||
|
|
|
@ -13,23 +13,14 @@
|
||||||
import parseQuestion from '$lib/utils/parseQuestion'
|
import parseQuestion from '$lib/utils/parseQuestion'
|
||||||
import yallist from 'yallist'
|
import yallist from 'yallist'
|
||||||
|
|
||||||
|
export let gameurl
|
||||||
|
|
||||||
let background = '/assets/temp/kar1.png'
|
let background = '/assets/temp/kar1.png'
|
||||||
let assets = Array.from(Array(6).keys()).map((_, i) => `/assets/temp/kar${i + 1}.png`)
|
let assets = Array.from(Array(6).keys()).map((_, i) => `/assets/temp/kar${i + 1}.png`)
|
||||||
let shareData = {
|
|
||||||
title: 'Geohry',
|
|
||||||
text: 'Naše geohry',
|
|
||||||
url: location.origin,
|
|
||||||
}
|
|
||||||
|
|
||||||
export let gameData = {}
|
|
||||||
|
|
||||||
const readUrlHash = () => {
|
|
||||||
return location.pathname.slice(6, location.pathname.length)
|
|
||||||
}
|
|
||||||
|
|
||||||
;(async () => {
|
;(async () => {
|
||||||
gameData = await api.post(`${api.hostName}/game/details`, {
|
const gameData = await api.post(`${api.hostName}/game/details`, {
|
||||||
gameurl: 'pisek-mesto-kralovske', //readUrlHash(),
|
gameurl: gameurl,
|
||||||
})
|
})
|
||||||
|
|
||||||
const questions = yallist(gameData.questions)
|
const questions = yallist(gameData.questions)
|
||||||
|
|
Loading…
Reference in New Issue