Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

feat(recents): simplify timeline and increase default limit

johavenc51e31fd29a4
diff --git a/backend/src/applications/comments/comments.controller.spec.ts b/backend/src/applications/comments/comments.controller.spec.ts
index f8bba45e..28987bb6 100644
--- a/backend/src/applications/comments/comments.controller.spec.ts
+++ b/backend/src/applications/comments/comments.controller.spec.ts
@@ -121,7 +121,7 @@ describe(CommentsController.name, () => {
expect(res).toEqual(recents)
})
- it('getRecents uses the default limit (10) when not provided', async () => {
+ it('getRecents uses the default limit (25) when not provided', async () => {
const recents = [{ id: 'r2' }] as any
commentsManager.getRecents.mockResolvedValueOnce(recents)
@@ -129,7 +129,7 @@ describe(CommentsController.name, () => {
const res = await commentsController.getRecents(user, undefined as any)
expect(commentsManager.getRecents).toHaveBeenCalledTimes(1)
- expect(commentsManager.getRecents).toHaveBeenCalledWith(user, 10)
+ expect(commentsManager.getRecents).toHaveBeenCalledWith(user, 25)
expect(res).toEqual(recents)
})
})
diff --git a/backend/src/applications/comments/comments.controller.ts b/backend/src/applications/comments/comments.controller.ts
index 28786170..98aca9b5 100644
--- a/backend/src/applications/comments/comments.controller.ts
+++ b/backend/src/applications/comments/comments.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, Patch, Post, Query, UseGuards, UseInterceptors } from '@nestjs/common'
+import { BadRequestException, Body, Controller, Delete, Get, ParseIntPipe, Patch, Post, Query, UseGuards, UseInterceptors } from '@nestjs/common'
import { ContextInterceptor } from '../../infrastructure/context/interceptors/context.interceptor'
import { SkipSpaceGuard } from '../spaces/decorators/space-skip-guard.decorator'
import { SkipSpacePermissionsCheck } from '../spaces/decorators/space-skip-permissions.decorator'
@@ -7,6 +7,7 @@ import { SpaceGuard } from '../spaces/guards/space.guard'
import { SpaceEnv } from '../spaces/models/space-env.model'
import { GetUser } from '../users/decorators/user.decorator'
import type { UserModel } from '../users/models/user.model'
+import { COMMENTS_RECENTS_DEFAULT_LIMIT, COMMENTS_RECENTS_MAX_LIMIT } from './constants/recents'
import { COMMENTS_ROUTE } from './constants/routes'
import { CreateOrUpdateCommentDto, DeleteCommentDto } from './dto/comment.dto'
import { CommentRecent } from './interfaces/comment-recent.interface'
@@ -42,7 +43,11 @@ export class CommentsController {
@Get(COMMENTS_ROUTE.RECENTS)
@SkipSpaceGuard()
- getRecents(@GetUser() user: UserModel, @Query('limit') limit: number = 10): Promise<CommentRecent[]> {
- return this.commentsManager.getRecents(user, limit)
+ getRecents(
+ @GetUser() user: UserModel,
+ @Query('limit', new ParseIntPipe({ optional: true })) limit: number = COMMENTS_RECENTS_DEFAULT_LIMIT
+ ): Promise<CommentRecent[]> {
+ if (!Number.isInteger(limit) || limit < 1) throw new BadRequestException('limit must be a positive integer')
+ return this.commentsManager.getRecents(user, Math.min(limit, COMMENTS_RECENTS_MAX_LIMIT))
}
}
diff --git a/backend/src/applications/comments/constants/recents.ts b/backend/src/applications/comments/constants/recents.ts
new file mode 100644
index 00000000..e03756a5
--- /dev/null
+++ b/backend/src/applications/comments/constants/recents.ts
@@ -0,0 +1,2 @@
+export const COMMENTS_RECENTS_DEFAULT_LIMIT = 25
+export const COMMENTS_RECENTS_MAX_LIMIT = 100
diff --git a/backend/src/applications/comments/services/comments-queries.service.ts b/backend/src/applications/comments/services/comments-queries.service.ts
index 81754025..4951a16c 100644
--- a/backend/src/applications/comments/services/comments-queries.service.ts
+++ b/backend/src/applications/comments/services/comments-queries.service.ts
@@ -16,6 +16,7 @@ import { SpacesQueries } from '../../spaces/services/spaces-queries.service'
import { USER_PERMISSION } from '../../users/constants/user'
import { UserModel } from '../../users/models/user.model'
import { userFullNameSQL, users } from '../../users/schemas/users.schema'
+import { COMMENTS_RECENTS_MAX_LIMIT } from '../constants/recents'
import { CommentRecent } from '../interfaces/comment-recent.interface'
import { Comment } from '../schemas/comment.interface'
import { comments } from '../schemas/comments.schema'
@@ -249,7 +250,8 @@ export class CommentsQueries {
.limit(limit)
}
- async getRecentsFromUser(user: UserModel, limit = 10): Promise<CommentRecent[]> {
+ async getRecentsFromUser(user: UserModel, limit: number): Promise<CommentRecent[]> {
+ const recentsLimit = Math.min(limit, COMMENTS_RECENTS_MAX_LIMIT)
const hasPersonal = user.havePermission(USER_PERMISSION.PERSONAL_SPACE)
const [spaces, shares] = await Promise.all([
user.havePermission(USER_PERMISSION.SPACES) ? this.spacesQueries.spaceIdentities(user.id) : Promise.resolve([]),
@@ -260,13 +262,13 @@ export class CommentsQueries {
const hasSpaces = spaceIds.length > 0
const hasShares = shareIds.length > 0
const sourceCount = +hasPersonal + +hasSpaces + +hasShares
- const sourceLimit = sourceCount > 1 ? limit * 2 : limit
- const sources: Promise<CommentRecent[]>[] = [
- ...(hasPersonal ? [this.getRecentsFromPersonal(user.id, sourceLimit) as Promise<CommentRecent[]>] : []),
- ...(hasSpaces ? [this.getRecentsFromSpaces(user.id, spaceIds, sourceLimit) as Promise<CommentRecent[]>] : []),
- ...(hasShares ? [this.getRecentsFromShares(user.id, shareIds, sourceLimit) as Promise<CommentRecent[]>] : [])
- ]
- const recents = (await Promise.all(sources)).flat().sort((a, b) => b.id - a.id)
- return Array.from(new Map(recents.map((r) => [r.id, r])).values()).slice(0, limit)
+ const sourceLimit = sourceCount > 1 ? recentsLimit * 2 : recentsLimit
+ const sourceRecents = await Promise.all([
+ hasPersonal ? this.getRecentsFromPersonal(user.id, sourceLimit) : Promise.resolve([]),
+ hasSpaces ? this.getRecentsFromSpaces(user.id, spaceIds, sourceLimit) : Promise.resolve([]),
+ hasShares ? this.getRecentsFromShares(user.id, shareIds, sourceLimit) : Promise.resolve([])
+ ])
+ const recents = sourceRecents.flat().sort((a, b) => b.id - a.id)
+ return Array.from(new Map(recents.map((r) => [r.id, r])).values()).slice(0, recentsLimit)
}
}
diff --git a/backend/src/applications/files/constants/recents.ts b/backend/src/applications/files/constants/recents.ts
new file mode 100644
index 00000000..25cbb2ec
--- /dev/null
+++ b/backend/src/applications/files/constants/recents.ts
@@ -0,0 +1,2 @@
+export const FILES_RECENTS_DEFAULT_LIMIT = 25
+export const FILES_RECENTS_MAX_LIMIT = 100
diff --git a/backend/src/applications/files/files.controller.spec.ts b/backend/src/applications/files/files.controller.spec.ts
index 8ee31de3..e0f7fa5c 100644
--- a/backend/src/applications/files/files.controller.spec.ts
+++ b/backend/src/applications/files/files.controller.spec.ts
@@ -45,13 +45,13 @@ describe(FilesController.name, () => {
vi.clearAllMocks()
})
- it('getRecents() should use limit=10 by default', async () => {
+ it('getRecents() should use limit=25 by default', async () => {
const recents = [{ path: '/a' }] as any
filesRecentsMock.getRecents.mockResolvedValue(recents)
const result = await filesController.getRecents(fakeUser, undefined as unknown as number)
- expect(filesRecentsMock.getRecents).toHaveBeenCalledWith(fakeUser, 10)
+ expect(filesRecentsMock.getRecents).toHaveBeenCalledWith(fakeUser, 25)
expect(result).toBe(recents)
})
diff --git a/backend/src/applications/files/files.controller.ts b/backend/src/applications/files/files.controller.ts
index f1cea9de..7a7cb004 100644
--- a/backend/src/applications/files/files.controller.ts
+++ b/backend/src/applications/files/files.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, Post, Query, Search, UseGuards } from '@nestjs/common'
+import { BadRequestException, Body, Controller, Delete, Get, ParseIntPipe, Post, Query, Search, UseGuards } from '@nestjs/common'
import { SkipSpacePermissionsCheck } from '../spaces/decorators/space-skip-permissions.decorator'
import { GetSpace } from '../spaces/decorators/space.decorator'
import { SpaceGuard } from '../spaces/guards/space.guard'
@@ -8,6 +8,7 @@ import { UserHaveRole } from '../users/decorators/roles.decorator'
import { GetUser } from '../users/decorators/user.decorator'
import { UserRolesGuard } from '../users/guards/roles.guard'
import { UserModel } from '../users/models/user.model'
+import { FILES_RECENTS_DEFAULT_LIMIT, FILES_RECENTS_MAX_LIMIT } from './constants/recents'
import { FILES_ROUTE } from './constants/routes'
import { DeleteFileFavoriteDto, FileFavoriteDto } from './dto/file-favorite.dto'
import { SearchFilesDto } from './dto/file-operations.dto'
@@ -57,8 +58,12 @@ export class FilesController {
// RECENT FILES
@Get(FILES_ROUTE.RECENTS)
- getRecents(@GetUser() user: UserModel, @Query('limit') limit: number = 10): Promise<FileRecent[]> {
- return this.filesRecents.getRecents(user, limit)
+ getRecents(
+ @GetUser() user: UserModel,
+ @Query('limit', new ParseIntPipe({ optional: true })) limit: number = FILES_RECENTS_DEFAULT_LIMIT
+ ): Promise<FileRecent[]> {
+ if (!Number.isInteger(limit) || limit < 1) throw new BadRequestException('limit must be a positive integer')
+ return this.filesRecents.getRecents(user, Math.min(limit, FILES_RECENTS_MAX_LIMIT))
}
// SEARCH FILES
diff --git a/backend/src/applications/files/services/files-queries.service.ts b/backend/src/applications/files/services/files-queries.service.ts
index b6ebcda6..d8df677b 100644
--- a/backend/src/applications/files/services/files-queries.service.ts
+++ b/backend/src/applications/files/services/files-queries.service.ts
@@ -10,6 +10,7 @@ import { spacesRoots } from '../../spaces/schemas/spaces-roots.schema'
import { spaces } from '../../spaces/schemas/spaces.schema'
import { syncClients } from '../../sync/schemas/sync-clients.schema'
import { syncPaths } from '../../sync/schemas/sync-paths.schema'
+import { FILES_RECENTS_MAX_LIMIT } from '../constants/recents'
import { FileDBProps } from '../interfaces/file-db-props.interface'
import { FileProps } from '../interfaces/file-props.interface'
import type { FileRecent, FileRecentLocation, FileRecentUpdate } from '../schemas/file-recent.interface'
@@ -283,7 +284,8 @@ export class FilesQueries {
}
}
- getRecentsFromUser(userId: number | undefined, spaceIds: number[], shareIds: number[], limit = 10): Promise<FileRecent[]> {
+ getRecentsFromUser(userId: number | undefined, spaceIds: number[], shareIds: number[], limit: number): Promise<FileRecent[]> {
+ const recentsLimit = Math.min(limit, FILES_RECENTS_MAX_LIMIT)
const where: SQL[] = [
...(userId !== undefined ? [eq(filesRecents.ownerId, userId)] : []),
...(spaceIds.length ? [inArray(filesRecents.spaceId, spaceIds)] : []),
@@ -310,7 +312,7 @@ export class FilesQueries {
.where(or(...where))
.groupBy(filesRecents.id)
.orderBy(desc(filesRecents.mtime))
- .limit(limit)
+ .limit(recentsLimit)
}
getRecentsFromLocation(location: FileRecentLocation): Promise<FileRecent[]> {
diff --git a/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.html b/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.html
deleted file mode 100644
index c0eac0b2..00000000
--- a/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="recents-widget-card">
- <div class="recents-widget-card__header">
- <div class="recents-widget-card__title-wrap">
- <span class="recents-widget-card__title-icon">
- <svg [lucideIcon]="icons.LucideMessageSquareMore"></svg>
- </span>
- <span class="recents-widget-card__title" l10nTranslate>Comments</span>
- </div>
- <button type="button" class="recents-widget-card__toggle" (click)="switchMore()">
- <svg [lucideIcon]="moreElements ? icons.LucideZoomOut : icons.LucideZoomIn"></svg>
- </button>
- </div>
- <div class="recents-widget-card__body">
- @for (c of comments(); track c.id; let i = $index) {
- <button type="button" class="recent-item-card" [style.animation-delay.ms]="i * 22" (click)="goToFile(c)">
- <span>
- <app-user-avatar [user]="c.author" [container]="'body'"></app-user-avatar>
- </span>
- <span class="recent-item-card__content">
- <span class="recent-item-card__title">{{ c.content }}</span>
- <app-file-location class="recent-item-card__path" [location]="c"></app-file-location>
- </span>
- <span class="recent-item-card__time">{{ c.modifiedAt | amLiveTimeAgo }}</span>
- </button>
- } @empty {
- <div class="recent-empty-state">
- <svg [lucideIcon]="icons.LucideMessageSquareMore"></svg>
- <div class="mt-3" l10nTranslate>No recent comments</div>
- </div>
- }
- </div>
-</div>
diff --git a/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.scss b/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.scss
deleted file mode 100644
index 1851b2a2..00000000
--- a/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.recent-item-card__media {
- border-radius: 999px;
- display: flex;
- align-items: center;
- justify-content: center;
-}
diff --git a/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.ts b/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.ts
deleted file mode 100644
index ca14ec66..00000000
--- a/frontend/src/app/applications/comments/components/widgets/comments-recents-widget.component.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Component, computed, inject, Signal } from '@angular/core'
-import { Router } from '@angular/router'
-import { LucideDynamicIcon, LucideMessageSquareMore, LucideZoomIn, LucideZoomOut } from '@lucide/angular'
-import { L10nTranslateDirective } from 'angular-l10n'
-import { LiveTimeAgoPipe } from '../../../../common/pipes/time-ago-live.pipe'
-import { TAB_MENU } from '../../../../layout/layout.interfaces'
-import { LayoutService } from '../../../../layout/layout.service'
-import { StoreService } from '../../../../store/store.service'
-import { FileLocationComponent } from '../../../files/components/utils/file-location.component'
-import { SPACES_PATH } from '../../../spaces/spaces.constants'
-import { UserAvatarComponent } from '../../../users/components/utils/user-avatar.component'
-import { CommentRecentModel } from '../../models/comment-recent.model'
-import { CommentsService } from '../../services/comments.service'
-
-@Component({
- selector: 'app-comments-recents-widget',
- imports: [L10nTranslateDirective, LucideDynamicIcon, UserAvatarComponent, LiveTimeAgoPipe, FileLocationComponent],
- templateUrl: './comments-recents-widget.component.html',
- styleUrl: './comments-recents-widget.component.scss'
-})
-export class CommentsRecentsWidgetComponent {
- protected moreElements = false
- protected readonly icons = { LucideMessageSquareMore, LucideZoomIn, LucideZoomOut }
- private readonly router = inject(Router)
- private readonly layout = inject(LayoutService)
- private readonly store = inject(StoreService)
- private readonly commentsService = inject(CommentsService)
- private nbInitialComments = 10
- private nbComments = this.nbInitialComments
- protected comments: Signal<CommentRecentModel[]> = computed(() => this.store.commentsRecents().slice(0, this.nbComments))
-
- constructor() {
- this.load()
- }
-
- switchMore() {
- if (this.moreElements) {
- this.moreElements = false
- this.nbComments = this.nbInitialComments
- } else {
- this.moreElements = true
- this.nbComments *= 5
- }
- this.load()
- }
-
- goToFile(c: CommentRecentModel) {
- this.router
- .navigate([SPACES_PATH.SPACES, ...c.file.path.split('/')], { queryParams: { select: c.file.name } })
- .then(() => this.layout.showRSideBarTab(TAB_MENU.COMMENTS, true))
- }
-
- private load() {
- this.commentsService.loadRecents(this.nbComments)
- }
-}
diff --git a/frontend/src/app/applications/comments/services/comments.service.ts b/frontend/src/app/applications/comments/services/comments.service.ts
index 5465d010..0a5b7eee 100644
--- a/frontend/src/app/applications/comments/services/comments.service.ts
+++ b/frontend/src/app/applications/comments/services/comments.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpErrorResponse, HttpParams } from '@angular/common/http'
+import { HttpClient, HttpErrorResponse } from '@angular/common/http'
import { inject, Injectable } from '@angular/core'
import { API_COMMENTS_FROM_SPACE, API_COMMENTS_RECENTS } from '@sync-in-server/backend/src/applications/comments/constants/routes'
import type { CreateOrUpdateCommentDto, DeleteCommentDto } from '@sync-in-server/backend/src/applications/comments/dto/comment.dto'
@@ -35,14 +35,12 @@ export class CommentsService {
return this.http.request<void>('delete', `${API_COMMENTS_FROM_SPACE}/${file.path}`, { body: deleteCommentDto })
}
- loadRecents(limit: number) {
+ loadRecents() {
this.http
- .get<CommentRecent[]>(API_COMMENTS_RECENTS, { params: new HttpParams().set('limit', limit) })
+ .get<CommentRecent[]>(API_COMMENTS_RECENTS)
.pipe(map((cs) => cs.map((c) => new CommentRecentModel(c))))
.subscribe({
- next: (cs: CommentRecentModel[]) => {
- this.store.commentsRecents.update((comments) => [...cs, ...comments.slice(limit)])
- },
+ next: (cs: CommentRecentModel[]) => this.store.commentsRecents.set(cs),
error: (e: HttpErrorResponse) => this.layout.sendNotification('error', 'Comments', 'Unable to load', e)
})
}
diff --git a/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.html b/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.html
deleted file mode 100644
index f9f968a2..00000000
--- a/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="recents-widget-card">
- <div class="recents-widget-card__header">
- <div class="recents-widget-card__title-wrap">
- <span class="recents-widget-card__title-icon">
- <svg [lucideIcon]="icons.LucideFileText"></svg>
- </span>
- <span class="recents-widget-card__title" l10nTranslate>Files</span>
- </div>
- <button type="button" class="recents-widget-card__toggle" (click)="switchMore()">
- <svg [lucideIcon]="moreElements ? icons.LucideZoomOut : icons.LucideZoomIn"></svg>
- </button>
- </div>
- <div class="recents-widget-card__body">
- @for (f of files(); track f.id; let i = $index) {
- <button type="button" class="recent-item-card" [style.animation-delay.ms]="i * 22" (click)="goToFile(f)">
- <span class="recent-item-card__media">
- <img [src]="f.mimeUrl" alt="" (error)="f.fallBackMimeUrl()">
- </span>
- <span class="recent-item-card__content">
- <span class="recent-item-card__title">{{ f.name }}</span>
- <app-file-location class="recent-item-card__path" [location]="f"></app-file-location>
- </span>
- <span class="recent-item-card__time">{{ f.mtime | amLiveTimeAgo }}</span>
- </button>
- } @empty {
- <div class="recent-empty-state">
- <svg [lucideIcon]="icons.LucideFileText"></svg>
- <div class="mt-3" l10nTranslate>No recent files</div>
- </div>
- }
- </div>
-</div>
diff --git a/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.scss b/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.scss
deleted file mode 100644
index 91b5f75e..00000000
--- a/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.recent-item-card__media {
- border-radius: 0.55rem;
- display: grid;
- place-items: center;
-}
-
-.recent-item-card__media img {
- width: 1.15rem;
- height: 1.15rem;
- object-fit: contain;
-}
diff --git a/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.ts b/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.ts
deleted file mode 100644
index 0c278389..00000000
--- a/frontend/src/app/applications/files/components/widgets/files-recents-widget.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Component, computed, inject, Signal } from '@angular/core'
-import { Router } from '@angular/router'
-import { LucideDynamicIcon, LucideFileText, LucideZoomIn, LucideZoomOut } from '@lucide/angular'
-import { L10nTranslateDirective } from 'angular-l10n'
-import { LiveTimeAgoPipe } from '../../../../common/pipes/time-ago-live.pipe'
-import { StoreService } from '../../../../store/store.service'
-import { SPACES_PATH } from '../../../spaces/spaces.constants'
-import { FileRecentModel } from '../../models/file-recent.model'
-import { FilesService } from '../../services/files.service'
-import { FileLocationComponent } from '../utils/file-location.component'
-
-@Component({
- selector: 'app-files-recents-widget',
- imports: [L10nTranslateDirective, LucideDynamicIcon, LiveTimeAgoPipe, FileLocationComponent],
- templateUrl: './files-recents-widget.component.html',
- styleUrl: './files-recents-widget.component.scss'
-})
-export class FilesRecentsWidgetComponent {
- protected moreElements = false
- protected readonly icons = { LucideFileText, LucideZoomIn, LucideZoomOut }
- private readonly router = inject(Router)
- private readonly store = inject(StoreService)
- private readonly filesService = inject(FilesService)
- private nbInitialFiles = 10
- private nbFiles = this.nbInitialFiles
- protected files: Signal<FileRecentModel[]> = computed(() => this.store.filesRecents().slice(0, this.nbFiles))
-
- constructor() {
- this.load()
- }
-
- switchMore() {
- if (this.moreElements) {
- this.moreElements = false
- this.nbFiles = this.nbInitialFiles
- } else {
- this.moreElements = true
- this.nbFiles *= 5
- }
- this.load()
- }
-
- goToFile(f: FileRecentModel) {
- this.router.navigate([SPACES_PATH.SPACES, ...f.path.split('/')], { queryParams: { select: f.name } }).catch(console.error)
- }
-
- private load() {
- this.filesService.loadRecents(this.nbFiles)
- }
-}
diff --git a/frontend/src/app/applications/files/services/files.service.ts b/frontend/src/app/applications/files/services/files.service.ts
index d0baef9d..975e9405 100644
--- a/frontend/src/app/applications/files/services/files.service.ts
+++ b/frontend/src/app/applications/files/services/files.service.ts
@@ -267,14 +267,12 @@ export class FilesService {
}
}
- loadRecents(limit: number) {
+ loadRecents() {
this.http
- .get<FileRecent[]>(API_FILES_RECENTS, { params: new HttpParams().set('limit', limit) })
+ .get<FileRecent[]>(API_FILES_RECENTS)
.pipe(map((fs) => fs.map((f) => new FileRecentModel(f))))
.subscribe({
- next: (fs: FileRecentModel[]) => {
- this.store.filesRecents.update((files) => [...fs, ...files.slice(limit)])
- },
+ next: (fs: FileRecentModel[]) => this.store.filesRecents.set(fs),
error: (e: HttpErrorResponse) => this.layout.sendNotification('error', 'Files', 'Unable to load', e)
})
}
diff --git a/frontend/src/app/applications/recents/components/recents.component.html b/frontend/src/app/applications/recents/components/recents.component.html
index c8c26678..911facb5 100644
--- a/frontend/src/app/applications/recents/components/recents.component.html
+++ b/frontend/src/app/applications/recents/components/recents.component.html
@@ -1,10 +1,157 @@
-<div appAutoResize class="recents-dashboard" [useMaxHeight]="false" [resizeOffset]="40">
- <div class="row recents-grid g-3">
- <div class="col-md-6">
- <app-files-recents-widget></app-files-recents-widget>
- </div>
- <div class="col-md-6">
- <app-comments-recents-widget></app-comments-recents-widget>
+<div appAutoResize [useMaxHeight]="false" [resizeOffset]="40">
+ <div class="recents-timeline" [class.recents-timeline--with-content]="groups().length > 0">
+ <div class="recents-timeline__filters" role="group" aria-label="Filter recents">
+ <button
+ type="button"
+ class="recents-filter"
+ [class.active]="activeFilter() === 'all'"
+ [attr.aria-pressed]="activeFilter() === 'all'"
+ (click)="activeFilter.set('all')"
+ l10nTranslate
+ >
+ All
+ </button>
+ <button
+ type="button"
+ class="recents-filter"
+ [class.active]="activeFilter() === 'file'"
+ [attr.aria-pressed]="activeFilter() === 'file'"
+ (click)="activeFilter.set('file')"
+ l10nTranslate
+ >
+ Files
+ </button>
+ <button
+ type="button"
+ class="recents-filter"
+ [class.active]="activeFilter() === 'comment'"
+ [attr.aria-pressed]="activeFilter() === 'comment'"
+ (click)="activeFilter.set('comment')"
+ l10nTranslate
+ >
+ Comments
+ </button>
</div>
+
+ @if (groups().length) {
+ <div class="recents-days">
+ @for (group of groups(); track group.key) {
+ <section class="recents-day">
+ <div class="recents-day__label">
+ <span class="recents-day__date">
+ @switch (group.period) {
+ @case ('today') {
+ <span l10nTranslate>Today</span>
+ }
+ @case ('yesterday') {
+ <span l10nTranslate>Yesterday</span>
+ }
+ @case ('week') {
+ <span l10nTranslate>This week</span>
+ }
+ @default {
+ {{ group.date | amLiveTimeAgo }}
+ }
+ }
+ </span>
+ <span class="recents-day__range">
+ @if (group.period === 'week') {
+ <time [attr.datetime]="group.startDate | date: 'yyyy-MM-dd'">
+ {{ group.startDate | l10nDate: locale.language : { day: 'numeric', month: 'short' } }}
+ </time>
+ <span aria-hidden="true">–</span>
+ <time [attr.datetime]="group.endDate | date: 'yyyy-MM-dd'">
+ {{ group.endDate | l10nDate: locale.language : { day: 'numeric', month: 'short' } }}
+ </time>
+ } @else if (group.period === 'older') {
+ <time [attr.datetime]="group.startDate | date: 'yyyy-MM'">
+ {{ group.startDate | l10nDate: locale.language : { month: 'long', year: 'numeric' } }}
+ </time>
+ } @else {
+ <time [attr.datetime]="group.startDate | date: 'yyyy-MM-dd'">
+ {{ group.startDate | l10nDate: locale.language : { dateStyle: 'full' } }}
+ </time>
+ }
+ </span>
+ </div>
+
+ <div class="recents-day__grid">
+ @for (item of group.items; track item.key; let itemIndex = $index) {
+ <button
+ type="button"
+ class="recent-card"
+ [class.recent-card--comment]="item.kind === 'comment'"
+ [style.animation-delay.ms]="itemIndex * 18"
+ (click)="goToItem(item)"
+ >
+ <span
+ class="badge badge-small recent-card__badge"
+ [class.bg-primary]="item.kind === 'file'"
+ [class.bg-success]="item.kind === 'comment'"
+ >
+ @if (item.kind === 'file') {
+ <svg [lucideIcon]="icons.LucideFileText" aria-hidden="true"></svg>
+ <span class="visually-hidden" l10nTranslate>File</span>
+ } @else {
+ <svg [lucideIcon]="icons.LucideMessageSquareMore" aria-hidden="true"></svg>
+ <span class="visually-hidden" l10nTranslate>Comments</span>
+ }
+ </span>
+
+ <span class="recent-card__top">
+ <span class="recent-card__media">
+ @if (item.kind === 'file') {
+ <img
+ class="recent-card__file-icon"
+ [src]="item.file.mimeUrl"
+ alt=""
+ (error)="item.file.fallBackMimeUrl()"
+ />
+ } @else {
+ <app-user-avatar [user]="item.comment.author" [height]="38" [width]="38" [container]="'body'"></app-user-avatar>
+ }
+ </span>
+
+ <span class="recent-card__summary">
+ @if (item.kind === 'file') {
+ <span class="recent-card__title">
+ {{ item.file.name }}
+ </span>
+ } @else {
+ <span class="recent-card__comment">
+ {{ item.comment.content }}
+ </span>
+ }
+ <span class="recent-card__time">{{ item.timestamp | amLiveTimeAgo }}</span>
+ </span>
+ </span>
+
+ <span class="recent-card__content">
+ <span class="recent-card__meta">
+ <app-file-location [location]="item.kind === 'file' ? item.file : item.comment"></app-file-location>
+ </span>
+ </span>
+ </button>
+ }
+ </div>
+ </section>
+ }
+ </div>
+ } @else {
+ <div class="recents-timeline__empty">
+ @if (activeFilter() !== 'comment') {
+ <div>
+ <svg [lucideIcon]="icons.LucideFileText"></svg>
+ <span l10nTranslate>No recent files</span>
+ </div>
+ }
+ @if (activeFilter() !== 'file') {
+ <div>
+ <svg [lucideIcon]="icons.LucideMessageSquareMore"></svg>
+ <span l10nTranslate>No recent comments</span>
+ </div>
+ }
+ </div>
+ }
</div>
</div>
diff --git a/frontend/src/app/applications/recents/components/recents.component.ts b/frontend/src/app/applications/recents/components/recents.component.ts
index 3b16176b..225d9a7a 100644
--- a/frontend/src/app/applications/recents/components/recents.component.ts
+++ b/frontend/src/app/applications/recents/components/recents.component.ts
@@ -1,20 +1,117 @@
-import { Component, inject } from '@angular/core'
+import { DatePipe } from '@angular/common'
+import { ChangeDetectionStrategy, Component, computed, inject, signal } from '@angular/core'
+import { Router } from '@angular/router'
+import { LucideDynamicIcon, LucideFileText, LucideMessageSquareMore } from '@lucide/angular'
+import { L10N_LOCALE, L10nDatePipe, type L10nLocale, L10nTranslateDirective } from 'angular-l10n'
import { AutoResizeDirective } from '../../../common/directives/auto-resize.directive'
+import { LiveTimeAgoPipe } from '../../../common/pipes/time-ago-live.pipe'
+import { dJs } from '../../../common/utils/time'
+import { TAB_MENU } from '../../../layout/layout.interfaces'
import { LayoutService } from '../../../layout/layout.service'
-import { CommentsRecentsWidgetComponent } from '../../comments/components/widgets/comments-recents-widget.component'
-import { FilesRecentsWidgetComponent } from '../../files/components/widgets/files-recents-widget.component'
+import { StoreService } from '../../../store/store.service'
+import { CommentsService } from '../../comments/services/comments.service'
+import { FileLocationComponent } from '../../files/components/utils/file-location.component'
+import { FilesService } from '../../files/services/files.service'
+import { SPACES_PATH } from '../../spaces/spaces.constants'
+import { UserAvatarComponent } from '../../users/components/utils/user-avatar.component'
+import type { RecentsTimelineFilter, RecentsTimelineGroup, RecentsTimelineItem } from '../interfaces/recents-timeline.interface'
import { RECENTS_ICON, RECENTS_PATH, RECENTS_TITLE } from '../recents.constants'
@Component({
selector: 'app-recents',
- imports: [AutoResizeDirective, FilesRecentsWidgetComponent, CommentsRecentsWidgetComponent],
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ imports: [
+ AutoResizeDirective,
+ DatePipe,
+ FileLocationComponent,
+ L10nDatePipe,
+ L10nTranslateDirective,
+ LiveTimeAgoPipe,
+ LucideDynamicIcon,
+ UserAvatarComponent
+ ],
templateUrl: './recents.component.html'
})
export class RecentsComponent {
+ protected readonly icons = { LucideFileText, LucideMessageSquareMore }
+ protected readonly activeFilter = signal<RecentsTimelineFilter>('all')
+ private readonly router = inject(Router)
private readonly layout = inject(LayoutService)
+ private readonly store = inject(StoreService)
+ private readonly filesService = inject(FilesService)
+ private readonly commentsService = inject(CommentsService)
+ protected readonly locale = inject<L10nLocale>(L10N_LOCALE)
+
+ protected readonly groups = computed<RecentsTimelineGroup[]>(() => {
+ const activeFilter = this.activeFilter()
+ const today = dJs().startOf('day')
+ const yesterday = today.subtract(1, 'day')
+ const weekStart = today.startOf('week')
+ const items: RecentsTimelineItem[] = [
+ ...this.store.filesRecents().map((file) => ({ key: `file-${file.id}`, kind: 'file' as const, timestamp: dJs(file.mtime).valueOf(), file })),
+ ...this.store
+ .commentsRecents()
+ .map((comment) => ({ key: `comment-${comment.id}`, kind: 'comment' as const, timestamp: dJs(comment.modifiedAt).valueOf(), comment }))
+ ]
+ .filter((item) => Number.isFinite(item.timestamp))
+ .filter((item) => activeFilter === 'all' || item.kind === activeFilter)
+ .sort((a, b) => b.timestamp - a.timestamp || a.key.localeCompare(b.key))
+
+ const groups = new Map<string, RecentsTimelineGroup>()
+ for (const item of items) {
+ const day = dJs(item.timestamp).startOf('day')
+ let key: string
+ let period: RecentsTimelineGroup['period']
+ let startDate: number
+ let endDate: number
+
+ if (day.isSame(today, 'day')) {
+ key = 'today'
+ period = 'today'
+ startDate = today.valueOf()
+ endDate = today.valueOf()
+ } else if (day.isSame(yesterday, 'day')) {
+ key = 'yesterday'
+ period = 'yesterday'
+ startDate = yesterday.valueOf()
+ endDate = yesterday.valueOf()
+ } else if (!day.isBefore(weekStart, 'day')) {
+ key = 'week'
+ period = 'week'
+ startDate = weekStart.valueOf()
+ endDate = today.valueOf()
+ } else {
+ const month = day.startOf('month')
+ key = `older-${month.format('YYYY-MM')}`
+ period = 'older'
+ startDate = month.valueOf()
+ endDate = month.endOf('month').valueOf()
+ }
+
+ const group = groups.get(key)
+ if (group) {
+ group.items.push(item)
+ } else {
+ groups.set(key, { key, date: item.timestamp, startDate, endDate, period, items: [item] })
+ }
+ }
+ return [...groups.values()]
+ })
constructor() {
this.layout.setBreadcrumbIcon(RECENTS_ICON)
this.layout.setBreadcrumbNav({ url: `/${RECENTS_PATH.BASE}/${RECENTS_TITLE}`, translating: true, sameLink: true })
+ this.filesService.loadRecents()
+ this.commentsService.loadRecents()
+ }
+
+ protected goToItem(item: RecentsTimelineItem) {
+ const target = item.kind === 'file' ? item.file : item.comment.file
+ this.router
+ .navigate([SPACES_PATH.SPACES, ...target.path.split('/')], { queryParams: { select: target.name } })
+ .then((navigated) => {
+ if (navigated && item.kind === 'comment') this.layout.showRSideBarTab(TAB_MENU.COMMENTS, true)
+ })
+ .catch(console.error)
}
}
diff --git a/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.html b/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.html
deleted file mode 100644
index cf53db42..00000000
--- a/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="row">
- @if (userService.userHavePermission(USER_PERMISSION.PERSONAL_SPACE)) {
- <div class="col">
- <div [routerLink]="[SPACES_PATH.PERSONAL_FILES]" [relativeTo]="null" class="small-box">
- <div class="inner">
- <p l10nTranslate>{{ SPACES_TITLE.PERSONAL_SPACE }}</p>
- </div>
- <div class="icon text-primary">
- <svg [lucideIcon]="SPACES_ICON.PERSONAL"></svg>
- </div>
- </div>
- </div>
- }
- @if (userService.userHavePermission(USER_PERMISSION.SPACES)) {
- <div class="col">
- <div [routerLink]="[SPACES_PATH.SPACES]" [relativeTo]="null" class="small-box">
- <div class="inner">
- <p l10nTranslate>{{ SPACES_TITLE.COLLABORATIVE_SPACES }}</p>
- </div>
- <div class="icon text-primary">
- <svg [lucideIcon]="SPACES_ICON.SPACES"></svg>
- </div>
- </div>
- </div>
- }
- @if (userService.userHavePermission(USER_PERMISSION.SHARES)) {
- <div class="col">
- <div [routerLink]="[SPACES_PATH.SPACES_SHARES]" [relativeTo]="null" class="small-box">
- <div class="inner">
- <p l10nTranslate>{{ SPACES_TITLE.SHARED_WITH_ME }}</p>
- </div>
- <div class="icon text-purple">
- <svg [lucideIcon]="SPACES_ICON.SHARED_WITH_ME"></svg>
- </div>
- </div>
- </div>
- }
- @if (userService.userHavePermission(USER_PERMISSION.SHARES_ADMIN)) {
- <div class="col">
- <div [routerLink]="[SPACES_PATH.SHARED]" [relativeTo]="null" class="small-box">
- <div class="inner">
- <p l10nTranslate>{{ SPACES_TITLE.SHARED_WITH_OTHER }}</p>
- </div>
- <div class="icon text-purple">
- <svg [lucideIcon]="SPACES_ICON.SHARED_WITH_OTHERS"></svg>
- </div>
- </div>
- </div>
- }
-</div>
diff --git a/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.ts b/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.ts
deleted file mode 100644
index b00389b3..00000000
--- a/frontend/src/app/applications/recents/components/widgets/recents-apps-widget.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Component, inject } from '@angular/core'
-import { RouterLink } from '@angular/router'
-import { LucideDynamicIcon } from '@lucide/angular'
-import { USER_PERMISSION } from '@sync-in-server/backend/src/applications/users/constants/user'
-import { L10nTranslateDirective } from 'angular-l10n'
-import { SPACES_ICON, SPACES_PATH, SPACES_TITLE } from '../../../spaces/spaces.constants'
-import { UserService } from '../../../users/user.service'
-
-@Component({
- selector: 'app-recents-apps-widget',
- imports: [RouterLink, LucideDynamicIcon, L10nTranslateDirective],
- templateUrl: './recents-apps-widget.component.html'
-})
-export class RecentsAppsWidgetComponent {
- protected readonly userService = inject(UserService)
- protected readonly USER_PERMISSION = USER_PERMISSION
- protected readonly SPACES_ICON = SPACES_ICON
- protected readonly SPACES_PATH = SPACES_PATH
- protected readonly SPACES_TITLE = SPACES_TITLE
-}
diff --git a/frontend/src/app/applications/recents/interfaces/recents-timeline.interface.ts b/frontend/src/app/applications/recents/interfaces/recents-timeline.interface.ts
new file mode 100644
index 00000000..fa151f1a
--- /dev/null
+++ b/frontend/src/app/applications/recents/interfaces/recents-timeline.interface.ts
@@ -0,0 +1,29 @@
+import type { CommentRecentModel } from '../../comments/models/comment-recent.model'
+import type { FileRecentModel } from '../../files/models/file-recent.model'
+
+export interface RecentsTimelineFileItem {
+ key: string
+ kind: 'file'
+ timestamp: number
+ file: FileRecentModel
+}
+
+export interface RecentsTimelineCommentItem {
+ key: string
+ kind: 'comment'
+ timestamp: number
+ comment: CommentRecentModel
+}
+
+export type RecentsTimelineItem = RecentsTimelineFileItem | RecentsTimelineCommentItem
+export type RecentsTimelineFilter = 'all' | RecentsTimelineItem['kind']
+export type RecentsTimelinePeriod = 'today' | 'yesterday' | 'week' | 'older'
+
+export interface RecentsTimelineGroup {
+ key: string
+ date: number
+ startDate: number
+ endDate: number
+ period: RecentsTimelinePeriod
+ items: RecentsTimelineItem[]
+}
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index 98bec14c..b090e1d9 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -53,6 +53,10 @@
"Notification": "Benachrichtigung",
"Notifications": "Benachrichtigungen",
"Event": "Ereignis",
+ "All": "Alle",
+ "Today": "Heute",
+ "Yesterday": "Gestern",
+ "This week": "Diese Woche",
"File": "Datei",
"Files": "Dateien",
"Personal space": "Persönlicher Bereich",
diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json
index 912f8725..89efee94 100644
--- a/frontend/src/i18n/es.json
+++ b/frontend/src/i18n/es.json
@@ -53,6 +53,10 @@
"Notification": "Notificación",
"Notifications": "Notificaciones",
"Event": "Evento",
+ "All": "Todo",
+ "Today": "Hoy",
+ "Yesterday": "Ayer",
+ "This week": "Esta semana",
"File": "Archivo",
"Files": "Archivos",
"Personal space": "Espacio personal",
diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json
index 32346711..0226350c 100644
--- a/frontend/src/i18n/fr.json
+++ b/frontend/src/i18n/fr.json
@@ -53,6 +53,10 @@
"Notification": "Notification",
"Notifications": "Notifications",
"Event": "Évènement",
+ "All": "Tout",
+ "Today": "Aujourd’hui",
+ "Yesterday": "Hier",
+ "This week": "Cette semaine",
"File": "Fichier",
"Files": "Fichiers",
"Personal space": "Espace personnel",
diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.json
index bbbb65d3..948ba7f7 100644
--- a/frontend/src/i18n/hi.json
+++ b/frontend/src/i18n/hi.json
@@ -53,6 +53,10 @@
"Notification": "सूचना",
"Notifications": "सूचनाएँ",
"Event": "घटना",
+ "All": "सभी",
+ "Today": "आज",
+ "Yesterday": "कल",
+ "This week": "इस सप्ताह",
"File": "फ़ाइल",
"Files": "फ़ाइलें",
"Personal space": "व्यक्तिगत स्थान",
diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json
index de5394e5..edc8834e 100644
--- a/frontend/src/i18n/it.json
+++ b/frontend/src/i18n/it.json
@@ -53,6 +53,10 @@
"Notification": "Notifica",
"Notifications": "Notifiche",
"Event": "Evento",
+ "All": "Tutto",
+ "Today": "Oggi",
+ "Yesterday": "Ieri",
+ "This week": "Questa settimana",
"File": "File",
"Files": "File",
"Personal space": "Spazio personale",
diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json
index 11165142..922250e0 100644
--- a/frontend/src/i18n/ja.json
+++ b/frontend/src/i18n/ja.json
@@ -53,6 +53,10 @@
"Notification": "通知",
"Notifications": "通知",
"Event": "イベント",
+ "All": "すべて",
+ "Today": "今日",
+ "Yesterday": "昨日",
+ "This week": "今週",
"File": "ファイル",
"Files": "ファイル",
"Personal space": "個人スペース",
diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json
index 748b624d..87ec66d9 100644
--- a/frontend/src/i18n/ko.json
+++ b/frontend/src/i18n/ko.json
@@ -53,6 +53,10 @@
"Notification": "알림",
"Notifications": "알림",
"Event": "이벤트",
+ "All": "전체",
+ "Today": "오늘",
+ "Yesterday": "어제",
+ "This week": "이번 주",
"File": "파일",
"Files": "파일",
"Personal space": "개인 공간",
diff --git a/frontend/src/i18n/nl.json b/frontend/src/i18n/nl.json
index b78cf9f5..65bf2db2 100644
--- a/frontend/src/i18n/nl.json
+++ b/frontend/src/i18n/nl.json
@@ -53,6 +53,10 @@
"Notification": "Melding",
"Notifications": "Meldingen",
"Event": "Gebeurtenis",
+ "All": "Alles",
+ "Today": "Vandaag",
+ "Yesterday": "Gisteren",
+ "This week": "Deze week",
"File": "Bestand",
"Files": "Bestanden",
"Personal space": "Persoonlijke ruimte",
diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json
index e1622832..068688bf 100644
--- a/frontend/src/i18n/pl.json
+++ b/frontend/src/i18n/pl.json
@@ -53,6 +53,10 @@
"Notification": "Powiadomienie",
"Notifications": "Powiadomienia",
"Event": "Zdarzenie",
+ "All": "Wszystko",
+ "Today": "Dzisiaj",
+ "Yesterday": "Wczoraj",
+ "This week": "W tym tygodniu",
"File": "Plik",
"Files": "Pliki",
"Personal space": "Przestrzeń osobista",
diff --git a/frontend/src/i18n/pt-BR.json b/frontend/src/i18n/pt-BR.json
index 61556d82..1c2f37e7 100644
--- a/frontend/src/i18n/pt-BR.json
+++ b/frontend/src/i18n/pt-BR.json
@@ -53,6 +53,10 @@
"Notification": "Notificação",
"Notifications": "Notificações",
"Event": "Evento",
+ "All": "Tudo",
+ "Today": "Hoje",
+ "Yesterday": "Ontem",
+ "This week": "Esta semana",
"File": "Arquivo",
"Files": "Arquivos",
"Personal space": "Espaço pessoal",
diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json
index bf59d1b5..41ceb5b4 100644
--- a/frontend/src/i18n/pt.json
+++ b/frontend/src/i18n/pt.json
@@ -53,6 +53,10 @@
"Notification": "Notificação",
"Notifications": "Notificações",
"Event": "Evento",
+ "All": "Tudo",
+ "Today": "Hoje",
+ "Yesterday": "Ontem",
+ "This week": "Esta semana",
"File": "Arquivo",
"Files": "Arquivos",
"Personal space": "Espaço pessoal",
diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json
index e7875d1c..bd9f6ff3 100644
--- a/frontend/src/i18n/ru.json
+++ b/frontend/src/i18n/ru.json
@@ -53,6 +53,10 @@
"Notification": "Уведомление",
"Notifications": "Уведомления",
"Event": "Событие",
+ "All": "Все",
+ "Today": "Сегодня",
+ "Yesterday": "Вчера",
+ "This week": "На этой неделе",
"File": "Файл",
"Files": "Файлы",
"Personal space": "Личное пространство",
diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json
index 48783c9f..23756997 100644
--- a/frontend/src/i18n/tr.json
+++ b/frontend/src/i18n/tr.json
@@ -53,6 +53,10 @@
"Notification": "Bildirim",
"Notifications": "Bildirimler",
"Event": "Olay",
+ "All": "Tümü",
+ "Today": "Bugün",
+ "Yesterday": "Dün",
+ "This week": "Bu hafta",
"File": "Dosya",
"Files": "Dosyalar",
"Personal space": "Kişisel alan",
diff --git a/frontend/src/i18n/zh.json b/frontend/src/i18n/zh.json
index 4840028c..2be7c11b 100644
--- a/frontend/src/i18n/zh.json
+++ b/frontend/src/i18n/zh.json
@@ -53,6 +53,10 @@
"Notification": "通知",
"Notifications": "通知",
"Event": "事件",
+ "All": "全部",
+ "Today": "今天",
+ "Yesterday": "昨天",
+ "This week": "本周",
"File": "文件",
"Files": "文件",
"Personal space": "个人空间",
diff --git a/frontend/src/styles/components/_boxes.scss b/frontend/src/styles/components/_boxes.scss
index 84af552f..b659e15a 100644
--- a/frontend/src/styles/components/_boxes.scss
+++ b/frontend/src/styles/components/_boxes.scss
@@ -29,12 +29,6 @@
}
}
-.recents-grid {
- padding: 5px;
- row-gap: 16px;
-}
-
-
.box-header {
display: flex;
align-items: center;
diff --git a/frontend/src/styles/components/_recents.scss b/frontend/src/styles/components/_recents.scss
index 8e5a6c0d..f19759be 100644
--- a/frontend/src/styles/components/_recents.scss
+++ b/frontend/src/styles/components/_recents.scss
@@ -1,168 +1,343 @@
-.recents-dashboard {
- padding: .4rem;
-}
+@mixin recents-theme(
+ $surface,
+ $surface-muted,
+ $surface-hover,
+ $empty-background,
+ $empty-text,
+ $border,
+ $border-hover,
+ $text,
+ $muted,
+ $primary-soft,
+ $card-shadow,
+ $card-hover-shadow
+) {
+ app-recents {
+ .recents-timeline__filters {
+ border-color: $border;
+ background: $surface-muted;
+ }
-.recents-grid {
- margin-left: 0;
- margin-right: 0;
-}
+ .recents-filter {
+ color: $muted;
-.recents-widget-card {
- position: relative;
- width: 100%;
- border: 1px solid;
- border-radius: $border-radius;
- overflow: hidden;
- transition: box-shadow 0.14s ease;
-}
+ &:hover,
+ &:focus-visible,
+ &.active {
+ color: $text;
+ background: $primary-soft;
+ }
+ }
-.recents-widget-card__header {
- display: flex;
- align-items: center;
- justify-content: space-between;
- gap: 0.78rem;
- padding: 0.34rem 0.66rem;
- border-bottom: 1px solid;
-}
+ .recents-day__date,
+ .recents-day__range,
+ .recent-card__time,
+ .recent-card__meta {
+ color: $muted;
+ }
-.recents-widget-card__title-wrap {
- display: flex;
- align-items: center;
- min-width: 0;
- gap: 0.58rem;
-}
+ .recent-card {
+ color: $text;
+ border-color: $border;
+ background: $surface;
+ box-shadow: 0 2px 6px $card-shadow;
-.recents-widget-card__title-icon {
- width: 2.05rem;
- height: 2.05rem;
- border-radius: 0.6rem;
- display: inline-flex;
- align-items: center;
- justify-content: center;
- font-size: $font-size-base;
-}
+ &:hover,
+ &:focus-visible {
+ border-color: $border-hover;
+ background: $surface-hover;
+ box-shadow: 0 4px 10px $card-hover-shadow;
+ }
+ }
-.recents-widget-card__title {
- display: inline-block;
- line-height: 1.05;
- font-size: $font-size-sm;
- font-weight: 500;
- user-select: none;
-}
+ .recent-card__media {
+ border-color: $border;
+ background: $surface-muted;
+ }
-.recents-widget-card__toggle {
- width: 2rem;
- height: 2rem;
- border-radius: 0.6rem;
- border: 1px solid transparent;
- background: transparent;
- color: inherit;
- font: inherit;
- appearance: none;
- display: inline-flex;
- align-items: center;
- justify-content: center;
- cursor: pointer;
- font-size: $font-size-base;
+ .recents-timeline__empty {
+ color: $empty-text;
+ border-color: $border;
+ background: $empty-background;
+ }
+ }
}
-.recents-widget-card__title-icon,
-.recents-widget-card__toggle {
- > .lucide {
- font-size: $font-size-xl;
+app-recents {
+ display: block;
+
+ .recents-timeline {
+ width: min(100%, 76rem);
+ margin: 0 auto;
+ padding: 0.55rem 0.7rem 1.25rem;
}
-}
-.recents-widget-card__body {
- padding: 0.48rem 0.48rem 0.52rem;
-}
+ .recents-timeline--with-content {
+ position: relative;
-.recent-item-card {
- width: 100%;
- border: 1px solid transparent;
- border-radius: 0.68rem;
- background: transparent;
- color: inherit;
- font: inherit;
- appearance: none;
- padding: 0.42rem 0.5rem;
- display: grid;
- grid-template-columns: 2rem minmax(0, 1fr) max-content;
- align-items: center;
- gap: 0.54rem;
- text-align: left;
- cursor: pointer;
- animation: recent-card-enter 0.26s ease both;
- transition: transform 0.2s ease, box-shadow 0.2s ease, border-color 0.2s ease, background-color 0.2s ease;
-
- + .recent-item-card {
- margin-top: 0.34rem;
+ > .recents-timeline__filters {
+ position: absolute;
+ top: 0.55rem;
+ right: 0.7rem;
+ }
+
+ .recents-day:first-child .recents-day__label {
+ min-height: 1.9rem;
+ padding-right: 19rem;
+ }
}
-}
-.recent-item-card:hover {
- transform: translateY(-1px);
-}
+ .recents-timeline__filters {
+ width: fit-content;
+ height: 1.9rem;
+ margin: 0 0 0 auto;
+ padding: 0.15rem;
+ display: flex;
+ align-items: center;
+ gap: 0.3rem;
+ border: 1px solid;
+ border-radius: $nav-pills-border-radius;
+ }
-.recent-item-card__media {
- width: 2rem;
- height: 2rem;
-}
+ .recents-filter {
+ min-width: 4.2rem;
+ height: 1.5rem;
+ padding: 0 0.68rem;
+ border: 0;
+ border-radius: $border-radius;
+ background: transparent;
+ font-size: $font-size-xs;
+ font-weight: 500;
+ line-height: 1;
+ cursor: pointer;
+ transition: color 0.15s ease, background-color 0.15s ease;
-.recent-item-card__content {
- min-width: 0;
- display: flex;
- flex-direction: column;
- gap: 0.1rem;
-}
+ &:focus-visible {
+ outline: 2px solid rgba($primary, 0.4);
+ outline-offset: 1px;
+ }
+ }
-.recent-item-card__title {
- line-height: 1.2;
- font-size: $font-size-base;
- font-weight: 400;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
+ .recents-days {
+ display: flex;
+ flex-direction: column;
+ gap: 1.4rem;
+ }
-.recent-item-card__path {
- line-height: 1.15;
- font-size: $font-size-xs;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
+ .recents-day__label {
+ display: flex;
+ flex-direction: column;
+ gap: 0.16rem;
+ margin-bottom: 0.72rem;
+ }
-.recent-item-card__time {
- white-space: nowrap;
- font-size: $font-size-xs;
- line-height: 1;
- margin-left: 0.38rem;
- min-width: 5.05rem;
- text-align: right;
- padding-top: 0.04rem;
-}
+ .recents-day__date {
+ font-size: $font-size-xs;
+ font-weight: 700;
+ line-height: 1.2;
+ letter-spacing: 0.035em;
+ text-transform: uppercase;
+ }
+
+ .recents-day__range {
+ display: flex;
+ align-items: center;
+ gap: 0.22rem;
+ font-size: $font-size-2xs;
+ line-height: 1.2;
+ opacity: 0.78;
+ text-transform: capitalize;
+ }
+
+ .recents-day__grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(min(100%, 15rem), 1fr));
+ gap: 0.72rem;
+ }
+
+ .recent-card {
+ position: relative;
+ width: 100%;
+ min-width: 0;
+ min-height: 5.20rem;
+ padding: 0.65rem 0.7rem;
+ display: flex;
+ flex-direction: column;
+ border: 1px solid;
+ border-radius: $nav-tabs-border-radius;
+ text-align: left;
+ appearance: none;
+ cursor: pointer;
+ animation: recent-card-enter 0.24s ease both;
+ transition: background-color 0.16s ease, border-color 0.16s ease, box-shadow 0.16s ease, transform 0.16s ease;
-.recent-empty-state {
- min-height: 142px;
- border-radius: 0.65rem;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- text-align: center;
- padding: 0.85rem;
+ &:hover,
+ &:focus-visible {
+ transform: translateY(-1px);
+ }
- > .lucide {
- font-size: 1.5rem;
+ &:focus-visible {
+ outline: 2px solid rgba($primary, 0.4);
+ outline-offset: 2px;
+ }
+ }
+
+ .recent-card__top {
+ min-width: 0;
+ padding-right: 2.1rem;
+ display: flex;
+ align-items: center;
+ gap: 0.7rem;
+ }
+
+ .recent-card__media {
+ width: 2.4rem;
+ height: 2.4rem;
+ display: grid;
+ flex: 0 0 auto;
+ place-items: center;
+ overflow: hidden;
+ border: 1px solid;
+ border-radius: $nav-pills-border-radius;
+
+ app-user-avatar {
+ display: grid;
+ place-items: center;
+ }
+ }
+
+ .recent-card__file-icon {
+ width: 1.45rem;
+ height: 1.45rem;
+ object-fit: contain;
+ }
+
+ .recent-card__summary {
+ min-width: 0;
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+ align-items: flex-start;
+ gap: 0.22rem;
+ }
+
+ .recent-card__badge {
+ position: absolute;
+ top: 0.65rem;
+ right: 0.7rem;
+ }
+
+ .recent-card__time {
+ font-size: $font-size-2xs;
+ line-height: 1;
+ white-space: nowrap;
+ }
+
+ .recent-card__content {
+ min-width: 0;
+ margin-top: auto;
+ display: flex;
+ flex-direction: column;
+ gap: 0.3rem;
+ }
+
+ .recent-card__title,
+ .recent-card__comment {
+ width: 100%;
+ min-width: 0;
+ overflow: hidden;
+ font-weight: 550;
+ line-height: 1.25;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
+ .recent-card__title {
+ font-size: $font-size-base;
+ }
+
+ .recent-card__meta {
+ min-width: 0;
+ font-size: $font-size-2xs;
+ line-height: 1.15;
+ }
+
+ .recent-card--comment {
+ .recent-card__comment {
+ font-size: $font-size-sm;
+ white-space: normal;
+ overflow-wrap: break-word;
+ }
+
+ .recent-card__media {
+ overflow: visible;
+ border: 0;
+ background: transparent;
+ }
+ }
+
+ .recents-timeline__empty {
+ min-height: 12rem;
+ padding: 1.25rem;
+ display: grid;
+ place-content: center;
+ gap: 2rem;
+ border: 1px dashed;
+ border-radius: $nav-tabs-border-radius;
+ text-align: center;
+ margin-top: 1.125rem;
+
+ > div {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.3rem;
+ font-size: $font-size-md;
+
+ > .lucide {
+ font-size: $font-size-xl;
+ }
+ }
+ }
+
+ @media (max-width: 767.98px) {
+ .recents-timeline {
+ padding-right: 0.35rem;
+ padding-left: 0.35rem;
+ }
+
+ .recents-timeline__filters {
+ width: 100%;
+ }
+
+ .recents-timeline--with-content {
+ > .recents-timeline__filters {
+ position: static;
+ }
+
+ .recents-day:first-child .recents-day__label {
+ min-height: 0;
+ padding-right: 0;
+ }
+ }
+
+ .recents-filter {
+ min-width: 0;
+ flex: 1;
+ }
+
+ .recents-day__grid {
+ grid-template-columns: minmax(0, 1fr);
+ }
}
}
@keyframes recent-card-enter {
from {
opacity: 0;
- transform: translateY(5px);
+ transform: translateY(4px);
}
+
to {
opacity: 1;
transform: translateY(0);
diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scss
index cba6abc5..e38c77e8 100755
--- a/frontend/src/styles/components/_theme_dark.scss
+++ b/frontend/src/styles/components/_theme_dark.scss
@@ -655,74 +655,6 @@
}
}
- app-files-recents-widget,
- app-comments-recents-widget {
- .recents-widget-card {
- border-color: rgba($dark-surface-border, 0.82);
- box-shadow: 0 12px 26px rgba($black, 0.3);
- background: linear-gradient(180deg, rgba(lighten($dark-surface-bg, 4%), 0.98) 0%, rgba($dark-bg-theme, 0.97) 100%);
- }
-
- .recents-widget-card__header {
- border-bottom-color: rgba($dark-surface-border, 0.7);
- background: lighten($sidebar-dark-apps-menu-title-bg, 4%);
- }
-
- .recents-widget-card__title {
- color: $dark-item-hover-color;
- }
-
- .recents-widget-card__title-icon {
- color: $dark-item-hover-color;
- background: rgba(lighten($dark-bg-theme, 4%), 0.78);
- border: 1px solid rgba($dark-surface-border, 0.58);
- }
-
- .recents-widget-card__toggle {
- color: $dark-item-color;
- background: rgba(lighten($dark-bg-theme, 5%), 0.8);
- border-color: rgba($dark-surface-border, 0.62);
- }
-
- .recents-widget-card__toggle:hover {
- background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 10%), 0.9);
- color: $dark-item-hover-color;
- }
-
- .recents-widget-card__body {
- background: linear-gradient(180deg, rgba(darken($dark-bg-theme, 1%), 0.8) 0%, rgba(darken($dark-bg-theme, 4%), 0.9) 100%);
- }
-
- .recent-item-card {
- background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 5%), 0.92);
- border-color: rgba($dark-surface-border, 0.7);
- box-shadow: 0 6px 14px rgba($black, 0.24);
- }
-
- .recent-item-card:hover {
- border-color: mix($primary, $dark-item-hover-color, 50%);
- background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 8%), 0.96);
- }
-
- .recent-item-card__title {
- color: $dark-item-hover-color;
- }
-
- .recent-item-card__media {
- background: rgba(lighten($dark-bg-theme, 2%), 0.78);
- border: 1px solid rgba($dark-surface-border, 0.56);
- }
-
- .recent-item-card__time {
- color: $theme-muted-blue;
- }
-
- .recent-empty-state {
- background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 4%), 0.8);
- color: $dark-item-color;
- border: 1px dashed rgba($dark-surface-border, 0.62);
- }
- }
.ui-disabled {
background-color: $sidebar-dark-icons-menu-bg !important;
color: $body-color;
@@ -757,6 +689,20 @@
color: $gray-light !important;
background-color: lighten($sidebar-dark-apps-menu-title-bg, 8%) !important;
}
+ @include recents-theme(
+ $surface: $dark-surface-bg,
+ $surface-muted: $dark-bg-theme,
+ $surface-hover: $dark-table-row-hover-bg,
+ $empty-background: rgba(lighten($sidebar-dark-apps-menu-title-bg, 4%), 0.8),
+ $empty-text: $dark-item-color,
+ $border: $dark-surface-border,
+ $border-hover: $dark-dialog-check-card-hover-border-color,
+ $text: $dark-item-hover-color,
+ $muted: $dark-text-muted-color,
+ $primary-soft: rgba($primary, 0.26),
+ $card-shadow: $dark-dialog-tab-card-shadow-color,
+ $card-hover-shadow: $dark-dialog-check-card-hover-shadow-color
+ );
.avatar-img {
background-color: darken($gray-light, 5%);
}
diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scss
index ef6318d4..e59ae1b2 100755
--- a/frontend/src/styles/components/_theme_light.scss
+++ b/frontend/src/styles/components/_theme_light.scss
@@ -635,74 +635,20 @@
.text-bg-light {
background-color: $white !important;
}
- app-files-recents-widget,
- app-comments-recents-widget {
- .recents-widget-card {
- border-color: rgba($light-surface-border, 0.5);
- box-shadow: 0 14px 34px $light-box-transparent-shadow-color;
- background: linear-gradient(160deg, $light-app-top-menu-gradient-end 0%, $light-menu-surface-bg 100%);
- }
-
- .recents-widget-card__header {
- border-bottom-color: rgba($light-surface-border, 0.5);
- background: linear-gradient(125deg, $light-app-top-menu-gradient-start 0%, $theme-light-panel-bg 100%);
- }
-
- .recents-widget-card__title {
- color: lighten($navy, 8%);
- }
-
- .recents-widget-card__title-icon {
- color: darken($primary, 11%);
- background: rgba($white, 0.7);
- border: 1px solid rgba($light-surface-border, 0.4);
- }
-
- .recents-widget-card__toggle {
- color: mix($navy, $primary, 40%);
- background: rgba($white, 0.72);
- border-color: rgba($light-surface-border, 0.48);
- }
-
- .recents-widget-card__toggle:hover {
- color: darken($primary, 8%);
- background: $white;
- }
-
- .recents-widget-card__body {
- background: linear-gradient(180deg, $white 0%, $light-surface-bg 100%);
- }
-
- .recent-item-card {
- background: $white;
- border-color: rgba($light-surface-border, 0.5);
- box-shadow: 0 5px 14px $light-dialog-tab-card-shadow-color;
- }
-
- .recent-item-card:hover {
- border-color: $light-dialog-check-card-hover-border-color;
- box-shadow: 0 10px 22px $light-dialog-check-card-hover-shadow-color;
- }
-
- .recent-item-card__title {
- color: $light-item-color;
- }
-
- .recent-item-card__media {
- background: $gray-lightest;
- border: 1px solid rgba($light-surface-border, 0.42);
- }
-
- .recent-item-card__time {
- color: $light-text-muted-color;
- }
-
- .recent-empty-state {
- background: rgba($light-menu-surface-bg, 0.8);
- color: $light-text-muted-color;
- border: 1px dashed rgba($light-surface-border, 0.52);
- }
- }
+ @include recents-theme(
+ $surface: $white,
+ $surface-muted: $light-surface-bg,
+ $surface-hover: $light-table-row-hover-bg,
+ $empty-background: rgba($light-menu-surface-bg, 0.8),
+ $empty-text: $light-text-muted-color,
+ $border: $light-surface-border,
+ $border-hover: $light-dialog-check-card-hover-border-color,
+ $text: $light-item-color,
+ $muted: $light-text-muted-color,
+ $primary-soft: rgba($primary, 0.12),
+ $card-shadow: $light-dialog-tab-card-shadow-color,
+ $card-hover-shadow: $light-dialog-check-card-hover-shadow-color
+ );
.avatar-img {
background-color: darken($gray-light, 5%);
}