Skip to content

Commit

Permalink
Updated directory reference for app_old
Browse files Browse the repository at this point in the history
  • Loading branch information
walidkayhan committed Jul 17, 2024
1 parent a9d6cac commit 185f25d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"build": "npm run build-prod",
"build-i18n": "concurrently --kill-others-on-fail --names \"build-i18n-server,build-i18n-app\" \"npm run build-i18n-server\" \"npm run build-i18n-app\"",
"build-i18n-server": "i18next-scanner --config i18next-scanner.config.server.js \"src/server/**/*.{html,js,jsx}\" \"!src/server/i18n/**\" \"!**/node_modules/**\"",
"build-i18n-app": "i18next-scanner --config i18next-scanner.config.app.js \"src/app/**/*.{html,js,jsx}\" \"!src/app/i18n/**\" \"!**/node_modules/**\"",
"build-i18n-app": "i18next-scanner --config i18next-scanner.config.app.js \"src/app_old/**/*.{html,js,jsx}\" \"!src/app_old/i18n/**\" \"!**/node_modules/**\"",
"build-latest": "concurrently --kill-others-on-fail --names \"build-prod-server,build-prod-app\" \"npm run build-prod-server\" \"npm run build-prod-app\"",
"build-dev": "concurrently --kill-others-on-fail --names \"build-dev-server,build-dev-app\" \"npm run build-dev-server\" \"npm run build-dev-app\"",
"build-dev-server": "cross-env NODE_ENV=development webpack-cli --progress --config webpack.config.server.development.js && npm run build-i18n-server",
Expand All @@ -42,9 +42,9 @@
"build-prod-server": "cross-env NODE_ENV=production webpack-cli --config webpack.config.server.production.js && npm run build-i18n-server",
"build-prod-app": "cross-env NODE_ENV=production webpack-cli --config webpack.config.app.production.js && npm run build-i18n-app",
"postbuild-dev-server": "bash -c \"mkdir -p output/server; cp -af src/server/{i18n,views} output/server/\"",
"postbuild-dev-app": "bash -c \"mkdir -p output/app output/app-server; cp -af src/app/{favicon.ico,i18n,images,assets} output/app/\"",
"postbuild-dev-app": "bash -c \"mkdir -p output/app output/app-server; cp -af src/app_old/{favicon.ico,i18n,images,assets} output/app/\"",
"postbuild-prod-server": "bash -c \"mkdir -p dist/gsender/server; cp -af src/server/{i18n,views} dist/gsender/server/\"",
"postbuild-prod-app": "bash -c \"mkdir -p dist/gsender/app; cp -af src/app/{favicon.ico,i18n,images,assets} dist/gsender/app/\"",
"postbuild-prod-app": "bash -c \"mkdir -p dist/gsender/app; cp -af src/app_old/{favicon.ico,i18n,images,assets} dist/gsender/app/\"",
"clean": "bash -c 'rm -rf ./dist ./output'",
"electron": "electron",
"electron-builder": "electron-builder",
Expand Down Expand Up @@ -80,7 +80,7 @@
"vite:build": "npm run vite:build:server && npm run vite:build:client",
"vite:build:client": "vite build --ssrManifest",
"vite:build:server": "vite build --ssr ./src/entry-server.tsx --outDir ../../dist/gsender/app-server",
"postvite:build": "bash -c \"mkdir -p dist/gsender/app; cp -af src/app/{favicon.ico,i18n,images,assets} dist/gsender/app/\"",
"postvite:build": "bash -c \"mkdir -p dist/gsender/app; cp -af src/app_old/{favicon.ico,i18n,images,assets} dist/gsender/app/\"",
"install:packages": "yarn install && yarn install --prefix /src/app"
},
"build": {
Expand Down
2 changes: 1 addition & 1 deletion src/server/api/api.metrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import logger from '../lib/logger';
import config from '../services/configstore';
import pkg from '../../package.json';
import { ERR_BAD_REQUEST, ERR_INTERNAL_SERVER_ERROR } from '../constants';
import { USER_DATA_COLLECTION } from '../../app/constants';
import { USER_DATA_COLLECTION } from '../../app_old/constants';

const CONFIG_KEY = 'metrics';

Expand Down
2 changes: 1 addition & 1 deletion src/server/controllers/Grbl/GrblController.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ import {
FILE_TYPE,
ALARM,
ERROR
} from '../../../app/constants';
} from '../../../app_old/constants';
import ApplyFirmwareProfile from '../../lib/Firmware/Profiles/ApplyFirmwareProfile';
import { determineMachineZeroFlagSet, determineMaxMovement, getAxisMaximumLocation } from '../../lib/homing';
import { calcOverrides } from '../runOverride';
Expand Down
2 changes: 1 addition & 1 deletion src/server/controllers/Grblhal/GrblHalController.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ import {
FILE_UNLOAD,
ALARM,
ERROR
} from '../../../app/constants';
} from '../../../app_old/constants';
import ApplyFirmwareProfile from '../../lib/Firmware/Profiles/ApplyFirmwareProfile';
import { determineHALMachineZeroFlag, determineMaxMovement, getAxisMaximumLocation } from '../../lib/homing';
import { calcOverrides } from '../runOverride';
Expand Down
2 changes: 1 addition & 1 deletion src/server/lib/EventTrigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

import config from '../services/configstore';
import { PROGRAM_EVENTS } from '../../app/constants';
import { PROGRAM_EVENTS } from '../../app_old/constants';

const noop = () => {};

Expand Down
16 changes: 8 additions & 8 deletions src/server/lib/Firmware/Profiles/ApplyFirmwareProfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
*
*/

import defaultGrbl from '../../../../app/containers/Firmware/eepromFiles/DefaultGrblSettings.json';
import longMill12x12 from '../../../../app/containers/Firmware/eepromFiles/Sienci Long Mill12X12.json';
import longMill12x30 from '../../../../app/containers/Firmware/eepromFiles/Sienci Long Mill12X30.json';
import longMill30x30 from '../../../../app/containers/Firmware/eepromFiles/Sienci Long Mill30X30.json';
import millOne from '../../../../app/containers/Firmware/eepromFiles/Sienci Mill One.json';
import millOneV3 from '../../../../app/containers/Firmware/eepromFiles/Sienci Mill OneV3.json';
import mK230x30 from '../../../../app/containers/Firmware/eepromFiles/MK2_30x30.json';
import mK212x30 from '../../../../app/containers/Firmware/eepromFiles/MK2_12x30.json';
import defaultGrbl from '../../../../app_old/containers/Firmware/eepromFiles/DefaultGrblSettings.json';
import longMill12x12 from '../../../../app_old/containers/Firmware/eepromFiles/Sienci Long Mill12X12.json';
import longMill12x30 from '../../../../app_old/containers/Firmware/eepromFiles/Sienci Long Mill12X30.json';
import longMill30x30 from '../../../../app_old/containers/Firmware/eepromFiles/Sienci Long Mill30X30.json';
import millOne from '../../../../app_old/containers/Firmware/eepromFiles/Sienci Mill One.json';
import millOneV3 from '../../../../app_old/containers/Firmware/eepromFiles/Sienci Mill OneV3.json';
import mK230x30 from '../../../../app_old/containers/Firmware/eepromFiles/MK2_30x30.json';
import mK212x30 from '../../../../app_old/containers/Firmware/eepromFiles/MK2_12x30.json';

import store from '../../../store';

Expand Down

0 comments on commit 185f25d

Please sign in to comment.