Merge branch 'newFEdesktop' of https://github.com/ethereum/remix-project into desktope2e

.gitignore

@@ -64,3 +64,4 @@ apps/remixdesktop/release/
 apps/remixdesktop/build*/
 apps/remix-ide/src/assets/list.json
 apps/remix-ide/src/assets/esbuild.wasm
+apps/remixdesktop/build*

apps/remixdesktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remixdesktop",
-  "version": "0.0.8-Alpha",
+  "version": "0.0.9-Alpha",
   "main": "build/main.js",
   "license": "MIT",
   "type": "commonjs",
@@ -101,6 +101,7 @@
           ]
         }
       ],
+      "icon": "assets/icon.png",
       "darkModeSupport": true
     },
     "dmg": {
@@ -116,7 +117,8 @@
     "win": {
       "target": [
         "nsis"
-      ]
+      ],
+      "icon": "assets/icon.png"
     },
     "linux": {
       "target": [

apps/remixdesktop/src/engine.ts

@@ -36,8 +36,8 @@ ipcMain.handle('manager:activatePlugin', async (event, plugin) => {
   return await appManager.call(plugin, 'createClient', event.sender.id)
 })
 
-ipcMain.on('fs:openFolder', async (event) => {
+ipcMain.on('fs:openFolder', async (event, path?) => {
-  fsPlugin.openFolder(event)
+  fsPlugin.openFolder(event, path)
 })
 
 

apps/remixdesktop/src/menus/edit.ts

@@ -33,19 +33,6 @@ export default (
     },
   ];
 
-  if (process.platform !== 'darwin') {
-    submenu.push(
-      { type: 'separator' },
-      {
-        label: 'Preferences...',
-        accelerator: commandKeys['window:preferences'],
-        click() {
-          execCommand('window:preferences');
-        }
-      }
-    );
-  }
-
   return {
     label: 'Edit',
     submenu

apps/remixdesktop/src/menus/file.ts

@@ -1,4 +1,22 @@
-import { BrowserWindow, MenuItemConstructorOptions } from 'electron';
+import { BrowserWindow, MenuItemConstructorOptions, app, ipcMain } from 'electron';
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
+import { cacheDir } from '../utils/config';
+
+let recentFolders: string[] = []
+
+if (fs.existsSync(cacheDir + '/remixdesktop.json')) {
+  try {
+    // read the cache file
+    const cache = fs.readFileSync(cacheDir + '/remixdesktop.json')
+    const data = JSON.parse(cache.toString())
+    recentFolders = data && data.recentFolders || []
+    console.log('recentFolders', recentFolders)
+  } catch (e) {
+
+  }
+}
 
 export default (
   commandKeys: Record<string, string>,
@@ -31,11 +49,16 @@ export default (
       },
       {
         role: 'recentDocuments',
-        submenu: [
+        submenu: recentFolders.map((folder) => {
-          {
+          return {
-            role: 'clearRecentDocuments'
+            label: folder,
+            click(item, focusedWindow) {
+              if(focusedWindow) {
+                ipcMain.emit('fs:openFolder', focusedWindow.webContents.id, folder);
+              }
+            }
           }
-        ]
+        })
       },
       {
         role: 'close',

apps/remixdesktop/src/plugins/fsPlugin.ts

@@ -76,10 +76,10 @@ export class FSPlugin extends ElectronBasePlugin {
     }
   }
 
-  openFolder(webContentsId: any): void {
+  openFolder(webContentsId: any, path?: string): void {
     const client = this.clients.find((c) => c.webContentsId === webContentsId)
     if (client) {
-      client.openFolder()
+      client.openFolder(path)
     }
   }
 }

libs/remix-ui/helper/src/lib/components/custom-tooltip.tsx

@@ -15,7 +15,9 @@ export function CustomTooltip({ children, placement, tooltipId, tooltipClasses,
   return (
     (!hide ? (
       <Fragment>
-        <OverlayTrigger overlay={
+        <OverlayTrigger 
+          placement={placement}
+          overlay={
           <Popover id={`popover-positioned-${placement}`}>
             <Popover.Content
               id={!tooltipId ? `${tooltipText}Tooltip` : tooltipId}

libs/remix-ui/search/src/lib/components/Search.tsx

@@ -8,8 +8,6 @@ import {FindContainer} from './FindContainer'
 import {Undo} from './Undo'
 import { platformContext } from '@remix-ui/app'
 
-
-
 export const SearchTab = (props) => {
   const plugin = props.plugin
   const platform = useContext(platformContext)

libs/remix-ui/workspace/src/lib/actions/workspace.ts

@@ -88,7 +88,6 @@ export const setPlugin = (filePanelPlugin, reducerDispatch) => {
     }
   })
   plugin.on('fs', 'workingDirChanged', async (dir: string) => {
-    console.log('workingDirChanged', dir)
     dispatch(setCurrentLocalFilePath(dir))
     await checkGit()
   })

libs/remix-ui/workspace/src/lib/components/flat-tree.tsx

@@ -49,7 +49,6 @@ let mouseTimer: any = {
 
 export const FlatTree = (props: FlatTreeProps) => {
   const { files, flatTree, expandPath, focusEdit, editModeOff, handleTreeClick, moveFile, moveFolder, fileState, focusElement, handleClickFolder } = props
-  //const [flatTree, setFlatTree] = useState<{ [x: string]: FileType }>({})
   const [hover, setHover] = useState<string>('')
   const [mouseOverTarget, setMouseOverTarget] = useState<{
     path: string,
@@ -297,4 +296,4 @@ export const FlatTree = (props: FlatTreeProps) => {
     </div>
   </>)
 
-}
+}