diff --git a/HTML UI/.idea/.gitignore b/HTML UI/.idea/.gitignore new file mode 100644 index 0000000..b58b603 --- /dev/null +++ b/HTML UI/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/HTML UI/.idea/HTML UI.iml b/HTML UI/.idea/HTML UI.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/HTML UI/.idea/HTML UI.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/HTML UI/.idea/modules.xml b/HTML UI/.idea/modules.xml new file mode 100644 index 0000000..fecea43 --- /dev/null +++ b/HTML UI/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/HTML UI/.idea/vcs.xml b/HTML UI/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/HTML UI/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/HTML UI/USER/assets/background.png b/HTML UI/USER/assets/background.png new file mode 100644 index 0000000..fc8f921 Binary files /dev/null and b/HTML UI/USER/assets/background.png differ diff --git a/HTML UI/USER/assets/hard-disk.ico b/HTML UI/USER/assets/hard-disk.ico new file mode 100644 index 0000000..8b62600 Binary files /dev/null and b/HTML UI/USER/assets/hard-disk.ico differ diff --git a/HTML UI/USER/assets/hard-disk.png b/HTML UI/USER/assets/hard-disk.png new file mode 100644 index 0000000..bdf9cbf Binary files /dev/null and b/HTML UI/USER/assets/hard-disk.png differ diff --git a/HTML UI/USER/assets/loading.gif b/HTML UI/USER/assets/loading.gif new file mode 100644 index 0000000..aaac076 Binary files /dev/null and b/HTML UI/USER/assets/loading.gif differ diff --git a/HTML UI/USER/assets/user_1144760.png b/HTML UI/USER/assets/user_1144760.png new file mode 100644 index 0000000..e87e7c7 Binary files /dev/null and b/HTML UI/USER/assets/user_1144760.png differ diff --git a/HTML UI/USER/css/change_department.css b/HTML UI/USER/css/change_department.css new file mode 100644 index 0000000..bcc894f --- /dev/null +++ b/HTML UI/USER/css/change_department.css @@ -0,0 +1,97 @@ +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 { + display: flex; + flex-direction: row; + justify-content: space-evenly; + align-items: center; + min-height: 100vh; +} + +.signup-form { + background-color: #535C91; + opacity: 71; + padding: 8vh 3vh 5vh; + border-radius: 1rem; + box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9); + width: 25%; +} + +.signup-form-title{ + margin-bottom: 5vh; + color: #FFFFFF; + text-align: center; +} + +.signup-form-title h2 { + color: #FFFFFF; + margin: 0; + padding: 0; + font-size: 5vh; +} + +.signup-form-title hr{ + width: 65%; +} + +.signup-form-content{ + display: flex; + margin-left: 2rem; + flex-direction: column; + align-items: start; + font-size: 1.5rem; + color: white; + font-weight: bold; +} + +.signup-form-content input{ + margin: 0.7rem; +} + +.signup-form-footer{ + margin-top: 7vh; + display: flex; + flex-wrap: wrap; + justify-content: space-between; + align-content: center; + align-items: center; +} + +button { + font-weight: bold; + width: 35%; + font-size: 1rem; + padding: 10px; + border: none; + border-radius: 5px; + margin-top: 5px; + cursor: pointer; +} + +button:hover{ + filter: brightness(85%); +} + +.signup-form button[name="continue"] { + background-color: #F44336; + color: white; +} + +.signup-form button[name="back"] { + background-color: #23BDEE; + color: white; +} \ No newline at end of file diff --git a/HTML UI/USER/css/login.css b/HTML UI/USER/css/login.css new file mode 100644 index 0000000..f391919 --- /dev/null +++ b/HTML UI/USER/css/login.css @@ -0,0 +1,102 @@ +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 { + 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; +} + +.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%; +} + +.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-direction: column; + align-content: center; + flex-wrap: wrap; +} + +.signup-form 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: 40%; + font-size: 1rem; + padding: 10px; + border: none; + border-radius: 5px; + margin-top: 1rem; + cursor: pointer; +} + +button:hover{ + filter: brightness(85%); +} + +.signup-form-footer{ + margin-top: 3vh; + display: flex; + align-content: center; + justify-content: center; +} + +.signup-form button[name="submit"] { + background-color: #F44336; + color: white; +} \ No newline at end of file diff --git a/HTML UI/USER/css/main_menu.css b/HTML UI/USER/css/main_menu.css new file mode 100644 index 0000000..90d65e3 --- /dev/null +++ b/HTML UI/USER/css/main_menu.css @@ -0,0 +1,128 @@ +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 { + 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; + flex-direction: row; + justify-content: space-between; + text-align: left; +} + +.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{ + display: flex; + flex-direction: row; + align-content: center; + align-items: center; + justify-content: center; +} + +button{ + margin: 0 1rem 0 1rem; + width: 15vw; + height: 10vh; + + 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{ + display: flex; + align-items: center; + justify-content: end; +} + +.right_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; +} + +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; +} + +button[name="menu_button"]{ + margin: 0.7rem; + background-color: #1B1A55; +} \ No newline at end of file diff --git a/HTML UI/USER/css/profile.css b/HTML UI/USER/css/profile.css new file mode 100644 index 0000000..005d193 --- /dev/null +++ b/HTML UI/USER/css/profile.css @@ -0,0 +1,105 @@ +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 { + display: flex; + flex-direction: row; + justify-content: space-evenly; + align-items: center; + min-height: 100vh; + text-align: center; /* Center the text for all child elements */ +} + +.header{ + color: #1B1A55; + font-size: 4vh; + text-transform: uppercase; + line-height: 2.5rem; + margin-bottom: 10rem; +} + +.signup-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%; +} + +.signup-form-title{ + margin-bottom: 5vh; +} + +.signup-form-title h2 { + color: #FFFFFF; + margin: 0; + padding: 0; + text-align: center; + font-size: 5vh; +} + +.signup-form button { + width: 100%; + padding: 10px; + border: none; + border-radius: 5px; + margin-top: 5px; + cursor: pointer; +} + +.signup-form-footer{ + margin-top: 7vh; + display: flex; + flex-direction: row; +} + +.signup-form button{ + font-weight: bold; + width: 40%; + font-size: 1rem; +} + +.signup-form button:hover{ + filter: brightness(85%); +} + +.signup-form hr{ + width: 40%; +} + +.signup-form button[name="login"] { + background-color: #2196F3; + color: white; + margin-right: 5rem; +} + +.signup-form 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; +} + +.signup-form button[name="submit"] { + background-color: #F44336; + color: white; +} \ No newline at end of file diff --git a/HTML UI/USER/css/sending_file_confirmation.css b/HTML UI/USER/css/sending_file_confirmation.css new file mode 100644 index 0000000..0c2ff31 --- /dev/null +++ b/HTML UI/USER/css/sending_file_confirmation.css @@ -0,0 +1,37 @@ +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 { + display: flex; + flex-direction: row; + justify-content: space-evenly; + align-items: center; + min-height: 100vh; + text-align: center; /* Center the text for all child elements */ +} + +.header{ + color: #1B1A55; + font-size: 4vh; + text-transform: uppercase; + line-height: 2.5rem; + margin-bottom: 10rem; +} + +img{ + width:20%; + height: 20%; +} diff --git a/HTML UI/USER/css/set_departments.css b/HTML UI/USER/css/set_departments.css new file mode 100644 index 0000000..fcba47b --- /dev/null +++ b/HTML UI/USER/css/set_departments.css @@ -0,0 +1,105 @@ +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 { + display: flex; + flex-direction: row; + justify-content: space-evenly; + align-items: center; + min-height: 100vh; + text-align: center; +} + +.header{ + color: #1B1A55; + font-size: 4vh; + text-transform: uppercase; + line-height: 2.5rem; + margin-bottom: 10rem; +} + +.signup-form { + background-color: #535C91; + opacity: 71; + padding: 8vh 3vh 5vh; + border-radius: 1rem; + box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.9); + width: 25%; +} + +.signup-form-title{ + margin-bottom: 5vh; +} + +.signup-form-title h2 { + color: #FFFFFF; + margin: 0; + padding: 0; + text-align: center; + font-size: 5vh; +} + +.signup-form hr{ + width: 65%; +} + +input{ + margin: 0 0 1rem 0; +} + +.signup-form-content{ + display: flex; + margin-left: 2rem; + flex-direction: column; + align-items: start; + font-size: 1.5rem; + color: white; + font-weight: bold; +} + +.signup-form-footer{ + margin-top: 5vh; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + align-content: space-between; +} + +button { + font-weight: bold; + width: 40%; + font-size: 1rem; + padding: 10px; + border: none; + border-radius: 5px; + margin-top: 5px; + cursor: pointer; +} + +button:hover{ + filter: brightness(85%); +} + +button[name="continue"] { + background-color: #F44336; + color: white; +} + +button[name="back"] { + background-color: #23BDEE; + color: white; +} \ No newline at end of file diff --git a/HTML UI/USER/css/share_file.css b/HTML UI/USER/css/share_file.css new file mode 100644 index 0000000..07344a4 --- /dev/null +++ b/HTML UI/USER/css/share_file.css @@ -0,0 +1,185 @@ +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 { + display: flex; + flex-direction: row; + justify-content: space-evenly; + align-items: center; + min-height: 100vh; + text-align: center; +} + +h1, h2{ + padding: 0; + margin: 0; +} + +.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{ + display: flex; + align-items: center; + justify-content: end; +} + +.right_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; +} + +.choose_user_form_title{ + display: flex; + flex-wrap: wrap; + flex-direction: column; + justify-content: left; + align-content: start; +} + +.choose_user_form_title hr{ + width: 40%; +} + +.choose_user_form_content{ + display: flex; + margin: 1rem 7rem 2rem 0.5rem; + flex-direction: column; + align-items: start; + + height: 20vh; /* Fixed height */ + width: 100%; /* Full width */ + overflow: auto; /* Enable scrolling */ + + font-size: 1.2rem; + color: white; + font-weight: bold; +} + +.choose_user_form_content::-webkit-scrollbar { + width: 10px; /* Reduced width of the scrollbar by 2px */ +} + +.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="submit"]{ + background-color: #F44336; +} + +button[name="select_file"]{ + margin: 0; + width: 8vw; + background-color: #1B1A55; +} \ No newline at end of file diff --git a/HTML UI/USER/css/sign_up_confirmation.css b/HTML UI/USER/css/sign_up_confirmation.css new file mode 100644 index 0000000..2dbc893 --- /dev/null +++ b/HTML UI/USER/css/sign_up_confirmation.css @@ -0,0 +1,32 @@ +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 { + display: flex; + flex-direction: row; + justify-content: space-evenly; + align-items: center; + min-height: 100vh; + text-align: center; /* Center the text for all child elements */ +} + +.header{ + color: #1B1A55; + font-size: 4vh; + text-transform: uppercase; + line-height: 2.5rem; + margin-bottom: 10rem; +} diff --git a/HTML UI/USER/css/sign_up_start.css b/HTML UI/USER/css/sign_up_start.css new file mode 100644 index 0000000..1b0cf20 --- /dev/null +++ b/HTML UI/USER/css/sign_up_start.css @@ -0,0 +1,104 @@ +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 { + display: flex; + flex-direction: row; + justify-content: space-evenly; + align-items: center; + min-height: 100vh; + text-align: center; +} + +.header{ + color: #1B1A55; + font-size: 4vh; + text-transform: uppercase; + line-height: 2.5rem; + margin-bottom: 10rem; +} + +.signup-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%; +} + +.signup-form-title{ + margin-bottom: 5vh; +} + +.signup-form-title h2 { + color: #FFFFFF; + margin: 0; + padding: 0; + text-align: center; + font-size: 5vh; +} + +.signup-form hr{ + width: 40%; +} + +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; +} + +.signup-form-footer{ + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + align-content: center; + align-items: center; + margin-top: 7vh; +} + +button { + font-weight: bold; + width: 35%; + font-size: 1rem; + padding: 10px; + border: none; + border-radius: 5px; + margin-top: 5px; + cursor: pointer; +} + +button:hover{ + filter: brightness(85%); +} + +button[name="login"] { + background-color: #2196F3; + color: white; +} + +button[name="submit"] { + background-color: #F44336; + color: white; +} \ No newline at end of file diff --git a/HTML UI/USER/html/change_department.html b/HTML UI/USER/html/change_department.html new file mode 100644 index 0000000..d96caf0 --- /dev/null +++ b/HTML UI/USER/html/change_department.html @@ -0,0 +1,31 @@ + + + + + + + Department Selection + + + +
+
+
+ + + +
+
+
+ + diff --git a/HTML UI/USER/html/login.html b/HTML UI/USER/html/login.html new file mode 100644 index 0000000..6b0cc81 --- /dev/null +++ b/HTML UI/USER/html/login.html @@ -0,0 +1,33 @@ + + + + + + + Login + + + +
+
+

DO WE KNOW

+

EACH OTHER?

+
+
+
+ + + +
+
+
+ + diff --git a/HTML UI/USER/html/main_menu.html b/HTML UI/USER/html/main_menu.html new file mode 100644 index 0000000..f1c3b33 --- /dev/null +++ b/HTML UI/USER/html/main_menu.html @@ -0,0 +1,57 @@ + + + + + + + Main Page + + + +
+
+
+
+

WELCOME BACK,

+

'username'!

+

Hope you have a productive day!

+
+ +
+
+
+ + +
+
+ + +
+
+ +
+
+
+ +
+
+
+
+

NOTIFICATIONS

+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ + diff --git a/HTML UI/USER/html/profile.html b/HTML UI/USER/html/profile.html new file mode 100644 index 0000000..274dd31 --- /dev/null +++ b/HTML UI/USER/html/profile.html @@ -0,0 +1,31 @@ + + + + + + + Signup + + + +
+
+
+ +
+ + + +
+ +
+
+
+ + diff --git a/HTML UI/USER/html/sending_file_confirmation.html b/HTML UI/USER/html/sending_file_confirmation.html new file mode 100644 index 0000000..762093c --- /dev/null +++ b/HTML UI/USER/html/sending_file_confirmation.html @@ -0,0 +1,20 @@ + + + + + + + Setup Completion + + + +
+
+

SENDING THE FILE!

+

PlEASE WAIT

+ Description of GIF + +
+
+ + diff --git a/HTML UI/USER/html/share_file.html b/HTML UI/USER/html/share_file.html new file mode 100644 index 0000000..9597f6e --- /dev/null +++ b/HTML UI/USER/html/share_file.html @@ -0,0 +1,53 @@ + + + + + + + Share File + + + +
+
+
+
+

SHARE A FILE

+
+

First select the file you want to share

+

(can be whatever resource from the system)

+
+
+

No file chosen

+
+
+
+ +
+
+ + +
+
+
+
+
+

USERS

+
+
+
+ + + + + + + + + +
+
+
+
+ + diff --git a/HTML UI/USER/html/sign_up_confirmation.html b/HTML UI/USER/html/sign_up_confirmation.html new file mode 100644 index 0000000..051b042 --- /dev/null +++ b/HTML UI/USER/html/sign_up_confirmation.html @@ -0,0 +1,19 @@ + + + + + + + Setup Completion + + + +
+
+

ALL THE SETUP IS DONE!

+

LET’S PROCEED TO THE

+

MAIN PAGE

+
+
+ + diff --git a/HTML UI/USER/html/sign_up_profile.html b/HTML UI/USER/html/sign_up_profile.html new file mode 100644 index 0000000..9463edd --- /dev/null +++ b/HTML UI/USER/html/sign_up_profile.html @@ -0,0 +1,35 @@ + + + + + + + Signup + + + +
+
+

LET US MEET

+

EACH OTHER

+
+
+
+ +
+ + + +
+ +
+
+
+ + diff --git a/HTML UI/USER/html/sing_up_departments.html b/HTML UI/USER/html/sing_up_departments.html new file mode 100644 index 0000000..be9a6e2 --- /dev/null +++ b/HTML UI/USER/html/sing_up_departments.html @@ -0,0 +1,35 @@ + + + + + + + Department Selection + + + +
+
+

TELL ME MORE

+

ABOUT

+

YOUR WORK

+
+
+
+ + + +
+
+
+ + diff --git a/UC/src/models/usersRegisterModel.js b/UC/src/models/usersRegisterModel.js index 56f82a8..3321593 100644 --- a/UC/src/models/usersRegisterModel.js +++ b/UC/src/models/usersRegisterModel.js @@ -3,7 +3,8 @@ const Joi = require('joi'); const usersRegisterModel = Joi.object({ name: Joi.string().required(), email: Joi.string().email().required(), - password: Joi.string().min(8).max(20).required() + password: Joi.string().min(8).max(20).required(), + department: Joi.string().required() }); module.exports = usersRegisterModel; \ No newline at end of file diff --git a/UC/src/routes/users.js b/UC/src/routes/users.js index 04cc030..720e62e 100644 --- a/UC/src/routes/users.js +++ b/UC/src/routes/users.js @@ -42,7 +42,7 @@ router.post('/register', validateRegisterBody, async (req, res) => { const usersData = fs.readFileSync(usersFilePath, 'utf8'); const usersJson = JSON.parse(usersData); - const { name, email, password } = req.jsonModel; + const { name, email, password, department} = req.jsonModel; const existingUser = usersJson.find(user => user.email === email); if (existingUser) { @@ -56,7 +56,8 @@ router.post('/register', validateRegisterBody, async (req, res) => { id: userId, name: name, email: email, - password: hashedPassword + password: hashedPassword, + department: department }; usersJson.push(newUser);