Merge remote-tracking branch 'origin/task/upgrade-to-angular20' into task-project-view-component-changes
This commit is contained in:
commit
b4c5fddf0d
@ -115,5 +115,8 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"cli": {
|
||||
"analytics": false
|
||||
}
|
||||
}
|
||||
|
||||
11527
package-lock.json
generated
11527
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
28
package.json
28
package.json
@ -10,24 +10,22 @@
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "^17.3.3",
|
||||
"@angular/cdk": "^17.3.10",
|
||||
"@angular/common": "^17.3.3",
|
||||
"@angular/compiler": "^17.3.3",
|
||||
"@angular/core": "^17.3.3",
|
||||
"@angular/forms": "^17.3.3",
|
||||
"@angular/material": "^17.3.10",
|
||||
"@angular/platform-browser": "^17.3.3",
|
||||
"@angular/platform-browser-dynamic": "^17.3.3",
|
||||
"@angular/router": "^17.3.3",
|
||||
"@angular/animations": "^20.0.0",
|
||||
"@angular/common": "^20.0.0",
|
||||
"@angular/compiler": "^20.0.0",
|
||||
"@angular/core": "^20.0.0",
|
||||
"@angular/forms": "^20.0.0",
|
||||
"@angular/platform-browser": "^20.0.0",
|
||||
"@angular/platform-browser-dynamic": "^20.0.0",
|
||||
"@angular/router": "^20.0.0",
|
||||
"rxjs": "~7.8.0",
|
||||
"tslib": "^2.3.0",
|
||||
"zone.js": "~0.14.4"
|
||||
"zone.js": "~0.15.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "^17.3.3",
|
||||
"@angular/cli": "~17.3.3",
|
||||
"@angular/compiler-cli": "^17.3.3",
|
||||
"@angular-devkit/build-angular": "^20.0.0",
|
||||
"@angular/cli": "~20.0.0",
|
||||
"@angular/compiler-cli": "^20.0.0",
|
||||
"@types/jasmine": "~4.3.0",
|
||||
"jasmine-core": "~4.6.0",
|
||||
"karma": "~6.4.0",
|
||||
@ -35,6 +33,6 @@
|
||||
"karma-coverage": "~2.2.0",
|
||||
"karma-jasmine": "~5.1.0",
|
||||
"karma-jasmine-html-reporter": "~2.1.0",
|
||||
"typescript": "~5.4.4"
|
||||
"typescript": "~5.8.0"
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
|
||||
import { AboutComponent } from './about.component';
|
||||
|
||||
@ -8,7 +9,7 @@ describe('AboutComponent', () => {
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [AboutComponent]
|
||||
imports: [AboutComponent, HttpClientTestingModule]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { CvService } from '../services/cv.service';
|
||||
import { IAbout } from './about.model';
|
||||
import { BaseComponent } from '../base/base.component';
|
||||
@ -6,7 +7,9 @@ import { BaseComponent } from '../base/base.component';
|
||||
@Component({
|
||||
selector: 'app-about',
|
||||
templateUrl: './about.component.html',
|
||||
styleUrl: './about.component.scss'
|
||||
styleUrl: './about.component.scss',
|
||||
standalone: true,
|
||||
imports: [CommonModule]
|
||||
})
|
||||
export class AboutComponent extends BaseComponent<IAbout> implements OnInit {
|
||||
constructor(svc: CvService){
|
||||
|
||||
@ -1,25 +1,15 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { Routes } from '@angular/router';
|
||||
import { AboutComponent } from './about/about.component';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { ResumeComponent } from './resume/resume.component';
|
||||
import { ProjectsComponent } from './projects/projects.component';
|
||||
import { BlogComponent } from './blog/blog.component';
|
||||
import { ContactComponent } from './contact/contact.component';
|
||||
|
||||
const routes: Routes = [
|
||||
{ path: '', component: AboutComponent, title: "About" },
|
||||
{ path: 'resume', component: ResumeComponent, title: "Resume" },
|
||||
{ path: 'projects', component: ProjectsComponent, title: "Projects" },
|
||||
{ path: 'weblog', component: BlogComponent, title: "Posts" },
|
||||
{ path: 'contact', component: ContactComponent, title: "Contact" },
|
||||
export const appRoutes: Routes = [
|
||||
{ path: '', component: AboutComponent, title: "Bangara Raju Kottedi" },
|
||||
{ path: 'resume', component: ResumeComponent, title: "Bangara Raju Kottedi - Resume" },
|
||||
{ path: 'projects', component: ProjectsComponent, title: "Bangara Raju Kottedi - Projects" },
|
||||
{ path: 'weblog', component: BlogComponent, title: "Bangara Raju Kottedi - Posts" },
|
||||
{ path: 'contact', component: ContactComponent, title: "Bangara Raju Kottedi - Contact" },
|
||||
{ path: '**', redirectTo: '/'}
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
declarations: [],
|
||||
imports: [
|
||||
RouterModule.forRoot(routes)
|
||||
],
|
||||
exports: [RouterModule]
|
||||
})
|
||||
export class AppRoutingModule { }
|
||||
|
||||
@ -1,27 +1,18 @@
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
import { RouterTestingModule } from '@angular/router/testing';
|
||||
import { AppComponent } from './app.component';
|
||||
|
||||
describe('AppComponent', () => {
|
||||
beforeEach(() => TestBed.configureTestingModule({
|
||||
declarations: [AppComponent]
|
||||
}));
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [AppComponent, HttpClientTestingModule, RouterTestingModule]
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
it('should create the app', () => {
|
||||
const fixture = TestBed.createComponent(AppComponent);
|
||||
const app = fixture.componentInstance;
|
||||
expect(app).toBeTruthy();
|
||||
});
|
||||
|
||||
it(`should have as title 'my-portfolio'`, () => {
|
||||
const fixture = TestBed.createComponent(AppComponent);
|
||||
const app = fixture.componentInstance;
|
||||
expect(app.title).toEqual('my-portfolio');
|
||||
});
|
||||
|
||||
it('should render title', () => {
|
||||
const fixture = TestBed.createComponent(AppComponent);
|
||||
fixture.detectChanges();
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
expect(compiled.querySelector('.content span')?.textContent).toContain('my-portfolio app is running!');
|
||||
});
|
||||
});
|
||||
|
||||
@ -1,9 +1,17 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { RouterOutlet } from '@angular/router';
|
||||
import { NavbarComponent } from './navbar/navbar.component';
|
||||
import { ContactSidebarComponent } from './contact-sidebar/contact-sidebar.component';
|
||||
import { SpinnerComponent } from './spinner/spinner.component';
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import { provideHttpClient, withInterceptors } from '@angular/common/http';
|
||||
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss']
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [RouterOutlet, NavbarComponent, ContactSidebarComponent, SpinnerComponent]
|
||||
})
|
||||
export class AppComponent {
|
||||
constructor() {}
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
import { AppComponent } from './app.component';
|
||||
import { ContactSidebarComponent } from './contact-sidebar/contact-sidebar.component';
|
||||
import { NavbarComponent } from './navbar/navbar.component';
|
||||
import { AboutComponent } from './about/about.component';
|
||||
import { ResumeComponent } from './resume/resume.component';
|
||||
import { ProjectsComponent } from './projects/projects.component';
|
||||
import { BlogComponent } from './blog/blog.component';
|
||||
import { ContactComponent } from './contact/contact.component';
|
||||
import { AppRoutingModule } from './app-routing.module';
|
||||
import { httpInterceptorProviders } from './http-interceptors';
|
||||
import { SpinnerComponent } from './spinner/spinner.component';
|
||||
import { MatDialogModule } from '@angular/material/dialog';
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
AppComponent,
|
||||
SpinnerComponent,
|
||||
ContactSidebarComponent,
|
||||
NavbarComponent,
|
||||
AboutComponent,
|
||||
ResumeComponent,
|
||||
ProjectsComponent,
|
||||
BlogComponent,
|
||||
ContactComponent
|
||||
],
|
||||
imports: [
|
||||
BrowserModule,
|
||||
HttpClientModule,
|
||||
AppRoutingModule,
|
||||
FormsModule,
|
||||
MatDialogModule,
|
||||
],
|
||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||
providers: [httpInterceptorProviders],
|
||||
bootstrap: [AppComponent]
|
||||
})
|
||||
export class AppModule { }
|
||||
@ -1,4 +1,5 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
|
||||
import { BlogComponent } from './blog.component';
|
||||
|
||||
@ -8,7 +9,7 @@ describe('BlogComponent', () => {
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [BlogComponent]
|
||||
imports: [BlogComponent, HttpClientTestingModule]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { CvService } from '../services/cv.service';
|
||||
import { BaseComponent } from '../base/base.component';
|
||||
import { IBlog } from './blog.model';
|
||||
@ -7,7 +8,9 @@ import { environment } from 'src/environments/environment';
|
||||
@Component({
|
||||
selector: 'app-blog',
|
||||
templateUrl: './blog.component.html',
|
||||
styleUrl: './blog.component.scss'
|
||||
styleUrl: './blog.component.scss',
|
||||
standalone: true,
|
||||
imports: [CommonModule]
|
||||
})
|
||||
export class BlogComponent extends BaseComponent<IBlog> implements OnInit{
|
||||
blogUrl!: string;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
|
||||
import { ContactSidebarComponent } from './contact-sidebar.component';
|
||||
|
||||
@ -8,7 +9,7 @@ describe('ContactSidebarComponent', () => {
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ContactSidebarComponent]
|
||||
imports: [ContactSidebarComponent, HttpClientTestingModule]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { BaseComponent } from '../base/base.component';
|
||||
import { CvService } from '../services/cv.service';
|
||||
import { ISideBar } from './side-bar.model';
|
||||
@ -6,7 +7,9 @@ import { ISideBar } from './side-bar.model';
|
||||
@Component({
|
||||
selector: 'app-contact-sidebar',
|
||||
templateUrl: './contact-sidebar.component.html',
|
||||
styleUrl: './contact-sidebar.component.scss'
|
||||
styleUrl: './contact-sidebar.component.scss',
|
||||
standalone: true,
|
||||
imports: [CommonModule]
|
||||
})
|
||||
export class ContactSidebarComponent extends BaseComponent<ISideBar> implements OnInit {
|
||||
sideBarExpanded: boolean = false;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
|
||||
import { ContactComponent } from './contact.component';
|
||||
|
||||
@ -8,7 +9,7 @@ describe('ContactComponent', () => {
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ContactComponent]
|
||||
imports: [ContactComponent, HttpClientTestingModule]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
|
||||
@ -1,12 +1,15 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule, FormBuilder, FormControl, NgForm } from '@angular/forms';
|
||||
import { CvService } from '../services/cv.service';
|
||||
import { IContact } from './contact.model';
|
||||
import { FormBuilder, FormControl, NgForm } from '@angular/forms';
|
||||
|
||||
@Component({
|
||||
selector: 'app-contact',
|
||||
templateUrl: './contact.component.html',
|
||||
styleUrl: './contact.component.scss'
|
||||
styleUrl: './contact.component.scss',
|
||||
standalone: true,
|
||||
imports: [CommonModule, FormsModule]
|
||||
})
|
||||
export class ContactComponent {
|
||||
messageModel: IContact = {name: '', email: '', content: '' };
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { RouterTestingModule } from '@angular/router/testing';
|
||||
|
||||
import { NavbarComponent } from './navbar.component';
|
||||
|
||||
@ -8,7 +9,7 @@ describe('NavbarComponent', () => {
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [NavbarComponent]
|
||||
imports: [NavbarComponent, RouterTestingModule]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'app-navbar',
|
||||
templateUrl: './navbar.component.html',
|
||||
styleUrl: './navbar.component.scss'
|
||||
styleUrl: './navbar.component.scss',
|
||||
standalone: true,
|
||||
imports: [CommonModule, RouterModule]
|
||||
})
|
||||
export class NavbarComponent {
|
||||
}
|
||||
|
||||
@ -1,18 +1,19 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
|
||||
import { PortfolioComponent } from './projects.component';
|
||||
import { ProjectsComponent } from './projects.component';
|
||||
|
||||
describe('PortfolioComponent', () => {
|
||||
let component: PortfolioComponent;
|
||||
let fixture: ComponentFixture<PortfolioComponent>;
|
||||
describe('ProjectsComponent', () => {
|
||||
let component: ProjectsComponent;
|
||||
let fixture: ComponentFixture<ProjectsComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [PortfolioComponent]
|
||||
imports: [ProjectsComponent, HttpClientTestingModule]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(PortfolioComponent);
|
||||
fixture = TestBed.createComponent(ProjectsComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { Component, OnInit, Inject } from '@angular/core';
|
||||
import { BaseComponent } from '../base/base.component';
|
||||
import { CvService } from '../services/cv.service';
|
||||
@ -11,7 +12,9 @@ import { MatDialog} from '@angular/material/dialog';
|
||||
@Component({
|
||||
selector: 'app-projects',
|
||||
templateUrl: './projects.component.html',
|
||||
styleUrl: './projects.component.scss'
|
||||
styleUrl: './projects.component.scss',
|
||||
standalone: true,
|
||||
imports: [CommonModule]
|
||||
})
|
||||
export class ProjectsComponent extends BaseComponent<IProjects> implements OnInit {
|
||||
filter: string = 'All';
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
|
||||
import { ResumeComponent } from './resume.component';
|
||||
|
||||
@ -8,7 +9,7 @@ describe('ResumeComponent', () => {
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ResumeComponent]
|
||||
imports: [ResumeComponent, HttpClientTestingModule]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { BaseComponent } from '../base/base.component';
|
||||
import { IResume } from './resume.model';
|
||||
import { CvService } from '../services/cv.service';
|
||||
@ -6,7 +7,9 @@ import { CvService } from '../services/cv.service';
|
||||
@Component({
|
||||
selector: 'app-resume',
|
||||
templateUrl: './resume.component.html',
|
||||
styleUrl: './resume.component.scss'
|
||||
styleUrl: './resume.component.scss',
|
||||
standalone: true,
|
||||
imports: [CommonModule]
|
||||
})
|
||||
export class ResumeComponent extends BaseComponent<IResume> implements OnInit {
|
||||
constructor(svc: CvService){
|
||||
|
||||
@ -1,13 +1,16 @@
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||
|
||||
import { ResumeService } from './cv.service';
|
||||
import { CvService } from './cv.service';
|
||||
|
||||
describe('ResumeService', () => {
|
||||
let service: ResumeService;
|
||||
describe('CvService', () => {
|
||||
let service: CvService;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({});
|
||||
service = TestBed.inject(ResumeService);
|
||||
TestBed.configureTestingModule({
|
||||
imports: [HttpClientTestingModule]
|
||||
});
|
||||
service = TestBed.inject(CvService);
|
||||
});
|
||||
|
||||
it('should be created', () => {
|
||||
|
||||
@ -1,11 +1,14 @@
|
||||
import { Component, ViewEncapsulation } from '@angular/core';
|
||||
import { LoaderService } from '../services/loader.service';
|
||||
import { CommonModule } from '@angular/common';
|
||||
|
||||
@Component({
|
||||
selector: 'app-spinner',
|
||||
templateUrl: './spinner.component.html',
|
||||
styleUrl: './spinner.component.scss',
|
||||
encapsulation: ViewEncapsulation.ShadowDom
|
||||
encapsulation: ViewEncapsulation.ShadowDom,
|
||||
standalone: true,
|
||||
imports: [CommonModule]
|
||||
})
|
||||
export class SpinnerComponent {
|
||||
|
||||
|
||||
4
src/environments/environment.production.ts
Normal file
4
src/environments/environment.production.ts
Normal file
@ -0,0 +1,4 @@
|
||||
export const environment = {
|
||||
apiUrl: 'https://localhost:7013',
|
||||
apiKey: "c6eAXYcNT873TT7BfMgQyS4ii7hxa53TLEUN7pAGaaU="
|
||||
};
|
||||
21
src/main.ts
21
src/main.ts
@ -1,7 +1,16 @@
|
||||
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
||||
import { bootstrapApplication } from '@angular/platform-browser';
|
||||
import { AppComponent } from './app/app.component';
|
||||
import { provideRouter } from '@angular/router';
|
||||
import { provideAnimations } from '@angular/platform-browser/animations';
|
||||
import { provideHttpClient, withInterceptors } from '@angular/common/http';
|
||||
import { appRoutes } from './app/app-routing.module';
|
||||
import { httpInterceptorProviders } from './app/http-interceptors';
|
||||
|
||||
import { AppModule } from './app/app.module';
|
||||
|
||||
|
||||
platformBrowserDynamic().bootstrapModule(AppModule)
|
||||
.catch(err => console.error(err));
|
||||
bootstrapApplication(AppComponent, {
|
||||
providers: [
|
||||
provideRouter(appRoutes),
|
||||
provideAnimations(),
|
||||
provideHttpClient(),
|
||||
httpInterceptorProviders
|
||||
]
|
||||
}).catch(err => console.error(err));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user