Merge branch 'master' into 'production'

updated committees (again)

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!143

src/views/CommitteePage/hvtmk.json

@@ -55,15 +55,9 @@
       "representatives": [
         {
           "name": "Justus Ojala"
-        }
+        },
-      ]
-    },
-    {
-      "name_fi": "Retkeilyvastaava, Kiltahuonevastaava",
-      "name_en": "",
-      "representatives": [
         {
-          "name": "Ville Lairila"
+          "name": "Aaro Rasilainen"
         }
       ]
     },
@@ -76,8 +70,30 @@
         },
         {
           "name": "Konsta Hakala"
+        },
+        {
+          "name": "Ville Lairila"
         }
+
       ]
-    }
+    },
+    {
+    "name_fi": "Yhdenvertaisuusvastaava",
+    "name_en": "",
+    "representatives": [
+      {
+        "name": "Saara Rossi"
+      },
+      {
+        "name": "Aaron Löfgren"
+      },
+      {
+        "name": "Milla Heino"
+      },
+      {
+        "name": "Sauli Hakala"
+      }
+    ]
+  }
   ]
 }

src/views/CommitteePage/mtmk.json

@@ -16,13 +16,22 @@
         }
       ]
     },
+    {
+      "name_fi": "Tyhjäntoimittaja",
+      "name_en": "",
+      "representatives": [
+        {
+          "name": "Visa Kurvi",
+          "phone_number": null,
+          "email": null,
+          "image": null
+        }
+      ]
+    },
     {
       "name_fi": "Toimittaja",
       "name_en": "Journalist",
       "representatives": [
-        {
-          "name": "Visa Kurvi"
-        },
         {
           "name": "Joona Komonen"
         },

src/views/CommitteePage/others.json

@@ -5,52 +5,27 @@
   "info": "",
   "roles": [
     {
-      "name_fi": "TEK-yhdyshenkilö",
+      "name_fi": "Merikapteeni",
-      "name_en": "TEK contact person",
+      "name_en": "Sea captain",
       "representatives": [
         {
-          "name": "Esko Väänänen",
+          "name": "Ville Lairila",
           "phone_number": null,
           "email": null
         }
+        
       ]
     },
     {
-      "name_fi": "Arkistonhoitaja",
+      "name_fi": "Meripojankloppi",
-      "name_en": "Archivist",
+      "name_en": "ship's boy",
       "representatives": [
         {
-          "name": "Iikka Huttu",
+          "name": "Peter Lindahl",
           "phone_number": null,
           "email": null
         }
-      ]
+        
-    },
-    {
-      "name_fi": "Teekkarikokouksen kiltaedustaja",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Oliver Hiekkamies"
-        }
-      ]
-    },
-    {
-      "name_fi": "Yhdenvertaisuusvastaava",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Saara Rossi"
-        },
-        {
-          "name": "Aaron Löfgren"
-        },
-        {
-          "name": "Milla Heino"
-        },
-        {
-          "name": "Sauli Hakala"
-        }
       ]
     }
   ]

src/views/CommitteePage/ptmk.json

@@ -23,9 +23,6 @@
         {
           "name": "Đình Minh Trần"
         },
-        {
-          "name": "Sauli Hakala"
-        },
         {
           "name": "Valentin Juhela"
         },

src/views/CommitteePage/swtmk.json

@@ -6,7 +6,7 @@
   "roles": [
     {
       "name_fi": "Myymäläpäällikkö",
-      "name_en": "",
+      "name_en": "Head of sales",
       "representatives": [
         {
           "name": "Tiitus Koski"
@@ -15,7 +15,7 @@
     },
     {
       "name_fi": "Myyjä",
-      "name_en": "",
+      "name_en": "Clerk",
       "representatives": [
         {
           "name": "Arvi Virkkunen"

src/views/CommitteePage/ytmk.json

@@ -6,7 +6,7 @@
   "roles": [
     {
       "name_fi": "Yrityssuhdemestari",
-      "name_en": "Master of Corporate Relations",
+      "name_en": "Head of Corporate Relations",
       "representatives": [
         {
           "name": "Tuomas Hintikka"