Add messages to pages
This commit is contained in:
		
							parent
							
								
									aaa5a2c0e0
								
							
						
					
					
						commit
						373aa81421
					
				
					 2 changed files with 22 additions and 2 deletions
				
			
		
							
								
								
									
										14
									
								
								server.js
									
										
									
									
									
								
							
							
						
						
									
										14
									
								
								server.js
									
										
									
									
									
								
							| 
						 | 
					@ -187,7 +187,7 @@ Server.prototype.fillTemplate = function (file, templateVars = {}) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Server.prototype.generateHomePage = function (req) {
 | 
					Server.prototype.generateHomePage = function (req) {
 | 
				
			||||||
  const files = fs.readdirSync(this.fileLocation).filter(fileName => fileName.includes('.json'));
 | 
					  const files = fs.readdirSync(this.fileLocation).filter(fileName => fileName.includes('.json'));
 | 
				
			||||||
  const books = files.map(fileName => {
 | 
					  let books = files.map(fileName => {
 | 
				
			||||||
    const bookData = JSON.parse(fs.readFileSync(path.resolve(this.fileLocation, fileName), 'utf8'));
 | 
					    const bookData = JSON.parse(fs.readFileSync(path.resolve(this.fileLocation, fileName), 'utf8'));
 | 
				
			||||||
    if (bookData.hasOwnProperty('fileName')) return '';
 | 
					    if (bookData.hasOwnProperty('fileName')) return '';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -220,6 +220,11 @@ Server.prototype.generateHomePage = function (req) {
 | 
				
			||||||
      modal,
 | 
					      modal,
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
  }).join('');
 | 
					  }).join('');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  if (books == '') {
 | 
				
			||||||
 | 
					    books = '<div class="column"><div class="content">The shelf is empty. Would you like to <a href="/give">add a book</a>?</div></div>';
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  const body = '<div class="columns is-multiline">' + books + '</div>';
 | 
					  const body = '<div class="columns is-multiline">' + books + '</div>';
 | 
				
			||||||
  return this.fillTemplate('./templates/htmlContainer.html', {
 | 
					  return this.fillTemplate('./templates/htmlContainer.html', {
 | 
				
			||||||
    title: 'View',
 | 
					    title: 'View',
 | 
				
			||||||
| 
						 | 
					@ -230,7 +235,7 @@ Server.prototype.generateHomePage = function (req) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Server.prototype.generateHistoryPage = function (req) {
 | 
					Server.prototype.generateHistoryPage = function (req) {
 | 
				
			||||||
  const files = fs.readdirSync(this.historyLocation).filter(fileName => fileName.includes('.json'));
 | 
					  const files = fs.readdirSync(this.historyLocation).filter(fileName => fileName.includes('.json'));
 | 
				
			||||||
  const history = files.map(fileName => {
 | 
					  let history = files.map(fileName => {
 | 
				
			||||||
    const bookData = JSON.parse(fs.readFileSync(path.resolve(this.historyLocation, fileName), 'utf8'));
 | 
					    const bookData = JSON.parse(fs.readFileSync(path.resolve(this.historyLocation, fileName), 'utf8'));
 | 
				
			||||||
    const id = fileName.replace('.json', '');
 | 
					    const id = fileName.replace('.json', '');
 | 
				
			||||||
    const added = fecha.format(new Date(bookData.added), 'hh:mm:ssA on dddd MMMM Do, YYYY');
 | 
					    const added = fecha.format(new Date(bookData.added), 'hh:mm:ssA on dddd MMMM Do, YYYY');
 | 
				
			||||||
| 
						 | 
					@ -256,6 +261,11 @@ Server.prototype.generateHistoryPage = function (req) {
 | 
				
			||||||
      modal,
 | 
					      modal,
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
  }).join('');
 | 
					  }).join('');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  if (history == '') {
 | 
				
			||||||
 | 
					    history = '<div class="column"><div class="content">No books have been taken yet. Would you like to <a href="/">take a book</a>?</div></div>';
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
  const body = '<div class="columns is-multiline">' + history + '</div>';
 | 
					  const body = '<div class="columns is-multiline">' + history + '</div>';
 | 
				
			||||||
  return this.fillTemplate('./templates/htmlContainer.html', {
 | 
					  return this.fillTemplate('./templates/htmlContainer.html', {
 | 
				
			||||||
    title: 'History',
 | 
					    title: 'History',
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,13 @@
 | 
				
			||||||
 | 
					<h2 class="title">
 | 
				
			||||||
 | 
					  Give a Book
 | 
				
			||||||
 | 
					</h2>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<div class="content">
 | 
				
			||||||
 | 
					  <p>
 | 
				
			||||||
 | 
					    Use this form to add a book to the library!
 | 
				
			||||||
 | 
					  </p>
 | 
				
			||||||
 | 
					</div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<form action="{{resourcePath}}give" method="post" enctype="multipart/form-data">
 | 
					<form action="{{resourcePath}}give" method="post" enctype="multipart/form-data">
 | 
				
			||||||
  <div class="field">
 | 
					  <div class="field">
 | 
				
			||||||
    <div class="file is-boxed has-name">
 | 
					    <div class="file is-boxed has-name">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue