feat: Add custom slug support for links

src/app/app.component.spec.ts

@@ -25,7 +25,7 @@ describe('AppComponent', () => {
     fixture.detectChanges();
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('h1')?.textContent).toContain(
-      'Hello, jklink',
+      'Hello, jklink'
     );
   });
 });

src/app/app.routes.ts

@@ -21,7 +21,7 @@ export const routes: Routes = [
     canActivate: [AuthGuard],
   },
   {
-    path: ':link',
+    path: ':slug',
     component: ViewLinkComponent,
   },
   {

src/app/confirmation-modal/confirmation-modal.component.html

@@ -1,6 +1,14 @@
 <h2 mat-dialog-title>{{ data.title }}</h2>
 <mat-dialog-content>{{ data.description }}</mat-dialog-content>
 <mat-dialog-actions>
-  <button [style.backgroundColor]="'#FFFFFF'" [style.color]="'#000000'" mat-stroked-button color="warn" (click)="accept()">Yes</button>
+  <button
+    [style.backgroundColor]="'#FFFFFF'"
+    [style.color]="'#000000'"
+    mat-stroked-button
+    color="warn"
+    (click)="accept()"
+  >
+    Yes
+  </button>
   <button mat-flat-button (click)="close()">No</button>
 </mat-dialog-actions>

src/app/create-link/create-link.component.html

@@ -1,6 +1,13 @@
 <div class="mx-auto container">
   <app-navbar></app-navbar>
-  <button [style.backgroundColor]="'#FFFFFF'" [style.color]="'#000000'" mat-stroked-button class="mt-3" color="warn" (click)="back()">
+  <button
+    [style.backgroundColor]="'#FFFFFF'"
+    [style.color]="'#000000'"
+    mat-stroked-button
+    class="mt-3"
+    color="warn"
+    (click)="back()"
+  >
     Back
   </button>
   <mat-card class="mt-3 p-3" appearance="outlined">
@@ -20,6 +27,11 @@
           placeholder="https://kjan.de"
         />
       </mat-form-field>
+      <mat-form-field appearance="outline">
+        <mat-error>{{ errorMessages["slug"] }}</mat-error>
+        <mat-label>Custom slug (optional)</mat-label>
+        <input formControlName="slug" matInput />
+      </mat-form-field>
       <button mat-flat-button type="submit" (click)="submit()">Create</button>
     </form>
   </mat-card>

src/app/create-link/create-link.component.ts

@@ -32,10 +32,7 @@ export class CreateLinkComponent {
   public requestFailed: boolean = false;
   public errorMessages: Record<string, string> = {};
 
-  constructor(
+  constructor(private linkService: LinkService, private router: Router) {}
-    private linkService: LinkService,
-    private router: Router,
-  ) {}
 
   private validationErrorMessages: Record<string, string> = {
     required: 'This field is required',
@@ -53,7 +50,7 @@ export class CreateLinkComponent {
           .map(
             (errorKey) =>
               this.validationErrorMessages[errorKey] ||
-              `Unknown error: ${errorKey}`,
+              `Unknown error: ${errorKey}`
           )
           .join(' ');
       }
@@ -70,9 +67,10 @@ export class CreateLinkComponent {
       link: new FormControl('', [
         Validators.required,
         Validators.pattern(
-          /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/,
+          /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/
         ),
       ]),
+      slug: new FormControl(''),
     });
     this.createLinkForm.valueChanges.subscribe(() => {
       this.updateErrorMessages();
@@ -89,6 +87,7 @@ export class CreateLinkComponent {
       .createLink({
         name: this.createLinkForm.get('name')?.value,
         link: this.createLinkForm.get('link')?.value,
+        slug: this.createLinkForm.get('slug')?.value,
       })
       .catch(() => (this.requestFailed = true))
       .finally(() => {

src/app/dashboard/dashboard.component.html

@@ -24,11 +24,11 @@
         The actual rendered columns are set as a property on the row definition" -->
 
           <!-- Position Column -->
-          <ng-container matColumnDef="id">
+          <ng-container matColumnDef="slug">
-            <th mat-header-cell *matHeaderCellDef>ID</th>
+            <th mat-header-cell *matHeaderCellDef>Slug</th>
             <td mat-cell *matCellDef="let element">
               <a (click)="goToLink(element)" class="link">
-                {{ element.id }}
+                {{ element.slug }}
               </a>
             </td>
           </ng-container>
@@ -49,11 +49,7 @@
           <ng-container matColumnDef="shortLink">
             <th mat-header-cell *matHeaderCellDef>Short link</th>
             <td mat-cell *matCellDef="let element">
-              <button
+              <button mat-flat-button class="my-3" (click)="copyLink(element)">
-                mat-flat-button
-                class="my-3"
-                (click)="copyLink(element.id)"
-              >
                 Copy short link
               </button>
             </td>

src/app/dashboard/dashboard.component.ts

@@ -27,7 +27,7 @@ import { AuthRecord } from 'pocketbase';
 })
 export class DashboardComponent {
   public links: Link[] = [];
-  displayedColumns: string[] = ['id', 'name', 'link', 'shortLink', 'actions'];
+  displayedColumns: string[] = ['slug', 'name', 'link', 'shortLink', 'actions'];
   public user!: AuthRecord;
 
   constructor(
@@ -35,15 +35,15 @@ export class DashboardComponent {
     private router: Router,
     private dialog: MatDialog,
     private snackBar: MatSnackBar,
-    private userService: UserService,
+    private userService: UserService
   ) {}
 
-  copyLink(id: string) {
+  copyLink(link: Link) {
-    navigator.clipboard.writeText(this.getShortLink(id));
+    navigator.clipboard.writeText(this.getShortLink(link));
   }
 
-  getShortLink(id: string): string {
+  getShortLink(link: Link): string {
-    return 'https://' + window.location.hostname + '/' + id;
+    return 'https://' + window.location.hostname + '/' + link.slug;
   }
 
   goToLink(link: Link) {
@@ -91,7 +91,7 @@ export class DashboardComponent {
         if (accepted) {
           this.linkService.deleteLink(link.id).catch(() => {
             const errorNotification = this.snackBar.open(
-              'Something went wrong.',
+              'Something went wrong.'
             );
             setTimeout(() => {
               errorNotification.dismiss();

src/app/login/login.component.ts

@@ -35,10 +35,7 @@ export class LoginComponent {
   private pb = new PocketBase(environment.POCKETBASE);
   public errorMessages: Record<string, string> = {};
 
-  constructor(
+  constructor(private router: Router, private snackBar: MatSnackBar) {}
-    private router: Router,
-    private snackBar: MatSnackBar,
-  ) {}
 
   private validationErrorMessages: Record<string, string> = {
     required: 'This field is required',
@@ -55,7 +52,7 @@ export class LoginComponent {
           .map(
             (errorKey) =>
               this.validationErrorMessages[errorKey] ||
-              `Unknown error: ${errorKey}`,
+              `Unknown error: ${errorKey}`
           )
           .join(' ');
       }
@@ -105,7 +102,7 @@ export class LoginComponent {
       .collection('users')
       .authWithPassword(
         this.loginForm.get('email')?.value,
-        this.loginForm.get('password')?.value,
+        this.loginForm.get('password')?.value
       )
       .then(() => {
         this.router.navigate(['dashboard']);

src/app/models/link.ts

@@ -3,4 +3,5 @@ export interface Link {
   link: string;
   name: string;
   owner: string;
+  slug: string;
 }

src/app/service/auth.service.ts

@@ -18,7 +18,7 @@ export class AuthGuard implements CanActivate {
 
   async canActivate(
     route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot,
+    state: RouterStateSnapshot
   ): Promise<boolean> {
     const pb = new PocketBase(environment.POCKETBASE);
     await pb

src/app/service/link.service.ts

@@ -13,8 +13,8 @@ export class LinkService {
     return this.pb.collection<Link>('links').getFullList<Link>();
   }
 
-  getLink(id: string): Promise<Link> {
+  getLink(slug: string): Promise<Link> {
-    return this.pb.collection('links').getOne<Link>(id);
+    return this.pb.collection('links').getFirstListItem(`slug="${slug}"`);
   }
 
   deleteLink(id: string): Promise<boolean> {
@@ -26,6 +26,7 @@ export class LinkService {
       name: link.name,
       link: link.link,
       owner: this.pb.authStore.record?.id,
+      slug: link.slug,
     });
   }
 }

src/app/service/user.service.ts

@@ -1,6 +1,6 @@
-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
 import PocketBase, { AuthRecord } from 'pocketbase';
-import { environment } from "../../environments/environment";
+import { environment } from '../../environments/environment';
 
 @Injectable({
   providedIn: 'root',

src/app/view-link/view-link.component.ts

@@ -12,12 +12,12 @@ export class ViewLinkComponent {
   constructor(
     private linkService: LinkService,
     private route: ActivatedRoute,
-    private router: Router,
+    private router: Router
   ) {}
 
   ngOnInit(): void {
     this.linkService
-      .getLink(this.route.snapshot.params['link'])
+      .getLink(this.route.snapshot.params['slug'])
       .then((link) => {
         window.location.href = link.link;
       });

src/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html class="h-full" lang="en" data-theme="light">
   <head>
     <meta charset="utf-8" />

src/main.ts

@@ -3,5 +3,5 @@ import { appConfig } from './app/app.config';
 import { AppComponent } from './app/app.component';
 
 bootstrapApplication(AppComponent, appConfig).catch((err) =>
-  console.error(err),
+  console.error(err)
 );