Added trade unions

Server/public/assets/trade-unions.json

@@ -0,0 +1 @@
+[]

Server/public/img/common/coops.svg

@@ -1,3 +1,3 @@
-<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-gear-fill"  fill="#5B6970" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 0 1-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 0 1 .872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 0 1 2.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 0 1 2.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 0 1 .872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 0 1-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 0 1-2.105-.872l-.1-.34zM8 10.93a2.929 2.929 0 1 0 0-5.86 2.929 2.929 0 0 0 0 5.858z"/>
+<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-gear-fill" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd"  fill="#5B6970" d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 0 1-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 0 1 .872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 0 1 2.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 0 1 2.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 0 1 .872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 0 1-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 0 1-2.105-.872l-.1-.34zM8 10.93a2.929 2.929 0 1 0 0-5.86 2.929 2.929 0 0 0 0 5.858z"/>
 </svg>

Server/public/img/common/groups.svg

@@ -1 +1 @@
-<svg viewBox="0 0 640 512" xmlns="http://www.w3.org/2000/svg" fill="#5B6970"><path d="m96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm448 0c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm32 32h-64c-17.6 0-33.5 7.1-45.1 18.6 40.3 22.1 68.9 62 75.1 109.4h66c17.7 0 32-14.3 32-32v-32c0-35.3-28.7-64-64-64zm-256 0c61.9 0 112-50.1 112-112s-50.1-112-112-112-112 50.1-112 112 50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3c-63.6 0-115.2 51.6-115.2 115.2v28.8c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zm-223.7-13.4c-11.6-11.5-27.5-18.6-45.1-18.6h-64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"/></svg>
+<svg viewBox="0 0 640 512" xmlns="http://www.w3.org/2000/svg"><path fill="#5B6970" d="m96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm448 0c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm32 32h-64c-17.6 0-33.5 7.1-45.1 18.6 40.3 22.1 68.9 62 75.1 109.4h66c17.7 0 32-14.3 32-32v-32c0-35.3-28.7-64-64-64zm-256 0c61.9 0 112-50.1 112-112s-50.1-112-112-112-112 50.1-112 112 50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3c-63.6 0-115.2 51.6-115.2 115.2v28.8c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zm-223.7-13.4c-11.6-11.5-27.5-18.6-45.1-18.6h-64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"/></svg>

Server/public/img/common/trade-unions.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 655.51 492.22">
+  <g>
+    <path id="path4" style="fill-rule: evenodd;" fill="#5B6970" d="m89.92,237.33c-8.97,2.22-18.14-3.38-20.26-12.35-2.22-8.97,3.38-18.14,12.35-20.26l240.37-58.67c8.97-2.22,18.14,3.38,20.26,12.35,2.22,8.97-3.38,18.14-12.35,20.26l-240.37,58.67Zm484.89,27.21c8.97,2.22,14.57,11.29,12.35,20.26s-11.29,14.57-20.26,12.35l-93.31-22.77c-8.97-2.22-14.57-11.29-12.35-20.26s11.29-14.57,20.26-12.35l93.31,22.77Zm9.75-83.57c9.07,2.12,14.67,11.19,12.54,20.17-2.12,9.07-11.19,14.67-20.17,12.54l-58.38-13.7c-9.07-2.12-14.67-11.19-12.54-20.17,2.12-9.07,11.19-14.67,20.17-12.54l58.38,13.7Zm-504.67-27.02c-9.07,2.12-18.14-3.57-20.17-12.54-2.12-9.07,3.57-18.14,12.54-20.17l169.25-39.66c9.07-2.12,18.14,3.57,20.17,12.54,2.12,9.07-3.57,18.14-12.54,20.17l-169.25,39.66Zm568.65-1.35l-206.6-50.37,20.65,83.18c3.47,13.99.87,27.98-6.08,39.47-6.85,11.29-18.14,19.97-31.94,23.45l-1.83.48c0,.1-.58.19-.77.19-52.3,8.4-96.5,16.79-134.23,24.41l-.19-.68-76.04,18.53,24.61,94.26c14.64,15.58,14.53,15.41,42.91,15.51,24.29-8.42,24.27-8.66,32.54-30.55l-22.77-92.06c1.16,1.06,2.61,1.93,4.25,2.32l305.22,74.4c4.92,1.25,10.04-1.83,11.19-6.85l45.74-184.6c1.35-4.82-1.74-9.94-6.66-11.1ZM7.03,88.34L363.1.24c5.02-1.16,10.04,1.93,11.29,6.95l46.8,188.46c1.25,4.92-1.83,10.04-6.85,11.19L58.27,294.94c-4.92,1.25-10.04-1.83-11.19-6.85L.28,99.63c-1.25-5.02,1.83-10.04,6.75-11.29Zm477.94,262.08l-76.04-18.53-22,107.4c4.23,26.34,3.74,25.6,26.68,38.88,24.82,2.87,25.17,3.26,46.02-13.91l25.34-113.85Z"/>
+    <path fill="#5B6970" d="m217.55,281.13h91.49v109.1c0,25.25-20.5,45.75-45.75,45.75h0c-25.25,0-45.75-20.5-45.75-45.75v-109.1h0Z" transform="translate(-76.12 71.01) rotate(-13.44)"/>
+    <path fill="#5B6970" d="m388.68,338.32h81.35v114.18c0,22.45-18.23,40.68-40.68,40.68h0c-22.45,0-40.68-18.23-40.68-40.68v-114.18h0Z" transform="translate(104.8 -86.1) rotate(13.03)"/>
+  </g>
+</svg>

Server/public/js/components/profile-trade-unions.js

@@ -0,0 +1 @@
+import{S as t,i as s,a as e,b as o,s as r,h as a,j as n,n as i,z as d,d as c,o as l}from"./index-0d9f0c09.js";import"../../../../../../../../../js/libraries/authTools.js";function h(t){let s,e,r;return{c(){s=a("h3"),s.textContent="Under development",e=n(),r=a("p"),r.innerHTML='Visit <a href="https://discord.gg/Qk8KUk787z" style="color: #c52a28;">https://discord.gg/Qk8KUk787z</a> and ask for your trade union to be added.',this.c=i,d(r,"position","relative"),d(r,"margin-top","2rem")},m(t,a){o(t,s,a),o(t,e,a),o(t,r,a)},p:i,i:i,o:i,d(t){t&&c(s),t&&c(e),t&&c(r)}}}function p(t){return l((()=>{})),[]}class u extends t{constructor(t){super(),this.shadowRoot.innerHTML="<style>@import '/css/common.css';h3{text-align:center}</style>",s(this,{target:this.shadowRoot,props:e(this.attributes),customElement:!0},p,h,r,{},null),t&&t.target&&o(t.target,this,t.anchor)}}customElements.define("profile-trade-unions",u);export{u as default};

Server/public/js/libraries/miscTools.js

@@ -13,9 +13,9 @@ export function debounce(func, timeout){
 }
 
 export function svgFromObject(object) {
-    var objectDoc = object.contentDocument;
-    var svgItem = objectDoc.querySelector("path");
-    return svgItem
+    var objectDoc = object.contentDocument
+    var svgItems = objectDoc.querySelectorAll("path")
+    return svgItems
 }
 
 export function rem2px(rem) {

Server/public/js/mapFuncs.js

@@ -6,7 +6,15 @@ export function addGroupPinContent(g,content,locale) {
     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>"
+            if (g.contact.includes("@") && g.contact.trim().split(" ").length==1) {
+                text += fieldText + "<a href='mailto:" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
+            }
+            else if (g.contact.includes("http")) {
+                text += fieldText + "<a href='" + g.contact + "' target='_blank' rel=noreferrer>" + g.contact + "</a>"
+            }
+            else {
+                text += fieldText + g.contact + "<br>"
+            } 
         }
         else if (field=="location") {
             let location = [g.country,g.state,g.town].filter(x => x!=null && x!=undefined)
@@ -175,4 +183,31 @@ export function addPartnersPinContent(g,content,locale) {
         }
     }
     return {text,coordinates}
+}
+
+export function addTradeUnionPinContent(g,content,locale) {
+    let coordinates
+    let text = "<b>"+content["TradeUnion"]+"</b><br>"
+    for (let field of ["name","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}
 }

Server/public/locales/en/landing-component.json

@@ -1,13 +1,15 @@
 {
     "top": "Our organization is a decentralized federation build upon the principle of free association. It consists of many groups of people united around a cause of bringing down exploitative politico-economic systems. We aim to replace them with libertarian socialist systems based on decentralization, direct democracy and worker-ownership of the means of production with the goal of creating an equitable, democratic and sustainable world by stopping exploitation of humans and nature.",
     "groupsTitle": "GROUPS",
-    "groupsText": "We organize groups for the purposes of education, advocacy, anti-fascist action and mutual aid. Our objective is to demonstrate how the current politico-economic systems detrimentally impact our well-being, present alternative approaches, and engage in mutual aid to alleviate the challenges of living under capitalism.",
+    "groupsText": "We organize groups for the purposes of education, advocacy, anti-fascist action and mutual aid. Our objective is to demonstrate how the current politico-economic systems detrimentally impact our well-being, present alternative approaches, and engage in mutual aid.",
     "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 communes. 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 a vital activity.",
     "partiesTitle": "PARTIES",
     "partiesText": "We create political parties in order to push for reforms allowing us to easier further our goals, to move the Overton window as well as to gain popularity. However, we recognize that we cannot achieve libertarian socialism through institutions which act contrary to our goals.",
+    "tradeUnionsTitle": "TRADE UNIONS",
+    "tradeUnionsText": "We promote trade unions, which empower laborers to collectively advocate for fair treatment, just wages, and improved working conditions. Struggle at a place of work is an integral part of our strategy to achieve libertarian socialism.",
     "findUs": "Find Us",
     "whatNow": "What Now?",
     "joinUs": "Join Us",

Server/public/locales/en/navbar-component.json

@@ -7,6 +7,7 @@
     "communes": "Communes",
     "cooperatives": "Cooperatives",
     "parties": "Parties",
+    "tradeUnions": "Trade Unions",
     "partners": "Partners",
     "login": "Login",
     "profile": "Profile"

Server/public/locales/en/trade-unions-component.json

@@ -0,0 +1,11 @@
+{
+    "tradeUnions": "Trade Unions",
+    "p1": "Trade unions play a pivotal role in safeguarding the rights and welfare of workers. Trade unions constitute an integral part of our organization, allowing workers to unite and collectively negotiate for fair wages, better working conditions, and improved labour rights. By fostering solidarity and mobilizing for collective action, trade unions contribute to our overarching mission of dismantling exploitative systems and ushering in a world centered on decentralized decision-making, direct democracy, and worker self-management.",
+    "subheading1": "Our Trade Unions",
+    "location": "Location",
+    "members": "Members",
+    "contact": "Contact",
+    "TradeUnion": "Trade union",
+    "tradeUnion": "trade union",
+    "map-prompt": "Want to appear on our map? Contact us!"
+}

Server/public/locales/ru/landing-component.json

@@ -8,6 +8,8 @@
     "cooperativesText": "Мы формируем рабочие кооперативы для финансирования операций наших групп и коммун, а также формирования основы новой социалистической экономики. Признавая, что экономическая власть влияет на политическую власть, мы считаем создание кооперативов одним из первых шагов на пути к социализму.",
     "partiesTitle": "ПАРТИИ",
     "partiesText": "Мы создаем политические партии, чтобы продвигать реформы, которые позволят легче достичь наших целей, сдвигать окно Овертона и увеличивать нашу популярность. Однако мы признаем, что мы не можем достичь либертарианского социализма с помощью институтов, действующих против наших целей.",
+    "tradeUnionsTitle": "ПРОФСОЮЗЫ",
+    "tradeUnionsText": "Мы поддерживаем профсоюзы, которые дают возможность работникам коллективно выступать за справедливое обращение, справедливую заработную плату и улучшение условий труда. Борьба на месте работы — неотъемлемая часть нашей стратегии по достижению либертарного социализма.",
     "findUs": "Найди нас",
     "whatNow": "Что теперь?",
     "joinUs": "Присоединяйся",

Server/public/locales/ru/navbar-component.json

@@ -8,6 +8,7 @@
     "cooperatives": "Кооперативы",
     "parties": "Партии",
     "partners": "Партнеры",
+    "tradeUnions": "Профсоюзы",
     "login": "Войти",
     "profile": "Профиль"
 }

Server/public/locales/ru/trade-unions-component.json

@@ -0,0 +1,11 @@
+{
+    "tradeUnions": "Профсоюзы",
+    "p1": "Профсоюзы играют ключевую роль в защите прав и благосостояния трудящихся. Профсоюзы составляют неотъемлемую часть нашей организации, позволяя работникам объединяться и вести коллективные переговоры о справедливой заработной плате, лучших условиях труда и улучшенных трудовых правах. Укрепляя солидарность и мобилизуя для коллективных действий, профсоюзы вносят свой вклад в нашу всеобъемлющую миссию по устранению эксплуататорских систем и установлению мира, основанного на децентрализованном принятии решений, прямой демократии и самоуправлении рабочих.",
+    "subheading1": "Наши профсоюзы",
+    "location": "Локация",
+    "members": "Участники",
+    "contact": "Контакт",
+    "TradeUnion": "Профсоюз",
+    "tradeUnion": "профсоюз",
+    "map-prompt": "Хочешь оказаться на нашей карте? Напиши нам!"
+}