Skip to content
Snippets Groups Projects
Commit d6a90b79 authored by Joshua Gill's avatar Joshua Gill
Browse files

Merge branch 'develop' into IssueSix 

# Conflicts:
#	build.gradle
#	src/main/java/com/example/clientproject/config/SecurityConfig.java
#	src/main/java/com/example/clientproject/data/users/Users.java
#	src/main/java/com/example/clientproject/web/controllers/HomeController.java
#	src/main/java/com/example/clientproject/web/controllers/SignInController.java
#	src/main/resources/database/Data Script/script.sql
#	src/main/resources/templates/fragments/nav.html
parents 8262e536 eddcb12c
No related branches found
No related tags found
4 merge requests!56tags will be saved to userFavTags table (needs user ID of current logged in user),!30merge,!24All Acceptance Criteria Met, password fields on "script.sql" and...,!23IssueSix complete
Hide whitespace changes
Inline Side-by-side
src/main/resources/templates/signUp.html 0 → 100644
+ 34
− 0
View file @ d6a90b79
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="css/bulma.min.css">
<link rel="stylesheet" type="text/css" href="css/signUp.css">
<html lang="en">
<head>
<meta charset="UTF-8">
<title>SignUp</title>
</head>
<body>
<div class="flex-container">
<div class="vert-flex-container" style="flex-grow: 3;">
<h1 class="has-text-weight-bold">Start collecting rewards <br>today!</h1>
<form action="/signup" th:method="post">
<div class="flex-container name-box-container">
<input class="input small-name-box" type="text" placeholder="Name" id="name" name="name"/>
<input class="input small-name-box" type="text" placeholder="Surname" id="surname" name="surname"/>
</div>
<input class="input large-input-box" type="email" placeholder="Email" id="email" name="email"/>
<input class="input large-input-box" type="password" placeholder="Password" id="password" name="password"/>
<button type="submit" class="button is-rounded signUp-Button">Sign Up</button>
</form>
</div>
<div class="loginPart" style="flex-grow: 4;">
<img style="position: absolute; top: 45px" src="imgs/Logo.png" width="112" height="28" class="logo">
<h2>Welcome!</h2>
<h3 class="special-text">Already a member of <br>ShopHub?<h3>
<button class="button is-rounded loginUp-Button">Sign in</button>
</div>
</div>
</body>
</html>
src/test/java/com/example/clientproject/data/shops/ShopsTests.java
+ 1
− 1
View file @ d6a90b79
......@@ -27,7 +27,7 @@ public class ShopsTests {
@Test
public void shouldGet12ShopsAfterInsert() throws Exception {
Shops newShop = new Shops("", "", 0, "", "", true);
Shops newShop = new Shops("", "", "", 0, "", "", true);
Shops shop = shopsRepo.save(newShop);
List<Shops> shopsList = shopsRepo.findAll();
......
src/test/java/com/example/clientproject/data/userPermissions/UserPermissionsTests.java
+ 1
− 1
View file @ d6a90b79
......@@ -45,7 +45,7 @@ public class UserPermissionsTests {
@Test
public void shouldGet158PermissionsAfterInsert() throws Exception {
Shops newShop = new Shops("", "", 0, "", "", true);
Shops newShop = new Shops("", "", "", 0, "", "", true);
shopsRepo.save(newShop);
TwoFactorMethods twoFactorMethods = twoFactorMethodsRepo.findByTwoFactorMethodId(1).get();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
......
src/test/java/com/example/clientproject/data/users/UsersTests.java
+ 1
− 0
View file @ d6a90b79
......@@ -44,3 +44,4 @@ public class UsersTests {
assertEquals(161, usersList.size());
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment