libsoc/site-libsoc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
a-ill
2023-07-16 16:56:28 +03:00
parent f1defcd241
commit a768fedc52
22 changed files with 104 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Server/app/svelte/public/js/communes.js
View File

@@ -7,7 +7,7 @@ export let communes = [
contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
},
{
location: [["Denmark",""],[55.915625218626275, 9.673445220831253]],
location: [["Denmark"],[55.915625218626275, 9.673445220831253]],
status: "forming",
members: 1,
contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
@@ -19,7 +19,7 @@ export let communes = [
contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
},
{
location: [["Latvia",""],[56.934159375258055, 25.269099001330265]],
location: [["Latvia"],[56.934159375258055, 25.269099001330265]],
status: "forming",
members: 1,
contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
@@ -50,8 +50,8 @@ export function addMarkersCommunes(map,content) {
}
else if (field=="location") {
let location = g[field][0]
let town = location[1]=="" ? "" : ", " + content[location[1]]
text += fieldText + content[location[0]] + town + "<br>"
let locationString = location.map(x => content[x]).join(", ")
text += fieldText + locationString + "<br>"
coordinates = g[field][1]
}
else if (field=="status") {

4
Server/app/svelte/public/js/coops.js
View File

@@ -56,8 +56,8 @@ export function addMarkersCoops(map,content) {
}
else if (field=="location") {
let location = g[field][0]
let town = location[1]=="" ? "" : ", " + content[location[1]]
text += fieldText + content[location[0]] + town + "<br>"
let locationString = location.map(x => content[x]).join(", ")
text += fieldText + locationString + "<br>"
coordinates = g[field][1]
}
else if (field=="market" || field=="status" || field=="description") {

13
Server/app/svelte/public/js/groups.js
View File

@@ -30,7 +30,7 @@ export let groups = [
contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
},
{
location: [["Ireland",""], [53.280192832733576, -7.688103518964818]],
location: [["Ireland"], [53.280192832733576, -7.688103518964818]],
members: 6,
contact: ["https://discord.gg/4BUau4AZre","DiscordInviteLink"]
},
@@ -39,6 +39,11 @@ export let groups = [
members: 2,
contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
},
{
location: [["USA","Florida"], [26.945024427155868, -81.22162645059898]],
members: 2,
contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
}
]
export let groupsByCountry = {}
@@ -68,8 +73,8 @@ function addMarkersToLayer(g,layer,content) {
}
else if (field=="location") {
let location = g[field][0]
let town = location[1]=="" ? "" : ", " + content[location[1]]
text += fieldText + content[location[0]] + town + "<br>"
let locationString = location.map(x => content[x]).join(", ")
text += fieldText + locationString + "<br>"
coordinates = g[field][1]
}
else {
@@ -99,7 +104,7 @@ export function addMarkersGroups(map,content) {
addMarkersToLayer(g,groupsMarkersLayerOut,content)
}
else {
let locationName = [gs[0].location[0][0],""]
let locationName = [gs[0].location[0][0]]
let locationCoordinates = [0,0]
let members = 0
let contact = gs[0].contact

3
Server/app/svelte/public/js/parties.js
View File

@@ -41,7 +41,8 @@ export function addMarkersParties(map,content) {
text += fieldText + "<a href='" + g.website + "' target='_blank' rel=noreferrer>" + g.website + "</a>" + "<br>"
}
else if (field=="location") {
text += fieldText + content[g[field][0]] + "<br>"
let locationString = location.map(x => content[x]).join(", ")
text += fieldText + locationString + "<br>"
coordinates = g[field][1]
}
else if (field=="description") {

2
Server/app/svelte/public/js/partners.js
View File

@@ -2,7 +2,7 @@ export let partners = [
{
name: "Gaia's Fall",
type: "typeGaiasFall",
location: [["Online",""],[0,0]],
location: [["Online"],[0,0]],
link: "https://discord.libsoc.org/invite/",
description: "descriptionGaiasFall",
logo: "gaias_fall"

5
Server/app/svelte/public/locales/en/countries.json
View File

@@ -1,4 +1,5 @@
{
"map-prompt": "Want to appear on our map? Contact us!",
"Online": "Online",
"Denmark": "Denmark",
"Estonia": "Estonia",
@@ -8,11 +9,13 @@
"Germany": "Germany",
"Copenhagen": "Copenhagen",
"Ireland": "Ireland",
"USA": "USA",
"Montreal": "Montreal",
"Kolding": "Kolding",
"KohtlaJarve": "Kohtla-Järve",
"Athens": "Athens",
"Riga": "Riga",
"Halifax": "Halifax",
"Wiesbaden": "Wiesbaden"
"Wiesbaden": "Wiesbaden",
"Florida": "Florida"
}

5
Server/app/svelte/public/locales/ru/countries.json
View File

@@ -1,4 +1,5 @@
{
"map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!",
"Online": "Онлайн",
"Denmark": "Дания",
"Estonia": "Эстония",
@@ -7,6 +8,7 @@
"Canada": "Канада",
"Ireland": "Ирландия",
"Germany": "Германия",
"USA": "CША",
"Copenhagen": "Копенгаген",
"Kolding": "Колдинг",
"KohtlaJarve": "Кохтла-Ярве",
@@ -14,5 +16,6 @@
"Riga": "Рига",
"Halifax": "Галифакс",
"Montreal": "Монреаль",
"Wiesbaden": "Висбаден"
"Wiesbaden": "Висбаден",
"Florida": "Флорида"
}

20
Server/app/svelte/src/communes-component.svelte
View File

@@ -34,15 +34,16 @@
<div id="text-container">
<h1>{$content.communes}</h1>
<img id="commune-img" src="/img/common/commune.svg" alt="commune">
<p>{$content.p1}</p>
<p class="description">{$content.p1}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackCommunes(createMap,$content,locale)}></map-component>
<p id="add-prompt">{$content["map-prompt"]}</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.location}: </b>{commune.location[0].map(x => $content[x]).join(", ")}</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>
@@ -58,6 +59,14 @@
<style>
@import '/css/common.css';
.description {
margin-bottom: 1rem;
}
#add-prompt {
margin-bottom: 2rem;
}
#commune-img {
position: absolute;
width: 11.5rem;
@@ -96,7 +105,7 @@
#map {
--height: 30rem;
--width: 100%;
--margin-bottom: 3rem;
--margin-bottom: 0,5rem;
}
#text-container {
@@ -111,6 +120,7 @@
}
h3 {
margin-top: 1rem;
margin-bottom: 1rem;
}
@@ -121,10 +131,6 @@
margin-bottom: 4rem;
}
#container>div>p {
margin-bottom: 1rem;
}
#container p {
text-align: justify;
}

20
Server/app/svelte/src/cooperatives-component.svelte
View File

@@ -33,9 +33,10 @@
<div id="text-container">
<h1>{$content.cooperatives}</h1>
<img id="coops-img" src="/img/common/coops.svg" alt="coops">
<p>{$content.p1}</p>
<p class="description">{$content.p1}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackCoops(createMap,$content,locale)}></map-component>
<p id="add-prompt">{$content["map-prompt"]}</p>
{#each Object.entries(coopsByCountry) as [name,coops]}
<h4 class="country-name">{$content[name]}</h4>
<div class="country-block">
@@ -44,7 +45,7 @@
<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.location}: </b>{coop.location[0].map(x => $content[x]).join(", ")}</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>
@@ -70,6 +71,14 @@
<style>
@import '/css/common.css';
.description {
margin-bottom: 1rem;
}
#add-prompt {
margin-bottom: 2rem;
}
#coops-img {
position: absolute;
width: 10.5rem;
@@ -127,7 +136,7 @@
#map {
--height: 30rem;
--width: 100%;
--margin-bottom: 3rem;
--margin-bottom: 0.5rem;
}
#text-container {
@@ -142,6 +151,7 @@
}
h3 {
margin-top: 1rem;
margin-bottom: 1rem;
}
@@ -152,10 +162,6 @@
margin-bottom: 4rem;
}
#container>div>p {
margin-bottom: 1rem;
}
#container p {
text-align: justify;
}

17
Server/app/svelte/src/groups-component.svelte
View File

@@ -34,15 +34,16 @@
<div id="text-container">
<h1>{$content.groups}</h1>
<img id="groups-img" src="/img/common/groups.svg" alt="groups">
<p>{$content.p1}</p>
<p class="description">{$content.p1}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackGroups(createMap,$content)}></map-component>
<p id="add-prompt">{$content["map-prompt"]}</p>
{#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.location}: </b>{group.location[0].map(x => $content[x]).join(", ")}</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>
@@ -57,6 +58,14 @@
<style>
@import '/css/common.css';
.description {
margin-bottom: 1rem;
}
#add-prompt {
margin-bottom: 2rem;
}
#groups-img {
position: absolute;
width: 14rem;
@@ -119,10 +128,6 @@
margin-bottom: 4rem;
}
#container>div>p {
margin-bottom: 1rem;
}
#container p {
text-align: justify;
}

17
Server/app/svelte/src/parties-component.svelte
View File

@@ -34,9 +34,10 @@
<div id="text-container">
<h1>{$content.parties}</h1>
<img id="party-img" src="/img/common/parties.svg" alt="party">
<p>{$content.p1}</p>
<p class="description">{$content.p1}</p>
<h3>{$content.subheading1}</h3>
<map-component id="map" callback={(createMap) => mapCallbackParties(createMap,$content)}></map-component>
<p id="add-prompt">{$content["map-prompt"]}</p>
{#each Object.entries(partiesByCountry) as [name,parties]}
<h4 class="country-name">{$content[name]}</h4>
<div class="country-block">
@@ -67,6 +68,14 @@
<style>
@import '/css/common.css';
.description {
margin-bottom: 1rem;
}
#add-prompt {
margin-bottom: 2rem;
}
#party-img {
position: absolute;
width: 11.5rem;
@@ -129,7 +138,7 @@
#map {
--height: 30rem;
--width: 100%;
--margin-bottom: 3rem;
--margin-bottom: 0.5rem;
}
#text-container {
@@ -154,10 +163,6 @@
margin-bottom: 4rem;
}
#container>div>p {
margin-bottom: 1rem;
}
#container p {
text-align: justify;
}