Moved all entries to db

2023-07-28 17:49:29 +03:00
parent c0f60f5e68
commit 5bc0cb8c25
112 changed files with 3887 additions and 895 deletions
--- a/Server/app/resources/basic/BasicController.jl
+++ b/Server/app/resources/basic/BasicController.jl
@@ -10,12 +10,6 @@ dict_layouts = Dict(
    :landing => generate_layout_html("main",controller,"landing",css=["landing"],libraries=["Leaflet"]),
    :manifesto => generate_layout_html("main",controller,"manifesto"),
    :join_us => generate_layout_html("main",controller,"join_us",libraries=["Leaflet"]),
-    :groups => generate_layout_html("main",controller,"groups",libraries=["Leaflet"]),
-    :groups_add => generate_layout_html("main",controller,"groups_add",libraries=["Leaflet"]),
-    :cooperatives => generate_layout_html("main",controller,"cooperatives",libraries=["Leaflet"]),
-    :communes => generate_layout_html("main",controller,"communes",libraries=["Leaflet"]),
-    :parties => generate_layout_html("main",controller,"parties",libraries=["Leaflet"]),
-    :partners => generate_layout_html("main",controller,"partners",libraries=["Leaflet"]),
    :compass => generate_layout_html("main",controller,"compass"),
 )

@@ -54,61 +48,6 @@ const join_us_info = Dict(
    ),
 )

-const groups_info = Dict(
-    "en" => Dict(
-        :title => "LibSoc - Groups",
-        :description => ""
-    ),
-    "ru" => Dict(
-        :title => "LibSoc - Группы",
-        :description => ""
-    )
-)
-
-const cooperatives_info = Dict(
-    "en" => Dict(
-        :title => "LibSoc - Cooperatives",
-        :description => ""
-    ),
-    "ru" => Dict(
-        :title => "LibSoc - Кооперативы",
-        :description => ""
-    )
-)
-
-const communes_info = Dict(
-    "en" => Dict(
-        :title => "LibSoc - Communes",
-        :description => ""
-    ),
-    "ru" => Dict(
-        :title => "LibSoc - Коммуны",
-        :description => ""
-    )
-)
-
-const partners_info = Dict(
-    "en" => Dict(
-        :title => "LibSoc - Partners",
-        :description => ""
-    ),
-    "ru" => Dict(
-        :title => "LibSoc - Партнеры",
-        :description => ""
-    )
-)
-
-const parties_info = Dict(
-    "en" => Dict(
-        :title => "LibSoc - Parties",
-        :description => ""
-    ),
-    "ru" => Dict(
-        :title => "LibSoc - Партии",
-        :description => ""
-    )
-)
-
 const compass_info = Dict(
    "en" => Dict(
        :title => "LibSoc - Political Compass",
@@ -147,62 +86,6 @@ function manifesto()
    )
 end

-function join_us()
-    locale = get_locale()
-    html(:basic,:join_us, layout = dict_layouts[:join_us], context = @__MODULE__,
-        title = join_us_info[locale][:title],
-        description = join_us_info[locale][:description]
-    )
-end
-
-function groups()
-    locale = get_locale()
-    html(:basic,:groups, layout = dict_layouts[:groups], context = @__MODULE__,
-        title = groups_info[locale][:title],
-        description = groups_info[locale][:description]
-    )
-end
-
-function groups_add()
-    locale = get_locale()
-    html(:basic,:groups_add, layout = dict_layouts[:groups_add], context = @__MODULE__,
-        title = groups_info[locale][:title],
-        description = groups_info[locale][:description]
-    )
-end
-
-function cooperatives()
-    locale = get_locale()
-    html(:basic,:cooperatives, layout = dict_layouts[:cooperatives], context = @__MODULE__,
-        title = cooperatives_info[locale][:title],
-        description = cooperatives_info[locale][:description]
-    )
-end
-
-function communes()
-    locale = get_locale()
-    html(:basic,:communes, layout = dict_layouts[:communes], context = @__MODULE__,
-        title = communes_info[locale][:title],
-        description = communes_info[locale][:description]
-    )
-end
-
-function partners()
-    locale = get_locale()
-    html(:basic,:partners, layout = dict_layouts[:partners], context = @__MODULE__,
-        title = partners_info[locale][:title],
-        description = partners_info[locale][:description]
-    )
-end
-
-function parties()
-    locale = get_locale()
-    html(:basic,:parties, layout = dict_layouts[:parties], context = @__MODULE__,
-        title = parties_info[locale][:title],
-        description = parties_info[locale][:description]
-    )
-end
-
 function political_compass()
    locale = get_locale()
    html(:basic,:compass, layout = dict_layouts[:compass], context = @__MODULE__,
@@ -211,9 +94,12 @@ function political_compass()
    )
 end

-function groups_add_post()
-    data = jsonpayload()
-    insert_into_table("groups_requests",data)
+function join_us()
+    locale = get_locale()
+    html(:basic,:join_us, layout = dict_layouts[:join_us], context = @__MODULE__,
+        title = join_us_info[locale][:title],
+        description = join_us_info[locale][:description]
+    )
 end

 end
--- a/Server/app/resources/communes/CommunesController.jl
+++ b/Server/app/resources/communes/CommunesController.jl
@@ -0,0 +1,59 @@
+module CommunesController
+
+using Genie, Genie.Renderer, Genie.Renderer.Html, Genie.Requests
+using JSON3
+using SearchLight
+using Server.DatabaseSupport, Server.TemplateEditor
+
+controller = "communes"
+dict_layouts = Dict(
+    :communes => generate_layout_html("main",controller,"communes",libraries=["Leaflet"]),
+    :communes_add => generate_layout_html("main",controller,"communes_add",libraries=["Leaflet"]),
+)
+
+#---Page info-----------------------------------------------------
+
+const communes_info = Dict(
+    "en" => Dict(
+        :title => "LibSoc - Communes",
+        :description => ""
+    ),
+    "ru" => Dict(
+        :title => "LibSoc - Коммуны",
+        :description => ""
+    )
+)
+
+function get_locale()
+    data = payload()
+    if :locale in keys(data)
+        return data[:locale]
+    else
+        return "en"
+    end
+end
+
+#---Functions---------------------------------------------------------
+
+function communes()
+    locale = get_locale()
+    html(:communes,:communes, layout = dict_layouts[:communes], context = @__MODULE__,
+        title = communes_info[locale][:title],
+        description = communes_info[locale][:description]
+    )
+end
+
+function communes_add()
+    locale = get_locale()
+    html(:communes,:communes_add, layout = dict_layouts[:communes_add], context = @__MODULE__,
+        title = communes_info[locale][:title],
+        description = communes_info[locale][:description]
+    )
+end
+
+function communes_add_post()
+    data = jsonpayload()
+    insert_into_table("communes_requests",data)
+end
+
+end
--- a/Server/app/resources/communes/views/communes.jl.html
+++ b/Server/app/resources/communes/views/communes.jl.html
--- a/Server/app/resources/communes/views/communes_add.jl.html
+++ b/Server/app/resources/communes/views/communes_add.jl.html
@@ -0,0 +1 @@
+<communes-add-component></communes-add-component>
--- a/Server/app/resources/cooperatives/CooperativesController.jl
+++ b/Server/app/resources/cooperatives/CooperativesController.jl
@@ -0,0 +1,60 @@
+module CooperativesController
+
+using Genie, Genie.Renderer, Genie.Renderer.Html, Genie.Requests
+using JSON3
+using SearchLight
+using Server.DatabaseSupport, Server.TemplateEditor
+
+controller = "cooperatives"
+dict_layouts = Dict(
+    :cooperatives => generate_layout_html("main",controller,"cooperatives",libraries=["Leaflet"]),
+    :cooperatives_add => generate_layout_html("main",controller,"cooperatives_add",libraries=["Leaflet"]),
+)
+
+#---Page info-----------------------------------------------------
+
+const cooperatives_info = Dict(
+    "en" => Dict(
+        :title => "LibSoc - Cooperatives",
+        :description => ""
+    ),
+    "ru" => Dict(
+        :title => "LibSoc - Кооперативы",
+        :description => ""
+    )
+)
+
+function get_locale()
+    data = payload()
+    if :locale in keys(data)
+        return data[:locale]
+    else
+        return "en"
+    end
+end
+
+#---Functions---------------------------------------------------------
+
+
+function cooperatives_add()
+    locale = get_locale()
+    html(:cooperatives,:cooperatives_add, layout = dict_layouts[:cooperatives_add], context = @__MODULE__,
+        title = cooperatives_info[locale][:title],
+        description = cooperatives_info[locale][:description]
+    )
+end
+
+function cooperatives()
+    locale = get_locale()
+    html(:cooperatives,:cooperatives, layout = dict_layouts[:cooperatives], context = @__MODULE__,
+        title = cooperatives_info[locale][:title],
+        description = cooperatives_info[locale][:description]
+    )
+end
+
+function cooperatives_add_post()
+    data = jsonpayload()
+    insert_into_table("cooperatives_requests",data)
+end
+
+end
--- a/Server/app/resources/cooperatives/views/cooperatives.jl.html
+++ b/Server/app/resources/cooperatives/views/cooperatives.jl.html
--- a/Server/app/resources/cooperatives/views/cooperatives_add.jl.html
+++ b/Server/app/resources/cooperatives/views/cooperatives_add.jl.html
@@ -0,0 +1 @@
+<cooperatives-add-component></cooperatives-add-component>
--- a/Server/app/resources/groups/GroupsController.jl
+++ b/Server/app/resources/groups/GroupsController.jl
@@ -0,0 +1,59 @@
+module GroupsController
+
+using Genie, Genie.Renderer, Genie.Renderer.Html, Genie.Requests
+using JSON3
+using SearchLight
+using Server.DatabaseSupport, Server.TemplateEditor
+
+controller = "groups"
+dict_layouts = Dict(
+    :groups => generate_layout_html("main",controller,"groups",libraries=["Leaflet"]),
+    :groups_add => generate_layout_html("main",controller,"groups_add",libraries=["Leaflet"]),
+)
+
+#---Page info-----------------------------------------------------
+
+const groups_info = Dict(
+    "en" => Dict(
+        :title => "LibSoc - Groups",
+        :description => ""
+    ),
+    "ru" => Dict(
+        :title => "LibSoc - Группы",
+        :description => ""
+    )
+)
+
+function get_locale()
+    data = payload()
+    if :locale in keys(data)
+        return data[:locale]
+    else
+        return "en"
+    end
+end
+
+#---Functions---------------------------------------------------------
+
+function groups()
+    locale = get_locale()
+    html(:groups,:groups, layout = dict_layouts[:groups], context = @__MODULE__,
+        title = groups_info[locale][:title],
+        description = groups_info[locale][:description]
+    )
+end
+
+function groups_add()
+    locale = get_locale()
+    html(:groups,:groups_add, layout = dict_layouts[:groups_add], context = @__MODULE__,
+        title = groups_info[locale][:title],
+        description = groups_info[locale][:description]
+    )
+end
+
+function groups_add_post()
+    data = jsonpayload()
+    insert_into_table("groups_requests",data)
+end
+
+end
--- a/Server/app/resources/groups/views/groups.jl.html
+++ b/Server/app/resources/groups/views/groups.jl.html
--- a/Server/app/resources/groups/views/groups_add.jl.html
+++ b/Server/app/resources/groups/views/groups_add.jl.html
--- a/Server/app/resources/parties/PartiesController.jl
+++ b/Server/app/resources/parties/PartiesController.jl
@@ -0,0 +1,60 @@
+module PartiesController
+
+using Genie, Genie.Renderer, Genie.Renderer.Html, Genie.Requests
+using JSON3
+using SearchLight
+using Server.DatabaseSupport, Server.TemplateEditor
+
+controller = "parties"
+dict_layouts = Dict(
+    :parties_add => generate_layout_html("main",controller,"parties_add",libraries=["Leaflet"]),
+    :parties => generate_layout_html("main",controller,"parties",libraries=["Leaflet"]),
+)
+
+#---Page info-----------------------------------------------------
+
+const parties_info = Dict(
+    "en" => Dict(
+        :title => "LibSoc - Parties",
+        :description => ""
+    ),
+    "ru" => Dict(
+        :title => "LibSoc - Партии",
+        :description => ""
+    )
+)
+
+function get_locale()
+    data = payload()
+    if :locale in keys(data)
+        return data[:locale]
+    else
+        return "en"
+    end
+end
+
+#---Functions---------------------------------------------------------
+
+
+function parties()
+    locale = get_locale()
+    html(:parties,:parties, layout = dict_layouts[:parties], context = @__MODULE__,
+        title = parties_info[locale][:title],
+        description = parties_info[locale][:description]
+    )
+end
+
+function parties_add()
+    locale = get_locale()
+    html(:parties,:parties_add, layout = dict_layouts[:parties_add], context = @__MODULE__,
+        title = parties_info[locale][:title],
+        description = parties_info[locale][:description]
+    )
+end
+
+function parties_add_post()
+    data = jsonpayload()
+    insert_into_table("parties_requests",data)
+end
+
+end
--- a/Server/app/resources/parties/views/parties.jl.html
+++ b/Server/app/resources/parties/views/parties.jl.html
--- a/Server/app/resources/parties/views/parties_add.jl.html
+++ b/Server/app/resources/parties/views/parties_add.jl.html
@@ -0,0 +1 @@
+<parties-add-component></parties-add-component>
--- a/Server/app/resources/partners/PartnersController.jl
+++ b/Server/app/resources/partners/PartnersController.jl
@@ -0,0 +1,59 @@
+module PartnersController
+
+using Genie, Genie.Renderer, Genie.Renderer.Html, Genie.Requests
+using JSON3
+using SearchLight
+using Server.DatabaseSupport, Server.TemplateEditor
+
+controller = "partners"
+dict_layouts = Dict(
+    :partners => generate_layout_html("main",controller,"partners",libraries=["Leaflet"]),
+    :partners_add => generate_layout_html("main",controller,"partners_add",libraries=["Leaflet"]),
+)
+
+#---Page info-----------------------------------------------------
+
+const partners_info = Dict(
+    "en" => Dict(
+        :title => "LibSoc - Partners",
+        :description => ""
+    ),
+    "ru" => Dict(
+        :title => "LibSoc - Партнеры",
+        :description => ""
+    )
+)
+
+
+function get_locale()
+    data = payload()
+    if :locale in keys(data)
+        return data[:locale]
+    else
+        return "en"
+    end
+end
+
+#---Functions---------------------------------------------------------
+
+function partners()
+    locale = get_locale()
+    html(:partners,:partners, layout = dict_layouts[:partners], context = @__MODULE__,
+        title = partners_info[locale][:title],
+        description = partners_info[locale][:description]
+    )
+end
+function partners_add()
+    locale = get_locale()
+    html(:partners,:partners_add, layout = dict_layouts[:partners_add], context = @__MODULE__,
+        title = partners_info[locale][:title],
+        description = partners_info[locale][:description]
+    )
+end
+
+function partners_add_post()
+    data = jsonpayload()
+    insert_into_table("partners_requests",data)
+end
+
+end
--- a/Server/app/resources/partners/views/partners.jl.html
+++ b/Server/app/resources/partners/views/partners.jl.html
--- a/Server/app/resources/partners/views/partners_add.jl.html
+++ b/Server/app/resources/partners/views/partners_add.jl.html
@@ -0,0 +1 @@
+<partners-add-component></partners-add-component>
--- a/Server/app/svelte/public/js/communes.js
+++ b/Server/app/svelte/public/js/communes.js
@@ -1,99 +0,0 @@
-
-export let communes = [
-    {
-        location: [["Canada","Montreal"],[45.55541047232767, -73.42859611607271]],
-        status: "forming",
-        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","Kohtla-Jarve"],[59.409521829709504, 27.288415912535914]],
-        status: "forming",
-        members: 2,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Latvia"],[56.934159375258055, 25.269099001330265]],
-        status: "forming",
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Switzerland"],[46.97045202584917, 8.05130091516525]],
-        status: "forming",
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    }
-]
-
-export let communesByCountry = {}
-for (let c of communes) {
-    let country = c.location[0][0]
-    if (country in communesByCountry) {
-        communesByCountry[country].push(c)
-    }
-    else {
-        communesByCountry[country] = [c]
-    }
-}
-
-export let communesMarkersLayer = L.layerGroup()
-
-export function translate(content, x) {
-    let out = content[x]
-    if (out==undefined) {
-        return x
-    }
-    else {
-        return out
-    }
-}
-
-export function addMarkersCommunes(map,content,locale) {
-    for (let g of communes) {
-        let coordinates
-        let text = "<b>"+content["Commune"]+"</b><br>"
-        for (let field in g) {
-            let fieldText = content[field] + ": "
-            if (field=="contact") {
-                text += fieldText + "<a href='" + g.contact[0] + "' target='_blank' rel=noreferrer>" + content[g.contact[1]]+ "</a>"
-            }
-            else if (field=="location") {
-                let location = g[field][0]
-                let locationString
-                if (locale=="en") {
-                    locationString = location.map(x => x).join(", ")
-                }
-                else {
-                    locationString = location.map(x => translate(content, x)).join(", ")
-                }
-
-                text += fieldText + locationString + "<br>"
-                coordinates = g[field][1]
-            }
-            else if (field=="status") {
-                text += fieldText + content[g[field]] + "<br>"
-            }
-            else {
-                text += fieldText + g[field] + "<br>"
-            }
-        }
-        var markerIcon = new L.Icon({
-            iconUrl: 'https://www.libsoc.org/img/common/markers/marker-red.png',
-            shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png',
-            iconSize: [25, 41],
-            iconAnchor: [12, 41],
-            popupAnchor: [1, -34],
-            shadowSize: [41, 41]
-        });
-        let marker = L.marker(coordinates, {icon: markerIcon})
-        marker.addTo(communesMarkersLayer).bindPopup(text)
-    }
-    communesMarkersLayer.addTo(map)
-}
--- a/Server/app/svelte/public/js/coops.js
+++ b/Server/app/svelte/public/js/coops.js
@@ -1,79 +0,0 @@
-export let coops = [
-    {
-        logo: "chiron_logo",
-        name: "Chiron Health",
-        location: [["Estonia","Kohtla-Järve"],[59.41038769769602, 27.287802936242034]],
-        market:   "wellnessAndHealth",
-        workers: 2,
-        status: "inDevelopment",
-        website: ["https://www.chrn.health/", "chrn.health"],
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"],
-        description: "descriptionChironHealth"
-    },
-    {
-        logo: "kuusk_logo",
-        name: "Kuusk",
-        location: [["Estonia","Kohtla-Järve"],[59.399947051803004, 27.277159931677055]],
-        market: "herbalTeas",
-        workers: 1,
-        status: "inDevelopment",
-        website: ["-","-"],
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"],
-        description: "kuuskDescription"
-    }
-]
-
-export let coopsByCountry = {}
-for (let g of coops) {
-    let country = g.location[0][0]
-    if (country in coopsByCountry) {
-        coopsByCountry[country].push(g)
-    }
-    else {
-        coopsByCountry[country] = [g]
-    }
-}
-
-export let coopsMarkersLayer = L.layerGroup()
-
-export function addMarkersCoops(map,content,locale) {
-    for (let g of coops) {
-        let coordinates
-        let text = "<b>"+content["Cooperative"]+"</b><br>"
-        for (let field in g) {
-            let fieldText
-            if (field!="logo") {
-                fieldText = content[field] + ": "
-            }
-            if (field=="logo") {
-                text += "<picture><source srcset=" + "/img/coops/" + g.logo + ".webp><source srcset='/img/coops/" + g.logo + ".png'><img alt='logo' style='position: relative; max-height: 5rem; max-width: 100%; margin: auto;'></picture>" + "<br>"
-            }
-            else if (field=="contact") {
-                text += fieldText + "<a href='https://www." + g.contact[0] + "' target='_blank' rel=noreferrer>" + content[g.contact[1]] + "</a>" + "<br>"
-            }
-            else if (field=="website") {
-                text += fieldText + "<a href='" + g.website[0] + "' target='_blank' rel=noreferrer>" + g.website[1] + "</a>" + "<br>"
-            }
-            else if (field=="location") {
-                let location = g[field][0]
-                let locationString
-                if (locale=="en") {
-                    locationString = location.map(x => x).join(", ")
-                }
-                else {
-                    locationString = location.map(x => content[x]).join(", ")
-                }
-                text += fieldText + locationString + "<br>"
-                coordinates = g[field][1]
-            }
-            else if (field=="market" || field=="status" || field=="description") {
-                text += fieldText + content[g[field]] + "<br>"
-            }
-            else {
-                text += fieldText + g[field] + "<br>"
-            }
-        }
-        L.marker(coordinates).addTo(coopsMarkersLayer).bindPopup(text)
-    }
-    coopsMarkersLayer.addTo(map)
-}
--- a/Server/app/svelte/public/js/groups.js
+++ b/Server/app/svelte/public/js/groups.js
@@ -1,198 +0,0 @@
-/*
-export let groups = [
-    {
-        location: [["Bulgaria","Varna"],[43.21582161671174, 27.89896092161012]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Canada","Halifax"],[44.65166135030067, -63.59289968306866]],
-        members: 2,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Canada","Toronto"], [43.6960589794647, -79.37396957644577]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Denmark","Copenhagen"],[55.6840661150132, 12.557133959514688]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Denmark","Kolding"], [55.49261908652738, 9.470268969851743]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Estonia","Kohtla-Järve"], [59.40629447076191, 27.280605339416322]],
-        members: 3,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Estonia","Tallinn"], [59.39180354687856, 24.72304565687877]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Germany","Wiesbaden"], [50.07459620869791, 8.234984059337897]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Greece","Athens"], [37.94877252621736, 23.677622972996158]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Ireland"], [53.280192832733576, -7.688103518964818]],
-        members: 6,
-        contact: ["https://discord.gg/4BUau4AZre","DiscordInviteLink"]
-    },
-    {
-        location: [["Latvia","Riga"], [56.94748425529816, 24.003027136431925]],
-        members: 2,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["USA","Florida"], [26.945024427155868, -81.22162645059898]],
-        members: 2,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["USA","Colorado","Louisville"], [39.965026323855334, -105.15948886693151]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["USA","Georgia"], [33.91813982808364, -84.38058579763135]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["USA","Ohio"], [40.18243610076637, -83.07800532738788]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Thailand","Chiang Mai"], [18.788343253574393, 98.99423221087719]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    },
-    {
-        location: [["Switzerland","Cham"], [47.18298143153399, 8.460076421717238]],
-        members: 1,
-        contact: ["https://discord.gg/Qk8KUk787z","DiscordInviteLink"]
-    }
-]
-*/
-
-export let groupsMarkersLayer = L.layerGroup()
-let groupsMarkersLayerOut = L.layerGroup()
-let groupsMarkersLayerIn = L.layerGroup()
-
-let contactGeneral =["https://discord.gg/4BUau4AZre","DiscordInviteLink"]
-
-export function translate(content, x) {
-    let out = content[x]
-    if (out==undefined) {
-        return x
-    }
-    else {
-        return out
-    }
-}
-
-function addMarkersToLayer(g,layer,content,locale) {
-    let coordinates
-    let text = "<b>"+content["Group"]+"</b><br>"
-    for (let field of ["location","members","contact"]) {
-        
-        let fieldText = content[field] + ": "
-        if (field=="contact") {
-            text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
-        }
-        else if (field=="location") {
-            let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
-            let locationString
-            if (locale=="en") {
-                locationString = location.map(x => x).join(", ")
-            }
-            else {
-                locationString = location.map(x => translate(content, x)).join(", ")
-            }
-            text += fieldText + locationString + "<br>"
-            coordinates = [g.latitude,g.longitude]
-        }
-        else {
-            text += fieldText + g[field] + "<br>"
-        }
-    }
-    var markerIcon = new L.Icon({
-        iconUrl: 'https://www.libsoc.org/img/common/markers/marker-green.png',
-        shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png',
-        iconSize: [25, 41],
-        iconAnchor: [12, 41],
-        popupAnchor: [1, -34],
-        shadowSize: [41, 41]
-    })
-    //console.log(text)
-    let marker = L.marker(coordinates, {icon: markerIcon})
-    marker.addTo(layer).bindPopup(text)
-}
-
-export function addMarkersGroups(groups,groupsByCountry,map,content,locale) {
-    for (let g of groups) {
-        addMarkersToLayer(g,groupsMarkersLayerIn,content,locale)
-    }
-    for (let gs of Object.values(groupsByCountry)) {
-        if (gs.length==1) {
-            let g = {...gs[0]}
-            g.country = [g.country]
-            addMarkersToLayer(g,groupsMarkersLayerOut,content,locale)
-        }
-        else {
-            let locationName = gs[0].country
-            let locationCoordinates = [0,0]
-            let members = 0
-            let contact = gs[0].contact
-            for (let g of gs) {
-                locationCoordinates[0] += g.latitude
-                locationCoordinates[1] += g.longitude
-                members += g.members
-                if (g.contact[0]!=gs[0].contact[0]) {
-                    contact = contactGeneral
-                }
-            }
-            locationCoordinates[0] = locationCoordinates[0]/gs.length
-            locationCoordinates[1] = locationCoordinates[1]/gs.length
-            let gNew = {
-                country: locationName,
-                latitude: locationCoordinates[0],
-                longitude: locationCoordinates[1],
-                members: members,
-                contact: contact
-            }
-            addMarkersToLayer(gNew,groupsMarkersLayerOut,content,locale)
-        }
-    }
-
-    groupsMarkersLayerOut.addTo(groupsMarkersLayer)
-    groupsMarkersLayer.addTo(map)
-    map.on("zoomend", () => onZoomEnd(map))
-}
-
-function onZoomEnd(map) {
-    let zoomLevel = map.getZoom()
-    if (zoomLevel==3) {
-        groupsMarkersLayer.removeLayer(groupsMarkersLayerIn)
-        groupsMarkersLayerOut.addTo(groupsMarkersLayer)
-    }
-    else if (zoomLevel==4) {
-        groupsMarkersLayer.removeLayer(groupsMarkersLayerOut)
-        groupsMarkersLayerIn.addTo(groupsMarkersLayer)
-    }
-}
-
-  
--- a/Server/app/svelte/public/js/libraries/mapTools.js
+++ b/Server/app/svelte/public/js/libraries/mapTools.js
@@ -0,0 +1,90 @@
+let contactGeneral =["https://discord.gg/4BUau4AZre","DiscordInviteLink"]
+
+export function translate(content, x) {
+    let out = content[x]
+    if (out==undefined) {
+        return x
+    }
+    else {
+        return out
+    }
+}
+
+function addMarkersToLayer(g,layer,content,locale,addPinContent,markerColor) {
+    let {text,coordinates} = addPinContent(g,content,locale)
+    var markerIcon = new L.Icon({
+        iconUrl: 'https://www.libsoc.org/img/common/markers/marker-' + markerColor + '.png',
+        shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png',
+        iconSize: [25, 41],
+        iconAnchor: [12, 41],
+        popupAnchor: [1, -34],
+        shadowSize: [41, 41]
+    })
+    let marker = L.marker(coordinates, {icon: markerIcon})
+    marker.addTo(layer).bindPopup(text)
+}
+
+export function addMarkersEntries(entries,entriesByCountry,map,content,locale,addPinContent,markerColor) {
+    let entriesMarkersLayer = L.layerGroup()
+    let entriesMarkersLayerOut = L.layerGroup()
+    let entriesMarkersLayerIn = L.layerGroup()
+    for (let g of entries) {
+        if (g.country!="Online" && g.country!="Worldwide") {
+            addMarkersToLayer(g,entriesMarkersLayerIn,content,locale,addPinContent,markerColor)
+        }
+    }
+    for (let gs of Object.values(entriesByCountry)) {
+        if (gs.length==1) {
+            let g = {...gs[0]}
+            g.country = [g.country]
+            if (g.country!="Online" && g.country!="Worldwide") {
+                addMarkersToLayer(g,entriesMarkersLayerOut,content,locale,addPinContent,markerColor)
+            }
+        }
+        else {
+            if (gs[0].country!="Online" && gs[0].country!="Worldwide") {
+                let locationName = gs[0].country
+                let locationCoordinates = [0,0]
+                let members = 0
+                let contact = gs[0].contact
+                for (let g of gs) {
+                    locationCoordinates[0] += g.latitude
+                    locationCoordinates[1] += g.longitude
+                    members += g.members
+                    if (g.contact[0]!=gs[0].contact[0]) {
+                        contact = contactGeneral
+                    }
+                }
+                locationCoordinates[0] = locationCoordinates[0]/gs.length
+                locationCoordinates[1] = locationCoordinates[1]/gs.length
+                let gNew = {
+                    country: locationName,
+                    latitude: locationCoordinates[0],
+                    longitude: locationCoordinates[1],
+                    members: members,
+                    contact: contact
+                }
+                addMarkersToLayer(gNew,entriesMarkersLayerOut,content,locale,addPinContent,markerColor)
+            }
+        }
+    }
+
+    entriesMarkersLayerOut.addTo(entriesMarkersLayer)
+    entriesMarkersLayer.addTo(map)
+    map.on("zoomend", () => onZoomEnd(map,entriesMarkersLayer,entriesMarkersLayerOut,entriesMarkersLayerIn))
+    return entriesMarkersLayer
+}
+
+function onZoomEnd(map,entriesMarkersLayer,entriesMarkersLayerOut,entriesMarkersLayerIn) {
+    let zoomLevel = map.getZoom()
+    if (zoomLevel==3) {
+        entriesMarkersLayer.removeLayer(entriesMarkersLayerIn)
+        entriesMarkersLayerOut.addTo(entriesMarkersLayer)
+    }
+    else if (zoomLevel==4) {
+        entriesMarkersLayer.removeLayer(entriesMarkersLayerOut)
+        entriesMarkersLayerIn.addTo(entriesMarkersLayer)
+    }
+}
+
+  
--- a/Server/app/svelte/public/js/mapFuncs.js
+++ b/Server/app/svelte/public/js/mapFuncs.js
@@ -0,0 +1,178 @@
+import { translate } from "/js/libraries/mapTools.js"
+
+export function addGroupPinContent(g,content,locale) {
+    let coordinates
+    let text = "<b>"+content["Group"]+"</b><br>"
+    for (let field of ["location","members","contact"]) {
+        let fieldText = content[field] + ": "
+        if (field=="contact") {
+            text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
+        }
+        else if (field=="location") {
+            let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+            let locationString
+            if (locale=="en") {
+                locationString = location.map(x => x).join(", ")
+            }
+            else {
+                locationString = location.map(x => translate(content, x)).join(", ")
+            }
+            text += fieldText + locationString + "<br>"
+            coordinates = [g.latitude,g.longitude]
+        }
+        else {
+            text += fieldText + g[field] + "<br>"
+        }
+    }
+    return {text,coordinates}
+}
+
+export function addCommunePinContent(g,content,locale) {
+    let coordinates
+    let text = "<b>"+content["Commune"]+"</b><br>"
+    for (let field of ["location","status","members","contact"]) {
+        let fieldText = content[field] + ": "
+        if (field=="contact") {
+            text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
+        }
+        else if (field=="location") {
+            let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+            let locationString
+            if (locale=="en") {
+                locationString = location.map(x => x).join(", ")
+            }
+            else {
+                locationString = location.map(x => translate(content, x)).join(", ")
+            }
+            text += fieldText + locationString + "<br>"
+            coordinates = [g.latitude,g.longitude]
+        }
+        else if (field=="status") {
+            text += fieldText + content[g[field]] + "<br>"
+        }
+        else {
+            text += fieldText + g[field] + "<br>"
+        }
+    }
+    return {text,coordinates}
+}
+
+export function addCoopPinContent(g,content,locale) {
+    let coordinates
+    let text = "<b>"+content["Cooperative"]+"</b><br>"
+    for (let field of ["logo","name","location","workers","status","website","contact","description"]) {
+        let fieldText
+        if (field!="logo") {
+            fieldText = content[field] + ": "
+        }
+        if (field=="logo") {
+            text += "<picture><source srcset=" + "/img/coops/" + g.logo + ".webp><source srcset='/img/coops/" + g.logo + ".png'><img alt='logo' style='position: relative; max-height: 5rem; max-width: 100%; margin: auto;'></picture>" + "<br>"
+        }
+        else if (field=="contact") {
+            text += fieldText + "<a href='https://www." + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>" + "<br>"
+        }
+        else if (field=="website") {
+            text += fieldText + "<a href='" + g.website + "' target='_blank' rel=noreferrer>" + g.website + "</a>" + "<br>"
+        }
+        else if (field=="location") {
+            let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+            let locationString
+            if (locale=="en") {
+                locationString = location.map(x => x).join(", ")
+            }
+            else {
+                locationString = location.map(x => translate(content, x)).join(", ")
+            }
+            text += fieldText + locationString + "<br>"
+            coordinates = [g.latitude,g.longitude]
+        }
+        else if (field=="market" || field=="status" || field=="description") {
+            text += fieldText + g[field] + "<br>"
+        }
+        else {
+            text += fieldText + g[field] + "<br>"
+        }
+    }
+    return {text,coordinates}
+}
+
+export function addPartyPinContent(g,content,locale) {
+    let coordinates
+    let text = "<b>"+content["Cooperative"]+"</b><br>"
+    for (let field of ["logo","name","location","website","contact","description"]) {
+        let fieldText
+        if (field!="logo") {
+            fieldText = content[field] + ": "
+        }
+        if (field=="logo") {
+            text += "<picture><source srcset=" + "/img/parties/" + g.logo + ".webp><source srcset='/img/parties/" + g.logo + ".png'><img alt='logo' style='position: relative; max-height: 5rem; max-width: 100%; margin: auto;'></picture>" + "<br>"
+        }
+        else if (field=="link") {
+            text += fieldText + "<a href='" + g.link + "' target='_blank' rel=noreferrer>" + g.link + "</a>" + "<br>"
+        }
+        else if (field=="website") {
+            text += fieldText + "<a href='" + g.website + "' target='_blank' rel=noreferrer>" + g.website + "</a>" + "<br>"
+        }
+        else if (field=="location") {
+            let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+            let locationString
+            if (locale=="en") {
+                locationString = location.map(x => x).join(", ")
+            }
+            else {
+                locationString = location.map(x => translate(content, x)).join(", ")
+            }
+            text += fieldText + locationString + "<br>"
+            coordinates = [g.latitude,g.longitude]
+        }
+        else if (field=="description") {
+            text += fieldText + content[g[field]] + "<br>"
+        }
+        else if (field=="contact") {
+            text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>" + "<br>"
+        }
+        else {
+            text += fieldText + g[field] + "<br>"
+        }
+    }
+    return {text,coordinates}
+}
+
+export function addPartnersPinContent(g,content,locale) {
+    let coordinates
+    let text = "<b>"+content["Partner"]+"</b><br>"
+    for (let field of ["logo","name","location","website","contact","description"]) {
+        let fieldText
+        if (field!="logo") {
+            fieldText = content[field] + ": "
+        }
+        if (field=="logo") {
+            text += "<picture><source srcset=" + "/img/coops/" + g.logo + ".webp><source srcset='/img/coops/" + g.logo + ".png'><img alt='logo' style='position: relative; max-height: 5rem; max-width: 100%; margin: auto;'></picture>" + "<br>"
+        }
+        else if (field=="contact") {
+            text += fieldText + "<a href='https://www." + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>" + "<br>"
+        }
+        else if (field=="website") {
+            text += fieldText + "<a href='" + g.website + "' target='_blank' rel=noreferrer>" + g.website + "</a>" + "<br>"
+        }
+        else if (field=="location") {
+            let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+            let locationString
+            if (locale=="en") {
+                locationString = location.map(x => x).join(", ")
+            }
+            else {
+                locationString = location.map(x => translate(content, x)).join(", ")
+            }
+            text += fieldText + locationString + "<br>"
+            coordinates = [g.latitude,g.longitude]
+        }
+        else if (field=="description") {
+            text += fieldText + g[field] + "<br>"
+        }
+        else {
+            text += fieldText + g[field] + "<br>"
+        }
+    }
+    return {text,coordinates}
+}
--- a/Server/app/svelte/public/js/parties.js
+++ b/Server/app/svelte/public/js/parties.js
@@ -1,74 +0,0 @@
-export let parties = [
-    {
-        logo: "roots",
-        name: "Roots",
-        location: ["Ireland",[52.98479517270413, -7.649233227534782]],
-        //members: 6,
-        link: "https://discord.gg/pSTMacJZsK",
-        description: "descriptionRoots"
-    }
-]
-
-export let partiesByCountry = {}
-for (let g of parties) {
-    let country = g.location[0]
-    if (country in partiesByCountry) {
-        partiesByCountry[country].push(g)
-    }
-    else {
-        partiesByCountry[country] = [g]
-    }
-}
-
-export let partiesMarkersLayer = L.layerGroup()
-
-export function addMarkersParties(map,content,locale) {
-    for (let g of parties) {
-        let coordinates
-        let text = "<b>"+content["Party"]+"</b><br>"
-        for (let field in g) {
-            let fieldText
-            if (field!="logo") {
-                fieldText = content[field] + ": "
-            }
-            if (field=="logo") {
-                text += "<picture><source srcset=" + "/img/parties/" + g.logo + ".webp><source srcset='/img/parties/" + g.logo + ".png'><img alt='logo' style='position: relative; max-height: 5rem; max-width: 100%; margin: auto;'></picture>" + "<br>"
-            }
-            else if (field=="link") {
-                text += fieldText + "<a href='" + g.link + "' target='_blank' rel=noreferrer>" + g.link + "</a>" + "<br>"
-            }
-            else if (field=="website") {
-                text += fieldText + "<a href='" + g.website + "' target='_blank' rel=noreferrer>" + g.website + "</a>" + "<br>"
-            }
-            else if (field=="location") {
-                let location = g[field][0]
-                let locationString
-                if (locale=="en") {
-                    locationString = location
-                }
-                else {
-                    locationString = content[location]
-                }
-                text += fieldText + locationString + "<br>"
-                coordinates = g[field][1]
-            }
-            else if (field=="description") {
-                text += fieldText + content[g[field]] + "<br>"
-            }
-            else {
-                text += fieldText + g[field] + "<br>"
-            }
-        }
-        var markerIcon = new L.Icon({
-            iconUrl: 'https://www.libsoc.org/img/common/markers/marker-gold.png',
-            shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png',
-            iconSize: [25, 41],
-            iconAnchor: [12, 41],
-            popupAnchor: [1, -34],
-            shadowSize: [41, 41]
-        });
-        let marker = L.marker(coordinates, {icon: markerIcon})
-        marker.addTo(partiesMarkersLayer).bindPopup(text)
-    }
-    partiesMarkersLayer.addTo(map)
-}
--- a/Server/app/svelte/public/js/partners.js
+++ b/Server/app/svelte/public/js/partners.js
@@ -1,21 +0,0 @@
-export let partners = [
-    {
-        name: "Gaia's Fall",
-        type: "typeGaiasFall",
-        location: [["Online"],[0,0]],
-        link: "https://discord.libsoc.org/invite/",
-        description: "descriptionGaiasFall",
-        logo: "gaias_fall"
-    }
-]
-
-export let partnersByCountry = {}
-for (let g of partners) {
-    let country = g.location[0][0]
-    if (country in partnersByCountry) {
-        partnersByCountry[country].push(g)
-    }
-    else {
-        partnersByCountry[country] = [g]
-    }
-}
--- a/Server/app/svelte/public/locales/en/communes-component.json
+++ b/Server/app/svelte/public/locales/en/communes-component.json
@@ -10,5 +10,6 @@
    "forming": "forming",
    "WhatsAppInviteLink": "WhatsApp invite link",
    "DiscordInviteLink": "Discord invite link",
-    "Commune": "Commune"
+    "Commune": "Commune",
+    "map-prompt": "Want to appear on our map? Contact us!"
 }
--- a/Server/app/svelte/public/locales/en/cooperatives-component.json
+++ b/Server/app/svelte/public/locales/en/cooperatives-component.json
@@ -18,6 +18,7 @@
    "descriptionChironHealth": "Chiron Health is a health platform providing courses and services on the topics of nutrition, exercise, sleep and mental wellbeing.",
    "herbalTeas": "herbal teas",
    "kuuskDescription": "Kuusk is an online store that sells herbal teas from exclusively local wild plants, as well as an online gathering course.",
-    "Cooperative": "Cooperative"
+    "Cooperative": "Cooperative",
+    "map-prompt": "Want to appear on our map? Contact us!"

 }
--- a/Server/app/svelte/public/locales/en/countries.json
+++ b/Server/app/svelte/public/locales/en/countries.json
@@ -1,3 +1,3 @@
 {
-    "map-prompt": "Want to appear on our map? Contact us!"
+
 }
--- a/Server/app/svelte/public/locales/en/groups-component.json
+++ b/Server/app/svelte/public/locales/en/groups-component.json
@@ -8,5 +8,6 @@
    "contact": "Contact",
    "DiscordInviteLink": "Discord invite link",
    "WhatsAppInviteLink": "WhatsApp invite link",
-    "Group": "Group"
+    "Group": "Group",
+    "map-prompt": "Want to appear on our map? Contact us!"
 }
--- a/Server/app/svelte/public/locales/en/parties-component.json
+++ b/Server/app/svelte/public/locales/en/parties-component.json
@@ -5,8 +5,10 @@
    "name": "Name",
    "location": "Location",
    "members": "Members",
-    "link": "Link",
+    "website": "Website",
+    "contact": "Contact",
    "description": "Description",
    "descriptionRoots": "We are a left libertarian organization based in Ireland. We have a focus on rebuilding the country's infrastructure, sense of governance, housing, agricultural industries and youth affairs.",
-    "Party": "Party"
+    "Party": "Party",
+    "map-prompt": "Want to appear on our map? Contact us!"
 }
--- a/Server/app/svelte/public/locales/en/partners-component.json
+++ b/Server/app/svelte/public/locales/en/partners-component.json
@@ -5,10 +5,11 @@
    "subheading2": "Online",
    "name": "Name",
    "location": "Location",
-    "type": "Type",
-    "link": "Link",
+    "website": "Website",
+    "contact": "Contact",
    "description": "Description",
    "typeGaiasFall": "a place for discussions",
-    "descriptionGaiasFall": "Gaia's Fall is a server that promotes Solarpunk ideals, environmentalism, anarchism, and anti-capitalism. We encourage civil debates, discussions of theories and possibilities, and the creation of communities focused on shaping a better world."
+    "descriptionGaiasFall": "Gaia's Fall is a server that promotes Solarpunk ideals, environmentalism, anarchism, and anti-capitalism. We encourage civil debates, discussions of theories and possibilities, and the creation of communities focused on shaping a better world.",
+    "map-prompt": "Want to appear on our map? Contact us!"

 }
--- a/Server/app/svelte/public/locales/ru/communes-component.json
+++ b/Server/app/svelte/public/locales/ru/communes-component.json
@@ -9,5 +9,6 @@
    "forming": "формируется",
    "WhatsAppInviteLink": "WhatsApp ссылка",
    "DiscordInviteLink": "Discord ссылка",
-    "Commune": "Коммуна"
+    "Commune": "Коммуна",
+    "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!"
 }
--- a/Server/app/svelte/public/locales/ru/cooperatives-component.json
+++ b/Server/app/svelte/public/locales/ru/cooperatives-component.json
@@ -18,5 +18,6 @@
    "descriptionChironHealth": "Chiron Health — это платформа о здоровье, предлагающая курсы и услуги по вопросам питания, физических упражнений, сна и психического благополучия",
    "herbalTeas": "травяные чаи",
    "kuuskDescription": "Kuusk — интернет-магазин, в котором продаются травяные чаи исключительно из местных дикорастущих растений, а также онлайн-курс по собирательству.",
-    "Cooperative": "Кооператив"
+    "Cooperative": "Кооператив",
+    "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!"
 }
--- a/Server/app/svelte/public/locales/ru/countries.json
+++ b/Server/app/svelte/public/locales/ru/countries.json
@@ -1,30 +1,3 @@
 {
-    "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!",
-    "Online": "Онлайн",
-    "Denmark": "Дания",
-    "Estonia": "Эстония",
-    "Greece": "Греция",
-    "Latvia": "Латвия",
-    "Canada": "Канада",
-    "Ireland": "Ирландия",
-    "Germany": "Германия",
-    "USA": "CША",
-    "Bulgaria": "Болгария",
-    "Thailand": "Тайланд",
-    "Colorado": "Колорадо",
-    "Georgia": "Джорджия",
-    "Ohio": "Огайо",
-    "Copenhagen": "Копенгаген",
-    "Kolding": "Колдинг",
-    "Kohtla-Järve": "Кохтла-Ярве",
-    "Athens": "Афины",
-    "Riga": "Рига",
-    "Halifax": "Галифакс",
-    "Montreal": "Монреаль",
-    "Wiesbaden": "Висбаден",
-    "Florida": "Флорида",
-    "Tallinn": "Таллинн",
-    "Varna": "Варна",
-    "Louisville": "Луисвилл",
-    "Toronto": "Торонто"
+
 }
--- a/Server/app/svelte/public/locales/ru/groups-component.json
+++ b/Server/app/svelte/public/locales/ru/groups-component.json
@@ -7,5 +7,6 @@
    "contact": "Контакт",
    "DiscordInviteLink": "Discord ссылка",
    "WhatsAppInviteLink": "WhatsApp ссылка",
-    "Group": "Группа"
+    "Group": "Группа",
+    "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!"
 }
--- a/Server/app/svelte/public/locales/ru/join-us-component.json
+++ b/Server/app/svelte/public/locales/ru/join-us-component.json
@@ -30,5 +30,6 @@
    "market": "Рынок",
    "workers": "Работники",
    "description": "Описание",
-    "website": "Вебсайт"
+    "website": "Вебсайт",
+    "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!"
 }
--- a/Server/app/svelte/public/locales/ru/landing-component.json
+++ b/Server/app/svelte/public/locales/ru/landing-component.json
@@ -11,5 +11,6 @@
    "findUs": "Найди нас",
    "whatNow": "Что теперь?",
    "joinUs": "Присоединяйся",
-    "talkWithUs": "Напиши нам"
+    "talkWithUs": "Напиши нам",
+    "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!"
 }
--- a/Server/app/svelte/public/locales/ru/parties-component.json
+++ b/Server/app/svelte/public/locales/ru/parties-component.json
@@ -5,9 +5,11 @@
    "name": "Имя",
    "location": "Локация",
    "members": "Участники",
-    "link": "Ссылка",
+    "website": "Вебсайт",
+    "contact": "Контакт",
    "description": "Описание",
    "ireland": "Ирландия",
    "descriptionRoots": "Мы — левая либертарная организация, базирующаяся в Ирландии. Мы уделяем особое внимание восстановлению инфраструктуры страны, самоуправлению, жилищному строительству, сельскохозяйственной промышленности и делам молодежи.",
-    "Party": "Партия"
+    "Party": "Партия",
+    "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!"
 }
--- a/Server/app/svelte/public/locales/ru/partners-component.json
+++ b/Server/app/svelte/public/locales/ru/partners-component.json
@@ -6,8 +6,10 @@
    "name": "Название",
    "location": "Локация",
    "type": "Тип",
-    "link": "Ссылка",
+    "website": "Вебсайт",
+    "contact": "Контакт",
    "description": "Описание",
    "typeGaiasFall": "место для общения",
-    "descriptionGaiasFall": "Gaia's Fall — это сервер, который продвигает идеалы соларпанка, защиту окружающей среды, анархизм и антикапитализм. Мы поощряем гражданские дебаты, обсуждение теорий и возможностей, а также создание сообществ, сосредоточенных на формировании лучшего мира."
+    "descriptionGaiasFall": "Gaia's Fall — это сервер, который продвигает идеалы соларпанка, защиту окружающей среды, анархизм и антикапитализм. Мы поощряем гражданские дебаты, обсуждение теорий и возможностей, а также создание сообществ, сосредоточенных на формировании лучшего мира.",
+    "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!"
 }
--- a/Server/app/svelte/rollup.config.js
+++ b/Server/app/svelte/rollup.config.js
@@ -10,7 +10,6 @@ import watch from "rollup-plugin-watch";

 const production = !process.env.ROLLUP_WATCH;

-
 function serve() {
 	let server;

--- a/Server/app/svelte/src/communes-add-component.svelte
+++ b/Server/app/svelte/src/communes-add-component.svelte
@@ -0,0 +1,415 @@
+<svelte:options tag="communes-add-component" />
+
+<script>
+    // Import statements
+    import { onMount } from 'svelte'
+    import { writable } from 'svelte/store'
+    import { loadLocaleContent, getData, sendData } from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    
+    // Import components
+    import "/js/components/map-component.js" 
+    import "/js/components/select-component.js" 
+    
+    // Main code
+    let loaded = writable(0)
+    let content = writable({})
+    let entries
+    let entriesByCountry
+
+    let callback = (response) => {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
+            let country = g.country
+            if (g.contact==null) {
+                g.contact = "https://discord.gg/Qk8KUk787z"
+            }
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
+            }
+            else {
+                entriesByCountry[country] = [g]
+            }
+        }
+        loaded.update((val) => {
+            return val + 1
+        })
+    }
+    getData("/assets/communes.json",callback)
+
+
+    let confirmationMsg
+    let addressInput
+    let contactInput
+    let statusInput
+    let addressVec
+    let userPinLat = 0
+    let userPinLng = 0
+    let userPin = createPin(0,0)
+    userPin.setOpacity(0)
+
+    let locale = loadLocaleContent(content,"communes-component",loaded)
+    loadLocaleContent(content,"countries",loaded)
+
+    function createPin(lat,lng) {
+        let markerIcon = new L.Icon({
+            iconUrl: '/img/common/markers/marker-black.png',
+            shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png',
+            iconSize: [25, 41],
+            iconAnchor: [12, 41],
+            popupAnchor: [1, -34],
+            shadowSize: [41, 41]
+        })
+        return L.marker([lat,lng], {icon: markerIcon})
+    }
+
+    function updatePin(marker,lat,lng) {
+        let newLatLng = L.latLng(lat, lng); // Replace with the desired coordinates
+        marker.setLatLng(newLatLng)
+    }
+
+    function reverseGeocodeLocal(latitude, longitude) {
+        let url = `https://nominatim.openstreetmap.org/reverse?lat=${latitude}&lon=${longitude}&format=jsonv2`;
+        
+        let callback = (response) => {
+            // Parse the response JSON
+            response = JSON.parse(response)
+            // Extract the address information from the response
+            let address = response.address
+            let city = address.city || address.town || address.village || address.hamlet
+            let state = address.state
+            let country = address.country
+            let fullAddress = country
+            if (state!=undefined) {
+                fullAddress += ", " + state
+            }
+            else {
+                state = ""
+            }
+            if (city!=undefined) {
+                fullAddress += ", " + city
+            }
+            else {
+                city = ""
+            }
+            addressInput.value = fullAddress
+            resizeInput(addressInput)
+        }
+        getData(url,callback)
+    }
+
+    function reverseGeocode(latitude, longitude) {
+        let url = `https://nominatim.openstreetmap.org/reverse?lat=${latitude}&lon=${longitude}&format=jsonv2&accept-language=en`;
+        
+        let callback = (response) => {
+            // Parse the response JSON
+            response = JSON.parse(response)
+            // Extract the address information from the response
+            let address = response.address
+            let city = address.city || address.town || address.village || address.hamlet
+            let state = address.state
+            let country = address.country
+            let fullAddress = country
+            if (state!=undefined) {
+                fullAddress += ", " + state
+            }
+            else {
+                state = ""
+            }
+            if (city!=undefined) {
+                fullAddress += ", " + city
+            }
+            else {
+                city = ""
+            }
+            addressVec = [country,state,city]
+        }
+        getData(url,callback)
+    }
+
+
+    function addGroupPinContent(g,content,locale) {
+        let coordinates
+        let text = "<b>"+content["Group"]+"</b><br>"
+        for (let field of ["location","members","contact"]) {
+            let fieldText = content[field] + ": "
+            if (field=="contact") {
+                text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
+            }
+            else if (field=="location") {
+                let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+                let locationString
+                if (locale=="en") {
+                    locationString = location.map(x => x).join(", ")
+                }
+                else {
+                    locationString = location.map(x => translate(content, x)).join(", ")
+                }
+                text += fieldText + locationString + "<br>"
+                coordinates = [g.latitude,g.longitude]
+            }
+            else {
+                text += fieldText + g[field] + "<br>"
+            }
+        }
+        return {text,coordinates}
+    }
+
+
+    function mapCallback(createMap,content,locale) {
+        let map = createMap([22, 0],2)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addGroupPinContent,"green")
+
+        userPin.addTo(map)
+        map.on('click', function(event) {
+            let lat = event.latlng.lat;
+            let lng = event.latlng.lng;
+            userPinLat = lat
+            userPinLng = lng
+            updatePin(userPin,lat,lng)
+            userPin.setOpacity(1)
+            reverseGeocodeLocal(lat, lng)
+            reverseGeocode(lat, lng)
+        })
+    }
+
+    function updateConfirmationMsg(response) {
+        if (response!==false) {
+
+            confirmationMsg.innerHTML = "You have been added to our database! Now go to our Discord to verify yourself."
+            confirmationMsg.style.color = "green"
+        }
+        else {
+            confirmationMsg.innerHTML = "Something went wrong."
+            confirmationMsg.style.color = "red"
+        }
+        
+    }
+
+    function submitLocation() {
+        if (addressVec!=undefined) {
+            let data = {
+                country: addressVec[0],
+                state: addressVec[1],
+                town: addressVec[2],
+                latitude: userPinLat,
+                longitude: userPinLng,
+                contact: contactInput.value,
+                status: statusInput.value
+            }
+            
+            if (data.state=="") {
+                data.state = null
+            }
+            if (data.town=="") {
+                data.town = null
+            }
+            if (data.contact=="") {
+                data.contact = null
+            }
+            let url = "/" + locale + "/communes-add-post/"
+            sendData(url,data,updateConfirmationMsg)
+        }
+    }
+
+    function resizeInput(el) {
+        el.nextElementSibling.innerHTML = el.value
+    }
+    
+    onMount(() => { 
+
+    })
+</script>
+
+{#key $loaded}
+    {#if $loaded==3}
+        <div id="container">
+            <!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
+            <div id="text-container">
+                <h1>Add a Commune</h1>
+                <img id="communes-img" src="/img/common/communes.svg" alt="communes">
+                <p class="description">If there are no communes near you who you can join and you want to start your own then do the following:</p>
+                <ol>
+                    <li>Click on the map to show us where you are located;</li>
+                    <li>Add a way to contact you or leave blank for a pin to point to our discord;</li>
+                    <li>Press "Submit" to add yourself to our map;</li>
+                    <li>Verify yourself by having a chat with us at our Discord server to show on the map;</li>
+                </ol>
+                <div id="address-input-wrapper" class="input-label-wrapper">
+                    <label for="address-input">Location: </label>
+                    <div class="input-wrapper">
+                        <input bind:this={addressInput} on:input={() => resizeInput(addressInput)} id="address-input" type="text" readonly>
+                        <div class="ghost-input"></div>
+                    </div>
+                </div>
+                <div class="input-label-wrapper">
+                    <label for="contact-input">Contact: </label>
+                    <div class="input-wrapper">
+                        <input bind:this={contactInput} on:input={() => resizeInput(contactInput)} id="contact-input" type="text">
+                        <div class="ghost-input"></div>
+                    </div>
+                </div>
+                <div id="status-input-wrapper" class="input-label-wrapper">
+                    <label for="contact-input">Status: </label>
+                    <div class="input-wrapper">
+                        <select-component bind:this={statusInput}  id="status-input" options={["forming","growing","not growing"]}></select-component>
+                        <div class="ghost-input"></div>
+                    </div>
+                </div>
+                <button id="submit-button" on:click={submitLocation}>Submit</button>
+                <p id="confirmation-msg" bind:this={confirmationMsg}></p>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
+            </div>
+        </div>
+    {/if}
+{/key}
+
+<style>
+    @import '/css/common.css';
+
+    #confirmation-msg {
+        margin-top: 0.5rem;
+        margin-bottom: 2rem;
+    }
+
+    ol li {
+        margin-left: 3rem;
+        margin-bottom: 0.5rem;
+    }
+
+    label {
+        display: inline-block;
+        font-family: var(--serif,serif);
+        font-size: 1.15rem;
+        line-height: 160%;
+        color: #222222;
+        width: 5.5rem;
+    }
+
+    input, .ghost-input {
+        font-size: 1.15rem;
+        font-family: var(--serif,serif);
+    }
+
+    input {
+        height: 2.5rem;
+        display: inline-block;
+        position: relative;
+    }
+
+    #address-input, #contact-input {
+        width: 100%;
+    }
+    
+    #address-input-wrapper {
+        margin-top: 2rem;
+        margin-bottom: 1rem;
+    }
+
+    #status-input {
+        --width: 100%;
+        --height: 2.5rem;
+        --display: inline-block;
+        --position: relative;
+        --background-color: white;
+        --border-radius: 0.4rem;
+        --border: black solid 0.063rem;
+        --padding-left: 0.5rem;
+        --font-size: 1.15rem;
+        --font-family: var(--serif, serif);
+    }
+
+    #status-input-wrapper {
+        margin-top: 1rem;
+        margin-bottom: 0rem;
+    }
+
+
+    .ghost-input {
+        display: block;
+        visibility: hidden;
+        height: 0;
+        
+        padding-left: 0.5rem;
+        padding-right: 0.5rem;
+    }
+
+    .input-wrapper {
+        display: inline-block;
+        max-width: calc(100% - 5.5rem);
+        min-width: min(20rem, calc(100% - 5.5rem));
+        height: 2.5rem;
+    }
+
+    .input-label-wrapper {
+        display: flex;
+        justify-content: start;
+    }
+
+    .input-label-wrapper label {
+        position: relative;
+        top: 0.3rem;
+    }
+
+    .description {
+        margin-bottom: 1rem;
+    }
+
+    #submit-button {
+        display: block;
+        margin: auto;
+        margin-top: 2rem;
+        padding: 1rem 2rem;
+        font-size: 1.4rem;
+        font-family: var(--sans-serif,sans-serif);
+        border: 0rem solid black;
+        border-radius: 0.5rem;
+        background: #cb1816;
+        color: white;
+    }
+
+    #communes-img {
+        position: absolute;
+        width: 11.5rem;
+        left: 50%;
+        transform: translate(-50%);
+        z-index: 0;
+        opacity: 0.2;
+    }
+
+    #text-container>:nth-child(3) {
+        margin-top: 8rem;
+    }
+
+    #map {
+        --height: 30rem;
+        --width: 100%;
+        --margin-top: 2rem;
+        --margin-bottom: 0.5rem;
+    }
+
+    #text-container {
+        position: relative;
+        max-width: calc(100vw - 4rem);
+        margin: auto;
+    }
+
+    h1 {
+        margin-bottom: 1rem;
+        font-size: 2.2rem;
+        text-align: center;
+    }
+
+    #container {
+        margin: auto;
+        max-width: 800px;
+        margin-top: 1rem;
+        margin-bottom: 4rem;
+    }
+
+    #container p {
+        text-align: justify;
+    }
+
+</style>
--- a/Server/app/svelte/src/communes-component.svelte
+++ b/Server/app/svelte/src/communes-component.svelte
@@ -3,31 +3,56 @@
 <script>
    // Import statements
    import { onMount } from 'svelte'
-    import { writable } from 'svelte/store';
-    import { communesByCountry, addMarkersCommunes } from '/js/communes.js'
-    import { loadLocaleContent } from "/js/libraries/serverTools.js"
-
+    import { writable } from 'svelte/store'
+    import { loadLocaleContent, getData} from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    import { addCommunePinContent } from "/js/mapFuncs.js"
+    
    // Import components
    import "/js/components/map-component.js" 
    
    // Main code
    let loaded = writable(0)
    let content = writable({})
+    let entries
+    let entriesByCountry

-    loadLocaleContent(content,"countries",loaded)
    let locale = loadLocaleContent(content,"communes-component",loaded)
+    loadLocaleContent(content,"countries",loaded)
+        
+    let callback = (response) => {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
+            let country = g.country
+            if (g.contact==null) {
+                g.contact = "https://discord.gg/Qk8KUk787z"
+            }
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
+            }
+            else {
+                entriesByCountry[country] = [g]
+            }
+        }
+        loaded.update((val) => {
+            return val + 1
+        })
+    }
+    getData("/assets/communes.json",callback)

-    function mapCallbackCommunes(createMap,content,locale) {
+    function mapCallback(createMap,content,locale) {
        let map = createMap([22, 0],2)
-        addMarkersCommunes(map,content,locale)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addCommunePinContent,"red")
    }

-    function getCountry(name) {
-        return locale=="en" ? name : $content[name]
+    function getCountry(x) {
+        return locale=="en" ? x : translate($content,x)
    }

-    function getAddress(group) {
-        return group.location[0].map(x => locale=="en" ? x : $content[x]).join(", ")
+    function getAddress(g) {
+        let location = [g.country,g.state,g.town].filter(x => x!=null)
+        return location.map(x => locale=="en" ? x : translate($content,x)).join(", ")
    }

    onMount(() => { 
@@ -36,25 +61,27 @@
 </script>

 {#key $loaded}
-    {#if $loaded==2}
+    {#if $loaded==3}
+
        <div id="container">
            <!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
            <div id="text-container">
                <h1>{$content.communes}</h1>
-                <img id="commune-img" src="/img/common/commune.svg" alt="commune">
+                <img id="communes-img" src="/img/common/communes.svg" alt="commune">
                <p class="description">{$content.p1}</p>
                <h3>{$content.subheading1}</h3>
-                <map-component id="map" callback={(createMap) => mapCallbackCommunes(createMap,$content,locale)}></map-component>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
                <p id="add-prompt">{$content["map-prompt"]}</p>
-                {#each Object.entries(communesByCountry) as [name,communes]}
+                {#each Object.entries(entriesByCountry) as [name,entries]}
                    <h4 class="country-name">{getCountry(name)}</h4>
                    <div class="country-block">
-                        {#each communes as commune}
+                        {#each entries as entry}
+                            
                            <div class="location-info">
-                                <p><b>{$content.location}: </b>{getAddress(commune)}</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>
+                                <p><b>{$content.location}: </b>{getAddress(entry)}</p>
+                                <p><b>{$content.status}: </b>{$content[entry.status]}</p>
+                                <p><b>{$content.members}: </b>{entry.members}</p>
+                                <p><b>{$content.contact}: </b><a href={entry.contact} target=;_blank; rel=noreferrer>{entry.contact}</a></p>
                            </div>
                        {/each}
                    </div>
@@ -75,7 +102,7 @@
        margin-bottom: 2rem;
    }

-    #commune-img {
+    #communes-img {
        position: absolute;
        width: 11.5rem;
        left: 50%;
--- a/Server/app/svelte/src/components/map-component.svelte
+++ b/Server/app/svelte/src/components/map-component.svelte
@@ -50,6 +50,8 @@
        width: var(--width,100%);
        margin-top: var(--margin-top,0);
        margin-bottom: var(--margin-bottom,0);
+        position: relative;
+        z-index: 0;
    }

 </style>
--- a/Server/app/svelte/src/components/select-component.svelte
+++ b/Server/app/svelte/src/components/select-component.svelte
@@ -194,6 +194,7 @@
    .select span {
        position: relative;
        padding-top: 0.5rem;
+        padding-left: 0.3rem;
        white-space: nowrap;
    }

--- a/Server/app/svelte/src/cooperatives-add-component.svelte
+++ b/Server/app/svelte/src/cooperatives-add-component.svelte
@@ -0,0 +1,413 @@
+<svelte:options tag="cooperatives-add-component" />
+
+<script>
+    // Import statements
+    import { onMount } from 'svelte'
+    import { writable } from 'svelte/store';
+    import { loadLocaleContent, getData, sendData } from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    
+    // Import components
+    import "/js/components/map-component.js" 
+    
+    // Main code
+    let loaded = writable(0)
+    let content = writable({})
+    let entries
+    let entriesByCountry
+
+    let callback = (response) => {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
+            let country = g.country
+            if (g.contact==null) {
+                g.contact = "https://discord.gg/Qk8KUk787z"
+            }
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
+            }
+            else {
+                entriesByCountry[country] = [g]
+            }
+        }
+        loaded.update((val) => {
+            return val + 1
+        })
+    }
+    getData("/assets/groups.json",callback)
+
+
+    let confirmationMsg
+    let addressInput
+    let contactInput
+    let addressVec
+    let userPinLat = 0
+    let userPinLng = 0
+    let userPin = createPin(0,0)
+    userPin.setOpacity(0)
+
+    let locale = loadLocaleContent(content,"groups-component",loaded)
+    loadLocaleContent(content,"countries",loaded)
+
+    function createPin(lat,lng) {
+        let markerIcon = new L.Icon({
+            iconUrl: '/img/common/markers/marker-black.png',
+            shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png',
+            iconSize: [25, 41],
+            iconAnchor: [12, 41],
+            popupAnchor: [1, -34],
+            shadowSize: [41, 41]
+        })
+        return L.marker([lat,lng], {icon: markerIcon})
+    }
+
+    function updatePin(marker,lat,lng) {
+        let newLatLng = L.latLng(lat, lng); // Replace with the desired coordinates
+        marker.setLatLng(newLatLng)
+    }
+
+    function reverseGeocodeLocal(latitude, longitude) {
+        let url = `https://nominatim.openstreetmap.org/reverse?lat=${latitude}&lon=${longitude}&format=jsonv2`;
+        
+        let callback = (response) => {
+            // Parse the response JSON
+            response = JSON.parse(response)
+            // Extract the address information from the response
+            let address = response.address
+            let city = address.city || address.town || address.village || address.hamlet
+            let state = address.state
+            let country = address.country
+            let fullAddress = country
+            if (state!=undefined) {
+                fullAddress += ", " + state
+            }
+            else {
+                state = ""
+            }
+            if (city!=undefined) {
+                fullAddress += ", " + city
+            }
+            else {
+                city = ""
+            }
+            addressInput.value = fullAddress
+            resizeInput(addressInput)
+        }
+        getData(url,callback)
+    }
+
+    function reverseGeocode(latitude, longitude) {
+        let url = `https://nominatim.openstreetmap.org/reverse?lat=${latitude}&lon=${longitude}&format=jsonv2&accept-language=en`;
+        
+        let callback = (response) => {
+            // Parse the response JSON
+            response = JSON.parse(response)
+            // Extract the address information from the response
+            let address = response.address
+            let city = address.city || address.town || address.village || address.hamlet
+            let state = address.state
+            let country = address.country
+            let fullAddress = country
+            if (state!=undefined) {
+                fullAddress += ", " + state
+            }
+            else {
+                state = ""
+            }
+            if (city!=undefined) {
+                fullAddress += ", " + city
+            }
+            else {
+                city = ""
+            }
+            addressVec = [country,state,city]
+        }
+        getData(url,callback)
+    }
+
+    function addGroupPinContent(g,content,locale) {
+        let coordinates
+        let text = "<b>"+content["Group"]+"</b><br>"
+        for (let field of ["location","members","contact"]) {
+            let fieldText = content[field] + ": "
+            if (field=="contact") {
+                text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
+            }
+            else if (field=="location") {
+                let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+                let locationString
+                if (locale=="en") {
+                    locationString = location.map(x => x).join(", ")
+                }
+                else {
+                    locationString = location.map(x => translate(content, x)).join(", ")
+                }
+                text += fieldText + locationString + "<br>"
+                coordinates = [g.latitude,g.longitude]
+            }
+            else {
+                text += fieldText + g[field] + "<br>"
+            }
+        }
+        return {text,coordinates}
+    }
+
+
+    function mapCallback(createMap,content,locale) {
+        let map = createMap([22, 0],2)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addGroupPinContent,"green")
+
+        userPin.addTo(map)
+        map.on('click', function(event) {
+            let lat = event.latlng.lat;
+            let lng = event.latlng.lng;
+            userPinLat = lat
+            userPinLng = lng
+            updatePin(userPin,lat,lng)
+            userPin.setOpacity(1)
+            reverseGeocodeLocal(lat, lng)
+            reverseGeocode(lat, lng)
+        })
+    }
+
+    function updateConfirmationMsg(response) {
+        if (response!==false) {
+
+            confirmationMsg.innerHTML = "You have been added to our database! Now go to our Discord to verify yourself."
+            confirmationMsg.style.color = "green"
+        }
+        else {
+            confirmationMsg.innerHTML = "Something went wrong."
+            confirmationMsg.style.color = "red"
+        }
+        
+    }
+
+    function submitLocation() {
+        if (addressVec!=undefined) {
+            let data = {
+                country: addressVec[0],
+                state: addressVec[1],
+                town: addressVec[2],
+                latitude: userPinLat,
+                longitude: userPinLng,
+                contact: contactInput.value
+            }
+            
+            if (data.state=="") {
+                data.state = null
+            }
+            if (data.town=="") {
+                data.town = null
+            }
+            if (data.contact=="") {
+                data.contact = null
+            }
+            let url = "/" + locale + "/groups-add-post/"
+            sendData(url,data,updateConfirmationMsg)
+        }
+    }
+
+    function resizeInput(el) {
+        el.nextElementSibling.innerHTML = el.value
+    }
+    
+    onMount(() => { 
+
+    })
+</script>
+
+{#key $loaded}
+    {#if $loaded==3}
+        <div id="container">
+            <!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
+            <div id="text-container">
+                <h1>Add a Group</h1>
+                <img id="groups-img" src="/img/common/groups.svg" alt="groups">
+                <p class="description">If there are no groups in your town with whom you can organize then do the following:</p>
+                <ol>
+                    <li>Click on the map to show us where you are located;</li>
+                    <li>Add a way to contact you or leave blank for a pin to point to our discord;</li>
+                    <li>Press "Submit" to add yourself to our map;</li>
+                    <li>Verify yourself by having a chat with us at our Discord server to show on the map;</li>
+                </ol>
+                <div id="address-input-wrapper" class="input-label-wrapper">
+                    <label for="address-input">Location: </label>
+                    <div class="input-wrapper">
+                        <input bind:this={addressInput} on:input={() => resizeInput(addressInput)} id="address-input" type="text" readonly>
+                        <div class="ghost-input"></div>
+                    </div>
+                </div>
+                <div class="input-label-wrapper">
+                    <label for="contact-input">Contact: </label>
+                    <div class="input-wrapper">
+                        <input bind:this={contactInput} on:input={() => resizeInput(contactInput)} id="contact-input" type="text">
+                        <div class="ghost-input"></div>
+                    </div>
+                </div>
+                <button id="submit-button" on:click={submitLocation}>Submit</button>
+                <p id="confirmation-msg" bind:this={confirmationMsg}></p>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
+            </div>
+        </div>
+    {/if}
+{/key}
+
+<style>
+    @import '/css/common.css';
+
+    #confirmation-msg {
+        margin-top: 0.5rem;
+        margin-bottom: 2rem;
+    }
+
+    ol li {
+        margin-left: 3rem;
+        margin-bottom: 0.5rem;
+    }
+
+    label {
+        display: inline-block;
+        font-family: var(--serif,serif);
+        font-size: 1.15rem;
+        line-height: 160%;
+        color: #222222;
+        width: 5.5rem;
+    }
+
+    input, .ghost-input {
+        font-size: 1.15rem;
+        font-family: var(--serif,serif);
+    }
+
+    input {
+        height: 2.5rem;
+        display: inline-block;
+        position: relative;
+    }
+
+    #address-input, #contact-input {
+        width: 100%;
+    }
+
+    #address-input-wrapper {
+        margin-top: 2rem;
+        margin-bottom: 1rem;
+    }
+
+    .ghost-input {
+        display: block;
+        visibility: hidden;
+        height: 0;
+        
+        padding-left: 0.5rem;
+        padding-right: 0.5rem;
+    }
+
+    .input-wrapper {
+        display: inline-block;
+        max-width: calc(100% - 5.5rem);
+        min-width: min(20rem, calc(100% - 5.5rem));
+        height: 2.5rem;
+    }
+
+    .input-label-wrapper {
+        display: flex;
+        justify-content: start;
+    }
+
+    .input-label-wrapper label {
+        position: relative;
+        top: 0.3rem;
+    }
+
+    .description {
+        margin-bottom: 1rem;
+    }
+
+    #submit-button {
+        display: block;
+        margin: auto;
+        margin-top: 2rem;
+        padding: 1rem 2rem;
+        font-size: 1.4rem;
+        font-family: var(--sans-serif,sans-serif);
+        border: 0rem solid black;
+        border-radius: 0.5rem;
+        background: #cb1816;
+        color: white;
+    }
+
+    #add-prompt {
+        margin-bottom: 2rem;
+    }
+
+    #groups-img {
+        position: absolute;
+        width: 14rem;
+        left: 50%;
+        transform: translate(-50%);
+        z-index: 0;
+        opacity: 0.2;
+    }
+
+    #text-container>:nth-child(3) {
+        margin-top: 8rem;
+    }
+
+    .country-name {
+        margin-bottom: 0.5rem;
+    }
+
+    .country-block {
+        margin-bottom: 2rem;
+    }
+
+    .location-info {
+        margin-bottom: 0.75rem;
+    }
+
+    .location-info p {
+        margin-bottom: 0;
+    }
+
+    a {
+        color: #DD1C1A;
+    }
+
+    #map {
+        --height: 30rem;
+        --width: 100%;
+        --margin-top: 2rem;
+        --margin-bottom: 0.5rem;
+    }
+
+    #text-container {
+        position: relative;
+        max-width: calc(100vw - 4rem);
+        margin: auto;
+    }
+
+    h1 {
+        margin-bottom: 1rem;
+        font-size: 2.2rem;
+        text-align: center;
+    }
+
+    h3 {
+        margin-bottom: 1rem;
+    }
+
+    #container {
+        margin: auto;
+        max-width: 800px;
+        margin-top: 1rem;
+        margin-bottom: 4rem;
+    }
+
+    #container p {
+        text-align: justify;
+    }
+
+</style>
--- a/Server/app/svelte/src/cooperatives-component.svelte
+++ b/Server/app/svelte/src/cooperatives-component.svelte
@@ -4,8 +4,9 @@
    // Import statements
    import { onMount } from 'svelte'
    import { writable } from 'svelte/store';
-    import { coopsByCountry, addMarkersCoops } from '/js/coops.js'
-    import { loadLocaleContent } from "/js/libraries/serverTools.js"
+    import { loadLocaleContent, getData} from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    import { addCoopPinContent } from "/js/mapFuncs.js"
    
    // Import components
    import "/js/components/map-component.js" 
@@ -13,21 +14,45 @@
    // Main code
    let loaded = writable(0)
    let content = writable({})
+    let entries
+    let entriesByCountry

-    let locale = loadLocaleContent(content,"countries",loaded)
-    loadLocaleContent(content,"cooperatives-component",loaded)
+    let locale = loadLocaleContent(content,"cooperatives-component",loaded)
+    loadLocaleContent(content,"countries",loaded)

-    function mapCallbackCoops(createMap,content) {
+    let callback = (response) => {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
+            let country = g.country
+            if (g.contact==null) {
+                g.contact = "https://discord.gg/Qk8KUk787z"
+            }
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
+            }
+            else {
+                entriesByCountry[country] = [g]
+            }
+        }
+        loaded.update((val) => {
+            return val + 1
+        })
+    }
+    getData("/assets/cooperatives.json",callback)
+
+    function mapCallback(createMap,content,locale) {
        let map = createMap([22, 0],2)
-        addMarkersCoops(map,content,locale)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addCoopPinContent,"blue")
    }

-    function getCountry(name) {
-        return locale=="en" ? name : $content[name]
+    function getCountry(x) {
+        return locale=="en" ? x : translate($content,x)
    }

-    function getAddress(group) {
-        return group.location[0].map(x => locale=="en" ? x : $content[x]).join(", ")
+    function getAddress(g) {
+        let location = [g.country,g.state,g.town].filter(x => x!=null)
+        return location.map(x => locale=="en" ? x : translate($content,x)).join(", ")
    }

    onMount(() => { 
@@ -36,37 +61,38 @@
 </script>

 {#key $loaded}
-    {#if $loaded==2}
+    {#if $loaded==3}
        <div id="container">
            <div id="text-container">
                <h1>{$content.cooperatives}</h1>
                <img id="coops-img" src="/img/common/coops.svg" alt="coops">
                <p class="description">{$content.p1}</p>
                <h3>{$content.subheading1}</h3>
-                <map-component id="map" callback={(createMap) => mapCallbackCoops(createMap,$content,locale)}></map-component>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
                <p id="add-prompt">{$content["map-prompt"]}</p>
-                {#each Object.entries(coopsByCountry) as [name,coops]}
+                {#each Object.entries(entriesByCountry) as [name,entries]}
                    <h4 class="country-name">{getCountry(name)}</h4>
                    <div class="country-block">
-                        {#each coops as coop}
+                        {#each entries as entry}
+                            {console.log(entry)}
                            <div class="location-info">
                                <div class="img-general-info">
                                    <div>
-                                        <p><b>{$content.name}: </b>{coop.name}</p>
-                                        <p><b>{$content.location}: </b>{getAddress(coop)}</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={coop.website[0]} target="_blank" rel=noreferrer>{coop.website[1]}</a></p>
-                                        <p><b>{$content.contact}: </b><a href={coop.contact[0]} target=;_blank; rel=noreferrer>{$content[coop.contact[1]]}</a></p>
+                                        <p><b>{$content.name}: </b>{entry.name}</p>
+                                        <p><b>{$content.location}: </b>{getAddress(entry)}</p>
+                                        <p><b>{$content.market}: </b>{entry.market}</p>
+                                        <p><b>{$content.workers}: </b>{entry.workers}</p>
+                                        <p><b>{$content.status}: </b>{entry.status}</p>
+                                        <p><b>{$content.website}: </b><a href={entry.website} target="_blank" rel=noreferrer>{entry.website}</a></p>
+                                        <p><b>{$content.contact}: </b><a href={entry.contact} target=;_blank; rel=noreferrer>{entry.contact}</a></p>
                                    </div>
                                    <picture>
-                                        <source srcset={"/img/coops/"+coop.logo+".webp"}>
-                                        <source srcset={"/img/coops/"+coop.logo+".png"}>
+                                        <source srcset={"/img/coops/"+entry.logo+".webp"}>
+                                        <source srcset={"/img/coops/"+entry.logo+".png"}>
                                        <img class="coop-logo" alt="logo">
                                    </picture>
                                </div>
-                                <p><b>{$content.description}: </b>{$content[coop.description]}</p>
+                                <p><b>{$content.description}: </b>{entry.description}</p>
                            </div>
                        {/each}
                    </div>
--- a/Server/app/svelte/src/groups-add-component.svelte
+++ b/Server/app/svelte/src/groups-add-component.svelte
@@ -4,8 +4,8 @@
    // Import statements
    import { onMount } from 'svelte'
    import { writable } from 'svelte/store';
-    import { addMarkersGroups, translate } from '/js/groups.js'
    import { loadLocaleContent, getData, sendData } from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
    
    // Import components
    import "/js/components/map-component.js" 
@@ -13,22 +13,22 @@
    // Main code
    let loaded = writable(0)
    let content = writable({})
-    let groups
-    let groupsByCountry
+    let entries
+    let entriesByCountry

    let callback = (response) => {
-        groups = JSON.parse(response)
-        groupsByCountry = {}
-        for (let g of groups) {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
            let country = g.country
            if (g.contact==null) {
                g.contact = "https://discord.gg/Qk8KUk787z"
            }
-            if (country in groupsByCountry) {
-                groupsByCountry[country].push(g)
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
            }
            else {
-                groupsByCountry[country] = [g]
+                entriesByCountry[country] = [g]
            }
        }
        loaded.update((val) => {
@@ -126,9 +126,37 @@
        getData(url,callback)
    }

-    function mapCallbackGroups(createMap,content,locale) {
+    function addGroupPinContent(g,content,locale) {
+        let coordinates
+        let text = "<b>"+content["Group"]+"</b><br>"
+        for (let field of ["location","members","contact"]) {
+            let fieldText = content[field] + ": "
+            if (field=="contact") {
+                text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
+            }
+            else if (field=="location") {
+                let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+                let locationString
+                if (locale=="en") {
+                    locationString = location.map(x => x).join(", ")
+                }
+                else {
+                    locationString = location.map(x => translate(content, x)).join(", ")
+                }
+                text += fieldText + locationString + "<br>"
+                coordinates = [g.latitude,g.longitude]
+            }
+            else {
+                text += fieldText + g[field] + "<br>"
+            }
+        }
+        return {text,coordinates}
+    }
+
+
+    function mapCallback(createMap,content,locale) {
        let map = createMap([22, 0],2)
-        addMarkersGroups(groups,groupsByCountry,map,content,locale)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addGroupPinContent,"green")

        userPin.addTo(map)
        map.on('click', function(event) {
@@ -220,7 +248,7 @@
                </div>
                <button id="submit-button" on:click={submitLocation}>Submit</button>
                <p id="confirmation-msg" bind:this={confirmationMsg}></p>
-                <map-component id="map" callback={(createMap) => mapCallbackGroups(createMap,$content,locale)}></map-component>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
            </div>
        </div>
    {/if}
--- a/Server/app/svelte/src/groups-component.svelte
+++ b/Server/app/svelte/src/groups-component.svelte
@@ -4,8 +4,9 @@
    // Import statements
    import { onMount } from 'svelte'
    import { writable } from 'svelte/store';
-    import { addMarkersGroups, translate } from '/js/groups.js'
-    import { loadLocaleContent, getData, sendData } from "/js/libraries/serverTools.js"
+    import { loadLocaleContent, getData} from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    import { addGroupPinContent } from "/js/mapFuncs.js"
    
    // Import components
    import "/js/components/map-component.js" 
@@ -13,25 +14,25 @@
    // Main code
    let loaded = writable(0)
    let content = writable({})
-    let groups
-    let groupsByCountry
+    let entries
+    let entriesByCountry

    let locale = loadLocaleContent(content,"groups-component",loaded)
    loadLocaleContent(content,"countries",loaded)

    let callback = (response) => {
-        groups = JSON.parse(response)
-        groupsByCountry = {}
-        for (let g of groups) {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
            let country = g.country
            if (g.contact==null) {
                g.contact = "https://discord.gg/Qk8KUk787z"
            }
-            if (country in groupsByCountry) {
-                groupsByCountry[country].push(g)
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
            }
            else {
-                groupsByCountry[country] = [g]
+                entriesByCountry[country] = [g]
            }
        }
        loaded.update((val) => {
@@ -40,9 +41,9 @@
    }
    getData("/assets/groups.json",callback)

-    function mapCallbackGroups(createMap,content,locale) {
+    function mapCallback(createMap,content,locale) {
        let map = createMap([22, 0],2)
-        addMarkersGroups(groups,groupsByCountry,map,content,locale)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addGroupPinContent,"green")
    }

    function getCountry(x) {
@@ -68,16 +69,16 @@
                <img id="groups-img" src="/img/common/groups.svg" alt="groups">
                <p class="description">{$content.p1}</p>
                <h3>{$content.subheading1}</h3>
-                <map-component id="map" callback={(createMap) => mapCallbackGroups(createMap,$content,locale)}></map-component>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
                <p id="add-prompt">{$content["map-prompt"]}</p>
-                {#each Object.entries(groupsByCountry) as [name,groups]}
+                {#each Object.entries(entriesByCountry) as [name,entries]}
                    <h4 class="country-name">{getCountry(name)}</h4>
                    <div class="country-block">
-                        {#each groups as group}
+                        {#each entries as entry}
                            <div class="location-info">
-                                <p><b>{$content.location}: </b>{getAddress(group)}</p>
-                                <p><b>{$content.members}: </b>{group.members}</p>
-                                <p><b>{$content.contact}: </b><a href={group.contact} target=;_blank; rel=noreferrer>{group.contact}</a></p>
+                                <p><b>{$content.location}: </b>{getAddress(entry)}</p>
+                                <p><b>{$content.members}: </b>{entry.members}</p>
+                                <p><b>{$content.contact}: </b><a href={entry.contact} target=;_blank; rel=noreferrer>{entry.contact}</a></p>
                            </div>
                        {/each}
                    </div>
--- a/Server/app/svelte/src/join-us-component.svelte
+++ b/Server/app/svelte/src/join-us-component.svelte
@@ -4,11 +4,9 @@
    // Import statements
    import { onMount } from 'svelte'
    import { writable } from 'svelte/store';
-    import { addMarkersGroups, groupsMarkersLayer } from '/js/groups.js'
-    import { addMarkersCoops, coopsMarkersLayer } from '/js/coops.js'
-    import { addMarkersCommunes, communesMarkersLayer } from '/js/communes.js'
-    import { addMarkersParties, partiesMarkersLayer } from '/js/parties.js'
    import { loadLocaleContent, getData } from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    import { addGroupPinContent, addCommunePinContent, addCoopPinContent, addPartyPinContent } from "/js/mapFuncs.js"

    // Import components
    import "/js/components/map-component.js" 
@@ -16,8 +14,8 @@
    // Main code
    let loaded = writable(0)
    let content = writable({})
-    let groups
-    let groupsByCountry
+    let entries = {}
+    let entriesByCountry ={}

    loadLocaleContent(content,"groups-component",loaded)
    loadLocaleContent(content,"communes-component",loaded)
@@ -27,40 +25,42 @@
    let locale = loadLocaleContent(content,"join-us-component",loaded)

    
-    let callback = (response) => {
-        groups = JSON.parse(response)
-        groupsByCountry = {}
-        for (let g of groups) {
+    let callback = (response,name) => {
+        entries[name] = JSON.parse(response)
+        entriesByCountry[name] = {}
+        for (let g of entries[name]) {
            let country = g.country
            if (g.contact==null) {
                g.contact = "https://discord.gg/Qk8KUk787z"
            }
-            if (country in groupsByCountry) {
-                groupsByCountry[country].push(g)
+            if (country in entriesByCountry[name]) {
+                entriesByCountry[name][country].push(g)
            }
            else {
-                groupsByCountry[country] = [g]
+                entriesByCountry[name][country] = [g]
            }
        }
        loaded.update((val) => {
            return val + 1
        })
    }
-    getData("/assets/groups.json",callback)
+    getData("/assets/groups.json",(response) => callback(response,"groups"))
+    getData("/assets/communes.json",(response) => callback(response,"communes"))
+    getData("/assets/cooperatives.json",(response) => callback(response,"cooperatives"))
+    getData("/assets/parties.json",(response) => callback(response,"parties"))

    function mapCallback(createMap,content,locale) {
        let map = createMap([22, 0],2)
-        addMarkersGroups(groups,groupsByCountry,map,content,locale)
-        addMarkersCommunes(map,content,locale)
-        addMarkersCoops(map,content,locale)
-        addMarkersParties(map,content,locale)
+        let groupsMarkersLayer = addMarkersEntries(entries["groups"],entriesByCountry["groups"],map,content,locale,addGroupPinContent,"green")
+        let communesMarkersLayer = addMarkersEntries(entries["communes"],entriesByCountry["communes"],map,content,locale,addCommunePinContent,"red")
+        let coopsMarkersLayer = addMarkersEntries(entries["cooperatives"],entriesByCountry["cooperatives"],map,content,locale,addCoopPinContent,"blue")
+        let partiesMarkersLayer = addMarkersEntries(entries["parties"],entriesByCountry["parties"],map,content,locale,addPartyPinContent,"gold")

-        let overlayMaps = {
-            "Groups": groupsMarkersLayer,
-            "Communes": communesMarkersLayer,
-            "Coops": coopsMarkersLayer,
-            "Parties": partiesMarkersLayer,
-        }
+        let overlayMaps = {}
+        overlayMaps[content.groups] = groupsMarkersLayer
+        overlayMaps[content.communes] = communesMarkersLayer
+        overlayMaps[content.cooperatives] = coopsMarkersLayer
+        overlayMaps[content.parties] = partiesMarkersLayer
        L.control.layers(null, overlayMaps).addTo(map)
    }

@@ -70,7 +70,7 @@
 </script>

 {#key $loaded}
-    {#if $loaded==7}
+    {#if $loaded==10}
        <div id="container">
            <div id="text-container">
                <h1>{$content.heading}</h1>
@@ -101,7 +101,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/Qk8KUk787z" 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,locale)} colors={["#23AC20","#CA2437","#217BC9","#FFD326"]}></map-component>
            </div>
        </div>
    {/if}
--- a/Server/app/svelte/src/landing-component.svelte
+++ b/Server/app/svelte/src/landing-component.svelte
@@ -4,11 +4,9 @@
    // Import statements
    import { onMount } from 'svelte'
    import { writable } from 'svelte/store';
-    import { addMarkersGroups, groupsMarkersLayer, translate } from '/js/groups.js'
-    import { addMarkersCoops, coopsMarkersLayer } from '/js/coops.js'
-    import { addMarkersCommunes, communesMarkersLayer } from '/js/communes.js'
-    import { addMarkersParties, partiesMarkersLayer } from '/js/parties.js'
    import { loadLocaleContent, getData } from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    import { addGroupPinContent, addCommunePinContent, addCoopPinContent, addPartyPinContent } from "/js/mapFuncs.js"

    // Import components
    import "/js/components/map-component.js" 
@@ -18,8 +16,8 @@
    let gridWidth
    let loaded = writable(0)
    let content = writable({})
-    let groups
-    let groupsByCountry
+    let entries = {}
+    let entriesByCountry ={}

    function changeWidth(locale) {
        if (locale=="ru") {
@@ -30,26 +28,29 @@
        }
    }

-    let callback = (response) => {
-        groups = JSON.parse(response)
-        groupsByCountry = {}
-        for (let g of groups) {
+    let callback = (response,name) => {
+        entries[name] = JSON.parse(response)
+        entriesByCountry[name] = {}
+        for (let g of entries[name]) {
            let country = g.country
            if (g.contact==null) {
                g.contact = "https://discord.gg/Qk8KUk787z"
            }
-            if (country in groupsByCountry) {
-                groupsByCountry[country].push(g)
+            if (country in entriesByCountry[name]) {
+                entriesByCountry[name][country].push(g)
            }
            else {
-                groupsByCountry[country] = [g]
+                entriesByCountry[name][country] = [g]
            }
        }
        loaded.update((val) => {
            return val + 1
        })
    }
-    getData("/assets/groups.json",callback)
+    getData("/assets/groups.json",(response) => callback(response,"groups"))
+    getData("/assets/communes.json",(response) => callback(response,"communes"))
+    getData("/assets/cooperatives.json",(response) => callback(response,"cooperatives"))
+    getData("/assets/parties.json",(response) => callback(response,"parties"))

    loadLocaleContent(content,"groups-component",loaded)
    loadLocaleContent(content,"communes-component",loaded)
@@ -61,10 +62,10 @@

    function mapCallback(createMap,content,locale) {
        let map = createMap([22, 0],2)
-        addMarkersGroups(groups,groupsByCountry,map,content,locale)
-        addMarkersCommunes(map,content,locale)
-        addMarkersCoops(map,content,locale)
-        addMarkersParties(map,content,locale)
+        let groupsMarkersLayer = addMarkersEntries(entries["groups"],entriesByCountry["groups"],map,content,locale,addGroupPinContent,"green")
+        let communesMarkersLayer = addMarkersEntries(entries["communes"],entriesByCountry["communes"],map,content,locale,addCommunePinContent,"red")
+        let coopsMarkersLayer = addMarkersEntries(entries["cooperatives"],entriesByCountry["cooperatives"],map,content,locale,addCoopPinContent,"blue")
+        let partiesMarkersLayer = addMarkersEntries(entries["parties"],entriesByCountry["parties"],map,content,locale,addPartyPinContent,"gold")

        let overlayMaps = {}
        overlayMaps[content.groups] = groupsMarkersLayer
@@ -81,7 +82,7 @@
 </script>

 {#key $loaded}
-    {#if $loaded==7}
+    {#if $loaded==10}
        <div id="container">
            <picture>
                <source srcset="/img/crowd.webp">
@@ -97,9 +98,9 @@
                        <p>{$content.groupsText}</p>
                    </div>
                    <div>
-                        <a href={"/" + locale + "/communes"}><h2>{$content.communesTitle}</h2></a>
-                        <img id="communes-img" src="/img/common/commune.svg" alt="communes">
-                        <p>{$content.communesText}</p>
+                        <a href={"/" + locale + "/parties"}><h2>{$content.partiesTitle}</h2></a>
+                        <img id="parties-img" src="/img/common/parties.svg" alt="coops">
+                        <p>{$content.partiesText}</p>
                    </div>
                    <div>
                        <a href={"/" + locale + "/coops"}><h2>{$content.cooperativesTitle}</h2></a>
@@ -107,9 +108,9 @@
                        <p>{$content.cooperativesText}</p>
                    </div>
                    <div>
-                        <a href={"/" + locale + "/parties"}><h2>{$content.partiesTitle}</h2></a>
-                        <img id="parties-img" src="/img/common/parties.svg" alt="coops">
-                        <p>{$content.partiesText}</p>
+                        <a href={"/" + locale + "/communes"}><h2>{$content.communesTitle}</h2></a>
+                        <img id="communes-img" src="/img/common/communes.svg" alt="communes">
+                        <p>{$content.communesText}</p>
                    </div>
                </div>
                <!--
--- a/Server/app/svelte/src/parties-add-component.svelte
+++ b/Server/app/svelte/src/parties-add-component.svelte
@@ -0,0 +1,413 @@
+<svelte:options tag="parties-add-component" />
+
+<script>
+    // Import statements
+    import { onMount } from 'svelte'
+    import { writable } from 'svelte/store';
+    import { loadLocaleContent, getData, sendData } from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    
+    // Import components
+    import "/js/components/map-component.js" 
+    
+    // Main code
+    let loaded = writable(0)
+    let content = writable({})
+    let entries
+    let entriesByCountry
+
+    let callback = (response) => {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
+            let country = g.country
+            if (g.contact==null) {
+                g.contact = "https://discord.gg/Qk8KUk787z"
+            }
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
+            }
+            else {
+                entriesByCountry[country] = [g]
+            }
+        }
+        loaded.update((val) => {
+            return val + 1
+        })
+    }
+    getData("/assets/parties.json",callback)
+
+
+    let confirmationMsg
+    let addressInput
+    let contactInput
+    let addressVec
+    let userPinLat = 0
+    let userPinLng = 0
+    let userPin = createPin(0,0)
+    userPin.setOpacity(0)
+
+    let locale = loadLocaleContent(content,"parties-component",loaded)
+    loadLocaleContent(content,"countries",loaded)
+
+    function createPin(lat,lng) {
+        let markerIcon = new L.Icon({
+            iconUrl: '/img/common/markers/marker-black.png',
+            shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png',
+            iconSize: [25, 41],
+            iconAnchor: [12, 41],
+            popupAnchor: [1, -34],
+            shadowSize: [41, 41]
+        })
+        return L.marker([lat,lng], {icon: markerIcon})
+    }
+
+    function updatePin(marker,lat,lng) {
+        let newLatLng = L.latLng(lat, lng); // Replace with the desired coordinates
+        marker.setLatLng(newLatLng)
+    }
+
+    function reverseGeocodeLocal(latitude, longitude) {
+        let url = `https://nominatim.openstreetmap.org/reverse?lat=${latitude}&lon=${longitude}&format=jsonv2`;
+        
+        let callback = (response) => {
+            // Parse the response JSON
+            response = JSON.parse(response)
+            // Extract the address information from the response
+            let address = response.address
+            let city = address.city || address.town || address.village || address.hamlet
+            let state = address.state
+            let country = address.country
+            let fullAddress = country
+            if (state!=undefined) {
+                fullAddress += ", " + state
+            }
+            else {
+                state = ""
+            }
+            if (city!=undefined) {
+                fullAddress += ", " + city
+            }
+            else {
+                city = ""
+            }
+            addressInput.value = fullAddress
+            resizeInput(addressInput)
+        }
+        getData(url,callback)
+    }
+
+    function reverseGeocode(latitude, longitude) {
+        let url = `https://nominatim.openstreetmap.org/reverse?lat=${latitude}&lon=${longitude}&format=jsonv2&accept-language=en`;
+        
+        let callback = (response) => {
+            // Parse the response JSON
+            response = JSON.parse(response)
+            // Extract the address information from the response
+            let address = response.address
+            let city = address.city || address.town || address.village || address.hamlet
+            let state = address.state
+            let country = address.country
+            let fullAddress = country
+            if (state!=undefined) {
+                fullAddress += ", " + state
+            }
+            else {
+                state = ""
+            }
+            if (city!=undefined) {
+                fullAddress += ", " + city
+            }
+            else {
+                city = ""
+            }
+            addressVec = [country,state,city]
+        }
+        getData(url,callback)
+    }
+
+    function addGroupPinContent(g,content,locale) {
+        let coordinates
+        let text = "<b>"+content["Group"]+"</b><br>"
+        for (let field of ["location","members","contact"]) {
+            let fieldText = content[field] + ": "
+            if (field=="contact") {
+                text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
+            }
+            else if (field=="location") {
+                let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+                let locationString
+                if (locale=="en") {
+                    locationString = location.map(x => x).join(", ")
+                }
+                else {
+                    locationString = location.map(x => translate(content, x)).join(", ")
+                }
+                text += fieldText + locationString + "<br>"
+                coordinates = [g.latitude,g.longitude]
+            }
+            else {
+                text += fieldText + g[field] + "<br>"
+            }
+        }
+        return {text,coordinates}
+    }
+
+
+    function mapCallback(createMap,content,locale) {
+        let map = createMap([22, 0],2)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addGroupPinContent,"green")
+
+        userPin.addTo(map)
+        map.on('click', function(event) {
+            let lat = event.latlng.lat;
+            let lng = event.latlng.lng;
+            userPinLat = lat
+            userPinLng = lng
+            updatePin(userPin,lat,lng)
+            userPin.setOpacity(1)
+            reverseGeocodeLocal(lat, lng)
+            reverseGeocode(lat, lng)
+        })
+    }
+
+    function updateConfirmationMsg(response) {
+        if (response!==false) {
+
+            confirmationMsg.innerHTML = "You have been added to our database! Now go to our Discord to verify yourself."
+            confirmationMsg.style.color = "green"
+        }
+        else {
+            confirmationMsg.innerHTML = "Something went wrong."
+            confirmationMsg.style.color = "red"
+        }
+        
+    }
+
+    function submitLocation() {
+        if (addressVec!=undefined) {
+            let data = {
+                country: addressVec[0],
+                state: addressVec[1],
+                town: addressVec[2],
+                latitude: userPinLat,
+                longitude: userPinLng,
+                contact: contactInput.value
+            }
+            
+            if (data.state=="") {
+                data.state = null
+            }
+            if (data.town=="") {
+                data.town = null
+            }
+            if (data.contact=="") {
+                data.contact = null
+            }
+            let url = "/" + locale + "/parties-add-post/"
+            sendData(url,data,updateConfirmationMsg)
+        }
+    }
+
+    function resizeInput(el) {
+        el.nextElementSibling.innerHTML = el.value
+    }
+    
+    onMount(() => { 
+
+    })
+</script>
+
+{#key $loaded}
+    {#if $loaded==3}
+        <div id="container">
+            <!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
+            <div id="text-container">
+                <h1>Add a Party</h1>
+                <img id="parties-img" src="/img/common/parties.svg" alt="parties">
+                <p class="description">If there are no parties in your country which you can join then do the following:</p>
+                <ol>
+                    <li>Click on the map to show us where you are located;</li>
+                    <li>Add a way to contact you or leave blank for a pin to point to our discord;</li>
+                    <li>Press "Submit" to add yourself to our map;</li>
+                    <li>Verify yourself by having a chat with us at our Discord server to show on the map;</li>
+                </ol>
+                <div id="address-input-wrapper" class="input-label-wrapper">
+                    <label for="address-input">Location: </label>
+                    <div class="input-wrapper">
+                        <input bind:this={addressInput} on:input={() => resizeInput(addressInput)} id="address-input" type="text" readonly>
+                        <div class="ghost-input"></div>
+                    </div>
+                </div>
+                <div class="input-label-wrapper">
+                    <label for="contact-input">Contact: </label>
+                    <div class="input-wrapper">
+                        <input bind:this={contactInput} on:input={() => resizeInput(contactInput)} id="contact-input" type="text">
+                        <div class="ghost-input"></div>
+                    </div>
+                </div>
+                <button id="submit-button" on:click={submitLocation}>Submit</button>
+                <p id="confirmation-msg" bind:this={confirmationMsg}></p>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
+            </div>
+        </div>
+    {/if}
+{/key}
+
+<style>
+    @import '/css/common.css';
+
+    #confirmation-msg {
+        margin-top: 0.5rem;
+        margin-bottom: 2rem;
+    }
+
+    ol li {
+        margin-left: 3rem;
+        margin-bottom: 0.5rem;
+    }
+
+    label {
+        display: inline-block;
+        font-family: var(--serif,serif);
+        font-size: 1.15rem;
+        line-height: 160%;
+        color: #222222;
+        width: 5.5rem;
+    }
+
+    input, .ghost-input {
+        font-size: 1.15rem;
+        font-family: var(--serif,serif);
+    }
+
+    input {
+        height: 2.5rem;
+        display: inline-block;
+        position: relative;
+    }
+
+    #address-input, #contact-input {
+        width: 100%;
+    }
+
+    #address-input-wrapper {
+        margin-top: 2rem;
+        margin-bottom: 1rem;
+    }
+
+    .ghost-input {
+        display: block;
+        visibility: hidden;
+        height: 0;
+        
+        padding-left: 0.5rem;
+        padding-right: 0.5rem;
+    }
+
+    .input-wrapper {
+        display: inline-block;
+        max-width: calc(100% - 5.5rem);
+        min-width: min(20rem, calc(100% - 5.5rem));
+        height: 2.5rem;
+    }
+
+    .input-label-wrapper {
+        display: flex;
+        justify-content: start;
+    }
+
+    .input-label-wrapper label {
+        position: relative;
+        top: 0.3rem;
+    }
+
+    .description {
+        margin-bottom: 1rem;
+    }
+
+    #submit-button {
+        display: block;
+        margin: auto;
+        margin-top: 2rem;
+        padding: 1rem 2rem;
+        font-size: 1.4rem;
+        font-family: var(--sans-serif,sans-serif);
+        border: 0rem solid black;
+        border-radius: 0.5rem;
+        background: #cb1816;
+        color: white;
+    }
+
+    #add-prompt {
+        margin-bottom: 2rem;
+    }
+
+    #parties-img {
+        position: absolute;
+        width: 14rem;
+        left: 50%;
+        transform: translate(-50%);
+        z-index: 0;
+        opacity: 0.2;
+    }
+
+    #text-container>:nth-child(3) {
+        margin-top: 8rem;
+    }
+
+    .country-name {
+        margin-bottom: 0.5rem;
+    }
+
+    .country-block {
+        margin-bottom: 2rem;
+    }
+
+    .location-info {
+        margin-bottom: 0.75rem;
+    }
+
+    .location-info p {
+        margin-bottom: 0;
+    }
+
+    a {
+        color: #DD1C1A;
+    }
+
+    #map {
+        --height: 30rem;
+        --width: 100%;
+        --margin-top: 2rem;
+        --margin-bottom: 0.5rem;
+    }
+
+    #text-container {
+        position: relative;
+        max-width: calc(100vw - 4rem);
+        margin: auto;
+    }
+
+    h1 {
+        margin-bottom: 1rem;
+        font-size: 2.2rem;
+        text-align: center;
+    }
+
+    h3 {
+        margin-bottom: 1rem;
+    }
+
+    #container {
+        margin: auto;
+        max-width: 800px;
+        margin-top: 1rem;
+        margin-bottom: 4rem;
+    }
+
+    #container p {
+        text-align: justify;
+    }
+
+</style>
--- a/Server/app/svelte/src/parties-component.svelte
+++ b/Server/app/svelte/src/parties-component.svelte
@@ -4,8 +4,9 @@
    // Import statements
    import { onMount } from 'svelte'
    import { writable } from 'svelte/store';
-    import { partiesByCountry, addMarkersParties } from '/js/parties.js'
-    import { loadLocaleContent } from "/js/libraries/serverTools.js"
+    import { loadLocaleContent, getData} from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    import { addPartyPinContent } from "/js/mapFuncs.js"

    // Import components
    import "/js/components/map-component.js" 
@@ -13,21 +14,45 @@
    // Main code
    let loaded = writable(0)
    let content = writable({})
+    let entries
+    let entriesByCountry

-    loadLocaleContent(content,"countries",loaded)
    let locale = loadLocaleContent(content,"parties-component",loaded)
+    loadLocaleContent(content,"countries",loaded)

-    function mapCallbackParties(createMap,content,locale) {
+    let callback = (response) => {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
+            let country = g.country
+            if (g.contact==null) {
+                g.contact = "https://discord.gg/Qk8KUk787z"
+            }
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
+            }
+            else {
+                entriesByCountry[country] = [g]
+            }
+        }
+        loaded.update((val) => {
+            return val + 1
+        })
+    }
+    getData("/assets/parties.json",callback)
+
+    function mapCallback(createMap,content,locale) {
        let map = createMap([22, 0],2)
-        addMarkersParties(map,content,locale)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addPartyPinContent,"gold")
    }

-    function getCountry(name) {
-        return locale=="en" ? name : $content[name]
+    function getCountry(x) {
+        return locale=="en" ? x : translate($content,x)
    }

-    function getAddress(group) {
-        return locale=="en" ? group.location : $content[group.location]
+    function getAddress(g) {
+        let location = [g.country,g.state,g.town].filter(x => x!=null)
+        return location.map(x => locale=="en" ? x : translate($content,x)).join(", ")
    }

    onMount(() => { 
@@ -36,7 +61,7 @@
 </script>

 {#key $loaded}
-    {#if $loaded==2}
+    {#if $loaded==3}
        <div id="container">
            <!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
            <div id="text-container">
@@ -44,26 +69,27 @@
                <img id="party-img" src="/img/common/parties.svg" alt="party">
                <p class="description">{$content.p1}</p>
                <h3>{$content.subheading1}</h3>
-                <map-component id="map" callback={(createMap) => mapCallbackParties(createMap,$content,locale)}></map-component>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
                <p id="add-prompt">{$content["map-prompt"]}</p>
-                {#each Object.entries(partiesByCountry) as [name,parties]}
+                {#each Object.entries(entriesByCountry) as [name,entries]}
                    <h4 class="country-name">{getCountry(name)}</h4>
                    <div class="country-block">
-                        {#each parties as party}
+                        {#each entries as entry}
                        <div class="location-info">
                            <div class="img-general-info">
                                <picture>
-                                    <source srcset={"/img/parties/"+party.logo+".webp"}>
-                                    <source srcset={"/img/parties/"+party.logo+".jpg"}>
+                                    <source srcset={"/img/parties/"+entry.logo+".webp"}>
+                                    <source srcset={"/img/parties/"+entry.logo+".jpg"}>
                                    <img class="party-logo" alt="logo">
                                </picture>
                                <div>
-                                    <p><b>{$content.name}: </b>{party.name}</p>
-                                    <p><b>{$content.location}: </b>{getAddress(party)}</p>
-                                    <p><b>{$content.link}: </b><a href={party.link} target=;_blank; rel=noreferrer>{party.link}</a></p>
+                                    <p><b>{$content.name}: </b>{entry.name}</p>
+                                    <p><b>{$content.location}: </b>{getAddress(entry)}</p>
+                                    <p><b>{$content.website}: </b><a href={entry.website} target=;_blank; rel=noreferrer>{entry.website}</a></p>
+                                    <p><b>{$content.contact}: </b><a href={entry.contact} target=;_blank; rel=noreferrer>{entry.contact}</a></p>
                                </div>
                            </div>
-                            <p><b>{$content.description}: </b>{$content[party.description]}</p>
+                            <p><b>{$content.description}: </b>{$content[entry.description]}</p>
                        </div>
                    {/each}
                    </div>
@@ -134,7 +160,7 @@
    .party-logo {
        position: relative;
        right: 0;
-        max-height: 5.5rem;
+        max-height: 6.5rem;
        max-width: 100%;
        border-radius: 1rem;
    }
--- a/Server/app/svelte/src/partners-add-component.svelte
+++ b/Server/app/svelte/src/partners-add-component.svelte
@@ -0,0 +1,195 @@
+<svelte:options tag="partners-component" />
+
+<script>
+    // Import statements
+    import { onMount } from 'svelte'
+    import { writable } from 'svelte/store';
+    import { loadLocaleContent, getData} from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    
+    // Import components
+    import "/js/components/map-component.js" 
+    
+    // Main code
+    let loaded = writable(0)
+    let content = writable({})
+    let entries
+    let entriesByCountry
+
+    let locale = loadLocaleContent(content,"groups-component",loaded)
+    loadLocaleContent(content,"countries",loaded)
+
+    let callback = (response) => {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
+            let country = g.country
+            if (g.contact==null) {
+                g.contact = "https://discord.gg/Qk8KUk787z"
+            }
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
+            }
+            else {
+                entriesByCountry[country] = [g]
+            }
+        }
+        loaded.update((val) => {
+            return val + 1
+        })
+    }
+    getData("/assets/groups.json",callback)
+
+    function addGroupPinContent(g,content,locale) {
+        let coordinates
+        let text = "<b>"+content["Group"]+"</b><br>"
+        for (let field of ["location","members","contact"]) {
+            let fieldText = content[field] + ": "
+            if (field=="contact") {
+                text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
+            }
+            else if (field=="location") {
+                let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
+                let locationString
+                if (locale=="en") {
+                    locationString = location.map(x => x).join(", ")
+                }
+                else {
+                    locationString = location.map(x => translate(content, x)).join(", ")
+                }
+                text += fieldText + locationString + "<br>"
+                coordinates = [g.latitude,g.longitude]
+            }
+            else {
+                text += fieldText + g[field] + "<br>"
+            }
+        }
+        return {text,coordinates}
+    }
+
+
+    function mapCallback(createMap,content,locale) {
+        let map = createMap([22, 0],2)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addGroupPinContent,"green")
+    }
+
+    function getCountry(x) {
+        return locale=="en" ? x : translate($content,x)
+    }
+
+    function getAddress(g) {
+        let location = [g.country,g.state,g.town].filter(x => x!=null)
+        return location.map(x => locale=="en" ? x : translate($content,x)).join(", ")
+    }
+
+    onMount(() => { 
+
+    })
+</script>
+
+{#key $loaded}
+    {#if $loaded==3}
+        <div id="container">
+            <!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
+            <div id="text-container">
+                <h1>{$content.groups}</h1>
+                <img id="groups-img" src="/img/common/groups.svg" alt="groups">
+                <p class="description">{$content.p1}</p>
+                <h3>{$content.subheading1}</h3>
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
+                <p id="add-prompt">{$content["map-prompt"]}</p>
+                {#each Object.entries(entriesByCountry) as [name,entries]}
+                    <h4 class="country-name">{getCountry(name)}</h4>
+                    <div class="country-block">
+                        {#each entries as entry}
+                            <div class="location-info">
+                                <p><b>{$content.location}: </b>{getAddress(entry)}</p>
+                                <p><b>{$content.members}: </b>{entry.members}</p>
+                                <p><b>{$content.contact}: </b><a href={entry.contact} target=;_blank; rel=noreferrer>{entry.contact}</a></p>
+                            </div>
+                        {/each}
+                    </div>
+                {/each}
+            </div>
+        </div>
+    {/if}
+{/key}
+
+<style>
+    @import '/css/common.css';
+
+    .description {
+        margin-bottom: 1rem;
+    }
+
+    #add-prompt {
+        margin-bottom: 2rem;
+    }
+
+    #groups-img {
+        position: absolute;
+        width: 14rem;
+        left: 50%;
+        transform: translate(-50%);
+        z-index: 0;
+        opacity: 0.2;
+    }
+
+    #text-container>:nth-child(3) {
+        margin-top: 8rem;
+    }
+
+    .country-name {
+        margin-bottom: 0.5rem;
+    }
+
+    .country-block {
+        margin-bottom: 2rem;
+    }
+
+    .location-info {
+        margin-bottom: 0.75rem;
+    }
+
+    .location-info p {
+        margin-bottom: 0;
+    }
+
+    a {
+        color: #DD1C1A;
+    }
+
+    #map {
+        --height: 30rem;
+        --width: 100%;
+        --margin-bottom: 0.5rem;
+    }
+
+    #text-container {
+        position: relative;
+        max-width: calc(100vw - 4rem);
+        margin: auto;
+    }
+
+    h1 {
+        margin-bottom: 1rem;
+        font-size: 2.2rem;
+        text-align: center;
+    }
+
+    h3 {
+        margin-bottom: 1rem;
+    }
+
+    #container {
+        margin: auto;
+        max-width: 800px;
+        margin-top: 1rem;
+        margin-bottom: 4rem;
+    }
+
+    #container p {
+        text-align: justify;
+    }
+
+</style>
--- a/Server/app/svelte/src/partners-component.svelte
+++ b/Server/app/svelte/src/partners-component.svelte
@@ -4,25 +4,55 @@
    // Import statements
    import { onMount } from 'svelte'
    import { writable } from 'svelte/store';
-    import { loadLocaleContent } from "/js/libraries/serverTools.js"
-    import { partnersByCountry } from '/js/partners.js'
-
+    import { loadLocaleContent, getData} from "/js/libraries/serverTools.js"
+    import { addMarkersEntries, translate } from "/js/libraries/mapTools.js"
+    import { addPartnersPinContent } from "/js/mapFuncs.js"
+    
    // Import components
    import "/js/components/map-component.js" 
    
    // Main code
    let loaded = writable(0)
    let content = writable({})
+    let entries
+    let entriesByCountry

-    loadLocaleContent(content,"countries",loaded)
    let locale = loadLocaleContent(content,"partners-component",loaded)
+    loadLocaleContent(content,"countries",loaded)

-    function getCountry(name) {
-        return locale=="en" ? name : $content[name]
+    let callback = (response) => {
+        entries = JSON.parse(response)
+        entriesByCountry = {}
+        for (let g of entries) {
+            let country = g.country
+            if (g.contact==null) {
+                g.contact = "https://discord.gg/Qk8KUk787z"
+            }
+            if (country in entriesByCountry) {
+                entriesByCountry[country].push(g)
+            }
+            else {
+                entriesByCountry[country] = [g]
+            }
+        }
+        loaded.update((val) => {
+            return val + 1
+        })
+    }
+    getData("/assets/partners.json",callback)
+
+    function mapCallback(createMap,content,locale) {
+        let map = createMap([22, 0],2)
+        addMarkersEntries(entries,entriesByCountry,map,content,locale,addPartnersPinContent,"blue")
    }

-    function getAddress(group) {
-        return group.location[0].map(x => locale=="en" ? x : $content[x]).join(", ")
+    function getCountry(x) {
+        return locale=="en" ? x : translate($content,x)
+    }
+
+    function getAddress(g) {
+        let location = [g.country,g.state,g.town].filter(x => x!=null)
+        return location.map(x => locale=="en" ? x : translate($content,x)).join(", ")
    }

    onMount(() => { 
@@ -31,7 +61,7 @@
 </script>

 {#key $loaded}
-    {#if $loaded==2}
+    {#if $loaded==3}
        <div id="container">
            <!--<img src="img/crowd.png" id="crowd" alt="crowd">-->
            <div id="text-container">
@@ -39,25 +69,27 @@
                <img id="hands-img" src="/img/common/handshake.svg" alt="hands">
                <p>{$content.p1}</p>
                <h3>{$content.subheading1}</h3>
-                {#each Object.entries(partnersByCountry) as [name,partners]}
+                <map-component id="map" callback={(createMap) => mapCallback(createMap,$content,locale)}></map-component>
+                <p id="add-prompt">{$content["map-prompt"]}</p>
+                {#each Object.entries(entriesByCountry) as [name,entries]}
                    <h4 class="country-name">{getCountry(name)}</h4>
                    <div class="country-block">
-                        {#each partners as partner}
+                        {#each entries as entry}
                        <div class="location-info">
                            <div class="img-general-info">
                                <picture>
-                                    <source srcset={"/img/partners/"+partner.logo+".webp"}>
-                                    <source srcset={"/img/partners/"+partner.logo+".jpg"}>
+                                    <source srcset={"/img/partners/"+entry.logo+".webp"}>
+                                    <source srcset={"/img/partners/"+entry.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>{getAddress(partner)}</p>
-                                    <p><b>{$content.link}: </b><a href={partner.link} target=;_blank; rel=noreferrer>{partner.link}</a></p>
+                                    <p><b>{$content.name}: </b>{entry.name}</p>
+                                    <p><b>{$content.location}: </b>{getAddress(entry)}</p>
+                                    <p><b>{$content.website}: </b><a href={entry.website} target=;_blank; rel=noreferrer>{entry.website}</a></p>
+                                    <p><b>{$content.contact}: </b><a href={entry.website} target=;_blank; rel=noreferrer>{entry.contact}</a></p>
                                </div>
                            </div>
-                            <p><b>{$content.description}: </b>{$content[partner.description]}</p>
+                            <p><b>{$content.description}: </b>{entry.description}</p>
                        </div>
                    {/each}
                    </div>
@@ -133,7 +165,7 @@
    #map {
        --height: 30rem;
        --width: 100%;
-        --margin-bottom: 3rem;
+        --margin-bottom: 0.5rem;
    }

    #text-container {
@@ -148,7 +180,7 @@
    }

    h3 {
-        margin-bottom: 2rem;
+        margin-bottom: 1rem;
    }

    #container {
				`@@ -0,0 +1 @@`
				`<communes-add-component></communes-add-component>`
				`@@ -0,0 +1 @@`
				`<cooperatives-add-component></cooperatives-add-component>`
				`@@ -0,0 +1 @@`
				`<parties-add-component></parties-add-component>`
				`@@ -0,0 +1 @@`
				`<partners-add-component></partners-add-component>`