From ca28d3c2d027806d95752a669f6f5f990b66cfea Mon Sep 17 00:00:00 2001 From: a-ill Date: Wed, 12 Jul 2023 01:42:33 +0300 Subject: [PATCH] Update --- Server/app/resources/basic/BasicController.jl | 14 ++--- .../resources/basic/views/communes.jl.html | 1 + .../resources/basic/views/communities.jl.html | 1 - .../public/js/{communities.js => communes.js} | 6 +-- Server/app/svelte/public/js/groups.js | 5 ++ .../public/locales/en/communes-component.json | 16 ++++++ .../locales/en/communities-component.json | 16 ------ .../public/locales/en/groups-component.json | 3 +- .../public/locales/en/join-us-component.json | 2 +- .../public/locales/en/landing-component.json | 6 +-- .../public/locales/en/navbar-component.json | 2 +- ...component.json => communes-component.json} | 0 .../public/locales/ru/groups-component.json | 3 +- .../public/locales/ru/navbar-component.json | 2 +- ...onent.svelte => communes-component.svelte} | 26 ++++----- .../app/svelte/src/join-us-component.svelte | 2 +- .../app/svelte/src/landing-component.svelte | 8 +-- .../svelte/src/navbar/navbar-component.svelte | 2 +- .../common/{communities.svg => commune.svg} | 0 Server/public/js/communes.js | 54 +++++++++++++++++++ .../js/components/communes-component.js | 1 + .../public/js/components/join-us-component.js | 2 +- .../public/js/components/landing-component.js | 2 +- .../public/js/components/navbar-component.js | 2 +- Server/public/js/groups.js | 5 ++ .../public/locales/en/communes-component.json | 16 ++++++ .../public/locales/en/groups-component.json | 3 +- .../public/locales/en/join-us-component.json | 2 +- .../public/locales/en/landing-component.json | 6 +-- Server/public/locales/en/manifesto.txt | 25 +++++---- .../public/locales/en/navbar-component.json | 2 +- .../public/locales/ru/communes-component.json | 16 ++++++ .../public/locales/ru/groups-component.json | 3 +- .../public/locales/ru/navbar-component.json | 2 +- Server/routes.jl | 3 +- 35 files changed, 184 insertions(+), 75 deletions(-) create mode 100644 Server/app/resources/basic/views/communes.jl.html delete mode 100644 Server/app/resources/basic/views/communities.jl.html rename Server/app/svelte/public/js/{communities.js => communes.js} (94%) create mode 100644 Server/app/svelte/public/locales/en/communes-component.json delete mode 100644 Server/app/svelte/public/locales/en/communities-component.json rename Server/app/svelte/public/locales/ru/{communities-component.json => communes-component.json} (100%) rename Server/app/svelte/src/{communities-component.svelte => communes-component.svelte} (74%) rename Server/public/img/common/{communities.svg => commune.svg} (100%) create mode 100644 Server/public/js/communes.js create mode 100644 Server/public/js/components/communes-component.js create mode 100644 Server/public/locales/en/communes-component.json create mode 100644 Server/public/locales/ru/communes-component.json diff --git a/Server/app/resources/basic/BasicController.jl b/Server/app/resources/basic/BasicController.jl index 074cf43..cb4b5b7 100644 --- a/Server/app/resources/basic/BasicController.jl +++ b/Server/app/resources/basic/BasicController.jl @@ -12,7 +12,7 @@ dict_layouts = Dict( :join_us => generate_layout_html("main",controller,"join_us",libraries=["Leaflet"]), :groups => generate_layout_html("main",controller,"groups",libraries=["Leaflet"]), :cooperatives => generate_layout_html("main",controller,"cooperatives",libraries=["Leaflet"]), - :communities => generate_layout_html("main",controller,"communities",libraries=["Leaflet"]), + :communes => generate_layout_html("main",controller,"communes",libraries=["Leaflet"]), :partners => generate_layout_html("main",controller,"partners",libraries=["Leaflet"]), :compass => generate_layout_html("main",controller,"compass"), ) @@ -74,9 +74,9 @@ const cooperatives_info = Dict( ) ) -const communities_info = Dict( +const communes_info = Dict( "en" => Dict( - :title => "LibSoc - Communities", + :title => "LibSoc - Communes", :description => "" ), "ru" => Dict( @@ -158,11 +158,11 @@ function cooperatives() ) end -function communities() +function communes() locale = get_locale() - html(:basic,:communities, layout = dict_layouts[:communities], context = @__MODULE__, - title = communities_info[locale][:title], - description = communities_info[locale][:description] + html(:basic,:communes, layout = dict_layouts[:communes], context = @__MODULE__, + title = communes_info[locale][:title], + description = communes_info[locale][:description] ) end diff --git a/Server/app/resources/basic/views/communes.jl.html b/Server/app/resources/basic/views/communes.jl.html new file mode 100644 index 0000000..e5c9fbd --- /dev/null +++ b/Server/app/resources/basic/views/communes.jl.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Server/app/resources/basic/views/communities.jl.html b/Server/app/resources/basic/views/communities.jl.html deleted file mode 100644 index 6363163..0000000 --- a/Server/app/resources/basic/views/communities.jl.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Server/app/svelte/public/js/communities.js b/Server/app/svelte/public/js/communes.js similarity index 94% rename from Server/app/svelte/public/js/communities.js rename to Server/app/svelte/public/js/communes.js index 0165dfa..f842a07 100644 --- a/Server/app/svelte/public/js/communities.js +++ b/Server/app/svelte/public/js/communes.js @@ -1,5 +1,5 @@ -export let communities = [ +export let communes = [ { location: ["CanadaMontreal",[45.55541047232767, -73.42859611607271]], status: "forming", @@ -20,8 +20,8 @@ export let communities = [ } ] -export function addMarkersCommunities(map,content) { - for (let g of communities) { +export function addMarkersCommunes(map,content) { + for (let g of communes) { let coordinates let text = "" for (let field in g) { diff --git a/Server/app/svelte/public/js/groups.js b/Server/app/svelte/public/js/groups.js index 1c515dc..c4ffa36 100644 --- a/Server/app/svelte/public/js/groups.js +++ b/Server/app/svelte/public/js/groups.js @@ -24,6 +24,11 @@ export let groups = [ members: 1, contact: ["https://chat.whatsapp.com/BhnmUNljUxJ2AjeHUwyTKh","WhatsAppInviteLink"] }, + { + location: ["Ireland", [53.280192832733576, -7.688103518964818]], + members: 6, + contact: ["https://discord.gg/4BUau4AZre","DiscordInviteLink"] + }, { location: ["LatviaRiga", [56.94748425529816, 24.003027136431925]], members: 2, diff --git a/Server/app/svelte/public/locales/en/communes-component.json b/Server/app/svelte/public/locales/en/communes-component.json new file mode 100644 index 0000000..96f51f2 --- /dev/null +++ b/Server/app/svelte/public/locales/en/communes-component.json @@ -0,0 +1,16 @@ +{ + "heading": "Communes", + "p1": "We establish libertarian socialist communes by buying land, housing and the means of production which are then owned by the members of these communes. There is no private property within the communes and, therefore, exploitation and suffering that comes with it. Decisions are made using direct democracy with a focus on consensus, ensuring that each commune member has power over decisions that affect their life. Communes try to establish their own cooperatives in order to finance their development becoming financially independent and sustainable, which allows for their survival and growth. Within communes the gift economy is utilized whenever possible. Each commune is a small beacon of socialism within the dark capitalist world showing us how good life can be if only we achieve our goal.", + "subheading1": "Our Communes", + "subheading2": "Europe", + "location": "Location", + "status": "Status", + "members": "Members", + "contact": "Contact", + "EstoniaKohtlaJarve": "Estonia, Kohtla-Järve", + "forming": "forming", + "WhatsAppInviteLink": "WhatsApp invite link", + "DiscordInviteLink": "Discord invite link", + "CanadaMontreal": "Canada, Montreal", + "Latvia": "Latvia" +} \ No newline at end of file diff --git a/Server/app/svelte/public/locales/en/communities-component.json b/Server/app/svelte/public/locales/en/communities-component.json deleted file mode 100644 index 5aa0bfc..0000000 --- a/Server/app/svelte/public/locales/en/communities-component.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "heading": "Communities", - "p1": "We establish libertarian socialist communities by buying land, housing and the means of production which are then owned by the members of these communities. There is no private property within the communities and, therefore, exploitation and suffering that comes with it. Decisions are made using direct democracy with a focus on consensus, ensuring that each community member has power over decisions that affect their life. Communities try to establish their own cooperatives in order to finance their development becoming financially independent and sustainable, which allows for their survival and growth. Within communities the gift economy is utilized whenever possible. Each community is a small beacon of socialism within the dark capitalist world showing us how good life can be if only we achieve our goal.", - "subheading1": "Our Communities", - "subheading2": "Europe", - "location": "Location", - "status": "Status", - "members": "Members", - "contact": "Contact", - "EstoniaKohtlaJarve": "Estonia, Kohtla-Järve", - "forming": "forming", - "WhatsAppInviteLink": "WhatsApp invite link", - "DiscordInviteLink": "Discord invite link", - "CanadaMontreal": "Canada, Montreal", - "Latvia": "Latvia" -} \ No newline at end of file diff --git a/Server/app/svelte/public/locales/en/groups-component.json b/Server/app/svelte/public/locales/en/groups-component.json index 1dd917c..48d4ac8 100644 --- a/Server/app/svelte/public/locales/en/groups-component.json +++ b/Server/app/svelte/public/locales/en/groups-component.json @@ -14,5 +14,6 @@ "EstoniaKohtlaJarve": "Estonia, Kohtla-Järve", "GreeceAthens": "Greece, Athens", "LatviaRiga": "Latvia, Riga", - "CanadaHalifax": "Canada, Halifax" + "CanadaHalifax": "Canada, Halifax", + "Ireland": "Ireland" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/en/join-us-component.json b/Server/app/svelte/public/locales/en/join-us-component.json index 48746ce..4f90b14 100644 --- a/Server/app/svelte/public/locales/en/join-us-component.json +++ b/Server/app/svelte/public/locales/en/join-us-component.json @@ -13,7 +13,7 @@ "subheading2": "Find Us", "findOur": "Find our", "group": "group", - "community": "community", + "commune": "commune", "or": "or", "cooperative": "cooperative", "nearYou": "near you and join to help make a world we both envision a reality.", diff --git a/Server/app/svelte/public/locales/en/landing-component.json b/Server/app/svelte/public/locales/en/landing-component.json index 34d74ae..62bc5a4 100644 --- a/Server/app/svelte/public/locales/en/landing-component.json +++ b/Server/app/svelte/public/locales/en/landing-component.json @@ -2,8 +2,8 @@ "top": "We are people united around a singular cause: bringing down authoritarian exploitative systems represented by various forms of capitalism and replacing them with libertarian socialist systems, with the goal of creating a more equitable and democratic world.", "groupsTitle": "GROUPS", "groupsText": "We organize groups for the purposes of education, advocacy, and mutual aid. Our objective is to demonstrate to people how the current politico-economic systems detrimentally impact our well-being, present them with alternative approaches, and engage in mutual aid to alleviate the challenges of living under capitalism.", - "communitiesTitle": "COMMUNITIES", - "communitiesText": "We establish communities based on libertarian socialist principles, where community members have ownership over land, houses, and the means of production as well as make decisions using direct democracy. We are gradually expanding our socialist world, one community at a time.", + "communesTitle": "COMMUNES", + "communesText": "We establish communes based on libertarian socialist principles, where commune members have ownership over land, houses, and the means of production as well as make decisions using direct democracy. We are gradually expanding our socialist world, one commune at a time.", "cooperativesTitle": "COOPERATIVES", - "cooperativesText": "We form worker cooperatives to finance the operations of our groups and communities. Recognizing that economic power influences political power, we consider the establishment of cooperatives to be one of the initial steps towards achieving socialism." + "cooperativesText": "We form worker cooperatives to finance the operations of our groups and communes. Recognizing that economic power influences political power, we consider the establishment of cooperatives to be one of the initial steps towards achieving socialism." } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/en/navbar-component.json b/Server/app/svelte/public/locales/en/navbar-component.json index 275329b..4501b50 100644 --- a/Server/app/svelte/public/locales/en/navbar-component.json +++ b/Server/app/svelte/public/locales/en/navbar-component.json @@ -3,7 +3,7 @@ "manifesto": "Manifesto", "joinUs": "Join Us", "groups": "Groups", - "communities": "Communities", + "communes": "Communes", "cooperatives": "Cooperatives", "partners": "Partners" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/ru/communities-component.json b/Server/app/svelte/public/locales/ru/communes-component.json similarity index 100% rename from Server/app/svelte/public/locales/ru/communities-component.json rename to Server/app/svelte/public/locales/ru/communes-component.json diff --git a/Server/app/svelte/public/locales/ru/groups-component.json b/Server/app/svelte/public/locales/ru/groups-component.json index debc525..8ccb83b 100644 --- a/Server/app/svelte/public/locales/ru/groups-component.json +++ b/Server/app/svelte/public/locales/ru/groups-component.json @@ -14,5 +14,6 @@ "EstoniaKohtlaJarve": "Эстония, Кохтла-Ярве", "GreeceAthens": "Греция, Афины", "LatviaRiga": "Латвия, Рига", - "CanadaHalifax": "Канада, Галифакс" + "CanadaHalifax": "Канада, Галифакс", + "Ireland": "Ирландия" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/ru/navbar-component.json b/Server/app/svelte/public/locales/ru/navbar-component.json index 6599ced..9428093 100644 --- a/Server/app/svelte/public/locales/ru/navbar-component.json +++ b/Server/app/svelte/public/locales/ru/navbar-component.json @@ -3,7 +3,7 @@ "manifesto": "Манифест", "joinUs": "Присоединяйся", "groups": "Группы", - "communities": "Коммуны", + "communes": "Коммуны", "cooperatives": "Кооперативы", "partners": "Партнеры" } \ No newline at end of file diff --git a/Server/app/svelte/src/communities-component.svelte b/Server/app/svelte/src/communes-component.svelte similarity index 74% rename from Server/app/svelte/src/communities-component.svelte rename to Server/app/svelte/src/communes-component.svelte index e9807dd..1e5125a 100644 --- a/Server/app/svelte/src/communities-component.svelte +++ b/Server/app/svelte/src/communes-component.svelte @@ -1,10 +1,10 @@ - +