feat(web) Remove fetching fonts from GoogleFonts (#703)
This commit is contained in:
parent
824da6a07b
commit
75c2067836
6 changed files with 15 additions and 4 deletions
|
@ -171,6 +171,7 @@ export class AssetRepository implements IAssetRepository {
|
||||||
.createQueryBuilder('asset')
|
.createQueryBuilder('asset')
|
||||||
.where('asset.userId = :userId', { userId: userId })
|
.where('asset.userId = :userId', { userId: userId })
|
||||||
.andWhere('asset.resizePath is not NULL')
|
.andWhere('asset.resizePath is not NULL')
|
||||||
|
.andWhere('asset.type = :type', { type: AssetType.IMAGE })
|
||||||
.leftJoinAndSelect('asset.exifInfo', 'exifInfo')
|
.leftJoinAndSelect('asset.exifInfo', 'exifInfo')
|
||||||
.orderBy('asset.createdAt', 'DESC');
|
.orderBy('asset.createdAt', 'DESC');
|
||||||
|
|
||||||
|
@ -225,6 +226,7 @@ export class AssetRepository implements IAssetRepository {
|
||||||
where: {
|
where: {
|
||||||
userId: userId,
|
userId: userId,
|
||||||
deviceId: deviceId,
|
deviceId: deviceId,
|
||||||
|
type: AssetType.IMAGE,
|
||||||
},
|
},
|
||||||
select: ['deviceAssetId'],
|
select: ['deviceAssetId'],
|
||||||
});
|
});
|
||||||
|
|
|
@ -15,6 +15,7 @@ import { AppController } from './app.controller';
|
||||||
import { ScheduleModule } from '@nestjs/schedule';
|
import { ScheduleModule } from '@nestjs/schedule';
|
||||||
import { ScheduleTasksModule } from './modules/schedule-tasks/schedule-tasks.module';
|
import { ScheduleTasksModule } from './modules/schedule-tasks/schedule-tasks.module';
|
||||||
import { DatabaseModule } from '@app/database';
|
import { DatabaseModule } from '@app/database';
|
||||||
|
import { AppLoggerMiddleware } from './middlewares/app-logger.middleware';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -64,7 +65,7 @@ export class AppModule implements NestModule {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
configure(consumer: MiddlewareConsumer): void {
|
configure(consumer: MiddlewareConsumer): void {
|
||||||
if (process.env.NODE_ENV == 'development') {
|
if (process.env.NODE_ENV == 'development') {
|
||||||
// consumer.apply(AppLoggerMiddleware).forRoutes('*');
|
consumer.apply(AppLoggerMiddleware).forRoutes('*');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 base;
|
||||||
@tailwind components;
|
@tailwind components;
|
||||||
@tailwind utilities;
|
@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 {
|
:root {
|
||||||
font-family: 'Work Sans', sans-serif;
|
font-family: 'Work Sans', sans-serif;
|
||||||
/* --immich-icon-button-hover-color: #d3d3d3; */
|
/* --immich-icon-button-hover-color: #d3d3d3; */
|
||||||
|
|
BIN
web/static/fonts/SnowburstOne-Regular.ttf
Normal file
BIN
web/static/fonts/SnowburstOne-Regular.ttf
Normal file
Binary file not shown.
BIN
web/static/fonts/WorkSans-Italic-VariableFont_wght.ttf
Normal file
BIN
web/static/fonts/WorkSans-Italic-VariableFont_wght.ttf
Normal file
Binary file not shown.
BIN
web/static/fonts/WorkSans-VariableFont_wght.ttf
Normal file
BIN
web/static/fonts/WorkSans-VariableFont_wght.ttf
Normal file
Binary file not shown.
Loading…
Reference in a new issue