Skip to content

Commit

Permalink
Merge pull request #15 from shipurjan/master
Browse files Browse the repository at this point in the history
0.2.0 release
  • Loading branch information
shipurjan authored May 12, 2024
2 parents 53032ca + 851ab92 commit 463d491
Show file tree
Hide file tree
Showing 20 changed files with 162 additions and 190 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ module.exports = {
},

rules: {
"dot-notation": "off",
"default-case": "error",
"@typescript-eslint/prefer-enum-initializers": "error",
"@typescript-eslint/no-duplicate-enum-values": "error",
Expand Down
19 changes: 8 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bioparallel",
"description": "Application for forensic trace comparison",
"version": "0.1.3",
"version": "0.2.0",
"author": {
"name": "Cyprian Zdebski",
"email": "[email protected]",
Expand Down Expand Up @@ -29,11 +29,10 @@
"test:e2e": "jest ./__tests__/e2e --passWithNoTests"
},
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop-flourish": "^1.1.0",
"@atlaskit/pragmatic-drag-and-drop-flourish": "1.1.0",
"@pixi/react": "7.1.0",
"@radix-ui/react-checkbox": "1.0.4",
"@radix-ui/react-dropdown-menu": "2.0.6",
"@radix-ui/react-icons": "1.3.0",
"@radix-ui/react-label": "2.0.2",
"@radix-ui/react-radio-group": "1.1.3",
"@radix-ui/react-separator": "1.0.3",
Expand All @@ -49,25 +48,24 @@
"@tauri-apps/plugin-store": "2.0.0-beta.2",
"class-variance-authority": "0.7.0",
"clsx": "2.1.0",
"i18next": "^23.10.1",
"i18next-resources-to-backend": "^1.2.0",
"i18next": "23.10.1",
"i18next-resources-to-backend": "1.2.0",
"immer": "10.0.4",
"lucide-react": "^0.363.0",
"md5": "^2.3.0",
"lucide-react": "0.363.0",
"modern-normalize": "2.0.0",
"next": "14.1.4",
"next-themes": "0.3.0",
"pixi-viewport": "5.0.2",
"pixi.js": "7.4.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-i18next": "^14.1.0",
"react-i18next": "14.1.0",
"react-resizable-panels": "2.0.13",
"react-virtuoso": "^4.7.4",
"react-virtuoso": "4.7.4",
"sonner": "1.4.41",
"tailwind-merge": "2.2.2",
"tailwindcss-animate": "1.0.7",
"tiny-invariant": "^1.3.3",
"tiny-invariant": "1.3.3",
"use-debounce": "10.0.0",
"zustand": "4.5.2"
},
Expand All @@ -78,7 +76,6 @@
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "14.2.2",
"@types/jest": "29.5.12",
"@types/md5": "^2.3.5",
"@types/node": "20.11.30",
"@types/react": "18.2.69",
"@types/react-dom": "18.2.22",
Expand Down
61 changes: 10 additions & 51 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bioparallel"
version = "0.1.3"
version = "0.2.0"
description = "Application for forensic trace comparision"
authors = ["Cyprian Zdebski"]
license = ""
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}
},
"productName": "bioparallel",
"version": "0.1.3",
"version": "0.2.0",
"identifier": "com.parallel.bio",
"plugins": {},
"app": {
Expand Down
11 changes: 11 additions & 0 deletions src/components/information-tabs/markings-info/columns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,17 @@ export const getColumns = (
},
] as Array<ColumnDef<EmptyableMarking>>)
: []),
// ID będzie pokazane tylko podczas developmentu
...(IS_DEV_ENVIRONMENT
? ([
{
accessorKey: "size",
header: "Size",
cell: cell =>
formatCell(cell, ({ row }) => row.original.size),
},
] as Array<ColumnDef<EmptyableMarking>>)
: []),
{
accessorKey: "label",
header: t("Marking.Keys.label", { ns: "object" }),
Expand Down
Loading

0 comments on commit 463d491

Please sign in to comment.