Added comments and formatted code.
This commit is contained in:
		
							parent
							
								
									213a7e565d
								
							
						
					
					
						commit
						7e6c2db6d2
					
				
					 7 changed files with 121 additions and 93 deletions
				
			
		|  | @ -29,8 +29,8 @@ | ||||||
| 
 | 
 | ||||||
|         <script src="login.js"></script> |         <script src="login.js"></script> | ||||||
| 
 | 
 | ||||||
|         <div id="incorrect"></div> |         <div id="errormessage"></div> | ||||||
| 
 | 
 | ||||||
|         <h2>You are logged in as <span id="username"></span></h2> |         <span id="username"></span> | ||||||
|     </body> |     </body> | ||||||
| </html> | </html> | ||||||
|  |  | ||||||
							
								
								
									
										21
									
								
								login.js
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								login.js
									
									
									
									
									
								
							|  | @ -1,6 +1,13 @@ | ||||||
| let uname = document.querySelector('#uname').value; // grabbing the username submitted and putting it in the variable uname
 | 
 | ||||||
| let pin = document.querySelector('#pin').value; // grabbing the pin submitted and putting it in the variable pin
 | //SETTING VARIABLES. GRABBING CONTENTS FROM FORM.
 | ||||||
| const form = document.querySelector('form'); // grabbing an element on the page
 | 
 | ||||||
|  | let uname = document.querySelector('#uname').value; | ||||||
|  | let pin = document.querySelector('#pin').value; | ||||||
|  | const form = document.querySelector('form'); | ||||||
|  | 
 | ||||||
|  | const cookies = document.cookie //TEMP
 | ||||||
|  | 
 | ||||||
|  | // SUBMIT FORM FUNCTION. AND FETCH USERNAME AND PIN FROM API. 
 | ||||||
| 
 | 
 | ||||||
| form.addEventListener("submit", async function (event) { | form.addEventListener("submit", async function (event) { | ||||||
|   event.preventDefault(); |   event.preventDefault(); | ||||||
|  | @ -19,14 +26,18 @@ form.addEventListener("submit", async function(event) { | ||||||
|   } |   } | ||||||
| }) | }) | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
|  | // FUNCTIONS FOR WHETHER THE LOGIN WAS A SUCCESS OR FAILURE
 | ||||||
|  | 
 | ||||||
| function login() { | function login() { | ||||||
|   console.log('You have logged in!') |   console.log('You have logged in!') | ||||||
|   document.querySelector("#username").innerHTML = `${uname}` |   document.querySelector("#username").innerHTML = `${uname}` | ||||||
|     document.querySelector("#incorrect").innerHTML = '' |   document.querySelector("#errormessage").innerHTML = '' | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function incorrectLogin() { | function incorrectLogin() { | ||||||
|   console.log('Incorrect Login!') |   console.log('Incorrect Login!') | ||||||
|     document.querySelector("#incorrect").innerHTML = 'Incorrect Login.' |   document.querySelector("#errormessage").innerHTML = 'Incorrect Login.' | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | console.log(cookies) //TEMP
 | ||||||
|  | @ -36,6 +36,6 @@ | ||||||
| 
 | 
 | ||||||
|         <script src="loginchange.js"></script> |         <script src="loginchange.js"></script> | ||||||
| 
 | 
 | ||||||
|         <div id="incorrect"></div> |         <div id="errormessage"></div> | ||||||
|     </body> |     </body> | ||||||
| </html> | </html> | ||||||
|  |  | ||||||
|  | @ -1,12 +1,21 @@ | ||||||
|  | 
 | ||||||
|  | //SETTING VARIABLES. GRABBING ELEMENT VALUES FROM FORM. 
 | ||||||
|  | 
 | ||||||
| let uname = document.querySelector('#uname').value; | let uname = document.querySelector('#uname').value; | ||||||
| let pin = document.querySelector('#pin').value; | let pin = document.querySelector('#pin').value; | ||||||
| let newUname = document.querySelector('#newuname').value; | let newUname = document.querySelector('#newuname').value; | ||||||
| let newPin = document.querySelector('#newpin').value; | let newPin = document.querySelector('#newpin').value; | ||||||
|  | const form = document.querySelector('form'); | ||||||
|  | let responseText; | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | //TODO
 | ||||||
| // let selected = document.querySelector('#selected').value;
 | // let selected = document.querySelector('#selected').value;
 | ||||||
| // let custom = document.querySelector('#custom').value;
 | // let custom = document.querySelector('#custom').value;
 | ||||||
| // let pronouns = ''
 | // let pronouns = ''
 | ||||||
| let responseText; | 
 | ||||||
| const form = document.querySelector('form'); | //FORM SUMBIT FUNCTION & GET THE USERS USERNAME AND SEE IF IT IS CORRECT.
 | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
| form.addEventListener("submit", async function (event) { | form.addEventListener("submit", async function (event) { | ||||||
|   event.preventDefault(); |   event.preventDefault(); | ||||||
|  | @ -16,6 +25,8 @@ form.addEventListener("submit", async function(event) { | ||||||
|   pin = formData.get('pin'); |   pin = formData.get('pin'); | ||||||
|   newUname = formData.get('newuname'); |   newUname = formData.get('newuname'); | ||||||
|   newPin = formData.get('newpin'); |   newPin = formData.get('newpin'); | ||||||
|  | 
 | ||||||
|  |   //TODO
 | ||||||
|   // selected = formData.get('selected');
 |   // selected = formData.get('selected');
 | ||||||
|   // custom = formData.get('custom')
 |   // custom = formData.get('custom')
 | ||||||
| 
 | 
 | ||||||
|  | @ -35,16 +46,19 @@ form.addEventListener("submit", async function(event) { | ||||||
|   try { |   try { | ||||||
|     const userNotFound = await getUname(); |     const userNotFound = await getUname(); | ||||||
| 
 | 
 | ||||||
|     if (userNotFound.status == `fail`) { |     if (userNotFound.status === 'fail') { | ||||||
|       document.querySelector("#incorrect").innerHTML = `user ${uname} was not found` |       document.querySelector("#errormessage").innerHTML = `user ${uname} was not found` | ||||||
|     } else { |     } else { | ||||||
|       loginChange() |       loginChange() | ||||||
|     } |     } | ||||||
|   } catch { |   } catch { | ||||||
|       document.querySelector("#incorrect").innerHTML = 'An Error has Occurred. Try again later.' |     document.querySelector("#errormessage").innerHTML = 'An Error has Occurred. Try again later.' | ||||||
|   } |   } | ||||||
| }) | }) | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
|  | //FETCH FUNTIONS. FETCHING USERNAME FROM API AND SUBMITTING NEW PIN AND USERNAME TO API.
 | ||||||
|  | 
 | ||||||
| async function getUname() { | async function getUname() { | ||||||
|   let response = await fetch(`/api/users/${uname}`); |   let response = await fetch(`/api/users/${uname}`); | ||||||
|   responseJson = await response.json(); |   responseJson = await response.json(); | ||||||
|  | @ -58,6 +72,6 @@ const rawResponse = await fetch(`/api/users/change/${uname}/${pin}/${newUname}/$ | ||||||
|     }, |     }, | ||||||
|     body: "" |     body: "" | ||||||
|   }); |   }); | ||||||
| document.querySelector("#incorrect").innerHTML = 'Login Changed!' |   document.querySelector("#errormessage").innerHTML = 'Login Changed!' | ||||||
|   window.location.replace("/login.html") |   window.location.replace("/login.html") | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -28,7 +28,7 @@ | ||||||
|                     <option value="she.her">she/her</option> |                     <option value="she.her">she/her</option> | ||||||
|                     <option value="he.him">he/him</option> |                     <option value="he.him">he/him</option> | ||||||
|                     <option value="they.them">they/them</option> |                     <option value="they.them">they/them</option> | ||||||
|                     <option value="it.its">it</option> |                     <option value="it.its">it/its</option> | ||||||
|                     <option value="fae.faer">fae/faer</option> |                     <option value="fae.faer">fae/faer</option> | ||||||
|                   </select> |                   </select> | ||||||
| 
 | 
 | ||||||
|  | @ -43,7 +43,7 @@ | ||||||
|               </form>  |               </form>  | ||||||
|         </div> |         </div> | ||||||
| 
 | 
 | ||||||
|         <div id="taken"></div> |         <div id="errormessage"></div> | ||||||
| 
 | 
 | ||||||
|         <script src="register.js"></script> |         <script src="register.js"></script> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										21
									
								
								register.js
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								register.js
									
									
									
									
									
								
							|  | @ -1,10 +1,15 @@ | ||||||
| let uname = document.querySelector('#uname').value; // grabbing the username submitted and putting it in the variable uname
 | 
 | ||||||
| let pin = document.querySelector('#pin').value; // grabbing the pin submitted and putting it in the variable pin
 | //DECLARING VARIABLES AND GRABBING VALUES FROM FORM. 
 | ||||||
|  | 
 | ||||||
|  | let uname = document.querySelector('#uname').value; | ||||||
|  | let pin = document.querySelector('#pin').value; | ||||||
| let selected = document.querySelector('#selected').value; | let selected = document.querySelector('#selected').value; | ||||||
| let custom = document.querySelector('#custom').value; | let custom = document.querySelector('#custom').value; | ||||||
| let pronouns = '' | let pronouns = '' | ||||||
| let responseText; | let responseText; | ||||||
| const form = document.querySelector('form'); // grabbing an element on the page
 | const form = document.querySelector('form'); | ||||||
|  | 
 | ||||||
|  | //SUBMIT FUNCTION &CHECKING IF USERNAME IS TAKEN
 | ||||||
| 
 | 
 | ||||||
| form.addEventListener("submit", async function (event) { | form.addEventListener("submit", async function (event) { | ||||||
|   event.preventDefault(); |   event.preventDefault(); | ||||||
|  | @ -26,15 +31,17 @@ form.addEventListener("submit", async function(event) { | ||||||
| 
 | 
 | ||||||
|     if (isTaken === `User ${uname}`) { |     if (isTaken === `User ${uname}`) { | ||||||
|       console.log("This username is taken.") |       console.log("This username is taken.") | ||||||
|       document.querySelector("#taken").innerHTML = `${uname} is already taken.` |       document.querySelector("#errormessage").innerHTML = `${uname} is already taken.` | ||||||
|     } else { |     } else { | ||||||
|       register() |       register() | ||||||
|     } |     } | ||||||
|   } catch { |   } catch { | ||||||
|       document.querySelector("#taken").innerHTML = 'An Error has Occurred. Try again later.' |     document.querySelector("#errormessage").innerHTML = 'An Error has Occurred. Try again later.' | ||||||
|   } |   } | ||||||
| }) | }) | ||||||
| 
 | 
 | ||||||
|  | //FETCH FUNCTIONS. GETTING USERNAME FROM API & REGISTERING USER ASSIGNED NAME AND PIN. 
 | ||||||
|  | 
 | ||||||
| async function getUname() { | async function getUname() { | ||||||
|   let response = await fetch(`$/api/users/${uname}`); |   let response = await fetch(`$/api/users/${uname}`); | ||||||
|   responseText = await response.text(); |   responseText = await response.text(); | ||||||
|  | @ -48,7 +55,7 @@ const rawResponse = await fetch(`/api/register/${uname.toString().toLowerCase()} | ||||||
|     }, |     }, | ||||||
|     body: "" |     body: "" | ||||||
|   }); |   }); | ||||||
| document.querySelector("#taken").innerHTML = 'Registered!' |   document.querySelector("#errormessage").innerHTML = 'Registered!' | ||||||
| window.location.replace("/login.html") |   //window.location.replace("/login.html")
 | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -21,11 +21,7 @@ form { | ||||||
|     width: 20%; |     width: 20%; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #taken { | #errormessage { | ||||||
|     padding-top: 1%; |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| #incorrect { |  | ||||||
|     padding-top: 1%; |     padding-top: 1%; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue