diff --git a/.classpath b/.classpath index ddeaa5b..68b32f5 100644 --- a/.classpath +++ b/.classpath @@ -1,13 +1,14 @@ - + - + + diff --git a/src/main/java/MessageResources.properties b/src/main/java/MessageResources.properties index a1e7aa0..28b7676 100644 --- a/src/main/java/MessageResources.properties +++ b/src/main/java/MessageResources.properties @@ -4,11 +4,19 @@ form.field.pre-choose=Must choose an option for the {0} first error.common.required=Required error.password.wrong=Wrong password - user.not-found.error=User not found + user.username-taken.error=Username's already taken user.delete.at-least-one.error=Must keep at least one user +user.email-format.error=Email with incorrect format user.create.success=User "{0}" was created successfully user.update.success=User "{0}" was update successfully user.delete.success=User "{0}" was deleted successfully + +company.name-taken.error=Name's already taken +company.not-found.error=Company not found +company.delete.at-least-one.error=Must keep at least one company +company.create.success=Company "{0}" was created successfully +company.update.success=Company "{0}" was update successfully +company.delete.success=Company "{0}" was deleted successfully \ No newline at end of file diff --git a/src/main/java/com/my_app/App.java b/src/main/java/com/my_app/App.java index 17e71c8..346cb68 100644 --- a/src/main/java/com/my_app/App.java +++ b/src/main/java/com/my_app/App.java @@ -15,12 +15,15 @@ import com.my_app.db.DataSourceFactory; import com.my_app.exception.AppGenericException; import com.my_app.model.City; +import com.my_app.model.Company; import com.my_app.model.Country; import com.my_app.model.User; import com.my_app.repo.CityRepository; +import com.my_app.repo.CompanyRepository; import com.my_app.repo.CountryRepository; import com.my_app.repo.UserRepository; import com.my_app.repo.impl.CityRepositoryImpl; +import com.my_app.repo.impl.CompanyRepositoryImpl; import com.my_app.repo.impl.CountryRepositoryImpl; import com.my_app.repo.impl.UserRepositoryImpl; @@ -81,6 +84,7 @@ private void initDb() { try (final Connection conn = this.dataSource.getConnection()) { initDbCountriesAndCities(conn); initDbUsers(conn); + initDbCompany(conn); } catch (SQLException e) { throw new AppGenericException("Error trying to insert initial db data", e); } @@ -115,20 +119,42 @@ private void initDbCountriesAndCities(Connection conn) throws SQLException { private void initDbUsers(Connection conn) throws SQLException { try (final Statement stmt = conn.createStatement()) { stmt.executeUpdate( - "CREATE TABLE \"USER\" (ID IDENTITY NOT NULL PRIMARY KEY, USERNAME VARCHAR(255) UNIQUE NOT NULL, PASSWORD VARCHAR(255) NOT NULL, CITY_ID BIGINT NOT NULL, FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))"); + "CREATE TABLE \"USER\" (ID IDENTITY NOT NULL PRIMARY KEY, USERNAME VARCHAR(255) UNIQUE NOT NULL, PASSWORD VARCHAR(255) NOT NULL, CITY_ID BIGINT NOT NULL,EMAIL VARCHAR(255) NOT NULL, FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))"); } final CityRepository cityRepository = new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn)); final UserRepository userRepository = new UserRepositoryImpl(conn, cityRepository); - userRepository.save(new User("admin", "admin", cityRepository.findById((long) this.random.nextInt(49) + 1))); + userRepository.save(new User("admin", "admin", cityRepository.findById((long) this.random.nextInt(49) + 1),"admin@gmail.com")); for (int i = 1; i < 11; i++) { userRepository.save( - new User("user" + i, "user" + i, cityRepository.findById((long) this.random.nextInt(49) + 1))); + new User("user" + i, "user" + i, cityRepository.findById((long) this.random.nextInt(49) + 1),"user" + i+"@gmail.com")); } Logger.debug("All users created: {}", userRepository.findAll()); } + /** + * + * @param conn + * @throws SQLException + */ + private void initDbCompany(Connection conn) throws SQLException { + try (final Statement stmt = conn.createStatement()) { + stmt.executeUpdate( + "CREATE TABLE \"COMPANY\" (ID IDENTITY NOT NULL PRIMARY KEY, NAME VARCHAR(255) UNIQUE NOT NULL, ADDRESS VARCHAR(255) NOT NULL, VATNUMBER VARCHAR(255) NOT NULL, CITY_ID BIGINT NOT NULL, FOREIGN KEY (CITY_ID) REFERENCES CITY(ID))"); + } + + final CityRepository cityRepository = new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn)); + + final CompanyRepository companyRepository = new CompanyRepositoryImpl(conn, cityRepository); + + for (int i = 1; i < 11; i++) { + companyRepository.save(new Company("company" +i , "address company" +i, "vat number"+i, cityRepository.findById((long) this.random.nextInt(49) + 1))); + } + + Logger.debug("All companies created: {}", companyRepository.findAll()); + } + } diff --git a/src/main/java/com/my_app/db/DataSourceFactory.java b/src/main/java/com/my_app/db/DataSourceFactory.java index 05c8c09..db1ffd1 100644 --- a/src/main/java/com/my_app/db/DataSourceFactory.java +++ b/src/main/java/com/my_app/db/DataSourceFactory.java @@ -8,7 +8,6 @@ public class DataSourceFactory { public DataSource create() { final JdbcDataSource ds = new JdbcDataSource(); - ds.setURL("jdbc:h2:mem:my_app;DB_CLOSE_DELAY=-1"); ds.setUser("sa"); ds.setPassword("sa"); diff --git a/src/main/java/com/my_app/model/Company.java b/src/main/java/com/my_app/model/Company.java new file mode 100644 index 0000000..d9d1ab0 --- /dev/null +++ b/src/main/java/com/my_app/model/Company.java @@ -0,0 +1,80 @@ +package com.my_app.model; + +public class Company { + private Long id; + private String name; + private String address; + private String vatNumber; + private City city; + + public Company() { + } + + public Company( String name,String address, String vatNumber, City city) { + super(); + this.name = name; + this.address=address; + this.vatNumber = vatNumber; + this.city = city; + } + + public Company(Long id, String name,String address, String vatNumber, City city) { + super(); + this.id = id; + this.name = name; + this.address=address; + this.vatNumber = vatNumber; + this.city = city; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + public String getAddress() { + return address; + } + + public void setAddress(String endereco) { + this.address = endereco; + } + + public String getVatNumber() { + return vatNumber; + } + + public void setVatNumber(String vatNumber) { + this.vatNumber = vatNumber; + } + + public City getCity() { + return city; + } + + public void setCity(City city) { + this.city = city; + } + + public boolean isNew() { + return this.id == null; + } + + @Override + public String toString() { + return String.format("Companies [id=%s, name=%s,address=%s, vatNumber=%s, city=%s]", id, name,address, vatNumber, city); + } + +} diff --git a/src/main/java/com/my_app/model/User.java b/src/main/java/com/my_app/model/User.java index 05b2167..e1bccb3 100644 --- a/src/main/java/com/my_app/model/User.java +++ b/src/main/java/com/my_app/model/User.java @@ -5,23 +5,26 @@ public class User { private String username; private String password; private City city; + private String email; public User() { } - public User(String username, String password, City city) { + public User(String username, String password, City city, String email) { super(); this.username = username; this.password = password; this.city = city; + this.email = email; } - public User(Long id, String username, String password, City city) { + public User(Long id, String username, String password, City city, String email) { super(); this.id = id; this.username = username; this.password = password; this.city = city; + this.email = email;//validarEmail(email); } public Long getId() { @@ -56,13 +59,22 @@ public void setCity(City city) { this.city = city; } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + public boolean isNew() { return this.id == null; } @Override public String toString() { - return String.format("User [id=%s, username=%s, password=%s, city=%s]", id, username, password, city); + return String.format("User [id=%s, username=%s, password=%s, city=%s, email=%s]", id, username, password, city, + email); } } diff --git a/src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java b/src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java new file mode 100644 index 0000000..bc32761 --- /dev/null +++ b/src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java @@ -0,0 +1,76 @@ +package com.my_app.page.company.delete; + +import java.sql.Connection; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import com.my_app.model.Company; +import com.my_app.service.CompanyService; +import com.my_app.service.factory.CompanyServiceFactory; +import com.my_app.utils.LoginUtils; + +public class CompanyDeleteAction extends Action { + @Override + public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest req, + HttpServletResponse res) throws Exception { + + if (LoginUtils.isUserNotLoggedIn(req.getSession())) { + return mapping.findForward("actionLoginRedir"); + } + + final ActionMessages actionMessages = new ActionMessages(); + final ActionErrors actionErrors = new ActionErrors(); + + + final CompanyService companyService = new CompanyServiceFactory().create((Connection) req.getAttribute("conn")); + + final int totalCompanisCount = companyService.findAll().size(); + + if (totalCompanisCount - 1 != 0) { + + final String companyIdStr = req.getParameter("companyId"); + + if (StringUtils.isNotBlank(companyIdStr)) { + + final Long companyId = Long.valueOf(companyIdStr); + + final Company company = companyService.findById(companyId); + + if (company != null) { + companyService.delete(company); + + actionMessages.add("topMsgs", new ActionMessage("company.delete.success", company.getName())); + } else { + actionErrors.add("topErrors", new ActionMessage("company.not-found.error")); + } + } else { + actionErrors.add("topErrors", new ActionMessage("company.not-found.error")); + } + + } else { + actionErrors.add("topErrors", new ActionMessage("company.delete.at-least-one.error")); + this.saveErrors(req, actionErrors); + } + + if (!actionMessages.isEmpty()) { + req.setAttribute("actionMessages", actionMessages); + this.saveMessages(req, actionMessages); + } else if (!actionErrors.isEmpty()) { + req.setAttribute("actionErrors", actionErrors); + this.saveErrors(req, actionErrors); + } + + return mapping.findForward("actionCompanies"); + } + +} diff --git a/src/main/java/com/my_app/page/company/list/CompanyListAction.java b/src/main/java/com/my_app/page/company/list/CompanyListAction.java new file mode 100644 index 0000000..56104a6 --- /dev/null +++ b/src/main/java/com/my_app/page/company/list/CompanyListAction.java @@ -0,0 +1,34 @@ +package com.my_app.page.company.list; + +import java.sql.Connection; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import com.my_app.service.CompanyService; +import com.my_app.service.factory.CompanyServiceFactory; +import com.my_app.utils.LoginUtils; + +public class CompanyListAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest req, + HttpServletResponse res) throws Exception { + + if (LoginUtils.isUserNotLoggedIn(req.getSession())) { + return mapping.findForward("actionLoginRedir"); + } + + final CompanyService companyService = new CompanyServiceFactory().create((Connection) req.getAttribute("conn")); + + req.setAttribute("companies", companyService.findAll()); + + return mapping.getInputForward(); + } + +} \ No newline at end of file diff --git a/src/main/java/com/my_app/page/company/save/CompanySaveAction.java b/src/main/java/com/my_app/page/company/save/CompanySaveAction.java new file mode 100644 index 0000000..a225dc1 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/CompanySaveAction.java @@ -0,0 +1,110 @@ +package com.my_app.page.company.save; + +import java.sql.Connection; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; + +import com.my_app.model.Company; +import com.my_app.page.company.save.service.CompanySaveService; +import com.my_app.page.company.save.service.CompanySaveServiceFactory; +import com.my_app.utils.LoginUtils; + +public class CompanySaveAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest req, + HttpServletResponse res) throws Exception { + final Connection conn = (Connection) req.getAttribute("conn"); + final CompanySaveService companySaveService = new CompanySaveServiceFactory().create(conn); + + final CompanySaveForm form = (CompanySaveForm) actionForm; + + req.setAttribute("form", form); + + if (LoginUtils.isUserNotLoggedIn(req.getSession())) { + return mapping.findForward("loginRedir"); + } else if ("save".equals(form.getAction())) { + return executeSaveAction(mapping, form, req, res, companySaveService); + } else if ("validate".equals(form.getAction())) { + return executeValidateAction(mapping, form, req, res, companySaveService); + } else { + return this.executeFormAction(mapping, form, req, res, companySaveService); + } + } + + private ActionForward executeFormAction(ActionMapping mapping, CompanySaveForm form, HttpServletRequest req, + HttpServletResponse res, CompanySaveService companySaveService) { + + if (form.isFormInit()) { + companySaveService.formInit(form); + form.setFormInit(false); + } + companySaveService.setRequestAttrs(form, req); + + return mapping.findForward("form"); + } + + + private ActionForward executeValidateAction(ActionMapping mapping, CompanySaveForm form, HttpServletRequest req, + HttpServletResponse res, CompanySaveService companySaveService) { + + if (companySaveService.validate(form)) { + form.getActionMessages().add("topMsgs", new ActionMessage("form.validation.success", form.getName())); + } else { + form.getActionErrors().add("topMsgs", new ActionMessage("form.validation.error")); + } + + if (!form.getActionMessages().isEmpty()) { + req.setAttribute("actionMessages", form.getActionMessages()); + this.saveMessages(req, form.getActionMessages()); + } else if (!form.getActionErrors().isEmpty()) { + req.setAttribute("actionErrors", form.getActionErrors()); + this.saveErrors(req, form.getActionErrors()); + } + + req.setAttribute("validated", true); + + return this.executeFormAction(mapping, form, req, res, companySaveService); + } + + private ActionForward executeSaveAction(ActionMapping mapping, CompanySaveForm form, HttpServletRequest req, + HttpServletResponse res, CompanySaveService companySaveService) { + + ActionForward actionForward; + + if (companySaveService.validate(form)) { + + final Company company = companySaveService.saveCompany(form); + + if (form.isNewCompany()) { + form.getActionMessages().add("topMsgs", new ActionMessage("company.create.success", company.getName())); + } else { + form.getActionMessages().add("topMsgs", new ActionMessage("company.update.success", company.getName())); + } + + actionForward = mapping.findForward("actionCompanies"); + } else { + form.getActionErrors().add("topMsgs", new ActionMessage("form.validation.error")); + req.setAttribute("validated", true); + + actionForward = this.executeFormAction(mapping, form, req, res, companySaveService); + } + + if (!form.getActionMessages().isEmpty()) { + req.setAttribute("actionMessages", form.getActionMessages()); + this.saveMessages(req, form.getActionMessages()); + } else if (!form.getActionErrors().isEmpty()) { + req.setAttribute("actionErrors", form.getActionErrors()); + this.saveErrors(req, form.getActionErrors()); + } + + return actionForward; + } +} diff --git a/src/main/java/com/my_app/page/company/save/CompanySaveForm.java b/src/main/java/com/my_app/page/company/save/CompanySaveForm.java new file mode 100644 index 0000000..bd59a1e --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/CompanySaveForm.java @@ -0,0 +1,95 @@ +package com.my_app.page.company.save; + +import com.my_app.model.BaseActionForm; + +public class CompanySaveForm extends BaseActionForm { +/** + * + */ + private static final long serialVersionUID = 1L; + + + private Long companyId; + private String name; + private String address; + private String vatNumber; + private Long countryId; + private Long cityId; + + private String originalName; + + private transient boolean formInit = true; + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String endereco) { + this.address = endereco; + } + + public String getVatNumber() { + return vatNumber; + } + + public void setVatNumber(String vatNumber) { + this.vatNumber = vatNumber; + } + + public Long getCountryId() { + return countryId; + } + + public void setCountryId(Long countryId) { + this.countryId = countryId; + } + + public Long getCityId() { + return cityId; + } + + public void setCityId(Long cityId) { + this.cityId = cityId; + } + + public String getOriginalName() { + return originalName; + } + + public void setOriginalName(String originalName) { + this.originalName = originalName; + } + + public boolean isFormInit() { + return formInit; + } + + public void setFormInit(boolean formInit) { + this.formInit = formInit; + } + + public boolean isNewCompany() { + return this.companyId == null || this.companyId == 0; + } + + public static long getSerialversionuid() { + return serialVersionUID; +} + +} diff --git a/src/main/java/com/my_app/page/company/save/mapper/CompanySaveFormToCompanyMapper.java b/src/main/java/com/my_app/page/company/save/mapper/CompanySaveFormToCompanyMapper.java new file mode 100644 index 0000000..999aa7a --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/mapper/CompanySaveFormToCompanyMapper.java @@ -0,0 +1,16 @@ +package com.my_app.page.company.save.mapper; + +import com.my_app.model.City; +import com.my_app.model.Company; +import com.my_app.page.company.save.CompanySaveForm; + +public class CompanySaveFormToCompanyMapper { + + public Company toCompany(CompanySaveForm form) { + + final City city = new City(form.getCityId()); + + return new Company(Long.valueOf(0).equals(form.getCompanyId()) ? null : form.getCompanyId(), form.getName(), + form.getAddress(), form.getVatNumber(), city); + } +} diff --git a/src/main/java/com/my_app/page/company/save/mapper/CompanyToCompanySaveFormMapper.java b/src/main/java/com/my_app/page/company/save/mapper/CompanyToCompanySaveFormMapper.java new file mode 100644 index 0000000..ecbb7e4 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/mapper/CompanyToCompanySaveFormMapper.java @@ -0,0 +1,23 @@ +package com.my_app.page.company.save.mapper; + +import com.my_app.model.Company; +import com.my_app.page.company.save.CompanySaveForm; + +public class CompanyToCompanySaveFormMapper { + + public CompanySaveForm toCompanySaveForm(Company company) { + return this.mapTo(company, new CompanySaveForm()); + } + + public CompanySaveForm mapTo(Company company, CompanySaveForm form) { + + form.setCompanyId(company.getId()); + form.setName(company.getName()); + form.setAddress(company.getAddress()); + form.setVatNumber(company.getVatNumber()); + form.setCountryId(company.getCity().getCountry().getId()); + form.setCityId(company.getCity().getId()); + return form; + } + +} diff --git a/src/main/java/com/my_app/page/company/save/service/CompanySaveService.java b/src/main/java/com/my_app/page/company/save/service/CompanySaveService.java new file mode 100644 index 0000000..3a535f1 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/service/CompanySaveService.java @@ -0,0 +1,17 @@ +package com.my_app.page.company.save.service; + +import javax.servlet.http.HttpServletRequest; + +import com.my_app.model.Company; +import com.my_app.page.company.save.CompanySaveForm; + +public interface CompanySaveService { + + public boolean validate(CompanySaveForm form); + + public Company saveCompany(CompanySaveForm form); + + public void formInit(CompanySaveForm form); + + public void setRequestAttrs(CompanySaveForm form, HttpServletRequest req); +} diff --git a/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceFactory.java b/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceFactory.java new file mode 100644 index 0000000..32a381a --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceFactory.java @@ -0,0 +1,17 @@ +package com.my_app.page.company.save.service; + +import java.sql.Connection; + +import com.my_app.service.factory.CityServiceFactory; +import com.my_app.service.factory.CompanyServiceFactory; +import com.my_app.service.factory.ConnectionBasedServiceFactory; +import com.my_app.service.factory.CountryServiceFactory; + +public class CompanySaveServiceFactory implements ConnectionBasedServiceFactory { + + @Override + public CompanySaveService create(Connection conn) { + return new CompanySaveServiceImpl(new CompanyServiceFactory().create(conn), new CountryServiceFactory().create(conn), + new CityServiceFactory().create(conn)); + } +} diff --git a/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceImpl.java b/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceImpl.java new file mode 100644 index 0000000..75e2dbf --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceImpl.java @@ -0,0 +1,98 @@ +package com.my_app.page.company.save.service; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.apache.struts.action.ActionMessage; + +import com.my_app.model.Company; +import com.my_app.page.company.save.CompanySaveForm; +import com.my_app.page.company.save.mapper.CompanySaveFormToCompanyMapper; +import com.my_app.page.company.save.mapper.CompanyToCompanySaveFormMapper; +import com.my_app.service.CityService; +import com.my_app.service.CompanyService; +import com.my_app.service.CountryService; +import com.my_app.utils.CompanyUtils; + +public class CompanySaveServiceImpl implements CompanySaveService { + + final CompanyService companyService; + final CountryService countryService; + final CityService cityService; + + public CompanySaveServiceImpl(CompanyService companyService, CountryService countryService, CityService cityService) { + super(); + this.companyService = companyService; + this.countryService = countryService; + this.cityService = cityService; + } + + @Override + public void formInit(CompanySaveForm form) { + if (!form.isNewCompany()) { + final Company company = this.companyService.findById(form.getCompanyId()); + + new CompanyToCompanySaveFormMapper().mapTo(company, form); + form.setOriginalName(form.getName()); + } + } + + @Override + public boolean validate(CompanySaveForm form) { + boolean isValid = true; + + if (StringUtils.isBlank(form.getName())) { + isValid = false; + form.getActionErrors().add("name", new ActionMessage("error.common.required")); + } + + else if ((form.isNewCompany() || (!form.isNewCompany() + && !form.getOriginalName().equals(CompanyUtils.normalizeCompanyName(form.getName())))) + && companyService.findByName(form.getName()) != null) { + isValid = false; + form.getActionErrors().add("name", new ActionMessage("company.name-taken.error")); + } + if (StringUtils.isBlank(form.getAddress())) { + isValid = false; + form.getActionErrors().add("address", new ActionMessage("error.common.required")); + } + + if (StringUtils.isBlank(form.getVatNumber())) { + isValid = false; + form.getActionErrors().add("vatNumber", new ActionMessage("error.common.required")); + } + + if (form.getCountryId() == null || form.getCountryId() == 0) { + isValid = false; + form.getActionErrors().add("country", new ActionMessage("error.common.required")); + } + + if (form.getCityId() == null || form.getCityId() == 0) { + isValid = false; + + if (form.getCountryId() == null || form.getCountryId() == 0) { + form.getActionErrors().add("city", new ActionMessage("form.field.pre-choose", "Country")); + } else { + form.getActionErrors().add("city", new ActionMessage("error.common.required")); + } + } + + + return isValid; + } + + @Override + public Company saveCompany(CompanySaveForm form) { + return this.companyService.save(new CompanySaveFormToCompanyMapper().toCompany(form)); + } + + @Override + public void setRequestAttrs(CompanySaveForm form, HttpServletRequest req) { + req.setAttribute("countries", this.countryService.findAll()); + + if (form.getCountryId() != null && form.getCountryId() > 0) { + req.setAttribute("cities", this.cityService.findAllByCountryId(form.getCountryId())); + } + } + +} diff --git a/src/main/java/com/my_app/page/login/LoginAction.java b/src/main/java/com/my_app/page/login/LoginAction.java index 1e4b4be..c3e9d99 100644 --- a/src/main/java/com/my_app/page/login/LoginAction.java +++ b/src/main/java/com/my_app/page/login/LoginAction.java @@ -31,7 +31,7 @@ public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpS return mapping.findForward("actionHomeRedir"); } else if ("submit".equals(form.getAction())) { return performSubmit(mapping, form, req, res, loginService); - } else { + }else { return this.performLogin(mapping, form, req, res); } } @@ -41,6 +41,7 @@ private ActionForward performLogin(ActionMapping mapping, LoginForm actionForm, return mapping.findForward("loginPage"); } + private ActionForward performSubmit(ActionMapping mapping, LoginForm form, HttpServletRequest req, HttpServletResponse res, LoginService loginService) { diff --git a/src/main/java/com/my_app/page/logout/LogoutAction.java b/src/main/java/com/my_app/page/logout/LogoutAction.java new file mode 100644 index 0000000..db4ca35 --- /dev/null +++ b/src/main/java/com/my_app/page/logout/LogoutAction.java @@ -0,0 +1,39 @@ +package com.my_app.page.logout; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import com.my_app.AppConstants; +import com.my_app.utils.LoginUtils; + +public class LogoutAction extends Action { + + @Override + public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest req, + HttpServletResponse res) throws Exception { + + return performLogout(mapping, req, res); + + } + + /** + * cahango limpar o user da sessão limpar a chave da sessão invalidar a + * sessão + */ + private ActionForward performLogout(ActionMapping mapping, HttpServletRequest req, HttpServletResponse res) { + + if (LoginUtils.isUserNotLoggedIn(req.getSession())) { + return mapping.findForward("actionLoginRedir"); + } + req.getSession().removeAttribute("username"); + req.getSession().setAttribute(AppConstants.SESSION_ATTR_KEY_IS_LOGGED_IN, false); + req.getSession().invalidate(); + + return mapping.findForward("loginPage"); + } +} diff --git a/src/main/java/com/my_app/page/user/save/UserSaveForm.java b/src/main/java/com/my_app/page/user/save/UserSaveForm.java index ebd2622..9062fcc 100644 --- a/src/main/java/com/my_app/page/user/save/UserSaveForm.java +++ b/src/main/java/com/my_app/page/user/save/UserSaveForm.java @@ -10,6 +10,7 @@ public class UserSaveForm extends BaseActionForm { private String password; private Long countryId; private Long cityId; + private String email; // cahango private String originalUsername; @@ -55,6 +56,14 @@ public void setCityId(Long cityId) { this.cityId = cityId; } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + public String getOriginalUsername() { return originalUsername; } diff --git a/src/main/java/com/my_app/page/user/save/mapper/UserSaveFormToUserMapper.java b/src/main/java/com/my_app/page/user/save/mapper/UserSaveFormToUserMapper.java index 762d42f..f175078 100644 --- a/src/main/java/com/my_app/page/user/save/mapper/UserSaveFormToUserMapper.java +++ b/src/main/java/com/my_app/page/user/save/mapper/UserSaveFormToUserMapper.java @@ -11,6 +11,6 @@ public User toUser(UserSaveForm form) { final City city = new City(form.getCityId()); return new User(Long.valueOf(0).equals(form.getUserId()) ? null : form.getUserId(), form.getUsername(), - form.getPassword(), city); + form.getPassword(), city, form.getEmail()); } } diff --git a/src/main/java/com/my_app/page/user/save/mapper/UserToUserSaveFormMapper.java b/src/main/java/com/my_app/page/user/save/mapper/UserToUserSaveFormMapper.java index 008c0be..195acfb 100644 --- a/src/main/java/com/my_app/page/user/save/mapper/UserToUserSaveFormMapper.java +++ b/src/main/java/com/my_app/page/user/save/mapper/UserToUserSaveFormMapper.java @@ -15,7 +15,7 @@ public UserSaveForm mapTo(User user, UserSaveForm form) { form.setUsername(user.getUsername()); form.setCountryId(user.getCity().getCountry().getId()); form.setCityId(user.getCity().getId()); - + form.setEmail(user.getEmail());// cahango return form; } diff --git a/src/main/java/com/my_app/page/user/save/service/UserSaveServiceImpl.java b/src/main/java/com/my_app/page/user/save/service/UserSaveServiceImpl.java index 3d41923..0ebfe46 100644 --- a/src/main/java/com/my_app/page/user/save/service/UserSaveServiceImpl.java +++ b/src/main/java/com/my_app/page/user/save/service/UserSaveServiceImpl.java @@ -70,6 +70,14 @@ public boolean validate(UserSaveForm form) { form.getActionErrors().add("city", new ActionMessage("error.common.required")); } } + // cahango + if (StringUtils.isBlank(form.getEmail())) { + isValid = false; + form.getActionErrors().add("email", new ActionMessage("error.common.required")); + }else if (!UserUtils.validarEmail(form.getEmail())) { + isValid = false; + form.getActionErrors().add("email", new ActionMessage("user.email-format.error")); + } return isValid; } diff --git a/src/main/java/com/my_app/repo/CompanyRepository.java b/src/main/java/com/my_app/repo/CompanyRepository.java new file mode 100644 index 0000000..7e540b9 --- /dev/null +++ b/src/main/java/com/my_app/repo/CompanyRepository.java @@ -0,0 +1,9 @@ +package com.my_app.repo; + +import com.my_app.model.Company; + +public interface CompanyRepository extends Repository { + + Company findByName(String name); + +} diff --git a/src/main/java/com/my_app/repo/impl/CompanyRepositoryImpl.java b/src/main/java/com/my_app/repo/impl/CompanyRepositoryImpl.java new file mode 100644 index 0000000..d7129f8 --- /dev/null +++ b/src/main/java/com/my_app/repo/impl/CompanyRepositoryImpl.java @@ -0,0 +1,146 @@ +package com.my_app.repo.impl; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.LinkedList; +import java.util.List; + +import com.my_app.exception.AppGenericException; +import com.my_app.model.Company; +import com.my_app.repo.CityRepository; +import com.my_app.repo.CompanyRepository; +import com.my_app.utils.CompanyUtils; + +public class CompanyRepositoryImpl implements CompanyRepository { + + private final Connection conn; + private final CityRepository cityRepository; + + public CompanyRepositoryImpl(Connection conn, CityRepository cityRepository) { + super(); + this.conn = conn; + this.cityRepository = cityRepository; + } + + @Override + public Company save(Company company) { + if (company.isNew()) { + return this.create(company); + } else { + return this.update(company); + } + } + + private Company create(Company company) { + try (final PreparedStatement stmt = this.conn + .prepareStatement("INSERT INTO \"COMPANY\" (NAME,ADDRESS, VATNUMBER, CITY_ID) VALUES (?, ?, ?,?)")) { + + stmt.setString(1, CompanyUtils.normalizeCompanyName(company.getName())); + stmt.setString(2, company.getAddress()); + stmt.setString(3, company.getVatNumber()); + stmt.setLong(4, company.getCity().getId()); + + stmt.executeUpdate(); + + return this.findByName(company.getName()); + } catch (SQLException e) { + throw new AppGenericException("Error while inserting Company", e); + } + } + + private Company update(Company company) { + try (final PreparedStatement stmt = this.conn.prepareStatement( + "UPDATE \"COMPANY\" SET NAME = ?,ADDRESS = ?, VATNUMBER = ?, CITY_ID = ? WHERE ID = ?")) { + + stmt.setString(1, CompanyUtils.normalizeCompanyName(company.getName())); + stmt.setString(2, company.getAddress()); + stmt.setString(3, company.getVatNumber()); + stmt.setLong(4, company.getCity().getId()); + stmt.setLong(5, company.getId()); + stmt.executeUpdate(); + + return this.findByName(company.getName()); + } catch (SQLException e) { + throw new AppGenericException("Error while updating Company", e); + } + } + + @Override + public Company findById(Long id) { + try (final PreparedStatement stmt = this.conn + .prepareStatement("SELECT ID, NAME,ADDRESS, VATNUMBER, CITY_ID FROM \"COMPANY\" WHERE ID = ?")) { + + stmt.setLong(1, id); + + try (final ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + return new Company(rs.getLong(1), rs.getString(2), rs.getString(3), rs.getString(4), + this.cityRepository.findById(rs.getLong(5))); + } + } + + return null; + } catch (SQLException e) { + throw new AppGenericException("Error while querying by id for Company", e); + } + } + + @Override + public Company findByName(String name) { + try (final PreparedStatement stmt = this.conn + .prepareStatement("SELECT ID, NAME,ADDRESS, VATNUMBER, CITY_ID FROM \"COMPANY\" WHERE NAME = ?")) { + + stmt.setString(1, CompanyUtils.normalizeCompanyName(name)); + + try (final ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + return new Company(rs.getLong(1), rs.getString(2), rs.getString(3), rs.getString(4), + this.cityRepository.findById(rs.getLong(5))); + } + } + + return null; + } catch (SQLException e) { + throw new AppGenericException("Error while querying by name for Company", e); + } + } + + @Override + public List findAll() { + try (final PreparedStatement stmt = this.conn + .prepareStatement("SELECT ID, NAME, ADDRESS, VATNUMBER, CITY_ID FROM \"COMPANY\""); + final ResultSet rs = stmt.executeQuery()) { + + final List companies = new LinkedList<>(); + + while (rs.next()) { + companies.add(new Company(rs.getLong(1), rs.getString(2), rs.getString(3), rs.getString(4), + this.cityRepository.findById(rs.getLong(5)))); + } + + return companies; + } catch (SQLException e) { + throw new AppGenericException("Error while querying for all Companies", e); + } + } + + @Override + public void deleteById(Long id) { + try (final PreparedStatement stmt = this.conn.prepareStatement("DELETE \"COMPANY\" WHERE ID = ?")) { + + stmt.setLong(1, id); + + stmt.executeUpdate(); + } catch (SQLException e) { + throw new AppGenericException("Error while deleting for Company", e); + } + } + + @Override + public void delete(Company company) { + this.deleteById(company.getId()); + } + +} diff --git a/src/main/java/com/my_app/repo/impl/UserRepositoryImpl.java b/src/main/java/com/my_app/repo/impl/UserRepositoryImpl.java index 5a8d13d..7983a0f 100644 --- a/src/main/java/com/my_app/repo/impl/UserRepositoryImpl.java +++ b/src/main/java/com/my_app/repo/impl/UserRepositoryImpl.java @@ -35,11 +35,12 @@ public User save(User user) { private User create(User user) { try (final PreparedStatement stmt = this.conn - .prepareStatement("INSERT INTO \"USER\" (USERNAME, PASSWORD, CITY_ID) VALUES (?, ?, ?)")) { + .prepareStatement("INSERT INTO \"USER\" (USERNAME, PASSWORD, CITY_ID, EMAIL) VALUES (?, ?, ?,?)")) { stmt.setString(1, UserUtils.normalizeUsername(user.getUsername())); stmt.setString(2, user.getPassword()); stmt.setLong(3, user.getCity().getId()); + stmt.setString(4, user.getEmail()); stmt.executeUpdate(); @@ -51,13 +52,13 @@ private User create(User user) { private User update(User user) { try (final PreparedStatement stmt = this.conn - .prepareStatement("UPDATE \"USER\" SET USERNAME = ?, PASSWORD = ?, CITY_ID = ? WHERE ID = ?")) { + .prepareStatement("UPDATE \"USER\" SET USERNAME = ?, PASSWORD = ?, CITY_ID = ? , EMAIL= ? WHERE ID = ?")) { stmt.setString(1, UserUtils.normalizeUsername(user.getUsername())); stmt.setString(2, user.getPassword()); stmt.setLong(3, user.getCity().getId()); - stmt.setLong(4, user.getId()); - + stmt.setString(4, user.getEmail()); + stmt.setLong(5, user.getId()); stmt.executeUpdate(); return this.findByUsername(user.getUsername()); @@ -69,14 +70,14 @@ private User update(User user) { @Override public User findById(Long id) { try (final PreparedStatement stmt = this.conn - .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID FROM \"USER\" WHERE ID = ?")) { + .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID, EMAIL FROM \"USER\" WHERE ID = ?")) { stmt.setLong(1, id); try (final ResultSet rs = stmt.executeQuery()) { if (rs.next()) { return new User(rs.getLong(1), rs.getString(2), rs.getString(3), - this.cityRepository.findById(rs.getLong(4))); + this.cityRepository.findById(rs.getLong(4)), rs.getString(5)); } } @@ -89,14 +90,14 @@ public User findById(Long id) { @Override public User findByUsername(String username) { try (final PreparedStatement stmt = this.conn - .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID FROM \"USER\" WHERE USERNAME = ?")) { + .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID, EMAIL FROM \"USER\" WHERE USERNAME = ?")) { stmt.setString(1, UserUtils.normalizeUsername(username)); try (final ResultSet rs = stmt.executeQuery()) { if (rs.next()) { return new User(rs.getLong(1), rs.getString(2), rs.getString(3), - this.cityRepository.findById(rs.getLong(4))); + this.cityRepository.findById(rs.getLong(4)), rs.getString(5)); } } @@ -109,14 +110,14 @@ public User findByUsername(String username) { @Override public List findAll() { try (final PreparedStatement stmt = this.conn - .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID FROM \"USER\""); + .prepareStatement("SELECT ID, USERNAME, PASSWORD, CITY_ID, EMAIL FROM \"USER\""); final ResultSet rs = stmt.executeQuery()) { final List users = new LinkedList<>(); while (rs.next()) { users.add(new User(rs.getLong(1), rs.getString(2), rs.getString(3), - this.cityRepository.findById(rs.getLong(4)))); + this.cityRepository.findById(rs.getLong(4)) , rs.getString(5))); } return users; diff --git a/src/main/java/com/my_app/service/CompanyService.java b/src/main/java/com/my_app/service/CompanyService.java new file mode 100644 index 0000000..4e6e634 --- /dev/null +++ b/src/main/java/com/my_app/service/CompanyService.java @@ -0,0 +1,9 @@ +package com.my_app.service; + +import com.my_app.model.Company; + +public interface CompanyService extends BaseService { + + Company findByName(String name); + +} \ No newline at end of file diff --git a/src/main/java/com/my_app/service/factory/CompanyServiceFactory.java b/src/main/java/com/my_app/service/factory/CompanyServiceFactory.java new file mode 100644 index 0000000..9207dee --- /dev/null +++ b/src/main/java/com/my_app/service/factory/CompanyServiceFactory.java @@ -0,0 +1,19 @@ +package com.my_app.service.factory; + +import java.sql.Connection; + +import com.my_app.repo.impl.CityRepositoryImpl; +import com.my_app.repo.impl.CompanyRepositoryImpl; +import com.my_app.repo.impl.CountryRepositoryImpl; +import com.my_app.service.CompanyService; +import com.my_app.service.impl.CompanyServiceImpl; + +public class CompanyServiceFactory implements ConnectionBasedServiceFactory { + + @Override + public CompanyService create(Connection conn) { + return new CompanyServiceImpl( + new CompanyRepositoryImpl(conn, new CityRepositoryImpl(conn, new CountryRepositoryImpl(conn)))); + } + +} diff --git a/src/main/java/com/my_app/service/impl/CompanyServiceImpl.java b/src/main/java/com/my_app/service/impl/CompanyServiceImpl.java new file mode 100644 index 0000000..30a0de3 --- /dev/null +++ b/src/main/java/com/my_app/service/impl/CompanyServiceImpl.java @@ -0,0 +1,47 @@ +package com.my_app.service.impl; + +import java.util.List; + +import com.my_app.model.Company; +import com.my_app.repo.CompanyRepository; +import com.my_app.service.CompanyService; + +public class CompanyServiceImpl implements CompanyService { + + private final CompanyRepository companiesRepository; + + public CompanyServiceImpl(CompanyRepository companiesRepository) { + this.companiesRepository = companiesRepository; + } + + @Override + public Company save(Company companies) { + return companiesRepository.save(companies); + } + + @Override + public Company findById(Long id) { + return companiesRepository.findById(id); + } + + @Override + public List findAll() { + return companiesRepository.findAll(); + } + + @Override + public void deleteById(Long id) { + companiesRepository.deleteById(id); + } + + @Override + public void delete(Company companies) { + companiesRepository.delete(companies); + } + + @Override + public Company findByName(String name) { + return companiesRepository.findByName(name); + } + +} diff --git a/src/main/java/com/my_app/utils/CompanyUtils.java b/src/main/java/com/my_app/utils/CompanyUtils.java new file mode 100644 index 0000000..b38101d --- /dev/null +++ b/src/main/java/com/my_app/utils/CompanyUtils.java @@ -0,0 +1,17 @@ +package com.my_app.utils; + +import static org.apache.commons.lang3.StringUtils.lowerCase; +import static org.apache.commons.lang3.StringUtils.replace; + +public class CompanyUtils { + + private CompanyUtils() { + } + + public static String normalizeCompanyName(String name) { + return replace(lowerCase(name), " ", "_"); + } + + + +} diff --git a/src/main/java/com/my_app/utils/UserUtils.java b/src/main/java/com/my_app/utils/UserUtils.java index d163006..9595882 100644 --- a/src/main/java/com/my_app/utils/UserUtils.java +++ b/src/main/java/com/my_app/utils/UserUtils.java @@ -3,8 +3,16 @@ import static org.apache.commons.lang3.StringUtils.lowerCase; import static org.apache.commons.lang3.StringUtils.replace; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class UserUtils { + private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@" + + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$"; + + private static final Pattern pattern = Pattern.compile(EMAIL_PATTERN, Pattern.CASE_INSENSITIVE); + private UserUtils() { } @@ -12,4 +20,9 @@ public static String normalizeUsername(String username) { return replace(lowerCase(username), " ", "_"); } + public static boolean validarEmail(String email) { + Matcher matcher = pattern.matcher(email); + return matcher.matches(); + } + } diff --git a/src/main/webapp/WEB-INF/struts-config.xml b/src/main/webapp/WEB-INF/struts-config.xml index 12cd624..7ea0571 100644 --- a/src/main/webapp/WEB-INF/struts-config.xml +++ b/src/main/webapp/WEB-INF/struts-config.xml @@ -6,13 +6,16 @@ + - + + + @@ -23,6 +26,10 @@ + + + + @@ -31,6 +38,17 @@ + + + + + + + + + + + diff --git a/src/main/webapp/company/list.jsp b/src/main/webapp/company/list.jsp new file mode 100644 index 0000000..41a5979 --- /dev/null +++ b/src/main/webapp/company/list.jsp @@ -0,0 +1,90 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html"%> +<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%> +<%@ taglib prefix="logic" uri="http://struts.apache.org/tags-logic"%> + + + + + + +Company - MyApp + + + + +
+

Companies

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdNameAddressVAT NumberCountryCityActions
No companies
${company.id}${company.name}${company.address}${company.vatNumber}${company.city.country.name}${company.city.name} +
+ +
+
+ New +
+ + + + \ No newline at end of file diff --git a/src/main/webapp/company/save/form.jsp b/src/main/webapp/company/save/form.jsp new file mode 100644 index 0000000..2cf24c8 --- /dev/null +++ b/src/main/webapp/company/save/form.jsp @@ -0,0 +1,109 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html"%> +<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%> +<%@ taglib prefix="logic" uri="http://struts.apache.org/tags-logic"%> + + + + + + +Companies - MyApp + + + + +
+

${form.newCompany ? 'New' : 'Update'} Company ${form.newCompany ? '' : form.name}

+ + + + + + + + +
+
+
+ + + + + + +
+ + +
+ +
+
+ +
+ + +
+ +
+
+ +
+ + +
+ +
+
+ + +
+ + +
+ +
+
+ +
+ + +
+ +
+
+ + + + Back + + +
+
+
+
+ + + + + + \ No newline at end of file diff --git a/src/main/webapp/company/save/js/form.js b/src/main/webapp/company/save/js/form.js new file mode 100644 index 0000000..56d4601 --- /dev/null +++ b/src/main/webapp/company/save/js/form.js @@ -0,0 +1,74 @@ +/** + * + */ + +let form = { + $form: $('form#company-save-fome'), + $action: $('input[name="action"]'), + + company: { + $id: $('input#company-id'), + $name: $('input#company-name'), + $address: $('input#company-address'), + $vatNumber: $('input#company-vatNumber'), + $country: $('select#company-country'), + $city: $('select#company-city') + }, + + btn: { + $validate: $('button.btn-validate'), + $save: $('button.btn-save') + }, + +} + + +let btnValidateClickHandler = (event) => { + event.preventDefault(); + console.debug('btn validate clicked'); + form.$action.val('validate'); + form.$form.submit(); +} + +let btnSaveClickHandler = (event) => { + event.preventDefault(); + console.debug('btn save clicked'); + form.$action.val('save'); + form.$form.submit(); +} + +let countryChangeHandler = () => { + let $country = form.company.$country; + let $city = form.company.$city; + + $city.prop('disabled', true).val('').empty().append($(``)); + + if ($country.val()) { + let countryId = Number($country.val()); + + cityService.findAllByCountryId(countryId).done((cities) => { + console.debug(cities); + + if (cities != null && cities.length > 0) { + $city.prop('disabled', false); + cities.forEach((city) => { + $city.append($(``)); + }); + } + }) + } +} + +let main = () => { + + form.btn.$validate.on('click', btnValidateClickHandler); + form.btn.$save.on('click', btnSaveClickHandler); + + form.company.$country.on('change', countryChangeHandler) + + console.debug('form.js initialized'); +} + +$(() => { + main(); +}) \ No newline at end of file diff --git a/src/main/webapp/home.jsp b/src/main/webapp/home.jsp index 22922db..b628f7f 100644 --- a/src/main/webapp/home.jsp +++ b/src/main/webapp/home.jsp @@ -1,4 +1,5 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="html" uri="http://struts.apache.org/tags-html"%> <%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%> @@ -12,20 +13,29 @@ - -
-

Home

-

Welcome to MyApp

-

Choose an area

-
-
-
- Users - -
-
-
- - + +
+

Home

+

Welcome to MyApp

+

Choose an area

+
+
+
Users + + + +
Companies + +
+ +
+
+ + \ No newline at end of file diff --git a/src/main/webapp/img/aac.PNG b/src/main/webapp/img/aac.PNG new file mode 100644 index 0000000..d428ec1 Binary files /dev/null and b/src/main/webapp/img/aac.PNG differ diff --git a/src/main/webapp/img/vista1.jpg b/src/main/webapp/img/vista1.jpg new file mode 100644 index 0000000..fe47b4e Binary files /dev/null and b/src/main/webapp/img/vista1.jpg differ diff --git a/src/main/webapp/incl/header.jsp b/src/main/webapp/incl/header.jsp index 92be318..a68a628 100644 --- a/src/main/webapp/incl/header.jsp +++ b/src/main/webapp/incl/header.jsp @@ -21,13 +21,20 @@
    • +
  • PagePublic
    • + + +
  • Private Page
    • +
  • diff --git a/src/main/webapp/incl/styles.jsp b/src/main/webapp/incl/styles.jsp index 790a062..db6a060 100644 --- a/src/main/webapp/incl/styles.jsp +++ b/src/main/webapp/incl/styles.jsp @@ -1,5 +1,5 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> \ No newline at end of file diff --git a/src/main/webapp/privatePage.jsp b/src/main/webapp/privatePage.jsp new file mode 100644 index 0000000..7abacee --- /dev/null +++ b/src/main/webapp/privatePage.jsp @@ -0,0 +1,62 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html"%> +<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%> + + + + + + +MyApp + + + + +
    +
    +
    +
    +
    +
    + +
    +
    +

    Cahango André

    + Luanda, + Angola + +

    + misterdel04@hotmail.com.com +
    04 de Fevereiro + de 1994 +

    + +
    + + + +
    +
    +
    +
    +
    +
    +
    + + + + + diff --git a/src/main/webapp/publicPage.jsp b/src/main/webapp/publicPage.jsp new file mode 100644 index 0000000..6f5d6bb --- /dev/null +++ b/src/main/webapp/publicPage.jsp @@ -0,0 +1,93 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html"%> +<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%> + + + + + + +MyApp + + + + +
    + +
    + + + + +
    + +
    + + + + + + \ No newline at end of file diff --git a/src/main/webapp/user/list.jsp b/src/main/webapp/user/list.jsp index 72bded5..cb52882 100644 --- a/src/main/webapp/user/list.jsp +++ b/src/main/webapp/user/list.jsp @@ -39,6 +39,7 @@ Username Country City + Email Actions @@ -56,6 +57,7 @@ ${user.username} ${user.city.country.name} ${user.city.name} + ${user.email}
    diff --git a/src/main/webapp/user/save/form.jsp b/src/main/webapp/user/save/form.jsp index 3a3f1b4..4df1e4b 100644 --- a/src/main/webapp/user/save/form.jsp +++ b/src/main/webapp/user/save/form.jsp @@ -81,6 +81,14 @@
    + +
    + + +
    + +
    +
    Back diff --git a/src/main/webapp/user/save/js/form.js b/src/main/webapp/user/save/js/form.js index 1585047..7f75c0a 100644 --- a/src/main/webapp/user/save/js/form.js +++ b/src/main/webapp/user/save/js/form.js @@ -11,7 +11,10 @@ let form = { $username: $('input#user-username'), $password: $('input#user-password'), $country: $('select#user-country'), - $city: $('select#user-city') + $city: $('select#user-city'), + $email: $('input#user-email'), + + }, btn: {