Merge pull request #103 from oatear/feature/update-dependencies

Update dependencies + Add new links
oatear · Jan 13, 2025 · f39989f · f39989f
2 parents 86ddabb + 51b8566
commit f39989f
Show file tree

Hide file tree

Showing 10 changed files with 4,826 additions and 4,131 deletions.
diff --git a/cider-app/README.md b/cider-app/README.md
@@ -20,7 +20,10 @@ Run `ng generate component component-name` to generate a new component. You can
 ## List outdated dependencies
 Run `npm outdated`
 
-## Update dependency
+## Update all dependencies (from current to wanted)
+Run `npm update`
+
+## Update specific dependency
 Run `ng update library@version` or `npm update library@version`. If it doesn't work use `ng update library@version --allow-dirty`.
 
 ## Install dependencies from package-lock.json only

diff --git a/cider-app/package-lock.json b/cider-app/package-lock.json
diff --git a/cider-app/package.json b/cider-app/package.json
@@ -4,7 +4,7 @@
   "author": {
     "name": "Hristo Iankov"
   },
-  "version": "0.4.8",
+  "version": "0.4.10",
   "repository": "https://github.com/oatear/cider",
   "main": "electron-app/dist/main.js",
   "scripts": {

diff --git a/cider-app/src/app/data-services/data-services.module.ts b/cider-app/src/app/data-services/data-services.module.ts
@@ -4,13 +4,15 @@ import { EntityNamePipe } from './pipes/entity-name.pipe';
 import { EntityListPipe } from './pipes/entity-list.pipe';
 import { EntityPipe } from './pipes/entity.pipe';
 import { EntityListCachedPipe } from './pipes/entity-list-cached.pipe';
+import { ToStringPipe } from './pipes/to-string.pipe';
 
 @NgModule({
   declarations: [
     EntityNamePipe,
     EntityListPipe,
+    EntityListCachedPipe,
     EntityPipe,
-    EntityListCachedPipe
+    ToStringPipe
   ],
   imports: [
     CommonModule
@@ -19,7 +21,8 @@ import { EntityListCachedPipe } from './pipes/entity-list-cached.pipe';
     EntityNamePipe,
     EntityListPipe,
     EntityListCachedPipe,
-    EntityPipe
+    EntityPipe,
+    ToStringPipe
   ]
 })
 export class DataServicesModule { }
diff --git a/cider-app/src/app/data-services/pipes/to-string.pipe.spec.ts b/cider-app/src/app/data-services/pipes/to-string.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { ToStringPipe } from './to-string.pipe';
+
+describe('ToStringPipe', () => {
+  it('create an instance', () => {
+    const pipe = new ToStringPipe();
+    expect(pipe).toBeTruthy();
+  });
+});
diff --git a/cider-app/src/app/data-services/pipes/to-string.pipe.ts b/cider-app/src/app/data-services/pipes/to-string.pipe.ts
@@ -0,0 +1,12 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'toString'
+})
+export class ToStringPipe implements PipeTransform {
+
+  transform(value: any): string {
+    return String(value);
+  }
+
+}
diff --git a/cider-app/src/app/entity-dialog/entity-dialog.component.html b/cider-app/src/app/entity-dialog/entity-dialog.component.html
@@ -9,7 +9,7 @@
                     <div *ngIf="col.service" class="p-field">
                         <label [for]="col.field">{{col.header}}</label>
                         <p-dropdown [options]="(col.service | entityList | async) || []" [(ngModel)]="entity[col.field]" 
-                            [id]="col.field" optionLabel="name" [optionValue]="col.service.getIdField()" class="p-mr-2"
+                            [id]="col.field | toString" optionLabel="name" [optionValue]="col.service.getIdField()" class="p-mr-2"
                             appendTo="body"></p-dropdown>
                     </div>
                 </ng-container>
@@ -18,7 +18,7 @@
                     <div class="p-field">
                         <label [for]="col.field">{{col.header}}</label>
                         <p-dropdown [options]="col.options || []" [(ngModel)]="entity[col.field]" 
-                            [id]="col.field" class="p-mr-2" appendTo="body"></p-dropdown>
+                            [id]="col.field | toString" class="p-mr-2" appendTo="body"></p-dropdown>
                     </div>
                 </ng-container>
                 <ng-container *ngSwitchCase="!col.hidden && col.type === FieldType.optionList 

diff --git a/cider-app/src/app/site-footer/site-footer.component.html b/cider-app/src/app/site-footer/site-footer.component.html
@@ -1,9 +1,11 @@
 <div class="footer">
     <span>CIDEr (Card IDE)</span>
-    <span>{{
+    <span class="fill">{{
         !(projectHomeUrl$ | async) && (projectUnsaved$ | async) ? 'Untitled' : ''
     }}
         {{projectHomeUrl$ | async}}
         {{(projectUnsaved$ | async) ? '*' : ''}}</span>
-    <span>Copyright Ⓒ 2023</span>
+    <span class="p-mr-2">Copyright Ⓒ 2025 Oatear LLC</span>
+    <p-button icon="pi pi-discord" [rounded]="true" [text]="true" (onClick)="navigateToDiscord()"/>
+    <p-button icon="pi pi-github" [rounded]="true" [text]="true" (onClick)="navigateToGithub()"/>
 </div>
diff --git a/cider-app/src/app/site-footer/site-footer.component.scss b/cider-app/src/app/site-footer/site-footer.component.scss
@@ -5,8 +5,19 @@
     font-weight: 400;
     // background-color: var(--surface-a);
     background-color: #343e4d;
-    color: rgba(255, 255, 255, 0.6);
+    color: #bfbfbf;
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
+}
+
+.footer > * {
+    &.fill {
+        flex-grow: 1;
+        text-align: center;
+    }
+}
+
+:host ::ng-deep .p-button.p-button-text {
+    color: #bfbfbf;
 }
diff --git a/cider-app/src/app/site-footer/site-footer.component.ts b/cider-app/src/app/site-footer/site-footer.component.ts
@@ -19,4 +19,11 @@ export class SiteFooterComponent implements OnInit {
   ngOnInit(): void {
   }
 
+  navigateToGithub() {
+    window.location.href = 'https://github.com/oatear/cider'
+  }
+  navigateToDiscord() {
+    window.location.href = 'https://discord.gg/8buTjPHh'
+  }
+
 }