From 2dabfadc0a1c590895a9aa5573f2ba46fce86e7e Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Sat, 25 Nov 2023 12:17:00 +0800 Subject: [PATCH] Add groups admin --- .../src/main/res/values-zh-rCN/strings.xml | 18 +++++++++++++ pkg/admin/src/db.ts | 25 +++++++++++++++++++ pkg/admin/src/index.ts | 2 ++ 3 files changed, 45 insertions(+) diff --git a/android/Omnivore/app/src/main/res/values-zh-rCN/strings.xml b/android/Omnivore/app/src/main/res/values-zh-rCN/strings.xml index 567c2df01..25a8f7e7e 100644 --- a/android/Omnivore/app/src/main/res/values-zh-rCN/strings.xml +++ b/android/Omnivore/app/src/main/res/values-zh-rCN/strings.xml @@ -139,6 +139,7 @@ 您尚未在此页面新增任何标记。 + 字体 字型大小: 边距 行距 @@ -204,4 +205,21 @@ 条款和条件 管理帐户 登出 + + + 收集箱 + 非订阅内容 + 订阅内容 + 邮件简讯 + 推荐 + 所有内容 + 已归档 + 已高亮 + 文档 + + + 从新到旧 + 从旧到新 + 最近阅读 + 最近发布 diff --git a/pkg/admin/src/db.ts b/pkg/admin/src/db.ts index f493fd30d..f01302f0d 100644 --- a/pkg/admin/src/db.ts +++ b/pkg/admin/src/db.ts @@ -52,6 +52,7 @@ export const registerDatabase = async (secrets: any): Promise => { Subscription, LibraryItem, UploadFile, + Recommendation, ], }) @@ -382,3 +383,27 @@ export class UploadFile extends BaseEntity { @Column({ type: 'timestamp', name: 'updated_at' }) updatedAt!: Date } + +@Entity({ name: 'recommendation' }) +export class Recommendation extends BaseEntity { + @PrimaryGeneratedColumn('uuid') + id!: string + + @JoinColumn({ name: 'recommender_id' }) + @ManyToOne(() => User, (user) => user.articles, { eager: true }) + recommender!: User + + @JoinColumn({ name: 'library_item_id' }) + @ManyToOne(() => User, (user) => user.articles, { eager: true }) + libraryItem!: LibraryItem + + @JoinColumn({ name: 'group_id' }) + @ManyToOne(() => User, (user) => user.articles, { eager: true }) + group!: Group + + @Column('text', { nullable: true }) + note?: string | null + + @Column({ type: 'timestamp', name: 'created_at' }) + createdAt!: Date +} diff --git a/pkg/admin/src/index.ts b/pkg/admin/src/index.ts index 543c0d987..5ce5967df 100644 --- a/pkg/admin/src/index.ts +++ b/pkg/admin/src/index.ts @@ -13,6 +13,7 @@ import { Subscription, Integration, LibraryItem, + Recommendation, } from './db' import { compare, hashSync } from 'bcryptjs' const readYamlFile = require('read-yaml-file') @@ -46,6 +47,7 @@ const ADMIN_USER_EMAIL = { resource: ContentDisplayReport, }, + { resource: Recommendation, options: { parent: { name: 'Users' } } }, ], })