Merge branch 'release' into analog-1.5.0

dalenguyen · Jun 14, 2024 · 24e4a63 · 24e4a63
2 parents d89884c + 395b87e
commit 24e4a63
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 8 deletions.
diff --git a/pdf/src/app/pages/(home).page.ts b/pdf/src/app/pages/(home).page.ts
@@ -13,6 +13,7 @@ import { ToastModule } from 'primeng/toast'
 import { DisclaimerComponent } from '../shared/components/disclaimer/disclaimer.component'
 import { PdfHandlerBase } from '../shared/components/pdf-handler-base/pdf-handler-base.directive'
 import { ShoutOutComponent } from '../shared/components/shout-out/shout-out.component'
+import { ByteSizeFormatter } from '../shared/pipes'
 import { getNextDays } from '../shared/utils'
 
 export const routeMeta: RouteMeta = {
@@ -55,7 +56,11 @@ export const routeMeta: RouteMeta = {
       @if(this.newFileSize() < this.currentFileSize()) {
       <p class="mb-4">
         Congratulations! Your file is reduced by
-        {{ this.currentFileSize() - this.newFileSize() }} bytes!
+        <strong
+          >{{
+            this.currentFileSize() - this.newFileSize() | byteSizeFormatter
+          }}!</strong
+        >
       </p>
       }
 
@@ -82,6 +87,7 @@ export const routeMeta: RouteMeta = {
     BuyMeACoffeeComponent,
     ShoutOutComponent,
     DisclaimerComponent,
+    ByteSizeFormatter,
   ],
 })
 export default class HomeComponent extends PdfHandlerBase {

diff --git a/pdf/src/app/shared/components/footer/footer.component.spec.ts b/pdf/src/app/shared/components/footer/footer.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { RouterTestingModule } from '@angular/router/testing'
+import { provideRouter } from '@angular/router'
 import { FooterComponent } from './footer.component'
 
 describe('FooterComponent', () => {
@@ -8,7 +8,9 @@ describe('FooterComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [FooterComponent, RouterTestingModule],
+      imports: [FooterComponent],
+      imports: [FooterComponent],
+      providers: [provideRouter([])],
     }).compileComponents()
 
     fixture = TestBed.createComponent(FooterComponent)

diff --git a/pdf/src/app/shared/components/header/header.component.ts b/pdf/src/app/shared/components/header/header.component.ts
@@ -40,17 +40,17 @@ import { LoginComponent, ProfileComponent } from '@pdfun/ui/auth'
             <div class="flex gap-4">
               <a
                 routerLink="/"
-                routerLinkActive="text-gray-200"
                 [routerLinkActiveOptions]="{ exact: true }"
-                class="text-gray-400 no-underline hover:text-white transition-colors duration-300"
+                routerLinkActive="active"
+                class="link"
               >
                 Resize PDF
               </a>
 
               <a
                 routerLink="/pdf-to-images"
-                routerLinkActive="text-gray-200"
-                class="text-gray-400 no-underline hover:text-white transition-colors duration-300"
+                routerLinkActive="active"
+                class="link"
               >
                 PDF to Images
               </a>

diff --git a/pdf/src/app/shared/pipes/byte-size-formatter.pipe.ts b/pdf/src/app/shared/pipes/byte-size-formatter.pipe.ts
@@ -0,0 +1,22 @@
+import { Pipe, PipeTransform } from '@angular/core'
+
+@Pipe({
+  name: 'byteSizeFormatter',
+  standalone: true,
+})
+export class ByteSizeFormatter implements PipeTransform {
+  transform(bytes: number, precision = 1): string {
+    if (isNaN(parseFloat(String(bytes))) || !isFinite(bytes))
+      return 'Invalid number'
+
+    const units = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB']
+    let unitIndex = 0
+
+    while (bytes >= 1024 && unitIndex < units.length - 1) {
+      bytes /= 1024
+      unitIndex++
+    }
+
+    return `${bytes.toFixed(precision)} ${units[unitIndex]}`
+  }
+}
diff --git a/pdf/src/app/shared/pipes/index.ts b/pdf/src/app/shared/pipes/index.ts
@@ -0,0 +1 @@
+export * from './byte-size-formatter.pipe'
diff --git a/pdf/src/styles.scss b/pdf/src/styles.scss
@@ -1,4 +1,4 @@
-@layer tailwind-base, tailwind-utilities, primeng;
+@layer tailwind-base, tailwind-utilities, tailwind-component, primeng;
 
 @layer tailwind-base {
   @tailwind base;
@@ -8,6 +8,19 @@
   @tailwind utilities;
 }
 
+@layer tailwind-components {
+  @tailwind components;
+}
+
+@layer tailwind-components {
+  .link {
+    @apply text-gray-400 no-underline hover:text-white transition-colors duration-300;
+  }
+  .active {
+    @apply text-gray-200;
+  }
+}
+
 @import 'primeng/resources/themes/tailwind-light/theme.css';
 @import 'primeng/resources/primeng.css';
 @import 'primeicons/primeicons.css';