Merge branch 'main' into main

src-tauri/src/data/auth.rs

@@ -106,8 +106,8 @@ pub fn save_user(name: &str, password: &str){
 fn test_authentication(){
     init_user_data();
     init_dir().expect("failed to create the main directory");
-    let name = "Nigger";
-    let password = "Nigger";
+    let name = "non existed user";
+    let password = "non existed user";
     save_user(name, password);
     authenticate_user(name, password);
     load_user(name, password)

src/pages/main_page/internal_apps/App.tsx

@@ -13,22 +13,24 @@ enum State {
 interface AppProps {
     element: React.ReactElement;
     name: string;
+    id: string;
 }
 
-function App({ element, name }: AppProps) {
+function App({ element, name, id }: AppProps) {
     let [ref, dx, dy] = useDraggable({ gridSize: 10 });
+    const [visibility, set_visibility] = useState('inherit');
 
-                //@ts-expect-error
+    //@ts-expect-error
     const [appState, setAppState] = useState(State.Normal);
 
     return (
         <div 
             className="frame"
             style={{
                 transform: `translate3d(${dx}px, ${dy}px, 0)`,
-
+                display: `${visibility}`,
             }}
-
+            id={id}
             //@ts-expect-error
             ref={ref}
             key={name}
@@ -37,7 +39,7 @@ function App({ element, name }: AppProps) {
                 <h1 className="sexy">{name}</h1>
                 <div className="frame-buttons">
                     <button className="minimize-btn">-</button>
-                    <button className="close-btn">x</button>
+                    <button className="close-btn" onClick={()=>document.getElementById(id)?.remove()}>x</button>
                 </div>
             </div>
             {element}

src/pages/main_page/internal_apps/file_system.tsx

@@ -2,14 +2,31 @@ import App from './App';
 import { invoke } from '@tauri-apps/api';
 import { useState } from 'react';
 
+function ContextMenu(){
+
+    return <div>
+        text here
+    </div>
+}
+
 function file_system(set_fs_html: React.Dispatch<React.SetStateAction<JSX.Element>>){
     const [location, set_location] = useState("Home");
     const [files, set_files] = useState([]);
     //@ts-expect-error
     invoke("ls", {}).then(result => set_files(result)).catch(console.log);
     //@ts-expect-error
     invoke("pwd", {}).then(result => set_location(result)).catch(console.log);
-    console.log(files, ", ", location);
+
+    const [menu_open, set_menu] = useState(false);
+    const right_click = (ev: MouseEvent) => {
+        //set_context({x: ev.clientX, y: ev.clientY});
+        console.log("right clicked");
+        //set_menu(true);
+
+    }
+    let internal_id = 0;
+    function id(){return (internal_id + 1).toString();}
+    document.addEventListener('contextmenu', right_click);
     return () => {
         let Application = <div className='ApplicationDirectory'>
                     <h1 className='filesystemtxt2'>/{location}/</h1>
@@ -18,9 +35,14 @@ function file_system(set_fs_html: React.Dispatch<React.SetStateAction<JSX.Elemen
     let app_html = <div className='frametest2'>
             {Application}
 
+    let app_html = <div className='frametest2'>
+        <div className='ApplicationDirectory'>
+            <h1 className='filesystemtxt2'>/{location}/</h1>
+        </div>
 
+        {menu_open && <ContextMenu />}
     </div>;
-    let app = <App element={app_html} name='feet pics'/>;
+    let app = <App element={app_html} id={id()}  name='feet pics'/>;
     set_fs_html(app);
 };
 }