Skip to content

Commit 076c35d

Browse files
Merge pull request #2242 from WISE-Community/remove-modules-part-1
2 parents e792d7c + f899369 commit 076c35d

69 files changed

Lines changed: 237 additions & 782 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/app/authoring-tool/edit-component-advanced/edit-component-advanced.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import { Component as WISEComponent } from '../../../assets/wise5/common/Compone
1515
import { components } from '../../../assets/wise5/components/Components';
1616

1717
@Component({
18-
templateUrl: './edit-component-advanced.component.html',
18+
imports: [MatDivider, MatDialogModule, MatButtonModule],
1919
styles: [
2020
'.mat-divider { margin: 0 -16px; } .mat-mdc-dialog-content { padding-top: 10px !important; padding-bottom: 10px !important; }'
2121
],
22-
imports: [MatDivider, MatDialogModule, MatButtonModule]
22+
templateUrl: './edit-component-advanced.component.html'
2323
})
2424
export class EditComponentAdvancedComponent {
2525
@ViewChild('component') private componentElementRef: ElementRef;

src/app/classroom-monitor/alert-status-corner/alert-status-corner.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { Component, Input } from '@angular/core';
33
import { MatTooltipModule } from '@angular/material/tooltip';
44

55
@Component({
6-
imports: [CommonModule, MatTooltipModule],
7-
selector: 'alert-status-corner',
8-
styleUrl: 'alert-status-corner.scss',
9-
templateUrl: 'alert-status-corner.component.html'
6+
imports: [CommonModule, MatTooltipModule],
7+
selector: 'alert-status-corner',
8+
styleUrl: 'alert-status-corner.scss',
9+
templateUrl: 'alert-status-corner.component.html'
1010
})
1111
export class AlertStatusCornerComponent {
1212
@Input() hasNewAlert: boolean;

src/app/classroom-monitor/status-icon/status-icon.component.html

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/app/classroom-monitor/status-icon/status-icon.component.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,18 @@ import { MatIconModule } from '@angular/material/icon';
33
import { MatTooltipModule } from '@angular/material/tooltip';
44

55
@Component({
6-
imports: [MatIconModule, MatTooltipModule],
7-
selector: 'status-icon',
8-
templateUrl: 'status-icon.component.html'
6+
imports: [MatIconModule, MatTooltipModule],
7+
selector: 'status-icon',
8+
template: `
9+
<mat-icon
10+
class="{{ class }}"
11+
tabindex="0"
12+
matTooltip="{{ tooltip }}"
13+
matTooltipPosition="above"
14+
>
15+
{{ name }}
16+
</mat-icon>
17+
`
918
})
1019
export class StatusIconComponent {
1120
@Input() class: string;

src/app/forgot/forgot-user-password-complete/forgot-user-password-complete.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { MatButton } from '@angular/material/button';
44
import { MatCard, MatCardContent } from '@angular/material/card';
55

66
@Component({
7-
templateUrl: './forgot-user-password-complete.component.html',
8-
imports: [MatCard, MatCardContent, MatButton]
7+
imports: [MatCard, MatCardContent, MatButton],
8+
templateUrl: './forgot-user-password-complete.component.html'
99
})
1010
export class ForgotUserPasswordCompleteComponent {
1111
@Input() username: string;

src/app/help/help.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { Component } from '@angular/core';
22
import { RouterModule } from '@angular/router';
33

44
@Component({
5-
imports: [RouterModule],
6-
selector: 'app-help',
7-
styleUrl: './help.component.scss',
8-
templateUrl: './help.component.html'
5+
imports: [RouterModule],
6+
selector: 'app-help',
7+
styleUrl: './help.component.scss',
8+
templateUrl: './help.component.html'
99
})
1010
export class HelpComponent {}

src/app/modules/header/header-signin/header-signin.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { Component } from '@angular/core';
22
import { RouterModule } from '@angular/router';
33

44
@Component({
5-
selector: 'app-header-signin',
6-
imports: [RouterModule],
7-
templateUrl: './header-signin.component.html',
8-
styleUrls: ['./header-signin.component.scss']
5+
imports: [RouterModule],
6+
selector: 'app-header-signin',
7+
styleUrl: './header-signin.component.scss',
8+
templateUrl: './header-signin.component.html'
99
})
1010
export class HeaderSigninComponent {}

src/app/modules/library/select-all-items-checkbox/select-all-items-checkbox.component.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import { MatTooltipModule } from '@angular/material/tooltip';
55
type SelectAllItemsStatus = 'none' | 'some' | 'all';
66

77
@Component({
8-
imports: [MatCheckboxModule, MatTooltipModule],
9-
providers: [{ provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: 'noop' } }],
10-
selector: 'select-all-items-checkbox',
11-
styleUrl: 'select-all-items-checkbox.component.scss',
12-
templateUrl: './select-all-items-checkbox.component.html'
8+
imports: [MatCheckboxModule, MatTooltipModule],
9+
providers: [{ provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: 'noop' } }],
10+
selector: 'select-all-items-checkbox',
11+
styleUrl: 'select-all-items-checkbox.component.scss',
12+
templateUrl: './select-all-items-checkbox.component.html'
1313
})
1414
export class SelectAllItemsCheckboxComponent {
1515
@Output() allSelectedEvent: EventEmitter<void> = new EventEmitter<void>();

src/app/modules/shared/blurb/blurb.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { CommonModule } from '@angular/common';
22
import { Component, ContentChild, Input, TemplateRef } from '@angular/core';
33

44
@Component({
5-
imports: [CommonModule],
6-
selector: 'app-blurb',
7-
styleUrl: './blurb.component.scss',
8-
templateUrl: './blurb.component.html'
5+
imports: [CommonModule],
6+
selector: 'app-blurb',
7+
styleUrl: './blurb.component.scss',
8+
templateUrl: './blurb.component.html'
99
})
1010
export class BlurbComponent {
1111
@Input() content: string;

src/app/modules/shared/search-bar/search-bar.component.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ import { MatInputModule } from '@angular/material/input';
1616
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
1717

1818
@Component({
19-
encapsulation: ViewEncapsulation.None,
20-
imports: [
21-
CommonModule,
22-
MatButtonModule,
23-
MatFormFieldModule,
24-
MatIconModule,
25-
MatInputModule,
26-
ReactiveFormsModule
27-
],
28-
selector: 'app-search-bar',
29-
styleUrl: './search-bar.component.scss',
30-
templateUrl: './search-bar.component.html'
19+
encapsulation: ViewEncapsulation.None,
20+
imports: [
21+
CommonModule,
22+
MatButtonModule,
23+
MatFormFieldModule,
24+
MatIconModule,
25+
MatInputModule,
26+
ReactiveFormsModule
27+
],
28+
selector: 'app-search-bar',
29+
styleUrl: './search-bar.component.scss',
30+
templateUrl: './search-bar.component.html'
3131
})
3232
export class SearchBarComponent implements OnInit {
3333
@Output('update') change: EventEmitter<string> = new EventEmitter<string>();

0 commit comments

Comments
 (0)