Merge branch '015-Registro-#62' into develop

src/main/java/org/springframework/cheapy/model/Authorities.java

@@ -3,11 +3,14 @@ package org.springframework.cheapy.model;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "authorities")
-public class Authorities{
+public class Authorities {
 	
+
+	//@NotNull
 	@Id
 	String username;
 	
@@ -25,34 +28,41 @@ public class Authorities{
 	public void setAuthority(String authority) {
 		this.authority = authority;
 	}
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((authority == null) ? 0 : authority.hashCode());
+		result = prime * result + ((username == null) ? 0 : username.hashCode());
+		return result;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Authorities other = (Authorities) obj;
+		if (authority == null) {
+			if (other.authority != null)
+				return false;
+		} else if (!authority.equals(other.authority))
+			return false;
+		if (username == null) {
+			if (other.username != null)
+				return false;
+		} else if (!username.equals(other.username))
+			return false;
+		return true;
+	}
+	@Override
+	public String toString() {
+		return "Authorities [username=" + username + ", authority=" + authority + "]";
+	}
 	
 	
-//	@ManyToOne
-//    @JoinColumn(name = "username")
-//	private Usuario user;
-//
-//    @Size(min = 3, max = 50)
-//    private String authority;
-//
-//	public Usuario getUser() {
-//		return user;
-//	}
-//
-//	public void setUser(Usuario usern) {
-//		this.user = usern;
-//	}
-//
-//	public String getAuthority() {
-//		return authority;
-//	}
-//
-//	public void setAuthority(String authority) {
-//		this.authority = authority;
-//	}
-//
-//	public static long getSerialversionuid() {
-//		return serialVersionUID;
-//	}
 	
 	
 }

src/main/java/org/springframework/cheapy/model/Client.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -32,6 +34,9 @@ public class Client extends BaseEntity {
 
 	@NotEmpty
 	private String address;
+	
+	@Enumerated(value = EnumType.STRING)
+	private Municipio municipio;
 
 	// Hora de apertura del local
 	@DateTimeFormat(pattern = "HH:mm")
@@ -51,8 +56,8 @@ public class Client extends BaseEntity {
 	private String description;
 
 	// Codigo de activacion de cuenta
-	@NotEmpty
-	private String code;
+//	@NotEmpty
+//	private String code;
 
 	@NotEmpty
 	private String food;
@@ -60,6 +65,10 @@ public class Client extends BaseEntity {
 	@OneToOne(cascade = CascadeType.ALL)
 	@JoinColumn(name = "username", referencedColumnName = "username")
 	private User usuar;
+	
+	@OneToOne(cascade = CascadeType.ALL)
+	@JoinColumn(name = "code", referencedColumnName = "code")
+	private Code cod;
 
 	@OneToMany
 	private List<FoodOffer> foodOffers;
@@ -129,12 +138,20 @@ public class Client extends BaseEntity {
 		this.description = description;
 	}
 
-	public String getCode() {
-		return code;
+	public Municipio getMunicipio() {
+		return municipio;
 	}
 
-	public void setCode(String code) {
-		this.code = code;
+	public void setMunicipio(Municipio municipio) {
+		this.municipio = municipio;
+	}
+
+	public Code getCode() {
+		return cod;
+	}
+
+	public void setCode(Code code) {
+		this.cod = code;
 	}
 
 	public String getFood() {

src/main/java/org/springframework/cheapy/model/Code.java

@@ -0,0 +1,39 @@
+package org.springframework.cheapy.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+@Entity
+@Table(name = "codes")
+public class Code extends BaseEntity{
+	
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@NotNull
+	String code;
+	
+	Boolean activo;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public Boolean getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Boolean activo) {
+		this.activo = activo;
+	}
+	
+}

src/main/java/org/springframework/cheapy/model/Municipio.java

@@ -0,0 +1,5 @@
+package org.springframework.cheapy.model;
+
+public enum Municipio {
+sevilla,dosHermanas,carmona,bollullos,pilas,montellano,mairenaAljarafe,mairenaAlcor
+}

src/main/java/org/springframework/cheapy/model/User.java

@@ -5,20 +5,33 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.validation.constraints.NotBlank;
 
+import org.springframework.boot.context.properties.bind.DefaultValue;
+
+import net.bytebuddy.implementation.bind.annotation.Default;
+
 @Entity
 @Table(name = "users")
-public class User{
+public class User {
 	
+	
+
 	@Id
+	@NotBlank
 	private String username;
 
 	@NotBlank
 	private String password;
 	
-	boolean enabled;
-
-	private static final long serialVersionUID = 1L;
 	
+	private Boolean enabled;
+	
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
 
 	public String getUsername() {
 		return username;
@@ -36,11 +49,48 @@ public class User{
 		this.password = password;
 	}
 
-	public boolean getEnabled() {
-		return enabled;
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((enabled == null) ? 0 : enabled.hashCode());
+		result = prime * result + ((password == null) ? 0 : password.hashCode());
+		result = prime * result + ((username == null) ? 0 : username.hashCode());
+		return result;
 	}
 
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		User other = (User) obj;
+		if (enabled == null) {
+			if (other.enabled != null)
+				return false;
+		} else if (!enabled.equals(other.enabled))
+			return false;
+		if (password == null) {
+			if (other.password != null)
+				return false;
+		} else if (!password.equals(other.password))
+			return false;
+		if (username == null) {
+			if (other.username != null)
+				return false;
+		} else if (!username.equals(other.username))
+			return false;
+		return true;
 	}
+
+	@Override
+	public String toString() {
+		return "User [username=" + username + ", password=" + password + ", enabled=" + enabled + "]";
+	}
+	
+
 }

src/main/java/org/springframework/cheapy/model/Usuario.java

@@ -2,11 +2,14 @@ package org.springframework.cheapy.model;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "usuarios")
@@ -23,16 +26,12 @@ public class Usuario extends BaseEntity{
 	@NotBlank
 	private String	apellidos;
 
-	@NotBlank
-	private String	dni;
-
 	@NotBlank
 	private String	direccion;
 
-	@NotBlank
-	//@Pattern(regexp = "([+][^0][\\d]{0,2})?[ ]?([(][\\d]{0,4}[)])?[ ]?([\\d]{6,10})$")
-	private String	telefono;
-
+	@Enumerated(value = EnumType.STRING)
+	private Municipio municipio;
+	
 	@Email
 	@NotBlank
 	private String	email;
@@ -57,13 +56,6 @@ public class Usuario extends BaseEntity{
 		this.apellidos = apellidos;
 	}
 
-	public String getDni() {
-		return dni;
-	}
-
-	public void setDni(String dni) {
-		this.dni = dni;
-	}
 
 	public String getDireccion() {
 		return direccion;
@@ -73,12 +65,20 @@ public class Usuario extends BaseEntity{
 		this.direccion = direccion;
 	}
 
-	public String getTelefono() {
-		return telefono;
+	public Municipio getMunicipio() {
+		return municipio;
 	}
 
-	public void setTelefono(String telefono) {
-		this.telefono = telefono;
+	public void setMunicipio(Municipio municipio) {
+		this.municipio = municipio;
+	}
+
+	public User getUsuar() {
+		return usuar;
+	}
+
+	public void setUsuar(User usuar) {
+		this.usuar = usuar;
 	}
 
 	public String getEmail() {
@@ -89,6 +89,7 @@ public class Usuario extends BaseEntity{
 		this.email = email;
 	}
 
+
 	public User getUsuar() {
 		return usuar;
 	}
@@ -96,6 +97,7 @@ public class Usuario extends BaseEntity{
 	public void setUsuar(User username) {
 		this.usuar = username;
 	}
+
 	
 	
 }

src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java

@@ -1,8 +1,16 @@
 package org.springframework.cheapy.repository;
 
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.Repository;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cheapy.model.Authorities;
+import org.springframework.dao.DataAccessException;
 
-public interface AuthoritiesRepository extends  CrudRepository<Authorities, Integer>{
+public interface AuthoritiesRepository extends  CrudRepository<Authorities, String>{
+
+//	@Autowired
+//	void save(Authorities authorities);
+	
 	
 }

src/main/java/org/springframework/cheapy/repository/ClientRepository.java

@@ -6,12 +6,14 @@ import java.util.List;
 
 
 import org.springframework.cheapy.model.Client;
+import org.springframework.cheapy.model.Code;
+import org.springframework.cheapy.model.Usuario;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-public interface ClientRepository extends CrudRepository<Client, String> {
+public interface ClientRepository extends Repository<Client, Integer> {
 
 	@Query("SELECT client FROM Client client WHERE username =:username")
 	@Transactional(readOnly = true)
@@ -26,5 +28,7 @@ public interface ClientRepository extends CrudRepository<Client, String> {
 	@Transactional(readOnly = true)
 	List<Client> findAllClient();
 	
-	
-}
+	void save(Client client);
+
+}
+

src/main/java/org/springframework/cheapy/repository/CodeRepository.java

@@ -0,0 +1,19 @@
+package org.springframework.cheapy.repository;
+
+import org.springframework.cheapy.model.Client;
+import org.springframework.cheapy.model.Code;
+import org.springframework.cheapy.model.Usuario;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+public interface CodeRepository extends Repository<Code, Integer> {
+
+	void save(Code code);
+
+	@Query("SELECT code FROM Code code WHERE code.code =:code")
+	@Transactional(readOnly = true)
+	Code findCodeByCode(String code);
+	
+}

src/main/java/org/springframework/cheapy/repository/UserRepository.java

@@ -3,13 +3,18 @@ package org.springframework.cheapy.repository;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.Repository;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cheapy.model.User;
 import org.springframework.cheapy.model.Usuario;
 
-public interface UserRepository extends CrudRepository<Usuario, String> {
+public interface UserRepository extends Repository<User, Integer> {
 
 	@Query("SELECT u FROM User u WHERE username =:username")
 	@Transactional(readOnly = true)
 	User findByUsername(String username);
+
+	
+	void save(User user);
 }

src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java

@@ -1,3 +1,4 @@
+
 package org.springframework.cheapy.repository;
 
 import java.util.List;
@@ -23,4 +24,5 @@ public interface UsuarioRepository extends Repository<Usuario, String> {
 	
 	void save(Usuario usuario);
 	
+
 }

src/main/java/org/springframework/cheapy/service/AuthoritiesService.java

@@ -19,10 +19,11 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class AuthoritiesService {
-/*
-	private AuthoritiesRepository authoritiesRepository;
-	private UserService userService;
 
+	@Autowired
+	private AuthoritiesRepository authoritiesRepository;
+//	private UserService userService;
+/*
 	@Autowired
 	public AuthoritiesService(AuthoritiesRepository authoritiesRepository,UserService userService) {
 		this.authoritiesRepository = authoritiesRepository;
@@ -33,12 +34,20 @@ public class AuthoritiesService {
 	public Authorities findAuthoritiyByUser(User user) {
 		return this.authoritiesRepository.findByUser(user.getUsername());
 	}
-
+*/
 	@Transactional
 	public void saveAuthorities(Authorities authorities) throws DataAccessException {
 		authoritiesRepository.save(authorities);
 	}
 	
+	@Transactional
+	public void saveAuthorities(String username, String role) throws DataAccessException {
+		Authorities authority = new Authorities();
+		authority.setUsername(username);
+		authority.setAuthority(role);
+		authoritiesRepository.save(authority);
+	}
+/*	
 	@Transactional
 	public void saveAuthorities(String username, String role) throws DataAccessException {
 		Authorities authority = new Authorities();

src/main/java/org/springframework/cheapy/service/ClientService.java

@@ -1,10 +1,15 @@
 package org.springframework.cheapy.service;
 
 import java.util.List;
+import javax.validation.Valid;
+
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cheapy.model.Client;
+import org.springframework.cheapy.model.Code;
+import org.springframework.cheapy.model.Usuario;
 import org.springframework.cheapy.repository.ClientRepository;
+import org.springframework.cheapy.repository.CodeRepository;
 import org.springframework.dao.DataAccessException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -15,10 +20,12 @@ import org.springframework.transaction.annotation.Transactional;
 public class ClientService {
 
 	private ClientRepository clientRepository;
+	private CodeRepository codeRepository;
 	
 	@Autowired
-	public ClientService(final ClientRepository clientRepository) {
+	public ClientService(final ClientRepository clientRepository, CodeRepository codeRepository) {
 		this.clientRepository = clientRepository;
+		this.codeRepository = codeRepository;
 	}
 
 	@Transactional
@@ -27,6 +34,19 @@ public class ClientService {
 		String username = authentication.getName();
 		return this.clientRepository.findByUsername(username);
 	}
+
+	public void saveClient(final Client client) throws DataAccessException {
+		this.clientRepository.save(client);
+	}
+
+	public void saveCode(Code code) throws DataAccessException{
+		this.codeRepository.save(code);
+		
+	}
+
+	public Code findCodeByCode(String code) {
+		return this.codeRepository.findCodeByCode(code);
+	}
 	
 	@Transactional
 	public Client findByUsername(String username) throws DataAccessException {

src/main/java/org/springframework/cheapy/service/UserService.java

@@ -1,6 +1,7 @@
 package org.springframework.cheapy.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.FoodOffer;
 import org.springframework.cheapy.model.User;
 import org.springframework.cheapy.repository.UserRepository;
 import org.springframework.dao.DataAccessException;
@@ -25,5 +26,8 @@ public class UserService {
 		String username = authentication.getName();
 		return this.userRepository.findByUsername(username);
 	}
-	
+
+	public void saveUser(final User user) throws DataAccessException {
+		this.userRepository.save(user);
+	}
 }

src/main/java/org/springframework/cheapy/service/UsuarioService.java

@@ -5,6 +5,15 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cheapy.model.Usuario;
+
+package org.springframework.cheapy.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.User;
+import org.springframework.cheapy.model.Usuario;
+import org.springframework.cheapy.repository.UserRepository;
+
 import org.springframework.cheapy.repository.UsuarioRepository;
 import org.springframework.dao.DataAccessException;
 import org.springframework.security.core.Authentication;
@@ -17,11 +26,11 @@ public class UsuarioService {
 
 	private UsuarioRepository usuarioRepository;
 
-
 	@Autowired
 	public UsuarioService(final UsuarioRepository usuarioRepository) {
 		this.usuarioRepository = usuarioRepository;
 	}
+
 	
 	@Transactional
 	public Usuario getCurrentUsuario() throws DataAccessException {

src/main/java/org/springframework/cheapy/system/SingUpController.java

@@ -0,0 +1,198 @@
+package org.springframework.cheapy.system;
+
+import java.util.Collection;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.Authorities;
+import org.springframework.cheapy.model.Client;
+import org.springframework.cheapy.model.Code;
+import org.springframework.cheapy.model.Municipio;
+import org.springframework.cheapy.model.Owner;
+import org.springframework.cheapy.model.User;
+import org.springframework.cheapy.model.Usuario;
+import org.springframework.cheapy.service.AuthoritiesService;
+import org.springframework.cheapy.service.ClientService;
+import org.springframework.cheapy.service.OwnerService;
+import org.springframework.cheapy.service.UserService;
+import org.springframework.cheapy.service.UsuarioService;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+public class SingUpController {
+
+	//private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm";
+
+	@Autowired
+	private final ClientService clientService;
+	@Autowired
+	private final UserService userService;
+	@Autowired
+	private final UsuarioService usuarioService;
+	@Autowired
+	private final AuthoritiesService authoritiesService;
+
+
+	public SingUpController(final ClientService clientService, UserService userService, AuthoritiesService authoritiesService,
+			UsuarioService usuarioService) {
+		this.clientService = clientService;
+		this.userService = userService;
+		this.authoritiesService = authoritiesService;
+		this.usuarioService = usuarioService;
+
+	}
+
+	@InitBinder
+	public void setAllowedFields(WebDataBinder dataBinder) {
+		dataBinder.setDisallowedFields("id");
+	}
+
+	@GetMapping("/users/new")
+	public String singUpUserForm(Map<String, Object> model) {
+		Usuario usuario = new Usuario();
+		
+		User user=new User();
+		
+		usuario.setUsuar(user);
+		model.put("municipio", Municipio.values());
+		model.put("usuario", usuario);
+		//model.put("user", user);
+		return "singup/singUpUser";
+	}
+
+	@PostMapping("/users/new")
+	public String singUpUserForm(/*@Valid User user,*/ @Valid Usuario usuario, BindingResult result) {
+		Authorities auth=new Authorities();
+		User user= usuario.getUsuar();
+		user.setEnabled(true);
+		usuario.setUsuar(user);
+		auth.setUsername(user.getUsername());
+		auth.setAuthority("usuario");
+		if (result.hasErrors()) {
+			return "singup/singUpUser";
+		}
+		else {
+			//auth.setId(1);
+			//this.authoritiesService.saveAuthorities(auth);
+			this.usuarioService.saveUsuario(usuario);
+			this.userService.saveUser(user);
+			this.authoritiesService.saveAuthorities(usuario.getUsuar().getUsername(), "usuario");
+			
+			return "redirect:/";
+		}
+	}
+
+	@GetMapping("/clients/new")
+	public String singUpClientForm(Map<String, Object> model) {
+		Client cliente = new Client();
+		
+		User user=new User();
+		
+		cliente.setUsuar(user);
+		model.put("municipio", Municipio.values());
+		model.put("cliente", cliente);
+		//model.put("user", user);
+		return "singup/singUpClient";
+	}
+
+	@PostMapping("/clients/new")
+	public String singUpClientForm(/*@Valid User user,*/ @Valid Client cliente, BindingResult result) {
+		Authorities auth=new Authorities();
+		System.out.println(cliente.getCode().getCode());
+		String cod=cliente.getCode().getCode();
+		Code code=this.clientService.findCodeByCode(cod);
+		User user= cliente.getUsuar();
+		user.setEnabled(true);
+		cliente.setUsuar(user);
+		auth.setUsername(user.getUsername());
+		auth.setAuthority("client");
+		if (result.hasErrors()) {
+			return "singup/singUpClient";
+		}else if(code.getActivo().equals(false)) {
+			return "error";
+		}else {
+			//auth.setId(1);
+			//this.authoritiesService.saveAuthorities(auth);
+			code.setActivo(false);
+			this.clientService.saveCode(code);
+			cliente.setCode(code);
+			this.clientService.saveClient(cliente);
+			this.userService.saveUser(user);
+			this.authoritiesService.saveAuthorities(cliente.getUsuar().getUsername(), "client");
+			
+			
+			return "redirect:/";
+		}
+	}
+//	@GetMapping("/owners/find")
+//	public String initFindForm(Map<String, Object> model) {
+//		model.put("owner", new Owner());
+//		return "owners/findOwners";
+//	}
+//
+//	@GetMapping("/owners")
+//	public String processFindForm(Owner owner, BindingResult result, Map<String, Object> model) {
+//
+//		// allow parameterless GET request for /owners to return all records
+//		if (owner.getLastName() == null) {
+//			owner.setLastName(""); // empty string signifies broadest possible search
+//		}
+//
+//		// find owners by last name
+//		Collection<Owner> results = this.ownerService.findByLastName(owner.getLastName());
+//		if (results.isEmpty()) {
+//			// no owners found
+//			result.rejectValue("lastName", "notFound", "not found");
+//			return "owners/findOwners";
+//		}
+//		else if (results.size() == 1) {
+//			// 1 owner found
+//			owner = results.iterator().next();
+//			return "redirect:/owners/" + owner.getId();
+//		}
+//		else {
+//			// multiple owners found
+//			model.put("selections", results);
+//			return "owners/ownersList";
+//		}
+//	}
+//
+//	@GetMapping("/owners/{ownerId}/edit")
+//	public String initUpdateOwnerForm(@PathVariable("ownerId") int ownerId, Model model) {
+//		Owner owner = this.ownerService.findOwnerById(ownerId);
+//		model.addAttribute(owner);
+//		return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+//	}
+//
+//	@PostMapping("/owners/{ownerId}/edit")
+//	public String processUpdateOwnerForm(@Valid Owner owner, BindingResult result,
+//			@PathVariable("ownerId") int ownerId) {
+//		if (result.hasErrors()) {
+//			return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+//		}
+//		else {
+//			owner.setId(ownerId);
+//			this.ownerService.saveOwner(owner);
+//			return "redirect:/owners/{ownerId}";
+//		}
+//	}
+//	@GetMapping("/owners/{ownerId}")
+//	public ModelAndView showOwner(@PathVariable("ownerId") int ownerId) {
+//		ModelAndView mav = new ModelAndView("owners/ownerDetails");
+//		Owner owner = this.ownerService.findOwnerById(ownerId);
+//		
+//		mav.addObject(owner);
+//		return mav;
+//	}
+//	
+}

src/main/resources/db/mysql/data.sql

@@ -1,26 +1,44 @@
-INSERT INTO users (username,password,enabled) VALUES ('admin','admin', TRUE );
-INSERT INTO authorities VALUES ('admin','admin');
+INSERT INTO owners VALUES (1, 'Javi', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');
+INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749');
+INSERT INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763');
+INSERT INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198');
+INSERT INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765');
+INSERT INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654');
+INSERT INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387');
+INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683');
+INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435');
+INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487');
 
-INSERT INTO users (username,password,enabled) VALUES ('manoli','manoli', TRUE );
-INSERT INTO authorities VALUES ('manoli','client');
-INSERT INTO users (username,password,enabled) VALUES ('david','david', TRUE );
-INSERT INTO authorities VALUES ('david','client');
 
-INSERT INTO users (username,password,enabled) VALUES ('paco','paco', TRUE );
-INSERT INTO authorities VALUES ('paco','usuario');
-INSERT INTO users (username,password,enabled) VALUES ('lolo','lolo', TRUE );
-INSERT INTO authorities VALUES ('lolo','usuario');
-INSERT INTO users (username,password,enabled) VALUES ('pepe','pepe', TRUE );
-INSERT INTO authorities VALUES ('pepe','usuario');
+INSERT INTO users (dtype,username,password,enabled) VALUES ('User','admin','admin', TRUE );
+INSERT INTO authorities (username,authority) VALUES ('admin','admin');
 
-INSERT INTO administrators (id, username) VALUES (1, 'admin');
+INSERT INTO users (dtype,username,password,enabled) VALUES ('User','manoli','manoli', TRUE );
+INSERT INTO authorities (username,authority) VALUES ('manoli','client');
+INSERT INTO users (dtype,username,password,enabled) VALUES ('User','david','david', TRUE );
+INSERT INTO authorities (username,authority) VALUES ('david','client');
 
-INSERT INTO usuarios (id, nombre, apellidos, dni, direccion, telefono, email, username) VALUES (2, 'Paco', 'Naranjo', '21154416G', 'C/Esperanza', '666973647', 'Paco@gmail.com','paco');
-INSERT INTO usuarios (id, nombre, apellidos, dni, direccion, telefono, email, username) VALUES (3, 'Lolo', 'Lopez', '25486596L', 'C/Macarena', '690670547' ,'Lolo@gmail.com','lolo');
-INSERT INTO usuarios (id, nombre, apellidos, dni, direccion, telefono, email, username) VALUES (4, 'Pepe', 'Lopez', '12456776V', 'C/Macarena', '690670547', 'Pepe@gmail.com','pepe');
+INSERT INTO users (dtype,username,password,enabled) VALUES ('User','paco','paco', TRUE );
+INSERT INTO authorities (username,authority) VALUES ('paco','usuario');
+INSERT INTO users (dtype,username,password,enabled) VALUES ('User','lolo','lolo', TRUE );
+INSERT INTO authorities (username,authority) VALUES ('lolo','usuario');
+INSERT INTO users (dtype,username,password,enabled) VALUES ('User','pepe','pepe', TRUE );
+INSERT INTO authorities (username,authority) VALUES ('pepe','usuario');
+
+
+INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (1, 'admin', 'admin',  'C/admin', 'carmona', 'admin@gmail.com','admin');
+INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (2, 'Paco', 'Naranjo', 'C/Esperanza', 'sevilla', 'Paco@gmail.com','paco');
+INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (3, 'Lolo', 'Lopez',  'C/Macarena', 'dosHermanas', 'Lolo@gmail.com','lolo');
+INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (4, 'Pepe', 'Lopez', 'C/Macarena', 'carmona', 'Pepe@gmail.com','pepe');
+
+INSERT INTO codes (id,code,activo) VALUES (1,'code1',FALSE);
+INSERT INTO codes (id,code,activo) VALUES (2,'code2',FALSE);
+INSERT INTO codes (id,code,activo) VALUES (3,'code3',TRUE);
+INSERT INTO codes (id,code,activo) VALUES (4,'code4',TRUE);
+
+INSERT INTO clients (id, name, email, address, municipio, init, finish, telephone, description, food, username, code) VALUES (1,'bar manoli','manoli@gmail.com','C/Betis', 'sevilla','10:00','22:00','608726190', 'description 1', 'ESPAÑOLA','manoli', 'code1');
+INSERT INTO clients (id, name, email, address, init, municipio, finish, telephone, description, food, username, code)  VALUES (2,'bar david','david@gmail.com','C/Sevilla', 'dosHermanas','09:30','22:00','608726190', 'description 2', 'americana','david', 'code2');
 
-INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username) VALUES (1,'bar manoli','manoli@gmail.com','C/Betis','10:00:00','22:00:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli');
-INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username)  VALUES (2,'bar david','david@gmail.com','C/Sevilla','09:30:00','22:00:00','608726190', 'description 2', 'code2', 'americana','david');
 
 INSERT INTO food_offers(start, end, code, status, client_id, food, discount) VALUES ('2021-08-14 12:00:00', '2021-08-15 12:00:00', 'FO-1', 'inactive', 1, 'macarrones', 15);
 INSERT INTO food_offers(start, end, code, status, client_id, food, discount) VALUES ('2021-08-15 12:00:00', '2021-08-16 12:00:00', 'FO-2', 'active', 1, 'macarrones con tomate', 10);

src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp

@@ -0,0 +1,317 @@
+<%@ page session="false" trimDirectiveWhitespaces="true" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
+<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+
+<!-- %@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %-->  
+
+<style>
+	
+	
+	body {
+	  font-family: "montserratregular", sans-serif;
+	  height: 100%;
+	}
+	
+	a {
+	  color: #92badd;
+	  display:inline-block;
+	  text-decoration: none;
+	  font-weight: 400;
+	}
+	
+	h2 {
+	  text-align: center;
+	  font-size: 16px;
+	  font-weight: 600;
+	  text-transform: uppercase;
+	  display:inline-block;
+	  margin: 40px 8px 10px 8px; 
+	  color: #cccccc;
+	}
+	
+	
+	
+	/* STRUCTURE */
+	
+	.wrapper {
+	  display: flex;
+	  align-items: center;
+	  flex-direction: column; 
+	  justify-content: center;
+	  width: 100%;
+	  min-height: 100%;
+	  padding: 20px;
+	}
+	
+	#formContent {
+	  -webkit-border-radius: 10px 10px 10px 10px;
+	  border-radius: 10px 10px 10px 10px;
+	  background: #fff;
+	  padding: 30px;
+	  width: 90%;
+	  max-width: 450px;
+	  position: relative;
+	  padding: 0px;
+	  -webkit-box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
+	  box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
+	  text-align: center;
+	}
+	
+	#formFooter {
+	  background-color: #f6f6f6;
+	  border-top: 1px solid #dce8f1;
+	  padding: 25px;
+	  text-align: center;
+	  -webkit-border-radius: 0 0 10px 10px;
+	  border-radius: 0 0 10px 10px;
+	}
+	
+	
+	
+	/* TABS */
+	
+	h2.inactive {
+	  color: #cccccc;
+	}
+	
+	h2.active {
+	  color: #0d0d0d;
+	  border-bottom: 2px solid #5fbae9;
+	}
+	
+	
+	
+	/* FORM TYPOGRAPHY*/
+	
+	input[type=button], input[type=submit], input[type=reset]  {
+	  background-color: #56baed;
+	  border: none;
+	  color: white;
+	  padding: 15px 80px;
+	  text-align: center;
+	  text-decoration: none;
+	  display: inline-block;
+	  text-transform: uppercase;
+	  font-size: 13px;
+	  -webkit-box-shadow: 0 10px 30px 0 rgba(95,186,233,0.4);
+	  box-shadow: 0 10px 30px 0 rgba(95,186,233,0.4);
+	  -webkit-border-radius: 5px 5px 5px 5px;
+	  border-radius: 5px 5px 5px 5px;
+	  margin: 5px 20px 40px 20px;
+	  -webkit-transition: all 0.3s ease-in-out;
+	  -moz-transition: all 0.3s ease-in-out;
+	  -ms-transition: all 0.3s ease-in-out;
+	  -o-transition: all 0.3s ease-in-out;
+	  transition: all 0.3s ease-in-out;
+	}
+	
+	input[type=button]:hover, input[type=submit]:hover, input[type=reset]:hover  {
+	  background-color: #39ace7;
+	}
+	
+	input[type=button]:active, input[type=submit]:active, input[type=reset]:active  {
+	  -moz-transform: scale(0.95);
+	  -webkit-transform: scale(0.95);
+	  -o-transform: scale(0.95);
+	  -ms-transform: scale(0.95);
+	  transform: scale(0.95);
+	}
+	
+	input[type=text], input[type=password] {
+	  background-color: #f6f6f6;
+	  border: none;
+	  color: #0d0d0d;
+	  padding: 15px 32px;
+	  text-align: center;
+	  text-decoration: none;
+	  display: inline-block;
+	  font-size: 16px;
+	  margin: 5px;
+	  width: 85%;
+	  border: 2px solid #f6f6f6;
+	  -webkit-transition: all 0.5s ease-in-out;
+	  -moz-transition: all 0.5s ease-in-out;
+	  -ms-transition: all 0.5s ease-in-out;
+	  -o-transition: all 0.5s ease-in-out;
+	  transition: all 0.5s ease-in-out;
+	  -webkit-border-radius: 5px 5px 5px 5px;
+	  border-radius: 5px 5px 5px 5px;
+	}
+	
+	input[type=text]:focus {
+	  background-color: #fff;
+	  border-bottom: 2px solid #5fbae9;
+	}
+	
+	input[type=text]:placeholder {
+	  color: #cccccc;
+	}
+	
+	
+	
+	/* ANIMATIONS */
+	
+	/* Simple CSS3 Fade-in-down Animation */
+	.fadeInDown {
+	  -webkit-animation-name: fadeInDown;
+	  animation-name: fadeInDown;
+	  -webkit-animation-duration: 1s;
+	  animation-duration: 1s;
+	  -webkit-animation-fill-mode: both;
+	  animation-fill-mode: both;
+	}
+	
+	@-webkit-keyframes fadeInDown {
+	  0% {
+	    opacity: 0;
+	    -webkit-transform: translate3d(0, -100%, 0);
+	    transform: translate3d(0, -100%, 0);
+	  }
+	  100% {
+	    opacity: 1;
+	    -webkit-transform: none;
+	    transform: none;
+	  }
+	}
+	
+	@keyframes fadeInDown {
+	  0% {
+	    opacity: 0;
+	    -webkit-transform: translate3d(0, -100%, 0);
+	    transform: translate3d(0, -100%, 0);
+	  }
+	  100% {
+	    opacity: 1;
+	    -webkit-transform: none;
+	    transform: none;
+	  }
+	}
+	
+	/* Simple CSS3 Fade-in Animation */
+	@-webkit-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
+	@-moz-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
+	@keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
+	
+	.fadeIn {
+	  opacity:0;
+	  -webkit-animation:fadeIn ease-in 1;
+	  -moz-animation:fadeIn ease-in 1;
+	  animation:fadeIn ease-in 1;
+	
+	  -webkit-animation-fill-mode:forwards;
+	  -moz-animation-fill-mode:forwards;
+	  animation-fill-mode:forwards;
+	
+	  -webkit-animation-duration:1s;
+	  -moz-animation-duration:1s;
+	  animation-duration:1s;
+	}
+	
+	.fadeIn.first {
+	  -webkit-animation-delay: 0.4s;
+	  -moz-animation-delay: 0.4s;
+	  animation-delay: 0.4s;
+	}
+	
+	.fadeIn.second {
+	  -webkit-animation-delay: 0.6s;
+	  -moz-animation-delay: 0.6s;
+	  animation-delay: 0.6s;
+	}
+	
+	.fadeIn.third {
+	  -webkit-animation-delay: 0.8s;
+	  -moz-animation-delay: 0.8s;
+	  animation-delay: 0.8s;
+	}
+	
+	.fadeIn.fourth {
+	  -webkit-animation-delay: 1s;
+	  -moz-animation-delay: 1s;
+	  animation-delay: 1s;
+	}
+	
+	/* Simple CSS3 Fade-in Animation */
+	.underlineHover:after {
+	  display: block;
+	  left: 0;
+	  bottom: -10px;
+	  width: 0;
+	  height: 2px;
+	  background-color: #56baed;
+	  content: "";
+	  transition: width 0.2s;
+	}
+	
+	.underlineHover:hover {
+	  color: #0d0d0d;
+	}
+	
+	.underlineHover:hover:after{
+	  width: 100%;
+	}
+	
+	
+	
+	/* OTHERS */
+	
+	*:focus {
+	    outline: none;
+	} 
+	
+	#icon {
+	  width:60%;
+	}
+
+</style>
+<cheapy:layout pageName="singUp">
+    <h2 style="text-align:center;padding:5px">
+        <fmt:message key="new"/><fmt:message key="user"/>
+    </h2>
+	<form:form modelAttribute="cliente" class="form-horizontal"
+		id="add-foodOffer-form">
+		<div class="form-group has-feedback">
+			<cheapy:inputField label="Nombre" placeholder="Ponga aqui su nombre"
+				name="name" />
+			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
+				name="address" />
+			<div class="form-group">                   
+            <label>Municipio: </label>
+			<select name="municipio">
+				<c:forEach items="${municipio}" var="entry">
+					<option value="${entry}">${entry}</option>
+				</c:forEach>
+			</select>
+			</div>
+			<cheapy:inputField label="Hora de apertura" placeholder="Ponga aqui su hora de apertura"
+				name="init" />
+			<cheapy:inputField label="Hora de cierre" placeholder="Ponga aqui su hora de cierre"
+				name="finish" />
+			<cheapy:inputField label="Teléfono" placeholder="Ponga aqui el teléfono del local"
+				name="telephone" />
+			<cheapy:inputField label="Descripción" placeholder="Ponga aqui su descripción"
+				name="description" />
+			<cheapy:inputField label="Email" placeholder="Ponga aqui su email"
+				name="email" />
+			<cheapy:inputField label="Tipo de comida" placeholder="Indique que tipo de comida sirve su negocio"
+				name="food" />
+			<cheapy:inputField label="Nombre de usuario" placeholder="Ponga aqui su nombre de usuario"
+				name="usuar.username" />
+			<cheapy:inputField label="Contraseña" placeholder="Ponga aqui su contraseña"
+				name="usuar.password" />
+			<cheapy:inputField label="Código de activación" placeholder="Ponga aqui el código que se le suministro al firmar el contrato"
+				name="code.code" />
+			<input type="submit" class="fadeIn fourth" value="Registrarse">
+		</div>
+	</form:form>
+
+</cheapy:layout>
+

src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp

@@ -0,0 +1,307 @@
+<%@ page session="false" trimDirectiveWhitespaces="true" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
+<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+
+<!-- %@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %-->  
+
+<style>
+	
+	
+	body {
+	  font-family: "montserratregular", sans-serif;
+	  height: 100%;
+	}
+	
+	a {
+	  color: #92badd;
+	  display:inline-block;
+	  text-decoration: none;
+	  font-weight: 400;
+	}
+	
+	h2 {
+	  text-align: center;
+	  font-size: 16px;
+	  font-weight: 600;
+	  text-transform: uppercase;
+	  display:inline-block;
+	  margin: 40px 8px 10px 8px; 
+	  color: #cccccc;
+	}
+	
+	
+	
+	/* STRUCTURE */
+	
+	.wrapper {
+	  display: flex;
+	  align-items: center;
+	  flex-direction: column; 
+	  justify-content: center;
+	  width: 100%;
+	  min-height: 100%;
+	  padding: 20px;
+	}
+	
+	#formContent {
+	  -webkit-border-radius: 10px 10px 10px 10px;
+	  border-radius: 10px 10px 10px 10px;
+	  background: #fff;
+	  padding: 30px;
+	  width: 90%;
+	  max-width: 450px;
+	  position: relative;
+	  padding: 0px;
+	  -webkit-box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
+	  box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
+	  text-align: center;
+	}
+	
+	#formFooter {
+	  background-color: #f6f6f6;
+	  border-top: 1px solid #dce8f1;
+	  padding: 25px;
+	  text-align: center;
+	  -webkit-border-radius: 0 0 10px 10px;
+	  border-radius: 0 0 10px 10px;
+	}
+	
+	
+	
+	/* TABS */
+	
+	h2.inactive {
+	  color: #cccccc;
+	}
+	
+	h2.active {
+	  color: #0d0d0d;
+	  border-bottom: 2px solid #5fbae9;
+	}
+	
+	
+	
+	/* FORM TYPOGRAPHY*/
+	
+	input[type=button], input[type=submit], input[type=reset]  {
+	  background-color: #56baed;
+	  border: none;
+	  color: white;
+	  padding: 15px 80px;
+	  text-align: center;
+	  text-decoration: none;
+	  display: inline-block;
+	  text-transform: uppercase;
+	  font-size: 13px;
+	  -webkit-box-shadow: 0 10px 30px 0 rgba(95,186,233,0.4);
+	  box-shadow: 0 10px 30px 0 rgba(95,186,233,0.4);
+	  -webkit-border-radius: 5px 5px 5px 5px;
+	  border-radius: 5px 5px 5px 5px;
+	  margin: 5px 20px 40px 20px;
+	  -webkit-transition: all 0.3s ease-in-out;
+	  -moz-transition: all 0.3s ease-in-out;
+	  -ms-transition: all 0.3s ease-in-out;
+	  -o-transition: all 0.3s ease-in-out;
+	  transition: all 0.3s ease-in-out;
+	}
+	
+	input[type=button]:hover, input[type=submit]:hover, input[type=reset]:hover  {
+	  background-color: #39ace7;
+	}
+	
+	input[type=button]:active, input[type=submit]:active, input[type=reset]:active  {
+	  -moz-transform: scale(0.95);
+	  -webkit-transform: scale(0.95);
+	  -o-transform: scale(0.95);
+	  -ms-transform: scale(0.95);
+	  transform: scale(0.95);
+	}
+	
+	input[type=text], input[type=password] {
+	  background-color: #f6f6f6;
+	  border: none;
+	  color: #0d0d0d;
+	  padding: 15px 32px;
+	  text-align: center;
+	  text-decoration: none;
+	  display: inline-block;
+	  font-size: 16px;
+	  margin: 5px;
+	  width: 85%;
+	  border: 2px solid #f6f6f6;
+	  -webkit-transition: all 0.5s ease-in-out;
+	  -moz-transition: all 0.5s ease-in-out;
+	  -ms-transition: all 0.5s ease-in-out;
+	  -o-transition: all 0.5s ease-in-out;
+	  transition: all 0.5s ease-in-out;
+	  -webkit-border-radius: 5px 5px 5px 5px;
+	  border-radius: 5px 5px 5px 5px;
+	}
+	
+	input[type=text]:focus {
+	  background-color: #fff;
+	  border-bottom: 2px solid #5fbae9;
+	}
+	
+	input[type=text]:placeholder {
+	  color: #cccccc;
+	}
+	
+	
+	
+	/* ANIMATIONS */
+	
+	/* Simple CSS3 Fade-in-down Animation */
+	.fadeInDown {
+	  -webkit-animation-name: fadeInDown;
+	  animation-name: fadeInDown;
+	  -webkit-animation-duration: 1s;
+	  animation-duration: 1s;
+	  -webkit-animation-fill-mode: both;
+	  animation-fill-mode: both;
+	}
+	
+	@-webkit-keyframes fadeInDown {
+	  0% {
+	    opacity: 0;
+	    -webkit-transform: translate3d(0, -100%, 0);
+	    transform: translate3d(0, -100%, 0);
+	  }
+	  100% {
+	    opacity: 1;
+	    -webkit-transform: none;
+	    transform: none;
+	  }
+	}
+	
+	@keyframes fadeInDown {
+	  0% {
+	    opacity: 0;
+	    -webkit-transform: translate3d(0, -100%, 0);
+	    transform: translate3d(0, -100%, 0);
+	  }
+	  100% {
+	    opacity: 1;
+	    -webkit-transform: none;
+	    transform: none;
+	  }
+	}
+	
+	/* Simple CSS3 Fade-in Animation */
+	@-webkit-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
+	@-moz-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
+	@keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
+	
+	.fadeIn {
+	  opacity:0;
+	  -webkit-animation:fadeIn ease-in 1;
+	  -moz-animation:fadeIn ease-in 1;
+	  animation:fadeIn ease-in 1;
+	
+	  -webkit-animation-fill-mode:forwards;
+	  -moz-animation-fill-mode:forwards;
+	  animation-fill-mode:forwards;
+	
+	  -webkit-animation-duration:1s;
+	  -moz-animation-duration:1s;
+	  animation-duration:1s;
+	}
+	
+	.fadeIn.first {
+	  -webkit-animation-delay: 0.4s;
+	  -moz-animation-delay: 0.4s;
+	  animation-delay: 0.4s;
+	}
+	
+	.fadeIn.second {
+	  -webkit-animation-delay: 0.6s;
+	  -moz-animation-delay: 0.6s;
+	  animation-delay: 0.6s;
+	}
+	
+	.fadeIn.third {
+	  -webkit-animation-delay: 0.8s;
+	  -moz-animation-delay: 0.8s;
+	  animation-delay: 0.8s;
+	}
+	
+	.fadeIn.fourth {
+	  -webkit-animation-delay: 1s;
+	  -moz-animation-delay: 1s;
+	  animation-delay: 1s;
+	}
+	
+	/* Simple CSS3 Fade-in Animation */
+	.underlineHover:after {
+	  display: block;
+	  left: 0;
+	  bottom: -10px;
+	  width: 0;
+	  height: 2px;
+	  background-color: #56baed;
+	  content: "";
+	  transition: width 0.2s;
+	}
+	
+	.underlineHover:hover {
+	  color: #0d0d0d;
+	}
+	
+	.underlineHover:hover:after{
+	  width: 100%;
+	}
+	
+	
+	
+	/* OTHERS */
+	
+	*:focus {
+	    outline: none;
+	} 
+	
+	#icon {
+	  width:60%;
+	}
+
+</style>
+<cheapy:layout pageName="singUp">
+    <h2 style="text-align:center;padding:5px">
+        <fmt:message key="new"/><fmt:message key="user"/>
+    </h2>
+	<form:form modelAttribute="usuario" class="form-horizontal"
+		id="add-foodOffer-form">
+		<div class="form-group has-feedback">
+			<cheapy:inputField label="Nombre" placeholder="Ponga aqui su nombre"
+				name="nombre" />
+			<cheapy:inputField label="Apellidos" placeholder="Ponga aqui sus apellidos"
+				name="apellidos" />
+			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
+				name="direccion" />
+			<div class="form-group">                   
+            <label>Municipio: </label>
+			<select name="municipio">
+				<c:forEach items="${municipio}" var="entry">
+					<option value="${entry}">${entry}</option>
+				</c:forEach>
+			</select>
+			</div>
+			<cheapy:inputField label="Email" placeholder="Ponga aqui su email"
+				name="email" />
+			<cheapy:inputField label="Nombre de usuario" placeholder="Ponga aqui su nombre de usuario"
+				name="usuar.username" />
+			<cheapy:inputField label="Contraseña" placeholder="Ponga aqui su contraseña"
+				name="usuar.password" />
+			<input type="submit" class="fadeIn fourth" value="Registrarse">
+		</div>
+	</form:form>
+
+</cheapy:layout>
+

src/main/webapp/WEB-INF/tags/menu.tag

@@ -77,6 +77,14 @@
 					<li><a href="<c:url value="/login" />">Iniciar sesión</a></li>
 					<!--<li><a href="<c:url value="/users/new" />">Register</a></li>-->
 				</sec:authorize>
+				<sec:authorize access="!isAuthenticated()">
+					<li><a href="<c:url value="/users/new" />">Registrarse Usuario</a></li>
+					<!--<li><a href="<c:url value="/users/new" />">Register</a></li>-->
+				</sec:authorize>
+				<sec:authorize access="!isAuthenticated()">
+					<li><a href="<c:url value="/clients/new" />">Registrarse Cliente</a></li>
+					<!--<li><a href="<c:url value="/users/new" />">Register</a></li>-->
+				</sec:authorize>
 				<sec:authorize access="isAuthenticated()">
 					<li class="dropdown"><a href="#" class="dropdown-toggle"
 						data-toggle="dropdown"> <span class="glyphicon glyphicon-user"></span>