Merge pull request #1 from HediMjid/sana

Sana test
This commit is contained in:
HediMjid 2021-12-13 12:44:13 +01:00 committed by GitHub
commit c55a560b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 0 deletions

8
.idea/.gitignore generated vendored
View File

@ -1,3 +1,11 @@
# Default ignored files # Default ignored files
/shelf/ /shelf/
/workspace.xml /workspace.xml
<<<<<<< HEAD
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
=======
>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11

9
.idea/Organizee.iml generated Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

4
.idea/misc.xml generated
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<<<<<<< HEAD
<component name="ProjectRootManager">
=======
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">
<option name="originalFiles"> <option name="originalFiles">
@ -9,6 +12,7 @@
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

8
.idea/modules.xml generated Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Organizee.iml" filepath="$PROJECT_DIR$/.idea/Organizee.iml" />
</modules>
</component>
</project>

4
.idea/vcs.xml generated
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<<<<<<< HEAD
<mapping directory="" vcs="Git" />
=======
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
</component> </component>
</project> </project>

1
README.md Normal file
View File

@ -0,0 +1 @@
# Organizee

View File

@ -14,6 +14,7 @@ public class Membre {
private String email; private String email;
private String password; private String password;
private String isAdmin; private String isAdmin;
private String testGit;
@ManyToOne(fetch= FetchType.EAGER) @ManyToOne(fetch= FetchType.EAGER)
@JoinColumn(name="TEAM_ID") @JoinColumn(name="TEAM_ID")
private Team team; private Team team;