Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Logging and detector mask #142

Merged
merged 16 commits into from
Sep 16, 2024
Merged

Add Logging and detector mask #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
012da63
start working on logging
tizayi Jul 11, 2024
9cdd179
working mask stripes
tizayi Aug 15, 2024
ffb94e8
correct offset
tizayi Aug 15, 2024
3df8d2e
working missing sections
tizayi Aug 16, 2024
79f9c41
add mask to dialog
tizayi Aug 19, 2024
099ae22
ad mask to detector form
tizayi Aug 19, 2024
d43fec5
remove misssing module
tizayi Aug 20, 2024
3562685
line too long
tizayi Aug 20, 2024
e74d80b
fix bug with requested s
tizayi Aug 29, 2024
810b17b
add doc string for log message
tizayi Aug 29, 2024
7c1729e
using enums for unit names
tizayi Aug 29, 2024
e18f2c1
name default colours
tizayi Sep 2, 2024
60329fa
format with prettier
tizayi Sep 2, 2024
9ec74ab
format github actions yml
tizayi Sep 2, 2024
3658ffb
add prettier plugins for eslint
tizayi Sep 2, 2024
8434036
fix typo
tizayi Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module.exports = {
"plugin:react-hooks/recommended",
"plugin:react/recommended",
"plugin:react/jsx-runtime",
"plugin:prettier/recommended",
],
ignorePatterns: ["dist", ".eslintrc.cjs"],
parser: "@typescript-eslint/parser",
Expand All @@ -26,7 +27,10 @@ module.exports = {
"no-throw-literal": "off",
"max-len": ["warn", { code: 80 }],
"@typescript-eslint/no-throw-literal": "error",
"@typescript-eslint/no-misused-promises": ["error", { "checksVoidReturn": { "attributes": false } }],
"@typescript-eslint/no-misused-promises": [
"error",
{ checksVoidReturn: { attributes: false } },
],
},
settings: {
react: {
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ jobs:
run: npm ci

- name: lint
run: npm run lint
run: |
npm run lint
npx prettier . --check

- name: Tests
run: npm run test
Expand Down
244 changes: 131 additions & 113 deletions arkit.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions catalog-info.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Component
metadata:
name: dedi-web
title: Dedi-Web
description: A client only Q-Range calculator
description: A client only Q-Range calculator
annotations:
backstage.io/techdocs-ref: dir:.
github.com/project-slug: DiamondLightSource/dedi-web
Expand All @@ -13,4 +13,4 @@ metadata:
spec:
type: Application
lifecycle: production
owner: group:data-analysis
owner: group:data-analysis
172 changes: 140 additions & 32 deletions package-lock.json
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"version": "0.0.0",
"type": "module",
"scripts": {
"format": "eslint --fix .",
"dev": "vite --port 3000",
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
Expand All @@ -16,7 +17,7 @@
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@h5web/lib": "^11.2.0",
"@h5web/lib": "^12.0.1",
"@mui/icons-material": "^5.15.3",
"@mui/material": "^5.14.17",
"@mui/system": "^5.15.9",
Expand All @@ -39,9 +40,12 @@
"@vitejs/plugin-react-swc": "^3.4.1",
"arkit": "^1.6.4",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.33.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"prettier": "^3.3.3",
"typescript": "^5.4.5",
"vite": "^5.2.13",
"vitest": "^1.5.1"
Expand Down
Loading