diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..adab172 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..44379ae --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..8edd092 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6f982ed --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/acceptance-test/build.gradle b/acceptance-test/build.gradle new file mode 100644 index 0000000..836da24 --- /dev/null +++ b/acceptance-test/build.gradle @@ -0,0 +1,81 @@ +plugins { + id "groovy" + id "idea" +} + +repositories { + maven { + url pinAppsDepsRepo + metadataSources { + artifact() + mavenPom() + } + } + maven { + url pinAppsReleasesRepo + metadataSources { + artifact() + mavenPom() + } + } + mavenLocal() +} + +ext { + gebVersion = '6.0' + spockVersion = '2.2-groovy-3.0' + seleniumVersion = '4.15.0' + webDriverManagerVersion = '5.6.2' +} + +dependencies { + implementation 'org.codehaus.groovy:groovy-all:3.0.8' + + testImplementation "org.gebish:geb-spock:${gebVersion}" + testImplementation "org.seleniumhq.selenium:selenium-support:${seleniumVersion}" + testImplementation "org.spockframework:spock-core:${spockVersion}" + testImplementation "org.seleniumhq.selenium:selenium-firefox-driver:${seleniumVersion}" + testImplementation "org.seleniumhq.selenium:selenium-chrome-driver:${seleniumVersion}" + testImplementation group: 'io.github.bonigarcia', name: 'webdrivermanager', version: webDriverManagerVersion +} + +test { + useJUnitPlatform() +} + +sourceSets { + acceptanceTest { + groovy + { + srcDirs = ['src/acceptanceTest/groovy'] + resources.srcDir file('src/acceptanceTest/resources') + compileClasspath += sourceSets.test.compileClasspath + runtimeClasspath += sourceSets.test.runtimeClasspath + } + } +} + +['firefox'].each { driver -> + task "${driver}acceptanceTest"(type: Test) { + useJUnitPlatform() + println("Created task: ${driver}acceptanceTest") + testClassesDirs = sourceSets.findByName("acceptanceTest").output.classesDirs + classpath = sourceSets.findByName("acceptanceTest").runtimeClasspath + + maxParallelForks = 1 + + reports { + html.outputLocation = reporting.file("$name/tests") + junitXml.outputLocation = file("$buildDir/test-results/$name") + html.required = true + } + outputs.upToDateWhen { false } + systemProperty 'geb.build.reportsDir', reporting.file("$name/geb") + + systemProperty 'geb.env', driver + + + } +} + + diff --git a/acceptance-test/src/acceptanceTest/groovy/pages/YahooQueryPage.groovy b/acceptance-test/src/acceptanceTest/groovy/pages/YahooQueryPage.groovy new file mode 100644 index 0000000..a7ea4f6 --- /dev/null +++ b/acceptance-test/src/acceptanceTest/groovy/pages/YahooQueryPage.groovy @@ -0,0 +1,18 @@ +import geb.Page + +class YahooQueryPage extends Page { + + static url = "https://www.yahoo.com/" + + static at = { title.contentEquals("Yahoo") } + + static content = { + searchField { $("input", name: "p")} + searchButton { $("button", id:"uh-search-button") } + } + + void search(String word) { + searchField.value(word) + searchButton.click() + } +} diff --git a/acceptance-test/src/acceptanceTest/groovy/pages/YahooResultPage.groovy b/acceptance-test/src/acceptanceTest/groovy/pages/YahooResultPage.groovy new file mode 100644 index 0000000..d378cb1 --- /dev/null +++ b/acceptance-test/src/acceptanceTest/groovy/pages/YahooResultPage.groovy @@ -0,0 +1,8 @@ +import geb.Page + +class YahooResultPage extends Page { + + public static String searchWord; + + static at = { title.startsWith(searchWord) } +} diff --git a/acceptance-test/src/acceptanceTest/groovy/tests/BaseSpec.groovy b/acceptance-test/src/acceptanceTest/groovy/tests/BaseSpec.groovy new file mode 100644 index 0000000..ff66ecf --- /dev/null +++ b/acceptance-test/src/acceptanceTest/groovy/tests/BaseSpec.groovy @@ -0,0 +1,6 @@ +import geb.spock.GebSpec + +class BaseSpec extends GebSpec{ + + +} diff --git a/acceptance-test/src/acceptanceTest/groovy/tests/YahooSpec.groovy b/acceptance-test/src/acceptanceTest/groovy/tests/YahooSpec.groovy new file mode 100644 index 0000000..a64cd29 --- /dev/null +++ b/acceptance-test/src/acceptanceTest/groovy/tests/YahooSpec.groovy @@ -0,0 +1,19 @@ +import geb.spock.GebSpec + +class YahooSpec extends BaseSpec{ + + def "Search \"hello!\""() { + String q = "hello!" + YahooResultPage.searchWord = q + + when: + to YahooQueryPage + + and: + search(q) + + then: + waitFor {at YahooResultPage} + } + +} diff --git a/acceptance-test/src/acceptanceTest/resources/GebConfig.groovy b/acceptance-test/src/acceptanceTest/resources/GebConfig.groovy new file mode 100644 index 0000000..18df81a --- /dev/null +++ b/acceptance-test/src/acceptanceTest/resources/GebConfig.groovy @@ -0,0 +1,55 @@ +import io.github.bonigarcia.wdm.WebDriverManager +import io.github.bonigarcia.wdm.config.DriverManagerType +import org.openqa.selenium.firefox.FirefoxDriver +import org.openqa.selenium.firefox.FirefoxOptions + +environments { + + + + firefox { + FirefoxOptions options = new FirefoxOptions() + options.setCapability("acceptInsecureCerts", true) + options.addArguments("--headless") + driver = { + DriverManagerType firefox = DriverManagerType.FIREFOX + WebDriverManager.getInstance(firefox).setup() + def tmpDriver = new FirefoxDriver(options) + tmpDriver.manage().window().maximize() + return tmpDriver + } + } + + +} + +atCheckWaiting = true +waiting { + timeout = 15 + retryInterval = 0.5 + presets { + slow { + timeout = 30 + retryInterval = 1 + } + medium { + timeout = 22 + retryInterval = 0.5 + } + fast { + timeout = 10 + } + waitOne { + timeout = 1 + } + verySlow { + timeout = 150 + retryInterval = 1 + } + } +} + + + +reportOnTestFailureOnly = true //takes screenshot only if a failure occurs +//quitCachedDriverOnShutdown = false //Use this if you want to prevent browser from closing diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..1b0420e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ + +# General settings +pinAppsDepsRepo=https://artifactory.intrafi.com/artifactory/pin-repository/ +pinAppsReleasesRepo=https://artifactory.intrafi.com/artifactory/pinapps-releases-local/ diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d4c0f2a --- /dev/null +++ b/settings.gradle @@ -0,0 +1,6 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'BusinessProject' +include 'acceptance-test', 'webapp' diff --git a/webapp/build.gradle b/webapp/build.gradle new file mode 100644 index 0000000..1ded3a4 --- /dev/null +++ b/webapp/build.gradle @@ -0,0 +1,47 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java-library' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + api libs.org.springframework.boot.spring.boot.starter.thymeleaf + api libs.org.springframework.boot.spring.boot.starter.web + api libs.org.springframework.boot.spring.boot.starter.data.jpa + api libs.org.springframework.boot.spring.boot.starter.validation + runtimeOnly libs.org.springframework.boot.spring.boot.devtools + runtimeOnly libs.com.mysql.mysql.connector.j + testImplementation libs.org.springframework.boot.spring.boot.starter.test +} + +group = 'com.business' +version = '0.0.1-SNAPSHOT' +description = 'BusinessProject' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +tasks.withType(Javadoc) { + options.encoding = 'UTF-8' +} + diff --git a/src/main/java/com/business/BusinessProjectApplication.java b/webapp/src/main/java/com/business/BusinessProjectApplication.java similarity index 100% rename from src/main/java/com/business/BusinessProjectApplication.java rename to webapp/src/main/java/com/business/BusinessProjectApplication.java diff --git a/src/main/java/com/business/Exceptions.java b/webapp/src/main/java/com/business/Exceptions.java similarity index 100% rename from src/main/java/com/business/Exceptions.java rename to webapp/src/main/java/com/business/Exceptions.java diff --git a/src/main/java/com/business/basiclogics/Logic.java b/webapp/src/main/java/com/business/basiclogics/Logic.java similarity index 100% rename from src/main/java/com/business/basiclogics/Logic.java rename to webapp/src/main/java/com/business/basiclogics/Logic.java diff --git a/src/main/java/com/business/controllers/AdminController.java b/webapp/src/main/java/com/business/controllers/AdminController.java similarity index 100% rename from src/main/java/com/business/controllers/AdminController.java rename to webapp/src/main/java/com/business/controllers/AdminController.java diff --git a/src/main/java/com/business/controllers/HomeController.java b/webapp/src/main/java/com/business/controllers/HomeController.java similarity index 100% rename from src/main/java/com/business/controllers/HomeController.java rename to webapp/src/main/java/com/business/controllers/HomeController.java diff --git a/src/main/java/com/business/controllers/OrderController.java b/webapp/src/main/java/com/business/controllers/OrderController.java similarity index 100% rename from src/main/java/com/business/controllers/OrderController.java rename to webapp/src/main/java/com/business/controllers/OrderController.java diff --git a/src/main/java/com/business/controllers/ProductController.java b/webapp/src/main/java/com/business/controllers/ProductController.java similarity index 100% rename from src/main/java/com/business/controllers/ProductController.java rename to webapp/src/main/java/com/business/controllers/ProductController.java diff --git a/src/main/java/com/business/controllers/UserController.java b/webapp/src/main/java/com/business/controllers/UserController.java similarity index 100% rename from src/main/java/com/business/controllers/UserController.java rename to webapp/src/main/java/com/business/controllers/UserController.java diff --git a/src/main/java/com/business/entities/Admin.java b/webapp/src/main/java/com/business/entities/Admin.java similarity index 100% rename from src/main/java/com/business/entities/Admin.java rename to webapp/src/main/java/com/business/entities/Admin.java diff --git a/src/main/java/com/business/entities/Orders.java b/webapp/src/main/java/com/business/entities/Orders.java similarity index 100% rename from src/main/java/com/business/entities/Orders.java rename to webapp/src/main/java/com/business/entities/Orders.java diff --git a/src/main/java/com/business/entities/Product.java b/webapp/src/main/java/com/business/entities/Product.java similarity index 100% rename from src/main/java/com/business/entities/Product.java rename to webapp/src/main/java/com/business/entities/Product.java diff --git a/src/main/java/com/business/entities/User.java b/webapp/src/main/java/com/business/entities/User.java similarity index 100% rename from src/main/java/com/business/entities/User.java rename to webapp/src/main/java/com/business/entities/User.java diff --git a/src/main/java/com/business/loginCredentials/AdminLogin.java b/webapp/src/main/java/com/business/loginCredentials/AdminLogin.java similarity index 100% rename from src/main/java/com/business/loginCredentials/AdminLogin.java rename to webapp/src/main/java/com/business/loginCredentials/AdminLogin.java diff --git a/src/main/java/com/business/loginCredentials/UserLogin.java b/webapp/src/main/java/com/business/loginCredentials/UserLogin.java similarity index 100% rename from src/main/java/com/business/loginCredentials/UserLogin.java rename to webapp/src/main/java/com/business/loginCredentials/UserLogin.java diff --git a/src/main/java/com/business/repositories/AdminRepository.java b/webapp/src/main/java/com/business/repositories/AdminRepository.java similarity index 100% rename from src/main/java/com/business/repositories/AdminRepository.java rename to webapp/src/main/java/com/business/repositories/AdminRepository.java diff --git a/src/main/java/com/business/repositories/OrderRepository.java b/webapp/src/main/java/com/business/repositories/OrderRepository.java similarity index 100% rename from src/main/java/com/business/repositories/OrderRepository.java rename to webapp/src/main/java/com/business/repositories/OrderRepository.java diff --git a/src/main/java/com/business/repositories/ProductRepository.java b/webapp/src/main/java/com/business/repositories/ProductRepository.java similarity index 100% rename from src/main/java/com/business/repositories/ProductRepository.java rename to webapp/src/main/java/com/business/repositories/ProductRepository.java diff --git a/src/main/java/com/business/repositories/UserRepository.java b/webapp/src/main/java/com/business/repositories/UserRepository.java similarity index 100% rename from src/main/java/com/business/repositories/UserRepository.java rename to webapp/src/main/java/com/business/repositories/UserRepository.java diff --git a/src/main/java/com/business/services/AdminServices.java b/webapp/src/main/java/com/business/services/AdminServices.java similarity index 100% rename from src/main/java/com/business/services/AdminServices.java rename to webapp/src/main/java/com/business/services/AdminServices.java diff --git a/src/main/java/com/business/services/OrderServices.java b/webapp/src/main/java/com/business/services/OrderServices.java similarity index 100% rename from src/main/java/com/business/services/OrderServices.java rename to webapp/src/main/java/com/business/services/OrderServices.java diff --git a/src/main/java/com/business/services/ProductServices.java b/webapp/src/main/java/com/business/services/ProductServices.java similarity index 100% rename from src/main/java/com/business/services/ProductServices.java rename to webapp/src/main/java/com/business/services/ProductServices.java diff --git a/src/main/java/com/business/services/UserServices.java b/webapp/src/main/java/com/business/services/UserServices.java similarity index 100% rename from src/main/java/com/business/services/UserServices.java rename to webapp/src/main/java/com/business/services/UserServices.java diff --git a/src/main/resources/application.properties b/webapp/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to webapp/src/main/resources/application.properties diff --git a/src/main/resources/static/Images/TEA.jpg b/webapp/src/main/resources/static/Images/TEA.jpg similarity index 100% rename from src/main/resources/static/Images/TEA.jpg rename to webapp/src/main/resources/static/Images/TEA.jpg diff --git a/src/main/resources/static/Images/TEA2.jpg b/webapp/src/main/resources/static/Images/TEA2.jpg similarity index 100% rename from src/main/resources/static/Images/TEA2.jpg rename to webapp/src/main/resources/static/Images/TEA2.jpg diff --git a/src/main/resources/static/Images/backgroundTea.jpg b/webapp/src/main/resources/static/Images/backgroundTea.jpg similarity index 100% rename from src/main/resources/static/Images/backgroundTea.jpg rename to webapp/src/main/resources/static/Images/backgroundTea.jpg diff --git a/src/main/resources/static/Images/final.jpg b/webapp/src/main/resources/static/Images/final.jpg similarity index 100% rename from src/main/resources/static/Images/final.jpg rename to webapp/src/main/resources/static/Images/final.jpg diff --git a/src/main/resources/static/Images/final2.jpg b/webapp/src/main/resources/static/Images/final2.jpg similarity index 100% rename from src/main/resources/static/Images/final2.jpg rename to webapp/src/main/resources/static/Images/final2.jpg diff --git a/src/main/resources/static/Images/final3.jpg b/webapp/src/main/resources/static/Images/final3.jpg similarity index 100% rename from src/main/resources/static/Images/final3.jpg rename to webapp/src/main/resources/static/Images/final3.jpg diff --git a/src/main/resources/static/Images/logo-black.png b/webapp/src/main/resources/static/Images/logo-black.png similarity index 100% rename from src/main/resources/static/Images/logo-black.png rename to webapp/src/main/resources/static/Images/logo-black.png diff --git a/src/main/resources/static/Images/logo-color (1).png b/webapp/src/main/resources/static/Images/logo-color (1).png similarity index 100% rename from src/main/resources/static/Images/logo-color (1).png rename to webapp/src/main/resources/static/Images/logo-color (1).png diff --git a/src/main/resources/static/Images/logo-color.png b/webapp/src/main/resources/static/Images/logo-color.png similarity index 100% rename from src/main/resources/static/Images/logo-color.png rename to webapp/src/main/resources/static/Images/logo-color.png diff --git a/src/main/resources/static/Images/logo-no-background.png b/webapp/src/main/resources/static/Images/logo-no-background.png similarity index 100% rename from src/main/resources/static/Images/logo-no-background.png rename to webapp/src/main/resources/static/Images/logo-no-background.png diff --git a/src/main/resources/static/Images/logo-white.png b/webapp/src/main/resources/static/Images/logo-white.png similarity index 100% rename from src/main/resources/static/Images/logo-white.png rename to webapp/src/main/resources/static/Images/logo-white.png diff --git a/src/main/resources/static/Images/logo-white2.png b/webapp/src/main/resources/static/Images/logo-white2.png similarity index 100% rename from src/main/resources/static/Images/logo-white2.png rename to webapp/src/main/resources/static/Images/logo-white2.png diff --git a/src/main/resources/static/Images/repairImage.jpg b/webapp/src/main/resources/static/Images/repairImage.jpg similarity index 100% rename from src/main/resources/static/Images/repairImage.jpg rename to webapp/src/main/resources/static/Images/repairImage.jpg diff --git a/src/main/resources/static/Images/robot-with-pliers.jpg b/webapp/src/main/resources/static/Images/robot-with-pliers.jpg similarity index 100% rename from src/main/resources/static/Images/robot-with-pliers.jpg rename to webapp/src/main/resources/static/Images/robot-with-pliers.jpg diff --git a/src/main/resources/static/Images/suhas.jpg b/webapp/src/main/resources/static/Images/suhas.jpg similarity index 100% rename from src/main/resources/static/Images/suhas.jpg rename to webapp/src/main/resources/static/Images/suhas.jpg diff --git a/src/main/resources/static/JavaScript/Products.js b/webapp/src/main/resources/static/JavaScript/Products.js similarity index 100% rename from src/main/resources/static/JavaScript/Products.js rename to webapp/src/main/resources/static/JavaScript/Products.js diff --git a/src/main/resources/static/Videos/teaTree.mp4 b/webapp/src/main/resources/static/Videos/teaTree.mp4 similarity index 100% rename from src/main/resources/static/Videos/teaTree.mp4 rename to webapp/src/main/resources/static/Videos/teaTree.mp4 diff --git a/src/main/resources/static/css/About.css b/webapp/src/main/resources/static/css/About.css similarity index 100% rename from src/main/resources/static/css/About.css rename to webapp/src/main/resources/static/css/About.css diff --git a/src/main/resources/static/css/Add_Admin.css b/webapp/src/main/resources/static/css/Add_Admin.css similarity index 100% rename from src/main/resources/static/css/Add_Admin.css rename to webapp/src/main/resources/static/css/Add_Admin.css diff --git a/src/main/resources/static/css/Add_Product.css b/webapp/src/main/resources/static/css/Add_Product.css similarity index 100% rename from src/main/resources/static/css/Add_Product.css rename to webapp/src/main/resources/static/css/Add_Product.css diff --git a/src/main/resources/static/css/Add_User.css b/webapp/src/main/resources/static/css/Add_User.css similarity index 100% rename from src/main/resources/static/css/Add_User.css rename to webapp/src/main/resources/static/css/Add_User.css diff --git a/src/main/resources/static/css/Admin_Page.css b/webapp/src/main/resources/static/css/Admin_Page.css similarity index 100% rename from src/main/resources/static/css/Admin_Page.css rename to webapp/src/main/resources/static/css/Admin_Page.css diff --git a/src/main/resources/static/css/BuyProduct.css b/webapp/src/main/resources/static/css/BuyProduct.css similarity index 100% rename from src/main/resources/static/css/BuyProduct.css rename to webapp/src/main/resources/static/css/BuyProduct.css diff --git a/src/main/resources/static/css/Home.css b/webapp/src/main/resources/static/css/Home.css similarity index 100% rename from src/main/resources/static/css/Home.css rename to webapp/src/main/resources/static/css/Home.css diff --git a/src/main/resources/static/css/Locate_us.css b/webapp/src/main/resources/static/css/Locate_us.css similarity index 100% rename from src/main/resources/static/css/Locate_us.css rename to webapp/src/main/resources/static/css/Locate_us.css diff --git a/src/main/resources/static/css/Login.css b/webapp/src/main/resources/static/css/Login.css similarity index 100% rename from src/main/resources/static/css/Login.css rename to webapp/src/main/resources/static/css/Login.css diff --git a/src/main/resources/static/css/Navigation.css b/webapp/src/main/resources/static/css/Navigation.css similarity index 100% rename from src/main/resources/static/css/Navigation.css rename to webapp/src/main/resources/static/css/Navigation.css diff --git a/src/main/resources/static/css/Products.css b/webapp/src/main/resources/static/css/Products.css similarity index 100% rename from src/main/resources/static/css/Products.css rename to webapp/src/main/resources/static/css/Products.css diff --git a/src/main/resources/static/css/Update_Admin.css b/webapp/src/main/resources/static/css/Update_Admin.css similarity index 100% rename from src/main/resources/static/css/Update_Admin.css rename to webapp/src/main/resources/static/css/Update_Admin.css diff --git a/src/main/resources/static/css/Update_Product.css b/webapp/src/main/resources/static/css/Update_Product.css similarity index 100% rename from src/main/resources/static/css/Update_Product.css rename to webapp/src/main/resources/static/css/Update_Product.css diff --git a/src/main/resources/static/css/Update_User.css b/webapp/src/main/resources/static/css/Update_User.css similarity index 100% rename from src/main/resources/static/css/Update_User.css rename to webapp/src/main/resources/static/css/Update_User.css diff --git a/src/main/resources/templates/About.html b/webapp/src/main/resources/templates/About.html similarity index 100% rename from src/main/resources/templates/About.html rename to webapp/src/main/resources/templates/About.html diff --git a/src/main/resources/templates/Add_Admin.html b/webapp/src/main/resources/templates/Add_Admin.html similarity index 100% rename from src/main/resources/templates/Add_Admin.html rename to webapp/src/main/resources/templates/Add_Admin.html diff --git a/src/main/resources/templates/Add_Product.html b/webapp/src/main/resources/templates/Add_Product.html similarity index 100% rename from src/main/resources/templates/Add_Product.html rename to webapp/src/main/resources/templates/Add_Product.html diff --git a/src/main/resources/templates/Add_User.html b/webapp/src/main/resources/templates/Add_User.html similarity index 100% rename from src/main/resources/templates/Add_User.html rename to webapp/src/main/resources/templates/Add_User.html diff --git a/src/main/resources/templates/Admin_Page.html b/webapp/src/main/resources/templates/Admin_Page.html similarity index 100% rename from src/main/resources/templates/Admin_Page.html rename to webapp/src/main/resources/templates/Admin_Page.html diff --git a/src/main/resources/templates/BuyProduct.html b/webapp/src/main/resources/templates/BuyProduct.html similarity index 100% rename from src/main/resources/templates/BuyProduct.html rename to webapp/src/main/resources/templates/BuyProduct.html diff --git a/src/main/resources/templates/Home.html b/webapp/src/main/resources/templates/Home.html similarity index 100% rename from src/main/resources/templates/Home.html rename to webapp/src/main/resources/templates/Home.html diff --git a/src/main/resources/templates/Locate_us.html b/webapp/src/main/resources/templates/Locate_us.html similarity index 100% rename from src/main/resources/templates/Locate_us.html rename to webapp/src/main/resources/templates/Locate_us.html diff --git a/src/main/resources/templates/Login.html b/webapp/src/main/resources/templates/Login.html similarity index 100% rename from src/main/resources/templates/Login.html rename to webapp/src/main/resources/templates/Login.html diff --git a/src/main/resources/templates/Navigation.html b/webapp/src/main/resources/templates/Navigation.html similarity index 100% rename from src/main/resources/templates/Navigation.html rename to webapp/src/main/resources/templates/Navigation.html diff --git a/src/main/resources/templates/Order_success.html b/webapp/src/main/resources/templates/Order_success.html similarity index 100% rename from src/main/resources/templates/Order_success.html rename to webapp/src/main/resources/templates/Order_success.html diff --git a/src/main/resources/templates/Products.html b/webapp/src/main/resources/templates/Products.html similarity index 100% rename from src/main/resources/templates/Products.html rename to webapp/src/main/resources/templates/Products.html diff --git a/src/main/resources/templates/Update_Admin.html b/webapp/src/main/resources/templates/Update_Admin.html similarity index 100% rename from src/main/resources/templates/Update_Admin.html rename to webapp/src/main/resources/templates/Update_Admin.html diff --git a/src/main/resources/templates/Update_Product.html b/webapp/src/main/resources/templates/Update_Product.html similarity index 100% rename from src/main/resources/templates/Update_Product.html rename to webapp/src/main/resources/templates/Update_Product.html diff --git a/src/main/resources/templates/Update_User.html b/webapp/src/main/resources/templates/Update_User.html similarity index 100% rename from src/main/resources/templates/Update_User.html rename to webapp/src/main/resources/templates/Update_User.html diff --git a/src/main/resources/templates/exception.html b/webapp/src/main/resources/templates/exception.html similarity index 100% rename from src/main/resources/templates/exception.html rename to webapp/src/main/resources/templates/exception.html diff --git a/src/test/java/com/business/BusinessProjectApplicationTests.java b/webapp/src/test/java/com/business/BusinessProjectApplicationTests.java similarity index 100% rename from src/test/java/com/business/BusinessProjectApplicationTests.java rename to webapp/src/test/java/com/business/BusinessProjectApplicationTests.java