[Update] Add new cat ui and file paths err

Author: codad5

package.json

@@ -1,7 +1,7 @@
 {
   "name": "google-task",
   "private": true,
-  "version": "0.0.4",
+  "version": "0.0.5",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/src/libs/auth.rs

@@ -1,4 +1,4 @@
-use super::filehelper::{ACCESS_TOKEN_FILE, AUTH_CODE_FILE};
+use super::filehelper::{ACCESS_TOKEN_FILE, AUTH_CODE_FILE, ENV_FILE};
 use super::response::{SaveAccessTokenResponse, SaveTokenResponse};
 
 

src-tauri/src/libs/filehelper.rs

@@ -18,35 +18,31 @@ pub fn get_app_local_data_dir(file_name: &str) -> String {
         file_name,
         Some(BaseDirectory::AppLocalData),
     ).expect("failed to resolve path");
-    path.to_str().unwrap().to_string()
-}
-
-pub fn resolve_access_token_file() -> String {
-    let access_token_file: String = get_app_local_data_dir("access_token.db");
-    println!("access token path: {}", access_token_file);
+    let path = path.to_str().unwrap().to_string();
     // check if file exists
-    if !std::path::Path::new(&access_token_file).exists() {
+    if !std::path::Path::new(file_name).exists() {
+        println!("File does not exist, creating file {} for {}", file_name, path);
         // create file
-        let mut file = std::fs::File::create(&access_token_file).unwrap();
+        let mut file = std::fs::File::create(file_name).unwrap();
         // write empty array to file
         file.write_all("".as_bytes()).unwrap();
     }
+    path
+}
+
+pub fn resolve_access_token_file() -> String {
+    let access_token_file: String = get_app_local_data_dir("access_token.db");
+    println!("access token path: {}", access_token_file);
     access_token_file
 }
 
 pub fn resolve_auth_code_file() -> String {
     let auth_code_file: String = get_app_local_data_dir("auth_code.db");
     println!("auth code path: {}", auth_code_file);
-    // check if file exists
-    if !std::path::Path::new(&auth_code_file).exists() {
-        // create file
-        let mut file = std::fs::File::create(&auth_code_file).unwrap();
-        // write empty array to file
-        file.write_all("".as_bytes()).unwrap();
-    }
     auth_code_file
 }
 
+
 lazy_static! {
     pub static ref ACCESS_TOKEN_FILE: String = resolve_access_token_file();
     pub static ref AUTH_CODE_FILE: String = resolve_auth_code_file();

src/App.tsx

@@ -50,7 +50,7 @@ function App() {
   useEffect(() => {
     listen_for_auth_code({
       onSucess: (code) => {
-        console.log(code);
+        console.log(code, "code generated");
         if (code) {
           saveAuthCode(code).then(() => {
             console.log("code saved");

src/components/ui/AddCategory.tsx

@@ -0,0 +1,66 @@
+import { IconButton, Button, FormControl, FormLabel, Input, ButtonGroup, Box, Popover, useDisclosure, PopoverTrigger, PopoverContent, FocusLock, PopoverArrow, PopoverCloseButton, Stack} from '@chakra-ui/react'
+import { CheckIcon } from '@chakra-ui/icons'
+import React, { useRef } from 'react'
+
+
+
+const Form = ({categoryNameRef, onCancel}: {categoryNameRef: React.RefObject<HTMLInputElement>, onCancel: () => void}) => {
+    const addNewCategory = () => {
+        console.log('adding new category', categoryNameRef.current?.value)
+    }
+
+    return (
+    <Stack spacing={4}>
+      <FormControl>
+        <FormLabel htmlFor={"categoryName"}>Category Name</FormLabel>
+              <Input ref={categoryNameRef} id={"categoryName"} placeholder={"Category Name"} />
+        </FormControl>
+      <ButtonGroup display='flex' justifyContent='flex-end'>
+        <Button variant='outline' onClick={onCancel}>
+          Cancel
+        </Button>
+        <Button colorScheme='teal' onClick={addNewCategory}>
+          Save
+        </Button>
+      </ButtonGroup>
+    </Stack>
+  )
+}
+
+export default function AddCategoryComponent() {
+    const { onOpen, onClose, isOpen } = useDisclosure()
+    const categoryNameRef = useRef<HTMLInputElement>(null)
+    return (
+        <>
+            <Box>
+                <Popover
+                    isOpen={isOpen}
+                    initialFocusRef={categoryNameRef}
+                    onOpen={onOpen}
+                    onClose={onClose}
+                    placement='right'
+                    closeOnBlur={false}
+                >
+                    <PopoverTrigger>
+                        <IconButton
+                            isRound={true}
+                            variant='solid'
+                            colorScheme='teal'
+                            aria-label='Done'
+                            size='sm'
+                            icon={<CheckIcon />}
+                        />
+                    </PopoverTrigger>
+                    <PopoverContent p={5}>
+                        <FocusLock persistentFocus={false}>
+                            <PopoverArrow />
+                            <PopoverCloseButton />
+                            <Form categoryNameRef={categoryNameRef} onCancel={onClose} />
+                        </FocusLock>
+                    </PopoverContent>
+                
+                </Popover>
+            </Box>
+        </>
+    )
+}

src/components/ui/LoggedInHeader.tsx

@@ -1,6 +1,7 @@
-import { Popover, PopoverTrigger, Avatar, Portal, PopoverContent, PopoverArrow, PopoverHeader, PopoverCloseButton, PopoverBody, Button, PopoverFooter } from "@chakra-ui/react";
+import { Popover, PopoverTrigger, Avatar, Spacer, Portal, Box, PopoverContent, PopoverArrow, PopoverHeader, PopoverCloseButton, PopoverBody, Button, PopoverFooter } from "@chakra-ui/react";
 import { useRecoilValue, useSetRecoilState } from "recoil";
 import { attemptLogoutState, userProfileSelector } from "../../config/states";
+import AddCategoryComponent from "./AddCategory";
 
 export default function LoggedInHeader() {
     const profile = useRecoilValue(userProfileSelector);
@@ -11,6 +12,11 @@ export default function LoggedInHeader() {
 
 
     return (
+        <>
+        <Box pr={4}>
+            <AddCategoryComponent />
+        </Box>
+        <Spacer />
         <Popover>
             <PopoverTrigger>
             <Avatar size="sm" name={profile?.name ?? "default"} src={profile?.picture ?? ""} />
@@ -26,6 +32,7 @@ export default function LoggedInHeader() {
                 <PopoverFooter> Date {new Date().getFullYear()}</PopoverFooter>
             </PopoverContent>
             </Portal>
-        </Popover>
+            </Popover>
+        </>
     )
 }

src/helpers/eventlistner.ts

@@ -5,17 +5,19 @@ type listnerCallback<T = any> = {
     onError ?: (err: Error) => any
 }
 
-export async function listen_for_auth_code(callback: listnerCallback<string|null>) {
+export async function listen_for_auth_code(callback: listnerCallback<string | null>) {
     const unlisten = await listen("oauth://url", async (data) => {
       try {
+        console.log("gotten data")
         if (!data.payload) return;
         const url = new URL(data.payload as string);
         const code = new URLSearchParams(url.search).get("code");
         return callback.onSucess(code);
       } catch (err) {
+        unlisten();
         return callback.onError ? callback.onError(err as Error) : null;
       }
     });
-    return unlisten();
+  return;
 }
 

src/helpers/invoker.ts

@@ -2,11 +2,11 @@ import {invoke} from '@tauri-apps/api/tauri';
 import { AccessToken } from '../types/googleapis';
 
 export async function save_auth_code(code: string) {
-    return await invoke('save_auth_code', {code});
+    return await invoke('save_code', {code});
 }
 
 export async function get_auth_code() {
-    return await invoke('get_auth_code');
+    return await invoke('load_code');
 }
 
 export async function save_access_token(token: string|AccessToken) {