Compare commits
	
		
			2 commits
		
	
	
		
			5543b1e8c5
			...
			c826b6b5db
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | c826b6b5db | ||
|  | d875ce398f | 
					 2 changed files with 32 additions and 21 deletions
				
			
		
							
								
								
									
										35
									
								
								chat.js
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								chat.js
									
									
									
									
									
								
							|  | @ -12,17 +12,21 @@ form.addEventListener("submit", async function (event) { | ||||||
| 
 | 
 | ||||||
|     formMessage = formData.get('message').toString(); |     formMessage = formData.get('message').toString(); | ||||||
| 
 | 
 | ||||||
|         //KINDA UNNECESSARY
 |     //KINDA UNNECESSARY
 | ||||||
|         //CHECKS TO SEE IF THE PERSON IS LOGGED IN IN ORDER TO SEND A MESSAGE.
 |     //CHECKS TO SEE IF THE PERSON IS LOGGED IN IN ORDER TO SEND A MESSAGE.
 | ||||||
|         const response = await fetch(`api/token/${username}/`); |     const response = await fetch(`api/token/${username}/`); | ||||||
|         const matches = await response.json(); |     const matches = await response.json(); | ||||||
|        | 
 | ||||||
|         //YES THIS IS CONFUSING I KNOW.
 |     //YES THIS IS CONFUSING I KNOW.
 | ||||||
|         if (matches.status === "ok") { |     if (matches.status === "ok") { | ||||||
|           sendMessage() |         sendMessage() | ||||||
|         } else { |     } else { | ||||||
|             document.querySelector("#errormessage").innerHTML = 'Username and token mismatch. Try logging in again.' |         const mismatch = 'Username and token mismatch. Try logging in again.' | ||||||
|         } |         printText(mismatch.bold()) | ||||||
|  |         logout() | ||||||
|  |         localStorage.removeItem('username') | ||||||
|  |     } | ||||||
|  | 
 | ||||||
| }) | }) | ||||||
| 
 | 
 | ||||||
| //SEND MESSAGE FETCH FUNCTION
 | //SEND MESSAGE FETCH FUNCTION
 | ||||||
|  | @ -86,4 +90,11 @@ function loggedIn() { | ||||||
| loggedIn() | loggedIn() | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| //REVIECE USERS PRONOUNS
 | //REVIECE USERS PRONOUNS
 | ||||||
|  | 
 | ||||||
|  | async function getPronouns() { | ||||||
|  | const response = await fetch(`api/users/${username}/`); | ||||||
|  | const data = await response.json(); | ||||||
|  | pronouns = data.pronouns | ||||||
|  | return pronouns; | ||||||
|  | } | ||||||
							
								
								
									
										18
									
								
								logout.js
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								logout.js
									
									
									
									
									
								
							|  | @ -20,13 +20,13 @@ async function logout() { | ||||||
|   loggedIn() |   loggedIn() | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // // IF THERE IS A TOKEN BUT NO USERNAME LOGOUT
 | // IF THERE IS A TOKEN BUT NO USERNAME LOGOUT
 | ||||||
| // if (allCookies !== '' && myStorage.length === 0) {
 | if (allCookies !== '' && myStorage.length === 0) { | ||||||
| //   logout()
 |   logout() | ||||||
| // }
 | } | ||||||
| 
 | 
 | ||||||
| // // IF THERE IS NO COOKIE BUT A USERNAME GET RID OF USERNAME LOCALLY.
 | // IF THERE IS NO COOKIE BUT A USERNAME GET RID OF USERNAME LOCALLY.
 | ||||||
| // if (allCookies === '' && myStorage.length !== 0) {
 | if (allCookies === '' && myStorage.length !== 0) { | ||||||
| //   localStorage.removeItem('username')
 |   localStorage.removeItem('username') | ||||||
| //   document.querySelector("#loggeduser").innerHTML = 'You are not logged in'
 |   document.querySelector("#loggeduser").innerHTML = 'You are not logged in' | ||||||
| // }
 | } | ||||||
		Loading…
	
		Reference in a new issue