diff --git a/seeder/.prettierrc.yaml b/seeder/.prettierrc.yaml index 7fb8da9720..644b5e51d6 100644 --- a/seeder/.prettierrc.yaml +++ b/seeder/.prettierrc.yaml @@ -1,7 +1,8 @@ { - "useTabs": true, - "singleQuote": false, - "trailingComma": "none", - "printWidth": 100, - "plugins": ["prettier-plugin-tailwindcss"] + "useTabs": true, + "singleQuote": false, + "tabWidth": 4, + "trailingComma": "none", + "printWidth": 100, + "plugins": ["prettier-plugin-tailwindcss"] } diff --git a/seeder/README.md b/seeder/README.md index feee9abfe4..7677827113 100644 --- a/seeder/README.md +++ b/seeder/README.md @@ -4,7 +4,7 @@ An Electron application with Solid and TypeScript ## Recommended IDE Setup -- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) +- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) ## Project Setup diff --git a/seeder/electron-builder.yml b/seeder/electron-builder.yml index 1f8f663c58..d89da9232b 100644 --- a/seeder/electron-builder.yml +++ b/seeder/electron-builder.yml @@ -1,46 +1,46 @@ appId: com.electron.app productName: core-seeder directories: - buildResources: build + buildResources: build files: - - "!**/.vscode/*" - - "!src/*" - - "!electron.vite.config.{js,ts,mjs,cjs}" - - "!{.eslintignore,eslint.config.{js,ts,mjs,cjs},.eslintrc.cjs,.prettierignore,.prettierrc.yaml,tailwind.config.{js,ts,mjs,cjs},postcss.config.{js,ts,mjs,cjs},dev-app-update.yml,CHANGELOG.md,README.md}" - - "!{.env,.env.*,.npmrc,pnpm-lock.yaml}" - - "!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}" - - "!http_cache.sqlite" # Ignore shiinobi + - "!**/.vscode/*" + - "!src/*" + - "!electron.vite.config.{js,ts,mjs,cjs}" + - "!{.eslintignore,eslint.config.{js,ts,mjs,cjs},.eslintrc.cjs,.prettierignore,.prettierrc.yaml,tailwind.config.{js,ts,mjs,cjs},postcss.config.{js,ts,mjs,cjs},dev-app-update.yml,CHANGELOG.md,README.md}" + - "!{.env,.env.*,.npmrc,pnpm-lock.yaml}" + - "!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}" + - "!http_cache.sqlite" # Ignore shiinobi asarUnpack: - - resources/** + - resources/** win: - executableName: core-seeder + executableName: core-seeder nsis: - artifactName: ${name}-${version}-setup.${ext} - shortcutName: ${productName} - uninstallDisplayName: ${productName} - createDesktopShortcut: always + artifactName: ${name}-${version}-setup.${ext} + shortcutName: ${productName} + uninstallDisplayName: ${productName} + createDesktopShortcut: always mac: - entitlementsInherit: build/entitlements.mac.plist - extendInfo: - - NSCameraUsageDescription: Application requests access to the device's camera. - - NSMicrophoneUsageDescription: Application requests access to the device's microphone. - - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder. - - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder. - notarize: false + entitlementsInherit: build/entitlements.mac.plist + extendInfo: + - NSCameraUsageDescription: Application requests access to the device's camera. + - NSMicrophoneUsageDescription: Application requests access to the device's microphone. + - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder. + - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder. + notarize: false dmg: - artifactName: ${name}-${version}.${ext} + artifactName: ${name}-${version}.${ext} linux: - target: - - AppImage - - snap - - deb - maintainer: electronjs.org - category: Utility + target: + - AppImage + - snap + - deb + maintainer: electronjs.org + category: Utility appImage: - artifactName: ${name}-${version}.${ext} + artifactName: ${name}-${version}.${ext} npmRebuild: false publish: - provider: generic - url: https://example.com/auto-updates + provider: generic + url: https://example.com/auto-updates electronDownload: - mirror: https://npmmirror.com/mirrors/electron/ + mirror: https://npmmirror.com/mirrors/electron/ diff --git a/seeder/src/main/database/_base.ts b/seeder/src/main/database/_base.ts index 62a9a0d56b..500fc8655b 100644 --- a/seeder/src/main/database/_base.ts +++ b/seeder/src/main/database/_base.ts @@ -1,8 +1,8 @@ import BetterSqlite3 from "better-sqlite3"; export class BaseDatabase { - migration_queue: any[] = []; - db: BetterSqlite3.Database; + protected migration_queue: any[] = []; + protected db: BetterSqlite3.Database; constructor(db: BetterSqlite3.Database) { this.db = db; diff --git a/seeder/src/main/database/staff.ts b/seeder/src/main/database/staff.ts index 48f18fa6d4..90e5e2e2ce 100644 --- a/seeder/src/main/database/staff.ts +++ b/seeder/src/main/database/staff.ts @@ -36,13 +36,13 @@ export class StaffDatabase extends BaseDatabase { }; public get_all_null_staff = () => { const stmt = this.db.prepare(` - SELECT * FROM ${this.#table_name} WHERE - name IS NULL OR - staff_image IS NULL OR - given_name IS NULL OR - alternate_name IS NULL OR - birthday IS NULL OR - about IS NULL + SELECT * FROM ${this.#table_name} WHERE + name IS NULL OR + staff_image IS NULL OR + given_name IS NULL OR + alternate_name IS NULL OR + birthday IS NULL OR + about IS NULL `); const rows = stmt.all(); return rows; diff --git a/seeder/src/renderer/components/navbar/index.tsx b/seeder/src/renderer/components/navbar/index.tsx index 8b2adae60b..97260ba6a1 100644 --- a/seeder/src/renderer/components/navbar/index.tsx +++ b/seeder/src/renderer/components/navbar/index.tsx @@ -10,7 +10,9 @@ const Navbar: Component = () => {
- +
); diff --git a/seeder/src/renderer/components/sidebar/index.tsx b/seeder/src/renderer/components/sidebar/index.tsx index e3a2b006de..6ea9580dbf 100644 --- a/seeder/src/renderer/components/sidebar/index.tsx +++ b/seeder/src/renderer/components/sidebar/index.tsx @@ -21,7 +21,10 @@ const Sidebar: Component = () => { {([command_cat, commands_obj]) => ( -
+
{command_cat}