Merged.

lib/AboutView.php

@@ -20,7 +20,7 @@ class AboutView extends View
             <p>
             A senior at Michigan State University majoring in Computer Science, 
             James has a strong love for software development, 
-            especially the creation of desktop applications.
+            especially the creation of desktop applications.</br>
 	        <a href="mailto:murra203@msu.edu">Email James</a>
             </p> </div>
             <div class="card">
@@ -29,7 +29,7 @@ class AboutView extends View
             <p>
             Senior Computer Science Major at Michigan State University.
             I enjoy long walks on the beach and casual conversation about
-            vimrc files. <a href="https://www.egr.msu.edu/~joseph62">Homepage Here</a>
+            vimrc files. <a href="https://www.egr.msu.edu/~joseph62">Homepage Here</a></br>
             <a href="mailto:joseph62@msu.edu">Email Sean</a>
 	        </p> </div>
             <div class="card">
@@ -38,7 +38,7 @@ class AboutView extends View
             <p>22 years old, from Washington D.C. Graduating in May 2018 
             with a Bachelor's of Science in Computer Science. I currently
             work as a web developer at SNWorks in East Lansing, MI. 
-            Check out my <a href="https://alfastep.github.io/">portfolio</a>.
+            Check out my <a href="https://alfastep.github.io/">portfolio</a>.</br>
             <a href="mailto:alfastep@msu.edu">Email Stephen</a>
             </p> </div>
             <div class="card">
@@ -46,7 +46,7 @@ class AboutView extends View
             <img src="assets/logan_arent.jpg" height="696" width="696" alt="Logan Arent">
             <p>
             Senior in Computer Science at Michigan State University. 
-            Working to gain as much knowledge as possible about software development.
+            Working to gain as much knowledge as possible about software development.</br>
             <a href="mailto:arentlog@msu.edu">Email Logan</a>
             </p> </div>
             <div class="card"> 
@@ -55,7 +55,7 @@ class AboutView extends View
             <p>
             20 years old, from Clarkston, MI.
             Graduating in May of 2018 with a B.S. in Computer Science.
-            Currently in a web development internship for Jackson National Life supporting the Mobile Technologies department.
+            Currently in a web development internship for Jackson National Life supporting the Mobile Technologies department.</br>
             <a href="mailto:coppers4@msu.edu">Email Colin</a>
             </p> </div>
         </div>

lib/LandingView.php

@@ -37,8 +37,11 @@ General Motors automotive plants check for paint defects at points along the ass
         <h2>Other Resources</h2>
         <ul>
         <li><a href="https://cse.msu.edu/~cse435/Projects/F2017/Project-Description-Assignment.pdf">Project Specification</a></li>
-        <li><a href="./CSE 435 - SRS V1.pdf">Software Reqirement Specs V1</a></li>
+        <li><a href="http://www.cse.msu.edu/~cse435/Projects/F2017/IntermediateAssignments/Questions%20and%20Answers.pdf">Questions for Customer and Customer Responses</a></li>
-        <li><a href="./CSE 435 - SRS V2.pdf">Software Reqirement Specs V2</a></li>
+        <li><a href="./CSE 435 - SRS V1.pdf">Software Reqirement Specs V1 PDF</a></li>
+        <li><a href="./CSE 435 - SRS V1.docx">Software Reqirement Specs V1 DOCX</a></li>
+        <li><a href="./CSE 435 - SRS V2.pdf">Software Reqirement Specs V2 PDF</a></li>
+        <li><a href="./CSE 435 - SRS V2.docx">Software Reqirement Specs V2 DOCX</a></li>
         <li><a href="./CSE 435 - Project Requirements Definition.pdf">Project Requirements</a></li>
         <li><a href="./prototype/login.html">Prototype V1</a></li>
         <li><a href="https://www.cse.msu.edu/~joseph62/prototype/login.html">Prototype V2</a></li>

lib/MilestonesView.php

@@ -27,10 +27,22 @@ Oct. 30: Develop Skeletal Website and Submit Info
 Nov. 1: Submit Project Requirements Definition Document
 </li>
 <li>
-Nov. 13: Submit Software Requirements Specification Document
+Nov. 13: Submit Software Requirements Specification Document V1
 </li>
 <li>
-Dec. 4: Present and Demonstrate the Project 
+Nov. 15: Submit Peer Review of the First Set of Deliverables
+</li>
+<li>
+Nov. 20: Complete Prototype 1 and Submit Review of SRS
+</li>
+<li>
+Nov. 29: Submit Software Requirements Specification Document V2
+</li>
+<li>
+Dec. 4: Complete Prototype 2
+</li>
+<li>
+Dec. 6: Present the Project and Submit Peer Review of the Second Set of Deliverables
 </li>
 </ul>
 </div>

lib/MinutesView.php

@@ -12,7 +12,7 @@ class MinutesView extends SecureView
 <h2>Meeting 1</h2>
 <p>
 <h3>10/16/2017 1:20PM – 1:50PM</h3>
-<p>Assign roles to each member. Discuss the best times to having meetings during the duration of the projects.
+<p>Agenda – Assign roles to each member. Discuss the best times to having meetings during the duration of the projects.
 </p>
 <p>
 Overview – Assigned roles for each group member, discussed times and days when we would all be available to meet, and assigned tasks that were due by the next meeting.
@@ -71,7 +71,7 @@ Overview – Discussed the best way to go about making the website in a way that
 </p>
 <p>Overview – Divided preliminary requirements tasks amongst ourselves. Got most of the requirements done at the meeting.  Figured out next meeting time to start going over SRS Requirements.
 </p> 
-<h3>Next Meeting – 11/09/2017 @ 5:00PM, 3211 Anthony Hall</h3> 
+<p>Next Meeting – 11/09/2017 @ 5:00PM, 3211 Anthony Hall</p> 
 <h3>Tasks to be completed:</h3>
 <ul>
 <li>
@@ -91,7 +91,7 @@ Logan – Requirements #3 by 10PM on 10/31
 <h3>11/09/2017 5:00PM – 6:00PM</h3>
 <p>Agenda –  Go over what needs to be done so that we can complete the SRS.</p> 
 <p>Overview – Went over what tasks need to be completed in order for us to complete the SRS. Divided up tasks amongst ourselves</p>
-<h3>Next Meeting – 11/09/2017 @ 5:00PM, International Center Food Court</h3>
+<p>Next Meeting – 11/09/2017 @ 5:00PM, International Center Food Court</p>
 <h3>Tasks to be completed:</h3>
 <ul>
 <li>Colin – Introduction, Purpose, Use Case, State Diagram by 10PM on 11/12</li>

lib/prelude.inc.php

@@ -6,4 +6,5 @@
 
 session_start();
 define("LOGIN","login");//login session constant
-define("ROOT", "/~joseph62/cse435/");
+define("ROOT", "/./");
+//define("ROOT", "/~joseph62/cse435/");