diff --git a/server/apps/immich/src/api-v1/asset/asset-repository.ts b/server/apps/immich/src/api-v1/asset/asset-repository.ts index 3c8863323..ccdcf16a9 100644 --- a/server/apps/immich/src/api-v1/asset/asset-repository.ts +++ b/server/apps/immich/src/api-v1/asset/asset-repository.ts @@ -171,6 +171,7 @@ export class AssetRepository implements IAssetRepository { .createQueryBuilder('asset') .where('asset.userId = :userId', { userId: userId }) .andWhere('asset.resizePath is not NULL') + .andWhere('asset.type = :type', { type: AssetType.IMAGE }) .leftJoinAndSelect('asset.exifInfo', 'exifInfo') .orderBy('asset.createdAt', 'DESC'); @@ -225,6 +226,7 @@ export class AssetRepository implements IAssetRepository { where: { userId: userId, deviceId: deviceId, + type: AssetType.IMAGE, }, select: ['deviceAssetId'], }); diff --git a/server/apps/immich/src/app.module.ts b/server/apps/immich/src/app.module.ts index 16f644c03..ae9172bc7 100644 --- a/server/apps/immich/src/app.module.ts +++ b/server/apps/immich/src/app.module.ts @@ -15,6 +15,7 @@ import { AppController } from './app.controller'; import { ScheduleModule } from '@nestjs/schedule'; import { ScheduleTasksModule } from './modules/schedule-tasks/schedule-tasks.module'; import { DatabaseModule } from '@app/database'; +import { AppLoggerMiddleware } from './middlewares/app-logger.middleware'; @Module({ imports: [ @@ -64,7 +65,7 @@ export class AppModule implements NestModule { // eslint-disable-next-line @typescript-eslint/no-unused-vars configure(consumer: MiddlewareConsumer): void { if (process.env.NODE_ENV == 'development') { - // consumer.apply(AppLoggerMiddleware).forRoutes('*'); + consumer.apply(AppLoggerMiddleware).forRoutes('*'); } } } diff --git a/web/src/app.css b/web/src/app.css index 79baeff7d..46eb231c9 100644 --- a/web/src/app.css +++ b/web/src/app.css @@ -1,10 +1,18 @@ -@import url('https://fonts.googleapis.com/css2?family=Work+Sans:wght@300;400;500;600;700&display=swap'); -@import url('https://fonts.googleapis.com/css2?family=Snowburst+One&display=swap'); - @tailwind base; @tailwind components; @tailwind utilities; +@font-face { + font-family: 'Work Sans'; + src: url('/fonts/WorkSans-VariableFont_wght.ttf') format('truetype-variations'); + font-weight: 1 999; +} + +@font-face { + font-family: 'Snowburst One'; + src: url('/fonts/SnowburstOne-Regular.ttf') format('truetype'); +} + :root { font-family: 'Work Sans', sans-serif; /* --immich-icon-button-hover-color: #d3d3d3; */ diff --git a/web/static/fonts/SnowburstOne-Regular.ttf b/web/static/fonts/SnowburstOne-Regular.ttf new file mode 100644 index 000000000..e29832085 Binary files /dev/null and b/web/static/fonts/SnowburstOne-Regular.ttf differ diff --git a/web/static/fonts/WorkSans-Italic-VariableFont_wght.ttf b/web/static/fonts/WorkSans-Italic-VariableFont_wght.ttf new file mode 100644 index 000000000..03e9671c1 Binary files /dev/null and b/web/static/fonts/WorkSans-Italic-VariableFont_wght.ttf differ diff --git a/web/static/fonts/WorkSans-VariableFont_wght.ttf b/web/static/fonts/WorkSans-VariableFont_wght.ttf new file mode 100644 index 000000000..c8d05412f Binary files /dev/null and b/web/static/fonts/WorkSans-VariableFont_wght.ttf differ