diff --git a/helpmehelpapplication/.idea/.gitignore b/helpmehelpapplication/.idea/.gitignore new file mode 100644 index 0000000..ab1f416 --- /dev/null +++ b/helpmehelpapplication/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Ignored default folder with query files +/queries/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/helpmehelpapplication/.idea/checkstyle-idea.xml b/helpmehelpapplication/.idea/checkstyle-idea.xml new file mode 100644 index 0000000..db90706 --- /dev/null +++ b/helpmehelpapplication/.idea/checkstyle-idea.xml @@ -0,0 +1,15 @@ + + + + 13.2.0 + JavaOnly + + + \ No newline at end of file diff --git a/helpmehelpapplication/.idea/compiler.xml b/helpmehelpapplication/.idea/compiler.xml new file mode 100644 index 0000000..5c8171b --- /dev/null +++ b/helpmehelpapplication/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/helpmehelpapplication/.idea/dictionaries/project.xml b/helpmehelpapplication/.idea/dictionaries/project.xml new file mode 100644 index 0000000..e01d6da --- /dev/null +++ b/helpmehelpapplication/.idea/dictionaries/project.xml @@ -0,0 +1,7 @@ + + + + Prestmo + + + \ No newline at end of file diff --git a/helpmehelpapplication/.idea/inspectionProfiles/Project_Default.xml b/helpmehelpapplication/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..769a78f --- /dev/null +++ b/helpmehelpapplication/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/helpmehelpapplication/.idea/jarRepositories.xml b/helpmehelpapplication/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/helpmehelpapplication/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/helpmehelpapplication/.idea/misc.xml b/helpmehelpapplication/.idea/misc.xml new file mode 100644 index 0000000..5e4e294 --- /dev/null +++ b/helpmehelpapplication/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/helpmehelpapplication/.idea/vcs.xml b/helpmehelpapplication/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/helpmehelpapplication/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/User.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/User.java index c51d84b..09e8c0d 100644 --- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/User.java +++ b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/User.java @@ -1,4 +1,55 @@ package ntnu.sytemutvikling.team6.models; +import java.util.UUID; + +// Passord må hashes!!! + +/** + * Represents a user. + * + * @Author Robin Strand Prestmo + */ public class User { + private UUID id; + private String name; + private String email; + private String password; + private String role; + private Settings settings; + private Inbox inbox; + + /** + * Creates a new user + * + * @param id gives the user a unique identifier with UUID + * @param name the name of the user + * @param email the email of the user + * @param password the password for the user + * @param role users role + * @param settings the user´s settings + * @param inbox the user´s inbox + * + * @Author Robin Strand Prestmo + */ + public User(UUID id, + String name, + String email, + String password, + String role, + Settings settings, + Inbox inbox) { + + this.id = id; + this.name = name; + this.email = email; + this.password = password; + this.role = role; + this.settings = settings; + this.inbox = inbox; + } + + // Add Getters + + // Add Setters + }