integrated static page
This commit is contained in:
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
import de.jottyfan.camporganizer.module.common.CommonController;
|
||||
import de.jottyfan.camporganizer.module.camplist.CommonController;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.jottyfan.camporganizer.module.common;
|
||||
package de.jottyfan.camporganizer.module.camplist;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.jottyfan.camporganizer.module.common;
|
||||
package de.jottyfan.camporganizer.module.camplist;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
@@ -20,8 +20,8 @@ import de.jottyfan.camporganizer.module.registration.KeycloakRepository;
|
||||
*
|
||||
*/
|
||||
@Controller
|
||||
public class IndexController extends CommonController {
|
||||
private static final Logger LOGGER = LogManager.getLogger(IndexController.class);
|
||||
public class CamplistController extends CommonController {
|
||||
private static final Logger LOGGER = LogManager.getLogger(CamplistController.class);
|
||||
|
||||
@Autowired
|
||||
private HttpServletRequest request;
|
||||
@@ -30,13 +30,13 @@ public class IndexController extends CommonController {
|
||||
private KeycloakRepository keycloak;
|
||||
|
||||
@Autowired
|
||||
private IndexService service;
|
||||
private CamplistService service;
|
||||
|
||||
@GetMapping("/")
|
||||
@GetMapping("/camplist")
|
||||
public String index(Model model) {
|
||||
super.setupSession(model, request);
|
||||
model.addAttribute("camps", service.getAllCamps(true));
|
||||
return super.isLoggedIn(request) ? dashboard(model) : "/index";
|
||||
return super.isLoggedIn(request) ? dashboard(model) : "/camplist";
|
||||
}
|
||||
|
||||
@GetMapping("/dashboard")
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.jottyfan.camporganizer.module.common;
|
||||
package de.jottyfan.camporganizer.module.camplist;
|
||||
|
||||
import static de.jottyfan.camporganizer.db.jooq.Tables.T_PERSON;
|
||||
import static de.jottyfan.camporganizer.db.jooq.Tables.T_PROFILE;
|
||||
@@ -30,8 +30,8 @@ import de.jottyfan.camporganizer.db.jooq.tables.records.VCampRecord;
|
||||
*/
|
||||
@Repository
|
||||
@Transactional(transactionManager = "transactionManager")
|
||||
public class IndexGateway {
|
||||
private static final Logger LOGGER = LogManager.getLogger(IndexGateway.class);
|
||||
public class CamplistGateway {
|
||||
private static final Logger LOGGER = LogManager.getLogger(CamplistGateway.class);
|
||||
|
||||
@Autowired
|
||||
private DSLContext jooq;
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.jottyfan.camporganizer.module.common;
|
||||
package de.jottyfan.camporganizer.module.camplist;
|
||||
|
||||
import static de.jottyfan.camporganizer.db.jooq.Tables.V_CAMP;
|
||||
|
||||
@@ -21,10 +21,10 @@ import de.jottyfan.camporganizer.module.dashboard.DashboardGateway;
|
||||
*
|
||||
*/
|
||||
@Service
|
||||
public class IndexService {
|
||||
public class CamplistService {
|
||||
|
||||
@Autowired
|
||||
private IndexGateway gateway;
|
||||
private CamplistGateway gateway;
|
||||
|
||||
@Autowired
|
||||
private DashboardGateway dashboardGateway;
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.jottyfan.camporganizer.module.common;
|
||||
package de.jottyfan.camporganizer.module.camplist;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.jottyfan.camporganizer.module.common;
|
||||
package de.jottyfan.camporganizer.module.camplist;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.jottyfan.camporganizer.module.common;
|
||||
package de.jottyfan.camporganizer.module.camplist;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.info.BuildProperties;
|
||||
@@ -37,7 +37,7 @@ import de.jottyfan.camporganizer.db.jooq.tables.TProfile;
|
||||
import de.jottyfan.camporganizer.db.jooq.tables.records.TCampRecord;
|
||||
import de.jottyfan.camporganizer.db.jooq.tables.records.TPersonRecord;
|
||||
import de.jottyfan.camporganizer.db.jooq.tables.records.TRssRecord;
|
||||
import de.jottyfan.camporganizer.module.common.LambdaResultWrapper;
|
||||
import de.jottyfan.camporganizer.module.camplist.LambdaResultWrapper;
|
||||
import de.jottyfan.camporganizer.module.mail.MailRepository;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,8 +21,8 @@ import de.jottyfan.camporganizer.db.jooq.enums.EnumFiletype;
|
||||
import de.jottyfan.camporganizer.db.jooq.tables.records.TPersonRecord;
|
||||
import de.jottyfan.camporganizer.db.jooq.tables.records.TPersondocumentRecord;
|
||||
import de.jottyfan.camporganizer.db.jooq.tables.records.TRssRecord;
|
||||
import de.jottyfan.camporganizer.module.common.BookingBean;
|
||||
import de.jottyfan.camporganizer.module.common.LambdaResultWrapper;
|
||||
import de.jottyfan.camporganizer.module.camplist.BookingBean;
|
||||
import de.jottyfan.camporganizer.module.camplist.LambdaResultWrapper;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
|
||||
import de.jottyfan.camporganizer.module.common.CommonController;
|
||||
import de.jottyfan.camporganizer.module.camplist.CommonController;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@@ -43,8 +43,8 @@ import de.jottyfan.camporganizer.db.jooq.tables.records.TPersonRecord;
|
||||
import de.jottyfan.camporganizer.db.jooq.tables.records.TPersondocumentRecord;
|
||||
import de.jottyfan.camporganizer.db.jooq.tables.records.TProfileRecord;
|
||||
import de.jottyfan.camporganizer.db.jooq.tables.records.TRssRecord;
|
||||
import de.jottyfan.camporganizer.module.common.BookingBean;
|
||||
import de.jottyfan.camporganizer.module.common.LambdaResultWrapper;
|
||||
import de.jottyfan.camporganizer.module.camplist.BookingBean;
|
||||
import de.jottyfan.camporganizer.module.camplist.LambdaResultWrapper;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import de.jottyfan.camporganizer.module.common.BookingBean;
|
||||
import de.jottyfan.camporganizer.module.camplist.BookingBean;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user