+ 
-## Minimum Features
-* `RESTful` web service which consumes requests from a front-end web application and caches each request and the respective response to a database.
-* The application must support a login functionality.
+## Features
+* `RESTful` web service consumes requests from a front-end web application and caches each request and the respective response to a database.
+* The application supports a login functionality.
+* To access the services and view pages of the website a user will need to create their account, register and login with valid credentials.
+* This app will allow a user to plan their event by making a choice of the services, products, and equipment,
+* building their own package of products or purchasing the ready package, adding the product to shopping cart and view the total for purchased services.
+
+
+## Developmental Notes
-## Developmental Notes
-### Tech Stack Selection
-* Select at least 1 technology from each of the following categories:
+### Tech Stack
* **Version Control System**
- 1. Github
- 2. Bitbucket
-
+ Github
+
* **Wireframe**
- 1. Mockflow
- 2. Balsamiq
- 3. Lucidcharts
+ PNG files - images of the web pages
+
* **Frontend**
- 1. Angular
- 2. React
- 3. Vue.JS
+ Java Server Pages
+ Cascading Style Sheets(CSS)
+ JavaScript
* **Business Logic**
- 1. Java
- 2. TypeScript
+ Java
+
* **WebServer Implementation**
- 1. Spring Boot
- 2. At least 1 [backing service](https://12factor.net/backing-services) API
+ Spring Boot
+
* **Data Layer**
- 1. MySQL
- 2. PostgreSQL
- 3. MariaDB
-
- * **Web Server Cloud Deployment**
- 1. Heroku
- 2. AWS EC2 Instance
-
- * **Web Application Cloud Deployment**
- 1. Netlify
- 2. AWS EC2 Instance
-
-
-
+ MySQL
+
### Installation
-* It is advised that you make install each of the following technologies to ensure that are at least accessible
- * Install [NodeJs](https://nodejs.org/en/).
- * Install [Angular](http://angular.io/).
- * Install [AngularCli](https://cli.angular.io/).
diff --git a/README_deliverables.md b/README_deliverables.md
index 4bb20a97f..65d9aa71a 100644
--- a/README_deliverables.md
+++ b/README_deliverables.md
@@ -44,7 +44,7 @@
### Spring MVC
* This deliverable includes connecting no. 1, 2 and 3 deliverables to function together
- * Spring MVC: Responsible for responding to a request made by the user. This can be login, registration, etc. When using Spring MVC make sure to use at least the following functionalities: different type of session management, annotation-based controller, exception handling, models, model attributes.
+ * Spring MVC: Responsible for responding to a request made by the userAccount. This can be login, registration, etc. When using Spring MVC make sure to use at least the following functionalities: different type of session management, annotation-based controller, exception handling, models, model attributes.
### Junit (Test all DAO classes)
diff --git a/README_plagiarism.md b/README_plagiarism.md
deleted file mode 100644
index 5b071dae3..000000000
--- a/README_plagiarism.md
+++ /dev/null
@@ -1,20 +0,0 @@
-### A Note on Plagiarism
-* You are encouraged to ask others, including students, instructors, and StackOverflow, for help. However, it is NOT ACCEPTABLE TO COPY another person's code and submit it as your own. More importantly, it is detrimental to your learning and growth.
-* All of the following are considered plagiarism or cheating:
- * Turning in work that is not your own.
- * Turning in someone else's work as your own.
- * Hiring, or paying someone to do your work for you.
- * Copying words or code without giving credit.
- * Building or copying someone else’s idea without their knowledge or giving credit.
- * Giving incorrect information about a source.
- * Changing words, variable names, etc. but copying the code or files of a source without giving credit.
- * Copying so many ideas or code blocks from a source that it makes up the majority of your work, whether you give credit or not.
- * Failing to put a quotation in quotation marks.
-
-
-* In an effort to not plagiarize, credit for this content goes to:
-* [Plagiarism.org](plagiarism.org), specifically the “plagiarism 101” section. The content was adapted for the code. For more information, please see:
- * [What is Plagiarism](http://www.plagiarism.org/plagiarism-101/what-is-plagiarism)
- * [Types of Plagiarism](http://www.plagiarism.org/plagiarism-101/types-of-plagiarism)
- * [How do I safely write code in my own 'words' and not plagiarize?](http://programmers.stackexchange.com/questions/80167/how-do-i-safely-write-code-in-my-own-words-and-not-plagiarize)
- * [Avoiding Plagiarism: Writing Computer Code](http://www.upenn.edu/academicintegrity/ai_computercode.html)
diff --git a/README_suggested-project-topics.md b/README_suggested-project-topics.md
deleted file mode 100644
index 9b2ac965e..000000000
--- a/README_suggested-project-topics.md
+++ /dev/null
@@ -1,54 +0,0 @@
-
-## Suggested Project Topics
-
-### (Suggested Project Topic 1) TCP Application
-
-#### User Stories to Fulfill
-* As a client, (not logged in) I
- * can send messages to a _peer_.
- * can view default channels
- * can view all accessible channels
- * can view messages live as they are received
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/footer.jsp b/src/main/webapp/WEB-INF/jsp/footer.jsp
new file mode 100644
index 000000000..18a042be5
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/footer.jsp
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/head.jsp b/src/main/webapp/WEB-INF/jsp/head.jsp
new file mode 100644
index 000000000..a097f891c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/head.jsp
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/header.jsp b/src/main/webapp/WEB-INF/jsp/header.jsp
new file mode 100644
index 000000000..4dccd82b4
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -0,0 +1,16 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+
+ Let's plan your event together!
+
+
+ Contact Us
+Let's plan your event together!
+
Stop by for a coffee or Leave us a message!
+
+
+
+ 
+ 
+
+
+
+ Our Location: 2345 Party Ave, Charlotte NC
+Phone number: (704) 567-7869
+
+
+
+
+
+ Party Time! We Bring Life to Your Party!
+ diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp new file mode 100644 index 000000000..18ed8263d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -0,0 +1,56 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + +
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/registration.jsp b/src/main/webapp/WEB-INF/jsp/registration.jsp
new file mode 100644
index 000000000..c9cbc1423
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/registration.jsp
@@ -0,0 +1,99 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/service.jsp b/src/main/webapp/WEB-INF/jsp/service.jsp
new file mode 100644
index 000000000..e1fb6d34d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/service.jsp
@@ -0,0 +1,511 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create New User Account
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ List of Services
+View Cart + +| + + | ++ + | ++ + | +
| + + | ++ + | ++ + | +
| + + | ++ + | ++ + | +
| + + | ++ + | ++ + | +
| + + | ++ + | ++ + | +
| + + | ++ + | ++ + | +
| + + | ++ + | ++ + | +
| + + | ++ + | ++ + | +
+ + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/services.jsp b/src/main/webapp/WEB-INF/jsp/services.jsp new file mode 100644 index 000000000..bb6d544ac --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/services.jsp @@ -0,0 +1,139 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> + + + + + +
Our Services
+We can make your event happen!
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%--template for dropdown menu
+
+
+ Party Supplies
+ +
+
+ Event Setting
+ +
+
+ Event Planning
+ +
+
+ Catering
+ +
+
+Flowers & Gifts
+ +
+
+--%>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/shopping_cart.jsp b/src/main/webapp/WEB-INF/jsp/shopping_cart.jsp
new file mode 100644
index 000000000..debcb372a
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/shopping_cart.jsp
@@ -0,0 +1,78 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+
+
+
+
+ Dynamic Drop Down List
+ +
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp
new file mode 100644
index 000000000..30d563b5c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -0,0 +1,56 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+
+ 
+ 
+ 
+
+
+ If you have a question about your order call (704) 567-7869
+
+
+
+
+
+
+
+ +
+ Shopping Cart
+| Service Options | +Quantity | +Unit Price | +Total | +
| + | + | Subtotal: $ |
+ |
View and Submit Your Order
+ +
+ 
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..ab7ea5cc0
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+ Welcome ${pageContext.request.userPrincipal.name} | Logout
+ +About Us
+
+ The Party Time Company offers services to make your family event unforgettable! We offer party supplies and rentals, assistance in your family event planning. Just anything you may need to make your event the best it can be! Whether it is a wedding, a child’s birthday, or a corporate event, we are here to offer you our superior service.
+ - needed to position the dropdown content */
+.dropdown {
+ position: relative;
+ display: inline-block;
+}
+
+/* Dropdown Content (Hidden by Default) */
+.dropdown-content {
+ display: none;
+ position: absolute;
+ background-color: grey;
+ min-width: 130px;
+ z-index: 1;
+}
+
+/* Links inside the dropdown */
+.dropdown-content a {
+ color: black;
+ padding: 5px 5px;
+ text-decoration: none;
+ display: block;
+}
+
+/* Change color of dropdown links on hover */
+.dropdown-content a:hover {background-color: grey}
+
+/* Show the dropdown menu (use JS to add this class to the .dropdown-content container when the user clicks on the dropdown button) */
+.show {display:block;}
\ No newline at end of file
diff --git a/src/main/webapp/resources/css/shopping_cart.css b/src/main/webapp/resources/css/shopping_cart.css
new file mode 100644
index 000000000..eeba766bf
--- /dev/null
+++ b/src/main/webapp/resources/css/shopping_cart.css
@@ -0,0 +1,96 @@
+html {
+ font-family: Cambria, serif;
+ color: midnightblue;
+ font-size: 20px;
+}
+header {
+ background-color: plum;
+}
+body {
+ background-color: plum;
+ background-position: center;
+ background-size: cover;
+ width: 980px;
+ margin-left: auto;
+ margin-right: 30px;
+ padding: 0px 10px 10px;
+}
+.topNavBar {
+ background-color: grey;
+ overflow: hidden;
+}
+
+.topNavBar a {
+ float: left;
+ display: block;
+ color: midnightblue;
+ text-align: center;
+ padding: 14px 16px;
+ text-decoration: none;
+ font-size: 17px;
+}
+
+.topNavBar a:hover {
+ background-color:whitesmoke;
+ color: blue;
+}
+
+.topNavBar a.active {
+ background-color:darkslategray;
+ color: white;
+}
+
+.topNavBar .icon {
+ display: none;
+}
+
+* {
+ box-sizing: border-box;
+}
+
+input[type=text], select, textarea {
+ width: 100%;
+ padding: 12px;
+ border: 1px solid gainsboro;
+ margin-top: 6px;
+ margin-bottom: 16px;
+ resize: vertical;
+}
+
+input[type=submit] {
+ background-color: plum;
+ color: midnightblue;
+ padding: 12px 20px;
+ border: 1px solid gainsboro;
+ cursor: pointer;
+}
+
+input[type=submit]:hover {
+ background-color: gray;
+}
+
+.container {
+ border-radius: 5px;
+ background-color: plum;
+ padding: 10px;
+}
+
+.column {
+ float: left;
+ width: 50%;
+ margin-top: 6px;
+ padding: 20px;
+}
+
+.row:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+
+@media screen and (max-width: 600px) {
+ .column, input[type=submit] {
+ width: 100%;
+ margin-top: 0;
+ }
+}
\ No newline at end of file
diff --git a/src/main/webapp/resources/css/style.css b/src/main/webapp/resources/css/style.css
new file mode 100644
index 000000000..fd4b16dfd
--- /dev/null
+++ b/src/main/webapp/resources/css/style.css
@@ -0,0 +1,94 @@
+html {
+ font-family: Cambria, serif;
+ color: midnightblue;
+ font-size: 15px;
+ background: #dda0dd;
+}
+body {
+ font-family: 'Montserrat', "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 25px;
+ color: midnightblue;
+ padding-top: 50px;
+ padding-bottom: 50px;
+ background-size: cover;
+ background: #dda0dd center;
+}
+
+header {
+ background: #dda0dd;
+}
+
+/*
+.container {
+ background: plum;
+}
+ */
+
+
+img {
+ float: right;
+}
+.topNavBar {
+ background-color: grey;
+ overflow: hidden;
+}
+
+.topNavBar a {
+ float: left;
+ display: block;
+ color: midnightblue;
+ text-align: center;
+ padding: 14px 16px;
+ text-decoration: none;
+ font-size: 17px;
+}
+
+.topNavBar a:hover {
+ background-color:whitesmoke;
+ color: blue;
+}
+
+.topNavBar a.active {
+ background-color:darkslategray;
+ color: white;
+}
+
+.topNavBar .icon {
+ display: none;
+}
+
+.form-heading {
+ text-align: center;
+ text-transform: uppercase;
+}
+.form-signin {
+ max-width: 360px;
+ padding: 15px;
+ margin: 0 auto;
+}
+.form-signin .form-control {
+ position: relative;
+ height: auto;
+ padding: 10px;
+ font-size: 15px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.form-signin .form-control:focus {
+ z-index: 3;
+}
+.form-signin input, .form-signin button {
+ margin-top: 10px;
+}
+.form-signin .form-signin-heading, .form-signin .checkbox {
+ margin-bottom: 10px;
+}
+.form-signin .checkbox {
+ font-weight: normal;
+}
+.has-error {
+ color: midnightblue;
+ line-height: 1;
+ font-size: 14px;
+}
\ No newline at end of file
diff --git a/src/main/webapp/resources/css/welcome.css b/src/main/webapp/resources/css/welcome.css
new file mode 100644
index 000000000..50f6ea26e
--- /dev/null
+++ b/src/main/webapp/resources/css/welcome.css
@@ -0,0 +1,52 @@
+html {
+ font-family: 'Montserrat', "Helvetica Neue", Helvetica, Arial, sans-serif;
+ color: midnightblue;
+ font-size: 15px;
+ padding: 0px;
+
+}
+body {
+ font-family: 'Montserrat', "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 25px;
+ color: midnightblue;
+ padding: 0px;
+ background-size: cover;
+ background: center;
+}
+
+* {
+ background: plum;
+}
+
+
+img {
+ float: right;
+}
+.topNavBar {
+ background-color: grey;
+ overflow: hidden;
+}
+
+.topNavBar a {
+ float: left;
+ display: block;
+ color: midnightblue;
+ text-align: center;
+ padding: 14px 16px;
+ text-decoration: none;
+ font-size: 17px;
+}
+
+.topNavBar a:hover {
+ background-color:whitesmoke;
+ color: blue;
+}
+
+.topNavBar a.active {
+ background-color:darkslategray;
+ color: white;
+}
+
+.topNavBar .icon {
+ display: none;
+}
diff --git a/src/main/webapp/resources/img/birthday.jpg b/src/main/webapp/resources/img/birthday.jpg
new file mode 100644
index 000000000..df0ad2bb6
Binary files /dev/null and b/src/main/webapp/resources/img/birthday.jpg differ
diff --git a/src/main/webapp/resources/img/catering.jpg b/src/main/webapp/resources/img/catering.jpg
new file mode 100644
index 000000000..7df646b70
Binary files /dev/null and b/src/main/webapp/resources/img/catering.jpg differ
diff --git a/src/main/webapp/resources/img/coffee_plan.jpg b/src/main/webapp/resources/img/coffee_plan.jpg
new file mode 100644
index 000000000..a1f52976f
Binary files /dev/null and b/src/main/webapp/resources/img/coffee_plan.jpg differ
diff --git a/src/main/webapp/resources/img/flowers.jpg b/src/main/webapp/resources/img/flowers.jpg
new file mode 100644
index 000000000..e4c197fa3
Binary files /dev/null and b/src/main/webapp/resources/img/flowers.jpg differ
diff --git a/src/main/webapp/resources/img/gifts.jpeg b/src/main/webapp/resources/img/gifts.jpeg
new file mode 100644
index 000000000..4df34f434
Binary files /dev/null and b/src/main/webapp/resources/img/gifts.jpeg differ
diff --git a/src/main/webapp/resources/img/location.jpg b/src/main/webapp/resources/img/location.jpg
new file mode 100644
index 000000000..5036a1045
Binary files /dev/null and b/src/main/webapp/resources/img/location.jpg differ
diff --git a/src/main/webapp/resources/img/myparty.jpeg b/src/main/webapp/resources/img/myparty.jpeg
new file mode 100644
index 000000000..741a80a91
Binary files /dev/null and b/src/main/webapp/resources/img/myparty.jpeg differ
diff --git a/src/main/webapp/resources/img/party-organiser.jpeg b/src/main/webapp/resources/img/party-organiser.jpeg
new file mode 100644
index 000000000..dce713850
Binary files /dev/null and b/src/main/webapp/resources/img/party-organiser.jpeg differ
diff --git a/src/main/webapp/resources/js/contact_us.js b/src/main/webapp/resources/js/contact_us.js
new file mode 100644
index 000000000..d64b35d05
--- /dev/null
+++ b/src/main/webapp/resources/js/contact_us.js
@@ -0,0 +1,8 @@
+function myFunction() {
+ let i = document.getElementById("myTopnav");
+ if (i.className === "topNavBar") {
+ i.className += " responsive";
+ } else {
+ i.className = "topNavBar";
+ }
+}
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/services.js b/src/main/webapp/resources/js/services.js
new file mode 100644
index 000000000..08d341172
--- /dev/null
+++ b/src/main/webapp/resources/js/services.js
@@ -0,0 +1,28 @@
+function myFunction() {
+ let i = document.getElementById("myTopnav");
+ if (i.className === "topNavBar") {
+ i.className += " responsive";
+ } else {
+ i.className = "topNavBar";
+ }
+}
+
+function renderGrid() {
+ let blocks = document.getElementById("wrapper").children;
+ let cols = 4, newleft, newtop;
+ for(let i = 1; i < blocks.length; i++){
+ if (i % cols == 0) {
+ newtop = (blocks[i-cols].offsetTop + blocks[i-cols].offsetHeight);
+ blocks[i].style.top = newtop+"px";
+ } else {
+ if(blocks[i-cols]){
+ newleft = (blocks[i-cols].offsetTop + blocks[i-cols].offsetHeight);
+ blocks[i].style.top = newleft+"px";
+ }
+ newleft = (blocks[i-1].offsetLeft + blocks[i-1].offsetWidth);
+ blocks[i].style.left = newleft+"px";
+ }
+ }
+}
+window.addEventListener("load", renderGrid, false);
+window.addEventListener("resize", renderGrid, false);
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/utils.js b/src/main/webapp/resources/js/utils.js
new file mode 100644
index 000000000..629b00892
--- /dev/null
+++ b/src/main/webapp/resources/js/utils.js
@@ -0,0 +1,26 @@
+// Utility JS functions are to be defined here
+function resizeIFrameToFitContent( iFrame ) {
+ iFrame.width = iFrame.contentWindow.document.body.scrollWidth;
+ iFrame.height = iFrame.contentWindow.document.body.scrollHeight;
+}
+
+// used to fetch all methods of an arbitrary object to display to client
+function getAllMethodsOfObject(obj) {
+ var result = [];
+ for (var id in obj) {
+ try {
+ if (typeof(obj[id]) == "function") {
+ result.push(id + ": " + obj[id].toString());
+ }
+ } catch (err) {
+ result.push(id + ": inaccessible");
+ }
+ }
+ return result;
+}
+
+
+
+function loadHtml(elementId, fileName) {
+ $(elementId).html('