This commit is contained in:
a-ill
2023-07-13 14:32:49 +03:00
parent 9f5ec9e26a
commit 8a176b7c1b
58 changed files with 1756 additions and 317 deletions

View File

@@ -4,16 +4,17 @@
// Import statements
import { onMount } from 'svelte'
import { writable } from 'svelte/store';
import { communes, addMarkersCommunes } from '/js/communes.js'
import { communesByCountry, addMarkersCommunes } from '/js/communes.js'
import { loadLocaleContent } from "/js/libraries/serverTools.js"
// Import components
import "/js/components/map-component.js"
// Main code
let loaded
let loaded = writable(0)
let content = writable({})
loadLocaleContent(content,"countries",loaded)
let locale = loadLocaleContent(content,"communes-component",loaded)
function mapCallbackCommunes(createMap,content) {
@@ -26,8 +27,8 @@
})
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==2}
<div id="container">
<!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
<div id="text-container">
@@ -36,15 +37,19 @@
<p>{$content.p1}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackCommunes(createMap,$content,locale)}></map-component>
{#each communes as commune}
<div class="location-info">
<p><b>{$content.location}: </b>{$content[commune.location[0]]}</p>
<p><b>{$content.status}: </b>{$content[commune.status]}</p>
<p><b>{$content.members}: </b>{commune.members}</p>
<p><b>{$content.contact}: </b><a href={commune.contact[0]} target=;_blank; rel=noreferrer>{$content[commune.contact[1]]}</a></p>
{#each Object.entries(communesByCountry) as [name,communes]}
<h4 class="country-name">{$content[name]}</h4>
<div class="country-block">
{#each communes as commune}
<div class="location-info">
<p><b>{$content.location}: </b>{$content[commune.location[0][0]] + (commune.location[0][1]=="" ? "" : ", " + $content[commune.location[0][1]])}</p>
<p><b>{$content.status}: </b>{$content[commune.status]}</p>
<p><b>{$content.members}: </b>{commune.members}</p>
<p><b>{$content.contact}: </b><a href={commune.contact[0]} target=;_blank; rel=noreferrer>{$content[commune.contact[1]]}</a></p>
</div>
{/each}
</div>
{/each}
</div>
</div>
{/if}
@@ -66,10 +71,15 @@
margin-top: 8rem;
}
h4 {
.country-name {
margin-bottom: 0.5rem;
}
.country-block {
margin-bottom: 2rem;
}
.location-info {
position: relative;
margin-bottom: 2rem;

View File

@@ -10,8 +10,9 @@
// Import components
// Main code
let loaded
let loaded = writable(0)
let content = writable({})
loadLocaleContent(content,"countries",loaded)
let locale = loadLocaleContent(content,"compass-component",loaded,contentCallback)
let qTag = 0
@@ -52,8 +53,8 @@
/**/
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==2}
<div id="container">
<div id="text-container">
<h1>{$content.heading}</h1>

View File

@@ -4,16 +4,17 @@
// Import statements
import { onMount } from 'svelte'
import { writable } from 'svelte/store';
import { coops, addMarkersCoops } from '/js/coops.js'
import { coopsByCountry, addMarkersCoops } from '/js/coops.js'
import { loadLocaleContent } from "/js/libraries/serverTools.js"
// Import components
import "/js/components/map-component.js"
// Main code
let loaded
let loaded = writable(0)
let content = writable({})
loadLocaleContent(content,"countries",loaded)
let locale = loadLocaleContent(content,"cooperatives-component",loaded)
function mapCallbackCoops(createMap,content) {
@@ -26,35 +27,39 @@
})
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==2}
<div id="container">
<div id="text-container">
<h1>{$content.heading}</h1>
<img id="coops-img" src="/img/common/coops.svg" alt="coops">
<p>{$content.p1}</p>
<p>{$content.p2}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackCoops(createMap,$content,locale)}></map-component>
{#each coops as coop}
<div class="location-info">
<div class="img-general-info">
<div>
<p><b>{$content.name}: </b>{coop.name}</p>
<p><b>{$content.location}: </b>{$content[coop.location[0]]}</p>
<p><b>{$content.market}: </b>{$content[coop.market]}</p>
<p><b>{$content.workers}: </b>{coop.workers}</p>
<p><b>{$content.status}: </b>{$content[coop.status]}</p>
<p><b>{$content.website}: </b><a href={"https://www."+coop.website} target="_blank" rel=noreferrer>{coop.website}</a></p>
<p><b>{$content.contact}: </b><a href={coop.contact[0]} target=;_blank; rel=noreferrer>{$content[coop.contact[1]]}</a></p>
{#each Object.entries(coopsByCountry) as [name,coops]}
<h4 class="country-name">{$content[name]}</h4>
<div class="country-block">
{#each coops as coop}
<div class="location-info">
<div class="img-general-info">
<div>
<p><b>{$content.name}: </b>{coop.name}</p>
<p><b>{$content.location}: </b>{$content[coop.location[0][0]] + (coop.location[0][1]=="" ? "" : ", " + $content[coop.location[0][1]])}</p>
<p><b>{$content.market}: </b>{$content[coop.market]}</p>
<p><b>{$content.workers}: </b>{coop.workers}</p>
<p><b>{$content.status}: </b>{$content[coop.status]}</p>
<p><b>{$content.website}: </b><a href={"https://www."+coop.website} target="_blank" rel=noreferrer>{coop.website}</a></p>
<p><b>{$content.contact}: </b><a href={coop.contact[0]} target=;_blank; rel=noreferrer>{$content[coop.contact[1]]}</a></p>
</div>
<picture>
<source srcset={"/img/coops/"+coop.logo+".webp"}>
<source srcset={"/img/coops/"+coop.logo+".png"}>
<img class="coop-logo" alt="logo">
</picture>
</div>
<p><b>{$content.description}: </b>{$content[coop.description]}</p>
</div>
<picture>
<source srcset={"/img/coops/"+coop.logo+".webp"}>
<source srcset={"/img/coops/"+coop.logo+".png"}>
<img class="coop-logo" alt="logo">
</picture>
</div>
<p><b>{$content.description}: </b>{$content[coop.description]}</p>
{/each}
</div>
{/each}
</div>
@@ -98,13 +103,17 @@
max-width: 100%;
}
h4 {
.country-name {
margin-bottom: 1rem;
}
.country-block {
margin-bottom: 2rem;
}
.location-info {
position: relative;
margin-bottom: 2rem;
margin-bottom: 1rem;
}
.location-info p {

View File

@@ -9,15 +9,16 @@
// Import components
// Main code
let loaded
let loaded = writable(0)
let content = writable({})
let locale = loadLocaleContent(content,"footer-component",loaded)
loadLocaleContent(content,"countries",loaded)
loadLocaleContent(content,"footer-component",loaded)
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==2}
<footer>
<div id="footer-content-container">
<div id="footer-grid-content-container" class="logged">

View File

@@ -4,17 +4,18 @@
// Import statements
import { onMount } from 'svelte'
import { writable } from 'svelte/store';
import { groups, addMarkersGroups } from '/js/groups.js'
import { groupsByCountry, addMarkersGroups } from '/js/groups.js'
import { loadLocaleContent} from "/js/libraries/serverTools.js"
// Import components
import "/js/components/map-component.js"
// Main code
let loaded
let loaded = writable(0)
let content = writable({})
let locale = loadLocaleContent(content,"groups-component",loaded)
loadLocaleContent(content,"groups-component",loaded)
loadLocaleContent(content,"countries",loaded)
function mapCallbackGroups(createMap,content) {
let map = createMap([22, 0],2)
@@ -22,26 +23,30 @@
}
onMount(() => {
// {console.log(loaded)}
})
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==2}
<div id="container">
<!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
<div id="text-container">
<h1>{$content.heading}</h1>
<img id="groups-img" src="/img/common/groups.svg" alt="groups">
<p>{$content.p1}</p>
<p>{$content.p2}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackGroups(createMap,$content,locale)}></map-component>
{#each groups as group}
<div class="location-info">
<p><b>{$content.location}: </b>{$content[group.location[0]]}</p>
<p><b>{$content.members}: </b>{group.members}</p>
<p><b>{$content.contact}: </b><a href={group.contact[0]} target=;_blank; rel=noreferrer>{$content[group.contact[1]]}</a></p>
<map-component id="map" callback={(createMap) => mapCallbackGroups(createMap,$content)}></map-component>
{#each Object.entries(groupsByCountry) as [name,groups]}
<h4 class="country-name">{$content[name]}</h4>
<div class="country-block">
{#each groups as group}
<div class="location-info">
<p><b>{$content.location}: </b>{$content[group.location[0][0]] + (group.location[0][1]=="" ? "" : ", " + $content[group.location[0][1]])}</p>
<p><b>{$content.members}: </b>{group.members}</p>
<p><b>{$content.contact}: </b><a href={group.contact[0]} target=;_blank; rel=noreferrer>{$content[group.contact[1]]}</a></p>
</div>
{/each}
</div>
{/each}
</div>
@@ -65,12 +70,16 @@
margin-top: 8rem;
}
h4 {
.country-name {
margin-bottom: 0.5rem;
}
.country-block {
margin-bottom: 2rem;
}
.location-info {
margin-bottom: 2rem;
margin-bottom: 0.75rem;
}
.location-info p {

View File

@@ -14,27 +14,22 @@
import "/js/components/map-component.js"
// Main code
let loaded
let loaded = writable(0)
let content = writable({})
let contentGroups = writable({})
let contentCommunities = writable({})
let contentCoops = writable({})
let contentParties = writable({})
loadLocaleContent(contentGroups,"groups-component")
loadLocaleContent(contentCommunities,"communities-component")
loadLocaleContent(contentCoops,"cooperatives-component")
loadLocaleContent(contentParties,"parties-component")
loadLocaleContent(content,"groups-component",loaded)
loadLocaleContent(content,"communities-component",loaded)
loadLocaleContent(content,"cooperatives-component",loaded)
loadLocaleContent(content,"parties-component",loaded)
loadLocaleContent(content,"countries",loaded)
let locale = loadLocaleContent(content,"join-us-component",loaded)
function mapCallback(createMap,content) {
let map = createMap([22, 0],2)
addMarkersGroups(map,$contentGroups)
addMarkersCommunities(map,$contentCommunities)
addMarkersCoops(map,$contentCoops)
addMarkersParties(map,$contentParties)
addMarkersGroups(map,content)
addMarkersCommunities(map,content)
addMarkersCoops(map,content)
addMarkersParties(map,content)
}
onMount(() => {
@@ -42,8 +37,8 @@
})
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==6}
<div id="container">
<div id="text-container">
<h1>{$content.heading}</h1>

View File

@@ -12,7 +12,7 @@
// Main code
let grid
let gridWidth
let loaded
let loaded = writable(0)
let content = writable({})
function changeWidth(locale) {
@@ -24,6 +24,7 @@
}
}
loadLocaleContent(content,"countries",loaded)
let locale = loadLocaleContent(content,"landing-component",loaded,changeWidth)
changeWidth(locale)
@@ -32,8 +33,8 @@
})
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==2}
<div id="container">
<picture>
<source srcset="/img/crowd.webp">
@@ -121,6 +122,7 @@
grid-template-columns: var(--grid-width);
grid-template-rows: var(--grid-width);
grid-gap: 4rem;
row-gap: 3rem;
margin-top: 2rem;
}

View File

@@ -26,12 +26,12 @@
let root
let main
let loaded
let loaded = writable(0)
let content = writable({})
loadLocaleContent(content,"countries",loaded)
let locale = loadLocaleContent(content,"manifesto-component",loaded)
const htmlDelims = ["ul","ol"]
getData("/locales/"+ locale + "/manifesto.txt",function(response) {
let splitText = response.split(/\r?\n/)
@@ -164,8 +164,8 @@
})
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==2}
<div id="container" bind:this={root}>
<div id="text-container">
{#key key}

View File

@@ -11,7 +11,7 @@
let hambInput
let navbar
let localesDropdown
let loaded
let loaded = writable(0)
let content = writable({})
let locale = loadLocaleContent(content,"navbar-component",loaded)

View File

@@ -4,17 +4,18 @@
// Import statements
import { onMount } from 'svelte'
import { writable } from 'svelte/store';
import { parties, addMarkersParties } from '/js/parties.js'
import { partiesByCountry, addMarkersParties } from '/js/parties.js'
import { loadLocaleContent } from "/js/libraries/serverTools.js"
// Import components
import "/js/components/map-component.js"
// Main code
let loaded
let loaded = writable(0)
let content = writable({})
let locale = loadLocaleContent(content,"parties-component",loaded)
loadLocaleContent(content,"countries",loaded)
loadLocaleContent(content,"parties-component",loaded)
function mapCallbackParties(createMap,content) {
let map = createMap([22, 0],2)
@@ -26,8 +27,8 @@
})
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==2}
<div id="container">
<!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
<div id="text-container">
@@ -36,21 +37,26 @@
<p>{$content.p1}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackParties(createMap,$content)}></map-component>
{#each parties as party}
<div class="location-info">
<div class="img-general-info">
<picture>
<source srcset={"/img/parties/"+party.logo+".webp"}>
<source srcset={"/img/parties/"+party.logo+".jpg"}>
<img class="party-logo" alt="logo">
</picture>
<div>
<p><b>{$content.name}: </b>{party.name}</p>
<p><b>{$content.location}: </b>{$content[party.location[0]]}</p>
<p><b>{$content.link}: </b><a href={party.link} target=;_blank; rel=noreferrer>{party.link}</a></p>
{#each Object.entries(partiesByCountry) as [name,parties]}
<h4 class="country-name">{name}</h4>
<div class="country-block">
{#each parties as party}
<div class="location-info">
<div class="img-general-info">
<picture>
<source srcset={"/img/parties/"+party.logo+".webp"}>
<source srcset={"/img/parties/"+party.logo+".jpg"}>
<img class="party-logo" alt="logo">
</picture>
<div>
<p><b>{$content.name}: </b>{party.name}</p>
<p><b>{$content.location}: </b>{$content[party.location[0]]}</p>
<p><b>{$content.link}: </b><a href={party.link} target=;_blank; rel=noreferrer>{party.link}</a></p>
</div>
</div>
<p><b>{$content.description}: </b>{$content[party.description]}</p>
</div>
<p><b>{$content.description}: </b>{$content[party.description]}</p>
{/each}
</div>
{/each}
</div>
@@ -78,9 +84,17 @@
margin-bottom: 2rem;
}
.country-name {
margin-bottom: 1rem;
}
.country-block {
margin-bottom: 2rem;
}
.location-info {
position: relative;
margin-bottom: 2rem;
margin-bottom: 1rem;
}
.location-info p {
@@ -93,7 +107,7 @@
width: 100%;
gap: 1.5rem;
align-items: center;
margin-bottom: 1rem;
margin-bottom: 0.75rem;
}
.img-general-info>:nth-child(2) {
@@ -103,7 +117,7 @@
.party-logo {
position: relative;
right: 0;
max-height: 6rem;
max-height: 5.5rem;
max-width: 100%;
border-radius: 1rem;
}

View File

@@ -5,24 +5,25 @@
import { onMount } from 'svelte'
import { writable } from 'svelte/store';
import { loadLocaleContent } from "/js/libraries/serverTools.js"
import { partners } from '/js/partners.js'
import { partnersByCountry } from '/js/partners.js'
// Import components
import "/js/components/map-component.js"
// Main code
let loaded
let loaded = writable(0)
let content = writable({})
let locale = loadLocaleContent(content,"partners-component",loaded)
loadLocaleContent(content,"countries",loaded)
loadLocaleContent(content,"partners-component",loaded)
onMount(() => {
})
</script>
{#key loaded}
{#if Object.keys($content).length!=0}
{#key $loaded}
{#if $loaded==2}
<div id="container">
<!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
<div id="text-container">
@@ -30,22 +31,27 @@
<img id="hands-img" src="/img/common/handshake.svg" alt="hands">
<p>{$content.p1}</p>
<h3>{$content.subheading1}</h3>
<h4>{$content.subheading2}</h4>
{#each partners as partner}
<div class="location-info">
<div class="img-general-info">
<picture>
<source srcset={"/img/partners/"+partner.logo+".webp"}>
<source srcset={"/img/partners/"+partner.logo+".jpg"}>
<img class="partner-logo" alt="logo">
</picture>
<div>
<p><b>{$content.name}: </b>{partner.name}</p>
<p><b>{$content.type}: </b>{$content[partner.type]}</p>
<p><b>{$content.link}: </b><a href={partner.link} target=;_blank; rel=noreferrer>{partner.link}</a></p>
{#each Object.entries(partnersByCountry) as [name,partners]}
<h4 class="country-name">{$content[name]}</h4>
<div class="country-block">
{#each partners as partner}
<div class="location-info">
<div class="img-general-info">
<picture>
<source srcset={"/img/partners/"+partner.logo+".webp"}>
<source srcset={"/img/partners/"+partner.logo+".jpg"}>
<img class="partner-logo" alt="logo">
</picture>
<div>
<p><b>{$content.name}: </b>{partner.name}</p>
<p><b>{$content.type}: </b>{$content[partner.type]}</p>
<p><b>{$content.location}: </b>{$content[partner.location[0][0]] + (partner.location[0][1]=="" ? "" : ", " + $content[partner.location[0][1]])}</p>
<p><b>{$content.link}: </b><a href={partner.link} target=;_blank; rel=noreferrer>{partner.link}</a></p>
</div>
</div>
<p><b>{$content.description}: </b>{$content[partner.description]}</p>
</div>
<p><b>{$content.description}: </b>{$content[partner.description]}</p>
{/each}
</div>
{/each}
</div>
@@ -76,7 +82,7 @@
width: 100%;
gap: 1.5rem;
align-items: center;
margin-bottom: 1rem;
margin-bottom: 0.5rem;
}
.img-general-info>:nth-child(2) {
@@ -86,7 +92,7 @@
.partner-logo {
position: relative;
right: 0;
max-height: 6rem;
max-height: 6.5rem;
max-width: 100%;
border-radius: 1rem;
}
@@ -95,9 +101,17 @@
margin-bottom: 2rem;
}
.country-name {
margin-bottom: 0.5rem;
}
.country-block {
margin-bottom: 2rem;
}
.location-info {
position: relative;
margin-bottom: 2rem;
margin-bottom: 0.5rem;
}
.location-info p {