Merge branch 'update/camelCase' of github.com:Start9Labs/start-os into rebase/feat/domains

web/projects/marketplace/src/pages/show/additional/additional.component.html

@@ -4,7 +4,7 @@
     <div class="detail-container">
       <!-- git hash -->
       <div
-        *ngIf="pkg.manifest['git-hash'] as gitHash; else noHash"
+        *ngIf="pkg.manifest.gitHash as gitHash; else noHash"
         button
         detail="false"
         class="detail-container-item item-padding item-copy"
@@ -66,26 +66,26 @@
       </ng-template>
       <!-- links -->
       <marketplace-additional-link
-        [url]="pkg.manifest['marketing-site']"
-        *ngIf="pkg.manifest['marketing-site']"
+        *ngIf="pkg.manifest.marketingSite"
+        [url]="pkg.manifest.marketingSite"
         label="Marketing Site"
         class="item-padding item-pointer"
       ></marketplace-additional-link>
       <marketplace-additional-link
-        [url]="pkg.manifest['upstream-repo']"
-        *ngIf="pkg.manifest['upstream-repo']"
+        *ngIf="pkg.manifest.upstreamRepo"
+        [url]="pkg.manifest.upstreamRepo"
         label="Source Repository"
         class="item-padding item-pointer"
       ></marketplace-additional-link>
       <marketplace-additional-link
-        [url]="pkg.manifest['wrapper-repo']"
-        *ngIf="pkg.manifest['wrapper-repo']"
+        *ngIf="pkg.manifest.wrapperRepo"
+        [url]="pkg.manifest.wrapperRepo"
         label="Wrapper Repository"
         class="item-padding item-pointer"
       ></marketplace-additional-link>
       <marketplace-additional-link
-        [url]="pkg.manifest['support-site']"
-        *ngIf="pkg.manifest['support-site']"
+        *ngIf="pkg.manifest.supportSite"
+        [url]="pkg.manifest.supportSite"
         label="Support Site"
         class="item-padding item-pointer"
       ></marketplace-additional-link>

web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html

@@ -1,10 +1,10 @@
 <div class="outer-container">
   <div class="inner-container">
-    <tui-avatar class="dep-img" [src]="pkg['dependency-metadata'][dep.key].icon"></tui-avatar>
+    <tui-avatar class="dep-img" [src]="pkg.dependencyMetadata[dep.key].icon"></tui-avatar>
     <div class="wrapper-margin">
       <div class="inner-container-title">
         <span>
-          {{ pkg['dependency-metadata'][dep.key].title || dep.key }}
+          {{ pkg.dependencyMetadata[dep.key].title || dep.key }}
         </span>
         <p>
           @if (dep.value.optional) {

web/projects/marketplace/src/pipes/filter-packages.pipe.ts

@@ -71,8 +71,7 @@ export class FilterPackagesPipe implements PipeTransform {
       .filter(p => category === 'all' || p.categories.includes(category!))
       .sort((a, b) => {
         return (
-          new Date(b['published-at']).valueOf() -
-          new Date(a['published-at']).valueOf()
+          new Date(b.publishedAt).valueOf() - new Date(a.publishedAt).valueOf()
         )
       })
       .map(a => ({ ...a }))

web/projects/marketplace/src/types.ts

@@ -29,10 +29,10 @@ export interface MarketplacePkg {
   manifest: Manifest
   categories: string[]
   versions: string[]
-  'dependency-metadata': {
+  dependencyMetadata: {
     [id: string]: DependencyMetadata
   }
-  'published-at': string
+  publishedAt: string
 }
 
 export interface DependencyMetadata {
@@ -46,19 +46,19 @@ export interface Manifest {
   id: string
   title: string
   version: string
-  'git-hash'?: string
+  gitHash?: string
   description: {
     short: string
     long: string
   }
   replaces?: string[]
-  'release-notes': string
+  releaseNotes: string
   license: string // name of license
-  'wrapper-repo': Url
-  'upstream-repo': Url
-  'support-site': Url
-  'marketing-site': Url
-  'donation-url': Url | null
+  wrapperRepo: Url
+  upstreamRepo: Url
+  supportSite: Url
+  marketingSite: Url
+  donationUrl: Url | null
   alerts: {
     install: string | null
     uninstall: string | null
@@ -67,8 +67,8 @@ export interface Manifest {
     stop: string | null
   }
   dependencies: Record<string, Dependency>
-  'os-version': string
-  'has-config': boolean
+  osVersion: string
+  hasConfig: boolean
 }
 
 export interface Dependency {