Skip to content

Commit

Permalink
Merge pull request #25 from Nel-Q/feature/ui-refactor-integration
Browse files Browse the repository at this point in the history
Feature/UI refactor integration
  • Loading branch information
Nel-Q authored May 8, 2024
2 parents e2981f8 + d5827c6 commit 2fb85da
Show file tree
Hide file tree
Showing 32 changed files with 2,668 additions and 8,600 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v16.13.0
Binary file added dist/touch-panel-ui.ch5z
Binary file not shown.
Binary file modified dist/touch-panel.ch5z
Binary file not shown.
201 changes: 151 additions & 50 deletions package-lock.json

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

8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,30 @@
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"bootstrap": "^5.3.2",
"bootstrap": "^5.3.3",
"bootstrap-icons": "^1.11.3",
"patch-package": "^8.0.0",
"react": "^18.2.0",
"react-bootstrap": "^2.9.2",
"react-bootstrap-switch": "^15.5.3",
"react-dom": "^18.2.0",
"react-lines-ellipsis": "^0.15.4",
"react-router-dom": "^6.21.3",
"react-scripts": "^5.0.1",
"resolve-url-loader": "^5.0.0",
"sass": "^1.72.0",
"sass-loader": "^14.1.1",
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"build:archive": "ch5-cli archive -p touch-panel -P samplesource=ch5-react -d build -o dist",
"deploy": "ch5-cli deploy -p -H 129.105.110.238 -t web dist/touch-panel.ch5z",
"deploy-touchscreen": "ch5-cli deploy -H 129.105.236.194 -t touchscreen dist/touch-panel.ch5z",
"build:onestep": "npm run build && npm run build:archive",
"build:deploy": "npm run build:onestep && npm run deploy",
"build:deploy-touchscreen": "npm run build:onestep && npm run deploy touchscreen",
"test": "react-scripts test",
"eject": "react-scripts eject",
"postinstall": "patch-package"
Expand Down
14 changes: 14 additions & 0 deletions public/Northwestern_WHITE.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2fb85da

Please sign in to comment.