diff --git a/build.gradle b/build.gradle index 0bdcc02bb2a5367c58f9bb20ef3f61c21057242b..a0a09e8fb45fd38801bd67049ca4bd872d6eac88 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.1.5' id 'io.spring.dependency-management' version '1.1.3' + id "com.github.node-gradle.node" version "7.0.1" } group = 'Team.5' @@ -34,6 +35,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation 'org.springframework.boot:spring-boot-starter-validation' + // https://mvnrepository.com/artifact/org.webjars/openlayers + implementation group: 'org.webjars', name: 'openlayers', version: '5.2.0' } tasks.named('bootBuildImage') { diff --git a/src/main/resources/static/css/styling.css b/src/main/resources/static/css/styling.css index 019ac115e3af242b49e1cf3ffafcb95ddf306ed8..167be5a4bbe5cc3859918339747ebf97d0fed5a5 100644 --- a/src/main/resources/static/css/styling.css +++ b/src/main/resources/static/css/styling.css @@ -1,2 +1,2 @@ /*@import "../../templates/towns/mapsTest/node_modules/ol/ol.css";*/ -@import "../node_modules/ol/ol.css"; +@import "../../templates/towns/mapsTest/node_modules/ol/ol.css"; diff --git a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java index aa1735bc98f7430f43c9d21fef2b4b51cc7f3001..3ae121d85a9c5584aaa3535fe03e80cbf879484c 100644 --- a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java +++ b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java @@ -32,18 +32,19 @@ class SmartTownsApplicationTests { private static JdbcTemplate jdbc; @BeforeAll public static void before() { - location = new Location(); } - @BeforeAll - public static void before2() { - locationRepo = new locationRepositoryJDBC(jdbc); } + location = new Location(); + locationRepo = new locationRepositoryJDBC(jdbc);} +// @BeforeAll +// public static void before2() { +// locationRepo = new locationRepositoryJDBC(jdbc); } // @Autowired // private locationRepository locationRepository; - @Test - public void whenAddingLocationsNonApprovedLocationsDontShowInTrails(){ - /// Discover number of approved/unapproved locations before adding tests - List<Location> approvedNumber = locationRepo.approvedLocations(); - } +// @Test +// public void whenAddingLocationsNonApprovedLocationsDontShowInTrails(){ +// /// Discover number of approved/unapproved locations before adding tests +// List<Location> approvedNumber = locationRepo.approvedLocations(); +// } //// Location loc1= new Location("TestFail", "Test@PleaseFail.test", "Fail Description here", //// "Caerphilly", 103, false); //// Location loc2= new Location("TestFail", "Test@PleaseFail2.test", "Fail Description here",