program finalizat
This commit is contained in:
andrei-mihnea-cerbu
Generated
+4086
-26
File diff suppressed because it is too large
Load Diff
+48
-5
@@ -4,25 +4,68 @@
|
||||
"version": "1.0.0",
|
||||
"description": "Aplicatie P2P pentru stocarea resurselor digitale",
|
||||
"scripts": {
|
||||
"clean": "del-cli dist",
|
||||
"start": "tsc && copyfiles -u 1 'src/**/*' dist && electron dist/main/main.js"
|
||||
"clean": "del-cli dist && del-cli out",
|
||||
"build-dist": "tsc && copyfiles -u 1 'src/**/*' dist",
|
||||
"start-dev": "tsc && copyfiles -u 1 'src/**/*' dist && electron dist/main/main.js",
|
||||
"start": "npm run clean && npm run build-dist && electron-forge start",
|
||||
"package": "npm run clean && npm run build-dist && electron-forge package",
|
||||
"make": "npm run clean && npm run build-dist && electron-forge make"
|
||||
},
|
||||
"main": "dist/main/main.js",
|
||||
"author": "Cerbu Andrei - Mihnea",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"dotenv": "^16.4.5",
|
||||
"electron": "^32.0.1",
|
||||
"ping": "^0.4.4",
|
||||
"uuid": "^10.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/electron": "^1.6.10",
|
||||
"@types/node": "^22.6.1",
|
||||
"@electron-forge/cli": "^6.0.0",
|
||||
"@electron-forge/maker-deb": "^6.0.0",
|
||||
"@electron-forge/maker-rpm": "^6.0.0",
|
||||
"@electron-forge/maker-squirrel": "^6.0.0",
|
||||
"@electron-forge/maker-zip": "^6.0.0",
|
||||
"@types/ping": "^0.4.4",
|
||||
"@types/uuid": "^10.0.0",
|
||||
"copyfiles": "^2.4.1",
|
||||
"del-cli": "^5.0.0",
|
||||
"electron": "^33.0.2",
|
||||
"typescript": "^5.6.2"
|
||||
},
|
||||
"config": {
|
||||
"forge": {
|
||||
"packagerConfig": {
|
||||
"name": "ClientApp",
|
||||
"icon": "../app_icons/icon.ico",
|
||||
"ignore": [
|
||||
"src",
|
||||
".idea",
|
||||
"tsconfig.json"
|
||||
]
|
||||
},
|
||||
"makers": [
|
||||
{
|
||||
"name": "@electron-forge/maker-squirrel",
|
||||
"config": {
|
||||
"name": "ClientApp",
|
||||
"setupIcon": "../app_icons/icon.ico"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "@electron-forge/maker-zip",
|
||||
"platforms": ["darwin"],
|
||||
"config": {
|
||||
"icon": "../app_icons/icon.icns"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "@electron-forge/maker-deb",
|
||||
"platforms": ["linux"],
|
||||
"config": {
|
||||
"icon": "../app_icons/icon.png"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 298 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 70 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 8.9 KiB |
@@ -0,0 +1,79 @@
|
||||
body, html {
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: "Pridi", sans-serif;
|
||||
background-color: #4A628A;
|
||||
}
|
||||
|
||||
.container {
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.header {
|
||||
text-align: center;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 48px;
|
||||
font-weight: 500;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.announcement-body {
|
||||
max-height: 300px; /* Limit the height to make it scrollable if content overflows */
|
||||
width: 80%;
|
||||
overflow-y: auto; /* Enable vertical scrolling */
|
||||
padding: 20px;
|
||||
color: white;
|
||||
background-color: rgba(0, 0, 0, 0.2); /* Slight background to make text stand out */
|
||||
border-radius: 8px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* Customize scrollbar appearance */
|
||||
.announcement-body::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
}
|
||||
|
||||
.announcement-body::-webkit-scrollbar-track {
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.announcement-body::-webkit-scrollbar-thumb {
|
||||
background-color: rgba(255, 255, 255, 0.8);
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.announcement-body::-webkit-scrollbar-thumb:hover {
|
||||
background-color: rgb(158, 158, 158);
|
||||
}
|
||||
|
||||
.announcement-footer {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
#closeButton {
|
||||
padding: 10px 20px;
|
||||
margin-bottom: 15px;
|
||||
font-size: 16px;
|
||||
color: #4A628A;
|
||||
background-color: white;
|
||||
border: none;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.3s ease;
|
||||
}
|
||||
|
||||
#closeButton:hover {
|
||||
background-color: #f0f0f0;
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
body, html {
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
font-family: "Pridi", sans-serif; /* Use sans-serif fallback */
|
||||
background-color: #4A628A;
|
||||
}
|
||||
|
||||
h4, h2, h1{
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.container{
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.title{
|
||||
font-size: 48px;
|
||||
font-weight: 500;
|
||||
letter-spacing: -1px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
img{
|
||||
width: 200px;
|
||||
height: 200px;
|
||||
}
|
||||
|
||||
p{
|
||||
color: white;
|
||||
}
|
||||
|
||||
.loading-section{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.spinner {
|
||||
margin-bottom: 8px;
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
border: 3px solid #f3f3f3;
|
||||
border-top: 3px solid #2196F3;
|
||||
border-radius: 50%;
|
||||
animation: spin 1s linear infinite;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% { transform: rotate(0deg); }
|
||||
100% { transform: rotate(360deg); }
|
||||
}
|
||||
+121
-88
@@ -1,110 +1,143 @@
|
||||
body, html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
font-family: "Pridi", sans-serif; /* Use sans-serif fallback */
|
||||
background-color: #4A628A;
|
||||
}
|
||||
|
||||
background-image: url('../assets/background.png');
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
h4, h2, h1{
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.page{
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.container {
|
||||
opacity: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.header {
|
||||
color: #1B1A55;
|
||||
font-size: 4vh;
|
||||
text-transform: uppercase;
|
||||
line-height: 2.5rem;
|
||||
margin-bottom: 10rem;
|
||||
}
|
||||
|
||||
.login-form {
|
||||
background-color: #535C91;
|
||||
opacity: 71;
|
||||
padding: 9vh 3vh 5vh;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9);
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
.login-form-title {
|
||||
margin: 0 0 5vh 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.login-form-title h2 {
|
||||
color: #FFFFFF;
|
||||
font-size: 5vh;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.login-form hr {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
.login-form-content {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
input {
|
||||
text-align: center;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
font-size: 1.2rem;
|
||||
width: 70%;
|
||||
padding: 1rem;
|
||||
margin: 0.7rem;
|
||||
background-color: #1B1A55;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
button {
|
||||
font-weight: bold;
|
||||
background: linear-gradient(to bottom, rgba(74, 98, 138, 0.0) 30%, rgba(186, 237, 255, 0.7));
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: space-evenly;
|
||||
height: 90%;
|
||||
width: 35%;
|
||||
font-size: 1rem;
|
||||
padding: 10px;
|
||||
border: none;
|
||||
border-radius: 5px;
|
||||
margin-top: 1rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
filter: brightness(85%);
|
||||
.header{
|
||||
text-align: center;
|
||||
padding-bottom: 16px;
|
||||
padding-top: 16px;
|
||||
}
|
||||
|
||||
.title{
|
||||
font-size: 48px;
|
||||
font-weight: 500;
|
||||
letter-spacing: -1px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.subheading{
|
||||
padding-top: 8px;
|
||||
font-size: 16px;
|
||||
letter-spacing: -0.5px;
|
||||
color: rgba(255,255,255, 0.8);
|
||||
}
|
||||
|
||||
.login-form{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
width: 80%;
|
||||
}
|
||||
|
||||
.login-title {
|
||||
font-size: 24px;
|
||||
font-weight: 500;
|
||||
color: white;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.login-form-content input {
|
||||
width: 100%;
|
||||
padding: 15px;
|
||||
margin: 10px 0;
|
||||
border: 1px solid #ccc; /* Light gray border */
|
||||
border-radius: 8px; /* Rounded corners */
|
||||
font-size: 1em;
|
||||
font-family: inherit;
|
||||
box-sizing: border-box;
|
||||
background-color: #f9f9f9; /* Light background */
|
||||
color: #333; /* Dark text color */
|
||||
transition: border-color 0.3s ease, box-shadow 0.3s ease; /* Smooth transition for interaction */
|
||||
}
|
||||
|
||||
/* Placeholder Text Styling */
|
||||
.login-form-content input::placeholder {
|
||||
color: #aaa; /* Lighter color for placeholders */
|
||||
}
|
||||
|
||||
/* Focus State Styling */
|
||||
.login-form-content input:focus {
|
||||
outline: none; /* Remove default focus outline */
|
||||
border-color: #4A628A; /* Blue border on focus */
|
||||
box-shadow: 0 0 5px rgba(74, 98, 138, 0.5); /* Subtle shadow for focus */
|
||||
background-color: #fff; /* Slightly brighter background on focus */
|
||||
}
|
||||
|
||||
/* Input Field Hover Effect */
|
||||
.login-form-content input:hover {
|
||||
border-color: #888; /* Darker gray border on hover */
|
||||
}
|
||||
|
||||
/* Disabled Input Styling */
|
||||
.login-form-content input:disabled {
|
||||
background-color: #e0e0e0; /* Light gray background for disabled input */
|
||||
cursor: not-allowed; /* Show "not allowed" cursor */
|
||||
opacity: 0.7; /* Slight transparency */
|
||||
}
|
||||
|
||||
.login-form-footer {
|
||||
margin-top: 3vh;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-content: center;
|
||||
width: 100%;
|
||||
flex-direction: column;
|
||||
justify-content: space-between; /* Align buttons next to each other */
|
||||
align-items: center;
|
||||
justify-content: space-evenly;
|
||||
gap: 10px; /* Space between buttons */
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
/* Styling for buttons */
|
||||
.login-form-footer button {
|
||||
flex: 1; /* Ensure buttons are equal width */
|
||||
padding: 16px;
|
||||
font-weight: 300;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.3s ease, transform 0.2s ease;
|
||||
}
|
||||
|
||||
button[name="underline"] {
|
||||
background-color: transparent; /* No background */
|
||||
border: none; /* Remove default button border */
|
||||
color: #4A628A; /* Set text color */
|
||||
font-size: 1em; /* Set font size */
|
||||
cursor: pointer; /* Add pointer cursor for interactivity */
|
||||
text-decoration: underline; /* Underline text */
|
||||
padding: 0; /* Remove default padding */
|
||||
}
|
||||
|
||||
button[name="submit"] {
|
||||
background-color: #F44336;
|
||||
color: white;
|
||||
width: 100%;
|
||||
background-color: #4A628A; /* Blue background */
|
||||
color: white; /* White text color */
|
||||
}
|
||||
|
||||
button[name="signup"] {
|
||||
background-color: #2196F3;
|
||||
color: white;
|
||||
}
|
||||
+166
-194
@@ -1,232 +1,204 @@
|
||||
body, html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-family: "Pridi", sans-serif; /* Use sans-serif fallback */
|
||||
background-color: #4A628A;
|
||||
}
|
||||
|
||||
h4, h2, h1{
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.title{
|
||||
font-size: 32px;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
|
||||
background-image: url('../assets/background.png');
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
}
|
||||
|
||||
.overlay {
|
||||
display: none;
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: rgba(0, 0, 0, 0.85);
|
||||
z-index: 2;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.ceo-validation-form {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
width: 300px;
|
||||
padding: 20px;
|
||||
background: #1B1A55;
|
||||
border-radius: 10px;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.ceo-validation-form h2 {
|
||||
text-align: center;
|
||||
letter-spacing: -1px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.form-actions {
|
||||
text-align: center;
|
||||
padding-top: 20px;
|
||||
}
|
||||
|
||||
.form-actions button {
|
||||
padding: 10px 20px;
|
||||
margin: 0 10px;
|
||||
border: none;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
input {
|
||||
text-align: center;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
font-size: 1.2rem;
|
||||
width: 80%;
|
||||
padding: 1rem;
|
||||
margin: 0.7rem;
|
||||
background-color: #1B1A55;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
#back_button {
|
||||
background-color: #f44336;
|
||||
width: 35%;
|
||||
height: auto;
|
||||
.user{
|
||||
display: inline;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#submit_button {
|
||||
background-color: #4CAF50;
|
||||
width: 35%;
|
||||
height: auto;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.container {
|
||||
opacity: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
min-height: 100vh;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.left_block {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background-color: #535C91;
|
||||
opacity: 71;
|
||||
padding: 2rem;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9);
|
||||
color: white;
|
||||
}
|
||||
|
||||
.left_block_top {
|
||||
display: flex;
|
||||
.navbar{
|
||||
padding-top: 8px;
|
||||
padding-right: 32px;
|
||||
padding-left: 32px;
|
||||
height: 10%;
|
||||
display:flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
text-align: left;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.left_block_top h1 {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.left_block_top img {
|
||||
margin: 0 3vw 0 5vw;
|
||||
width: 8vw;
|
||||
height: 8vw;
|
||||
}
|
||||
|
||||
.left_block_content {
|
||||
margin: 2rem 0 2rem 0;
|
||||
}
|
||||
|
||||
.left_block_buttons {
|
||||
.welcome{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
img{
|
||||
padding-right: 8px;
|
||||
width:25px;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.page{
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.container{
|
||||
width:100%;
|
||||
height:100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
button {
|
||||
margin: 0 1rem 0 1rem;
|
||||
width: 15vw;
|
||||
height: 10vh;
|
||||
.left_block{
|
||||
background: linear-gradient(to bottom, #131A24, #4A628A);
|
||||
width: 25%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
border: none;
|
||||
border-radius: 10px;
|
||||
.notification-title{
|
||||
padding-top: 16px;
|
||||
padding-bottom: 16px;
|
||||
text-align: center;
|
||||
height: 10%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
color: white;
|
||||
font-size: 1rem;
|
||||
font-weight: bold;
|
||||
.notifications{
|
||||
overflow-y: auto;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
flex-grow: 1; /* Allow it to take available space */
|
||||
max-height: calc(90% - 80px);
|
||||
}
|
||||
|
||||
text-transform: uppercase;
|
||||
.right_block_content button:last-child {
|
||||
background-color: #FF6347;
|
||||
}
|
||||
|
||||
.right_block_content button:last-child:hover {
|
||||
background-color: #fd4c29;
|
||||
}
|
||||
|
||||
.alert, .logout-button{
|
||||
cursor: pointer;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
|
||||
outline: none;
|
||||
transition: background-color 0.3s ease;
|
||||
border-radius: 15px;
|
||||
width: 80%;
|
||||
min-height: 64px;
|
||||
height: auto;
|
||||
padding:12px;
|
||||
background: #FF6347;
|
||||
font-weight: bold;
|
||||
font-size: 12px;
|
||||
}
|
||||
.notification{
|
||||
cursor: pointer;
|
||||
border-radius: 15px;
|
||||
width: 80%;
|
||||
min-height: 64px;
|
||||
height: auto;
|
||||
padding:12px;
|
||||
background: rgba(186, 229, 255);
|
||||
font-weight: bold;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
filter: brightness(85%);
|
||||
.notification:hover{
|
||||
background: #d9efff;
|
||||
}
|
||||
|
||||
.left_block_footer {
|
||||
.alert:hover, .logout-button:hover{
|
||||
background: rgb(244, 44, 44);
|
||||
}
|
||||
|
||||
.notif-title{
|
||||
font-size: 24px;
|
||||
font-weight: 300;
|
||||
letter-spacing: -1px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.left-content{
|
||||
height: 90%;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.left_block_footer{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: end;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
padding-bottom: 16px;
|
||||
}
|
||||
|
||||
.right_block {
|
||||
display: flex;
|
||||
.right_block_content{
|
||||
height: 90%;
|
||||
}
|
||||
|
||||
.right_block{
|
||||
width: 75%;
|
||||
display:flex;
|
||||
flex-direction: column;
|
||||
background-color: #535C91;
|
||||
opacity: 71;
|
||||
padding: 2rem;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9);
|
||||
color: white;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.notifications {
|
||||
display: flex;
|
||||
margin: 1rem 2rem 2rem 3rem;
|
||||
flex-direction: column;
|
||||
align-items: start;
|
||||
|
||||
height: 40vh; /* Fixed height */
|
||||
width: 80%; /* Full width */
|
||||
overflow: auto; /* Enable scrolling */
|
||||
|
||||
font-size: 1.2rem;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.notifications::-webkit-scrollbar {
|
||||
width: 10px; /* Reduced width of the scrollbar by 2px */
|
||||
}
|
||||
|
||||
.notifications::-webkit-scrollbar-track {
|
||||
background: #1B1A55; /* Updated track color */
|
||||
}
|
||||
|
||||
.notifications::-webkit-scrollbar-thumb {
|
||||
background: #535C91; /* Updated handle color */
|
||||
border: 2px solid #1B1A55; /* Adding a border to effectively reduce the thumb size */
|
||||
}
|
||||
|
||||
.notifications::-webkit-scrollbar-thumb:hover {
|
||||
background: #555; /* Updated handle color on hover */
|
||||
}
|
||||
|
||||
button[name="logout"] {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
width: 10vw;
|
||||
height: 5vh;
|
||||
background-color: #F44336;
|
||||
}
|
||||
|
||||
button[name="alert"] {
|
||||
margin: 0.7rem;
|
||||
background-color: #F44336;
|
||||
}
|
||||
|
||||
button[name="notification"] {
|
||||
margin: 0.7rem;
|
||||
background-color: #23BDEE;
|
||||
.right_block_content {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr); /* 3 equal-width columns */
|
||||
gap: 8px; /* Spacing between buttons */
|
||||
padding: 32px; /* Optional padding */
|
||||
}
|
||||
|
||||
button[name="menu_button"] {
|
||||
margin: 0.7rem;
|
||||
background-color: #1B1A55;
|
||||
padding: 10px 20px;
|
||||
font-size: 16px;
|
||||
background-color: rgba(186,229,244,0.4); /* Button background */
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.3s ease, transform 0.2s ease;
|
||||
}
|
||||
|
||||
button[name="menu_button"]:hover {
|
||||
background-color: #3B5173; /* Darker background on hover */
|
||||
}
|
||||
|
||||
.notifications::-webkit-scrollbar {
|
||||
width: 4px; /* Width of the scrollbar */
|
||||
}
|
||||
|
||||
.notifications::-webkit-scrollbar-track {
|
||||
background: rgba(255, 255, 255, 0.1); /* Track background color */
|
||||
border-radius: 10px; /* Rounded corners for the track */
|
||||
}
|
||||
|
||||
.notifications::-webkit-scrollbar-thumb {
|
||||
background-color: rgba(74, 98, 138, 0.8); /* Scrollbar handle color */
|
||||
border-radius: 10px; /* Rounded corners for the scrollbar handle */
|
||||
}
|
||||
|
||||
.notifications::-webkit-scrollbar-thumb:hover {
|
||||
background-color: rgba(74, 98, 138, 1); /* Darker color on hover */
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
html, body, div, span, applet, object, iframe,
|
||||
h1, h2, h3, h4, h5, h6, p, blockquote, pre, hr
|
||||
a, abbr, acronym, address, big, cite, code,
|
||||
del, dfn, em, img, ins, kbd, q, s, samp,
|
||||
small, strike, strong, sub, sup, tt, var,
|
||||
b, u, i, center,
|
||||
dl, dt, dd, ol, ul, li,
|
||||
fieldset, form, label, legend,
|
||||
table, caption, tbody, tfoot, thead, tr, th, td,
|
||||
article, aside, canvas, details, embed,
|
||||
figure, figcaption, footer, header, hgroup,
|
||||
menu, nav, output, ruby, section, summary,
|
||||
time, mark, audio, video {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
font: inherit;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
/* HTML5 display-role reset for older browsers */
|
||||
article, aside, details, figcaption, figure,
|
||||
footer, header, hgroup, menu, nav, section {
|
||||
display: block;
|
||||
}
|
||||
body {
|
||||
line-height: 1;
|
||||
}
|
||||
ol, ul {
|
||||
list-style: none;
|
||||
}
|
||||
blockquote, q {
|
||||
quotes: none;
|
||||
}
|
||||
blockquote:before, blockquote:after,
|
||||
q:before, q:after {
|
||||
content: none;
|
||||
}
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
}
|
||||
+105
-79
@@ -1,110 +1,136 @@
|
||||
body, html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
font-family: "Pridi", sans-serif; /* Use sans-serif fallback */
|
||||
background-color: #4A628A;
|
||||
}
|
||||
|
||||
background-image: url('../assets/background.png');
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
h4, h2, h1{
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.page{
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.container {
|
||||
opacity: 0;
|
||||
|
||||
border-radius: 10px;
|
||||
background: linear-gradient(to bottom, rgba(74, 98, 138, 0.0) 30%, rgba(186, 237, 255, 0.7));
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
min-height: 100vh;
|
||||
text-align: center; /* Center the text for all child elements */
|
||||
justify-content: space-evenly;
|
||||
height: 90%;
|
||||
width: 35%;
|
||||
}
|
||||
|
||||
.header {
|
||||
color: #1B1A55;
|
||||
font-size: 4vh;
|
||||
text-transform: uppercase;
|
||||
line-height: 2.5rem;
|
||||
margin-bottom: 10rem;
|
||||
}
|
||||
|
||||
.profile-form {
|
||||
background-color: #535C91;
|
||||
opacity: 71;
|
||||
padding: 13vh 3vh 5vh;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9);
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
.profile-form-title {
|
||||
margin-bottom: 5vh;
|
||||
}
|
||||
|
||||
.profile-form hr {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
.profile-form-title h2 {
|
||||
color: #FFFFFF;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
.header{
|
||||
text-align: center;
|
||||
font-size: 5vh;
|
||||
padding-bottom: 16px;
|
||||
padding-top: 16px;
|
||||
}
|
||||
|
||||
.profile-form-content {
|
||||
.title{
|
||||
font-size: 48px;
|
||||
font-weight: 500;
|
||||
letter-spacing: -1px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.subheading{
|
||||
padding-top: 8px;
|
||||
font-size: 16px;
|
||||
letter-spacing: -0.5px;
|
||||
color: rgba(255,255,255, 0.8);
|
||||
}
|
||||
|
||||
.profile-form{
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
width: 80%;
|
||||
}
|
||||
|
||||
.profile-form-content input {
|
||||
width: 100%;
|
||||
padding: 15px;
|
||||
margin: 10px 0;
|
||||
border: 1px solid #ccc; /* Light gray border */
|
||||
border-radius: 8px; /* Rounded corners */
|
||||
font-size: 1em;
|
||||
font-family: inherit;
|
||||
box-sizing: border-box;
|
||||
background-color: #f9f9f9; /* Light background */
|
||||
color: #333; /* Dark text color */
|
||||
transition: border-color 0.3s ease, box-shadow 0.3s ease; /* Smooth transition for interaction */
|
||||
}
|
||||
|
||||
/* Placeholder Text Styling */
|
||||
.profile-form-content input::placeholder {
|
||||
color: #aaa; /* Lighter color for placeholders */
|
||||
}
|
||||
|
||||
/* Focus State Styling */
|
||||
.profile-form-content input:focus {
|
||||
outline: none; /* Remove default focus outline */
|
||||
border-color: #4A628A; /* Blue border on focus */
|
||||
box-shadow: 0 0 5px rgba(74, 98, 138, 0.5); /* Subtle shadow for focus */
|
||||
background-color: #fff; /* Slightly brighter background on focus */
|
||||
}
|
||||
|
||||
/* Input Field Hover Effect */
|
||||
.profile-form-content input:hover {
|
||||
border-color: #888; /* Darker gray border on hover */
|
||||
}
|
||||
|
||||
/* Disabled Input Styling */
|
||||
.profile-form-content input:disabled {
|
||||
background-color: #e0e0e0; /* Light gray background for disabled input */
|
||||
cursor: not-allowed; /* Show "not allowed" cursor */
|
||||
opacity: 0.7; /* Slight transparency */
|
||||
}
|
||||
|
||||
.profile-form-footer {
|
||||
margin-top: 7vh;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
flex-direction: column;
|
||||
justify-content: space-between; /* Align buttons next to each other */
|
||||
align-items: center;
|
||||
gap: 10px; /* Space between buttons */
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
input {
|
||||
text-align: center;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
font-size: 1.2rem;
|
||||
width: 70%;
|
||||
padding: 1rem;
|
||||
margin: 0.7rem;
|
||||
background-color: #1B1A55;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
button {
|
||||
font-weight: bold;
|
||||
width: 35%;
|
||||
font-size: 1rem;
|
||||
padding: 10px;
|
||||
/* Styling for buttons */
|
||||
.profile-form button {
|
||||
flex: 1; /* Ensure buttons are equal width */
|
||||
padding: 16px;
|
||||
font-weight: 300;
|
||||
border: none;
|
||||
border-radius: 5px;
|
||||
margin-top: 1rem;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.3s ease, transform 0.2s ease;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
filter: brightness(85%);
|
||||
button[name="underline"] {
|
||||
background-color: transparent; /* No background */
|
||||
border: none; /* Remove default button border */
|
||||
color: #4A628A; /* Set text color */
|
||||
font-size: 1em; /* Set font size */
|
||||
cursor: pointer; /* Add pointer cursor for interactivity */
|
||||
text-decoration: underline; /* Underline text */
|
||||
padding: 0; /* Remove default padding */
|
||||
}
|
||||
|
||||
button[name="submit"] {
|
||||
background-color: #F44336;
|
||||
color: white;
|
||||
width: 100%;
|
||||
background-color: #4A628A; /* Blue background */
|
||||
color: white; /* White text color */
|
||||
}
|
||||
|
||||
button[name="login"] {
|
||||
background-color: #2196F3;
|
||||
color: white;
|
||||
margin-right: 5rem;
|
||||
}
|
||||
@@ -1,110 +1,151 @@
|
||||
body, html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
font-family: "Pridi", sans-serif; /* Use sans-serif fallback */
|
||||
background-color: #4A628A;
|
||||
}
|
||||
|
||||
background-image: url('../assets/background.png');
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
h4, h2, h1{
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.page{
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.container {
|
||||
opacity: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.header {
|
||||
color: #1B1A55;
|
||||
font-size: 4vh;
|
||||
text-transform: uppercase;
|
||||
line-height: 2.5rem;
|
||||
margin-bottom: 10rem;
|
||||
}
|
||||
|
||||
.login-form {
|
||||
background-color: #535C91;
|
||||
opacity: 71;
|
||||
padding: 9vh 3vh 5vh;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9);
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
.login-form-title {
|
||||
margin: 0 0 5vh 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.login-form-title h2 {
|
||||
color: #FFFFFF;
|
||||
font-size: 5vh;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.login-form hr {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
.login-form-content {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
input {
|
||||
text-align: center;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
font-size: 1.2rem;
|
||||
width: 70%;
|
||||
padding: 1rem;
|
||||
margin: 0.7rem;
|
||||
background-color: #1B1A55;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
button {
|
||||
font-weight: bold;
|
||||
background: linear-gradient(to bottom, rgba(74, 98, 138, 0.0) 30%, rgba(186, 237, 255, 0.7));
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
height: 90%;
|
||||
width: 35%;
|
||||
font-size: 1rem;
|
||||
padding: 10px;
|
||||
border: none;
|
||||
border-radius: 5px;
|
||||
margin-top: 1rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
filter: brightness(85%);
|
||||
.header{
|
||||
display: flex;
|
||||
width: 80%;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 20%;
|
||||
text-align: center;
|
||||
padding-bottom: 16px;
|
||||
padding-top: 16px;
|
||||
}
|
||||
|
||||
.title{
|
||||
font-size: 48px;
|
||||
font-weight: 500;
|
||||
letter-spacing: -1px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.subheading{
|
||||
font-size: 16px;
|
||||
letter-spacing: -0.5px;
|
||||
padding-top: 8px;
|
||||
color: rgba(255,255,255, 0.8);
|
||||
}
|
||||
|
||||
.login-form{
|
||||
height: 80%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: space-around;
|
||||
width: 80%;
|
||||
}
|
||||
|
||||
.login-title {
|
||||
font-size: 24px;
|
||||
font-weight: 500;
|
||||
color: white;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.login-form-content input {
|
||||
width: 100%;
|
||||
padding: 15px;
|
||||
margin: 10px 0;
|
||||
border: 1px solid #ccc; /* Light gray border */
|
||||
border-radius: 8px; /* Rounded corners */
|
||||
font-size: 1em;
|
||||
font-family: inherit;
|
||||
box-sizing: border-box;
|
||||
background-color: #f9f9f9; /* Light background */
|
||||
color: #333; /* Dark text color */
|
||||
transition: border-color 0.3s ease, box-shadow 0.3s ease; /* Smooth transition for interaction */
|
||||
}
|
||||
|
||||
/* Placeholder Text Styling */
|
||||
.login-form-content input::placeholder {
|
||||
color: #aaa; /* Lighter color for placeholders */
|
||||
}
|
||||
|
||||
/* Focus State Styling */
|
||||
.login-form-content input:focus {
|
||||
outline: none; /* Remove default focus outline */
|
||||
border-color: #4A628A; /* Blue border on focus */
|
||||
box-shadow: 0 0 5px rgba(74, 98, 138, 0.5); /* Subtle shadow for focus */
|
||||
background-color: #fff; /* Slightly brighter background on focus */
|
||||
}
|
||||
|
||||
/* Input Field Hover Effect */
|
||||
.login-form-content input:hover {
|
||||
border-color: #888; /* Darker gray border on hover */
|
||||
}
|
||||
|
||||
/* Disabled Input Styling */
|
||||
.login-form-content input:disabled {
|
||||
background-color: #e0e0e0; /* Light gray background for disabled input */
|
||||
cursor: not-allowed; /* Show "not allowed" cursor */
|
||||
opacity: 0.7; /* Slight transparency */
|
||||
}
|
||||
|
||||
.login-form-footer {
|
||||
margin-top: 3vh;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-content: center;
|
||||
width: 100%;
|
||||
flex-direction: column;
|
||||
justify-content: space-between; /* Align buttons next to each other */
|
||||
align-items: center;
|
||||
justify-content: space-evenly;
|
||||
gap: 10px; /* Space between buttons */
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
/* Styling for buttons */
|
||||
.login-form-footer button {
|
||||
flex: 1; /* Ensure buttons are equal width */
|
||||
padding: 16px;
|
||||
font-weight: 300;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.3s ease, transform 0.2s ease;
|
||||
}
|
||||
|
||||
button[name="underline"] {
|
||||
background-color: transparent; /* No background */
|
||||
border: none; /* Remove default button border */
|
||||
color: #4A628A; /* Set text color */
|
||||
font-size: 1em; /* Set font size */
|
||||
cursor: pointer; /* Add pointer cursor for interactivity */
|
||||
text-decoration: underline; /* Underline text */
|
||||
padding: 0; /* Remove default padding */
|
||||
}
|
||||
|
||||
button[name="submit"] {
|
||||
background-color: #F44336;
|
||||
color: white;
|
||||
width: 100%;
|
||||
background-color: #4A628A; /* Blue background */
|
||||
color: white; /* White text color */
|
||||
}
|
||||
|
||||
button[name="signup"] {
|
||||
background-color: #2196F3;
|
||||
color: white;
|
||||
}
|
||||
+125
-154
@@ -1,191 +1,162 @@
|
||||
body, html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
font-family: "Pridi", sans-serif; /* Use sans-serif fallback */
|
||||
background-color: #4A628A;
|
||||
}
|
||||
|
||||
background-image: url('../assets/background.png');
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
h4, h2, h1{
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.page{
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.container {
|
||||
opacity: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
min-height: 100vh;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
h1, h2 {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
.left_block {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background-color: #535C91;
|
||||
opacity: 71;
|
||||
padding: 2rem;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9);
|
||||
color: white;
|
||||
}
|
||||
|
||||
.left_block_top {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.left_block_top_left {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.left_block_top_left hr {
|
||||
margin: 0 0 1rem 0;
|
||||
width: 45%;
|
||||
}
|
||||
|
||||
.left_block_top_right {
|
||||
width: 10vw;
|
||||
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-content: center;
|
||||
justify-content: center;
|
||||
|
||||
padding: 0 2vh 0 2vh;
|
||||
background-color: #1B1A55;
|
||||
margin: 0 0 0 5vw;
|
||||
border-radius: 1rem;
|
||||
}
|
||||
|
||||
.left_block_content {
|
||||
display: flex;
|
||||
justify-content: start;
|
||||
align-items: center;
|
||||
margin: 2rem 0 2rem 0;
|
||||
}
|
||||
|
||||
.left_block_buttons {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-content: center;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
button {
|
||||
margin: 0 1rem 0 1rem;
|
||||
width: 10vw;
|
||||
height: 5vh;
|
||||
|
||||
border: none;
|
||||
border-radius: 10px;
|
||||
|
||||
color: white;
|
||||
font-size: 1rem;
|
||||
font-weight: bold;
|
||||
|
||||
text-transform: uppercase;
|
||||
cursor: pointer;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
|
||||
outline: none;
|
||||
transition: background-color 0.3s ease;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
filter: brightness(85%);
|
||||
}
|
||||
|
||||
.left_block_footer {
|
||||
background: linear-gradient(to bottom, rgba(74, 98, 138, 0.0) 30%, rgba(186, 237, 255, 0.7));
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: end;
|
||||
height: 90%;
|
||||
width: 35%;
|
||||
}
|
||||
|
||||
.right_block {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background-color: #535C91;
|
||||
opacity: 71;
|
||||
padding: 2rem 4rem 2rem 2rem;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9);
|
||||
.header{
|
||||
text-align: center;
|
||||
padding-bottom: 16px;
|
||||
padding-top: 32px;
|
||||
}
|
||||
|
||||
.title{
|
||||
font-size: 48px;
|
||||
font-weight: 500;
|
||||
letter-spacing: -1px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.choose_user_form_title {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
justify-content: left;
|
||||
align-content: start;
|
||||
.subheading{
|
||||
padding-top: 8px;
|
||||
font-size: 16px;
|
||||
letter-spacing: -0.5px;
|
||||
color: rgba(255,255,255, 0.8);
|
||||
}
|
||||
|
||||
.choose_user_form_title hr {
|
||||
.form{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
width: 80%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.footer {
|
||||
padding-bottom: 16px;
|
||||
display: flex;
|
||||
width: 100%;
|
||||
flex-direction: row;
|
||||
justify-content: space-between; /* Align buttons next to each other */
|
||||
align-items: center;
|
||||
gap: 10px; /* Space between buttons */
|
||||
}
|
||||
|
||||
.filename-title{
|
||||
font-size: 16px;
|
||||
font-weight: 300;
|
||||
color: white;
|
||||
padding: 48px 24px 48px 24px;
|
||||
background-color: rgba(0,0,0,0.25);
|
||||
border-radius: 10px;
|
||||
margin-top: 16px;
|
||||
box-shadow: 2px 2px 2px 1px rgb(0 0 0 / 20%);
|
||||
}
|
||||
|
||||
.users_block{
|
||||
padding-top: 16px;
|
||||
}
|
||||
|
||||
label{
|
||||
margin-top: 8px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.choose_user_form_content {
|
||||
overflow-y: hidden;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
max-height: 180px;
|
||||
display: flex;
|
||||
margin: 1rem 7rem 2rem 0.5rem;
|
||||
flex-direction: column;
|
||||
align-items: start;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
height: 20vh; /* Fixed height */
|
||||
width: 100%; /* Full width */
|
||||
overflow: auto; /* Enable scrolling */
|
||||
|
||||
font-size: 1.2rem;
|
||||
h5{
|
||||
font-size: 20px;
|
||||
font-weight: 300;
|
||||
text-align: center;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.choose_user_form_content::-webkit-scrollbar {
|
||||
width: 10px; /* Reduced width of the scrollbar by 2px */
|
||||
/* Styling for buttons */
|
||||
.form button {
|
||||
flex: 1; /* Ensure buttons are equal width */
|
||||
padding: 16px;
|
||||
font-weight: 300;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.3s ease, transform 0.2s ease;
|
||||
}
|
||||
|
||||
.choose_user_form_content::-webkit-scrollbar-track {
|
||||
background: #1B1A55; /* Updated track color */
|
||||
}
|
||||
|
||||
.choose_user_form_content::-webkit-scrollbar-thumb {
|
||||
background: #535C91; /* Updated handle color */
|
||||
border: 2px solid #1B1A55; /* Adding a border to effectively reduce the thumb size */
|
||||
}
|
||||
|
||||
.choose_user_form_content::-webkit-scrollbar-thumb:hover {
|
||||
background: #555; /* Updated handle color on hover */
|
||||
}
|
||||
|
||||
button[name="back"] {
|
||||
background-color: #23BDEE;
|
||||
button[name="underline"] {
|
||||
background-color: transparent; /* No background */
|
||||
border: none; /* Remove default button border */
|
||||
color: #4A628A; /* Set text color */
|
||||
font-size: 1em; /* Set font size */
|
||||
cursor: pointer; /* Add pointer cursor for interactivity */
|
||||
text-decoration: underline; /* Underline text */
|
||||
padding: 0; /* Remove default padding */
|
||||
}
|
||||
|
||||
button[name="submit"] {
|
||||
background-color: #F44336;
|
||||
width: 100%;
|
||||
background-color: #4A628A; /* Blue background */
|
||||
color: white; /* White text color */
|
||||
}
|
||||
|
||||
button[name="select_file"] {
|
||||
margin: 0;
|
||||
width: 8vw;
|
||||
background-color: #1B1A55;
|
||||
button[name="submit"]:hover {
|
||||
background-color: #3B5173; /* Darker background on hover */
|
||||
}
|
||||
|
||||
.choose_user_form_content::-webkit-scrollbar {
|
||||
width: 4px; /* Width of the scrollbar */
|
||||
}
|
||||
|
||||
.choose_user_form_content::-webkit-scrollbar-track {
|
||||
background: rgba(255, 255, 255, 0.1); /* Track background color */
|
||||
border-radius: 10px; /* Rounded corners for the track */
|
||||
}
|
||||
|
||||
.choose_user_form_content::-webkit-scrollbar-thumb {
|
||||
background-color: rgba(74, 98, 138, 0.8); /* Scrollbar handle color */
|
||||
border-radius: 10px; /* Rounded corners for the scrollbar handle */
|
||||
}
|
||||
|
||||
.choose_user_form_content::-webkit-scrollbar-thumb:hover {
|
||||
background-color: rgba(74, 98, 138, 1); /* Darker color on hover */
|
||||
}
|
||||
|
||||
.choose_user_form_content:empty {
|
||||
overflow-y: hidden;
|
||||
}
|
||||
+146
-80
@@ -1,117 +1,183 @@
|
||||
/* General Styles */
|
||||
body, html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
background-image: url('../assets/background.png');
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
font-family: "Pridi", sans-serif; /* Use sans-serif fallback */
|
||||
background-color: #4A628A; /* Background color */
|
||||
}
|
||||
|
||||
.container {
|
||||
min-height: 100vh;
|
||||
h4, h2, h1 {
|
||||
margin: 0; /* Remove default margin */
|
||||
}
|
||||
|
||||
.step {
|
||||
/* Page Layout */
|
||||
.page {
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
min-height: 100vh;
|
||||
opacity: 0; /* Make steps invisible by default */
|
||||
visibility: hidden; /* Hide steps by default */
|
||||
transition: opacity 0.5s ease, visibility 0.5s ease; /* Smooth transition */
|
||||
}
|
||||
.container{
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: space-evenly;
|
||||
}
|
||||
|
||||
.step.active {
|
||||
opacity: 1; /* Show the active step */
|
||||
visibility: visible; /* Make it visible */
|
||||
/* Active Step Styles */
|
||||
.step {
|
||||
border-radius: 10px;
|
||||
background: linear-gradient(to bottom, rgba(74, 98, 138, 0.0) 30%, rgba(186, 237, 255, 0.7));
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: stretch;
|
||||
height: 90%;
|
||||
width: 35%;
|
||||
}
|
||||
|
||||
/* Header Styling */
|
||||
.header {
|
||||
color: #1B1A55;
|
||||
font-size: 4vh;
|
||||
text-transform: uppercase;
|
||||
line-height: 2.5rem;
|
||||
margin-bottom: 10rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 20%;
|
||||
text-align: center;
|
||||
padding-bottom: 16px;
|
||||
padding-top: 16px;
|
||||
}
|
||||
|
||||
.title{
|
||||
font-size: 48px;
|
||||
font-weight: 500;
|
||||
letter-spacing: -1px;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.subheading{
|
||||
font-size: 16px;
|
||||
letter-spacing: -0.5px;
|
||||
padding-top: 8px;
|
||||
color: rgba(255,255,255, 0.8);
|
||||
}
|
||||
|
||||
/* Signup Form Styles */
|
||||
.signup-form {
|
||||
background-color: #535C91;
|
||||
opacity: 71;
|
||||
padding: 9vh 3vh 5vh;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9);
|
||||
width: 25%;
|
||||
display: flex;
|
||||
height: 80%;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
width: 80%; /* Width of the form */
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.signup-form-title {
|
||||
margin: 0 0 5vh 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.signup-form-title h2 {
|
||||
color: #FFFFFF;
|
||||
font-size: 5vh;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.signup-form hr {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
.signup-form-content {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
input {
|
||||
text-align: center;
|
||||
font-size: 24px;
|
||||
font-weight: 500;
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
font-size: 1.2rem;
|
||||
width: 70%;
|
||||
padding: 1rem;
|
||||
margin: 0.7rem;
|
||||
background-color: #1B1A55;
|
||||
border-radius: 10px;
|
||||
margin-bottom: 16px; /* Space below title */
|
||||
}
|
||||
|
||||
button {
|
||||
font-weight: bold;
|
||||
width: 35%;
|
||||
font-size: 1rem;
|
||||
padding: 10px;
|
||||
border: none;
|
||||
border-radius: 5px;
|
||||
margin-top: 1rem;
|
||||
cursor: pointer;
|
||||
/* Input Styles */
|
||||
.signup-form-content input {
|
||||
width: 100%;
|
||||
padding: 15px;
|
||||
margin: 10px 0;
|
||||
border: 1px solid #ccc; /* Light gray border */
|
||||
border-radius: 8px; /* Rounded corners */
|
||||
font-size: 1em;
|
||||
font-family: inherit;
|
||||
box-sizing: border-box;
|
||||
background-color: #f9f9f9; /* Light background */
|
||||
color: #333; /* Dark text color */
|
||||
transition: border-color 0.3s ease, box-shadow 0.3s ease; /* Smooth transition for interaction */
|
||||
}
|
||||
|
||||
button:hover {
|
||||
filter: brightness(85%);
|
||||
/* Placeholder Text Styling */
|
||||
.signup-form-content input::placeholder {
|
||||
color: #aaa; /* Lighter color for placeholders */
|
||||
}
|
||||
|
||||
.signup-form-content-radio{
|
||||
width: 100%;
|
||||
display: flex; /* Use flexbox to arrange items in a row */
|
||||
align-items: flex-start;
|
||||
flex-direction: column;
|
||||
justify-content: flex-start;
|
||||
gap: 20px;
|
||||
}
|
||||
|
||||
.signup-form-content-radio label {
|
||||
width: 100%;
|
||||
display: flex; /* Make label a flex container */
|
||||
align-items: flex-start;
|
||||
justify-content: flex-start;
|
||||
cursor: pointer; /* Change cursor to pointer when hovering */
|
||||
}
|
||||
|
||||
/* Optional: Styling the radio button */
|
||||
.signup-form-content-radio input[type="radio"] {
|
||||
margin-right: 8px; /* Space between radio button and label text */
|
||||
}
|
||||
/* Focus State Styling */
|
||||
.signup-form-content input:focus {
|
||||
outline: none; /* Remove default focus outline */
|
||||
border-color: #4A628A; /* Change border color on focus */
|
||||
box-shadow: 0 0 5px rgba(74, 98, 138, 0.5); /* Subtle shadow for focus */
|
||||
background-color: #fff; /* Slightly brighter background on focus */
|
||||
}
|
||||
|
||||
/* Input Field Hover Effect */
|
||||
.signup-form-content input:hover {
|
||||
border-color: #888; /* Darker gray border on hover */
|
||||
}
|
||||
|
||||
/* Disabled Input Styling */
|
||||
.signup-form-content input:disabled {
|
||||
background-color: #e0e0e0; /* Light gray background for disabled input */
|
||||
cursor: not-allowed; /* Show "not allowed" cursor */
|
||||
opacity: 0.7; /* Slight transparency */
|
||||
}
|
||||
|
||||
/* Signup Form Footer */
|
||||
.signup-form-footer {
|
||||
margin-top: 3vh;
|
||||
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-content: center;
|
||||
width: 100%;
|
||||
justify-content: space-between; /* Align buttons next to each other */
|
||||
align-items: center;
|
||||
justify-content: space-evenly;
|
||||
gap: 10px; /* Space between buttons */
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
/* Button Styles */
|
||||
.signup-form-footer button {
|
||||
flex: 1; /* Ensure buttons are equal width */
|
||||
padding: 16px;
|
||||
font-weight: 300;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.3s ease, transform 0.2s ease;
|
||||
}
|
||||
|
||||
button[name="back"] {
|
||||
background-color: #F44336;
|
||||
color: white;
|
||||
background-color: transparent; /* No background for 'back' button */
|
||||
color: #4A628A; /* Set text color */
|
||||
text-decoration: underline; /* Underline text */
|
||||
}
|
||||
|
||||
button[name="continue"] {
|
||||
background-color: #2196F3;
|
||||
color: white;
|
||||
width: 100%;
|
||||
background-color: #4A628A; /* Blue background */
|
||||
color: white; /* White text color */
|
||||
}
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
body, html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
|
||||
background-image: url('../assets/background.png');
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
.container {
|
||||
opacity: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.header {
|
||||
color: #1B1A55;
|
||||
font-size: 4vh;
|
||||
text-transform: uppercase;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.loading-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.spinner {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
border: 6px solid #f3f3f3;
|
||||
border-top: 6px solid #2196F3;
|
||||
border-radius: 50%;
|
||||
animation: spin 1s linear infinite;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% { transform: rotate(0deg); }
|
||||
100% { transform: rotate(360deg); }
|
||||
}
|
||||
|
||||
.loading-section p {
|
||||
font-size: 1.5rem;
|
||||
color: white;
|
||||
margin-top: 1rem;
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
body, html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
|
||||
background-image: url('../assets/background.png');
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
.container {
|
||||
opacity: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.header {
|
||||
color: #1B1A55;
|
||||
font-size: 4vh;
|
||||
text-transform: uppercase;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.loading-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.spinner {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
border: 6px solid #f3f3f3;
|
||||
border-top: 6px solid #2196F3;
|
||||
border-radius: 50%;
|
||||
animation: spin 1s linear infinite;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% { transform: rotate(0deg); }
|
||||
100% { transform: rotate(360deg); }
|
||||
}
|
||||
|
||||
.loading-section p {
|
||||
font-size: 1.5rem;
|
||||
color: white;
|
||||
margin-top: 1rem;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<link href="../css/announcement.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
|
||||
<script src="../js/announcement.js"></script>
|
||||
<script src="../js/helpers.js"></script>
|
||||
<title>Announcement</title>
|
||||
</head>
|
||||
<body onload="loadAnnouncement(); fadeIn()">
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1 class="title">Announcement</h1>
|
||||
</div>
|
||||
<div class="announcement-body">
|
||||
<p id="announcement-content">Loading announcement...</p>
|
||||
</div>
|
||||
<div class="announcement-footer">
|
||||
<button id="closeButton" onclick="closeWindow()">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -4,10 +4,13 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<!-- Reuse the same CSS files as UC Not Found -->
|
||||
<link href="../css/welcome.css" rel="stylesheet">
|
||||
<link href="../css/loading.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
|
||||
<script src="../js/helpers.js"></script>
|
||||
<title>Welcome</title>
|
||||
@@ -15,11 +18,12 @@
|
||||
<body onload="fadeIn()">
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1>BACKUP FETCHER</h1>
|
||||
<h1 class="title">Team Vault</h1>
|
||||
</div>
|
||||
<img src="../assets/refresh-data.webp" alt="Backup Fetcher" class="backup-img">
|
||||
<div class="loading-section">
|
||||
<div class="spinner"></div>
|
||||
<p>Backup is not searched, please wait...</p>
|
||||
<p>Backup is now searched, please wait...</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
@@ -4,33 +4,39 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<link href="../css/login.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
<title>Login</title>
|
||||
</head>
|
||||
<body onload="fadeIn()">
|
||||
<div class="page">
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1>DO WE KNOW</h1>
|
||||
<h1>EACH OTHER?</h1>
|
||||
<h1 class="title">TeamVault</h1>
|
||||
<h4 class="subheading">Do we know each other?</h4>
|
||||
</div>
|
||||
<form class="login-form" id="loginForm">
|
||||
<div class="login-form-title">
|
||||
<h2>Login</h2>
|
||||
<hr>
|
||||
<h2 class="login-title">Login</h2>
|
||||
</div>
|
||||
<div class="login-form-content">
|
||||
<input name="email" placeholder="Email" type="email">
|
||||
<input name="password" placeholder="Password" type="password">
|
||||
</div>
|
||||
<div class="login-form-footer">
|
||||
<button id="signup" name="submit" type="button">Sign Up</button>
|
||||
<div>
|
||||
<button id="signup" name="underline" type="button">Sign Up</button>
|
||||
<button id="resetPassword" name="underline" type="button">Reset Password</button>
|
||||
</div>
|
||||
<button id="submit" name="submit" type="submit">Submit</button>
|
||||
<button id="resetPassword" name="resetPassword" type="button">Reset Password</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="../js/login.js"></script>
|
||||
<script src="../js/helpers.js"></script>
|
||||
|
||||
@@ -4,9 +4,12 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<link href="../css/main_menu.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
|
||||
<script src="../js/main_menu.js"></script>
|
||||
<script src="../js/helpers.js"></script>
|
||||
@@ -14,41 +17,43 @@
|
||||
<title>Main Page</title>
|
||||
|
||||
</head>
|
||||
<body onload="fadeIn()">
|
||||
<div class="container">
|
||||
<div class="left_block">
|
||||
<div class="left_block_top">
|
||||
<div>
|
||||
<h1>WELCOME BACK,</h1>
|
||||
<h1 id="username-field"></h1>
|
||||
<h2>Hope you have a productive day!</h2>
|
||||
<body onload="initialSetup(); fadeIn()">
|
||||
<div class="page">
|
||||
<div class="container">
|
||||
<div class="left_block">
|
||||
<div class="notification-title">
|
||||
<h1 class="notif-title">Notifications</h1>
|
||||
</div>
|
||||
<div class=left-content>
|
||||
<div class="notifications" id="notifications">
|
||||
<!--Notifications are generated here-->
|
||||
</div>
|
||||
<div class="left_block_footer">
|
||||
<button class="logout-button" id="logout" name="logout">Logout</button>
|
||||
</div>
|
||||
</div>
|
||||
<img alt="" src="../assets/user_1144760.png">
|
||||
</div>
|
||||
<div class="left_block_content">
|
||||
<div class="left_block_buttons">
|
||||
|
||||
<div class="right_block">
|
||||
<div class="navbar">
|
||||
<div class="welcome">
|
||||
<img alt="" src="../assets/user_1144760.png">
|
||||
<h3 class="user">Welcome Back, </h3>
|
||||
<h3 class="user" id="username-field"></h3>
|
||||
<h3 class="user">!</h3>
|
||||
|
||||
</div>
|
||||
<h1 class="title">TeamVault</h1>
|
||||
</div>
|
||||
|
||||
<div class="right_block_content">
|
||||
<button id="change-info" name="menu_button">Change your info</button>
|
||||
<button id="share-file" name="menu_button">Share a file</button>
|
||||
</div>
|
||||
<div class="left_block_buttons">
|
||||
<button id="backup-dir" name="menu_button">Set backup directory</button>
|
||||
<button id="department-dir" name="menu_button">Set department directory</button>
|
||||
<button id="share-dir" name="menu_button">Set share directory</button>
|
||||
</div>
|
||||
<div class="left_block_buttons">
|
||||
<button id="restore-backup" name="menu_button">Restore backup</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="left_block_footer">
|
||||
<button id="logout" name="logout">Logout</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right_block">
|
||||
<div>
|
||||
<h1>NOTIFICATIONS</h1>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="notifications" id="notifications">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -4,9 +4,12 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<link href="../css/profile.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
|
||||
<script src="../js/profile.js"></script>
|
||||
<script src="../js/helpers.js"></script>
|
||||
@@ -14,22 +17,24 @@
|
||||
<title>Profile</title>
|
||||
</head>
|
||||
<body onload="fadeIn()">
|
||||
<div class="container">
|
||||
<form class="profile-form" id="profileForm">
|
||||
<div class="profile-form-title">
|
||||
<h2>Profile</h2>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="profile-form-content">
|
||||
<input name="email" placeholder="Email" type="email">
|
||||
<input name="username" placeholder="Username" type="text">
|
||||
<input name="password" placeholder="Password" type="password">
|
||||
</div>
|
||||
<div class="profile-form-footer">
|
||||
<button name="login" type="button">Back</button>
|
||||
<button name="submit" type="submit">Submit</button>
|
||||
</div>
|
||||
</form>
|
||||
<div class="page">
|
||||
<div class="container">
|
||||
<form class="profile-form" id="profileForm">
|
||||
<div class="header">
|
||||
<h1 class="title">Profile</h1>
|
||||
<h3 class="subheading">Who are you?</h3>
|
||||
</div>
|
||||
<div class="profile-form-content">
|
||||
<input name="email" placeholder="Email" type="email">
|
||||
<input name="username" placeholder="Username" type="text">
|
||||
<input name="password" placeholder="Password" type="password">
|
||||
</div>
|
||||
<div class="profile-form-footer">
|
||||
<button id="back" name="underline" type="button">Back</button>
|
||||
<button id="submit" name="submit" type="submit">Submit</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<!-- Reuse the same CSS files as UC Not Found -->
|
||||
<link href="../css/loading.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
|
||||
<script src="../js/helpers.js"></script>
|
||||
<script src="../js/reset_database.js"></script>
|
||||
<title>Welcome</title>
|
||||
</head>
|
||||
<body onload="fadeIn()">
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1 class="title">Welcome to TeamVault</h1>
|
||||
</div>
|
||||
<img src="../assets/2581896.png" style="margin-left: 20px" alt="Connecting to server" class="server-img">
|
||||
<div class="loading-section">
|
||||
<div class="spinner"></div>
|
||||
<p>The CEO initialized a complete reset, please wait...</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -3,33 +3,37 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
<link href="../css/reset_password.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
<title>Reset Password</title>
|
||||
</head>
|
||||
<body onload="fadeIn()">
|
||||
<div class="page">
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1>RESET</h1>
|
||||
<h1>YOUR PASSWORD</h1>
|
||||
<h1 class="title">TeamVault</h1>
|
||||
<h3 class="subheading">Forgot your password? No worries, it happens to the best of us!</h3>
|
||||
</div>
|
||||
<form class="login-form" id="resetPasswordForm">
|
||||
<div class="login-form-title">
|
||||
<h2>Reset Password</h2>
|
||||
<hr>
|
||||
<h2 class="login-title">Reset Password</h2>
|
||||
</div>
|
||||
<div class="login-form-content">
|
||||
<input name="email" placeholder="Email" type="email" required>
|
||||
<input name="newPassword" placeholder="New Password" type="password" required>
|
||||
</div>
|
||||
<div class="login-form-footer">
|
||||
<button id="backToLogin" name="backToLogin" type="button">Back to Login</button>
|
||||
<button id="resetPassword" name="resetPassword" type="submit">Reset Password</button>
|
||||
<button id="backToLogin" name="underline" type="button">Back to Login</button>
|
||||
<button id="resetPassword" name="submit" type="submit">Reset Password</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<script src="../js/reset_password.js"></script>
|
||||
<script src="../js/helpers.js"></script>
|
||||
</body>
|
||||
|
||||
@@ -4,46 +4,42 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<link href="../css/share_file.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
|
||||
<script src="../js/share_file.js"></script>
|
||||
<script src="../js/helpers.js"></script>
|
||||
|
||||
<title>Share File</title>
|
||||
</head>
|
||||
<body onload="fadeIn()">
|
||||
<body onload="fetchUsersAndCreateCheckboxes(); updateFileName(); fadeIn()">
|
||||
<div class="page">
|
||||
<div class="container">
|
||||
<div class="left_block">
|
||||
<div class="left_block_top">
|
||||
<div class="left_block_top_left">
|
||||
<h1>SHARE A FILE</h1>
|
||||
<hr>
|
||||
<h2>First select the file you want to share</h2>
|
||||
<h2>(can be whatever resource from the system)</h2>
|
||||
</div>
|
||||
<div class="left_block_top_right">
|
||||
<h2 id="fileName"></h2>
|
||||
</div>
|
||||
<div class="form">
|
||||
<div class="header">
|
||||
<h1 class="title">Share a File</h1>
|
||||
<h3 class="subheading">First select the file you want to share.</h3>
|
||||
<button class="filename-title" id="selectFile" name="submit" type="button">Select</button>
|
||||
<form class="users_block" id="userDestForm">
|
||||
<h5>Users</h5>
|
||||
<h3 class="subheading">Select the users you want to share the file with.</h3>
|
||||
<div id="choose_user_form_content" class="choose_user_form_content">
|
||||
<!-- Insert the users from the database -->
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="left_block_content">
|
||||
<button id="selectFile" name="select_file" type="button">Select</button>
|
||||
</div>
|
||||
<div class="left_block_footer">
|
||||
<button id="backButton" name="back" type="button">Back</button>
|
||||
|
||||
|
||||
<div class="footer">
|
||||
<button id="backButton" name="underline" type="button">Back</button>
|
||||
<button id="submitButton" name="submit" type="submit">Submit</button>
|
||||
</div>
|
||||
</div>
|
||||
<form class="right_block" id="userDestForm">
|
||||
<div class="choose_user_form_title">
|
||||
<h1>USERS</h1>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="choose_user_form_content">
|
||||
<!-- Insert the users from the database -->
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -3,24 +3,27 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link href="../css/sign_up.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
<title>Signup Process</title>
|
||||
</head>
|
||||
<body onload="fadeIn()">
|
||||
|
||||
<div class="page">
|
||||
<div class="container">
|
||||
<!-- Step 1: Profile Information -->
|
||||
<div class="step active" id="step1">
|
||||
<div class="header">
|
||||
<h1>LET US MEET</h1>
|
||||
<h1>EACH OTHER</h1>
|
||||
<h1 class="title">TeamVault</h1>
|
||||
<h3 class="subheading">Let us meet each other</h3>
|
||||
</div>
|
||||
<form class="signup-form" id="signupForm">
|
||||
<div class="signup-form-title">
|
||||
<h2>Sign Up</h2>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="signup-form-content">
|
||||
<input name="email" placeholder="Email" type="email" required>
|
||||
@@ -37,16 +40,14 @@
|
||||
<!-- Step 2: Department Selection -->
|
||||
<div class="step" id="step2" style="display: none;">
|
||||
<div class="header">
|
||||
<h1>TELL ME MORE</h1>
|
||||
<h1>ABOUT</h1>
|
||||
<h1>YOUR WORK</h1>
|
||||
<h1 class="title">TeamVault</h1>
|
||||
<h3 class="subheading">Tell me more about your work</h3>
|
||||
</div>
|
||||
<form class="signup-form" id="departmentForm">
|
||||
<div class="signup-form-title">
|
||||
<h2>Choose your department</h2>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="signup-form-content" id="departmentList">
|
||||
<div class="signup-form-content-radio" id="departmentList">
|
||||
<!-- List of departments will be dynamically inserted here -->
|
||||
</div>
|
||||
<div class="signup-form-footer">
|
||||
@@ -56,7 +57,7 @@
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<script src="../js/sign_up.js"></script>
|
||||
<script src="../js/helpers.js"></script>
|
||||
</body>
|
||||
|
||||
@@ -4,9 +4,12 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
|
||||
<link href="../css/uc_not_found.css" rel="stylesheet">
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<link href="../css/loading.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
|
||||
<script src="../js/helpers.js"></script>
|
||||
|
||||
@@ -15,9 +18,9 @@
|
||||
<body onload="fadeIn()">
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1>SEARCHING FOR THE</h1>
|
||||
<h1>SERVER...</h1>
|
||||
<h1 class="title">TeamVault</h1>
|
||||
</div>
|
||||
<img src="../assets/cloud-computing.webp" alt="Connecting to server" class="server-img">
|
||||
<div class="loading-section">
|
||||
<div class="spinner"></div>
|
||||
<p>Please wait while we try to connect to the server.</p>
|
||||
|
||||
@@ -4,10 +4,13 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport">
|
||||
<link href="../assets/hard-disk.ico" rel="icon" type="image/x-icon">
|
||||
|
||||
<link href="../css/normalizer.css" rel="stylesheet">
|
||||
<!-- Reuse the same CSS files as UC Not Found -->
|
||||
<link href="../css/welcome.css" rel="stylesheet">
|
||||
<link href="../css/loading.css" rel="stylesheet">
|
||||
<link href="../css/transition.css" rel="stylesheet">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Pridi:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
|
||||
|
||||
<script src="../js/helpers.js"></script>
|
||||
<title>Welcome</title>
|
||||
@@ -15,7 +18,7 @@
|
||||
<body onload="fadeIn()">
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1>WELCOME TO THE APP</h1>
|
||||
<h1 class="title">Welcome to TeamVault</h1>
|
||||
</div>
|
||||
<div class="loading-section">
|
||||
<div class="spinner"></div>
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
// Load announcement content from the application info when the page loads
|
||||
async function loadAnnouncement() {
|
||||
try {
|
||||
const announcementText = await window.electronAPI.readApplicationInfo('announcement');
|
||||
const announcementContent = document.getElementById('announcement-content');
|
||||
if (announcementContent && announcementText) {
|
||||
|
||||
console.log('Announcement:', announcementText);
|
||||
announcementContent.innerHTML = formatTextForHtml(announcementText);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to load announcement:', error);
|
||||
document.getElementById('announcement-content').textContent = 'Failed to load announcement.';
|
||||
}
|
||||
}
|
||||
|
||||
function formatTextForHtml(text) {
|
||||
// Replace newlines with <br> tags
|
||||
let formattedText = text.replace(/\n/g, '<br>');
|
||||
|
||||
// Replace tabs with a few non-breaking spaces for indentation
|
||||
formattedText = formattedText.replace(/\t/g, ' ');
|
||||
|
||||
// Replace other special characters as needed
|
||||
// Example: Handle double spaces by converting to
|
||||
formattedText = formattedText.replace(/ /g, ' ');
|
||||
|
||||
return formattedText;
|
||||
}
|
||||
|
||||
// Close the window when the close button is clicked
|
||||
function closeWindow() {
|
||||
window.electronAPI.writeApplicationInfo('announcement', '');
|
||||
window.electronAPI.closeAnnouncementWindow();
|
||||
}
|
||||
@@ -24,13 +24,24 @@ function fadeOut(destination) {
|
||||
async function waitForResponse() {
|
||||
return new Promise((resolve) => {
|
||||
const idResponseCheck = setInterval(async () => {
|
||||
const status = await window.electronAPI.hasResponseArrived();
|
||||
if (status) {
|
||||
if (await window.electronAPI.hasResponseArrived()) {
|
||||
clearInterval(idResponseCheck);
|
||||
const response = await window.electronAPI.getLastUcResult();
|
||||
resolve(response || null); // Resolve the response or null if not available
|
||||
resolve(await window.electronAPI.getLastUcResult()); // Resolve the response or null if not available
|
||||
}
|
||||
}, 100); // Check every 100 milliseconds if the response has arrived
|
||||
});
|
||||
}
|
||||
|
||||
function toggleScroll(idComponent, scrollHeight = 180) {
|
||||
const element = document.getElementById(idComponent); // Using getElementById
|
||||
if (!element) {
|
||||
console.error(`Element with ID '${idComponent}' not found.`);
|
||||
return;
|
||||
}
|
||||
if (element.scrollHeight > scrollHeight) {
|
||||
element.style.overflowY = 'auto'; // Enable scroll if content overflows
|
||||
} else {
|
||||
element.style.overflowY = 'hidden'; // Disable scroll if content fits
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+99
-85
@@ -1,7 +1,12 @@
|
||||
let codeLogin = '';
|
||||
let codeFindByEmail = '';
|
||||
let codeFindKeyByUser = '';
|
||||
let codeOk = '';
|
||||
|
||||
document.addEventListener('DOMContentLoaded', async function () {
|
||||
const submitButton = document.getElementById('submit');
|
||||
const signUpButton = document.getElementById('signup');
|
||||
const resetPasswordButton = document.getElementById('resetPassword');
|
||||
const signUpButton = document.getElementById('signup');
|
||||
|
||||
// Retrieve the operation codes via IPC
|
||||
const operationCodes = await window.electronAPI.getOperationsCodes();
|
||||
@@ -10,21 +15,21 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
return;
|
||||
}
|
||||
|
||||
const codeLogin = operationCodes.LOGIN;
|
||||
const codeFindByEmail = operationCodes.FIND_BY_EMAIL;
|
||||
const codeFindKeyByUser = operationCodes.FIND_KEY_BY_USER_ID;
|
||||
const codeOk = operationCodes.OK;
|
||||
|
||||
signUpButton.addEventListener('click', function (e) {
|
||||
e.preventDefault();
|
||||
window.electronAPI.changeContent('sign_up');
|
||||
});
|
||||
codeLogin = operationCodes.LOGIN;
|
||||
codeFindByEmail = operationCodes.FIND_BY_EMAIL;
|
||||
codeFindKeyByUser = operationCodes.FIND_KEY_BY_USER_ID;
|
||||
codeOk = operationCodes.OK;
|
||||
|
||||
resetPasswordButton.addEventListener('click', function (e) {
|
||||
e.preventDefault();
|
||||
window.electronAPI.changeContent('reset_password');
|
||||
});
|
||||
|
||||
signUpButton.addEventListener('click', function (e) {
|
||||
e.preventDefault();
|
||||
window.electronAPI.changeContent('sign_up');
|
||||
});
|
||||
|
||||
// Submit button logic (handle login)
|
||||
submitButton.addEventListener('click', async function (e) {
|
||||
e.preventDefault();
|
||||
@@ -72,79 +77,88 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
await window.electronAPI.closeUcSocket();
|
||||
await window.electronAPI.changeContent('main_menu');
|
||||
});
|
||||
|
||||
async function attemptLogin(email, password) {
|
||||
const app_type = await window.electronAPI.readUserConfig('app_type');
|
||||
const messageData = { email, password, app_type };
|
||||
|
||||
// Send the login message to the server
|
||||
if (!await window.electronAPI.sendUcMessage(codeLogin, messageData)) {
|
||||
await window.electronAPI.showAlert('Failed to send login request.');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Wait for the response using waitForResponse
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
await window.electronAPI.resetApplicationInfo();
|
||||
await window.electronAPI.resetUserConfig();
|
||||
await window.electronAPI.writeUserConfig('app_type', app_type);
|
||||
await window.electronAPI.writeUserConfig('user_info', { email, password });
|
||||
return true;
|
||||
}else if(response && respone.operationCode !== codeOk){
|
||||
await window.electronAPI.showAlert(response.metaInfo.message);
|
||||
return false;
|
||||
}
|
||||
|
||||
await window.electronAPI.showAlert('Invalid login response received.');
|
||||
return false;
|
||||
}
|
||||
|
||||
async function fetchAndStoreUserInfo(userEmail) {
|
||||
if (!await window.electronAPI.sendUcMessage(codeFindByEmail, { email: userEmail })) {
|
||||
await window.electronAPI.showAlert('Failed to send request to fetch user info.');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Wait for the response using waitForResponse
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
let userInfo = await window.electronAPI.readUserConfig('user_info');
|
||||
if (!userInfo) {
|
||||
userInfo = {};
|
||||
}
|
||||
|
||||
userInfo.id = response.metaInfo.id;
|
||||
userInfo.departmentId = response.metaInfo.departmentId;
|
||||
userInfo.name = response.metaInfo.name || 'User';
|
||||
|
||||
await window.electronAPI.writeUserConfig('user_info', userInfo);
|
||||
return true;
|
||||
}
|
||||
|
||||
await window.electronAPI.showAlert('Failed to fetch user info from server.');
|
||||
return false;
|
||||
}
|
||||
|
||||
async function fetchAndStoreEncryptionKey(userId) {
|
||||
if (!await window.electronAPI.sendUcMessage(codeFindKeyByUser, { userId })) {
|
||||
await window.electronAPI.showAlert('Failed to send request to fetch encryption key.');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Wait for the response using waitForResponse
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
const encryptionKey = {
|
||||
key: response.metaInfo.key.key,
|
||||
iv: response.metaInfo.key.iv,
|
||||
};
|
||||
|
||||
await window.electronAPI.writeUserConfig('encryption_key', encryptionKey);
|
||||
return true;
|
||||
}
|
||||
|
||||
await window.electronAPI.showAlert('Failed to fetch encryption key from server.');
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
async function attemptLogin(email, password) {
|
||||
const app_type = await window.electronAPI.readUserConfig('app_type');
|
||||
const messageData = {email, password, app_type};
|
||||
|
||||
// Send the login message to the server
|
||||
if (!await window.electronAPI.sendUcMessage(codeLogin, messageData)) {
|
||||
await window.electronAPI.showAlert('Failed to send login request.');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Wait for the response using waitForResponse
|
||||
const response = await waitForResponse();
|
||||
|
||||
if (!response) {
|
||||
await window.electronAPI.showAlert('No response from server.');
|
||||
return false;
|
||||
}
|
||||
|
||||
if (response.operationCode !== codeOk) {
|
||||
await window.electronAPI.showAlert(response.metaInfo.message);
|
||||
return false;
|
||||
}
|
||||
|
||||
const user_info = await window.electronAPI.readUserConfig('user_info');
|
||||
if (!user_info || (user_info && user_info.email !== email)) {
|
||||
await window.electronAPI.resetApplicationInfo();
|
||||
await window.electronAPI.resetMemory();
|
||||
await window.electronAPI.resetUserConfig();
|
||||
await window.electronAPI.writeUserConfig('app_type', app_type);
|
||||
await window.electronAPI.writeUserConfig('user_info', {email, password});
|
||||
return true;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
async function fetchAndStoreUserInfo(userEmail) {
|
||||
if (!await window.electronAPI.sendUcMessage(codeFindByEmail, {email: userEmail})) {
|
||||
await window.electronAPI.showAlert('Failed to send request to fetch user info.');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Wait for the response using waitForResponse
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
let userInfo = await window.electronAPI.readUserConfig('user_info');
|
||||
if (!userInfo) {
|
||||
userInfo = {};
|
||||
}
|
||||
|
||||
userInfo.id = response.metaInfo.id;
|
||||
userInfo.departmentId = response.metaInfo.departmentId;
|
||||
userInfo.name = response.metaInfo.name || 'User';
|
||||
|
||||
await window.electronAPI.writeUserConfig('user_info', userInfo);
|
||||
return true;
|
||||
}
|
||||
|
||||
await window.electronAPI.showAlert('Failed to fetch user info from server.');
|
||||
return false;
|
||||
}
|
||||
|
||||
async function fetchAndStoreEncryptionKey(userId) {
|
||||
if (!await window.electronAPI.sendUcMessage(codeFindKeyByUser, {userId})) {
|
||||
await window.electronAPI.showAlert('Failed to send request to fetch encryption key.');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Wait for the response using waitForResponse
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
const encryptionKey = {
|
||||
key: response.metaInfo.key.key,
|
||||
iv: response.metaInfo.key.iv,
|
||||
};
|
||||
|
||||
await window.electronAPI.writeUserConfig('encryption_key', encryptionKey);
|
||||
return true;
|
||||
}
|
||||
|
||||
await window.electronAPI.showAlert('Failed to fetch encryption key from server.');
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -9,9 +9,6 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
const shareFileButton = document.getElementById('share-file');
|
||||
const logoutButton = document.getElementById('logout');
|
||||
const restoreBackupButton = document.getElementById('restore-backup');
|
||||
|
||||
await fetchUserInfo();
|
||||
await checkAndSetAllDirectories();
|
||||
|
||||
backupButton.addEventListener('click', async function () {
|
||||
await setPath('backupDirectory');
|
||||
@@ -43,6 +40,12 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
});
|
||||
});
|
||||
|
||||
async function initialSetup(){
|
||||
await checkAndSetAllDirectories();
|
||||
await loadReceivedFiles();
|
||||
await fetchUserInfo();
|
||||
}
|
||||
|
||||
async function restoreBackup() {
|
||||
const backupDirectory = await window.electronAPI.readApplicationInfo('backupDirectory');
|
||||
|
||||
@@ -59,7 +62,7 @@ async function restoreBackup() {
|
||||
}
|
||||
|
||||
// Call the IPC method to initiate the backup retrieval process
|
||||
await window.electronAPI.startBackupRetrieval(destinationPath);
|
||||
window.electronAPI.startBackupRetrieval(destinationPath);
|
||||
|
||||
// Switch the content to the 'backup_retrieve' page
|
||||
fadeOut('backup_retrieve');
|
||||
@@ -89,6 +92,7 @@ async function attachNotificationButton(pathKey, buttonText, buttonId, buttonNam
|
||||
if (!path) {
|
||||
const notificationsDiv = document.getElementById('notifications');
|
||||
const button = document.createElement('button');
|
||||
button.className='alert';
|
||||
button.id = buttonId;
|
||||
button.name = buttonName;
|
||||
button.textContent = buttonText;
|
||||
@@ -152,6 +156,7 @@ async function loadReceivedFiles() {
|
||||
if (!existingButtons.includes(filePath)) {
|
||||
const button = document.createElement('button');
|
||||
button.setAttribute('data-filepath', filePath); // Set a custom attribute to track the file path
|
||||
button.className = 'notification';
|
||||
button.name = 'notification';
|
||||
button.textContent = `You received a file "${fileName}" from ${userName}`; // Display the userName and file name
|
||||
button.addEventListener('click', () => handleFileReceivedButtonPressed(filePath, button));
|
||||
|
||||
@@ -10,8 +10,8 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
usernameInput.value = name;
|
||||
passwordInput.value = password;
|
||||
|
||||
const backButton = document.querySelector('button[name="login"]');
|
||||
const submitButton = document.querySelector('button[name="submit"]');
|
||||
const backButton = document.getElementById('back');
|
||||
const submitButton = document.getElementById('submit');
|
||||
|
||||
// Get operation codes from the backend
|
||||
const operationCodes = await window.electronAPI.getOperationsCodes();
|
||||
@@ -39,7 +39,8 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
const name = usernameInput.value;
|
||||
const password = passwordInput.value;
|
||||
|
||||
const { id, departmentId, app_type } = await window.electronAPI.readUserConfig('user_info'); // Fetch login data
|
||||
const { id, departmentId } = await window.electronAPI.readUserConfig('user_info'); // Fetch login data
|
||||
const app_type = await window.electronAPI.readUserConfig('app_type'); // Fetch app type
|
||||
|
||||
// Prepare the data to be sent via the UC socket
|
||||
const messageData = {
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
document.addEventListener('DOMContentLoaded', async function () {
|
||||
await new Promise(resolve => setTimeout(resolve, 7000));
|
||||
window.electronAPI.changeContent('login');
|
||||
});
|
||||
@@ -1,3 +1,6 @@
|
||||
let codeResetPassword = '';
|
||||
let codeOk = '';
|
||||
|
||||
document.addEventListener('DOMContentLoaded', async function () {
|
||||
const backToLoginButton = document.getElementById('backToLogin');
|
||||
const resetPasswordButton = document.getElementById('resetPassword');
|
||||
@@ -9,8 +12,8 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
return;
|
||||
}
|
||||
|
||||
const codeResetPassword = operationCodes.RESET_PASSWORD;
|
||||
const codeOk = operationCodes.OK;
|
||||
codeResetPassword = operationCodes.RESET_PASSWORD;
|
||||
codeOk = operationCodes.OK;
|
||||
|
||||
// Back to login
|
||||
backToLoginButton.addEventListener('click', function (e) {
|
||||
@@ -45,19 +48,19 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
await window.electronAPI.showAlert('Password reset successfully.');
|
||||
window.electronAPI.changeContent('login');
|
||||
});
|
||||
|
||||
async function attemptResetPassword(email, newPassword) {
|
||||
const app_type = await window.electronAPI.readUserConfig('app_type');
|
||||
const messageData = { email, newPassword, app_type };
|
||||
|
||||
if (!await window.electronAPI.sendUcMessage(codeResetPassword, messageData)) return false;
|
||||
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
return true;
|
||||
} else {
|
||||
await window.electronAPI.showAlert(response?.metaInfo?.message || 'Error resetting password.');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
async function attemptResetPassword(email, newPassword) {
|
||||
const app_type = await window.electronAPI.readUserConfig('app_type');
|
||||
const messageData = { email, newPassword, app_type };
|
||||
|
||||
if (!await window.electronAPI.sendUcMessage(codeResetPassword, messageData)) return false;
|
||||
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
return true;
|
||||
} else {
|
||||
await window.electronAPI.showAlert(response?.metaInfo?.message || 'Error resetting password.');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,62 +1,13 @@
|
||||
let pathToFile = '';
|
||||
let fetchUsersInterval = null;
|
||||
|
||||
document.addEventListener('DOMContentLoaded', async function () {
|
||||
let user_info = {};
|
||||
let pathToFile = '';
|
||||
const selectFileButton = document.getElementById('selectFile');
|
||||
const submitButton = document.getElementById('submitButton');
|
||||
const backButton = document.getElementById('backButton');
|
||||
|
||||
user_info = await window.electronAPI.readUserConfig('user_info');
|
||||
if (!user_info) {
|
||||
await window.electronAPI.showAlert('No user_info entry found.');
|
||||
return;
|
||||
}
|
||||
|
||||
// Function to update the file name display
|
||||
function updateFileName() {
|
||||
const fileNameElement = document.getElementById('fileName');
|
||||
if (!fileNameElement) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (pathToFile.trim() === '') {
|
||||
fileNameElement.textContent = 'No file chosen';
|
||||
} else {
|
||||
fileNameElement.textContent = pathToFile.split('\\').pop().split('/').pop();
|
||||
}
|
||||
}
|
||||
|
||||
updateFileName();
|
||||
|
||||
// Fetch user information from applicationInfo and create checkboxes for selecting users
|
||||
async function fetchUsersAndCreateCheckboxes() {
|
||||
const usersInfoId = await window.electronAPI.readApplicationInfo('active_users_info');
|
||||
if (!usersInfoId) {
|
||||
await window.electronAPI.showAlert('Internal error.');
|
||||
return;
|
||||
}
|
||||
|
||||
const usersInfo = await window.electronAPI.readMemoryEntry(usersInfoId);
|
||||
if (!usersInfo || usersInfo.length === 0) {
|
||||
await window.electronAPI.showAlert('No active users found.');
|
||||
await window.electronAPI.changeContent('main_menu');
|
||||
return;
|
||||
}
|
||||
|
||||
const usersDiv = document.querySelector('.choose_user_form_content');
|
||||
usersDiv.innerHTML = '';
|
||||
usersInfo.forEach(user => {
|
||||
const checkbox = document.createElement('input');
|
||||
checkbox.type = 'checkbox';
|
||||
checkbox.name = 'users';
|
||||
checkbox.value = user.ip; // Store user's IP in the value
|
||||
|
||||
const label = document.createElement('label');
|
||||
label.innerHTML = `${user.user_info.name}`; // Display user's name
|
||||
label.insertBefore(checkbox, label.firstChild);
|
||||
|
||||
usersDiv.appendChild(label);
|
||||
});
|
||||
}
|
||||
|
||||
// Event listener for selecting the file
|
||||
document.getElementById('selectFile').addEventListener('click', async function () {
|
||||
selectFileButton.addEventListener('click', async function (event) {
|
||||
event.preventDefault();
|
||||
try {
|
||||
pathToFile = await window.electronAPI.selectFile();
|
||||
updateFileName();
|
||||
@@ -64,14 +15,7 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
console.error('Error opening file dialog:', error);
|
||||
}
|
||||
});
|
||||
|
||||
// Event listener for back button to navigate to main menu
|
||||
document.getElementById('backButton').addEventListener('click', function () {
|
||||
fadeOut('main_menu');
|
||||
});
|
||||
|
||||
// Submit button logic to queue file send tasks and then navigate to main_menu.html
|
||||
document.getElementById('submitButton').addEventListener('click', async function (event) {
|
||||
submitButton.addEventListener('click', async function (event) {
|
||||
event.preventDefault();
|
||||
|
||||
// Check if a file was chosen
|
||||
@@ -80,6 +24,11 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
return;
|
||||
}
|
||||
|
||||
const user_info = await window.electronAPI.readUserConfig('user_info');
|
||||
if (!user_info) {
|
||||
return;
|
||||
}
|
||||
|
||||
const form = document.getElementById('userDestForm');
|
||||
const checkboxes = form.querySelectorAll('input[name="users"]');
|
||||
const selectedUserIps = Array.from(checkboxes)
|
||||
@@ -100,19 +49,78 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
userName: user_info.name // Sender's username from userConfig
|
||||
};
|
||||
await window.electronAPI.addTaskToSendFileQueue(task);
|
||||
|
||||
await window.electronAPI.showAlert('File sent to the queue.');
|
||||
console.log(`Task added to send file to IP ${selectedUserIp}`);
|
||||
} catch (error) {
|
||||
console.error(`Error processing IP ${selectedUserIp}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
// Navigate back to the main menu after all tasks are queued
|
||||
fadeOut('main_menu'); // Navigate to the main menu
|
||||
});
|
||||
backButton.addEventListener('click', function (event) {
|
||||
event.preventDefault();
|
||||
fadeOut('main_menu');
|
||||
});
|
||||
|
||||
// Fetch users and create checkboxes every 5 seconds (in case of updates)
|
||||
setInterval(fetchUsersAndCreateCheckboxes, 5000);
|
||||
|
||||
fetchUsersAndCreateCheckboxes().then(() => console.log('User checkboxes rendered'));
|
||||
});
|
||||
|
||||
// Function to update the file name display
|
||||
function updateFileName() {
|
||||
const fileNameElement = document.getElementById('selectFile');
|
||||
if (!fileNameElement) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (pathToFile.trim() === '') {
|
||||
fileNameElement.textContent = 'No file chosen';
|
||||
} else {
|
||||
fileNameElement.textContent = pathToFile.split('\\').pop().split('/').pop();
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchUsersAndCreateCheckboxes() {
|
||||
// Step 1: Get the currently checked users before refreshing the list
|
||||
const selectedUserIps = new Set(
|
||||
Array.from(document.querySelectorAll('input[name="users"]:checked'))
|
||||
.map(checkbox => checkbox.value)
|
||||
);
|
||||
|
||||
const usersInfoId = await window.electronAPI.readApplicationInfo('active_users_info');
|
||||
if (!usersInfoId) {
|
||||
await window.electronAPI.showAlert('Internal error.');
|
||||
return;
|
||||
}
|
||||
|
||||
const usersInfo = await window.electronAPI.readMemoryEntry(usersInfoId);
|
||||
if (!usersInfo || usersInfo.length === 0) {
|
||||
await window.electronAPI.showAlert('No active users found.');
|
||||
clearInterval(fetchUsersInterval);
|
||||
fetchUsersInterval = null;
|
||||
await window.electronAPI.changeContent('main_menu');
|
||||
return;
|
||||
}
|
||||
|
||||
const usersDiv = document.getElementById('choose_user_form_content');
|
||||
usersDiv.innerHTML = ''; // Clear the list before updating
|
||||
|
||||
usersInfo.forEach(user => {
|
||||
const checkbox = document.createElement('input');
|
||||
checkbox.type = 'checkbox';
|
||||
checkbox.name = 'users';
|
||||
checkbox.value = user.ip; // Store user's IP in the value
|
||||
|
||||
// Step 2: Check if this user was previously selected
|
||||
if (selectedUserIps.has(user.ip)) {
|
||||
checkbox.checked = true; // Restore checked state
|
||||
}
|
||||
|
||||
const label = document.createElement('label');
|
||||
label.innerHTML = `${user.user_info.name}`; // Display user's name
|
||||
label.insertBefore(checkbox, label.firstChild);
|
||||
|
||||
usersDiv.appendChild(label);
|
||||
});
|
||||
|
||||
toggleScroll('choose_user_form_content');
|
||||
}
|
||||
|
||||
|
||||
+48
-46
@@ -1,3 +1,14 @@
|
||||
let codeOk = '';
|
||||
let codeGetDepartments = '';
|
||||
let codeSignUp = '';
|
||||
let userData = {
|
||||
email: null,
|
||||
name: null,
|
||||
password: null,
|
||||
app_type: null,
|
||||
departmentId: null
|
||||
};
|
||||
|
||||
document.addEventListener('DOMContentLoaded', async function () {
|
||||
const nextToStep2Button = document.getElementById('nextToStep2');
|
||||
const backToStep1Button = document.getElementById('backToStep1');
|
||||
@@ -7,15 +18,6 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
const step1 = document.getElementById('step1');
|
||||
const step2 = document.getElementById('step2');
|
||||
|
||||
// This object will hold the user data
|
||||
let userData = {
|
||||
email: null,
|
||||
name: null,
|
||||
password: null,
|
||||
app_type: null,
|
||||
departmentId: null
|
||||
};
|
||||
|
||||
if (!await window.electronAPI.openUcSocket()) {
|
||||
alert('Internal error of the application.');
|
||||
return;
|
||||
@@ -27,16 +29,15 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
return;
|
||||
}
|
||||
|
||||
const codeGetDepartments = operationCodes.GET_DEPARTMENTS;
|
||||
const codeSignUp = operationCodes.SIGN_UP;
|
||||
const codeOk = operationCodes.OK;
|
||||
codeGetDepartments = operationCodes.GET_DEPARTMENTS;
|
||||
codeSignUp = operationCodes.SIGN_UP;
|
||||
codeOk = operationCodes.OK;
|
||||
|
||||
let departments = await getDepartments();
|
||||
if (departments === null) {
|
||||
await window.electronAPI.showAlert('Failed to fetch departments.');
|
||||
return;
|
||||
}
|
||||
console.log(departments);
|
||||
|
||||
// Handle form submission for Step 1 (Profile Information)
|
||||
nextToStep2Button.addEventListener('click', async function (e) {
|
||||
@@ -98,37 +99,38 @@ document.addEventListener('DOMContentLoaded', async function () {
|
||||
await window.electronAPI.closeUcSocket();
|
||||
await window.electronAPI.changeContent('login');
|
||||
});
|
||||
|
||||
async function getDepartments() {
|
||||
if (!await window.electronAPI.sendUcMessage(codeGetDepartments)) return null;
|
||||
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
return response.metaInfo.departments;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async function attemptSignUp() {
|
||||
if (!await window.electronAPI.sendUcMessage(codeSignUp, userData)) return false;
|
||||
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
return true;
|
||||
}
|
||||
await window.electronAPI.showAlert(`Signup failed: ${response?.metaInfo?.message || 'Unknown error'}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Function to switch between steps
|
||||
function switchStep(fromStep, toStep) {
|
||||
fromStep.classList.remove('active'); // Fade out the current step
|
||||
setTimeout(() => {
|
||||
fromStep.style.display = 'none'; // Hide the current step after transition
|
||||
toStep.style.display = 'flex'; // Ensure display is flex for the next step
|
||||
setTimeout(() => {
|
||||
toStep.classList.add('active'); // Fade in the next step
|
||||
}, 20); // Small delay to allow display change before applying opacity
|
||||
}, 500); // Transition duration (0.5s)
|
||||
}
|
||||
});
|
||||
|
||||
async function getDepartments() {
|
||||
if (!await window.electronAPI.sendUcMessage('GET_DEPARTMENTS')) return null;
|
||||
|
||||
const response = await waitForResponse();
|
||||
console.log(response);
|
||||
if (response && response.operationCode === codeOk) {
|
||||
return response.metaInfo.departments;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async function attemptSignUp() {
|
||||
if (!await window.electronAPI.sendUcMessage(codeSignUp, userData)) return false;
|
||||
|
||||
const response = await waitForResponse();
|
||||
if (response && response.operationCode === codeOk) {
|
||||
return true;
|
||||
}
|
||||
await window.electronAPI.showAlert(`Signup failed: ${response?.metaInfo?.message || 'Unknown error'}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Function to switch between steps
|
||||
function switchStep(fromStep, toStep) {
|
||||
fromStep.classList.remove('active'); // Fade out the current step
|
||||
setTimeout(() => {
|
||||
fromStep.style.display = 'none'; // Hide the current step after transition
|
||||
toStep.style.display = 'flex'; // Ensure display is flex for the next step
|
||||
setTimeout(() => {
|
||||
toStep.classList.add('active'); // Fade in the next step
|
||||
}, 20); // Small delay to allow display change before applying opacity
|
||||
}, 500); // Transition duration (0.5s)
|
||||
}
|
||||
|
||||
+155
-177
@@ -1,203 +1,181 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { FileEncryptor } from './file_encryptor'; // Assume the class is in this file
|
||||
import { MemoryManager } from './memory_manager'; // Assume this handles memory-based storage
|
||||
import { JsonManager } from './json_manager'; // Manages JSON-based configurations
|
||||
import { TcpClient } from '../network/tcp/tcp_client' // Import your TcpClient class
|
||||
import { operationCodes } from '../network/operation_codes';
|
||||
import { JsonManager } from './json_manager'; // Assuming this manages JSON configurations
|
||||
import { TcpCommunicator } from "./tcp_communicator";
|
||||
import { operationCodes } from '../network/operation_codes'; // Assuming this holds operation codes
|
||||
import { parentPort } from 'worker_threads';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
import crypto from 'crypto';
|
||||
import { ParsedMessage } from "../network/message_handler";
|
||||
|
||||
export class BackupManager {
|
||||
private fileEncryptor: FileEncryptor | null = null;
|
||||
private memoryManager: MemoryManager;
|
||||
private applicationInfo: JsonManager;
|
||||
export class BackupRetrievalWorker {
|
||||
private userConfig: JsonManager;
|
||||
private applicationInfo: JsonManager;
|
||||
private readonly clientPort: number;
|
||||
private readonly destinationPath: string;
|
||||
private encryptionKey: Buffer | null = null;
|
||||
private iv: Buffer | null = null;
|
||||
private tcpCommunicator: TcpCommunicator | null = null;
|
||||
|
||||
constructor(userConfigPath: string, applicationInfoPath: string, memoryManagerPath: string, clientPort: number) {
|
||||
this.applicationInfo = new JsonManager(applicationInfoPath);
|
||||
constructor(userConfigPath: string, applicationInfoPath: string, clientPort: number, destinationPath: string) {
|
||||
this.userConfig = new JsonManager(userConfigPath);
|
||||
this.memoryManager = new MemoryManager(memoryManagerPath);
|
||||
this.applicationInfo = new JsonManager(applicationInfoPath);
|
||||
this.clientPort = clientPort;
|
||||
this.destinationPath = destinationPath;
|
||||
}
|
||||
|
||||
async start(): Promise<void> {
|
||||
setInterval(async () => {
|
||||
await this.initialize(); // Re-run every minute
|
||||
}, 60000); // 1 minute interval
|
||||
}
|
||||
try {
|
||||
const userInfo = await this.userConfig.readValue('user_info');
|
||||
if (!userInfo || !userInfo.name) {
|
||||
throw new Error('User information or name is missing.');
|
||||
}
|
||||
const userName = userInfo.name;
|
||||
|
||||
// Initialize the backup process: fetch data from the app info and memory
|
||||
private async initialize(): Promise<void> {
|
||||
// Initialize the encryption settings from UserConfig
|
||||
const encryptionKeyData = await this.userConfig.readValue('encryption_key');
|
||||
if (!encryptionKeyData || !encryptionKeyData.key || !encryptionKeyData.iv) {
|
||||
console.error('Encryption key data is missing in user configuration.');
|
||||
return;
|
||||
}
|
||||
|
||||
// Create a new FileEncryptor with the retrieved key and IV
|
||||
this.fileEncryptor = new FileEncryptor(encryptionKeyData.key, encryptionKeyData.iv);
|
||||
|
||||
// Get the name of the user
|
||||
const userInfo = await this.userConfig.readValue('user_info');
|
||||
if (!userInfo || !userInfo.name) {
|
||||
console.error('User information is missing in user configuration.');
|
||||
return;
|
||||
}
|
||||
|
||||
const userName = userInfo.name;
|
||||
|
||||
// Get the backup directory information from ApplicationInfo
|
||||
const backupDirectoryData = await this.applicationInfo.readValue('backupDirectory');
|
||||
if (!backupDirectoryData || !backupDirectoryData.id || !backupDirectoryData.path) {
|
||||
console.error('Backup directory information is missing in application info.');
|
||||
return;
|
||||
}
|
||||
|
||||
const activeUsersIp = await this.applicationInfo.readValue('users_ip');
|
||||
if (!activeUsersIp || !activeUsersIp.length) {
|
||||
console.error('No active users found.');
|
||||
return;
|
||||
}
|
||||
|
||||
const backupDirectoryId = backupDirectoryData.id;
|
||||
const backupDirectoryPath = backupDirectoryData.path;
|
||||
|
||||
// Get the file structure from MemoryManager
|
||||
const directoryData = await this.memoryManager.retrieveMetaInformation(backupDirectoryId);
|
||||
if (!directoryData || !directoryData.structure) {
|
||||
console.error('Backup directory structure is missing in memory.');
|
||||
return;
|
||||
}
|
||||
|
||||
// Send files to the list of IPs
|
||||
await this.sendFilesToUsers(directoryData.structure, userName, activeUsersIp, backupDirectoryPath);
|
||||
}
|
||||
|
||||
// Method to encrypt a file and return the base64 string
|
||||
private encryptFile(filePath: string): string {
|
||||
if (!this.fileEncryptor) {
|
||||
return filePath;
|
||||
}
|
||||
|
||||
if (!fs.existsSync(filePath)) {
|
||||
console.error(`File not found: ${filePath}`);
|
||||
return '';
|
||||
}
|
||||
|
||||
// Use FileEncryptor to encrypt the file and return the base64 string
|
||||
return this.fileEncryptor.encryptFileToBase64(filePath);
|
||||
}
|
||||
|
||||
// Send files to the list of users and remove successfully sent files from the list
|
||||
private async sendFilesToUsers(fileStructure: { [key: string]: string }, userName: string, usersIp: string[], backupDirectoryPath: string): Promise<void> {
|
||||
let unsentFiles = Object.keys(fileStructure); // Keep track of unsent files
|
||||
|
||||
for (const fileName of unsentFiles) {
|
||||
const filePath = fileStructure[fileName];
|
||||
const encryptedFileContent = this.encryptFile(filePath);
|
||||
|
||||
if (!encryptedFileContent) {
|
||||
console.error(`Failed to encrypt file: ${fileName}`);
|
||||
continue; // Skip to the next file
|
||||
const encryptionData = await this.userConfig.readValue('encryption_key');
|
||||
if (!encryptionData || !encryptionData.key || !encryptionData.iv) {
|
||||
throw new Error('Encryption key or IV is missing.');
|
||||
}
|
||||
|
||||
// Calculate relative file path
|
||||
const relativeFilePath = path.relative(backupDirectoryPath, filePath); // Get the relative file path
|
||||
this.encryptionKey = Buffer.from(encryptionData.key, 'base64');
|
||||
this.iv = Buffer.from(encryptionData.iv, 'base64');
|
||||
|
||||
// Meta information to send
|
||||
const metaInfo = {
|
||||
userName, // Name of the user
|
||||
relativeFilePath // Relative path to preserve the directory structure
|
||||
};
|
||||
const activeUsersIp = await this.applicationInfo.readValue('users_ip');
|
||||
if (!activeUsersIp || !activeUsersIp.length) {
|
||||
parentPort?.postMessage({ success: false, message: 'No active users found.' });
|
||||
return;
|
||||
}
|
||||
|
||||
for (const ip of usersIp) {
|
||||
const tcpClient = new TcpClient(this.clientPort);
|
||||
tcpClient.openSocket(ip);
|
||||
|
||||
// Wait for AES key and send the file
|
||||
try {
|
||||
const sendSuccess = await this.waitForAesKeyAndSendFile(tcpClient, operationCodes.BACKUP_FILE, metaInfo, Buffer.from(encryptedFileContent, 'base64'));
|
||||
if (sendSuccess) {
|
||||
console.log(`Successfully sent file: ${fileName} to ${ip}`);
|
||||
unsentFiles = unsentFiles.filter(f => f !== fileName); // Remove the file from the unsent list
|
||||
tcpClient.closeSocket();
|
||||
break; // Move to the next file after successful send
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Failed to send file: ${fileName} to ${ip}. Error: ${error}`);
|
||||
tcpClient.closeSocket();
|
||||
let backupSuccessful = true;
|
||||
for (const ip of activeUsersIp) {
|
||||
const success = await this.processBackupForIp(ip, userName);
|
||||
if (!success) {
|
||||
backupSuccessful = false;
|
||||
parentPort?.postMessage({ success: false, message: 'Backup could not be completed due to an internal error.' });
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (backupSuccessful) {
|
||||
parentPort?.postMessage({ success: true, message: 'Backup successful.' });
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error('Error in BackupRetrievalWorker:', error);
|
||||
parentPort?.postMessage({ success: false, message: `Backup could not be completed due to an internal error: ${error.message}` });
|
||||
}
|
||||
}
|
||||
|
||||
private async processBackupForIp(ip: string, userName: string): Promise<boolean> {
|
||||
this.tcpCommunicator = new TcpCommunicator(ip, this.clientPort);
|
||||
if (!await this.tcpCommunicator.connect()) {
|
||||
console.error(`Failed to connect to ${ip}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
const backupExists = await this.checkIfBackupExists(userName);
|
||||
if (!backupExists) {
|
||||
console.log(`No backup found for user ${userName} on IP ${ip}`);
|
||||
await this.tcpCommunicator.disconnect();
|
||||
return true; // Skip user if no backup found, do not mark as error
|
||||
}
|
||||
|
||||
const backupStructure = await this.requestBackupStructure(userName);
|
||||
if (!backupStructure || Object.keys(backupStructure).length === 0) {
|
||||
console.log(`No files found in backup structure for user ${userName} on IP ${ip}`);
|
||||
await this.tcpCommunicator.disconnect();
|
||||
return true; // Skip user if no files found, do not mark as error
|
||||
}
|
||||
|
||||
for (const relativeFilePath of Object.keys(backupStructure)) {
|
||||
const fileRequestSuccess = await this.requestBackupFile(userName, relativeFilePath);
|
||||
if (!fileRequestSuccess) {
|
||||
console.error(`Failed to retrieve file ${relativeFilePath} from backup for user ${userName} on IP ${ip}`);
|
||||
await this.tcpCommunicator.disconnect();
|
||||
return false; // Stop if any file fails to be retrieved
|
||||
}
|
||||
}
|
||||
|
||||
// If there are any unsent files, notify the parent process
|
||||
if (unsentFiles.length > 0) {
|
||||
parentPort?.postMessage({ success: false, message: 'Backup could not be completed for all files', unsentFiles });
|
||||
} else {
|
||||
parentPort?.postMessage({ success: true, message: 'Backup completed successfully' });
|
||||
await this.tcpCommunicator.disconnect();
|
||||
return true;
|
||||
}
|
||||
|
||||
private async checkIfBackupExists(userName: string): Promise<boolean> {
|
||||
if (!this.tcpCommunicator) return false;
|
||||
|
||||
const metaInfo = { name: userName };
|
||||
if (!await this.tcpCommunicator.sendMessage(operationCodes.IS_BACKUP_CREATED, metaInfo)) return false;
|
||||
|
||||
const response = await this.waitForResponse();
|
||||
return response?.metaInfo?.backupExists === true;
|
||||
}
|
||||
|
||||
private async requestBackupStructure(userName: string): Promise<any> {
|
||||
if (!this.tcpCommunicator) return false;
|
||||
|
||||
const metaInfo = { name: userName };
|
||||
if (!await this.tcpCommunicator.sendMessage(operationCodes.GET_BACKUP_STRUCTURE, metaInfo)) return null;
|
||||
|
||||
const response = await this.waitForResponse();
|
||||
return response?.metaInfo?.structure || null;
|
||||
}
|
||||
|
||||
private async requestBackupFile(userName: string, relativeFilePath: string): Promise<boolean> {
|
||||
if (!this.tcpCommunicator) return false;
|
||||
|
||||
const metaInfo = { name: userName, relativeFilePath };
|
||||
if (!await this.tcpCommunicator.sendMessage(operationCodes.REQ_FILE_FROM_BACKUP, metaInfo)) return false;
|
||||
|
||||
const response = await this.waitForResponse();
|
||||
if (response?.operationCode === operationCodes.OK && response.metaInfo && response.fileContent) {
|
||||
return this.saveFile(response.metaInfo.relativeFilePath, response.fileContent.toString('base64'));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private saveFile(relativeFilePath: string, fileContent: string): boolean {
|
||||
if (!this.encryptionKey || !this.iv) {
|
||||
console.error('Encryption key or IV is not set.');
|
||||
return false;
|
||||
}
|
||||
|
||||
let encryptedBuffer: Buffer;
|
||||
try {
|
||||
encryptedBuffer = Buffer.from(fileContent, 'base64');
|
||||
} catch (error) {
|
||||
console.error('Error decoding base64 file content:', error);
|
||||
return false;
|
||||
}
|
||||
|
||||
let decryptedContent: Buffer;
|
||||
try {
|
||||
const decipher = crypto.createDecipheriv('aes-256-cbc', this.encryptionKey, this.iv);
|
||||
decryptedContent = Buffer.concat([decipher.update(encryptedBuffer), decipher.final()]);
|
||||
} catch (error) {
|
||||
console.error('Error decrypting file:', error);
|
||||
return false;
|
||||
}
|
||||
|
||||
const fullFilePath = path.join(this.destinationPath, relativeFilePath);
|
||||
try {
|
||||
const dirPath = path.dirname(fullFilePath);
|
||||
if (!fs.existsSync(dirPath)) {
|
||||
fs.mkdirSync(dirPath, { recursive: true });
|
||||
}
|
||||
fs.writeFileSync(fullFilePath, decryptedContent);
|
||||
console.log(`File saved successfully: ${fullFilePath}`);
|
||||
return true;
|
||||
} catch (error: any) {
|
||||
console.error(`Error saving file ${relativeFilePath}: ${error.message}`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Wait for AES key to be set, send the file, and wait for the response
|
||||
private async waitForAesKeyAndSendFile(tcpClient: TcpClient, operationCode: string, metaInfo: { [key: string]: any }, fileContent: Buffer, checkInterval: number = 500, timeout: number = 10000): Promise<boolean> {
|
||||
const startTime = Date.now();
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const intervalId = setInterval(async () => {
|
||||
const elapsedTime = Date.now() - startTime;
|
||||
|
||||
// Check if AES key is set, if timeout occurs, reject
|
||||
if (!tcpClient.isAesKeySet()) {
|
||||
if (elapsedTime > timeout) {
|
||||
clearInterval(intervalId);
|
||||
console.error('Timeout waiting for AES key.');
|
||||
reject(new Error('Timeout waiting for AES key.'));
|
||||
}
|
||||
return; // Continue waiting for AES key
|
||||
}
|
||||
|
||||
// AES key is set, send the message
|
||||
clearInterval(intervalId);
|
||||
|
||||
try {
|
||||
const success = await tcpClient.sendMessage(operationCode, metaInfo, fileContent);
|
||||
if (!success) {
|
||||
reject(new Error('Failed to send the file content.'));
|
||||
return;
|
||||
}
|
||||
|
||||
// Wait for a response after sending the message
|
||||
const responseReceived = await this.waitForMessageResponse(tcpClient, timeout);
|
||||
if (!responseReceived) {
|
||||
reject(new Error('Timeout waiting for the message response.'));
|
||||
return;
|
||||
}
|
||||
|
||||
// Everything went fine
|
||||
resolve(true);
|
||||
} catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}, checkInterval); // Check for AES key every `checkInterval`
|
||||
});
|
||||
}
|
||||
|
||||
// Method to wait for the response from the TCP client
|
||||
private waitForMessageResponse(tcpClient: TcpClient, timeout: number = 10000): Promise<any> {
|
||||
private async waitForResponse(): Promise<ParsedMessage | null> {
|
||||
return new Promise((resolve) => {
|
||||
const startTime = Date.now();
|
||||
const intervalId = setInterval(() => {
|
||||
const response = tcpClient.getLastResult();
|
||||
const elapsedTime = Date.now() - startTime;
|
||||
|
||||
if (response) {
|
||||
clearInterval(intervalId);
|
||||
resolve(true);
|
||||
} else if (elapsedTime > timeout) {
|
||||
clearInterval(intervalId);
|
||||
resolve(false); // No response after timeout
|
||||
const idResponseCheck = setInterval(async () => {
|
||||
if (!this.tcpCommunicator) return null;
|
||||
if (this.tcpCommunicator.hasResponseArrived()) {
|
||||
clearInterval(idResponseCheck);
|
||||
resolve(this.tcpCommunicator.getLastResult());
|
||||
}
|
||||
}, 100);
|
||||
});
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import { JsonManager } from './json_manager'; // Assuming this manages JSON configurations
|
||||
import { TcpClient } from '../network/tcp/tcp_client'; // Assuming this handles TCP client connections
|
||||
import { operationCodes } from '../network/operation_codes'; // Assuming this holds operation codes
|
||||
import { JsonManager } from './json_manager'; // Assuming this manages JSON configurations
|
||||
import { TcpCommunicator } from "./tcp_communicator";
|
||||
import { operationCodes } from '../network/operation_codes'; // Assuming this holds operation codes
|
||||
import { parentPort } from 'worker_threads';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
import crypto from 'crypto'; // Import the crypto module for encryption and decryption
|
||||
import crypto from 'crypto';
|
||||
import { ParsedMessage } from "../network/message_handler"; // Import the crypto module for encryption and decryption
|
||||
|
||||
export class BackupRetrievalWorker {
|
||||
private userConfig: JsonManager;
|
||||
@@ -13,6 +14,7 @@ export class BackupRetrievalWorker {
|
||||
private readonly destinationPath: string;
|
||||
private encryptionKey: Buffer | null = null;
|
||||
private iv: Buffer | null = null;
|
||||
private tcpCommunicator: TcpCommunicator | null = null;
|
||||
|
||||
constructor(userConfigPath: string, applicationInfoPath: string, clientPort: number, destinationPath: string) {
|
||||
this.userConfig = new JsonManager(userConfigPath);
|
||||
@@ -22,203 +24,149 @@ export class BackupRetrievalWorker {
|
||||
}
|
||||
|
||||
async start(): Promise<void> {
|
||||
// Retrieve the necessary data from userConfig and applicationInfo
|
||||
const userInfo = await this.userConfig.readValue('user_info');
|
||||
if (!userInfo || !userInfo.name) {
|
||||
console.error('User information or name is missing.');
|
||||
return;
|
||||
}
|
||||
const userName = userInfo.name;
|
||||
|
||||
// Load encryption key and IV from userConfig
|
||||
const encryptionData = await this.userConfig.readValue('encryption_key');
|
||||
if (!encryptionData || !encryptionData.key || !encryptionData.iv) {
|
||||
console.error('Encryption key or IV is missing.');
|
||||
return;
|
||||
}
|
||||
|
||||
// Convert encryption key and IV from base64 to buffer
|
||||
this.encryptionKey = Buffer.from(encryptionData.key, 'base64');
|
||||
this.iv = Buffer.from(encryptionData.iv, 'base64');
|
||||
|
||||
const activeUsersIp = await this.applicationInfo.readValue('users_ip');
|
||||
if (!activeUsersIp || !activeUsersIp.length) {
|
||||
console.error('No active users found.');
|
||||
return;
|
||||
}
|
||||
|
||||
// Process each IP and request backup data
|
||||
for (const ip of activeUsersIp) {
|
||||
try {
|
||||
const success = await this.processBackupForIp(ip, userName);
|
||||
if (success) {
|
||||
console.log(`Backup retrieved successfully from ${ip}`);
|
||||
} else {
|
||||
console.error(`Failed to retrieve backup from ${ip}`);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Error processing backup from ${ip}: ${error}`);
|
||||
try {
|
||||
const userInfo = await this.userConfig.readValue('user_info');
|
||||
if (!userInfo || !userInfo.name) {
|
||||
throw new Error('User information or name is missing.');
|
||||
}
|
||||
}
|
||||
const userName = userInfo.name;
|
||||
|
||||
// Notify the parent that the worker is done
|
||||
parentPort?.postMessage({ success: true, message: 'Backup retrieval completed.' });
|
||||
const encryptionData = await this.userConfig.readValue('encryption_key');
|
||||
if (!encryptionData || !encryptionData.key || !encryptionData.iv) {
|
||||
throw new Error('Encryption key or IV is missing.');
|
||||
}
|
||||
|
||||
this.encryptionKey = Buffer.from(encryptionData.key, 'base64');
|
||||
this.iv = Buffer.from(encryptionData.iv, 'base64');
|
||||
|
||||
const activeUsersIp = await this.applicationInfo.readValue('users_ip');
|
||||
if (!activeUsersIp || !activeUsersIp.length) {
|
||||
throw new Error('No active users found.');
|
||||
}
|
||||
|
||||
for (const ip of activeUsersIp) {
|
||||
const success = await this.processBackupForIp(ip, userName);
|
||||
if (!success) {
|
||||
throw new Error(`Failed to retrieve backup from ${ip}`);
|
||||
}
|
||||
console.log(`Backup retrieved successfully from ${ip}`);
|
||||
}
|
||||
|
||||
parentPort?.postMessage({ success: true, message: 'Backup retrieval completed successfully.' });
|
||||
} catch (error: any) {
|
||||
console.error('Error in BackupRetrievalWorker:', error);
|
||||
parentPort?.postMessage({ success: false, message: `A problem occurred: ${error.message}` });
|
||||
}
|
||||
}
|
||||
|
||||
private async processBackupForIp(ip: string, userName: string): Promise<boolean> {
|
||||
const tcpClient = new TcpClient(this.clientPort);
|
||||
tcpClient.openSocket(ip);
|
||||
|
||||
try {
|
||||
// Wait for the AES key to be set before continuing
|
||||
const aesSet = await this.waitForAesKey(tcpClient);
|
||||
if (!aesSet) {
|
||||
console.error(`Timeout waiting for AES key on IP ${ip}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Step 1: Check if a backup exists for the user on this IP
|
||||
const backupExists = await this.checkIfBackupExists(tcpClient, userName);
|
||||
if (!backupExists) {
|
||||
console.log(`No backup found for user ${userName} on IP ${ip}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Step 2: Request the structure of the backup directory
|
||||
const backupStructure = await this.requestBackupStructure(tcpClient, userName);
|
||||
if (!backupStructure || Object.keys(backupStructure).length === 0) {
|
||||
console.log(`No files found in backup structure for user ${userName} on IP ${ip}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Step 3: Request and retrieve each file from the backup
|
||||
for (const relativeFilePath of Object.keys(backupStructure)) {
|
||||
const fileRequestSuccess = await this.requestBackupFile(tcpClient, userName, relativeFilePath);
|
||||
if (!fileRequestSuccess) {
|
||||
console.error(`Failed to retrieve file ${relativeFilePath} from backup for user ${userName} on IP ${ip}`);
|
||||
return false; // Stop if any file fails to be retrieved
|
||||
}
|
||||
}
|
||||
|
||||
return true; // All files retrieved successfully
|
||||
} catch (error) {
|
||||
console.error(`Error during backup processing for IP ${ip}: ${error}`);
|
||||
return false;
|
||||
} finally {
|
||||
tcpClient.closeSocket(); // Ensure socket is closed
|
||||
this.tcpCommunicator = new TcpCommunicator(ip, this.clientPort);
|
||||
if (!await this.tcpCommunicator.connect()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const backupExists = await this.checkIfBackupExists(userName);
|
||||
if (!backupExists) {
|
||||
console.log(`No backup found for user ${userName} on IP ${ip}`);
|
||||
await this.tcpCommunicator.disconnect();
|
||||
return true;
|
||||
}
|
||||
|
||||
const backupStructure = await this.requestBackupStructure(userName);
|
||||
if (!backupStructure || Object.keys(backupStructure).length === 0) {
|
||||
console.log(`No files found in backup structure for user ${userName} on IP ${ip}`);
|
||||
await this.tcpCommunicator.disconnect();
|
||||
return true;
|
||||
}
|
||||
|
||||
for (const relativeFilePath of Object.keys(backupStructure)) {
|
||||
const fileRequestSuccess = await this.requestBackupFile(userName, relativeFilePath);
|
||||
if (!fileRequestSuccess) {
|
||||
await this.tcpCommunicator.disconnect();
|
||||
throw new Error(`Failed to retrieve file ${relativeFilePath} from backup for user ${userName} on IP ${ip}`);
|
||||
}
|
||||
}
|
||||
|
||||
await this.tcpCommunicator.disconnect();
|
||||
return true;
|
||||
}
|
||||
|
||||
// Wait for AES key to be set
|
||||
private async waitForAesKey(tcpClient: TcpClient, timeout: number = 10000): Promise<boolean> {
|
||||
const startTime = Date.now();
|
||||
private async checkIfBackupExists(userName: string): Promise<boolean> {
|
||||
if (!this.tcpCommunicator) return false;
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const intervalId = setInterval(() => {
|
||||
const elapsedTime = Date.now() - startTime;
|
||||
|
||||
if (tcpClient.isAesKeySet()) {
|
||||
clearInterval(intervalId);
|
||||
resolve(true); // AES key is set, we can proceed
|
||||
} else if (elapsedTime > timeout) {
|
||||
clearInterval(intervalId);
|
||||
resolve(false); // Timeout reached, AES key not set
|
||||
}
|
||||
}, 500); // Check every 500ms
|
||||
});
|
||||
}
|
||||
|
||||
// Wait for a message response with timeout
|
||||
private async waitForMessageResponse(tcpClient: TcpClient, timeout: number = 10000): Promise<any> {
|
||||
const startTime = Date.now();
|
||||
|
||||
return new Promise((resolve) => {
|
||||
const intervalId = setInterval(() => {
|
||||
const elapsedTime = Date.now() - startTime;
|
||||
const response = tcpClient.getLastResult();
|
||||
|
||||
if (response) {
|
||||
clearInterval(intervalId);
|
||||
resolve(response); // Return the response
|
||||
} else if (elapsedTime > timeout) {
|
||||
clearInterval(intervalId);
|
||||
resolve(null); // Timeout, no response
|
||||
}
|
||||
}, 500); // Check every 500ms
|
||||
});
|
||||
}
|
||||
|
||||
// Check if the backup exists for the user on the remote IP
|
||||
private async checkIfBackupExists(tcpClient: TcpClient, userName: string): Promise<boolean> {
|
||||
const metaInfo = { name: userName };
|
||||
await tcpClient.sendMessage(operationCodes.IS_BACKUP_CREATED, metaInfo);
|
||||
if (!await this.tcpCommunicator.sendMessage(operationCodes.IS_BACKUP_CREATED, metaInfo)) return false;
|
||||
|
||||
const response = await this.waitForMessageResponse(tcpClient);
|
||||
const response = await this.waitForResponse();
|
||||
return response?.metaInfo?.backupExists === true;
|
||||
}
|
||||
|
||||
// Request the backup structure from the remote IP
|
||||
private async requestBackupStructure(tcpClient: TcpClient, userName: string): Promise<any> {
|
||||
const metaInfo = { name: userName };
|
||||
await tcpClient.sendMessage(operationCodes.GET_BACKUP_STRUCTURE, metaInfo);
|
||||
private async requestBackupStructure(userName: string): Promise<any> {
|
||||
if (!this.tcpCommunicator) return false;
|
||||
|
||||
const response = await this.waitForMessageResponse(tcpClient);
|
||||
return response?.metaInfo?.structure ? response.metaInfo.structure : null;
|
||||
const metaInfo = { name: userName };
|
||||
if (!await this.tcpCommunicator.sendMessage(operationCodes.GET_BACKUP_STRUCTURE, metaInfo)) return null;
|
||||
|
||||
const response = await this.waitForResponse();
|
||||
return response?.metaInfo?.structure || null;
|
||||
}
|
||||
|
||||
// Request a file from the backup and wait for it to be decrypted and stored
|
||||
private async requestBackupFile(tcpClient: TcpClient, userName: string, relativeFilePath: string): Promise<boolean> {
|
||||
const metaInfo = { name: userName, relativeFilePath };
|
||||
await tcpClient.sendMessage(operationCodes.REQ_FILE_FROM_BACKUP, metaInfo);
|
||||
private async requestBackupFile(userName: string, relativeFilePath: string): Promise<boolean> {
|
||||
if (!this.tcpCommunicator) return false;
|
||||
|
||||
const response = await this.waitForMessageResponse(tcpClient);
|
||||
const metaInfo = { name: userName, relativeFilePath };
|
||||
if (!await this.tcpCommunicator.sendMessage(operationCodes.REQ_FILE_FROM_BACKUP, metaInfo)) return false;
|
||||
|
||||
const response = await this.waitForResponse();
|
||||
if (response?.operationCode === operationCodes.OK && response.metaInfo && response.fileContent) {
|
||||
return this.saveFile(response.metaInfo.relativeFilePath, response.fileContent);
|
||||
return this.saveFile(response.metaInfo.relativeFilePath, response.fileContent.toString('base64'));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Decrypt the file content using AES-256-CBC and save the decrypted file
|
||||
private saveFile(relativeFilePath: string, fileContent: string): boolean {
|
||||
if (!this.encryptionKey || !this.iv) {
|
||||
console.error('Encryption key or IV is not set.');
|
||||
return false;
|
||||
throw new Error('Encryption key or IV is not set.');
|
||||
}
|
||||
|
||||
// Decode the base64-encoded file content into a buffer
|
||||
let encryptedBuffer: Buffer;
|
||||
try {
|
||||
encryptedBuffer = Buffer.from(fileContent, 'base64');
|
||||
} catch (error) {
|
||||
console.error('Error decoding base64 file content:', error);
|
||||
return false;
|
||||
} catch (error: any) {
|
||||
throw new Error(`Error decoding base64 file content: ${error.message}`);
|
||||
}
|
||||
|
||||
// Decrypt the file content
|
||||
let decryptedContent: Buffer;
|
||||
try {
|
||||
const decipher = crypto.createDecipheriv('aes-256-cbc', this.encryptionKey, this.iv);
|
||||
decryptedContent = Buffer.concat([decipher.update(encryptedBuffer), decipher.final()]);
|
||||
} catch (error) {
|
||||
console.error('Error decrypting file:', error);
|
||||
return false;
|
||||
} catch (error: any) {
|
||||
throw new Error(`Error decrypting file: ${error.message}`);
|
||||
}
|
||||
|
||||
// Save the decrypted file content
|
||||
const fullFilePath = path.join(this.destinationPath, relativeFilePath);
|
||||
|
||||
try {
|
||||
const dirPath = path.dirname(fullFilePath);
|
||||
if (!fs.existsSync(dirPath)) {
|
||||
fs.mkdirSync(dirPath, { recursive: true }); // Ensure directory exists
|
||||
fs.mkdirSync(dirPath, { recursive: true });
|
||||
}
|
||||
|
||||
fs.writeFileSync(fullFilePath, decryptedContent);
|
||||
console.log(`File saved successfully: ${fullFilePath}`);
|
||||
return true;
|
||||
} catch (error: any) {
|
||||
console.error(`Error saving file ${relativeFilePath}: ${error.message}`);
|
||||
return false;
|
||||
throw new Error(`Error saving file ${relativeFilePath}: ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
private async waitForResponse(): Promise<ParsedMessage | null> {
|
||||
return new Promise((resolve) => {
|
||||
const idResponseCheck = setInterval(async () => {
|
||||
if (!this.tcpCommunicator) return null;
|
||||
if (this.tcpCommunicator.hasResponseArrived()) {
|
||||
clearInterval(idResponseCheck);
|
||||
resolve(this.tcpCommunicator.getLastResult());
|
||||
}
|
||||
}, 100);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { TcpClient } from '../network/tcp/tcp_client'; // Assuming this class exists
|
||||
import { TcpCommunicator } from './tcp_communicator'; // Using TcpCommunicator instead of TcpClient
|
||||
import { operationCodes } from '../network/operation_codes';
|
||||
import { JsonManager } from './json_manager'; // Manages JSON configurations
|
||||
import { MemoryManager } from './memory_manager'; // Manages in-memory data structures
|
||||
import { ParsedMessage } from "../network/message_handler";
|
||||
|
||||
export class DepartmentSharer {
|
||||
private userConfig: JsonManager;
|
||||
@@ -11,6 +12,8 @@ export class DepartmentSharer {
|
||||
private memoryManager: MemoryManager; // To read the department files
|
||||
private departmentDirectory: string | null;
|
||||
private readonly clientPort: number;
|
||||
private isBusy: boolean = false; // Busy flag to prevent simultaneous sharing
|
||||
private tcpCommunicator: TcpCommunicator | null = null; // For each user connection
|
||||
|
||||
constructor(
|
||||
userConfigPath: string,
|
||||
@@ -20,7 +23,7 @@ export class DepartmentSharer {
|
||||
) {
|
||||
this.userConfig = new JsonManager(userConfigPath);
|
||||
this.applicationInfo = new JsonManager(applicationInfoPath);
|
||||
this.memoryManager = new MemoryManager(memoryManagerPath); // To retrieve files
|
||||
this.memoryManager = new MemoryManager(memoryManagerPath);
|
||||
this.clientPort = clientPort;
|
||||
this.departmentDirectory = null;
|
||||
}
|
||||
@@ -28,7 +31,11 @@ export class DepartmentSharer {
|
||||
// Start sharing files with the department every minute
|
||||
async start(): Promise<void> {
|
||||
setInterval(async () => {
|
||||
await this.shareFilesWithDepartment(); // Retry every minute
|
||||
if (!this.isBusy) {
|
||||
this.isBusy = true;
|
||||
await this.shareFilesWithDepartment();
|
||||
this.isBusy = false;
|
||||
}
|
||||
}, 10000); // 10-second interval for testing
|
||||
}
|
||||
|
||||
@@ -61,7 +68,6 @@ export class DepartmentSharer {
|
||||
|
||||
// Filter users who belong to the same department
|
||||
const departmentUsers = activeUsers.filter((user: any) => user.user_info.departmentId === departmentId);
|
||||
|
||||
if (departmentUsers.length === 0) {
|
||||
console.log('No users found in the same department.');
|
||||
return;
|
||||
@@ -83,15 +89,41 @@ export class DepartmentSharer {
|
||||
return;
|
||||
}
|
||||
|
||||
// Send each file to every department user
|
||||
await this.shareFilesWithUsers(departmentUsers, departmentFiles.structure, userName);
|
||||
// Iterate over all department users and perform the operations
|
||||
for (const user of departmentUsers) {
|
||||
const userIp = user.ip;
|
||||
this.tcpCommunicator = new TcpCommunicator(userIp, this.clientPort);
|
||||
|
||||
// After sending all files, clear the department directory
|
||||
await this.clearDepartmentDirectory(departmentUsers);
|
||||
if(await this.tcpCommunicator.connect()) continue;
|
||||
|
||||
// First clear the department directory
|
||||
const clearSuccess = await this.clearDepartmentDirectory();
|
||||
if (clearSuccess) {
|
||||
await this.sendFilesToUser(departmentFiles.structure, userName);
|
||||
}
|
||||
|
||||
await this.tcpCommunicator.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
// Send the files to the users in the department
|
||||
private async shareFilesWithUsers(users: any[], files: { [key: string]: string }, userName: string): Promise<void> {
|
||||
// Clear the department directory for a user
|
||||
private async clearDepartmentDirectory(): Promise<boolean> {
|
||||
if(!this.tcpCommunicator) return false;
|
||||
|
||||
if (!await this.tcpCommunicator.sendMessage(operationCodes.CLEAR_DEPARTMENT)) return false;
|
||||
const response = await this.waitForResponse();
|
||||
|
||||
if (!response || response.operationCode !== operationCodes.OK){
|
||||
console.error('Failed to clear the department directory.');
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// Send the files to a user in the department
|
||||
private async sendFilesToUser(files: { [key: string]: string }, userName: string): Promise<void> {
|
||||
if(!this.tcpCommunicator) return;
|
||||
const unsentFiles = Object.keys(files); // Keep track of unsent files
|
||||
|
||||
for (const fileName of unsentFiles) {
|
||||
@@ -116,163 +148,29 @@ export class DepartmentSharer {
|
||||
relativeFilePath // Use the relative path to preserve directory structure
|
||||
};
|
||||
|
||||
// Send the file to each user in the same department
|
||||
for (const user of users) {
|
||||
const userIp = user.ip;
|
||||
const tcpClient = new TcpClient(this.clientPort);
|
||||
// Send the file
|
||||
if (!await this.tcpCommunicator.sendMessage(operationCodes.DEPARTMENT_FILE, metaInfo, Buffer.from(fileContent))) return;
|
||||
|
||||
// Open a connection to the user's IP
|
||||
tcpClient.openSocket(userIp);
|
||||
|
||||
try {
|
||||
// Wait for the AES key and send the file
|
||||
const success = await this.waitForAesKeyAndSendFile(tcpClient, operationCodes.DEPARTMENT_FILE, metaInfo, fileContent);
|
||||
if (success) {
|
||||
console.log(`File successfully sent: ${fileName} to user ${userIp}`);
|
||||
unsentFiles.splice(unsentFiles.indexOf(fileName), 1); // Remove successfully sent file
|
||||
tcpClient.closeSocket(); // Close the connection after sending
|
||||
break; // Move to the next file after a successful send
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Failed to send file: ${fileName} to IP: ${userIp}. Error: ${error}`);
|
||||
tcpClient.closeSocket(); // Ensure socket is closed on error
|
||||
}
|
||||
const response = await this.waitForResponse();
|
||||
if (!response || response.operationCode !== operationCodes.OK) {
|
||||
console.error(`Failed to send file: ${fileName}`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (unsentFiles.length > 0) {
|
||||
console.log('Some files could not be sent, retrying later.');
|
||||
} else {
|
||||
console.log('All files shared successfully.');
|
||||
unsentFiles.splice(unsentFiles.indexOf(fileName), 1);
|
||||
await this.tcpCommunicator.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
// Clear the department directory for all users after sharing
|
||||
private async clearDepartmentDirectory(users: any[]): Promise<void> {
|
||||
for (const user of users) {
|
||||
const userIp = user.ip;
|
||||
const tcpClient = new TcpClient(this.clientPort);
|
||||
|
||||
// Open a connection to the user's IP
|
||||
tcpClient.openSocket(userIp);
|
||||
|
||||
try {
|
||||
const success = await this.waitForAesKeyAndSendClearDepartment(tcpClient, operationCodes.CLEAR_DEPARTMENT);
|
||||
if (success) {
|
||||
console.log(`Department directory cleared successfully for user ${userIp}`);
|
||||
} else {
|
||||
console.error(`Failed to clear department directory for user ${userIp}`);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Error clearing department directory for user ${userIp}:`, error);
|
||||
} finally {
|
||||
tcpClient.closeSocket(); // Ensure the socket is closed
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Wait for AES key to be set, send the file, and wait for the response
|
||||
private async waitForAesKeyAndSendFile(tcpClient: TcpClient, operationCode: string, metaInfo: { [key: string]: any }, fileContent: Buffer, checkInterval: number = 500, timeout: number = 10000): Promise<boolean> {
|
||||
const startTime = Date.now();
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const intervalId = setInterval(async () => {
|
||||
const elapsedTime = Date.now() - startTime;
|
||||
|
||||
// Check if AES key is set, if timeout occurs, reject
|
||||
if (!tcpClient.isAesKeySet()) {
|
||||
if (elapsedTime > timeout) {
|
||||
clearInterval(intervalId);
|
||||
console.error('Timeout waiting for AES key.');
|
||||
reject(new Error('Timeout waiting for AES key.'));
|
||||
}
|
||||
return; // Continue waiting for AES key
|
||||
}
|
||||
|
||||
// AES key is set, send the file
|
||||
clearInterval(intervalId);
|
||||
|
||||
try {
|
||||
const success = await tcpClient.sendMessage(operationCode, metaInfo, fileContent);
|
||||
if (!success) {
|
||||
reject(new Error('Failed to send the file content.'));
|
||||
return;
|
||||
}
|
||||
|
||||
// Wait for a response after sending the message
|
||||
const responseReceived = await this.waitForMessageResponse(tcpClient, timeout);
|
||||
if (!responseReceived) {
|
||||
reject(new Error('Timeout waiting for the message response.'));
|
||||
return;
|
||||
}
|
||||
|
||||
resolve(true); // Everything went fine
|
||||
} catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}, checkInterval); // Check for AES key every `checkInterval`
|
||||
});
|
||||
}
|
||||
|
||||
// Wait for AES key to be set, send the clear department message, and wait for the response
|
||||
private async waitForAesKeyAndSendClearDepartment(tcpClient: TcpClient, operationCode: string, checkInterval: number = 500, timeout: number = 10000): Promise<boolean> {
|
||||
const startTime = Date.now();
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const intervalId = setInterval(async () => {
|
||||
const elapsedTime = Date.now() - startTime;
|
||||
|
||||
// Check if AES key is set, if timeout occurs, reject
|
||||
if (!tcpClient.isAesKeySet()) {
|
||||
if (elapsedTime > timeout) {
|
||||
clearInterval(intervalId);
|
||||
console.error('Timeout waiting for AES key.');
|
||||
reject(new Error('Timeout waiting for AES key.'));
|
||||
}
|
||||
return; // Continue waiting for AES key
|
||||
}
|
||||
|
||||
// AES key is set, send the clear department message
|
||||
clearInterval(intervalId);
|
||||
|
||||
try {
|
||||
const success = await tcpClient.sendMessage(operationCode, {});
|
||||
if (!success) {
|
||||
reject(new Error('Failed to send the clear department operation.'));
|
||||
return;
|
||||
}
|
||||
|
||||
// Wait for a response after sending the message
|
||||
const responseReceived = await this.waitForMessageResponse(tcpClient, timeout);
|
||||
if (!responseReceived) {
|
||||
reject(new Error('Timeout waiting for the message response.'));
|
||||
return;
|
||||
}
|
||||
|
||||
resolve(true); // Everything went fine
|
||||
} catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}, checkInterval); // Check for AES key every `checkInterval`
|
||||
});
|
||||
}
|
||||
|
||||
// Wait for the response from the TCP client
|
||||
private waitForMessageResponse(tcpClient: TcpClient, timeout: number = 10000): Promise<boolean> {
|
||||
private async waitForResponse(): Promise<ParsedMessage | null> {
|
||||
return new Promise((resolve) => {
|
||||
const startTime = Date.now();
|
||||
const intervalId = setInterval(() => {
|
||||
const response = tcpClient.getLastResult();
|
||||
const elapsedTime = Date.now() - startTime;
|
||||
|
||||
if (response?.operationCode === operationCodes.OK) {
|
||||
clearInterval(intervalId);
|
||||
resolve(true); // Message successfully received
|
||||
} else if (elapsedTime > timeout) {
|
||||
clearInterval(intervalId);
|
||||
resolve(false); // No response after timeout
|
||||
const idResponseCheck = setInterval(async () => {
|
||||
if (!this.tcpCommunicator) return null;
|
||||
if (this.tcpCommunicator.hasResponseArrived()) {
|
||||
clearInterval(idResponseCheck);
|
||||
resolve(this.tcpCommunicator.getLastResult()); // Resolve the response or null if not available
|
||||
}
|
||||
}, 100); // Check every 100ms
|
||||
}, 100); // Check every 100 milliseconds if the response has arrived
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import { QueueManager } from './queue_manager'; // Assume the QueueManager is in this path
|
||||
import { TcpClient } from '../network/tcp/tcp_client'; // Import your TcpClient class
|
||||
import { operationCodes } from '../network/operation_codes';
|
||||
import {QueueManager} from './queue_manager';
|
||||
import {TcpCommunicator} from "./tcp_communicator"; // Updated to use TcpCommunicator
|
||||
import {operationCodes} from '../network/operation_codes';
|
||||
import fs from "fs";
|
||||
import path from "path";
|
||||
import {compareFnFileItemTask, FileItemTask} from "../interfaces/file_item_task";
|
||||
import {ParsedMessage} from "../network/message_handler";
|
||||
|
||||
interface FileSendTask {
|
||||
ip: string;
|
||||
@@ -14,45 +15,56 @@ interface FileSendTask {
|
||||
export class FileSharer {
|
||||
private queueManager: QueueManager<FileSendTask>;
|
||||
private readonly clientPort: number;
|
||||
private isBusy: boolean;
|
||||
private tcpCommunicator: TcpCommunicator | null = null;
|
||||
|
||||
constructor(queueFilePath: string, clientPort: number) {
|
||||
|
||||
|
||||
this.queueManager = new QueueManager<FileItemTask>(queueFilePath, compareFnFileItemTask);
|
||||
this.clientPort = clientPort;
|
||||
this.isBusy = false; // Initialize the busy flag
|
||||
}
|
||||
|
||||
// Start processing the file queue
|
||||
async start(): Promise<void> {
|
||||
setInterval(async () => {
|
||||
await this.processQueue(); // Process the queue at regular intervals
|
||||
if (!this.isBusy) { // Check if the queue is already being processed
|
||||
await this.processQueue(); // Process the queue at regular intervals
|
||||
}
|
||||
}, 10000); // 10 seconds interval
|
||||
}
|
||||
|
||||
// Method to process the queue
|
||||
private async processQueue(): Promise<void> {
|
||||
if (this.isBusy) {
|
||||
console.log("Queue is already being processed. Skipping this interval.");
|
||||
return;
|
||||
}
|
||||
|
||||
this.isBusy = true; // Set busy flag to true before starting
|
||||
|
||||
while (!this.queueManager.isEmpty()) {
|
||||
const task = this.queueManager.peek();
|
||||
|
||||
if (task) {
|
||||
console.log(task);
|
||||
const success = await this.sendFile(task);
|
||||
|
||||
if (!success) {
|
||||
console.error(`Failed to send file: ${task.path} to IP: ${task.ip}. Re-adding to queue.`);
|
||||
this.queueManager.dequeue();
|
||||
this.queueManager.enqueue(task); // Re-add to queue if failed
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
console.log(`File sent successfully: ${task.path} to IP: ${task.ip}.`);
|
||||
this.queueManager.dequeue();
|
||||
}
|
||||
}
|
||||
}
|
||||
this.isBusy = false; // Reset busy flag after the queue is processed
|
||||
}
|
||||
|
||||
// Method to send the file to a specific IP using the TcpClient
|
||||
// Method to send the file to a specific IP using TcpCommunicator
|
||||
private async sendFile(task: FileSendTask): Promise<boolean> {
|
||||
const { ip, path: filePath, userName } = task;
|
||||
const {ip, path: filePath, userName} = task;
|
||||
|
||||
// Ensure the file exists before attempting to send
|
||||
if (!fs.existsSync(filePath)) {
|
||||
@@ -63,7 +75,7 @@ export class FileSharer {
|
||||
// Read the file contents
|
||||
const fileContent = fs.readFileSync(filePath);
|
||||
|
||||
// Extract the file name from the file path using path.basename (handles both Windows and Unix)
|
||||
// Extract the file name from the file path using path.basename
|
||||
const fileName = path.basename(filePath);
|
||||
|
||||
const metaInfo = {
|
||||
@@ -71,82 +83,36 @@ export class FileSharer {
|
||||
relativeFilePath: fileName, // Use the file name instead of the full path
|
||||
};
|
||||
|
||||
const tcpClient = new TcpClient(this.clientPort);
|
||||
tcpClient.openSocket(ip);
|
||||
this.tcpCommunicator = new TcpCommunicator(ip, this.clientPort);
|
||||
|
||||
// Wait for the AES key and then send the file
|
||||
try {
|
||||
const sendSuccess = await this.waitForAesKeyAndSendFile(tcpClient, operationCodes.SHARE_FILE, metaInfo, fileContent, task);
|
||||
tcpClient.closeSocket();
|
||||
|
||||
return sendSuccess;
|
||||
} catch (error) {
|
||||
console.error(`Error sending file: ${filePath} to IP: ${ip}. Error: ${error}`);
|
||||
tcpClient.closeSocket();
|
||||
if (!await this.tcpCommunicator.connect()) {
|
||||
console.error(`Failed to connect to IP: ${ip}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
console.log(`Sending file: ${filePath} to IP: ${ip}`);
|
||||
|
||||
if (!await this.tcpCommunicator.sendMessage(operationCodes.SHARE_FILE, metaInfo, fileContent)) return false;
|
||||
|
||||
const response = await this.waitForResponse();
|
||||
if (!response || response.operationCode !== operationCodes.OK) {
|
||||
console.error(`Failed to send file: ${filePath} to IP: ${ip}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
await this.tcpCommunicator.disconnect();
|
||||
return true;
|
||||
}
|
||||
|
||||
// Wait for AES key to be set and send the file, handling the response
|
||||
private async waitForAesKeyAndSendFile(tcpClient: TcpClient, operationCode: string, metaInfo: { [key: string]: any }, fileContent: Buffer, task: FileSendTask, checkInterval: number = 500, timeout: number = 10000): Promise<boolean> {
|
||||
const startTime = Date.now();
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const intervalId = setInterval(async () => {
|
||||
const elapsedTime = Date.now() - startTime;
|
||||
|
||||
// Check if AES key is set, if timeout occurs, reject
|
||||
if (!tcpClient.isAesKeySet()) {
|
||||
if (elapsedTime > timeout) {
|
||||
clearInterval(intervalId);
|
||||
console.error('Timeout waiting for AES key.');
|
||||
|
||||
reject(new Error('Timeout waiting for AES key.'));
|
||||
}
|
||||
return; // Continue waiting for AES key
|
||||
}
|
||||
|
||||
// AES key is set, send the message
|
||||
clearInterval(intervalId);
|
||||
|
||||
try {
|
||||
const success = await tcpClient.sendMessage(operationCode, metaInfo, fileContent);
|
||||
if (!success) {
|
||||
reject(new Error('Failed to send the file content.'));
|
||||
return;
|
||||
}
|
||||
|
||||
// Wait for a response after sending the message
|
||||
const responseReceived = await this.waitForMessageResponse(tcpClient, timeout);
|
||||
if (!responseReceived) {
|
||||
reject(new Error('Timeout waiting for the message response.'));
|
||||
return;
|
||||
}
|
||||
|
||||
resolve(true); // Everything went fine
|
||||
} catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}, checkInterval); // Check for AES key every `checkInterval`
|
||||
});
|
||||
}
|
||||
|
||||
// Method to wait for the response from the TCP client
|
||||
private waitForMessageResponse(tcpClient: TcpClient, timeout: number = 10000): Promise<boolean> {
|
||||
private async waitForResponse(): Promise<ParsedMessage | null> {
|
||||
return new Promise((resolve) => {
|
||||
const startTime = Date.now();
|
||||
const intervalId = setInterval(() => {
|
||||
const response = tcpClient.getLastResult();
|
||||
const elapsedTime = Date.now() - startTime;
|
||||
|
||||
if (response?.operationCode === operationCodes.OK) {
|
||||
clearInterval(intervalId);
|
||||
resolve(true); // Message successfully received
|
||||
} else if (elapsedTime > timeout) {
|
||||
clearInterval(intervalId);
|
||||
resolve(false); // No response after timeout
|
||||
const idResponseCheck = setInterval(async () => {
|
||||
if (!this.tcpCommunicator) return null;
|
||||
if (this.tcpCommunicator.hasResponseArrived()) {
|
||||
clearInterval(idResponseCheck);
|
||||
resolve(this.tcpCommunicator.getLastResult()); // Resolve the response or null if not available
|
||||
}
|
||||
}, 100); // Check every 100ms
|
||||
}, 100); // Check every 100 milliseconds if the response has arrived
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
import { JsonManager } from './json_manager'; // Assuming you have this class for managing user/memory
|
||||
import { WindowManager } from './window_manager'; // For managing app navigation
|
||||
import { UdpClient } from '../network/udp/udp_client';
|
||||
|
||||
export class TaskScheduler {
|
||||
private applicationInfo: JsonManager;
|
||||
private windowManager: WindowManager;
|
||||
private appStarted: boolean = false;
|
||||
private intervalIds: NodeJS.Timeout[] = []; // Array to store interval IDs
|
||||
|
||||
constructor(applicationInfo: JsonManager, windowManager: WindowManager) {
|
||||
this.applicationInfo = applicationInfo;
|
||||
this.windowManager = windowManager;
|
||||
}
|
||||
|
||||
// Function to schedule the UC check task with dynamic UDP client creation
|
||||
public startUCCheck(udpPort: number, okPage: string, errorPage: string, interval: number = 30000) {
|
||||
const intervalId = setInterval(async () => {
|
||||
try {
|
||||
const udpClient = new UdpClient(udpPort); // Create UdpClient with the provided port
|
||||
const aliveClients = await udpClient.getAliveClients();
|
||||
const storedIp = await this.applicationInfo.readValue('serverIp');
|
||||
const foundClient = aliveClients.length > 0;
|
||||
|
||||
if (foundClient) {
|
||||
const ipAddress = aliveClients[0]; // Just using the first alive client
|
||||
|
||||
if (!storedIp || storedIp !== ipAddress) {
|
||||
await this.applicationInfo.writeValue('serverIp', ipAddress);
|
||||
if (!this.appStarted) {
|
||||
await this.windowManager.changeContent(okPage);
|
||||
}
|
||||
this.appStarted = true;
|
||||
} else if (!this.appStarted) {
|
||||
await this.windowManager.changeContent(okPage);
|
||||
this.appStarted = true;
|
||||
}
|
||||
} else {
|
||||
await this.windowManager.changeContent(errorPage);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Error checking UC:', err);
|
||||
await this.windowManager.changeContent(errorPage);
|
||||
}
|
||||
}, interval);
|
||||
|
||||
this.intervalIds.push(intervalId);
|
||||
}
|
||||
|
||||
// Function to schedule the IP lookup task, storing the active addresses in memory
|
||||
public async startUserIPLookup(udpPort: number, interval: number = 30000) {
|
||||
const serverIp = await this.applicationInfo.readValue('serverIp'); // Ensure it's awaited if it's an async function
|
||||
const intervalId = setInterval(async () => {
|
||||
try {
|
||||
const udpClient = new UdpClient(udpPort); // Create a UDP client with the provided port
|
||||
const activeIPs = await udpClient.getAliveClients(); // Get the list of active IPs
|
||||
|
||||
// Filter out the serverIp from the list of active clients
|
||||
const filteredIPs = activeIPs.filter(ip => ip !== serverIp);
|
||||
|
||||
// Save the filtered IPs to 'users_ip'
|
||||
await this.applicationInfo.writeValue('users_ip', filteredIPs);
|
||||
} catch (err) {
|
||||
console.error('Error during user IP lookup:', err);
|
||||
}
|
||||
}, interval);
|
||||
|
||||
this.intervalIds.push(intervalId); // Store the interval ID
|
||||
}
|
||||
|
||||
// Function to stop all tasks (UC check, user worker, etc.)
|
||||
public stopAllTasks() {
|
||||
this.intervalIds.forEach(clearInterval); // Clear all intervals
|
||||
this.intervalIds = []; // Reset the array
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ import { JsonManager } from "./json_manager";
|
||||
import { MemoryManager } from "./memory_manager";
|
||||
import { operationCodes } from "../network/operation_codes";
|
||||
import { TcpCommunicator } from "./tcp_communicator";
|
||||
import {ParsedMessage} from "../network/message_handler";
|
||||
|
||||
export class UsersInfoFetcher {
|
||||
private applicationInfo: JsonManager;
|
||||
@@ -24,7 +25,7 @@ export class UsersInfoFetcher {
|
||||
async start(): Promise<void> {
|
||||
setInterval(async () => {
|
||||
await this.initialize(); // Re-run every minute
|
||||
}, 60000); // 1 minute interval
|
||||
}, 5000); // 1 minute interval
|
||||
}
|
||||
|
||||
// Initialize and fetch user IPs and process users info
|
||||
@@ -57,16 +58,19 @@ export class UsersInfoFetcher {
|
||||
continue;
|
||||
}
|
||||
|
||||
if(!await this.tcpCommunicator?.sendMessage(operationCodes.GET_USER_INFORMATION)){
|
||||
await this.tcpCommunicator.disconnect();
|
||||
continue
|
||||
}
|
||||
|
||||
// Wait for the response for 10 seconds
|
||||
const response = await this.waitForResponse();
|
||||
console.log(response);
|
||||
|
||||
// If a response is received and is successful, append it to usersInfo
|
||||
if (response && response.metaInfo) {
|
||||
console.log(`Response received from ${ip}:`, response);
|
||||
usersInfo.push({
|
||||
ip: ip,
|
||||
user_info: response.metaInfo // Push the IP and user_info object into the array
|
||||
user_info: response.metaInfo
|
||||
});
|
||||
}
|
||||
|
||||
@@ -76,31 +80,15 @@ export class UsersInfoFetcher {
|
||||
await this.updateActiveUsers(usersInfo); // Update active users information in the memory
|
||||
}
|
||||
|
||||
// Send the message once and wait for the response for a specific timeout
|
||||
private async waitForResponse(timeout: number = 10000): Promise<any> {
|
||||
// Send the message once
|
||||
const status = await this.tcpCommunicator?.sendMessage(operationCodes.GET_USER_INFORMATION);
|
||||
if (!status) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Wait for the response until the timeout
|
||||
private async waitForResponse(): Promise<ParsedMessage | null> {
|
||||
return new Promise((resolve) => {
|
||||
const startTime = Date.now();
|
||||
|
||||
const checkResponseInterval = setInterval(async () => {
|
||||
// Check if the message has been received
|
||||
if (this.tcpCommunicator?.hasResponseArrived()) {
|
||||
clearInterval(checkResponseInterval);
|
||||
resolve(this.tcpCommunicator?.getLastResult()); // Return the response once it arrives
|
||||
const idResponseCheck = setInterval(async () => {
|
||||
if (!this.tcpCommunicator) return null;
|
||||
if (this.tcpCommunicator.hasResponseArrived()) {
|
||||
clearInterval(idResponseCheck);
|
||||
resolve(this.tcpCommunicator.getLastResult()); // Resolve the response or null if not available
|
||||
}
|
||||
|
||||
// If the timeout is reached, stop checking and resolve with null
|
||||
if (Date.now() - startTime > timeout) {
|
||||
clearInterval(checkResponseInterval);
|
||||
resolve(null);
|
||||
}
|
||||
}, 100); // Check every 100ms if the response has arrived
|
||||
}, 100); // Check every 100 milliseconds if the response has arrived
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import path from 'path';
|
||||
export class WindowManager {
|
||||
private readonly mainWindow: BrowserWindow;
|
||||
private readonly pathToPagesDir: string;
|
||||
private announcementWindow: BrowserWindow | null = null;
|
||||
|
||||
constructor(mainWindow: BrowserWindow, pathToPagesDir: string) {
|
||||
this.pathToPagesDir = pathToPagesDir;
|
||||
@@ -89,4 +90,46 @@ export class WindowManager {
|
||||
return undefined; // Return undefined if no file was selected
|
||||
}
|
||||
}
|
||||
|
||||
// Method to display an announcement in a new window
|
||||
async displayAnnouncement(): Promise<void> {
|
||||
if (this.announcementWindow) {
|
||||
// If the window is already open, focus it
|
||||
this.announcementWindow.focus();
|
||||
return;
|
||||
}
|
||||
|
||||
const mainScreen = require('electron').screen.getPrimaryDisplay();
|
||||
const { width, height } = mainScreen.size;
|
||||
|
||||
// Initialize the announcement window
|
||||
this.announcementWindow = new BrowserWindow({
|
||||
width: width / 3,
|
||||
height: height / 2,
|
||||
resizable: false,
|
||||
title: 'Announcement',
|
||||
webPreferences: {
|
||||
preload: path.join(__dirname, '..', 'main', 'preload.js'),
|
||||
contextIsolation: true,
|
||||
nodeIntegration: false,
|
||||
},
|
||||
});
|
||||
|
||||
this.announcementWindow.removeMenu();
|
||||
|
||||
// Load the announcement page
|
||||
const announcementPath = path.join(this.pathToPagesDir, 'announcement.html');
|
||||
await this.announcementWindow.loadFile(announcementPath);
|
||||
|
||||
// Handle window close
|
||||
this.announcementWindow.on('closed', () => {
|
||||
this.announcementWindow = null; // Clean up the reference
|
||||
});
|
||||
}
|
||||
|
||||
async closeAnnouncementWindow(): Promise<void> {
|
||||
if (this.announcementWindow) {
|
||||
this.announcementWindow.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,10 +13,40 @@ export class WorkerManager {
|
||||
this.workers = []; // Initialize the array to store workers
|
||||
}
|
||||
|
||||
// Start the Connection Pool Worker
|
||||
async startWatchersWorker(memoryManagerPath: string, applicationInfoPath: string): Promise<void> {
|
||||
async startNetworkScannerWorker(udpPort: number, tcpPort: number, okPage: string, errorPage: string, databaseResetPage: string, userConfigPath: string, applicationInfoPath: string): Promise<void> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const worker = new Worker(path.join(this.pathToWorkerDir, 'watcher_worker.js'), {
|
||||
const worker = new Worker(path.join(this.pathToWorkerDir, 'network_scanner_worker.js'), {
|
||||
workerData: { udpPort, tcpPort, okPage, errorPage, databaseResetPage, userConfigPath, applicationInfoPath }, // Pass necessary data to the worker
|
||||
});
|
||||
|
||||
this.workers.push(worker); // Store the worker reference
|
||||
|
||||
worker.on('message', (data) => {
|
||||
console.log(data);
|
||||
if (data.type === 'changeContent') {
|
||||
this.windowManager.changeContent(data.page);
|
||||
}
|
||||
});
|
||||
|
||||
worker.on('error', (err) => {
|
||||
console.error('Network Scanner Worker error:', err);
|
||||
worker.terminate();
|
||||
this.removeWorker(worker);
|
||||
reject(err); // Reject the promise if there's an error
|
||||
});
|
||||
|
||||
worker.on('exit', (code) => {
|
||||
console.log(`Network Scanner Worker exited with code ${code}`);
|
||||
this.removeWorker(worker); // Remove worker reference when it exits
|
||||
resolve(); // Resolve when the worker exits cleanly
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// Start the Connection Pool Worker
|
||||
async startDirectoriesWatchersWorker(memoryManagerPath: string, applicationInfoPath: string): Promise<void> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const worker = new Worker(path.join(this.pathToWorkerDir, 'directories_watcher_worker.js'), {
|
||||
workerData: { memoryManagerPath, applicationInfoPath }, // Pass the port to the worker
|
||||
});
|
||||
|
||||
@@ -110,17 +140,18 @@ export class WorkerManager {
|
||||
clientPort: number,
|
||||
destinationPath: string
|
||||
): Promise<void> {
|
||||
return new Promise((resolve, reject) => {
|
||||
return new Promise(async (resolve, reject) => {
|
||||
const worker = new Worker(path.join(this.pathToWorkerDir, 'backup_retrieval_worker.js'), {
|
||||
workerData: { userConfigPath, applicationInfoPath, clientPort, destinationPath }, // Pass parameters to the worker
|
||||
});
|
||||
|
||||
this.workers.push(worker); // Store the worker reference
|
||||
|
||||
worker.on('message', (data) => {
|
||||
worker.on('message', async (data) => {
|
||||
console.log('Backup Retrieval Worker message:', data);
|
||||
this.windowManager.changeContent('main_menu');
|
||||
this.windowManager.showAlert(data.message);
|
||||
await new Promise((resolve) => setTimeout(resolve, 3000)); // Wait for 1 second
|
||||
await this.windowManager.changeContent('main_menu');
|
||||
await this.windowManager.showAlert(data.message);
|
||||
});
|
||||
|
||||
worker.on('error', (err) => {
|
||||
|
||||
+62
-16
@@ -7,20 +7,20 @@ import {WorkerManager} from "../helpers/worker_manager";
|
||||
import {DirectoryWatcher} from "../helpers/directory_watcher";
|
||||
import {QueueManager} from "../helpers/queue_manager";
|
||||
import {compareFnFileItemTask, FileItemTask} from "../interfaces/file_item_task";
|
||||
import {TaskScheduler} from "../helpers/task_scheduler";
|
||||
import {WindowManager} from "../helpers/window_manager";
|
||||
import {JsonManager} from "../helpers/json_manager";
|
||||
import {MemoryManager} from "../helpers/memory_manager";
|
||||
import {TcpCommunicator} from "../helpers/tcp_communicator";
|
||||
|
||||
import {operationCodes} from "../network/operation_codes";
|
||||
import os from "os";
|
||||
|
||||
// Load environment variables
|
||||
dotenv.config({ path: path.join(__dirname, '..', '..', '.env') });
|
||||
|
||||
const UDP_PORT = process.env.UDP_PORT ? parseInt(process.env.UDP_PORT) : 41233;
|
||||
const TCP_PORT = process.env.TCP_PORT ? parseInt(process.env.TCP_PORT) : 41234;
|
||||
const HOST = process.env.HOST || '0.0.0.0';
|
||||
const HOST = getLocalIp();
|
||||
|
||||
let mainWindow: BrowserWindow | null = null;
|
||||
let windowManager: WindowManager | null = null;
|
||||
@@ -29,10 +29,11 @@ let userConfig: JsonManager | null = null;
|
||||
let applicationInfo: JsonManager | null = null;
|
||||
let memoryManager: MemoryManager | null = null;
|
||||
let workerManager: WorkerManager | null = null;
|
||||
let taskScheduler: TaskScheduler | null = null;
|
||||
let backupDirectoryManager: DirectoryWatcher | null = null;
|
||||
let departmentShareManager: DirectoryWatcher | null = null;
|
||||
let sendFileQueue: QueueManager<FileItemTask> | null = null;
|
||||
let announcementWatcher: NodeJS.Timeout | null = null;
|
||||
let resetApplicationWatcher: NodeJS.Timeout | null = null;
|
||||
|
||||
const pathToPagesDir = path.join(__dirname, '..', '..', 'render', 'html');
|
||||
const pathToWorkerDir = path.join(__dirname, '..', 'workers');
|
||||
@@ -62,11 +63,6 @@ async function cleanupAndExit() {
|
||||
departmentShareManager.closeWatcher(); // Add this method to DirectoryWatcher to close the watcher
|
||||
}
|
||||
|
||||
if(taskScheduler){
|
||||
console.log('Stopping all tasks...');
|
||||
taskScheduler.stopAllTasks()
|
||||
}
|
||||
|
||||
if(workerManager){
|
||||
console.log('Terminating all workers...');
|
||||
workerManager.closeAllWorkers()
|
||||
@@ -86,6 +82,43 @@ async function ensureDirectoryExists(dirPath: string): Promise<void> {
|
||||
}
|
||||
}
|
||||
|
||||
function getLocalIp() {
|
||||
const interfaces = os.networkInterfaces();
|
||||
for (let interfaceName in interfaces) {
|
||||
const addresses = interfaces[interfaceName];
|
||||
if(!addresses) continue;
|
||||
for (let address of addresses) {
|
||||
// Filter for IPv4 and ignore internal (127.0.0.1) addresses
|
||||
if (address.family === 'IPv4' && !address.internal) {
|
||||
return address.address;
|
||||
}
|
||||
}
|
||||
}
|
||||
return ''; // Fallback if no IP is found
|
||||
}
|
||||
|
||||
function startAnnouncementWatcher() {
|
||||
const checkInterval = 5000; // Check every 5 seconds
|
||||
|
||||
announcementWatcher = setInterval(async () => {
|
||||
if(!windowManager || !applicationInfo) return;
|
||||
const announcement = await applicationInfo.readValue('announcement');
|
||||
|
||||
if (announcement) await windowManager.displayAnnouncement();
|
||||
}, checkInterval);
|
||||
}
|
||||
|
||||
function startResetApplicationWatcher() {
|
||||
const checkInterval = 5000; // Check every 5 seconds
|
||||
|
||||
resetApplicationWatcher = setInterval(async () => {
|
||||
if(!applicationInfo || !windowManager) return;
|
||||
const resetApplicationPreferences = await applicationInfo.readValue('reset_application_preferences');
|
||||
|
||||
if (resetApplicationPreferences) await windowManager.changeContent('reset-database');
|
||||
}, checkInterval);
|
||||
}
|
||||
|
||||
app.whenReady().then(async () => {
|
||||
const title = 'Application';
|
||||
const mainScreen = require('electron').screen.getPrimaryDisplay();
|
||||
@@ -103,6 +136,8 @@ app.whenReady().then(async () => {
|
||||
},
|
||||
});
|
||||
|
||||
mainWindow.removeMenu();
|
||||
|
||||
await ensureDirectoryExists(pathToJsons);
|
||||
await ensureDirectoryExists(pathToClientsBackups);
|
||||
|
||||
@@ -112,14 +147,20 @@ app.whenReady().then(async () => {
|
||||
memoryManager = new MemoryManager(path.join(pathToJsons, 'memory.json'));
|
||||
sendFileQueue = new QueueManager(path.join(pathToJsons, 'sendFileTasks.json'), compareFnFileItemTask);
|
||||
|
||||
taskScheduler = new TaskScheduler(applicationInfo, windowManager);
|
||||
workerManager = new WorkerManager(pathToWorkerDir, windowManager);
|
||||
|
||||
await userConfig.writeValue('app_type', 'client');
|
||||
await applicationInfo.writeValue('users_ip', []);
|
||||
await applicationInfo.writeValue('serverIp', '');
|
||||
await applicationInfo.writeValue('announcement', '');
|
||||
await applicationInfo.writeValue('reset_application_preferences', false);
|
||||
await memoryManager.resetFile();
|
||||
|
||||
workerManager.startWatchersWorker(path.join(pathToJsons, 'memory.json'), path.join(pathToJsons, 'application.json'));
|
||||
startAnnouncementWatcher();
|
||||
startResetApplicationWatcher();
|
||||
|
||||
workerManager.startNetworkScannerWorker(UDP_PORT, TCP_PORT, 'login', 'uc_not_found', 'reset_database', path.join(pathToJsons, 'userConfig.json'), path.join(pathToJsons, 'application.json'));
|
||||
workerManager.startDirectoriesWatchersWorker(path.join(pathToJsons, 'memory.json'), path.join(pathToJsons, 'application.json'));
|
||||
workerManager.startServersWorker(HOST, UDP_PORT, TCP_PORT);
|
||||
workerManager.startResourceCoordinatorWorker(
|
||||
path.join(pathToJsons, 'userConfig.json'),
|
||||
@@ -129,10 +170,6 @@ app.whenReady().then(async () => {
|
||||
TCP_PORT
|
||||
);
|
||||
|
||||
|
||||
taskScheduler.startUCCheck(UDP_PORT, 'login', 'uc_not_found');
|
||||
taskScheduler.startUserIPLookup(UDP_PORT);
|
||||
|
||||
registerIPCHandlers();
|
||||
|
||||
await windowManager.changeContent('welcome');
|
||||
@@ -251,7 +288,11 @@ function registerIPCHandlers() {
|
||||
|
||||
ipcMain.handle('reset-application-json-files', async () => {
|
||||
if (!applicationInfo) throw new Error('ApplicationInfo is not initialized.');
|
||||
return applicationInfo.resetFile();
|
||||
const serverIp = await applicationInfo.readValue('serverIp');
|
||||
await applicationInfo.resetFile();
|
||||
if(serverIp) {
|
||||
await applicationInfo.writeValue('serverIp', serverIp);
|
||||
}
|
||||
});
|
||||
|
||||
ipcMain.handle('remove-application-json-files-key', async (_event: IpcMainInvokeEvent, key: string) => {
|
||||
@@ -280,13 +321,18 @@ function registerIPCHandlers() {
|
||||
return memoryManager.removeMetaInformation(id);
|
||||
});
|
||||
|
||||
ipcMain.handle('memory-reset', async () => {
|
||||
if (!memoryManager) throw new Error('MemoryManager is not initialized.');
|
||||
return memoryManager.resetFile();
|
||||
});
|
||||
|
||||
// Queue IPC Handlers
|
||||
ipcMain.handle('add-task-to-send-file-queue', async (event: IpcMainInvokeEvent, task: FileItemTask) => {
|
||||
if (!sendFileQueue) throw new Error('SendFileQueue is not initialized.');
|
||||
sendFileQueue.enqueue(task);
|
||||
});
|
||||
|
||||
// BackupRetrievalWorker IPC Handler
|
||||
// Workers IPC Handlers
|
||||
ipcMain.handle('start-backup-retrieval', async (_event: IpcMainInvokeEvent, destinationPath: string) => {
|
||||
if (!workerManager) throw new Error('WorkerManager is not initialized.');
|
||||
return workerManager.startBackupRetrievalWorker(
|
||||
|
||||
@@ -27,6 +27,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
||||
readMemoryEntry: (id: string): Promise<any> => ipcRenderer.invoke('memory-read-entry', id),
|
||||
updateMemoryEntry: (id: string, data: any): Promise<boolean> => ipcRenderer.invoke('memory-update-entry', id, data),
|
||||
removeMemoryEntry: (id: string): Promise<boolean> => ipcRenderer.invoke('memory-remove-entry', id),
|
||||
resetMemory: (): Promise<boolean> => ipcRenderer.invoke('memory-reset'),
|
||||
|
||||
// UI methods
|
||||
showAlert: (message: string): Promise<void> => ipcRenderer.invoke('show-alert', message),
|
||||
@@ -38,6 +39,6 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
||||
// Queue methods
|
||||
addTaskToSendFileQueue: (task: FileItemTask): Promise<void> => ipcRenderer.invoke('add-task-to-send-file-queue', task),
|
||||
|
||||
// BackupRetrievalWorker
|
||||
startBackupRetrieval: (destinationPath: string): Promise<void> => ipcRenderer.invoke('start-backup-retrieval', destinationPath)
|
||||
// Workers
|
||||
startBackupRetrieval: (destinationPath: string): Promise<void> => ipcRenderer.invoke('start-backup-retrieval', destinationPath),
|
||||
});
|
||||
|
||||
@@ -25,6 +25,7 @@ export let operationCodes = {
|
||||
|
||||
GET_USERS: 'GET_USERS',
|
||||
FIND_KEY_BY_USER_ID: 'FIND_KEY_BY_USER_ID',
|
||||
SEND_ANNOUNCEMENT: 'SEND_ANNOUNCEMENT',
|
||||
|
||||
GET_USER_INFORMATION: 'GET_USER_INFORMATION',
|
||||
CLEAR_BACKUP: 'CLEAR_BACKUP',
|
||||
|
||||
@@ -12,19 +12,16 @@ export abstract class OperationBase implements OperationPlugin {
|
||||
|
||||
// Default handler for OK operation
|
||||
public static handleOk(parsedMessage: ParsedMessage): ParsedMessage {
|
||||
console.log('OK operation received');
|
||||
return parsedMessage; // Typically, you would just acknowledge with OK, returning as-is
|
||||
}
|
||||
|
||||
// Default handler for ERR operation
|
||||
public static handleErr(parsedMessage: ParsedMessage): ParsedMessage {
|
||||
console.log('ERR operation received: ', parsedMessage.metaInfo?.message || 'No error details provided');
|
||||
return parsedMessage; // Typically, you would log the error and return
|
||||
}
|
||||
|
||||
// Default handler for END operation
|
||||
public static handleEnd(parsedMessage: ParsedMessage): ParsedMessage {
|
||||
console.log('END operation received');
|
||||
return {
|
||||
operationCode: OperationBase.operationCodes.END,
|
||||
metaInfo: { message: 'Connection ended.' },
|
||||
|
||||
@@ -10,7 +10,9 @@ const LOCK_FILE_EXTENSION = '.lock';
|
||||
export class UserToUserOperations extends OperationBase {
|
||||
public static readonly operationCodes = {
|
||||
...OperationBase.operationCodes, // Inherit common operation codes (OK, ERR, END)
|
||||
SEND_ANNOUNCEMENT: 'SEND_ANNOUNCEMENT',
|
||||
GET_USER_INFORMATION: 'GET_USER_INFORMATION',
|
||||
RESET_DATABASE: 'RESET_DATABASE',
|
||||
BACKUP_FILE: 'BACKUP_FILE',
|
||||
CLEAR_BACKUP: 'CLEAR_BACKUP',
|
||||
SHARE_FILE: 'SHARE_FILE',
|
||||
@@ -32,7 +34,7 @@ export class UserToUserOperations extends OperationBase {
|
||||
|
||||
// Read JSON file with a lock mechanism
|
||||
static readJsonSync(filePath: string): any {
|
||||
const lockFilePath = `${filePath}${LOCK_FILE_EXTENSION}`;
|
||||
const lockFilePath = `${filePath}.${LOCK_FILE_EXTENSION}`;
|
||||
const absolutePath = path.resolve(filePath);
|
||||
|
||||
try {
|
||||
@@ -65,6 +67,112 @@ export class UserToUserOperations extends OperationBase {
|
||||
}
|
||||
}
|
||||
|
||||
static writeJsonSync(filePath: string, data: any): boolean {
|
||||
const lockFilePath = `${filePath}.${LOCK_FILE_EXTENSION}`;
|
||||
const absolutePath = path.resolve(filePath);
|
||||
|
||||
try {
|
||||
// Loop until the lock file is removed by another process
|
||||
while (fs.existsSync(lockFilePath)) {
|
||||
console.log(`Waiting for lock file to be released: ${lockFilePath}`);
|
||||
UserToUserOperations.sleep(100); // Use the sleep utility to pause
|
||||
}
|
||||
|
||||
// Create lock file to signal this process is working on the file
|
||||
fs.writeFileSync(lockFilePath, ''); // Create the lock file
|
||||
|
||||
// Write the data to the JSON file
|
||||
fs.writeFileSync(absolutePath, JSON.stringify(data, null, 2), 'utf-8');
|
||||
console.log(`Data written successfully to ${absolutePath}`);
|
||||
|
||||
// Once processing is done, delete the lock file
|
||||
fs.unlinkSync(lockFilePath); // Remove the lock file
|
||||
|
||||
return true; // Indicate successful write
|
||||
} catch (error) {
|
||||
console.error(`Error writing JSON to ${filePath}:`, error);
|
||||
|
||||
// Ensure the lock file is removed even in case of an error
|
||||
if (fs.existsSync(lockFilePath)) {
|
||||
fs.unlinkSync(lockFilePath);
|
||||
}
|
||||
|
||||
return false; // Indicate failure
|
||||
}
|
||||
}
|
||||
|
||||
public static handleResetDatabase(parsedMessage: ParsedMessage): ParsedMessage {
|
||||
// Path to the application.json file
|
||||
const pathToApplicationJson = path.join(__dirname, '..', '..', 'json_files', 'application.json');
|
||||
|
||||
try {
|
||||
// Read the existing data from application.json
|
||||
const appData = UserToUserOperations.readJsonSync(pathToApplicationJson) || {};
|
||||
|
||||
// Update the reset_application_preferences field to true
|
||||
appData.reset_application_preferences = true;
|
||||
|
||||
// Write the updated data back to application.json
|
||||
const success = UserToUserOperations.writeJsonSync(pathToApplicationJson, appData);
|
||||
|
||||
if (success) {
|
||||
console.log(`Application preferences reset successfully.`);
|
||||
return {
|
||||
operationCode: UserToUserOperations.operationCodes.OK,
|
||||
metaInfo: { message: 'Application preferences reset successfully.' },
|
||||
};
|
||||
} else {
|
||||
throw new Error("Failed to write to application.json");
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error(`Error resetting application preferences: ${error.message}`);
|
||||
return {
|
||||
operationCode: UserToUserOperations.operationCodes.ERR,
|
||||
metaInfo: { message: `Error resetting application preferences: ${error.message}` },
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static handleSendAnnouncement(parsedMessage: ParsedMessage): ParsedMessage {
|
||||
// Ensure the message is available in metaInfo
|
||||
if (!parsedMessage.metaInfo || !parsedMessage.metaInfo.message) {
|
||||
return {
|
||||
operationCode: UserToUserOperations.operationCodes.ERR,
|
||||
metaInfo: { message: 'Missing announcement message in meta information.' },
|
||||
};
|
||||
}
|
||||
|
||||
const announcementMessage = parsedMessage.metaInfo.message;
|
||||
|
||||
// Path to the application.json file
|
||||
const pathToApplicationJson = path.join(__dirname, '..', '..', 'json_files', 'application.json');
|
||||
|
||||
try {
|
||||
// Read the existing data from application.json
|
||||
const appData = UserToUserOperations.readJsonSync(pathToApplicationJson) || {};
|
||||
|
||||
// Update the announcement field with the new message
|
||||
appData.announcement = announcementMessage;
|
||||
|
||||
// Write the updated data back to application.json
|
||||
fs.writeFileSync(pathToApplicationJson, JSON.stringify(appData, null, 2), 'utf-8');
|
||||
|
||||
console.log(`Announcement message saved successfully: ${announcementMessage}`);
|
||||
|
||||
return {
|
||||
operationCode: UserToUserOperations.operationCodes.OK,
|
||||
metaInfo: { message: 'Announcement message saved successfully.' },
|
||||
};
|
||||
} catch (error: any) {
|
||||
console.error(`Error saving announcement message: ${error.message}`);
|
||||
return {
|
||||
operationCode: UserToUserOperations.operationCodes.ERR,
|
||||
metaInfo: { message: `Error saving announcement message: ${error.message}` },
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// Handle user information retrieval
|
||||
public static handleGetUserInformation(parsedMessage: ParsedMessage): ParsedMessage {
|
||||
const pathToUserJson = path.join(__dirname, '..', '..', 'json_files', 'userConfig.json');
|
||||
@@ -484,6 +592,8 @@ export class UserToUserOperations extends OperationBase {
|
||||
// Register user-to-user operations with the OperationHandler
|
||||
public register(operationHandler: OperationHandler): void {
|
||||
// Register specific handlers for user-to-user operations
|
||||
operationHandler.registerHandler(UserToUserOperations.operationCodes.RESET_DATABASE, UserToUserOperations.handleResetDatabase);
|
||||
operationHandler.registerHandler(UserToUserOperations.operationCodes.SEND_ANNOUNCEMENT, UserToUserOperations.handleSendAnnouncement);
|
||||
operationHandler.registerHandler(UserToUserOperations.operationCodes.GET_USER_INFORMATION, UserToUserOperations.handleGetUserInformation);
|
||||
operationHandler.registerHandler(UserToUserOperations.operationCodes.BACKUP_FILE, UserToUserOperations.handleBackupFile);
|
||||
operationHandler.registerHandler(UserToUserOperations.operationCodes.CLEAR_BACKUP, UserToUserOperations.handleClearBackup);
|
||||
|
||||
@@ -137,8 +137,6 @@ export class TcpClientCommunicator extends SocketCommunicatorBase {
|
||||
messageToProcess = this.decryptWithRsa(incomingMessage);
|
||||
}
|
||||
|
||||
console.log(`\n\nComplete Message:\n${messageToProcess}\n\n`);
|
||||
|
||||
const result = this.operationHandler.handleOperation(messageToProcess);
|
||||
|
||||
if(result.operationCode === operationCodes.SET_AES_KEY){
|
||||
|
||||
@@ -80,9 +80,6 @@ export class TcpClient {
|
||||
|
||||
// Check if the message is received (based on if lastResult is available)
|
||||
isMessageReceived(): boolean {
|
||||
console.log('Is message received?');
|
||||
console.log(this.lastResult);
|
||||
console.log(this.lastResult !== null);
|
||||
return this.lastResult !== null;
|
||||
}
|
||||
|
||||
|
||||
@@ -23,16 +23,4 @@ const backupRetrievalWorker = new BackupRetrievalWorker(
|
||||
);
|
||||
|
||||
// Start the backup retrieval process
|
||||
backupRetrievalWorker.start()
|
||||
.then(() => {
|
||||
parentPort?.postMessage({
|
||||
success: true,
|
||||
message: 'Backup retrieval completed successfully.'
|
||||
});
|
||||
})
|
||||
.catch((error: any) => {
|
||||
parentPort?.postMessage({
|
||||
success: false,
|
||||
message: `Backup retrieval failed: ${error.message}`
|
||||
});
|
||||
});
|
||||
backupRetrievalWorker.start();
|
||||
|
||||
@@ -18,7 +18,7 @@ const backupIntervalId = setInterval(async () => {
|
||||
} else {
|
||||
console.log('Retrying BackupDirectoryManager initialization...');
|
||||
}
|
||||
}, 60000); // Check every 60 seconds
|
||||
}, 10000); // Check every 60 seconds
|
||||
|
||||
|
||||
// Department share manager check loop
|
||||
@@ -29,7 +29,7 @@ const departmentIntervalId = setInterval(async () => {
|
||||
} else {
|
||||
console.log('Retrying DepartmentShareManager initialization...');
|
||||
}
|
||||
}, 60000); // Check every 60 seconds
|
||||
}, 10000); // Check every 60 seconds
|
||||
|
||||
// Department share manager check loop
|
||||
const shareIntervalId = setInterval(async () => {
|
||||
@@ -39,5 +39,5 @@ const shareIntervalId = setInterval(async () => {
|
||||
} else {
|
||||
console.log('Retrying DepartmentShareManager initialization...');
|
||||
}
|
||||
}, 60000); // Check every 60 seconds
|
||||
}, 10000); // Check every 60 seconds
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
import {parentPort, workerData} from 'worker_threads';
|
||||
import {JsonManager} from '../helpers/json_manager';
|
||||
import {UdpClient} from '../network/udp/udp_client';
|
||||
import {TcpCommunicator} from "../helpers/tcp_communicator";
|
||||
import {operationCodes} from "../network/operation_codes";
|
||||
import {ParsedMessage} from "../network/message_handler";
|
||||
|
||||
// Define the structure of workerData
|
||||
interface WorkerData {
|
||||
udpPort: number;
|
||||
tcpPort: number
|
||||
okPage: string;
|
||||
errorPage: string;
|
||||
databaseResetPage: string;
|
||||
userConfigPath: string;
|
||||
applicationInfoPath: string;
|
||||
}
|
||||
|
||||
// Extract the data passed to the worker
|
||||
const {udpPort, tcpPort, okPage, errorPage, databaseResetPage, userConfigPath, applicationInfoPath}: WorkerData = workerData;
|
||||
|
||||
// Create a JsonManager instance for application info
|
||||
const applicationInfo = new JsonManager(applicationInfoPath);
|
||||
const userConfig = new JsonManager(userConfigPath);
|
||||
|
||||
let appStarted = false;
|
||||
let intervalIds: NodeJS.Timeout[] = []; // Store interval IDs for future clearing
|
||||
|
||||
// Flags to prevent overlapping executions
|
||||
let ucCheckBusy = false;
|
||||
let ipLookupBusy = false;
|
||||
let sendLoginBusy = false;
|
||||
|
||||
// Function to schedule the UC check task with dynamic UDP client creation
|
||||
function startUCCheck(udpPort: number, okPage: string, errorPage: string, interval: number = 5000): void {
|
||||
const intervalId = setInterval(async () => {
|
||||
if (ucCheckBusy) return; // If already running, skip this iteration
|
||||
ucCheckBusy = true; // Mark as busy
|
||||
|
||||
try {
|
||||
console.log('UC Check running...');
|
||||
const udpClient = new UdpClient(udpPort); // Create UdpClient with the provided port
|
||||
const aliveClients = await udpClient.getAliveClients();
|
||||
const storedIp = await applicationInfo.readValue('serverIp');
|
||||
const foundClient = aliveClients.length > 0;
|
||||
|
||||
if (foundClient) {
|
||||
const ipAddress = aliveClients[0]; // Just using the first alive client
|
||||
|
||||
if (!storedIp || storedIp !== ipAddress) {
|
||||
await applicationInfo.writeValue('serverIp', ipAddress);
|
||||
if (!appStarted) {
|
||||
parentPort?.postMessage({type: 'changeContent', page: okPage});
|
||||
}
|
||||
appStarted = true;
|
||||
} else if (!appStarted) {
|
||||
parentPort?.postMessage({type: 'changeContent', page: okPage});
|
||||
appStarted = true;
|
||||
}
|
||||
} else {
|
||||
parentPort?.postMessage({type: 'changeContent', page: errorPage});
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Error checking UC:', err);
|
||||
parentPort?.postMessage({type: 'changeContent', page: errorPage});
|
||||
} finally {
|
||||
ucCheckBusy = false; // Mark as not busy
|
||||
}
|
||||
}, interval);
|
||||
|
||||
intervalIds.push(intervalId);
|
||||
}
|
||||
|
||||
// Function to schedule the IP lookup task, storing the active addresses in memory
|
||||
function startUserIPLookup(udpPort: number, interval: number = 10000): void {
|
||||
const intervalId = setInterval(async () => {
|
||||
if (ipLookupBusy) return; // If already running, skip this iteration
|
||||
ipLookupBusy = true; // Mark as busy
|
||||
|
||||
try {
|
||||
console.log('IP Lookup running...');
|
||||
const serverIp = await applicationInfo.readValue('serverIp');
|
||||
const udpClient = new UdpClient(udpPort); // Create a UDP client with the provided port
|
||||
const activeIPs = await udpClient.getAliveClients(); // Get the list of active IPs
|
||||
|
||||
// Filter out the serverIp from the list of active clients
|
||||
const filteredIPs = activeIPs.filter(ip => ip !== serverIp);
|
||||
|
||||
// Save the filtered IPs to 'users_ip'
|
||||
await applicationInfo.writeValue('users_ip', filteredIPs);
|
||||
} catch (err) {
|
||||
console.error('Error during user IP lookup:', err);
|
||||
} finally {
|
||||
ipLookupBusy = false; // Mark as not busy
|
||||
}
|
||||
}, interval);
|
||||
|
||||
intervalIds.push(intervalId);
|
||||
}
|
||||
|
||||
function sendLoginRequest(databaseResetPage: string, interval: number = 5000): void {
|
||||
// Read user_info from userConfig for email and password
|
||||
const intervalId = setInterval(async () => {
|
||||
if (sendLoginBusy && !appStarted) return;
|
||||
sendLoginBusy = true;
|
||||
|
||||
const userInfo = await userConfig.readValue('user_info');
|
||||
if (!userInfo || !userInfo.email || !userInfo.password) {
|
||||
console.error("Email or password not found in user config.");
|
||||
return;
|
||||
}
|
||||
|
||||
const app_type = await userConfig.readValue('app_type');
|
||||
|
||||
const email = userInfo.email;
|
||||
const password = userInfo.password;
|
||||
|
||||
// Initialize the TCP communicator with the server IP from applicationInfo
|
||||
const serverIp = await applicationInfo.readValue('serverIp');
|
||||
if (!serverIp) {
|
||||
console.error("Server IP not found in application info.");
|
||||
return;
|
||||
}
|
||||
|
||||
const tcpCommunicator = new TcpCommunicator(serverIp, tcpPort);
|
||||
|
||||
if (!await tcpCommunicator.connect()) {
|
||||
console.error("Failed to connect to the server.");
|
||||
return;
|
||||
}
|
||||
|
||||
// Prepare the login request data
|
||||
const metaInfo = {email, password, app_type};
|
||||
if (!await tcpCommunicator.sendMessage(operationCodes.LOGIN, metaInfo)) {
|
||||
console.error("Failed to send login request.");
|
||||
await tcpCommunicator.disconnect();
|
||||
return;
|
||||
}
|
||||
|
||||
// Await and process the response
|
||||
const response = await waitForResponse(tcpCommunicator);
|
||||
if (response?.operationCode !== operationCodes.OK) {
|
||||
await userConfig.resetFile();
|
||||
await userConfig.writeValue('app_type', app_type);
|
||||
parentPort?.postMessage({type: 'changeContent', page: databaseResetPage});
|
||||
return;
|
||||
}
|
||||
}, interval)
|
||||
intervalIds.push(intervalId); // Store the interval ID for later clearing if needed
|
||||
}
|
||||
|
||||
// Helper function to wait for a response
|
||||
async function waitForResponse(tcpCommunicator: TcpCommunicator): Promise<ParsedMessage | null> {
|
||||
return new Promise((resolve) => {
|
||||
const checkInterval = setInterval(() => {
|
||||
if (tcpCommunicator.hasResponseArrived()) {
|
||||
clearInterval(checkInterval);
|
||||
resolve(tcpCommunicator.getLastResult());
|
||||
}
|
||||
}, 100);
|
||||
});
|
||||
}
|
||||
|
||||
// Start the UC Check and User IP Lookup tasks
|
||||
startUCCheck(udpPort, okPage, errorPage);
|
||||
startUserIPLookup(udpPort);
|
||||
sendLoginRequest(databaseResetPage);
|
||||
@@ -1,6 +1,6 @@
|
||||
import { workerData } from 'worker_threads';
|
||||
import { UsersInfoFetcher } from '../helpers/users_info_fetcher';
|
||||
import {BackupManager} from "../helpers/backup_manager";
|
||||
import {BackupRetrievalWorker} from "../helpers/backup_manager";
|
||||
import {FileSharer} from "../helpers/file_sharer";
|
||||
import {DepartmentSharer} from "../helpers/department_sharer";
|
||||
|
||||
@@ -16,7 +16,7 @@ usersInfoFetcher.start()
|
||||
console.error('Error starting Users Info Fetcher:', error);
|
||||
});
|
||||
|
||||
const backupManager = new BackupManager(
|
||||
const backupManager = new BackupRetrievalWorker(
|
||||
usersConfigPath,
|
||||
applicationInfoPath,
|
||||
memoryManagerPath,
|
||||
|
||||
Reference in New Issue
Block a user