Skip to content

Commit f082846

Browse files
ANKUR DWIVEDIANKUR DWIVEDI
ANKUR DWIVEDI
authored and
ANKUR DWIVEDI
committed
addressed the feedbacks
1 parent f7947b8 commit f082846

9 files changed

+37
-38
lines changed

sdk/projects/imagekitio-angular/src/lib/ik-image/ik-image.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, AfterViewInit, OnInit, ElementRef, Input, OnChanges } from '@angular/core';
2-
import { ImagekitioAngularService } from '../imagekitio-angular.service';
2+
import { ImagekitService } from '../imagekitio-angular.service';
33
import { Dict, QueryParameters, IkImageComponentOptions, LqipOptions } from '../utility/ik-type-def-collection'
44
import { Transformation } from 'imagekit-javascript/dist/src/interfaces/Transformation';
55

@@ -21,7 +21,7 @@ export class IkImageComponent implements AfterViewInit, OnInit, OnChanges {
2121

2222
observer: MutationObserver;
2323

24-
constructor(private el: ElementRef, private imagekit: ImagekitioAngularService) {
24+
constructor(private el: ElementRef, private imagekit: ImagekitService) {
2525
}
2626

2727
ngOnInit(): void {

sdk/projects/imagekitio-angular/src/lib/ik-upload/ik-upload.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AfterViewInit, ElementRef, Component, Input, Output, EventEmitter } from '@angular/core';
2-
import { ImagekitioAngularService } from '../imagekitio-angular.service';
2+
import { ImagekitService } from '../imagekitio-angular.service';
33
import { IkUploadComponentOptions, Dict, HTMLInputEvent } from '../utility/ik-type-def-collection';
44

55
@Component({
@@ -10,7 +10,7 @@ import { IkUploadComponentOptions, Dict, HTMLInputEvent } from '../utility/ik-ty
1010
<input type="file" (change)="handleFileInput($event)" />
1111
</ng-template>
1212
`,
13-
providers: [ImagekitioAngularService]
13+
providers: [ImagekitService]
1414
})
1515
export class IkUploadComponent implements AfterViewInit {
1616
@Input('fileName') fileName: string; //optional
@@ -40,7 +40,7 @@ export class IkUploadComponent implements AfterViewInit {
4040
fileToUpload: File = null;
4141
xhr: XMLHttpRequest;
4242

43-
constructor(private el: ElementRef, private imagekit: ImagekitioAngularService) {
43+
constructor(private el: ElementRef, private imagekit: ImagekitService) {
4444
}
4545

4646
ngAfterViewInit():void {
@@ -155,7 +155,7 @@ export class IkUploadComponent implements AfterViewInit {
155155
this.urlEndpoint === undefined ){
156156
return this.imagekit.ikInstance;
157157
}
158-
return new ImagekitioAngularService({
158+
return new ImagekitService({
159159
urlEndpoint: this.urlEndpoint,
160160
publicKey: this.publicKey,
161161
})._ikInstance

sdk/projects/imagekitio-angular/src/lib/ik-video/ik-video.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, OnInit, ElementRef, Input } from '@angular/core';
2-
import { ImagekitioAngularService } from '../imagekitio-angular.service';
2+
import { ImagekitService } from '../imagekitio-angular.service';
33
import { IkVideoComponentOptions, QueryParameters, Dict } from '../utility/ik-type-def-collection'
44
import { Transformation } from 'imagekit-javascript/dist/src/interfaces/Transformation';
55

@@ -18,7 +18,7 @@ export class IkVideoComponent implements OnInit {
1818
@Input('queryParameters') queryParameters: QueryParameters;
1919
url = '';
2020

21-
constructor(private el: ElementRef, private imagekit: ImagekitioAngularService) { }
21+
constructor(private el: ElementRef, private imagekit: ImagekitService) { }
2222

2323
ngOnInit(): void {
2424
const options: IkVideoComponentOptions = this.src ? {src: this.src} : {path: this.path};

sdk/projects/imagekitio-angular/src/lib/imagekitio-angular.module.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { CommonModule } from '@angular/common';
12
import { ModuleWithProviders, NgModule } from '@angular/core';
2-
import { ImageKitConfiguration } from './imagekitio-angular.service';
33
import { IkImageComponent } from './ik-image/ik-image.component';
4-
import { IkVideoComponent } from './ik-video/ik-video.component';
54
import { IkUploadComponent } from './ik-upload/ik-upload.component';
6-
import { CommonModule } from '@angular/common';
5+
import { IkVideoComponent } from './ik-video/ik-video.component';
6+
import { ImageKitConfiguration, ImagekitService } from './imagekitio-angular.service';
77

88
@NgModule({
99
declarations: [
@@ -16,7 +16,8 @@ import { CommonModule } from '@angular/common';
1616
IkImageComponent,
1717
IkVideoComponent,
1818
IkUploadComponent
19-
]
19+
],
20+
providers: [ ImagekitService ]
2021
})
2122
export class ImagekitioAngularModule {
2223
static forRoot(config: ImageKitConfiguration): ModuleWithProviders<ImagekitioAngularModule> {

sdk/projects/imagekitio-angular/src/lib/imagekitio-angular.service.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export interface Lqip {
77
}
88

99
export class ImageKitConfiguration {
10-
urlEndpoint: string ='';
11-
publicKey: string ='';
10+
urlEndpoint: string;
11+
publicKey: string;
1212
authenticator?: () => Promise<any>
1313
lqip?: Lqip;
1414
fileName?: string;
@@ -21,10 +21,8 @@ export class ImageKitConfiguration {
2121
sdkVersion?: string;
2222
}
2323

24-
@Injectable({
25-
providedIn: 'root'
26-
})
27-
export class ImagekitioAngularService {
24+
@Injectable()
25+
export class ImagekitService {
2826

2927
_ikInstance: any;
3028
constructor(private configuration: ImageKitConfiguration) {

sdk/tests/sdk-tests/ik-image.component.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import { ElementRef } from "@angular/core";
22
import { ComponentFixture, TestBed } from '@angular/core/testing';
33
import { IkImageComponent } from "../../projects/imagekitio-angular/src/lib/ik-image/ik-image.component";
4-
import { ImagekitioAngularService } from "../../projects/imagekitio-angular/src/lib/imagekitio-angular.service";
4+
import { ImagekitService } from "../../projects/imagekitio-angular/src/lib/imagekitio-angular.service";
55
import { IkImageComponentOptions, LqipOptions } from '../../projects/imagekitio-angular/src/lib/utility/ik-type-def-collection'
66

77
describe("IkImageComponent", () => {
88
let component: IkImageComponent;
9-
let imageKitService: ImagekitioAngularService;
9+
let imageKitService: ImagekitService;
1010
let fixture: ComponentFixture<IkImageComponent>;
1111

1212
beforeEach(() => {
13-
imageKitService = new ImagekitioAngularService({
13+
imageKitService = new ImagekitService({
1414
urlEndpoint: "https://ik.imagekit.io/company/",
1515
publicKey: "abc",
1616
});
1717
TestBed.configureTestingModule({
1818
declarations: [IkImageComponent],
1919
providers: [ {
20-
provide: ImagekitioAngularService, useValue: imageKitService
20+
provide: ImagekitService, useValue: imageKitService
2121
}]
2222
}).compileComponents();
2323
fixture = TestBed.createComponent(IkImageComponent);
@@ -37,8 +37,8 @@ describe("IkImageComponent", () => {
3737

3838
it("Presence and absence of trailing slash in urlEndpoint should not result in double slash (//) in the returned url", () => {
3939
let comp: IkImageComponent;
40-
let iKService: ImagekitioAngularService;
41-
iKService = new ImagekitioAngularService({
40+
let iKService: ImagekitService;
41+
iKService = new ImagekitService({
4242
urlEndpoint: "https://ik.imagekit.io/company",
4343
publicKey: "abc",
4444
});
@@ -61,8 +61,8 @@ describe("IkImageComponent", () => {
6161

6262
it("Presence and absence of leading slash in path parameter should not result in double slash (//) in the returned url", () => {
6363
let comp: IkImageComponent;
64-
let iKService: ImagekitioAngularService;
65-
iKService = new ImagekitioAngularService({
64+
let iKService: ImagekitService;
65+
iKService = new ImagekitService({
6666
urlEndpoint: "https://ik.imagekit.io/company/",
6767
publicKey: "abc",
6868
});

sdk/tests/sdk-tests/ik-upload.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { ComponentFixture, TestBed } from '@angular/core/testing';
2-
import { ImageKitConfiguration, ImagekitioAngularService } from "../../projects/imagekitio-angular/src/lib/imagekitio-angular.service";
2+
import { ImageKitConfiguration, ImagekitService } from "../../projects/imagekitio-angular/src/lib/imagekitio-angular.service";
33
import { IkUploadComponent } from "../../projects/imagekitio-angular/src/lib/ik-upload/ik-upload.component";
44
import { IkUploadComponentOptions } from '../../projects/imagekitio-angular/src/lib/utility/ik-type-def-collection';
55
import { EventEmitter } from '@angular/core';
66

77
describe("IkUploadComponent", () => {
88
let component: IkUploadComponent;
9-
let imageKitService: ImagekitioAngularService;
9+
let imageKitService: ImagekitService;
1010
let imageKitConfiguration: ImageKitConfiguration;
1111
let fixture: ComponentFixture<IkUploadComponent>;
1212

@@ -36,7 +36,7 @@ describe("IkUploadComponent", () => {
3636
TestBed.configureTestingModule({
3737
declarations: [IkUploadComponent],
3838
providers: [
39-
{provide: ImagekitioAngularService, useValue: imageKitService},
39+
{provide: ImagekitService, useValue: imageKitService},
4040
{provide: ImageKitConfiguration, useValue: imageKitConfiguration}
4141
]
4242
}).compileComponents();

sdk/tests/sdk-tests/ik-video.component.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import { ElementRef } from "@angular/core";
22
import { ComponentFixture, TestBed } from '@angular/core/testing';
33
import { IkVideoComponent } from "../../projects/imagekitio-angular/src/lib/ik-video/ik-video.component";
4-
import { ImagekitioAngularService } from "../../projects/imagekitio-angular/src/lib/imagekitio-angular.service";
4+
import { ImagekitService } from "../../projects/imagekitio-angular/src/lib/imagekitio-angular.service";
55
import { IkVideoComponentOptions } from '../../projects/imagekitio-angular/src/lib/utility/ik-type-def-collection'
66

77
describe("IkVideoComponent", () => {
88
let component: IkVideoComponent;
9-
let imageKitService: ImagekitioAngularService;
9+
let imageKitService: ImagekitService;
1010
let fixture: ComponentFixture<IkVideoComponent>;
1111

1212
beforeEach(() => {
13-
imageKitService = new ImagekitioAngularService({
13+
imageKitService = new ImagekitService({
1414
urlEndpoint: "https://ik.imagekit.io/company/",
1515
publicKey: "abc",
1616
});
1717
TestBed.configureTestingModule({
1818
declarations: [IkVideoComponent],
1919
providers: [ {
20-
provide: ImagekitioAngularService, useValue: imageKitService
20+
provide: ImagekitService, useValue: imageKitService
2121
}]
2222
}).compileComponents();
2323
fixture = TestBed.createComponent(IkVideoComponent);
@@ -39,8 +39,8 @@ describe("IkVideoComponent", () => {
3939

4040
it("Presence and absence of leading slash in path parameter should not result in double slash (//) in the returned url", () => {
4141
let comp: IkVideoComponent;
42-
let iKService: ImagekitioAngularService;
43-
iKService = new ImagekitioAngularService({
42+
let iKService: ImagekitService;
43+
iKService = new ImagekitService({
4444
urlEndpoint: "https://ik.imagekit.io/company/",
4545
publicKey: "abc",
4646
});

sdk/tests/sdk-tests/imagekit.service.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { ImagekitioAngularService } from "../../projects/imagekitio-angular/src/lib/imagekitio-angular.service";
1+
import { ImagekitService } from "../../projects/imagekitio-angular/src/lib/imagekitio-angular.service";
22

33
describe("ImagekitService", () => {
4-
let imagekitService: ImagekitioAngularService;
4+
let imagekitService: ImagekitService;
55
beforeEach(() => {
6-
imagekitService = new ImagekitioAngularService({
6+
imagekitService = new ImagekitService({
77
urlEndpoint: "url",
88
publicKey: "pub",
99
});

0 commit comments

Comments
 (0)