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

Merge branch 'main' of https://github.com/lib-soc/website into bugfix/ui-fixes

Browse Source
This commit is contained in:
Mowkax
2023-07-16 22:08:54 +03:00
parent 8698ecc261 d236addefe
commit 7103973320
44 changed files with 170 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,12 @@ export let communes = [
members: 2,
contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
},
{
location: [["Denmark"],[55.915625218626275, 9.673445220831253]],
status: "forming",
members: 1,
contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
},
{
location: [["Estonia","KohtlaJarve"],[59.409521829709504, 27.288415912535914]],
status: "forming",
@@ -13,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"]
@@ -36,7 +42,7 @@ export let communesMarkersLayer = L.layerGroup()
export function addMarkersCommunes(map,content) {
for (let g of communes) {
let coordinates
let text = "<b>Commune</b><br>"
let text = "<b>"+content["Commune"]+"</b><br>"
for (let field in g) {
let fieldText = content[field] + ": "
if (field=="contact") {
@@ -44,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") {

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

@@ -39,7 +39,7 @@ export let coopsMarkersLayer = L.layerGroup()
export function addMarkersCoops(map,content) {
for (let g of coops) {
let coordinates
let text = "<b>Cooperative</b><br>"
let text = "<b>"+content["Cooperative"]+"</b><br>"
for (let field in g) {
let fieldText
if (field!="logo") {
@@ -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") {

15
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 = {}
@@ -60,7 +65,7 @@ let contactGeneral =["https://discord.gg/4BUau4AZre","DiscordInviteLink"]
function addMarkersToLayer(g,layer,content) {
let coordinates
let text = "<b>Group</b><br>"
let text = "<b>"+content["Group"]+"</b><br>"
for (let field in g) {
let fieldText = content[field] + ": "
if (field=="contact") {
@@ -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

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

@@ -25,7 +25,7 @@ export let partiesMarkersLayer = L.layerGroup()
export function addMarkersParties(map,content) {
for (let g of parties) {
let coordinates
let text = "<b>Party</b><br>"
let text = "<b>"+content["Party"]+"</b><br>"
for (let field in g) {
let fieldText
if (field!="logo") {
@@ -41,7 +41,9 @@ 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 location = g[field][0]
let locationString = location
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"