Merge pull request #1 from OSINT-for-Ukraine/WIP

PM 1.0

.gitignore

@@ -1,4 +1,5 @@
 .idea/
+venv/
 .cert
 nohup.out
 build/

README.md

@@ -1,20 +1,14 @@
-<h1 align="center">Civilian Harm in Ukraine TimeMap</h1>
+<h1 align="center">Project Mariupol TimeMap</h1>
 
 <h2 align="center">
 	Explore it in <a href="https://map.osintforukraine.com/">map.osintforukraine.com</a>
-	<br/>
-	Download/integrate the data from <a href="https://bellingcat-embeds.ams3.cdn.digitaloceanspaces.com/production/ukr/timemap/api.json">here</a> <small>(regularly updated dataset)</small>
 </h2>
 
-<h3 align="center">
-Read Bellingcat's article about this project in 
-<a href="https://www.bellingcat.com/news/2022/03/17/hospitals-bombed-and-apartments-destroyed-mapping-incidents-of-civilian-harm-in-ukraine/">English (UK)</a>,
-<a href="https://ru.bellingcat.com/novosti/2022/03/18/hospitals-bombed-and-apartments-destroyed-mapping-incidents-of-civilian-harm-in-ukraine-ru/">Русский (Россия)</a>
-</h3>
-
 <p align="center">
 <strong>
-	TimeMap is a tool for exploration, monitoring and classification of incidents in time and space, originally forked from <a href="https://github.com/forensic-architecture/timemap">forensic-architecture/timemap</a>.
+	TimeMap is a tool for exploration, monitoring and classification of incidents in time and space, originally forked from <a href="https://github.com/bellingcat/ukraine-timemap">Bellingcat's Civilian Harm Ukraine-Timemap</a>.
+    <br>
+    Also, credits to forensic-architecture for the original repository: <a href="https://github.com/forensic-architecture/timemap">forensic-architecture/timemap</a>.
 </strong>
 </p>
 <br>
@@ -27,10 +21,8 @@ Read Bellingcat's article about this project in
 * adjust any local configs in [config.js](config.js)
 * `CONFIG=config.js npm run dev` or `npm run dev` if the file is named config.js
 * For more info visit the [original repo](https://github.com/forensic-architecture/timemap)
-* 
 * For production deployment:
 * pm2 serve build/ 80 --name "map" --spa
-* pm2 start server.mjs --name api
 
 ## Deployment
 This project is now living in github pages and the API has switched to auto-updated S3 files.

config.js

@@ -4,10 +4,12 @@ const config = {
   title: "Project Mariupol",
   display_title: "Project Mariupol",
   SERVER_ROOT: "https://api.osintforukraine.com/",
+  MILITARY_EXT: "Military",
   EVENTS_EXT: "Events",
   SOURCES_EXT: "Sources",
   ASSOCIATIONS_EXT: "Associations",
   LOGIN_EXT: "login",
+  // API_DATA: "https://api.osintforukraine.com/Events",
   API_DATA: "https://api.osintforukraine.com/Events",
   MAPBOX_TOKEN:
     "pk.eyJ1IjoiYmVsbGluZ2NhdC1tYXBib3giLCJhIjoiY2tleW0wbWliMDA1cTJ5bzdkbTRraHgwZSJ9.GJQkjPzj8554VhR5SPsfJg",
@@ -64,19 +66,16 @@ const config = {
       },
       intro: [
         '<div class="two-columns"><div class="two-columns_column"><figure><img style="width: 100%; display:block;" src="https://bellingcat-embeds.ams3.cdn.digitaloceanspaces.com/ukraine-timemap/cover01-s.jpg" frameborder="0"><figcaption>Image: Vyacheslav Madiyevskyy/Reuters</figcaption></figure></div><div class="two-columns_column"><figure><img style="width: 100%; display:block;" src="https://bellingcat-embeds.ams3.cdn.digitaloceanspaces.com/ukraine-timemap/cover02-s.jpg" frameborder="0"><figcaption>Image: Järva Teataja/Scanpix Baltics via Reuters</figcaption></figure></div></div>',
-        "Each day, new information and imagery of war crimes in occupied territories and combat zones around Ukraine emerge. Since the revelation of the Bucha Massacre at the beginning of April 2022, there have been various efforts to document war crimes in Ukraine. \n" +
-        "\n" +
-        "Unlike other mapping efforts our map is aimed to serve as an archive of potential evidence for International crimes. It can then be used in the interests of justice, accountability and research by advocacy groups, academics, and most importantly used to train the next generation of OSINTers by helping them learn on the go. \n" +
-        "\n" +
-        "We achieve our mission by: \n" +
-            "\n" +
-        "    Documenting International Crimes by our OSINTers\n" +
-            "\n" +
-        "    Aggregating already mapped data from other OSINT groups\n" +
-            "\n" +
-        "    Collaborating with International and Local NGO’s \n" +
-            "\n" +
-        "    Collaboration with Academic Institutions"
+        "Each day, new information and imagery of war crimes in occupied territories and combat zones around Ukraine emerge. Since the revelation of the Bucha massacre at the beginning of April 2022, there have been various efforts to document war crimes in Ukraine. However, as part of southern and parts of eastern Ukraine remain occupied, traditional modes of investigation have not been successful in gathering information from those regions.\n" +
+        "Open-source information is information in any format (audio, visual and/or metadata) that is available to be accessed online without restrictions. Popular examples are photos from social media apps and pages. In the context of Ukraine, OSINT has been utilised vastly for many purposes. During the first few weeks of the war (and still today), OSINT pages and channels on Telegram and Twitter have been tracking the war (uploading troop movements, tallying unit casualties from photos and videos, tracking planes via the ‘flightradar’ app). In mid-March, the first OSINT information on war crimes emerged with MAXAR satellite imagery of corpse covered roads in occupied Bucha, Hostomel, and Irpin (towns near Kyiv). From then on, various OSINT investigation efforts have been conducted by both governmental and private organisations to document war crimes in Ukraine.\n" +
+        "The project has a twofold goal:\n" +
+        "- mapping international crimes committed in Ukraine by the Russian Federation,\n" +
+        "- providing a learning environment to new OSINTers by training them by practice. \n" +
+        "We achieve our mission by:\n" +
+        "- documenting international crimes by our OSINTers,\n" +
+        "- aggregating already mapped data from other OSINT groups,\n" +
+        "- collaborating with international and local NGOs, \n" +
+        "- collaboration with academic institutions."
       ],
 
       flags: { isInfopoup: false, isCover: false },
@@ -124,20 +123,21 @@ const config = {
       spotlights: {},
     },
     ui: {
-      coloring: {
+      coloring: { // todo change color
         mode: "STATIC",
-        maxNumOfColors: 9,
-        defaultColor: "#dfdfdf",
+        maxNumOfColors: 10,
+        defaultColor: "#262323",
         colors: [
-          "#7E57C2",
-          "#F57C00",
-          "#FFEB3B",
-          "#D34F73",
+          "#8B0000",
+          "#442020",
+          "#2F4F4F",
           "#08B2E3",
           "#A1887F",
-          "#90A4AE",
           "#E57373",
+          "#90A4AE",
           "#80CBC4",
+          "#7E57C2",
+          "#FFEB3B",
         ],
       },
       card: {