Skip to content

Commit 8a64944

Browse files
committed
changes in selectComponent
1 parent 1ff144b commit 8a64944

File tree

13 files changed

+1024
-844
lines changed

13 files changed

+1024
-844
lines changed

projects/arc-lib/documentation.json

Lines changed: 458 additions & 339 deletions
Large diffs are not rendered by default.

projects/arc-lib/src/lib/components/auth/auth.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</nb-layout-column>
77
<nb-layout-column>
88
<div class="login-img">
9-
<img width="90%" src="http://localhost:4200/assets/images/auth/login-img.png" src=""alt="loginImg" />
9+
<img width="90%" src="http://localhost:4200/assets/images/auth/login-img.png" alt="loginImg" />
1010
</div>
1111
</nb-layout-column>
1212
</nb-layout>

projects/arc-lib/src/lib/components/auth/auth.module.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ import {ThemeModule} from '@project-lib/theme/theme.module';
1111
import {AuthRoutingModule} from './auth-routing.module';
1212
import {AuthComponent} from './auth.component';
1313
import {LoginComponent} from './login/login.component';
14+
import { HomePageComponent } from './home-page/home-page.component';
15+
import { LoginPageComponent } from './login-page/login-page.component';
1416

1517
@NgModule({
16-
declarations: [LoginComponent, AuthComponent],
18+
declarations: [LoginComponent, AuthComponent, HomePageComponent, LoginPageComponent],
1719
schemas: [CUSTOM_ELEMENTS_SCHEMA],
1820
imports: [
1921
CommonModule,
2022
FormsModule,
2123
RouterModule,
22-
// ThemeModule,
24+
ThemeModule,
2325
AuthRoutingModule,
2426
HttpClientModule,
2527
NbLayoutModule,
Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,29 @@
11
<nb-card class="h-100">
22
<nb-card-body>
33
<div class="align-center logo">
4-
<img
5-
width="20%"
6-
7-
8-
src="http://localhost:4200/assets/images/auth/angular.png"
9-
alt="logo"
10-
draggable="false"
11-
/>
4+
<img width="20%" src= "{{image}}" alt="logo" draggable="false"
5+
height="126px" width="120px" />
6+
7+
<!-- src="baseHref + 'images/auth/angular.png'" -->
128
</div>
139
<div class="align-center description text-center">
1410
<h2>Hello and Welcome! to the Angular Boiler Plate</h2>
1511
</div>
1612
<div class="align-center text-center">
17-
<span class="w-60"
18-
>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam egestas
13+
<span class="w-60">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam egestas
1914
dui sit amet purus consequat, sed ornare nulla imperdiete tiam egestas
20-
dui sit amet.</span
21-
>
15+
dui sit amet.</span>
2216
</div>
2317
<div class="align-center login-btn">
2418
<button (click)="loginViaGoogle()" class="google-btn">
2519
Continue with Google
2620
</button>
2721
</div>
2822
<div class="align-center footer">
29-
<span class="w-50 text-center">
23+
<span class=" text-center">
3024
By continuing with Google, you agree to our Terms of Service and Privacy
3125
Policy.
3226
</span>
3327
</div>
3428
</nb-card-body>
35-
</nb-card>
29+
</nb-card>

projects/arc-lib/src/lib/components/auth/login/login.component.scss

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
@use "sass:map";
2-
@use "projects/arc-lib/src/lib/theme/styles/_variables.scss" as *;
2+
@use "../../../theme/styles/variables" as *;
3+
@use "../../../../styles.scss" as *;
4+
@use "../../../../../../arc/src/themes.scss" as *;
5+
36

47
:host {
58
.logo {
6-
padding-top: 15%;
9+
padding-top: 10%;
710
}
811

912
.description {
1013
padding-top: 10%;
1114
}
1215

1316
.login-btn {
14-
padding-top: 10%;
17+
padding-top: 7%;
1518
}
1619

1720
.footer {
18-
padding-top: 15%;
21+
padding-top: 7%;
1922
}
2023
}
24+
*{font-family: 'Montserrat,Open Sans,sans-serif',}
2125

2226
.google-btn {
2327
width: 24.125rem;
@@ -38,4 +42,4 @@
3842
&:active {
3943
border-color: map-get($font, "primary");
4044
}
41-
}
45+
}

projects/arc-lib/src/lib/components/auth/login/login.component.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import {Location} from '@angular/common';
2-
import {Component} from '@angular/core';
2+
import {Component, Inject} from '@angular/core';
33
import {ActivatedRoute} from '@angular/router';
44
import {AuthService} from '@project-lib/core/auth';
55
import {RouteComponentBaseDirective} from '@project-lib/core/route-component-base';
66

7+
// import { APP_BASE_HREF } from '@angular/common';
8+
79
@Component({
810
selector: 'login',
911
templateUrl: './login.component.html',
@@ -14,10 +16,14 @@ export class LoginComponent extends RouteComponentBaseDirective {
1416
override readonly route: ActivatedRoute,
1517
override readonly location: Location,
1618
private readonly authService: AuthService,
19+
// @Inject(APP_BASE_HREF)
20+
// private baseHref: string
1721
) {
1822
super(route, location);
1923
}
20-
24+
image="../../../assets/images/auth/angular.png"
25+
// ""
26+
// projects/arc-lib/src/lib/assets/images/auth/angular.png
2127
loginViaGoogle() {
2228
this.authService.loginViaGoogle();
2329
}

projects/arc-lib/src/lib/components/selector/list/list.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { ITEM_HEIGHT, PLACEHOLDER_ITEM } from '../constants';
2222
import { GroupConfig } from '../types';
2323

2424
@Component({
25-
selector: 'list',
25+
selector: 'app-list',
2626
templateUrl: './list.component.html',
2727
styleUrls: ['./list.component.scss'],
2828
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -151,6 +151,8 @@ export class ListComponent<
151151
* It initializes the removed set, the visible list, and the search control
152152
*/
153153
ngOnInit(): void {
154+
debugger
155+
console.log(this.options)
154156
this.removed = new Set();
155157
this.visibleList = Object.assign([], this.options);
156158
this.sortByGroups();

projects/arc-lib/src/lib/components/selector/select.module.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import {
88
NbFormFieldModule,
99
NbIconModule,
1010
NbInputModule,
11+
NbLayoutModule,
1112
NbTagModule,
13+
NbThemeModule,
1214
} from '@nebular/theme';
1315
import { TranslateModule } from '@ngx-translate/core';
1416
import { ResizeModule } from '../resize/resize.module';
@@ -25,6 +27,7 @@ import {ListComponent} from './list/list.component';
2527
NbFormFieldModule,
2628
NbIconModule,
2729
NbTagModule,
30+
NbLayoutModule,
2831
NbInputModule,
2932
NbCheckboxModule,
3033
ReactiveFormsModule,

projects/arc-lib/src/lib/components/selector/select/select.component.html

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
<nb-form-field
1+
<div
22
class="select-container"
3-
[class.disabled]="disabled"
4-
(bizbookResize)="multiple && updateTagsCount()"
3+
[class.disabled]="disabledDropdown"
54
cdk-overlay-origin
6-
7-
(click)="!disabled && toggleDropdown()"
5+
(click)="!disabledDropdown && toggleDropdown()"
86
>
9-
<!--6 #overlayOrigin="cdkOverlayOrigin" -->
107
<div
118
*ngIf="multiple && invisibleTags.length"
129
nbSuffix
@@ -19,16 +16,17 @@
1916
nbSuffix
2017
class="close-icon"
2118
icon="close-outline"
22-
*ngIf="!disabled && !isEmpty && showClearAll"
19+
*ngIf="!disabledDropdown && !isEmpty && showClearAll"
2320
(click)="clearAll(); $event.stopPropagation()"
2421
></nb-icon>
2522
<nb-icon
2623
[@rotate]="state"
27-
*ngIf="!disabled"
24+
*ngIf="!disabledDropdown"
2825
nbSuffix
29-
(click)="toggleDropdown(); $event.stopPropagation()"
26+
(click)="toggleDropdown()"
3027
icon="chevron-down"
3128
></nb-icon>
29+
3230
<nb-tag-list
3331
[ngStyle]="{padding}"
3432
*ngIf="multiple; else single"
@@ -38,26 +36,29 @@
3836
<nb-tag
3937
*ngFor="let item of visibleTags"
4038
[text]="asString(item && item[nameField])"
41-
[ngStyle]="{
42-
maxWidth: 'calc(100% - ' + suffixCount * suffixWidth + 'px)'
43-
}"
44-
[removable]="!disabled"
39+
[ngStyle]="{maxWidth: 'calc(100% - ' + suffixCount * suffixWidth + 'px)'}"
40+
[removable]="!disabledDropdown"
4541
(remove)="toggle(item); toggleDropdown()"
4642
></nb-tag>
4743
<input
4844
type="text"
45+
class="tag-input"
4946
nbTagInput
5047
fullWidth
5148
[placeholder]="placeholder"
5249
(keyup.enter)="selectOnEnter && autocompleteEnter(autoCompleteInput)"
5350
[hidden]="
54-
(!allowInput && visibleTags.length !== 0) || (disabled && multiple)
51+
(!allowInput && visibleTags.length !== 0) ||
52+
(disabledDropdown && multiple && visibleTags.length !== 0)
5553
"
56-
[readonly]="!allowInput"
54+
[readonly]="!allowInput || disabledDropdown"
5755
#autoCompleteInput
5856
[class.cursor-pointer]="!allowInput"
5957
(input)="updateAutocompleteOptions(autoCompleteInput.value)"
60-
(click)="$event.stopPropagation(); !allowInput && toggleDropdown()"
58+
(click)="
59+
$event.stopPropagation();
60+
!disabledDropdown && !allowInput && toggleDropdown()
61+
"
6162
[ngStyle]="{
6263
minWidth: inputMinWidth + 'px',
6364
marginRight: suffixCount * suffixWidth + 'px'
@@ -68,31 +69,30 @@
6869
<input
6970
type="text"
7071
class="cursor-pointer"
71-
[class.no-disable-style]="!disabled"
72+
[class.no-disable-style]="!disabledDropdown"
7273
nbInput
7374
fullWidth
7475
[value]="selectedItems.selected[0]?.[nameField] ?? ''"
7576
[placeholder]="placeholder"
7677
readonly
7778
/>
7879
</ng-template>
79-
</nb-form-field>
80+
</div>
81+
8082
<ng-template
8183
cdk-connected-overlay
8284
cdkConnectedOverlayLockPosition
8385
cdkConnectedOverlayHasBackdrop
8486
cdkConnectedOverlayBackdropClass="cdk-overlay-transparent-backdrop"
85-
cdkConnectedOverlayPanelClass="cdk-panel-bizbook-select"
87+
cdkConnectedOverlayPanelClass="cdk-panel-select"
8688
[cdkConnectedOverlayScrollStrategy]="overlay.scrollStrategies.block()"
87-
8889
[cdkConnectedOverlayOpen]="state === states.Open"
8990
[cdkConnectedOverlayPositions]="positions"
90-
[cdkConnectedOverlayWidth]="width"
91+
[cdkConnectedOverlayWidth]="0"
9192
(backdropClick)="close()"
9293
(detach)="close()"
93-
>
94-
<!--87 [cdkConnectedOverlayOrigin]="overlayOrigin" -->
95-
<list
94+
>
95+
<!-- <app-list
9696
class="dropdown-panel"
9797
[options]="options"
9898
[nameField]="nameField"
@@ -106,30 +106,31 @@
106106
[searchPlaceholder]="searchPlaceholder"
107107
[disabledField]="disabledField"
108108
[selectOnEnter]="selectOnEnter"
109-
[ngStyle]="{ height: dropdownHeight + 'px' }"
109+
[ngStyle]="{height: dropdownHeight + 'px'}"
110110
[groupConfig]="groupConfig"
111111
[showIcon]="showIcon"
112-
></list>
112+
113+
114+
></app-list> -->
113115
</ng-template>
114116
<ng-template
115117
cdk-connected-overlay
116118
cdkConnectedOverlayLockPosition
117119
cdkConnectedOverlayHasBackdrop
118120
cdkConnectedOverlayBackdropClass="cdk-overlay-transparent-backdrop"
119-
cdkConnectedOverlayPanelClass="cdk-panel-bizbook-select"
121+
cdkConnectedOverlayPanelClass="cdk-panel-select"
120122
[cdkConnectedOverlayScrollStrategy]="overlay.scrollStrategies.block()"
121-
122123
[cdkConnectedOverlayOpen]="
123124
!!currentPanel && currentPanel.state === states.Open
124125
"
125126
[cdkConnectedOverlayPositions]="positions"
126-
[cdkConnectedOverlayWidth]="currentPanel?.width ?? 0"
127+
[cdkConnectedOverlayWidth]="10"
127128
(backdropClick)="closePanel()"
128129
(detach)="closePanel()"
129130
>
130-
<list
131+
132+
<!-- <app-list
131133
class="dropdown-panel"
132-
*ngIf="currentPanel?.list?.length"
133134
[options]="currentPanel?.list"
134135
[nameField]="nameField"
135136
[idField]="idField"
@@ -147,9 +148,9 @@
147148
[multiple]="false"
148149
[search]="false"
149150
[removal]="currentPanel?.removal ?? false"
150-
[ngStyle]="{ height: (currentPanel?.height ?? 0) + 'px' }"
151+
[ngStyle]="{height: (currentPanel?.height ?? 0) + 'px'}"
151152
(closed)="closePanel()"
152153
[groupConfig]="groupConfig"
153-
></list>
154+
155+
></app-list> -->
154156
</ng-template>
155-
<!-- 119 [cdkConnectedOverlayOrigin]="overlayOrigin" -->

projects/arc-lib/src/lib/components/selector/select/select.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.select-container {
2-
width: 100%;
2+
width: 100px !important;
33
nb-icon[icon="chevron-down"] {
44
cursor: pointer;
55
}

0 commit comments

Comments
 (0)