Skip to content

Commit

Permalink
update package.json and add linux build step
Browse files Browse the repository at this point in the history
  • Loading branch information
IceSentry committed Nov 15, 2019
1 parent 5b803b5 commit 9de03ce
Show file tree
Hide file tree
Showing 7 changed files with 1,437 additions and 1,855 deletions.
3,214 changes: 1,394 additions & 1,820 deletions package-lock.json

Large diffs are not rendered by default.

64 changes: 34 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"name": "capra_web_ui",
"version": "0.1.0",
"author": "Club Capra",
"author": {
"name": "Club Capra",
"email": "[email protected]",
"url": "clubcapra.com"
},
"description": "User Interface for ROS based robots",
"private": true,
"homepage": "./",
Expand All @@ -12,7 +16,7 @@
"start:electron": "wait-on http://localhost:3000 && electron .",
"build": "npm run build:react && npm run build:electron",
"build:react": "react-scripts build",
"build:electron": "electron-builder",
"build:electron": "electron-builder -lw",
"test": "react-scripts test --transformIgnorePatterns \"/node_modules/(?!@club_capra/roslib-ts-client).+\\.js$\"",
"eject": "react-scripts eject",
"lint": "eslint --ext js,ts,tsx src"
Expand All @@ -36,43 +40,43 @@
},
"dependencies": {
"@club_capra/roslib-ts-client": "^0.3.3",
"chart.js": "^2.8.0",
"@reduxjs/toolkit": "^1.0.4",
"chart.js": "^2.9.3",
"chartjs-plugin-streaming": "^1.8.0",
"date-fns": "^2.4.1",
"date-fns": "^2.7.0",
"lodash": "^4.17.15",
"polished": "^3.4.1",
"react": "^16.10.1",
"react-dom": "^16.10.1",
"react-icons": "^3.7.0",
"react-redux": "^7.1.1",
"react-router-dom": "^5.1.1",
"react-toastify": "^5.4.0",
"polished": "^3.4.2",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-icons": "^3.8.0",
"react-redux": "^7.1.3",
"react-router-dom": "^5.1.2",
"react-toastify": "^5.4.1",
"redux": "^4.0.4",
"redux-starter-kit": "^0.7.0",
"shortid": "^2.2.15",
"styled-components": "^4.4.0",
"typescript": "3.6.3"
"styled-components": "^4.4.1",
"typescript": "3.7.2"
},
"devDependencies": {
"@types/chart.js": "^2.8.5",
"@types/jest": "24.0.18",
"@types/lodash": "^4.14.141",
"@types/node": "12.7.8",
"@types/react": "16.9.3",
"@types/react-dom": "16.9.1",
"@types/react-redux": "^7.1.4",
"@types/react-router-dom": "^5.1.0",
"@types/chart.js": "^2.9.0",
"@types/jest": "24.0.23",
"@types/lodash": "^4.14.147",
"@types/node": "12.12.7",
"@types/react": "16.9.11",
"@types/react-dom": "16.9.4",
"@types/react-redux": "^7.1.5",
"@types/react-router-dom": "^5.1.2",
"@types/shortid": "0.0.29",
"@types/styled-components": "^4.1.19",
"concurrently": "^4.1.2",
"electron": "^6.0.10",
"@types/styled-components": "^4.4.0",
"concurrently": "^5.0.0",
"electron": "^7.1.1",
"electron-builder": "^21.2.0",
"eslint-config-prettier": "^6.3.0",
"eslint-config-prettier": "^6.5.0",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-react": "^7.14.3",
"husky": "^3.0.7",
"prettier": "^1.18.2",
"react-scripts": "3.1.2",
"eslint-plugin-react": "^7.16.0",
"husky": "^3.0.9",
"prettier": "^1.19.1",
"react-scripts": "3.2.0",
"wait-on": "^3.3.0"
},
"browserslist": {
Expand Down
3 changes: 2 additions & 1 deletion src/store/modules/feed/reducer.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { ICameraData, ICameraFeed } from './@types'
import { PayloadAction, createSlice } from 'redux-starter-kit'
import { PayloadAction, createSlice } from '@reduxjs/toolkit'
import { FeedTypeEnum } from 'store/modules/feed/@types'
import { initialState } from 'store/modules/feed/initialState'
import shortid from 'shortid'
import { GlobalState } from 'store/rootReducer'

export const feedSlice = createSlice({
name: 'feed',
initialState,
reducers: {
addCamera: (state, { payload }: PayloadAction<ICameraData>) => {
Expand Down
3 changes: 2 additions & 1 deletion src/store/modules/gamepad/reducer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createSlice, PayloadAction } from 'redux-starter-kit'
import { createSlice, PayloadAction } from '@reduxjs/toolkit'
import { GamepadState } from 'store/modules/gamepad/@types'
import { GlobalState } from 'store/rootReducer'

Expand All @@ -7,6 +7,7 @@ export const initialState: GamepadState = {
}

export const gamepadSlice = createSlice({
name: 'gamepad',
initialState,
reducers: {
setIsArmControlled: (state, { payload }: PayloadAction<boolean>) => {
Expand Down
3 changes: 2 additions & 1 deletion src/store/modules/pwa/reducer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PWAState } from './@types'
import { createSlice } from 'redux-starter-kit'
import { createSlice } from '@reduxjs/toolkit'
import { toast } from 'react-toastify'

export const initialState: PWAState = {
Expand All @@ -9,6 +9,7 @@ export const initialState: PWAState = {
}

export const pwaSlice = createSlice({
name: 'pwa',
initialState,
reducers: {
onContentLoaded: state => {
Expand Down
3 changes: 2 additions & 1 deletion src/store/modules/ros/reducer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RosState } from 'store/modules/ros/@types'
import { GlobalState } from 'store/rootReducer'
import { createSlice, PayloadAction } from 'redux-starter-kit'
import { createSlice, PayloadAction } from '@reduxjs/toolkit'
import { toast } from 'react-toastify'
import { ICameraData } from 'store/modules/feed/@types'

Expand All @@ -16,6 +16,7 @@ export const initialState: RosState = {
}

export const rosSlice = createSlice({
name: 'ros',
initialState,
reducers: {
setIp: (state, { payload }: PayloadAction<string>) => {
Expand Down
2 changes: 1 addition & 1 deletion src/store/store.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { configureStore } from 'redux-starter-kit'
import { configureStore } from '@reduxjs/toolkit'
import { rootReducer } from 'store/rootReducer'
import { loadState, saveState } from 'store/localStorage'
import { throttle } from 'lodash'
Expand Down

0 comments on commit 9de03ce

Please sign in to comment.