Merge pull request #12 from nosaraei/main

change appearance
arvancloud · Feb 12, 2023 · 041af86 · 041af86
2 parents d7a0d82 + 82bfb2a
commit 041af86
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 39 deletions.
diff --git a/backend/channel/BucketsChannel.js b/backend/channel/BucketsChannel.js
@@ -544,6 +544,13 @@ storage_class = STANDARD`;
         });
 
     }
+
+    async unMountBucket(){
+
+        if(GlobalData.RClone){
+            GlobalData.RClone.kill();
+        }
+    }
 }
 
 const instance = new BucketsChannel();

diff --git a/backend/view/loading.html b/backend/view/loading.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Loading Arvan S3 Application</title>
+    <title>Loading Arvan Cloud S3 Application</title>
     <style>
         body{
             background-color: #00baba;

diff --git a/main.js b/main.js
@@ -73,22 +73,28 @@ function CreateWindow() {
     // Create the browser window.
 
     mainWindow = new BrowserWindow({
-        width: 1024,
+        width: 1210,
         height: 768,
         minWidth: 1024,
         minHeight: 768,
+        maxWidth: 1210,
+        //maxHeight: 768,
         icon: path.join(__dirname, 'icon.png'),
         autoHideMenuBar: true,
-        show: false,
+        show: true,
+        maximizable: false,
+        frame: true,
+        movable: true,
+        transparent: false,
         webPreferences: {
             nodeIntegration: false,
             contextIsolation: false,
             preload: path.join(__dirname, 'preload.js')
         }
     });
 
-    mainWindow.maximize();
-    mainWindow.show();
+    //mainWindow.maximize();
+    //mainWindow.show();
 
     mainWindow.on('close', async e => {
         e.preventDefault();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "arvan-s3",
-  "version": "1.1.1",
+  "name": "arvan-cloud-s3",
+  "version": "1.1.2",
   "private": true,
   "main": "main.js",
   "homepage": "./",

diff --git a/public/index.html b/public/index.html
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Arvan S3</title>
+    <title>Arvan Cloud S3</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/App.js b/src/App.js
@@ -94,8 +94,8 @@ function App(){
                             padding: '1.5rem',
                             boxShadow: '0 4px 20px rgba(0,0,0, 0.03)',
                             borderRadius: '1rem',
-                            marginTop: '1.5rem',
-                            minHeight: 'calc(91vh - 1.5rem)'
+                            marginTop: '1rem',
+                            minHeight: 'calc(91vh - 1rem)'
                         }}>
                             <Routes>
                                 <Route path={"/profiles"} element={<ProfilesList/>}/>

diff --git a/src/index.css b/src/index.css
@@ -33,7 +33,7 @@ body {
   font-weight: 400;
   line-height: 1.5;
   color: rgb(52, 68, 86);
-  padding-bottom: 1.5rem;
+  padding-bottom: 1rem;
 }
 
 code {

diff --git a/src/sections/BucketsList/BucketsList.js b/src/sections/BucketsList/BucketsList.js
@@ -281,6 +281,28 @@ const BucketsList = () => {
 
     };
 
+    const handleUnMountBucket = async (params) => {
+
+        try{
+
+            await window.channel("Buckets@unMountBucket");
+
+            layout.notify(params.row.Name + " unmounted successfully", {
+                severity: "success"
+            });
+
+        }
+        catch (e) {
+
+            console.log(e);
+
+            layout.notify("Error in bucket unmount", {
+                severity: "error"
+            });
+        }
+
+    };
+
     function getCreationDateAttribute(params) {
 
         return moment(params.value).locale('en').format('DD MMMM YYYY - HH:mm');
@@ -350,6 +372,12 @@ const BucketsList = () => {
                         </ListItemIcon>
                         <ListItemText>Mount as drive</ListItemText>
                     </MenuItem>
+                    <MenuItem onClick={handleUnMountBucket.bind(this, params)}>
+                        <ListItemIcon>
+                            <SaveIcon fontSize="small" />
+                        </ListItemIcon>
+                        <ListItemText>Unmount bucket</ListItemText>
+                    </MenuItem>
                     <MenuItem onClick={handleCopyBucket.bind(this, params)}>
                         <ListItemIcon>
                             <FolderCopyIcon fontSize="small" />

diff --git a/src/sections/ObjectsList/ObjectsList.js b/src/sections/ObjectsList/ObjectsList.js
@@ -457,34 +457,10 @@ const ObjectsList = () => {
                     <IconButton onClick={handleBackToBuckets}><BackIcon fontSize="small" /></IconButton>
                     <span style={{fontSize: '16px', fontWeight: '700'}}>Bucket {mountedBucket}</span>
                 </div>
-                <ActionMenu buttonTitle="Batch operation" disabled={!selectionModel.length}>
-                    <MenuItem onClick={handleBulkDownloadObjects}>
-                        <ListItemIcon>
-                            <CloudDownloadOutlinedIcon fontSize="small" />
-                        </ListItemIcon>
-                        <ListItemText>Download objects</ListItemText>
-                    </MenuItem>
-                    <MenuItem onClick={handleBulkSetPublic}>
-                        <ListItemIcon>
-                            <PublicIcon fontSize="small" />
-                        </ListItemIcon>
-                        <ListItemText>Access public read</ListItemText>
-                    </MenuItem>
-                    <MenuItem onClick={handleBulkSetPrivate}>
-                        <ListItemIcon>
-                            <PublicOffIcon fontSize="small" />
-                        </ListItemIcon>
-                        <ListItemText>Remove public read access</ListItemText>
-                    </MenuItem>
-                    <MenuItem onClick={handleBulkDeleteObjects}>
-                        <ListItemIcon>
-                            <DeleteIcon fontSize="small" />
-                        </ListItemIcon>
-                        <ListItemText>Delete objects</ListItemText>
-                    </MenuItem>
-                </ActionMenu>
+
                 <div style={{
                     marginTop: '-40px',
+                    marginLeft: '-120px'
                 }}>
                     <TextField
                         size="small"
@@ -496,8 +472,36 @@ const ObjectsList = () => {
                         onChange={(e) => setSearchKey(e.target.value)}
                     />
                 </div>
+                <Stack direction="row" justifyContent="space-between" sx={{gap: '1rem'}}>
+                    <ActionMenu  buttonTitle="Batch operation" disabled={!selectionModel.length}>
+                        <MenuItem onClick={handleBulkDownloadObjects}>
+                            <ListItemIcon>
+                                <CloudDownloadOutlinedIcon fontSize="small" />
+                            </ListItemIcon>
+                            <ListItemText>Download objects</ListItemText>
+                        </MenuItem>
+                        <MenuItem onClick={handleBulkSetPublic}>
+                            <ListItemIcon>
+                                <PublicIcon fontSize="small" />
+                            </ListItemIcon>
+                            <ListItemText>Access public read</ListItemText>
+                        </MenuItem>
+                        <MenuItem onClick={handleBulkSetPrivate}>
+                            <ListItemIcon>
+                                <PublicOffIcon fontSize="small" />
+                            </ListItemIcon>
+                            <ListItemText>Remove public read access</ListItemText>
+                        </MenuItem>
+                        <MenuItem onClick={handleBulkDeleteObjects}>
+                            <ListItemIcon>
+                                <DeleteIcon fontSize="small" />
+                            </ListItemIcon>
+                            <ListItemText>Delete objects</ListItemText>
+                        </MenuItem>
+                    </ActionMenu>
+                    <Button onClick={() => setUploadBoxDialog({open: true})} variant="contained" startIcon={<CloudUploadIcon />}>Upload</Button>
+                </Stack>
 
-                <Button onClick={() => setUploadBoxDialog({open: true})} variant="contained" startIcon={<CloudUploadIcon />}>Upload</Button>
             </Stack>
 
             <ObjectUploadBoxDialog

diff --git a/src/sections/ProfilesList/ProfilesList.js b/src/sections/ProfilesList/ProfilesList.js
@@ -210,7 +210,7 @@ const ProfilesList = () => {
 
     const ToolBar = (
         <div>
-            <h3 style={{marginTop: '0'}}>Arvan S3</h3>
+            <h3 style={{marginTop: '0'}}>Arvan Cloud S3</h3>
             <Stack direction="row" justifyContent="space-between" sx={{marginBottom: '1rem'}}>
                 <div>
                     <span style={{fontSize: '16px', fontWeight: '700'}}>Profiles</span>