-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(.prettierignore): fix merge conflicts. fix prettier config error
chore #484
- Loading branch information
Showing
11 changed files
with
2,483 additions
and
985 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| coverage | ||
| dist | ||
| frontend/dist | ||
| node_modules | ||
| frontend/node_modules | ||
| .prettierignore | ||
| # Ignore all HTML files: | ||
| *.html |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "arrowParens": "always", | ||
| "bracketSpacing": true, | ||
| "embeddedLanguageFormatting": "auto", | ||
| "htmlWhitespaceSensitivity": "css", | ||
| "insertPragma": false, | ||
| "jsxBracketSameLine": false, | ||
| "jsxSingleQuote": false, | ||
| "printWidth": 80, | ||
| "proseWrap": "preserve", | ||
| "quoteProps": "as-needed", | ||
| "requirePragma": false, | ||
| "semi": true, | ||
| "singleQuote": true, | ||
| "tabWidth": 2, | ||
| "trailingComma": "es5", | ||
| "useTabs": false, | ||
| "vueIndentScriptAndStyle": false | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 21 additions & 24 deletions
45
frontend/src/app/administration/invite-user/invite-user.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,23 @@ | ||
| <div class="container col-12 col-md-7 mx-auto"> | ||
| <p-card> | ||
| <h6>Invite a User</h6> | ||
| <div id="formContent"> | ||
| <form [formGroup]="inviteForm" (ngSubmit)="onSubmit(inviteForm)" id="userForm"> | ||
| <input | ||
| formControlName="email" | ||
| type="text" | ||
| class="fill-width" | ||
| id="email" | ||
| class="form-control" | ||
| name="email" | ||
| placeholder="Email" | ||
| style="margin-bottom: 5px;" | ||
| /> | ||
| <input | ||
| [disabled]="!inviteForm.valid" | ||
| type="submit" | ||
| class="btn btn-success centerBtn" | ||
| value="Submit" | ||
| /> | ||
| <br> | ||
| </form> | ||
| </div> | ||
| </p-card> | ||
| </div> | ||
| <h6>Invite a User</h6> | ||
| <div id="formContent"> | ||
| <form [formGroup]="inviteForm" (ngSubmit)="onSubmit(inviteForm)" id="userForm"> | ||
| <div class="col-12"> | ||
| <div class="p-d-flex p-flex-column"> | ||
| <div class="p-d-flex p-flex-column p-flex-md-row"> | ||
| <label for="inviteUser" class="col-12 col-md-4 col-form-label">User Email:</label> | ||
| <div class="col-12 col-md-8"> | ||
| <input pInputText formControlName="email" type="text" class="fill-width" id="email" class="form-control" | ||
| name="email" placeholder="Email" style="margin-bottom: 5px;" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <input pInputText [disabled]="!inviteForm.valid" type="submit" class="btn btn-primary float-right" | ||
| value="Submit" /> | ||
| <br /> | ||
| </form> | ||
| </div> | ||
| </p-card> | ||
| </div> |
84 changes: 43 additions & 41 deletions
84
frontend/src/app/administration/settings/settings.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,48 @@ | ||
| <div class="container col-12 col-md-7 mx-auto"> | ||
| <p-card> | ||
| <h6>Application Email Settings</h6> | ||
| <div id="formContent"> | ||
| <form [formGroup]="settingsForm" (ngSubmit)="onSubmit(settingsForm)" id="userForm"> | ||
| <div class="col-12"> | ||
| <div class="p-d-flex p-flex-column"> | ||
| <div class="p-d-flex p-flex-column"> | ||
| <span> | ||
| <i class="pi pi-info-circle"></i><i style="font-size: smaller;"> An app password is a | ||
| 16-digit passcode that gives a | ||
| non-Google app or device permission to access your Google Account. Please follow this <a | ||
| href="https://support.google.com/mail/answer/185833?hl=en-GB">link</a> for more | ||
| information.</i> | ||
| </span></div> | ||
| <div class="p-d-flex p-flex-column p-flex-md-row"> | ||
| <label for="fromEmail" class="col-12 col-md-4 col-form-label">Gmail Account:</label> | ||
| <div class="col-12 col-md-8"> | ||
| <input formControlName="fromEmail" type="text" id="fromEmail" class="form-control" | ||
| name="fromEmail" placeholder="Email" style="margin-bottom: 5px;" pInputText/> | ||
| </div> | ||
| </div> | ||
| <p-card> | ||
| <h6>Application Email Settings</h6> | ||
| <div id="formContent"> | ||
| <form [formGroup]="settingsForm" (ngSubmit)="onSubmit(settingsForm)" id="userForm"> | ||
| <div class="col-12"> | ||
| <div class="p-d-flex p-flex-column"> | ||
| <div class="p-d-flex p-flex-column"> | ||
| <span> | ||
| <i class="pi pi-info-circle"></i><i style="font-size: smaller;"> An app password is a | ||
| 16-digit passcode that gives a | ||
| non-Google app or device permission to access your Google Account. Please follow this <a | ||
| href="https://support.google.com/mail/answer/185833?hl=en-GB">link</a> for more | ||
| information.</i> | ||
| </span> | ||
| </div> | ||
| <div class="p-d-flex p-flex-column p-flex-md-row"> | ||
| <label for="fromEmail" class="col-12 col-md-4 col-form-label">Gmail Account:</label> | ||
| <div class="col-12 col-md-8"> | ||
| <input pInputText formControlName="fromEmail" type="text" id="fromEmail" class="form-control" | ||
| name="fromEmail" placeholder="Email" style="margin-bottom: 5px;" pInputText /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="p-d-flex p-flex-column p-flex-md-row"> | ||
| <label for="fromEmailPassword" class="col-12 col-md-4 col-form-label">Gmail App Password:</label> | ||
| <div class="col-12 col-md-8"> | ||
| <input formControlName="fromEmailPassword" type="password" id="fromEmailPassword" | ||
| class="form-control" name="fromEmailPassword" [placeholder]="isEdit ? '':keyPlaceholder" | ||
| style="margin-bottom: 5px;" pInputText/> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="p-d-flex p-flex-column p-flex-md-row"> | ||
| <label for="companyName" class="col-12 col-md-4 col-form-label">Company Name:</label> | ||
| <div class="col-12 col-md-8"> | ||
| <input formControlName="companyName" type="text" id="companyName" class="form-control" | ||
| name="companyName" placeholder="Company Name" style="margin-bottom: 5px;" pInputText/> | ||
| </div> | ||
| <div class="p-d-flex p-flex-column p-flex-md-row"> | ||
| <label for="fromEmailPassword" class="col-12 col-md-4 col-form-label">Gmail App Password:</label> | ||
| <div class="col-12 col-md-8"> | ||
| <input pInputText formControlName="fromEmailPassword" type="password" id="fromEmailPassword" | ||
| class="form-control" name="fromEmailPassword" [placeholder]="isEdit ? '':keyPlaceholder" | ||
| style="margin-bottom: 5px;" pInputText /> | ||
| </div> | ||
| </div> | ||
| <input [disabled]="isEdit ? !settingsForm.valid : false" type="submit" class="btn btn-success centerBtn" | ||
| [value]="isEdit ? 'Update' : 'Edit'" pInputText/> | ||
| </form> | ||
| </div> | ||
| <div class="p-d-flex p-flex-column p-flex-md-row"> | ||
| <label for="companyName" class="col-12 col-md-4 col-form-label">Company Name:</label> | ||
| <div class="col-12 col-md-8"> | ||
| <input pInputText formControlName="companyName" type="text" id="companyName" class="form-control" | ||
| name="companyName" placeholder="Company Name" style="margin-bottom: 5px;" pInputText /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </p-card> | ||
| </div> | ||
| <input pInputText [disabled]="isEdit ? !settingsForm.valid : false" type="submit" | ||
| class="btn btn-primary float-right" [value]="isEdit ? 'Update' : 'Edit'" pInputText /> | ||
| <br /> | ||
| </form> | ||
| </div> | ||
| </p-card> | ||
| </div> |
Oops, something went wrong.