Skip to content

Commit

Permalink
Merge pull request #142 from DiamondLightSource/logging
Browse files Browse the repository at this point in the history
Add Logging and detector mask
  • Loading branch information
tizayi authored Sep 16, 2024
2 parents 25e096a + 8434036 commit a8067f5
Show file tree
Hide file tree
Showing 34 changed files with 928 additions and 355 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.cjs
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
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
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
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

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
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

0 comments on commit a8067f5

Please sign in to comment.