From f5f48767dce7750dfde45599ce7dabacb5ce33d0 Mon Sep 17 00:00:00 2001
From: Jamie Pine <32987599+jamiepine@users.noreply.github.com>
Date: Tue, 8 Mar 2022 06:02:09 -0800
Subject: [PATCH] some tweaks

---
 apps/desktop/src/components/file/Sidebar.tsx  |  7 ++++--
 .../src/components/primitive/Slider.tsx       | 11 ++--------
 .../src/screens/settings/GeneralSettings.tsx  | 22 +++++++++++--------
 packages/core/src/tx/dataflow.md              | 16 ++++++++++----
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/apps/desktop/src/components/file/Sidebar.tsx b/apps/desktop/src/components/file/Sidebar.tsx
index ad2e0c592..ffd71dcd1 100644
--- a/apps/desktop/src/components/file/Sidebar.tsx
+++ b/apps/desktop/src/components/file/Sidebar.tsx
@@ -131,6 +131,9 @@ export const Sidebar: React.FC<SidebarProps> = (props) => {
             </div>
           );
         })}
+        <div className="w-full px-2 py-1.5 mt-1 text-xs font-bold text-center text-gray-500 border border-dashed rounded border-transparent cursor-normal border-gray-550">
+          Add Location
+        </div>
       </div>
       <div>
         <Heading>Tags</Heading>
@@ -162,9 +165,9 @@ export const Sidebar: React.FC<SidebarProps> = (props) => {
           )}
         </NavLink>
       </div>
-      <div className="w-full px-2 py-2 mb-2 text-xs font-bold text-center text-gray-500 border border-dashed rounded border-gray-550">
+      {/* <div className="w-full px-2 py-2 mb-2 text-xs font-bold text-center text-gray-500 border border-dashed rounded border-gray-550">
         Drop
-      </div>
+      </div> */}
     </div>
   );
 };
diff --git a/apps/desktop/src/components/primitive/Slider.tsx b/apps/desktop/src/components/primitive/Slider.tsx
index 5b1e1edc8..992a00511 100644
--- a/apps/desktop/src/components/primitive/Slider.tsx
+++ b/apps/desktop/src/components/primitive/Slider.tsx
@@ -1,15 +1,8 @@
 import React from 'react';
 import * as SliderPrimitive from '@radix-ui/react-slider';
 
-interface SliderProps {
-  value: number[];
-}
-
-const Slider = (props: SliderProps) => (
-  <SliderPrimitive.Root
-    value={props.value}
-    className="relative flex items-center w-full h-6 select-none"
-  >
+const Slider = (props: SliderPrimitive.SliderProps) => (
+  <SliderPrimitive.Root {...props} className="relative flex items-center w-full h-6 select-none">
     <SliderPrimitive.Track className="relative flex-grow h-2 bg-gray-500 rounded-full outline-none">
       <SliderPrimitive.Range className="absolute h-full rounded-full outline-none bg-primary-500" />
     </SliderPrimitive.Track>
diff --git a/apps/desktop/src/screens/settings/GeneralSettings.tsx b/apps/desktop/src/screens/settings/GeneralSettings.tsx
index e0697572b..7d6a57d25 100644
--- a/apps/desktop/src/screens/settings/GeneralSettings.tsx
+++ b/apps/desktop/src/screens/settings/GeneralSettings.tsx
@@ -1,7 +1,7 @@
 import { InputContainer } from '../../components/primitive/InputContainer';
 import { Button, Input } from '../../components/primitive';
 import { invoke } from '@tauri-apps/api';
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useExplorerStore } from '../../store/explorer';
 import { useAppState } from '../../store/global';
 import Listbox from '../../components/primitive/Listbox';
@@ -12,6 +12,8 @@ import Slider from '../../components/primitive/Slider';
 export default function GeneralSettings() {
   const locations = useLocations();
 
+  const [fakeSliderVal, setFakeSliderVal] = useState([30, 0]);
+
   // const fileUploader = useRef<HTMLInputElement | null>(null);
   const app = useAppState();
 
@@ -73,10 +75,15 @@ export default function GeneralSettings() {
         </div>
       </InputContainer>
       <InputContainer
-        title="Locations"
-        description="Local cache storage for media previews and thumbnails."
+        title="Volumes"
+        description="A list of mounted volumes on this machine, for no reason."
       >
-        <Slider value={[20, 0]} />
+        <Slider
+          step={5}
+          value={fakeSliderVal}
+          onValueChange={setFakeSliderVal}
+          defaultValue={[25, 75]}
+        />
       </InputContainer>
       <InputContainer
         title="Media cache directory"
@@ -86,14 +93,11 @@ export default function GeneralSettings() {
           <Input
             className="flex-grow"
             value={app.config.data_dir}
-            placeholder="/users/jamie/Desktop"
+            placeholder="/users/jamie/Library/Application Support/spacedrive/cache"
           />
         </div>
       </InputContainer>
-      <InputContainer
-        title="Something about a vault"
-        description="Local cache storage for media previews and thumbnails."
-      >
+      <InputContainer title="Vault" description="Enable vault storage with VeraCrypt.">
         <div className="flex flex-row">
           <Button variant="primary">Enable Vault</Button>
           {/*<Input className="flex-grow" value="jeff" placeholder="/users/jamie/Desktop" />*/}
diff --git a/packages/core/src/tx/dataflow.md b/packages/core/src/tx/dataflow.md
index cb073b1f2..5dc0cc1ee 100644
--- a/packages/core/src/tx/dataflow.md
+++ b/packages/core/src/tx/dataflow.md
@@ -22,7 +22,7 @@ Flow for changing an active "Job" resource for example:
    ```
 2. Resolver is defined in Rust
    ```rust
-    #[derive(Serialize, Deserialize, Debug)]
+    #[derive(Serialize, Deserialize)]
     pub struct GetLatestJobs {
         amount: u8
     }
@@ -35,7 +35,15 @@ Flow for changing an active "Job" resource for example:
         }
     }
    ```
-3. Rust backend dispatches change to a resource
+3. Register resolver
+   - this enum is serialized into TS for use 
+   ```rust 
+   #[derive(Serialize, Deserialize, TS)]
+    pub enum Requests {
+        GetLatestJobs(GetLatestJobs)
+    }
+   ```
+4. Rust backend dispatches change to a resource
    ```rust
         Commit::new(
             Resource::Job,
@@ -45,9 +53,9 @@ Flow for changing an active "Job" resource for example:
                     Job::percentage_complete().set(&percentage_complete),
                     Job::completed_task_count().set(&completed_task_count),
                 ])
-                .raw(),
+                ._raw_gql(),
         )
         .exec()
         .await?;
     ```
-4. From within the
\ No newline at end of file
+5. Commit
\ No newline at end of file