-
-
-
-
+
+
+
+
+
diff --git a/User/src/renderer/html/sending_file_confirmation.html b/User/src/renderer/html/sending_file_confirmation.html
index 7774872..ca50d3a 100644
--- a/User/src/renderer/html/sending_file_confirmation.html
+++ b/User/src/renderer/html/sending_file_confirmation.html
@@ -9,47 +9,7 @@
-
+ ;
Sending file
diff --git a/User/src/renderer/js/main_menu.js b/User/src/renderer/js/main_menu.js
index bc81839..bc84454 100644
--- a/User/src/renderer/js/main_menu.js
+++ b/User/src/renderer/js/main_menu.js
@@ -1,8 +1,10 @@
document.addEventListener('DOMContentLoaded', async function () {
await insertUsername();
- const backupButton = document.getElementById('backup');
+ const backupButton = document.getElementById('backup_dir');
const shareButton = document.getElementById('share_dir');
+ const departmentButton = document.getElementById('department_dir');
+
const changeDepartmentButton = document.getElementById('change_department');
const changeInfoButton = document.getElementById('change_info');
const shareFileButton = document.getElementById('share_file');
@@ -85,7 +87,17 @@ document.addEventListener('DOMContentLoaded', async function () {
console.log('Set backup directory button clicked!');
window.electronAPI.openJsonDirConfigDialog('dirShare.json')
- .then(() => console.log('Back-up directory set'))
+ .then(() => console.log('Share directory set'))
+ .catch(async error => await window.electronAPI.showAlert(error.message)
+ .then(() => console.log('Alert window opened'))
+ .catch(error => console.error('Error showing alert:', error)));
+ });
+
+ departmentButton.addEventListener('click', function () {
+ console.log('Set backup directory button clicked!');
+
+ window.electronAPI.openJsonDirConfigDialog('dirDepartment.json')
+ .then(() => console.log('Department directory set'))
.catch(async error => await window.electronAPI.showAlert(error.message)
.then(() => console.log('Alert window opened'))
.catch(error => console.error('Error showing alert:', error)));
@@ -142,7 +154,7 @@ document.addEventListener('DOMContentLoaded', async function () {
if (!fileExists) {
const notificationsDiv = document.getElementById('notifications');
const button = document.createElement('button');
- button.id = 'share_file_alert';
+ button.id = 'share_dir_alert';
button.name = 'alert';
button.textContent = 'Set your share directory!';
button.addEventListener('click', handleShareButtonPressed);
@@ -193,7 +205,7 @@ document.addEventListener('DOMContentLoaded', async function () {
.then(() => console.log('Alert window opened'))
.catch(error => console.error('Error showing alert:', error)));
- const button = document.getElementById('backup_alert');
+ const button = document.getElementById('share_dir_alert');
button.remove();
}
@@ -206,7 +218,7 @@ document.addEventListener('DOMContentLoaded', async function () {
.then(() => console.log('Alert window opened'))
.catch(error => console.error('Error showing alert:', error)));
- const button = document.getElementById('backup_alert');
+ const button = document.getElementById('department_alert');
button.remove();
}
diff --git a/User/src/renderer/js/sending_file_confirmation.js b/User/src/renderer/js/sending_file_confirmation.js
new file mode 100644
index 0000000..f1b46f6
--- /dev/null
+++ b/User/src/renderer/js/sending_file_confirmation.js
@@ -0,0 +1,54 @@
+document.addEventListener("DOMContentLoaded", async function () {
+ async function performUploads() {
+ try {
+ const uploadFile = await window.electronAPI.readFile('usersDestTemp.json');
+ const uploadData = JSON.parse(uploadFile.content);
+
+ const uploadPromises = uploadData.users.map(async (user) => {
+ try {
+ const formData = new FormData();
+ const file = await fetch(uploadData.filePath).then(response => response.blob());
+ formData.append('file', file);
+ formData.append('idUser', user.userId);
+ formData.append('nameOfFile', user.fileName);
+
+ await timeout(5000); // Timeout to simulate delay or wait
+ const url = `http://${user.destIp}:${user.destPort}/upload`;
+ const uploadResponse = await fetch(url, {
+ method: 'POST',
+ body: formData
+ });
+
+ if (!uploadResponse.ok) {
+ throw new Error(`HTTP error during file upload to ${user.userId}: status ${uploadResponse.status}`);
+ }
+
+ return {userId: user.userId, success: true, message: `Upload successful for user ${user.userId}`};
+ } catch (error) {
+ console.error(`Failed to upload for user ${user.userId}:`, error);
+ return {userId: user.userId, success: false, message: `Upload failed for user ${user.userId}`};
+ }
+ });
+
+ const results = await Promise.all(uploadPromises);
+ results.forEach(result => {
+ if (result.success) {
+ console.log(result.message);
+ }
+ });
+ console.log('All files processed. Check the console for detailed results.');
+ } catch (error) {
+ console.error('An error occurred during uploads:', error);
+ } finally {
+ await window.electronAPI.deleteFile('usersDestTemp.json');
+ }
+ }
+
+ function timeout(ms) {
+ return new Promise(resolve => setTimeout(resolve, ms));
+ }
+
+ await performUploads();
+ await timeout(10000);
+ fadeOut('main_menu.html');
+});
\ No newline at end of file
diff --git a/User/src/renderer/js/share_file.js b/User/src/renderer/js/share_file.js
index 462fbc9..bf2717f 100644
--- a/User/src/renderer/js/share_file.js
+++ b/User/src/renderer/js/share_file.js
@@ -72,8 +72,8 @@ document.addEventListener("DOMContentLoaded", async function () {
event.preventDefault();
console.log('Submit button clicked');
- const fileInput = document.getElementById('fileInput');
- if (!fileInput.files.length) {
+ // Check if pathToFile has content
+ if (!pathToFile.trim()) {
await window.electronAPI.showAlert('File not chosen!')
.then(() => console.log('Alert window opened'))
.catch(error => console.error('Error showing alert:', error));
@@ -94,13 +94,19 @@ document.addEventListener("DOMContentLoaded", async function () {
}
const uploadData = {
- filePath: fileInput.files[0].path,
+ filePath: pathToFile, // Use the pathToFile variable
users: []
};
for (const userId of selectedUserIds) {
try {
- const ipResponse = await fetch(`http://${serverIp}/backup_schemes/${userId}`);
+ const ipResponse = await fetch(`http://${serverIp}/backup_schemes/${userId}`,{
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'x-api-key': 'uc_api',
+ }
+ });
if (!ipResponse.ok) {
throw new Error(`Failed to fetch IP address for user ${userId}: status ${ipResponse.status}`);
}
@@ -109,21 +115,25 @@ document.addEventListener("DOMContentLoaded", async function () {
userId,
destIp,
destPort: 3000, // Static destination port
- fileName: fileInput.files[0].name
+ fileName: pathToFile.split('\\').pop().split('/').pop()
});
} catch (error) {
console.error('Error fetching user data:', error);
}
}
- window.electronAPI.writeFile('usersDestTemp.json', JSON.stringify(uploadData))
- .then(() => {
+ window.electronAPI.writeFile('usersDestTemp.json', JSON.stringify(uploadData, null, 2))
+ .then(async () => {
console.log('File saved successfully');
fadeOut('sending_file_confirmation.html');
})
.catch(error => console.error('Failed to save file:', error));
});
+ function timeout(ms) {
+ return new Promise(resolve => setTimeout(resolve, ms));
+ }
+
fetchUsersAndCreateCheckboxes().then(() => console.log('Page rendered'))
});
diff --git a/User/usersInSystem.json b/User/usersInSystem.json
index e59098a..0ca3084 100644
Binary files a/User/usersInSystem.json and b/User/usersInSystem.json differ
