Skip to content

Commit

Permalink
Migrate to NX 16.10
Browse files Browse the repository at this point in the history
  • Loading branch information
silicia-apps committed Oct 6, 2023
1 parent 239d07d commit ace03a7
Show file tree
Hide file tree
Showing 15 changed files with 9,805 additions and 7,873 deletions.
3 changes: 2 additions & 1 deletion libs/appwrite/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"project": "libs/appwrite/ng-package.json"
"project": "libs/appwrite/ng-package.json",
"updateBuildableProjectDepsInPackageJson": true
},
"configurations": {
"production": {
Expand Down
3 changes: 2 additions & 1 deletion libs/auth/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"project": "libs/auth/ng-package.json"
"project": "libs/auth/ng-package.json",
"updateBuildableProjectDepsInPackageJson": true
},
"configurations": {
"production": {
Expand Down
3 changes: 2 additions & 1 deletion libs/core/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"project": "libs/core/ng-package.json"
"project": "libs/core/ng-package.json",
"updateBuildableProjectDepsInPackageJson": true
},
"configurations": {
"production": {
Expand Down
3 changes: 2 additions & 1 deletion libs/core/src/lib/components/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
</ion-toolbar>
</ion-header>
<ion-content>
<sio-menu *ngIf="this.tab && this.sioCoreAppComponentState.split" [id]="this.tab"></sio-menu>
<div #side_content>
<ng-content select="[slot='side_content']"></ng-content>
</div>
Expand Down Expand Up @@ -76,8 +77,8 @@
</ion-footer>
</ion-menu>
<ion-router-outlet id="main-content">
<sio-menu *ngIf="this.tab" [id]="this.tab" [position]="'bottom' //(this.split$ | async)?'top':'bottom'"></sio-menu>
<ng-content></ng-content>
<sio-menu *ngIf="this.tab" [id]="this.tab" position="bottom"></sio-menu>
</ion-router-outlet>
</ion-split-pane>
</ng-template>
Expand Down
6 changes: 3 additions & 3 deletions libs/core/src/lib/components/app/app.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

:host {
ion-split-pane {
//--side-min-width: 300px;
//--side-width: 360px;
//--side-max-width: 360px;
--side-min-width: 300px;
--side-width: 300px;
--side-max-width: 300px;
--border: 0px 0px 0px 0px;

ion-menu[side='start'] {
Expand Down
4 changes: 2 additions & 2 deletions libs/core/src/lib/components/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ export class SioCoreAppComponent implements OnInit, OnDestroy {
); } else this.sioCoreLoggerService.warn('[sioCoreAppComponent][Constructor] No config in environment file');
}

@Select(SioCoreAppComponentState.split)
split$!: Observable<boolean>;
//@Select(SioCoreAppComponentState.split)
//split$!: Observable<boolean>;

ngOnInit(): void {
(async () => {
Expand Down
6 changes: 3 additions & 3 deletions libs/core/src/lib/components/app/store/app.state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ export class SioCoreAppComponentState extends NgxsDataRepository<SioCoreAppCompo
return state.dark;
}

@Selector()
static split(state: SioCoreAppComponentStateModel) {
return state.split;
@Computed()
get split() {
return this.snapshot.split;
}

@Selector()
Expand Down
11 changes: 3 additions & 8 deletions libs/core/src/lib/components/card/card.component.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<ion-card [disabled]="this.disabled">
<ion-img *ngIf="this.img" [alt]="this.altImg" [src]="this.img" />
<ion-img *ngIf="this.img" [alt]="this.altImg" [src]="this.img" />
<ion-accordion-group [value]="this.value" (ionChange)="this.test()">
<ion-accordion
[value]="false"
[toggleIcon]="this.toggleIcon"
[toggleIconSlot]="this.toggleIconSlot"
>

<ion-accordion [value]="false" [toggleIcon]="this.toggleIcon" [toggleIconSlot]="this.toggleIconSlot">
<ion-item [color]="this.color" slot="header">
<ion-card-header [color]="this.color">
<div #header><ng-content select="[slot='header']"></ng-content></div>
Expand All @@ -21,4 +16,4 @@
</ion-card-content>
</ion-accordion>
</ion-accordion-group>
</ion-card>
</ion-card>
2 changes: 2 additions & 0 deletions libs/core/src/lib/components/menu/menu.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { SioColorType } from '../../shared/shared.type';
import { SioCoreMenuInterface } from './store/menu.interface';
import { SioCoreMenuState } from './store/menu.state';
import { SioCoreLoggerService } from '../../services/logger';
import { SioCoreAppComponentState } from '../app/store';

@Component({
selector: 'sio-menu',
Expand All @@ -28,6 +29,7 @@ export class SioCoreMenuComponent implements OnInit {

constructor(
private sioCoreLoggerService: SioCoreLoggerService,
public sioCoreAppComponentState: SioCoreAppComponentState,
private _sioCoreMenuState: SioCoreMenuState
) { }

Expand Down
86 changes: 44 additions & 42 deletions libs/core/src/lib/components/slide/slide.component.html
Original file line number Diff line number Diff line change
@@ -1,60 +1,62 @@
<ion-list lines="none">
<ion-list-header><ion-label>Più Venduti</ion-label></ion-list-header>
<ion-item>
<swiper-container [modules]="this.swiperModules" slidesPerView = "auto" [spaceBetween]="1">
<swiper-container [modules]="this.swiperModules" slides-per-view="auto" [spaceBetween]="1">
<swiper-slide>
<sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125">
</sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125">

</sio-card></swiper-slide>

</swiper-container>
</ion-item>
</ion-item>
<ion-list-header><ion-label>Offerte</ion-label></ion-list-header>
<ion-item>
<swiper-container [modules]="this.swiperModules" slides-per-view="auto" [spaceBetween]="1">
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/120?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/120?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/120?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/120?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/120?random=125"></sio-card></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=129"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=130"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=131"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=132"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=133"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=134"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=135"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=136"></swiper-slide>
<swiper-slide>
<sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125">
</sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125">

</sio-card></swiper-slide>

</swiper-container>
</ion-item>
<ion-list-header><ion-label>Bevande</ion-label></ion-list-header>
<ion-item>
<swiper-container [modules]="this.swiperModules" slides-per-view="auto" [spaceBetween]="5">
<swiper-slide><img src="https://loremflickr.com/120/120?random=25"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=26"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=27"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=28"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=29"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=30"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=31"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=32"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=33"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=34"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=35"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=36"></swiper-slide>
</swiper-container>
<swiper-container [modules]="this.swiperModules" slides-per-view="auto" [spaceBetween]="1">
<swiper-slide>
<sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125">
</sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125">

</sio-card></swiper-slide>

</swiper-container>
</ion-item>
<ion-list-header><ion-label>Offerte</ion-label></ion-list-header>
<ion-item>
<swiper-container [modules]="this.swiperModules" slides-per-view="auto" [spaceBetween]="5">
<swiper-slide><img src="https://loremflickr.com/120/120?random=125"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=126"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=127"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=128"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=129"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=130"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=131"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=132"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=133"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=134"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=135"></swiper-slide>
<swiper-slide><img src="https://loremflickr.com/120/120?random=136"></swiper-slide>
<swiper-container [modules]="this.swiperModules" slides-per-view="auto" [spaceBetween]="1">
<swiper-slide>
<sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125">
</sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125"></sio-card></swiper-slide>
<swiper-slide><sio-card title="€ 5,00" subtitle="coca cola" img="https://loremflickr.com/120/60?random=125">

</sio-card></swiper-slide>

</swiper-container>
</ion-item>
</ion-list>
13 changes: 0 additions & 13 deletions libs/core/src/lib/components/slide/slide.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,6 @@
}

swiper-slide {
display: flex;
position: relative;

flex-direction: column;
flex-shrink: 0;
align-items: center;
justify-content: center;

width: auto;

font-size: 18px;

text-align: center;
box-sizing: border-box;
}
}
3 changes: 2 additions & 1 deletion libs/database/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"project": "libs/database/ng-package.json"
"project": "libs/database/ng-package.json",
"updateBuildableProjectDepsInPackageJson": true
},
"configurations": {
"production": {
Expand Down
Loading

0 comments on commit ace03a7

Please sign in to comment.