diff --git a/src/data.sql b/src/data.sql deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/main/java/Team5/SmartTowns/Data/UserRepository.java b/src/main/java/Team5/SmartTowns/Data/UserRepository.java index aea6a6f357f292ceb4770f23ae4f61744d6f5911..80e0dc68f41a672abef55a3af8cd43de03940404 100644 --- a/src/main/java/Team5/SmartTowns/Data/UserRepository.java +++ b/src/main/java/Team5/SmartTowns/Data/UserRepository.java @@ -2,7 +2,10 @@ package Team5.SmartTowns.Data; import java.util.List; + public interface UserRepository { List<user> getAllUsers(); + + } diff --git a/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java index 17f15f9c465c85e6fe552108b906ef4b1c9e14fd..00ac1d212f3f10d669d78225c75079bf151b8748 100644 --- a/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java @@ -29,7 +29,7 @@ public class UserRepositoryJDBC implements UserRepository{ @Override public List<user> getAllUsers(){ - String sql = "select * from user"; + String sql = "select * from User"; return jdbc.query(sql, userMapper); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f1e9fb7cf88b1830f79b91a6b170ceffa2bbd11c..95f46c69ab2c6b38e1c520a5b8438c8f87aba0a3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.datasource.url=jdbc:mariadb://localhost3306/Towns +spring.datasource.url=jdbc:mariadb://localhost:3306/towns spring.datasource.username=root spring.datasource.password=comsc diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql new file mode 100644 index 0000000000000000000000000000000000000000..95d37883734a52617f095531a2d731c04a65f2e1 --- /dev/null +++ b/src/main/resources/schema.sql @@ -0,0 +1,12 @@ +drop table if exists trails; +create table if not exists trails( + trailID bigint auto_increment primary key +) engine=InnoDB; +drop table if exists location; +create table if not exists location( + locationID bigint auto_increment primary key +) engine=InnoDB; +drop table if exists users; +create table if not exists users( + userID bigint auto_increment primary key +) engine=InnoDB; \ No newline at end of file diff --git a/src/main/resources/static/users.html b/src/main/resources/static/users.html new file mode 100644 index 0000000000000000000000000000000000000000..566549bdf8fae810809c1a81066000687cb338f6 --- /dev/null +++ b/src/main/resources/static/users.html @@ -0,0 +1,10 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8"> + <title>Title</title> +</head> +<body> + +</body> +</html> \ No newline at end of file