diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2017-06-06 01:04:51 -0400 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2017-06-06 01:04:51 -0400 |
| commit | 7040b8b2f7509bb1d79607469b2191ef9db8a05a (patch) | |
| tree | f4f02bb453c55079818623a05331782a4147a57d /client/src | |
| parent | 5ea842ad2cac92d1dd5c90029cbeaa24d01c93ba (diff) | |
db
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/lib/db/backupDB.js | 10 | ||||
| -rw-r--r-- | client/src/lib/db/index.js | 27 |
2 files changed, 19 insertions, 18 deletions
diff --git a/client/src/lib/db/backupDB.js b/client/src/lib/db/backupDB.js index 3e11d02..38d9939 100644 --- a/client/src/lib/db/backupDB.js +++ b/client/src/lib/db/backupDB.js @@ -162,7 +162,7 @@ export const backupDB = { "keywords": "#Drones #UAV #Airstrike #Attack #Military #Warfare #Venice #Austria", "description": "Arguably, this was the first drone strike in history: In August 22nd 1849 Venice was bombarded by unmanned balloons launched by the Austrians, who controlled much of Italy at the time. The experimental approach of using hot air balloons, which carried ordnance, was a consequence of the actual topography of Venice. Since the city was surrounded by water, the Austrian artillery could not intrude. This incident is the first known use of aerial bombing. \r\n\r\nThe image below illustrates an artistic interpretation of the bombing from a Russian source. \r\n", "image": { - "uri": "http://www.ctie.monash.edu/hargrave/images/balloonbombs1848_500.jpg", + "uri": "https://marsupial.s3.amazonaws.com/armory/a0e0c8c0-4a4e-11e7-ad41-938ea8af50c1.jpg", "caption": "", "width": "500", "height": "752" @@ -176,7 +176,7 @@ export const backupDB = { "disabled": false, "__index": 10, "dateCreated": "Thu, 11 May 2017 13:58:11 GMT", - "credit": " Bombing by Balloon, 1848, Source: Prof. Jurij Drushnin, Moscow, Russia" + "credit": "Bombing by Balloon, 1848. Source: Prof. Jurij Drushnin, Moscow, Russia" }, { "id": "boston-as-the-eagle-and-the-wild-goose-see-it", @@ -1273,7 +1273,7 @@ export const backupDB = { "keywords": "#Drone #UAV #Airstrike #US-Army #War on Terror #Weapons #Afghanistan #Arts #Attack #Airplanes #Evidence #US-Army\r\n", "description": "Afghanistan has suffered through many long decades of war, from its conflict with the Soviet Union in the 1980s and the subsequent civil war, to 16 years of US-led NATO combat missions. While war has political, economic and social impacts, it is also present in art. In the case of Afghan art, it is expressed in the ancient form of woven rugs that illustrate daily life. Rugs depicted Kalashnikovs, tanks and grenades during the Soviet Union conflict; drones began appearing on the rugs since the US started operating them in 2001. The world of ancient art and modern warfare collide on the so called ‘war rugs’, but they also reflect the violent conditions of life under war.", "image": { - "uri": "http://media.npr.org/assets/img/2015/02/07/warrug1-16c4e0185e8d3183ed29d1b8b3e982dcd9f937ef-s1000-c85.jpg", + "uri": "https://marsupial.s3.amazonaws.com/armory/b44dc6b0-4a4e-11e7-ad41-938ea8af50c1.jpg", "caption": "", "width": "1000", "height": "604" @@ -1281,11 +1281,11 @@ export const backupDB = { "credit": "Courtesy of Kevin Sudeith\r\n", "links": [ { - "text": "Link text", + "text": "The Atlantic", "uri": "https://www.theatlantic.com/technology/archive/2015/01/drones-are-appearing-on-afghan-rugs/385025/" }, { - "text": "Link text", + "text": "Messy Nessy", "uri": "http://www.messynessychic.com/2015/01/29/war-rugs-the-obscure-collectors-market-for-afghan-kitsch/" } ], diff --git a/client/src/lib/db/index.js b/client/src/lib/db/index.js index a60fa03..21e648d 100644 --- a/client/src/lib/db/index.js +++ b/client/src/lib/db/index.js @@ -14,19 +14,20 @@ function fetchDB(cb) { if (json) { raw_db = parse(json) } - return fetch(hosts.comments, { - method: 'GET', - }) - }).then(res => { - if (res.status !== 200) { - return null - } - return res.json() - }).then(json => { - if (json) { - raw_db.comments = json.reverse() - cb(raw_db) - } + cb(raw_db) +// return fetch(hosts.comments, { +// method: 'GET', +// }) +// }).then(res => { +// if (res.status !== 200) { +// return null +// } +// return res.json() +// }).then(json => { +// if (json) { +// raw_db.comments = json.reverse() +// cb(raw_db) +// } }).catch((err) => { console.warn(err) }) |
