diff --git a/content/photos/2020-06-14-x-marks-the-spot.jpg b/content/photos/2020-06-14-x-marks-the-spot.jpg new file mode 100644 index 00000000..21357238 Binary files /dev/null and b/content/photos/2020-06-14-x-marks-the-spot.jpg differ diff --git a/content/photos/2020-06-14-x-marks-the-spot.md b/content/photos/2020-06-14-x-marks-the-spot.md new file mode 100644 index 00000000..773e3860 --- /dev/null +++ b/content/photos/2020-06-14-x-marks-the-spot.md @@ -0,0 +1,8 @@ +--- +date: 2020-06-14T16:59:57.000Z + +title: X Marks The Spot +image: 2020-06-14-x-marks-the-spot.jpg +--- + +Above [Tempelhofer Feld](https://en.wikipedia.org/wiki/Tempelhofer_Feld). diff --git a/content/photos/2020-06-28-lines-of-nature.jpg b/content/photos/2020-06-28-lines-of-nature.jpg new file mode 100644 index 00000000..73203a84 Binary files /dev/null and b/content/photos/2020-06-28-lines-of-nature.jpg differ diff --git a/content/photos/2020-06-28-lines-of-nature.md b/content/photos/2020-06-28-lines-of-nature.md new file mode 100644 index 00000000..abc8aed4 --- /dev/null +++ b/content/photos/2020-06-28-lines-of-nature.md @@ -0,0 +1,6 @@ +--- +date: 2020-06-28T13:57:10.000Z + +title: Lines of Nature +image: 2020-06-28-lines-of-nature.jpg +--- diff --git a/content/photos/2020-08-13-2020.jpg b/content/photos/2020-08-13-2020.jpg new file mode 100644 index 00000000..c7d817e2 Binary files /dev/null and b/content/photos/2020-08-13-2020.jpg differ diff --git a/content/photos/2020-08-13-2020.md b/content/photos/2020-08-13-2020.md new file mode 100644 index 00000000..1e834ffc --- /dev/null +++ b/content/photos/2020-08-13-2020.md @@ -0,0 +1,6 @@ +--- +date: 2020-08-13T16:39:32.000Z + +title: '2020' +image: 2020-08-13-2020.jpg +--- diff --git a/content/photos/2020-08-16-castle-gardens.jpg b/content/photos/2020-08-16-castle-gardens.jpg new file mode 100644 index 00000000..60afb823 Binary files /dev/null and b/content/photos/2020-08-16-castle-gardens.jpg differ diff --git a/content/photos/2020-08-16-castle-gardens.md b/content/photos/2020-08-16-castle-gardens.md new file mode 100644 index 00000000..fdc80450 --- /dev/null +++ b/content/photos/2020-08-16-castle-gardens.md @@ -0,0 +1,8 @@ +--- +date: 2020-08-16T14:50:06.000Z + +title: Castle Gardens +image: 2020-08-16-castle-gardens.jpg +--- + +Above the gardens of [Rheinsberg Castle](https://en.wikipedia.org/wiki/Rheinsberg). diff --git a/content/photos/2020-09-12-friedrichshain.jpg b/content/photos/2020-09-12-friedrichshain.jpg new file mode 100644 index 00000000..f0f51119 Binary files /dev/null and b/content/photos/2020-09-12-friedrichshain.jpg differ diff --git a/content/photos/2020-09-12-friedrichshain.md b/content/photos/2020-09-12-friedrichshain.md new file mode 100644 index 00000000..ba1b0923 --- /dev/null +++ b/content/photos/2020-09-12-friedrichshain.md @@ -0,0 +1,8 @@ +--- +date: 2020-09-12T18:50:29.000Z + +title: Friedrichshain +image: 2020-09-12-friedrichshain.jpg +--- + +DCIM\100MEDIA\DJI_0188.JPG diff --git a/content/photos/2020-10-11-charite.jpg b/content/photos/2020-10-11-charite.jpg new file mode 100644 index 00000000..f03542ed Binary files /dev/null and b/content/photos/2020-10-11-charite.jpg differ diff --git a/content/photos/2020-10-11-charite.md b/content/photos/2020-10-11-charite.md new file mode 100644 index 00000000..76d06cde --- /dev/null +++ b/content/photos/2020-10-11-charite.md @@ -0,0 +1,8 @@ +--- +date: 2020-10-11T11:26:54.000Z + +title: 'Charité' +image: 2020-10-11-charite.jpg +--- + +On top of the [Futurium](https://futurium.de/en/). diff --git a/content/photos/2020-10-25-letters-change.jpg b/content/photos/2020-10-25-letters-change.jpg new file mode 100644 index 00000000..92146d94 Binary files /dev/null and b/content/photos/2020-10-25-letters-change.jpg differ diff --git a/content/photos/2020-10-25-letters-change.md b/content/photos/2020-10-25-letters-change.md new file mode 100644 index 00000000..f660426b --- /dev/null +++ b/content/photos/2020-10-25-letters-change.md @@ -0,0 +1,8 @@ +--- +date: 2020-10-25T12:44:01.000Z + +title: Letters Change +image: 2020-10-25-letters-change.jpg +--- + +Old letters of Schönefeld Airport being taken away during the changing of letters into BER Terminal 5. diff --git a/content/photos/2020-11-29-wall-memorial.jpg b/content/photos/2020-11-29-wall-memorial.jpg new file mode 100644 index 00000000..69aae678 Binary files /dev/null and b/content/photos/2020-11-29-wall-memorial.jpg differ diff --git a/content/photos/2020-11-29-wall-memorial.md b/content/photos/2020-11-29-wall-memorial.md new file mode 100644 index 00000000..c4e875b0 --- /dev/null +++ b/content/photos/2020-11-29-wall-memorial.md @@ -0,0 +1,8 @@ +--- +date: 2020-11-29T14:31:31.000Z + +title: Wall Memorial +image: 2020-11-29-wall-memorial.jpg +--- + +Berlin Wall Memorial at Bernauer Straße. diff --git a/content/photos/2020-12-22-tier-pandemic.jpg b/content/photos/2020-12-22-tier-pandemic.jpg new file mode 100644 index 00000000..c9a66b4b Binary files /dev/null and b/content/photos/2020-12-22-tier-pandemic.jpg differ diff --git a/content/photos/2020-12-22-tier-pandemic.md b/content/photos/2020-12-22-tier-pandemic.md new file mode 100644 index 00000000..8902195f --- /dev/null +++ b/content/photos/2020-12-22-tier-pandemic.md @@ -0,0 +1,8 @@ +--- +date: 2020-12-22T18:29:04.000Z + +title: TiER Pandemic +image: 2020-12-22-tier-pandemic.jpg +--- + +Look inside the TiER bar in Berlin Neukölln. diff --git a/content/photos/2021-02-21-reflections.jpg b/content/photos/2021-02-21-reflections.jpg new file mode 100644 index 00000000..0d1641e5 Binary files /dev/null and b/content/photos/2021-02-21-reflections.jpg differ diff --git a/content/photos/2021-02-21-reflections.md b/content/photos/2021-02-21-reflections.md new file mode 100644 index 00000000..7ebdf808 --- /dev/null +++ b/content/photos/2021-02-21-reflections.md @@ -0,0 +1,8 @@ +--- +date: 2021-02-21T13:57:03.000Z + +title: Reflections +image: 2021-02-21-reflections.jpg +--- + +Looking up the [Tchoban Foundation](http://www.tchoban-foundation.de) building. diff --git a/content/photos/2021-08-05-maidan-nezalezhnosti.jpg b/content/photos/2021-08-05-maidan-nezalezhnosti.jpg new file mode 100644 index 00000000..ffbfaf88 Binary files /dev/null and b/content/photos/2021-08-05-maidan-nezalezhnosti.jpg differ diff --git a/content/photos/2021-08-05-maidan-nezalezhnosti.md b/content/photos/2021-08-05-maidan-nezalezhnosti.md new file mode 100644 index 00000000..30e5e343 --- /dev/null +++ b/content/photos/2021-08-05-maidan-nezalezhnosti.md @@ -0,0 +1,8 @@ +--- +date: 2021-08-05T12:07:49.000Z + +title: Майдан Незалежності +image: 2021-08-05-maidan-nezalezhnosti.jpg +--- + +The [Maidan Nezalezhnosti](https://en.wikipedia.org/wiki/Maidan_Nezalezhnosti) or Independence Square in Kyiv, Ukraine. diff --git a/package-lock.json b/package-lock.json index 064efbf9..5bd15d7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "gatsby-remark-smartypants": "^5.2.0", "gatsby-remark-vscode": "^3.3.0", "gatsby-source-filesystem": "^4.2.0", - "gatsby-source-graphql": "^4.1.3", + "gatsby-source-graphql": "^4.2.0", "gatsby-transformer-remark": "^5.2.0", "gatsby-transformer-sharp": "^4.2.0", "node-fetch": "^2.6.1", @@ -94,7 +94,7 @@ "markdownlint-cli": "^0.30.0", "node-iptc": "^1.0.5", "npm-run-all": "^4.1.5", - "ora": "^6.0.1", + "ora": "^5.4.1", "postcss": "^8.4.4", "prettier": "^2.5.0", "shortid": "^2.2.16", @@ -17108,15 +17108,12 @@ } }, "node_modules/is-interactive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", - "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/is-invalid-path": { @@ -17403,6 +17400,18 @@ "node": ">=0.10.0" } }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-url": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", @@ -19958,6 +19967,92 @@ "resolved": "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz", "integrity": "sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=" }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-symbols/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/log-symbols/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/log-symbols/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/log-symbols/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/loglevel": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", @@ -23049,40 +23144,28 @@ } }, "node_modules/ora": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-6.0.1.tgz", - "integrity": "sha512-TDdKkKHdWE6jo/6pIa5U5AWcSVfpNRFJ8sdRJpioGNVPLAzZzHs/N+QhUfF7ZbyoC+rnDuNTKzeDJUbAza9g4g==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, "dependencies": { - "bl": "^5.0.0", - "chalk": "^4.1.2", - "cli-cursor": "^4.0.0", - "cli-spinners": "^2.6.0", - "is-interactive": "^2.0.0", - "is-unicode-supported": "^1.1.0", - "log-symbols": "^5.0.0", - "strip-ansi": "^7.0.1", + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", "wcwidth": "^1.0.1" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/ora/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, "node_modules/ora/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -23098,41 +23181,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/ora/node_modules/bl": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", - "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", - "dev": true, - "dependencies": { - "buffer": "^6.0.3", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/ora/node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, "node_modules/ora/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -23149,21 +23197,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/ora/node_modules/cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", - "dev": true, - "dependencies": { - "restore-cursor": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/ora/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -23191,79 +23224,6 @@ "node": ">=8" } }, - "node_modules/ora/node_modules/is-unicode-supported": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.1.0.tgz", - "integrity": "sha512-lDcxivp8TJpLG75/DpatAqNzOpDPSpED8XNtrpBHTdQ2InQ1PbW78jhwSxyxhhu+xbVSast2X38bwj8atwoUQA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/log-symbols": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.0.0.tgz", - "integrity": "sha512-zBsSKauX7sM0kcqrf8VpMRPqcWzU6a/Wi7iEl0QlVSCiIZ4CctaLdfVdiZUn6q2/nenyt392qJqpw9FhNAwqxQ==", - "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^1.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/ora/node_modules/restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", - "dev": true, - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/ora/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -45355,9 +45315,9 @@ } }, "is-interactive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", - "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true }, "is-invalid-path": { @@ -45558,6 +45518,12 @@ "unc-path-regex": "^0.1.2" } }, + "is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true + }, "is-url": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", @@ -47542,6 +47508,67 @@ "resolved": "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz", "integrity": "sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=" }, + "log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "requires": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "loglevel": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", @@ -49732,28 +49759,22 @@ } }, "ora": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-6.0.1.tgz", - "integrity": "sha512-TDdKkKHdWE6jo/6pIa5U5AWcSVfpNRFJ8sdRJpioGNVPLAzZzHs/N+QhUfF7ZbyoC+rnDuNTKzeDJUbAza9g4g==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, "requires": { - "bl": "^5.0.0", - "chalk": "^4.1.2", - "cli-cursor": "^4.0.0", - "cli-spinners": "^2.6.0", - "is-interactive": "^2.0.0", - "is-unicode-supported": "^1.1.0", - "log-symbols": "^5.0.0", - "strip-ansi": "^7.0.1", + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", "wcwidth": "^1.0.1" }, "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -49763,27 +49784,6 @@ "color-convert": "^2.0.1" } }, - "bl": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", - "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", - "dev": true, - "requires": { - "buffer": "^6.0.3", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, "chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -49794,15 +49794,6 @@ "supports-color": "^7.1.0" } }, - "cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", - "dev": true, - "requires": { - "restore-cursor": "^4.0.0" - } - }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -49824,52 +49815,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "is-unicode-supported": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.1.0.tgz", - "integrity": "sha512-lDcxivp8TJpLG75/DpatAqNzOpDPSpED8XNtrpBHTdQ2InQ1PbW78jhwSxyxhhu+xbVSast2X38bwj8atwoUQA==", - "dev": true - }, - "log-symbols": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.0.0.tgz", - "integrity": "sha512-zBsSKauX7sM0kcqrf8VpMRPqcWzU6a/Wi7iEl0QlVSCiIZ4CctaLdfVdiZUn6q2/nenyt392qJqpw9FhNAwqxQ==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^1.0.0" - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", diff --git a/package.json b/package.json index 55a7c3ea..207d94d6 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "gatsby-remark-smartypants": "^5.2.0", "gatsby-remark-vscode": "^3.3.0", "gatsby-source-filesystem": "^4.2.0", - "gatsby-source-graphql": "^4.1.3", + "gatsby-source-graphql": "^4.2.0", "gatsby-transformer-remark": "^5.2.0", "gatsby-transformer-sharp": "^4.2.0", "node-fetch": "^2.6.1", @@ -113,7 +113,7 @@ "markdownlint-cli": "^0.30.0", "node-iptc": "^1.0.5", "npm-run-all": "^4.1.5", - "ora": "^6.0.1", + "ora": "^5.4.1", "postcss": "^8.4.4", "prettier": "^2.5.0", "shortid": "^2.2.16", diff --git a/src/@types/Image.d.ts b/src/@types/Image.d.ts index 82488e37..71de3b63 100644 --- a/src/@types/Image.d.ts +++ b/src/@types/Image.d.ts @@ -27,7 +27,7 @@ export interface ExifFormatted { } export interface Exif { - formatted?: ExifFormatted + formatted: ExifFormatted exif?: any image?: any thumbnail?: any diff --git a/src/components/atoms/Exif.tsx b/src/components/atoms/Exif.tsx index 1ff632ea..29fdfd08 100644 --- a/src/components/atoms/Exif.tsx +++ b/src/components/atoms/Exif.tsx @@ -23,10 +23,14 @@ export default function Exif({ exif }: { exif: ExifMeta }): ReactElement { const { iso, model, fstop, shutterspeed, focalLength, exposure, gps } = exif.formatted + const formattedModel = model === 'FC7203' ? 'DJI Mavic Mini' : model + return (