Skip to content

Commit

Permalink
update merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Rodolphe_Lassalle committed Jul 17, 2024
2 parents 5398760 + 0686992 commit f235b73
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 46 deletions.
6 changes: 4 additions & 2 deletions backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ spring.servlet.multipart.file-size-threshold=10MB
# Token authentication
spring.security.oauth2.resourceserver.jwt.public-key-location=MaPremierApplicationAngularSpringBootMongoDB

# mail
# Parameter mail
spring.mail.host=smtp.gmail.com
spring.mail.port=587
# adresse mail
spring.mail.username=[email protected]
# password
spring.mail.password=password
spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.starttls.required=true
spring.mail.properties.mail.smtp.connectiontimeout=5000
spring.mail.properties.mail.smtp.timeout=5000
spring.mail.properties.mail.smtp.writetimeout=5000
spring.mail.properties.mail.smtp.writetimeout=5000
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import com.perso.gtper.emailings.MailGrilleAdded;
import com.perso.gtper.entities.Personnal;
import com.perso.gtper.repositories.PersonnalRepository;
import com.perso.gtper.services.PersonnalService;

@ExtendWith(MockitoExtension.class)
public class PersonnalServiceTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.perso.gtper.enums.ERole;
import com.perso.gtper.repositories.RoleRepository;
import com.perso.gtper.repositories.UserRepository;
import com.perso.gtper.services.UserServiceImpl;

@ExtendWith(MockitoExtension.class)
public class UserServiceImplTest {
Expand Down
66 changes: 26 additions & 40 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/src/app/shared/components/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class HomeComponent implements OnDestroy {
this.menuOutsideClickListener = this.renderer.listen(
'document',
'click',
(event) => {
(event: Event) => {
const isOutsideClicked = !(
this.appTopbar.menuButton.nativeElement.isSameNode(
event.target
Expand All @@ -67,7 +67,7 @@ export class HomeComponent implements OnDestroy {
this.profileMenuOutsideClickListener = this.renderer.listen(
'document',
'click',
(event) => {
(event: Event) => {
const isOutsideClicked = !(
this.appTopbar.menu.nativeElement.isSameNode(event.target) ||
this.appTopbar.menu.nativeElement.contains(event.target) ||
Expand Down

0 comments on commit f235b73

Please sign in to comment.