diff --git a/.classpath b/.classpath index ddeaa5b..4beff56 100644 --- a/.classpath +++ b/.classpath @@ -2,12 +2,8 @@ - - - - - + diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/src/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/src/.idea/libraries/lib.xml b/src/.idea/libraries/lib.xml new file mode 100644 index 0000000..020f694 --- /dev/null +++ b/src/.idea/libraries/lib.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml new file mode 100644 index 0000000..07115cd --- /dev/null +++ b/src/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml new file mode 100644 index 0000000..296f8f6 --- /dev/null +++ b/src/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/src/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/java7-struts1-jquery-bootstrap3-web-project.iml b/src/java7-struts1-jquery-bootstrap3-web-project.iml new file mode 100644 index 0000000..61b19ed --- /dev/null +++ b/src/java7-struts1-jquery-bootstrap3-web-project.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/MessageResources.properties b/src/main/java/MessageResources.properties index a1e7aa0..8faa0a8 100644 --- a/src/main/java/MessageResources.properties +++ b/src/main/java/MessageResources.properties @@ -4,6 +4,7 @@ form.field.pre-choose=Must choose an option for the {0} first error.common.required=Required error.password.wrong=Wrong password +error.common.invalidEmail=Please enter valid email user.not-found.error=User not found user.username-taken.error=Username's already taken diff --git a/src/main/java/com/my_app/App.java b/src/main/java/com/my_app/App.java index 17e71c8..2521eed 100644 --- a/src/main/java/com/my_app/App.java +++ b/src/main/java/com/my_app/App.java @@ -15,6 +15,7 @@ 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; @@ -23,6 +24,8 @@ import com.my_app.repo.impl.CityRepositoryImpl; import com.my_app.repo.impl.CountryRepositoryImpl; import com.my_app.repo.impl.UserRepositoryImpl; +import com.my_app.repo.CompanyRepository; +import com.my_app.repo.impl.CompanyRepositoryImpl; public class App { @@ -81,6 +84,7 @@ private void initDb() { try (final Connection conn = this.dataSource.getConnection()) { initDbCountriesAndCities(conn); initDbUsers(conn); + initDbCompanies(conn); } catch (SQLException e) { throw new AppGenericException("Error trying to insert initial db data", e); } @@ -115,20 +119,37 @@ 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, EMAIL 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 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", "admin@admin.com", cityRepository.findById((long) this.random.nextInt(49) + 1))); 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, "user"+ i +"@user.com" , cityRepository.findById((long) this.random.nextInt(49) + 1))); } Logger.debug("All users created: {}", userRepository.findAll()); } + + private void initDbCompanies(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, "company" + i, "VAT"+ 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/model/Company.java b/src/main/java/com/my_app/model/Company.java new file mode 100644 index 0000000..6bd1582 --- /dev/null +++ b/src/main/java/com/my_app/model/Company.java @@ -0,0 +1,79 @@ +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 address) { + this.address = address; + } + + 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("Company [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..ccf17ad 100644 --- a/src/main/java/com/my_app/model/User.java +++ b/src/main/java/com/my_app/model/User.java @@ -4,23 +4,26 @@ public class User { private Long id; private String username; private String password; + private String email; private City city; public User() { } - public User(String username, String password, City city) { + public User(String username, String password, String email, City city) { super(); this.username = username; this.password = password; + this.email = email; this.city = city; } - public User(Long id, String username, String password, City city) { + public User(Long id, String username, String password, String email, City city) { super(); this.id = id; this.username = username; this.password = password; + this.email = email; this.city = city; } @@ -47,6 +50,14 @@ public String getPassword() { public void setPassword(String password) { this.password = password; } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } public City getCity() { return city; @@ -62,7 +73,7 @@ public boolean isNew() { @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, email=%s, city=%s]", id, username, password, email, city); } } 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..077a91e --- /dev/null +++ b/src/main/java/com/my_app/page/company/delete/CompanyDeleteAction.java @@ -0,0 +1,75 @@ +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 totalCompaniesCount = companyService.findAll().size(); + + if (totalCompaniesCount - 1 != 0) { + + final String companyIdStr = req.getParameter("companyId"); + + if (StringUtils.isNotBlank(companyIdStr)) { + final Long userId = Long.valueOf(companyIdStr); + + final Company company = companyService.findById(userId); + + 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..7aa533e --- /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(); + } + +} 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..f50b7aa --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/CompanySaveAction.java @@ -0,0 +1,109 @@ +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..ba57dd0 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/CompanySaveForm.java @@ -0,0 +1,91 @@ +package com.my_app.page.company.save; + +import com.my_app.model.BaseActionForm; + +public class CompanySaveForm extends BaseActionForm { + private static final long serialVersionUID = 3648004327226250285L; + + 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 address) { + this.address = address; + } + + 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..e320057 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/mapper/CompanyToCompanySaveFormMapper.java @@ -0,0 +1,24 @@ +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 toUserSaveForm(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..f9f1bec --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/service/CompanySaveService.java @@ -0,0 +1,16 @@ +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..d8b9f10 --- /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.ConnectionBasedServiceFactory; +import com.my_app.service.factory.CountryServiceFactory; +import com.my_app.service.factory.CompanyServiceFactory; + +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..51ef880 --- /dev/null +++ b/src/main/java/com/my_app/page/company/save/service/CompanySaveServiceImpl.java @@ -0,0 +1,96 @@ +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.CountryService; +import com.my_app.service.CompanyService; +import com.my_app.utils.UserUtils; + +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(UserUtils.normalizeUsername(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/logout/LogoutAction.java b/src/main/java/com/my_app/page/logout/LogoutAction.java new file mode 100644 index 0000000..c9d5120 --- /dev/null +++ b/src/main/java/com/my_app/page/logout/LogoutAction.java @@ -0,0 +1,62 @@ +package com.my_app.page.logout; + +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.AppConstants; +import com.my_app.page.login.service.LoginService; +import com.my_app.page.login.service.LoginServiceFactory; +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 { + + req.getSession().setAttribute(AppConstants.SESSION_ATTR_KEY_IS_LOGGED_IN, false); + return mapping.findForward("actionLoginRedir"); + + /* final LoginService loginService = new LoginServiceFactory().create((Connection) req.getAttribute("conn")); + + final LoginForm form = (LoginForm) actionForm; + + req.setAttribute("form", form); + + if (LoginUtils.isUserLoggedIn(req.getSession())) { + return mapping.findForward("actionHomeRedir"); + } else if ("submit".equals(form.getAction())) { + return performSubmit(mapping, form, req, res, loginService); + } else { + return this.performLogin(mapping, form, req, res); + } + } + + private ActionForward performLogin(ActionMapping mapping, LoginForm actionForm, HttpServletRequest req, + HttpServletResponse res) { + return mapping.findForward("loginPage"); + } + + private ActionForward performSubmit(ActionMapping mapping, LoginForm form, HttpServletRequest req, + HttpServletResponse res, LoginService loginService) { + + if (loginService.validate(form)) { + req.getSession().setAttribute(AppConstants.SESSION_ATTR_KEY_IS_LOGGED_IN, true); + req.getSession().setAttribute("username", form.getUsername()); + + return mapping.findForward("actionHomeRedir"); + } else { + super.saveErrors(req, form.getActionErrors()); + req.setAttribute("actionErrors", form.getActionErrors()); + req.setAttribute("validated", true); + return mapping.findForward("loginPage"); + } */ + } +} \ No newline at end of file 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..32c9705 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 @@ -8,6 +8,7 @@ public class UserSaveForm extends BaseActionForm { private Long userId; private String username; private String password; + private String email; private Long countryId; private Long cityId; @@ -38,6 +39,14 @@ public String getPassword() { public void setPassword(String password) { this.password = password; } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } public Long getCountryId() { return countryId; 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..3877326 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(), form.getEmail(), city); } } 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..9f3bc41 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 @@ -13,6 +13,8 @@ public UserSaveForm mapTo(User user, UserSaveForm form) { form.setUserId(user.getId()); form.setUsername(user.getUsername()); + form.setPassword(user.getPassword()); + form.setEmail(user.getEmail()); form.setCountryId(user.getCity().getCountry().getId()); form.setCityId(user.getCity().getId()); 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..f2fb2b9 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 @@ -1,5 +1,8 @@ package com.my_app.page.user.save.service; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; @@ -55,6 +58,20 @@ public boolean validate(UserSaveForm form) { isValid = false; form.getActionErrors().add("password", new ActionMessage("error.common.required")); } + + if (StringUtils.isBlank(form.getEmail())) { + isValid = false; + form.getActionErrors().add("email", new ActionMessage("error.common.required")); + } else { + String emailRegex = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$"; + Pattern pattern = Pattern.compile(emailRegex); + Matcher matcher = pattern.matcher(form.getEmail()); + + if (!matcher.matches()) { + isValid = false; + form.getActionErrors().add("email", new ActionMessage("error.email.invalid")); + } + } if (form.getCountryId() == null || form.getCountryId() == 0) { isValid = false; 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..fce3aee --- /dev/null +++ b/src/main/java/com/my_app/repo/impl/CompanyRepositoryImpl.java @@ -0,0 +1,147 @@ +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.UserUtils; + +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, UserUtils.normalizeUsername(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, UserUtils.normalizeUsername(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, UserUtils.normalizeUsername(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 username 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..3596ea4 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, EMAIL, CITY_ID) VALUES (?, ?, ?, ?)")) { stmt.setString(1, UserUtils.normalizeUsername(user.getUsername())); stmt.setString(2, user.getPassword()); - stmt.setLong(3, user.getCity().getId()); + stmt.setString(3, user.getEmail()); + stmt.setLong(4, user.getCity().getId()); stmt.executeUpdate(); @@ -51,12 +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 = ?, EMAIL = ?, CITY_ID = ? 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(3, user.getEmail()); + stmt.setLong(4, user.getCity().getId()); + stmt.setLong(5, user.getId()); stmt.executeUpdate(); @@ -69,14 +71,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, EMAIL, CITY_ID 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))); + return new User(rs.getLong(1), rs.getString(2), rs.getString(3), rs.getString(4), + this.cityRepository.findById(rs.getLong(5))); } } @@ -89,14 +91,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, EMAIL, CITY_ID 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))); + return new User(rs.getLong(1), rs.getString(2), rs.getString(3), rs.getString(4), + this.cityRepository.findById(rs.getLong(5))); } } @@ -109,14 +111,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, EMAIL, CITY_ID 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)))); + users.add(new User(rs.getLong(1), rs.getString(2), rs.getString(3), rs.getString(4), + this.cityRepository.findById(rs.getLong(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..b8807bc --- /dev/null +++ b/src/main/java/com/my_app/service/CompanyService.java @@ -0,0 +1,11 @@ +package com.my_app.service; + +import com.my_app.model.Company; + +public interface CompanyService extends BaseService { + + Company findByName(String name); + + + +} 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..b78a389 --- /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.CountryRepositoryImpl; +import com.my_app.repo.impl.CompanyRepositoryImpl; +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..743feab --- /dev/null +++ b/src/main/java/com/my_app/service/impl/CompanyServiceImpl.java @@ -0,0 +1,53 @@ +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 companyRepository; + + public CompanyServiceImpl(CompanyRepository companyRepository) { + this.companyRepository = companyRepository; + } + + @Override + public Company save(Company company) { + return this.companyRepository.save(company); + } + + @Override + public Company findById(Long id) { + return this.companyRepository.findById(id); + } + + @Override + public Company findByName(String name) { + return this.companyRepository.findByName(name); + } + + @Override + public List findAll() { + return this.companyRepository.findAll(); + } + + /*@Override + public boolean userMatchPassword(String username, String password) { + final Company user = this.findByUsername(username); + return user.getPassword().equals(password); + } */ + + @Override + public void deleteById(Long id) { + this.companyRepository.deleteById(id); + } + + @Override + public void delete(Company company) { + this.deleteById(company.getId()); + } + +} diff --git a/src/main/webapp/WEB-INF/struts-config.xml b/src/main/webapp/WEB-INF/struts-config.xml index 12cd624..0dbf51d 100644 --- a/src/main/webapp/WEB-INF/struts-config.xml +++ b/src/main/webapp/WEB-INF/struts-config.xml @@ -1,37 +1,52 @@ - + + - + + + - + - + - + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 1d7bc26..f50b722 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -18,11 +18,11 @@ *.do - + RequestAttrSetterFilter com.my_app.servlet.filter.RequestAttrSetterFilter - + RequestAttrSetterFilter /* diff --git a/src/main/webapp/company/list.jsp b/src/main/webapp/company/list.jsp new file mode 100644 index 0000000..7fceb1d --- /dev/null +++ b/src/main/webapp/company/list.jsp @@ -0,0 +1,75 @@ +<%@ 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 + + + + +
+

Users

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdNameCountryCityActions
No companies
${company.id}${company.name}${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..550a12f --- /dev/null +++ b/src/main/webapp/company/save/form.jsp @@ -0,0 +1,106 @@ +<%@ 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..c59fd8d 100644 --- a/src/main/webapp/home.jsp +++ b/src/main/webapp/home.jsp @@ -22,6 +22,9 @@
Users +
+ Companies + diff --git a/src/main/webapp/incl/header.jsp b/src/main/webapp/incl/header.jsp index 92be318..ae5122f 100644 --- a/src/main/webapp/incl/header.jsp +++ b/src/main/webapp/incl/header.jsp @@ -17,6 +17,10 @@
  • With sidebar
  • Full-width fluid
    • +
  • Public Page
    • + +
  • Private Page
    • +
    • @@ -27,7 +31,7 @@ diff --git a/src/main/webapp/page-layout/privatePage.jsp b/src/main/webapp/page-layout/privatePage.jsp new file mode 100644 index 0000000..fb0af3e --- /dev/null +++ b/src/main/webapp/page-layout/privatePage.jsp @@ -0,0 +1,35 @@ +<%@ 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"%> + + + + + + +Private Page - MyApp + + + + + + +
      +

      Private Page (Default)

      +

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris ac augue eu leo posuere hendrerit nec vel sapien. Pellentesque a ipsum hendrerit, elementum lectus eget, convallis enim. Phasellus sit amet sollicitudin nisl. Suspendisse ac placerat nibh. Suspendisse non pellentesque lectus. Vivamus pulvinar faucibus neque, sed vulputate libero commodo at. Morbi sed placerat diam. Nullam vestibulum iaculis ante, nec rhoncus ligula efficitur ac. Integer vel risus tortor. Morbi laoreet blandit cursus. Nulla venenatis leo ut risus luctus aliquet. Etiam ut rhoncus risus. Phasellus purus lorem, convallis et varius sed, auctor eu felis. Mauris feugiat metus id quam sodales suscipit. Curabitur id rhoncus metus.

      +

      Heading 2

      +

      Proin egestas congue mauris sit amet vestibulum. Curabitur varius eget elit vitae mollis. Nunc laoreet sed purus nec lacinia. Vestibulum vitae massa malesuada, laoreet leo a, pellentesque tortor. In efficitur at nibh lacinia lobortis. Etiam feugiat viverra purus sed mattis. Duis dictum odio sagittis sagittis sollicitudin. Nulla pellentesque tristique aliquet. Pellentesque lobortis diam vel rhoncus dignissim. Sed ac elementum ipsum. Vestibulum viverra quam ac volutpat porta.

      +

      Heading 3

      +

      In pulvinar eros non ante placerat molestie ut in purus. Curabitur et efficitur augue. Sed feugiat id felis in tristique. Cras porttitor quam sed ornare bibendum. Vivamus imperdiet rutrum ligula, id feugiat libero molestie vitae. Ut id ligula dignissim, luctus velit eget, malesuada sapien. Morbi a ligula consequat, tempus urna vel, molestie lacus. Cras in metus et diam ornare luctus a sit amet eros. Aenean sodales risus eu neque rutrum malesuada. Vivamus at sodales turpis. Donec dictum dictum massa, sit amet fringilla risus.

      +

      Heading 4

      +

      Morbi vel leo sollicitudin, lobortis tortor ut, convallis elit. Nam vestibulum id ipsum sed fringilla. In auctor at arcu et tincidunt. Duis rhoncus, metus vitae aliquet sagittis, tellus massa feugiat ante, sed faucibus massa eros id ex. Vestibulum ac neque maximus, bibendum massa nec, ultricies nisl. Donec pharetra laoreet justo. In ultricies, elit laoreet placerat ornare, enim magna efficitur ex, et aliquet arcu lectus a urna. Suspendisse in vehicula sapien. Suspendisse non augue eget magna rutrum consectetur. Integer sit amet orci molestie, fermentum mauris id, iaculis arcu. Donec ac cursus odio, nec vehicula tellus. Suspendisse potenti.

      +
      Heading 5
      +

      Vestibulum finibus id nunc eget faucibus. Morbi tristique ante molestie feugiat elementum. Donec tincidunt sodales libero, quis ullamcorper velit tincidunt vitae. Ut fermentum tempus ex, at aliquet mauris iaculis id. Fusce commodo sapien sit amet eros faucibus, eget aliquam orci rhoncus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus volutpat tempus luctus.

      +
      Heading 6
      +

      Suspendisse nec arcu quis nibh gravida ultrices. Praesent at malesuada nisl, sed porta sapien. Sed pharetra nulla sed quam fringilla auctor. Aenean scelerisque arcu in ornare dictum. Maecenas aliquam nisi vulputate, vehicula nisi ut, sodales nisl. Integer interdum nec nisi vel scelerisque. Integer ornare mi mi, non placerat sem accumsan eget. Nunc in neque quam. Proin commodo velit ut mi eleifend, id luctus metus sollicitudin. Integer rutrum felis ac massa pellentesque egestas. Vivamus malesuada neque a pellentesque gravida. Nunc a hendrerit sapien. Donec et fringilla ipsum, quis sagittis sem. Integer metus tellus, scelerisque sed nisl quis, dignissim consequat odio. Fusce nec nulla non est semper tempus eu vel mauris. Curabitur et aliquam libero.

      +
      + + + + \ No newline at end of file diff --git a/src/main/webapp/page-layout/publicPage.jsp b/src/main/webapp/page-layout/publicPage.jsp new file mode 100644 index 0000000..4ac1907 --- /dev/null +++ b/src/main/webapp/page-layout/publicPage.jsp @@ -0,0 +1,35 @@ +<%@ 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"%> + + + + + + +Public Page - MyApp + + + + + + +
      +

      Public Page (Full With Fluid)

      +

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris ac augue eu leo posuere hendrerit nec vel sapien. Pellentesque a ipsum hendrerit, elementum lectus eget, convallis enim. Phasellus sit amet sollicitudin nisl. Suspendisse ac placerat nibh. Suspendisse non pellentesque lectus. Vivamus pulvinar faucibus neque, sed vulputate libero commodo at. Morbi sed placerat diam. Nullam vestibulum iaculis ante, nec rhoncus ligula efficitur ac. Integer vel risus tortor. Morbi laoreet blandit cursus. Nulla venenatis leo ut risus luctus aliquet. Etiam ut rhoncus risus. Phasellus purus lorem, convallis et varius sed, auctor eu felis. Mauris feugiat metus id quam sodales suscipit. Curabitur id rhoncus metus.

      +

      Heading 2

      +

      Proin egestas congue mauris sit amet vestibulum. Curabitur varius eget elit vitae mollis. Nunc laoreet sed purus nec lacinia. Vestibulum vitae massa malesuada, laoreet leo a, pellentesque tortor. In efficitur at nibh lacinia lobortis. Etiam feugiat viverra purus sed mattis. Duis dictum odio sagittis sagittis sollicitudin. Nulla pellentesque tristique aliquet. Pellentesque lobortis diam vel rhoncus dignissim. Sed ac elementum ipsum. Vestibulum viverra quam ac volutpat porta.

      +

      Heading 3

      +

      In pulvinar eros non ante placerat molestie ut in purus. Curabitur et efficitur augue. Sed feugiat id felis in tristique. Cras porttitor quam sed ornare bibendum. Vivamus imperdiet rutrum ligula, id feugiat libero molestie vitae. Ut id ligula dignissim, luctus velit eget, malesuada sapien. Morbi a ligula consequat, tempus urna vel, molestie lacus. Cras in metus et diam ornare luctus a sit amet eros. Aenean sodales risus eu neque rutrum malesuada. Vivamus at sodales turpis. Donec dictum dictum massa, sit amet fringilla risus.

      +

      Heading 4

      +

      Morbi vel leo sollicitudin, lobortis tortor ut, convallis elit. Nam vestibulum id ipsum sed fringilla. In auctor at arcu et tincidunt. Duis rhoncus, metus vitae aliquet sagittis, tellus massa feugiat ante, sed faucibus massa eros id ex. Vestibulum ac neque maximus, bibendum massa nec, ultricies nisl. Donec pharetra laoreet justo. In ultricies, elit laoreet placerat ornare, enim magna efficitur ex, et aliquet arcu lectus a urna. Suspendisse in vehicula sapien. Suspendisse non augue eget magna rutrum consectetur. Integer sit amet orci molestie, fermentum mauris id, iaculis arcu. Donec ac cursus odio, nec vehicula tellus. Suspendisse potenti.

      +
      Heading 5
      +

      Vestibulum finibus id nunc eget faucibus. Morbi tristique ante molestie feugiat elementum. Donec tincidunt sodales libero, quis ullamcorper velit tincidunt vitae. Ut fermentum tempus ex, at aliquet mauris iaculis id. Fusce commodo sapien sit amet eros faucibus, eget aliquam orci rhoncus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus volutpat tempus luctus.

      +
      Heading 6
      +

      Suspendisse nec arcu quis nibh gravida ultrices. Praesent at malesuada nisl, sed porta sapien. Sed pharetra nulla sed quam fringilla auctor. Aenean scelerisque arcu in ornare dictum. Maecenas aliquam nisi vulputate, vehicula nisi ut, sodales nisl. Integer interdum nec nisi vel scelerisque. Integer ornare mi mi, non placerat sem accumsan eget. Nunc in neque quam. Proin commodo velit ut mi eleifend, id luctus metus sollicitudin. Integer rutrum felis ac massa pellentesque egestas. Vivamus malesuada neque a pellentesque gravida. Nunc a hendrerit sapien. Donec et fringilla ipsum, quis sagittis sem. Integer metus tellus, scelerisque sed nisl quis, dignissim consequat odio. Fusce nec nulla non est semper tempus eu vel mauris. Curabitur et aliquam libero.

      +
      + + + + \ No newline at end of file diff --git a/src/main/webapp/user/save/form.jsp b/src/main/webapp/user/save/form.jsp index 3a3f1b4..051fdd6 100644 --- a/src/main/webapp/user/save/form.jsp +++ b/src/main/webapp/user/save/form.jsp @@ -55,6 +55,14 @@ + +
      + + +
      + +
      +
      diff --git a/src/main/webapp/user/save/js/form.js b/src/main/webapp/user/save/js/form.js index 1585047..bfebf2b 100644 --- a/src/main/webapp/user/save/js/form.js +++ b/src/main/webapp/user/save/js/form.js @@ -10,6 +10,7 @@ let form = { $id: $('input#user-id'), $username: $('input#user-username'), $password: $('input#user-password'), + $email: $('input#user-email'), $country: $('select#user-country'), $city: $('select#user-city') }, diff --git a/src/out/production/java7-struts1-jquery-bootstrap3-web-project/MessageResources.properties b/src/out/production/java7-struts1-jquery-bootstrap3-web-project/MessageResources.properties new file mode 100644 index 0000000..a1e7aa0 --- /dev/null +++ b/src/out/production/java7-struts1-jquery-bootstrap3-web-project/MessageResources.properties @@ -0,0 +1,14 @@ +form.validation.error=Form contains errors, please check each field error message +form.validation.success=Form was validated successfully +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.create.success=User "{0}" was created successfully +user.update.success=User "{0}" was update successfully +user.delete.success=User "{0}" was deleted successfully