From 11535fbaca145bd2e40892ee576bbb6f0c002af9 Mon Sep 17 00:00:00 2001
From: Iliyan Dimitrov <18351905+IliyanID@users.noreply.github.com>
Date: Wed, 22 Mar 2023 11:56:27 -0600
Subject: [PATCH] Updated passwords

---
 .../src/main/java/com/tco/Server/Server.java     | 14 +++++++-------
 Docker/Dockerfile                                | 16 ++++++++++++++++
 Docker/start.sh                                  |  0
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 Docker/Dockerfile
 create mode 100644 Docker/start.sh

diff --git a/Back-End/src/main/java/com/tco/Server/Server.java b/Back-End/src/main/java/com/tco/Server/Server.java
index 4ed6a9b..6bd63f9 100644
--- a/Back-End/src/main/java/com/tco/Server/Server.java
+++ b/Back-End/src/main/java/com/tco/Server/Server.java
@@ -48,7 +48,7 @@ private void configureRestfulApiServer() {
         String keyStorePassword = "password";
         https.secure(keyStoreLocation, keyStorePassword, null, null);
 
-        https.staticFiles.location("/public/build");
+        http.staticFiles.location("/public/build");
 
         Timer timer = new Timer();
         timer.scheduleAtFixedRate(new TimerTask() {
@@ -71,14 +71,14 @@ public void run() {
 
     private void processRestfulApiRequests()
     {
-        https.get("/Analytics",(request,response)->{
+        http.get("/Analytics",(request,response)->{
             response.type("text/html");
             response.header("Access-Control-Allow-Origin","*");
             response.status(200); //Success
             return analytics.returnHTML();
         });
 
-        https.get("/EtsyImages",(request,response)->{
+        http.get("/EtsyImages",(request,response)->{
             response.type("application/json");
             response.header("Access-Control-Allow-Origin","*");
             response.status(200); //Success
@@ -88,7 +88,7 @@ private void processRestfulApiRequests()
             return etsy.getJSONResponse();
         });
 
-        https.get("/InstagramImages",(request,response)->{
+        http.get("/InstagramImages",(request,response)->{
             response.type("application/json");
             response.header("Access-Control-Allow-Origin","*");
             response.status(200); //Success
@@ -97,12 +97,12 @@ private void processRestfulApiRequests()
             return instagram.getJSONResponse();
         });
 
-        https.get("/defaultsite",(request,response)->{
+        http.get("/defaultsite",(request,response)->{
             response.redirect("https://www.lindibracelets.com");
             return "";
         });
 
-        http.before(((request, response) -> {
+        /*http.before(((request, response) -> {
             final String url = request.url();
             if (url.startsWith("http://"))
             {
@@ -110,7 +110,7 @@ private void processRestfulApiRequests()
                 response.redirect("https://" + split[1]);
             }
             
-        }));
+        }));*/
     }
 
     public static void main(String[] args)
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
new file mode 100644
index 0000000..89fdffc
--- /dev/null
+++ b/Docker/Dockerfile
@@ -0,0 +1,16 @@
+FROM node:14-alpine
+RUN apk update
+RUN apk add git
+RUN apk add maven
+RUN apk add openjdk8-jre
+RUN npm install -g npm@6.14.15
+RUN git clone https://github.com/IliyanID/Lindi-Bracelets.git
+RUN cd /Lindi-Bracelets/Front-End && npm install && npm run build
+RUN cp -r /Lindi-Bracelets/Front-End/build /Lindi-Bracelets/Back-End/src/main/resources/public
+RUN cd /Lindi-Bracelets/Back-End && mvn -q package
+
+WORKDIR /Lindi-Bracelets/Back-End/target
+
+ENTRYPOINT java -jar Server-2.0-jar-with-dependencies.jar
+EXPOSE 443
+EXPOSE 80
\ No newline at end of file
diff --git a/Docker/start.sh b/Docker/start.sh
new file mode 100644
index 0000000..e69de29