Merge branch 'QRCodes' into 'main'

Qr codes

Closes #49

See merge request !27

src/main/java/Team5/SmartTowns/data/DatabaseController.java

@@ -9,8 +9,10 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.*;
+
 @Controller
 public class DatabaseController {
+
     @Autowired
     private LocationRepository locationRepository;
     @Autowired

src/main/java/Team5/SmartTowns/data/LocationRepository.java

@@ -8,5 +8,4 @@ public interface LocationRepository {
     List<Location> getAllLocation();
     void addLocation(Location loc);
 
-
 }

src/main/java/Team5/SmartTowns/data/MockUser.java

-package Team5.SmartTowns.Data;
+package Team5.SmartTowns.data;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
@@ -8,8 +8,8 @@ import java.util.List;
 public class MockUser {
 
     private JdbcTemplate jdbc;
-    private RowMapper<trail> trailMapper;
-    public List<trail> getAllTrails(){
+    private RowMapper<Trail> trailMapper;
+    public List<Trail> getAllTrails(){
         String sql= "SELECT * FROM trails";
         return jdbc.query(sql, trailMapper);
     }

src/main/java/Team5/SmartTowns/data/QRCodes.java

-package Team5.SmartTowns.Data;
+package Team5.SmartTowns.data;
 
 public class QRCodes {
 }

src/main/java/Team5/SmartTowns/trails/TrailsController.java

 package Team5.SmartTowns.trails;
 
 
-import Team5.SmartTowns.Landmarks.Landmarks;
+import Team5.SmartTowns.landmarks.Landmarks;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import static Team5.SmartTowns.Landmarks.Landmarks.landmarksDragonstrail;
+import static Team5.SmartTowns.landmarks.Landmarks.landmarksDragonstrail;
 
 //import static Team5.SmartTowns.Landmarks.Landmarks.landmarksDragonstrail;
 

src/main/java/Team5/SmartTowns/users/User.java

@@ -17,7 +17,6 @@ public class User {
     String name;
     String imgPath;
     int dragonProgress;
-    Map<Badge, Integer> badgeProgress = new HashMap<>(); // Demonstrates the progress towards a specific badge (0-100)
     Map<Sticker, Boolean> hasStickers = new HashMap<>(); // True if User has sticker (key)
     Map<Integer, Boolean> dragonstaleLandmarkIDs = new HashMap<>(); // Storing the IDs of the landmarks associated with Dragonstale, as well as if the user has visited it before (boolean)
 
@@ -26,14 +25,12 @@ public class User {
         this.email = email;
         this.name = name;
         this.dragonProgress = dragonProgress;
-//        this.dragonstaleLandmarkIDs = dragonstaleLandmarkIDs;
         imgPath = findImagePath();
     }
-    public User(int id, String email, String name, int dragonProgress) {
+    public User(int id, String email, String name) {
         this.id = id;
         this.email = email;
         this.name = name;
-        this.dragonProgress = dragonProgress;
         imgPath = findImagePath();
     }
 

src/main/resources/schema.sql

@@ -28,7 +28,6 @@ create table if not exists users
     id bigint auto_increment primary key,
     email varchar(128),
     name varchar(30),
-    name varchar(128),
     dragonProgress int,
     dragonsLandmarkIDs longtext
 ) engine=InnoDB;