From 13ad82c4c38d18d682da9fe5bfa43bc3953995b0 Mon Sep 17 00:00:00 2001 From: John Letey <30328854+johnletey@users.noreply.github.com> Date: Sun, 21 Jul 2019 22:23:28 +0100 Subject: [PATCH 1/3] feat: Add filename and path on edit view (blocks#3) --- src/index.js | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 26f1712..d3bb475 100644 --- a/src/index.js +++ b/src/index.js @@ -4,7 +4,7 @@ import { remote, ipcRenderer } from 'electron' import { jsx, Styled } from 'theme-ui' import { render } from 'react-dom' import { Editor, serializer, stringifyMDX } from '@blocks/editor' -import { Folder, FileText } from 'react-feather' +import { Folder, FileText, ArrowLeft } from 'react-feather' import debounce from 'lodash.debounce' import Layout from './layout' @@ -56,6 +56,8 @@ const App = () => { }, [openFilePathname]) if (openFilePathname && openFileContents) { + const parentDir = getParentDirectory(openFilePathname) + return ( { marginTop: '40px' }} > + { + handleFileListSelection(parentDir) + }} + > + + Back + + + + {openFilePathname} + { From 905e03507a9600bb0e687905bd753d467b6c9aac Mon Sep 17 00:00:00 2001 From: John Letey <30328854+johnletey@users.noreply.github.com> Date: Mon, 22 Jul 2019 15:16:46 +0100 Subject: [PATCH 2/3] fix: Update `build` and `pack` commands --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 86ff1f8..0a380d0 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ "main": "main/index.js", "scripts": { "start": "yarn prepare && electron main/index.js", - "build": "build", - "pack": "build --dir", + "build": "electron-builder", + "pack": "electron-builder --dir", "prepare": "babel src -d renderer", "watch": "babel src -d renderer -w" }, @@ -37,7 +37,7 @@ "build": { "appId": "io.blocks", "productName": "Blocks", - "copyright": "© 2019 Blocks contributores. All rights reserved", + "copyright": "© 2019 Blocks contributors. All rights reserved", "mac": { "category": "public.app-category.developer-tools" }, From a601cbb6e8b26d200406493d5ff7492e160962f9 Mon Sep 17 00:00:00 2001 From: John Letey <30328854+johnletey@users.noreply.github.com> Date: Mon, 22 Jul 2019 15:17:03 +0100 Subject: [PATCH 3/3] refactor: Add `.DS_Store` to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 902e2bb..73a272f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ dist renderer node_modules +.DS_Store