Skip to content

Commit

Permalink
Fix prettier
Browse files Browse the repository at this point in the history
Update staff.ts

Update _base.ts
  • Loading branch information
baseplate-admin committed Aug 13, 2024
1 parent 98f45e2 commit 4df9eec
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 49 deletions.
11 changes: 6 additions & 5 deletions seeder/.prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -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"]
}
2 changes: 1 addition & 1 deletion seeder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
64 changes: 32 additions & 32 deletions seeder/electron-builder.yml
Original file line number Diff line number Diff line change
@@ -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/
4 changes: 2 additions & 2 deletions seeder/src/main/database/_base.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
14 changes: 7 additions & 7 deletions seeder/src/main/database/staff.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion seeder/src/renderer/components/navbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ const Navbar: Component = () => {
<CoreSeederLogo class="w-auto md:h-4" />
</div>
<div class="h-full">
<button class="btn btn-neutral h-full min-h-full rounded outline-none">Logout</button>
<button class="btn btn-neutral h-full min-h-full rounded outline-none">
Logout
</button>
</div>
</div>
);
Expand Down
5 changes: 4 additions & 1 deletion seeder/src/renderer/components/sidebar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ const Sidebar: Component = () => {
</A>
<For each={Object.entries(COMMANDS_MAPPING)}>
{([command_cat, commands_obj]) => (
<details class="collapse collapse-arrow rounded-none border-none !outline-none" open>
<details
class="collapse collapse-arrow rounded-none border-none !outline-none"
open
>
<summary class="collapse-title min-h-max p-0 text-sm text-info after:!right-1 after:!top-1/2 after:!size-1.5">
{command_cat}
</summary>
Expand Down

0 comments on commit 4df9eec

Please sign in to comment.