rsanchez-wsu · Santurce · Mar 11, 2019 · Mar 11, 2019 · Mar 13, 2019 · Mar 13, 2019
diff --git a/.project b/.project
@@ -10,6 +10,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
@@ -28,8 +38,10 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=
-eclipse.preferences.version=1
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+	<wb-module deploy-name="RaiderPlanner.git">
+		<property name="context-root" value="RaiderPlanner.git"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="src"/>
+	</wb-module>
+</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+	<fixed facet="jst.java"/>
+	<fixed facet="jst.web"/>
+	<installed facet="jst.web" version="2.4"/>
+	<installed facet="jst.java" version="1.8"/>
+</faceted-project>
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: java
+dist: trusty
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
@@ -16,4 +17,3 @@ notifications:
 branches:
   except:
   - "/^.*-dev/"
-
diff --git a/AUTHORS b/AUTHORS
@@ -13,15 +13,19 @@ Fahad Alnashwan <alnashwan.2@wright.edu>
 Matthew Barrett <barrett.77@wright.edu>
 Gage Berghoff <berghoff.2@wright.edu>
 Aashish Bharadwaj <aashish.bharadwaj01@gmail.com>
+Daniel Bleigh <bleigh.2@wright.edu>
 Alena Brand <brand.18@wright.edu>
 Nathaniel C Crossman <crossman.4@wright.edu>
 Gabriel Dodds <dodds.26@wright.edu>
+Nathan Dunn <dunn.113@wright.edu>
+Elizabeth Farr <farr.16@wright.edu>
 Randy Forte <forterandy@outlook.com>
 Aaron Hammer <hammer.21@wright.edu>
 Dominick Hatton <hatton.24@wright.edu>
 Peter Haviland <haviland.4@wright.edu>
 Rachel Hill <hill.382@wright.edu>
 Andy Hulett <hulett.4@wright.edu>
+William Kiger <kiger.9@wright.edu>
 Ryan Koeller <koeller.8@wright.edu>
 James Languirand <languirand.2@wright.edu>
 Eric Levine <levine.15@wright.edu>
@@ -37,6 +41,7 @@ Eric Sweet <sweet.22@wright.edu>
 Nguyen Vo <vo.8@wright.edu>
 Amila Dias <asdtech153@live.com>
 Katherine Lemmert <katlemmert001@gmail.com>
+Ashley Reese <irish.4@wright.edu>
 Nathan Schroer <schroer.14@wright.edu>
 Hayden Richter <richter.20@wright.edu>
 Joshua Shaw <shaw.150@wright.edu>
@@ -50,4 +55,4 @@ Alexander Voultos <voultos.2@wright.com>
 Sara Walsh <uglypurses@yahoo.com>
 Isaiah Winfrey <winfrey.5@wright.edu>
 Joseph Yancey <yancey.14@wright.edu>
-Adam Cone <cone.14@wright.edu>
+Adam Cone <cone.14@wright.edu>
diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
 # RaiderPlanner
 #### The best study planner since the Gantt Diagram
 
-Please have a look at the [project website](https://rsanchez-wsu.github.io/RaiderPlanner) for information about RaiderPlanner.
+Please have a look at the [project website](https://rsanchez-wsu.github.io/RaiderPlanner)(old website) for information about RaiderPlanner.
 
 If you would like to contribute to RaiderPlanner, then please read about configuring the [development toolchain](TOOLCHAIN.md) and then read the [contributor guidelines](CONTRIBUTING.md).
 
 
 | Branch  | Build status  |
 | ------------- | ------------- |
-| rsanchez-wsu/master: | [![Build Status](https://api.travis-ci.org/rsanchez-wsu/RaiderPlanner.svg?branch=master)](https://travis-ci.org/rsanchez-wsu/RaiderPlanner)  |
+| gzdwsu/master: | [![Build Status](https://api.travis-ci.org/gzdwsu/RaiderPlanner.svg?branch=master)](https://travis-ci.org/gzdwsu/RaiderPlanner)  |
 
 
 
diff --git a/about.html b/about.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+    <title>RaiderPlanner</title>
+    <link rel="stylesheet" href="assets/css/normalize.css">
+    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,700">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Kaushan+Script">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700">
+    <link rel="stylesheet" href="assets/fonts/font-awesome.min.css">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Bigshot+One">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/aos/2.1.1/aos.css">
+    <link rel="stylesheet" href="assets/css/untitled.css">
+	<link rel="stylesheet" href="assets/css/main.css">
+    <link rel="icon" href="assets/img/new.png">
+    <link rel="favicon" href="assets/img/new.png" height="21" width="42">
+</head>
+
+<body id="page-top">
+    <nav class="navbar navbar-dark navbar-expand-lg fixed-top bg-dark" "text-left" id="mainNav">
+        <div class="container"><a class="navbar-brand" href="#page-top"><img src="assets/img/new.png" img float="center"></a><button class="navbar-toggler navbar-toggler-right" data-toggle="collapse"
+                data-target="#navbarResponsive" type="button" data-toogle="collapse" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"><i class="fa fa-bars"></i></button>
+            <div class="collapse navbar-collapse" id="navbarResponsive" float="left">
+                <ul class="nav navbar-nav ml-auto text-uppercase">
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href="#page-top">Home</a></li>
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href="#about">About</a></li>
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href="#portfolio">Contribute</a></li>
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href=help.html>Help</a></li>
+		    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" "text-left"  href="demo.html">Online Demo</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <header class="masthead">
+        <div class="container">
+            <div class="intro-text">
+                <div class="intro-lead-in"><span style="color: rgb(132,59,59);">Welcome To&nbsp;</span></div>
+                <div class="intro-heading text-uppercase"><span class="text-capitalize" style="color: rgb(152,96,96);">RaiderPlanner</span></div><a class="btn btn-primary btn-xl text-uppercase js-scroll-trigger" role="button" href="#about" data-bs-hover-animate="tada" style="background-color: rgb(122,86,83);">Tell me more</a></div>
+        </div>
+    </header>
+<main> 
+ <h2>December 2016 Our Humble Beginnings</h2>
+ <p>Students from the University of East Anglia located in Norwich, England took on a Study Planner project as part of their course work for
+  "CMP-5012B - Software Engineering I". Which led to PearPlanner.</P>
+
+<h2>RaiderPlanner A new project is Born</h2>
+<p>RaiderPlanner is the PearPlanner's direct successor, a class project comprising most of the coursework for Wright State 
+ University's "Introduction to the Design of IT Syetems" class (CEG 3120). The class uses GitHub as the file storage repository.</p>
+
+<h2>Purpose</h2>
+<p>The purpose of this project is to implement a program containing the pertinent information from a given semester 
+ (coursework, deadline information, exam information etc.) with a simple Graphical User Interface.</p>
+
+<h2>Capabilities
+ 4 major ones:</h2>
+<p>
+    1.Load module, coursework and deadline information from a defined file format.
+    2.Define study tasks, details, milestones and deadlines.
+    3.Record study activities that contribute towards completing study tasks and milestones.
+    4.Visualize activities, dependencies, intermediate milestones and deadlines using Gantt chart representation as well as a study progress dashboard that highlights upcoming deadlines and progress towards completing milestones and time spent for each module.
+</p>
+
+
+
+</main>    
+<footer>
+<p>RaiderPlanner: Raider up!</p>
+</footer>  
+</body>
+</html>
diff --git a/build.gradle b/build.gradle
@@ -37,6 +37,7 @@ buildscript {
 		classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.1'
 		classpath 'gradle.plugin.edu.sc.seis.gradle:launch4j:2.4.4'
 		classpath "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.3"
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE"    
 	}
 }
 
@@ -47,6 +48,9 @@ apply plugin: 'checkstyle'
 apply plugin: 'com.github.spotbugs'
 apply plugin: 'edu.sc.seis.launch4j'
 apply plugin: 'org.junit.platform.gradle.plugin'
+apply plugin: 'war'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
 
 
 compileJava {
@@ -105,6 +109,7 @@ repositories {
  * Gradle grabs dependencies from the above repositories.
  */
 dependencies {
+    //implementation 'org.springframework.book:spring-boot-dependencies:2.1.3.RELEASE'
 	compile 'net.sf.biweekly:biweekly:0.6.1'
 	compile 'commons-validator:commons-validator:1.6'
 	compile 'com.google.guava:guava:21.0'
@@ -129,8 +134,23 @@ dependencies {
 	compile 'org.junit.platform:junit-platform-runner:1.0.1'
 	compile 'org.junit.vintage:junit-vintage-engine:4.12.1'
 	implementation 'com.github.PlusHaze:TrayNotification:5393c3a54f'
-	compile fileTree(dir: 'src', include: ['*.jar'])
+	//compile fileTree(dir: 'src', include: ['*.jar'])
 	compile group: 'org.apache.derby', name: 'derby', version: '10.14.1.0'
+    // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
+    // add dependency for jackson's @JsonCreator and @JsonProperty annotations
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
+    // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
+    // add dependency for creating Spring Boot Rest applications
+    compile 'org.springframework.boot:spring-boot-starter-web:2.1.3.RELEASE'
+    // https://mvnrepository.com/artifact/org.springframework/spring-webmvc
+    // add dependency for consuming RESTful services
+    compile 'org.springframework:spring-webmvc:5.1.5.RELEASE'
+    // https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api
+    // add dependency for creating web applications
+    compile 'javax.servlet:javax.servlet-api:4.0.1'
+    // https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-war-plugin
+    // add dependency for assembling web application WAR files
+    compile 'org.apache.maven.plugins:maven-war-plugin:3.2.2'
 	runtime group: 'org.apache.derby', name: 'derby', version: '10.14.1.0'
 }
 

diff --git a/contribute.html b/contribute.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>    
+<title> 
+Contribute-WIP
+</title>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="stylesheet" href="assets/css/normalize.css">
+<link rel="stylesheet" href="assets/css/contribute.css">  
+</head>  
+<body>
+<header>
+  <iframe width="560" height="315" src="https://www.youtube.com/embed/9lUxAKLZX_s" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+</header>    
+  <nav class="navbar navbar-dark navbar-expand-lg fixed-top bg-dark" id="mainNav">
+        <div class="container"><a class="navbar-brand" href="#page-top" style="background-size: cover;min-width: 20px;height: 51px;"><img src="assets/img/new.png" style="height: 35px;width: 40px;padding-top: 0px;"></a><button class="navbar-toggler navbar-toggler-right" data-toggle="collapse"
+                data-target="#navbarResponsive" type="button" data-toogle="collapse" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"><i class="fa fa-bars"></i></button>
+            <div class="collapse navbar-collapse" id="navbarResponsive">
+                <ul class="nav navbar-nav ml-auto text-uppercase">
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href=index.html>Home</a></li>
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href=about.html>About</a></li>
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href=contribute.html>Contribute</a></li>
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href=help.html>Help</a></li>
+		    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" "text-left"  href="demo.html">Online Demo</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+<main> 
+  <h2>Moving Forward</h2>
+  <p>The Fall 2017 students of Mr. Sanchez' CEG-3120 class started out the semester working on several issues identified by Mr. Sanchez. As part of the course progression students were asked to identify issues or enhancements for RaiderPlanner. The objective is to incorporate some or all of these recommended changes throughout the course of the project.</p> 
+  <h2>Special Features</h2>
+  <p>The current implementation of RaiderPlanner (formerly PearPlanner) keeps the 4 central capabilities from the original project, along with implementation of several changes made by the CEG-3120 students. This planner can be used by a student to keep track of the major items due over the course of the semester, and includes tools allowing the user to add calendar reminders, make notes and assign tasks for each assignment.</p> 
+  <h2>Our inspiration: Pearplanner</h2>
+  <p>Credit for the original project goes to: Benjamin Dickson, Andrew Odintsov, Zilvinas Ceikauskas and Bijan Ghasemi Afshar</p>
+  <h2>Want to find this project?</h2>
+  <p>The orginal RaiderPlanner project can be found in a repository owned by Roberto Sanchez</p><a href="https://github.com/rsanchez-wsu/RaiderPlanner"</a>
+  <h2>User manual</h2>
+     <img src="assets/img/pearplanner.jpg" alt="User Manual"><p>Credit for the original project goes to: Benjamin Dickson, Andrew Odintsov, Zilvinas Ceikauskas and Bijan Ghasemi Afshar</p> 
+</main>    
+<footer>
+  <p>RaiderPlanner: Raider up!</p>
+</footer>  
+</body>
+</html>
diff --git a/demo.html b/demo.html
@@ -0,0 +1,72 @@
+<!-- Document initially begun by Kyle Ragan -->
+<!-- Note: if at some point in the future the instructor decides this is a pointless addition or not possible to add, anyone is free 
+to remove this from the site. It is only an idea I had and I would simply be interested to see if it can be done. Might end up working 
+best as some kind of animated walk-through thing rather than an actual online application within the website, but whoever works on this 
+in the future is free to decide what to try-->
+
+<!DOCTYPE html>
+<html>
+
+<!-- Credit for head, nav, and footer go to the makers of index and help, I used those in order to keep the same design on the page -->
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+    <title>RaiderPlanner</title>
+    <link rel="stylesheet" href="assets/css/normalize.css">
+    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,700">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Kaushan+Script">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700">
+    <link rel="stylesheet" href="assets/fonts/font-awesome.min.css">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Bigshot+One">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/aos/2.1.1/aos.css">
+    <link rel="stylesheet" href="assets/css/untitled.css">
+	<link rel="icon" href="assets/img/favnew.png">
+	<link rel="stylesheet" href="assets/css/main.css">
+</head>
+
+<body>
+    <!-- Navigation -->
+    <nav class="navbar navbar-dark navbar-expand-lg fixed-top bg-dark" id="mainNav">
+        <div class="container"><a class="navbar-brand" href="#page-top" style="background-size: cover;min-width: 20px;height: 51px;"><img src="assets/img/new.png" style="height: 35px;width: 40px;padding-top: 0px;"></a><button class="navbar-toggler navbar-toggler-right" data-toggle="collapse"
+                data-target="#navbarResponsive" type="button" data-toogle="collapse" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"><i class="fa fa-bars"></i></button>
+            <div class="collapse navbar-collapse" id="navbarResponsive">
+                <ul class="nav navbar-nav ml-auto text-uppercase">
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href=index.html>Home</a></li>
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href=about.html>About</a></li>
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href=contribute.html>Contribute</a></li>
+                    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" href=help.html>Help</a></li>
+		    <li class="nav-item" role="presentation"><a class="nav-link js-scroll-trigger" "text-left"  href="demo.html">Online Demo</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+
+	<section class="demo-class">
+		<h2>Coming Soon!</h2>
+		<p>An online demo experience of RaiderPlanner is in the works, check back in the future!</p>
+	</section>
+
+	<footer style="background-color: #d7d7d7;margin-top: 29px;">
+        <div class="container" style="background-color: rgba(220,216,216,0);">
+            <div class="row">
+                <div class="col-md-4"><span class="copyright" style="font-size: 22px;margin-top: 0px;padding-top: 0px;">RaiderPlanner</span></div>
+                <div class="col-md-4"><a class="btn btn-primary btn-lg btn-default" role="button" href="https://github.com/rsanchez-wsu/RaiderPlanner" target="_blank"><i class="fa fa-github fa-fw"></i><span class="network-name">&nbsp;github</span></a></div>
+                <div class="col-md-4">
+                    <a href="#portfolioModal7" class="portfolio-link" data-toggle="modal">
+                        <div class="portfolio-hover" style="margin-top: 4px;">
+                            <div class="portfolio-hover-content">
+                                <p>Credit for images and copyrights.</p>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </footer>
+  </body>
+
+</html>