Skip to content

Commit

Permalink
feat(ng): angular 10
Browse files Browse the repository at this point in the history
  • Loading branch information
vreyes-haulmer committed Aug 21, 2020
1 parent 4d85a24 commit 7ccb278
Show file tree
Hide file tree
Showing 17 changed files with 43 additions and 61 deletions.
44 changes: 13 additions & 31 deletions Client/package-lock.json

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

7 changes: 3 additions & 4 deletions Client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"private": true,
"dependencies": {
"@angular/animations": "^10.0.11",
"@angular/cdk": "^9.1.12",
"@angular/cdk": "^10.1.3",
"@angular/common": "^10.0.11",
"@angular/compiler": "^10.0.11",
"@angular/core": "^10.0.11",
"@angular/flex-layout": "^10.0.0-beta.32",
"@angular/forms": "^10.0.11",
"@angular/material": "^8.2.3",
"@angular/material-moment-adapter": "^8.2.3",
"@angular/material": "^10.1.3",
"@angular/material-moment-adapter": "^10.1.3",
"@angular/platform-browser": "^10.0.11",
"@angular/platform-browser-dynamic": "^10.0.11",
"@angular/platform-server": "^10.0.11",
Expand All @@ -35,7 +35,6 @@
"classlist.js": "1.1.20150312",
"core-js": "^2.6.11",
"express": "4.16.3",
"hammerjs": "2.0.8",
"jquery": "^3.5.1",
"jwt-decode": "^2.2.0",
"moment": "^2.27.0",
Expand Down
2 changes: 1 addition & 1 deletion Client/src/app/PaginatorESP.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {MatPaginatorIntl} from '@angular/material';
import { MatPaginatorIntl } from '@angular/material/paginator';
import { Injectable } from "@angular/core";
@Injectable()
export class MatPaginatorIntlEsp extends MatPaginatorIntl {
Expand Down
21 changes: 9 additions & 12 deletions Client/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,15 @@ registerLocaleData(localeEsCl, 'es-CL');


// Material
import {
MatButtonModule,
MatIconModule,
MatInputModule,
MatRippleModule,
MatFormFieldModule,
MatTooltipModule,
MatSelectModule,
MatDialogModule,
MatPaginatorModule,
MatPaginatorIntl
} from '@angular/material';
import { MatButtonModule } from '@angular/material/button';
import { MatRippleModule } from '@angular/material/core';
import { MatDialogModule } from '@angular/material/dialog';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatPaginatorModule, MatPaginatorIntl } from '@angular/material/paginator';
import { MatSelectModule } from '@angular/material/select';
import { MatTooltipModule } from '@angular/material/tooltip';
import {AddCareerComponent} from './modules/resources/careers/add-career/add-career.component';
import { AddSubjectComponent } from './modules/resources/subjects/add-subject/add-subject.component';
import { InterfaceModule } from './modules/interface/interface.module';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit, Inject, AfterViewInit } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { WeekDay } from '@angular/common';
import { BrowserStack } from 'protractor/built/driverProviders';
import { ClassroomService } from '../../services';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { FormGroup, FormBuilder, Validators, FormArray } from '@angular/forms';
import { WeekDay } from '@angular/common';
import { Section, Building, Classroom, AssignationRequest, UserData } from '../../models';
import { MatDialogRef } from '@angular/material';
import { MatDialogRef } from '@angular/material/dialog';
import { SectionService, AuthService, ClassroomService, AssignationRequestService, TeacherService, ToastService } from '../../services';
import {MAT_MOMENT_DATE_FORMATS, MomentDateAdapter} from '@angular/material-moment-adapter';
import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
Expand Down
2 changes: 1 addition & 1 deletion Client/src/app/components/search/search.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { MatDialogRef } from '@angular/material';
import { MatDialogRef } from '@angular/material/dialog';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { WeekDay } from '@angular/common';
import { ClassroomService } from '../../services';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit, Inject } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { AssignationRequest } from '../../../models';
import { WeekDay } from '@angular/common';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { AssignationRequest, Classroom } from '../../../models';
import { MatTableDataSource, MatPaginator, MatDialog } from '@angular/material';
import { MatDialog } from '@angular/material/dialog';
import { MatPaginator } from '@angular/material/paginator';
import { MatTableDataSource } from '@angular/material/table';
import { AssignationRequestService, ClassroomService, ToastService } from '../../../services';
import { WeekDay } from '@angular/common';
import { RequestDialogComponent } from '../request-dialog/request-dialog.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
import {Building, Classroom} from '../../../../../models';
import {MatTableDataSource} from '@angular/material/table';
import {AddClassroomComponent} from '../../add-classroom/add-classroom.component';
import {MatDialog} from '@angular/material';
import { MatDialog } from '@angular/material/dialog';
import {ClassroomService, BuildingService, ToastService, AuthService} from '../../../../../services';
import {DeleteDialogComponent} from '../../../../../components/delete-dialog/delete-dialog.component';
import {MatSort} from '@angular/material/sort';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, Inject, OnInit} from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Career, UserData } from '../../../../models';
import { TeacherService } from '../../../../services/teacher.service';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit, Inject } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';

@Component({
selector: 'app-completed-career',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, OnInit, Input, Output, EventEmitter, OnChanges, ChangeDetect
import { Blocks, Classroom, Assignation, BlockName, UserType } from '../../../../models';
import { AssignationService, AuthService } from '../../../../services';
import { WeekDay } from '@angular/common';
import { MatDialog } from '@angular/material';
import { MatDialog } from '@angular/material/dialog';
import { AssignationSelectDialogComponent } from '../../../../components/assignation-select-dialog/assignation-select-dialog.component';
import { areAllEquivalent } from '@angular/compiler/src/output/output_ast';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit, Inject } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { SectionService, ToastService } from '../../../../services';

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit, Inject } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { UserData } from '../../../../models';
import { FormBuilder, Validators, FormControl, FormGroup } from '@angular/forms';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import {Career, Section, UserData, UserType} from '../../../../models';
import {MatDialog, MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
import { MatDialog } from '@angular/material/dialog';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { TeacherService, AuthService, ToastService } from '../../../../services';
import { AddTeacherComponent } from '../add-teacher/add-teacher.component';
import { DeleteDialogComponent } from '../../../../components/delete-dialog/delete-dialog.component';
Expand Down
1 change: 0 additions & 1 deletion Client/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
import 'hammerjs';

if (environment.production) {
enableProdMode();
Expand Down

0 comments on commit 7ccb278

Please sign in to comment.