Compare commits

...

2 Commits

3 changed files with 9 additions and 4 deletions

View File

@ -5,6 +5,7 @@ import com.alttd.altitudeweb.database.web_db.KeyPairMapper;
import com.alttd.altitudeweb.database.web_db.PrivilegedUserMapper; import com.alttd.altitudeweb.database.web_db.PrivilegedUserMapper;
import com.alttd.altitudeweb.database.web_db.SettingsMapper; import com.alttd.altitudeweb.database.web_db.SettingsMapper;
import com.alttd.altitudeweb.database.web_db.forms.AppealMapper; import com.alttd.altitudeweb.database.web_db.forms.AppealMapper;
import com.alttd.altitudeweb.database.web_db.mail.EmailVerificationMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSession;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -22,7 +23,7 @@ public class InitializeWebDb {
configuration.addMapper(KeyPairMapper.class); configuration.addMapper(KeyPairMapper.class);
configuration.addMapper(PrivilegedUserMapper.class); configuration.addMapper(PrivilegedUserMapper.class);
configuration.addMapper(AppealMapper.class); configuration.addMapper(AppealMapper.class);
configuration.addMapper(com.alttd.altitudeweb.database.web_db.mail.EmailVerificationMapper.class); configuration.addMapper(EmailVerificationMapper.class);
}).join() }).join()
.runQuery(sqlSession -> { .runQuery(sqlSession -> {
createSettingsTable(sqlSession); createSettingsTable(sqlSession);

View File

@ -81,8 +81,7 @@
<mat-label>Email</mat-label> <mat-label>Email</mat-label>
<input matInput <input matInput
formControlName="email" formControlName="email"
placeholder="Email" placeholder="Email">
[defaultValue]="verifiedEmails().length > 0 ? verifiedEmails()[0] : ''">
@if (form.controls.email.invalid && form.controls.email.touched) { @if (form.controls.email.invalid && form.controls.email.touched) {
<mat-error> <mat-error>
@if (form.controls.email.errors?.['required']) { @if (form.controls.email.errors?.['required']) {

View File

@ -79,7 +79,12 @@ export class AppealComponent implements OnInit, OnDestroy, AfterViewInit {
this.emailIsValid.set(false); this.emailIsValid.set(false);
} }
}); });
computed(() => {
if (this.verifiedEmails().length > 0) {
this.form.get('email')?.setValue(this.verifiedEmails()[0]);
this.emailIsValid.set(true);
}
});
} }
ngOnInit() { ngOnInit() {