This commit is contained in:
a-ill
2023-07-10 17:16:02 +03:00
parent b1b9f6bc10
commit 0f74610ae1
16 changed files with 41 additions and 22 deletions

View File

@@ -1,7 +1,7 @@
export let communities = [
{
location: ["CanadaMontreal",[44.654781585774785, -63.61076905562609]],
location: ["CanadaMontreal",[45.55541047232767, -73.42859611607271]],
status: "forming",
members: 2,
contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"]

View File

@@ -1,4 +1,9 @@
export let groups = [
{
location: ["CanadaHalifax",[44.65166135030067, -63.59289968306866]],
members: 2,
contact: ["https://discord.gg/xAPZmyr8B6","DiscordInviteLink"]
},
{
location: ["DenmarkCopenhagen",[55.6840661150132, 12.557133959514688]],
members: 1,

View File

@@ -7,11 +7,12 @@
"location": "Location",
"members": "Members",
"contact": "Contact",
"DiscordInviteLink": "Discord invite link",
"WhatsAppInviteLink": "WhatsApp invite link",
"DenmarkCopenhagen": "Denmark, Copenhagen",
"DenmarkKolding": "Denmark, Kolding",
"EstoniaKohtlaJarve": "Estonia, Kohtla-Järve",
"GreeceAthens": "Greece, Athens",
"LatviaRiga": "Latvia, Riga",
"DiscordInviteLink": "Discord invite link",
"WhatsAppInviteLink": "WhatsApp invite link"
"CanadaHalifax": "Canada, Halifax"
}

View File

@@ -7,11 +7,12 @@
"location": "Локация",
"members": "Участники",
"contact": "Контакт",
"DiscordInviteLink": "Discord ссылка",
"WhatsAppInviteLink": "WhatsApp ссылка",
"DenmarkCopenhagen": "Дания, Копенгаген",
"DenmarkKolding": "Дания, Колдинг",
"EstoniaKohtlaJarve": "Эстония, Кохтла-Ярве",
"GreeceAthens": "Греция, Афины",
"LatviaRiga": "Латвия, Рига",
"DiscordInviteLink": "Discord ссылка",
"WhatsAppInviteLink": "WhatsApp ссылка"
"CanadaHalifax": "Канада, Галифакс"
}

View File

@@ -36,7 +36,6 @@
<p>{$content.p1}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackCommunities(createMap,$content,locale)}></map-component>
<h4>{$content.subheading2}</h4>
{#each communities as community}
<div class="location-info">
<p><b>{$content.location}: </b>{$content[community.location[0]]}</p>

View File

@@ -36,7 +36,6 @@
<p>{$content.p2}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackCoops(createMap,$content,locale)}></map-component>
<h4>{$content.subheading2}</h4>
{#each coops as coop}
<div class="location-info">
<div class="img-general-info">

View File

@@ -37,7 +37,6 @@
<p>{$content.p2}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackGroups(createMap,$content,locale)}></map-component>
<h4>{$content.subheading2}</h4>
{#each groups as group}
<div class="location-info">
<p><b>{$content.location}: </b>{$content[group.location[0]]}</p>

View File

@@ -16,13 +16,21 @@
let loaded
let content = writable({})
let contentGroups = writable({})
let contentCommunities = writable({})
let contentCoops = writable({})
loadLocaleContent(contentGroups,"groups-component")
loadLocaleContent(contentCommunities,"communities-component")
loadLocaleContent(contentCoops,"cooperatives-component")
let locale = loadLocaleContent(content,"join-us-component",loaded)
function mapCallback(createMap,content,locale) {
function mapCallback(createMap,content) {
let map = createMap([51.505, -0.09],3)
addMarkersGroups(map,content,locale)
addMarkersCoops(map,content,locale)
addMarkersCommunities(map,content,locale)
addMarkersGroups(map,$contentGroups)
addMarkersCommunities(map,$contentCommunities)
addMarkersCoops(map,$contentCoops)
}
onMount(() => {
@@ -61,7 +69,7 @@
<p>{$content.nearYou}</p>
</div>
<p>{$content.noneNear} <a href="https://chat.whatsapp.com/BhnmUNljUxJ2AjeHUwyTKh" target="_blank" rel=noreferrer>{$content.WhatsAppGroup}</a> {$content.or} <a href="https://discord.gg/xAPZmyr8B6" target="_blank" rel=noreferrer>{$content.DiscordServer}</a>{$content.helpStart}</p>
<map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
<map-component id="map" callback={(createMap) => mapCallback(createMap,$content)}></map-component>
</div>
</div>
{/if}