diff --git a/.github/workflows/electron-sandbox.yml b/.github/workflows/electron-sandbox.yml index 004e919..eab0fcf 100644 --- a/.github/workflows/electron-sandbox.yml +++ b/.github/workflows/electron-sandbox.yml @@ -1,4 +1,4 @@ -name: Sandbox Clinic Desktop +name: Sandbox Clinic System on: [push] @@ -9,7 +9,6 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - # os: [windows-latest] steps: - name: Starting Context @@ -20,16 +19,16 @@ jobs: uses: actions/checkout@v1 with: fetch-depth: 1 - - name: Use Node.js 10.x + - name: Use Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 10.x + node-version: 16.x - name: yarn install run: | yarn install - name: Publish run: | - yarn run dist + yarn run dist - name: Cleanup artifacts Linux and macOS if: matrix.os != 'windows-latest' run: | diff --git a/.gitignore b/.gitignore index 6047073..b7b0e95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ node_modules package-lock.json yarn.lock -dist \ No newline at end of file +dist +electron-builder.env +lib.js \ No newline at end of file diff --git a/README.MD b/README.MD index 957d48c..fb46b41 100644 --- a/README.MD +++ b/README.MD @@ -1,4 +1,4 @@ -# CUBETIQ Clinic Application +# CUBETIQ Clinic System Management ![Sandbox Clinic Desktop](https://github.com/CUBETIQ/sandbox-clinic/workflows/Sandbox%20Clinic%20Desktop/badge.svg) diff --git a/assets/images/icon.ico b/assets/images/icon.ico new file mode 100644 index 0000000..ad1ccb8 Binary files /dev/null and b/assets/images/icon.ico differ diff --git a/assets/images/icon.png b/assets/images/icon.png new file mode 100644 index 0000000..5778ec9 Binary files /dev/null and b/assets/images/icon.png differ diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..0625ca9 --- /dev/null +++ b/build.sh @@ -0,0 +1,9 @@ +BUILD_PROFILE=${1:-clinic} +echo "Build for profile ${BUILD_PROFILE}" + +cat profile/${BUILD_PROFILE}.env > lib.js + +echo "Verify lib.js" +cat lib.js + +yarn dist \ No newline at end of file diff --git a/builder-config.yaml b/builder-config.yaml new file mode 100644 index 0000000..e69de29 diff --git a/config/electron-builder-dev.json b/config/electron-builder-dev.json index 2d68f4e..e93c654 100644 --- a/config/electron-builder-dev.json +++ b/config/electron-builder-dev.json @@ -2,10 +2,10 @@ "productName": "Clinic-Dev", "appId": "com.cubetiqs.clinic", "mac": { - "category": "com.cubetiqs.pro.clinic" + "category": "com.cubetiqs.clinic" }, "linux": { - "category": "com.cubetiqs.pro.clinic", + "category": "com.cubetiqs.clinic", "target": ["AppImage", "deb"] }, "win": { diff --git a/config/electron-builder-sandbox.json b/config/electron-builder-sandbox.json index a4917e0..d4f2d3f 100644 --- a/config/electron-builder-sandbox.json +++ b/config/electron-builder-sandbox.json @@ -2,10 +2,10 @@ "productName": "Clinic-Sandbox", "appId": "com.cubetiqs.clinic", "mac": { - "category": "com.cubetiqs.pro.clinic" + "category": "com.cubetiqs.clinic" }, "linux": { - "category": "com.cubetiqs.pro.clinic", + "category": "com.cubetiqs.clinic", "target": ["AppImage", "deb"] }, "win": { diff --git a/main.js b/main.js index b226d28..5b86db3 100644 --- a/main.js +++ b/main.js @@ -1,10 +1,11 @@ const electron = require("electron"); const { app, BrowserWindow } = electron; const os = require("os"); +const APP_URL = require("./lib"); -const URL = process.env.APP_URL || "https://clinic.cubetiqs.com"; +const URL = APP_URL || "https://clinic.cubetiqs.com"; const MAIN_URL = `${URL}?platform=desktop&offline=true&os=${os.platform()}&hostname=${os.hostname()}&arch=${os.arch()}&source=${process.env.USERNAME || "unknown"}` -const APP_TITLE = "CUBETIQ CLINIC SYSTEM"; +const APP_TITLE = "Clinic System"; let mainApp; app.allowRendererProcessReuse = true; @@ -12,6 +13,8 @@ app.on("ready", () => { mainApp = new BrowserWindow({ width: 1024, height: 768, + icon: "./assets/images/icon.png", + title: APP_TITLE, }); mainApp.webContents.executeJavaScript( diff --git a/package.json b/package.json index 79d405a..c63a61e 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,9 @@ "version": "1.0.2", "description": "CUBETIQ Clinic System Management", "main": "main.js", + "icon": "./assets/images/icon.ico", "build": { - "productName": "Clinic-Sandbox", + "productName": "Sandbox-Clinic", "appId": "com.cubetiqs.clinic", "mac": { "category": "com.cubetiqs.clinic" @@ -17,7 +18,8 @@ ] }, "win": { - "target": "nsis" + "target": "nsis", + "icon": "./assets/images/icon.ico" } }, "devDependencies": { @@ -27,7 +29,7 @@ }, "scripts": { "postinstall": "electron-builder install-app-deps", - "start": "yarn && cross-env DR_URL=https://clinic.cubetiqs.com?platform=desktop electron ./main", + "start": "yarn && cross-env APP_URL=https://clinic.cubetiqs.com?platform=desktop electron ./main", "pack": "electron-builder --dir", "dist": "electron-builder --publish never", "build-icon": "electron-icon-builder --input=icon.png --output=dist/icons", diff --git a/profile/clinic.env b/profile/clinic.env new file mode 100644 index 0000000..36c67d2 --- /dev/null +++ b/profile/clinic.env @@ -0,0 +1,3 @@ +const APP_URL = 'https://clinic.cubetiqs.com'; + +module.exports = APP_URL; \ No newline at end of file diff --git a/profile/dr.env b/profile/dr.env new file mode 100644 index 0000000..d5b67db --- /dev/null +++ b/profile/dr.env @@ -0,0 +1,3 @@ +const APP_URL = 'https://app.drprofessionalglobal.com'; + +module.exports = APP_URL; \ No newline at end of file diff --git a/profile/em.env b/profile/em.env new file mode 100644 index 0000000..91d5c10 --- /dev/null +++ b/profile/em.env @@ -0,0 +1,3 @@ +const APP_URL = 'https://app.embeautyclinic.com'; + +module.exports = APP_URL; \ No newline at end of file diff --git a/profile/kesor.env b/profile/kesor.env new file mode 100644 index 0000000..d4b238c --- /dev/null +++ b/profile/kesor.env @@ -0,0 +1,3 @@ +const APP_URL = 'https://claris.cubetiqs.com'; + +module.exports = APP_URL; \ No newline at end of file