fix: ignore trash, fav for now

danobot · Jul 15, 2020 · 3fe4570 · 3fe4570
1 parent 8ad1faa
commit 3fe4570
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 22 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -80,8 +80,8 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: New-Item -Path "./source/common/assets" -Name "handlebars" -ItemType "directory" # Hello, PowerShell ._.
 
-      - name: Set up build environment and compile the assets
-        if: matrix.os != 'ubuntu-18.04'
+      - name: "[All except docker] Set up build environment and compile the assets"
+        if: matrix.os != 'ubuntu-18.04' # all except the docker build
         run: |
           yarn
       # WINDOWS ==============================================================

diff --git a/app/components/MainMenu/MainMenu.tsx b/app/components/MainMenu/MainMenu.tsx
@@ -41,7 +41,8 @@ export default function MainMenu({
   hideFinderModal,
   showNotebookModal,
   hideNotebookModal,
-  searchNotesGlobal
+  searchNotesGlobal,
+  cacheParentId
 }) {
   const finderRef = useRef(null);
   const createNotebookModalRef = useRef(2);
@@ -97,29 +98,34 @@ export default function MainMenu({
 
       <MenuItem
         label="All notes"
+        droppable
         icon={<FontAwesomeIcon icon={faBook} />}
         compKey="MenuItem"
         onClickHandler={e=> selectNotebook("ALL")}
         selected={selectedNotebook === "ALL"}
-
+        cacheParentId={e=>cacheParentId("ALL")}
       />
 
 
       <ContextMenuTrigger id="trash_trigger">
         <MenuItem
           label="Trash"
+          droppable
           icon={<FontAwesomeIcon icon={faTrash} />}
           compKey="trashMenuItem"
           onClickHandler={e=> selectNotebook("TRASH")}
           selected={selectedNotebook === "TRASH"}
+          cacheParentId={e=>cacheParentId("TRASH")}
         />
       </ContextMenuTrigger>
       <MenuItem
         label="Favourites"
+        droppable
         icon={<FontAwesomeIcon icon={faStar} />}
         compKey="favMenuItem"
         onClickHandler={e=> selectNotebook("FAV")}
         selected={selectedNotebook === "FAV"}
+        cacheParentId={e=>cacheParentId("FAV")}
       />
       <ContextMenuTrigger id="mainmenu_notebooks">
         <MenuItem
@@ -168,6 +174,7 @@ export default function MainMenu({
             selected={selectedNotebook === "tag::" +  n}
             compKey={`tag-menu-item-${n}`}
             key={`tag-menu-item-${n}`}
+            //cacheParentId={e=>cacheParentId(("tag::" +  n)}
           />
           ))}
       </MenuItem>

diff --git a/app/components/MainMenu/MenuItem.tsx b/app/components/MainMenu/MenuItem.tsx
@@ -1,8 +1,8 @@
 import React, {useState} from 'react';
 import { MenuItemStyle, MenuItemIcon, MenuItemLabel, MenuItemNormal, MenuItemSelected } from './style';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { useDrop } from 'react-dnd'
-import { faCaretSquareRight, faCaretSquareDown } from '@fortawesome/free-solid-svg-icons';
+import { useDrop } from 'react-dnd';
+import { faCaretSquareRight, faCaretSquareDown, faCaretSquareLeft } from '@fortawesome/free-solid-svg-icons';
 import { DragItemTypes } from '../../utils/DragItemTypes';
 
 export default function MenuItem({
@@ -23,7 +23,6 @@ export default function MenuItem({
 }) {
   const MenuItemComponent = (selected) ? MenuItemSelected : MenuItemNormal;
   const [v, setVis] = useState(visible )
-  const [id, setId] = useState( )
   const handleClick = () => {
     setVis(!v)
   }
@@ -32,7 +31,7 @@ export default function MenuItem({
     accept: DragItemTypes.NOTE,
     drop: (data) => {
       cacheParentId()
-      return { name: id}
+      return { name: noteId}
     },
     collect: (monitor) => {
       return {
@@ -41,15 +40,17 @@ export default function MenuItem({
       }
     },
   })
-  // const isActive = canDrop && isOver
-  // let style = {}
-  // if (isActive) {
-  //   style.backgroundColor = 'darkgreen'
-  // } else if (canDrop && droppable) {
-  //   style.backgroundColor = 'darkkhaki'
-  // }
+  const isActive = canDrop && isOver && droppable
+  let style = {};
+  if (isActive) {
+    style.backgroundColor = '#292d4e';
+    // style.border= '1px solid white';
+  } else if (canDrop && droppable) {
+    // style.backgroundColor = 'blue'
+  }
   return (
     <MenuItemComponent
+    style={style}
     ref={drop}
     >
       <MenuItemStyle
@@ -63,7 +64,7 @@ export default function MenuItem({
             icon={v ? faCaretSquareDown : faCaretSquareRight}
           />}</MenuItemIcon>}
         <MenuItemLabel>{label}</MenuItemLabel>
-        {right}
+        { right }
       </MenuItemStyle>
       {v ? children : <></>}
     </MenuItemComponent>

diff --git a/app/components/MiddleMenu/MiddleMenu.tsx b/app/components/MiddleMenu/MiddleMenu.tsx
@@ -110,7 +110,12 @@ export default function MiddleMenu({
                 note={i}
                 selected={i._id === selectedNote}
                 handleClick={selectNoteAction}
-                handleDrag={(id) => moveNote(id, dropNoteCache)}
+                handleDrag={(id) => {
+                  if (dropNoteCache != "ALL" && dropNoteCache != "TRASH" && dropNoteCache != "FAV") {
+                    moveNote(id, dropNoteCache)
+                  }
+                  }
+                }
                 handlers={notecardContextHandlers}
               />
             ))

diff --git a/app/components/MiddleMenu/NoteCard/NoteCard.tsx b/app/components/MiddleMenu/NoteCard/NoteCard.tsx
@@ -4,7 +4,7 @@ import Truncate from 'react-truncate'
 import { Tag } from 'antd';
 import Moment from 'react-moment';
 import styled from 'styled-components';
-import { useDrag } from 'react-dnd'
+import { useDrag } from 'react-dnd';
 import {
   ContextMenu,
   ContextMenuTrigger,

diff --git a/app/containers/Root.tsx b/app/containers/Root.tsx
@@ -5,10 +5,11 @@ import { hot } from 'react-hot-loader/root';
 import { History } from 'history';
 import { ThemeProvider } from 'styled-components';
 import { Store } from '../reducers/types';
+
 import Routes from '../Routes';
 import darkTheme from '../utils/dark_theme.json';
-import { DndProvider } from 'react-dnd'
-import { HTML5Backend } from 'react-dnd-html5-backend'
+import { DndProvider } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
 type Props = {
   store: Store;
   history: History;

diff --git a/app/reducers/notes.ts b/app/reducers/notes.ts
@@ -14,7 +14,7 @@ const notesReducer = createReducer(initialState, {
     [CREATE_NOTE]: (state, action) => {
       const noteId = action.id
 
-      const newState = addChildToParent(newState, action.id, action.parent)
+      const newState = addChildToParent(state, action.id, action.parent)
       const newNote = {_id: noteId,
         title: "",
         createdAt: Date.now(),
@@ -54,7 +54,7 @@ const notesReducer = createReducer(initialState, {
     [UPDATE_NOTE]: (state, action) => {
       console.log(action)
 
-      return updateNoteAttributesInArray(newState, action.id, action.attributes)
+      return updateNoteAttributesInArray(state, action.id, action.attributes)
 
     },
     [MOVE_NOTE]: (state, action) => {

diff --git a/app/utils/utils.js b/app/utils/utils.js
@@ -125,6 +125,8 @@ export const hasChildren = ( children ) => {
     return false;
   }
 }
+
+// Immutable state updaters for Notes
 export const updateNoteAttributesInArray = (state, noteId, attributes) => {
   return state.map((item, id) => {
     if (item._id !== noteId) { return item }