Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor project configuration and enhance HTML structure for better … #175

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
Expand All @@ -27,6 +26,31 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
4 changes: 0 additions & 4 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
<filteredResources>
<filter>
Expand Down
24 changes: 16 additions & 8 deletions .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -1,37 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">






<wb-module deploy-name="onlinebookstore">






<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>






<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>





<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>






<property name="java-output-path" value="/onlinebookstore/build/classes"/>




<property name="context-root" value="onlinebookstore"/>






</wb-module>






Expand Down
2 changes: 1 addition & 1 deletion .settings/org.eclipse.wst.common.project.facet.core.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="jst.web" version="3.1"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.8"/>
<installed facet="jst.web" version="2.5"/>
</faceted-project>
3 changes: 2 additions & 1 deletion WebContent/CustomerHome.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="ISO-8859-1">
<title>Book Store</title>
Expand Down
31 changes: 8 additions & 23 deletions WebContent/CustomerLogin.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="ISO-8859-1">
<title>Book Store</title>
Expand All @@ -9,11 +10,10 @@
<link rel="icon" type="image/png" sizes="16x16"
href="./favicons/favicon-16x16.png">
<link rel="manifest" href="./favicons/site.webmanifest">
<link rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css">
<link rel="stylesheet" href="styles.css">
<style>
/* COMPACT CAPTCHA YELLOW */
/* Custom styles for the captcha box */
.capbox {
background: #ccc2a7;
background: linear-gradient(to right, #ccc2a7, #8f8874);
Expand All @@ -26,19 +26,16 @@
padding: 5px 8px 5px 8px;
border-radius: 4px 4px 4px 4px;
}

.capbox-inner {
font: bold 12px arial, sans-serif;
color: #000000;
background: rgba(255, 255, 255, 0.30);
/* SEMI TRANSPARENT BACKGROUND */
margin: 0px auto 0px auto;
padding: 3px 8px 5px 10px;
border-radius: 4px;
display: inline-block;
vertical-align: middle;
}

#CaptchaDiv {
color: #000000;
font: normal 25px Impact, Charcoal, arial, sans-serif;
Expand All @@ -52,24 +49,16 @@
margin-right: 4px;
border-radius: 4px;
}

#CaptchaInput {
border: black 2px solid;
margin: 3px 0px 1px 0px;
width: 105px;
}

input {
padding: 2px 2px;
margin: 2px 0;
box-sizing: border-box;
border-radius: 10px;
}
</style>
</head>
<body onload="funload()">
<header>
<nav class="navbar navbar-expand-sm bg-dark">
<nav class="navbar is-dark">
<a class="navbar-brand"> <!-- The below line can be an image or a h1, either will work -->
<img src="logo.png" alt="Google logo" width="60" height="30px">
</a>
Expand Down Expand Up @@ -102,7 +91,7 @@ <h1>Welcome to Online Book Store</h1>
id="theform">
<table class="tab" style="width: 40%">
<tr style="color: brown; padding-left: 35%">
<td>Customer LOGIN</td>
<th>Customer LOGIN</th>
</tr>
<tr>
<td><a href="SellerLogin.html"
Expand Down Expand Up @@ -158,7 +147,7 @@ <h1>Welcome to Online Book Store</h1>
why += "- Please Enter CAPTCHA Code.\n";
}
if (theform.CaptchaInput.value != "") {
if (ValidCaptcha(theform.CaptchaInput.value) == false) {
if (!ValidCaptcha()) {
why += "- The CAPTCHA Code Does Not Match.\n";
}
}
Expand All @@ -184,11 +173,7 @@ <h1>Welcome to Online Book Store</h1>
function ValidCaptcha() {
var str1 = removeSpaces(document.getElementById('txtCaptcha').value);
var str2 = removeSpaces(document.getElementById('CaptchaInput').value);
if (str1 == str2) {
return true;
} else {
return false;
}
return str1 == str2;
}

// Remove the spaces from the entered and generated code
Expand Down
Loading