Skip to content

Commit

Permalink
Merge pull request #18 from codezerro/check-updater-l
Browse files Browse the repository at this point in the history
Check updater
  • Loading branch information
codezerro authored Nov 12, 2024
2 parents cc5dfca + 0796c29 commit fd3a766
Show file tree
Hide file tree
Showing 16 changed files with 731 additions and 300 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,5 @@ typings/
# Electron-Forge
out/
old/
dist/
dist/
node_modules
149 changes: 77 additions & 72 deletions electron-builder.yml
Original file line number Diff line number Diff line change
@@ -1,72 +1,77 @@
appId: com.roboticsacademy.app
productName: RoboticsAcademy
directories:
buildResources: build

buildDependenciesFromSource: true

extraResources:
- './splashscreen.html'
- 'resources/**'
- './roboticsacademy.db'
files:
- '!**/.vscode/*'
- '!src/*'
- '!electron.vite.config.{js,ts,mjs,cjs}'
- '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
- '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
asarUnpack:
- resources/**
win:
executableName: RoboticsAcademy
requestedExecutionLevel: requireAdministrator
target:
- nsis
icon: resources/icons/icon.ico
nsis:
artifactName: ${name}-${version}-setup.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
installerLanguages:
- en
- es
createDesktopShortcut: true
displayLanguageSelector: true
createStartMenuShortcut: true
allowToChangeInstallationDirectory: true
oneClick: false
perMachine: false
installerIcon: resources/icons/icon.ico
uninstallerIcon: resources/icons/icon.ico
installerHeaderIcon: resources/icons/icon.ico
license: license/license_en_US.txt

mac:
entitlementsInherit: build/entitlements.mac.plist
extendInfo:
- NSCameraUsageDescription: Application requests access to the device's camera.
- NSMicrophoneUsageDescription: Application requests access to the device's microphone.
- NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
notarize: false
dmg:
artifactName: ${name}-${version}.${ext}
linux:
icon: resources/icons/icon.icns
desktop:
Type: 'Application'
Encoding: 'UTF-8'
Name: 'Robotics Academy'
target:
- deb
maintainer: https://jderobot.github.io/RoboticsAcademy/
category: Utility
appImage:
artifactName: ${name}-${version}.${ext}
npmRebuild: false
publish:
provider: generic
url:
electronDownload:
mirror:
appId: com.roboticsacademy.app
productName: RoboticsAcademy
directories:
buildResources: build

buildDependenciesFromSource: true

extraResources:
- './splashscreen.html'
- './updaterScreen.html'
- 'resources/**'
- './roboticsacademy.db'
files:
- '!**/.vscode/*'
- '!src/*'
- '!electron.vite.config.{js,ts,mjs,cjs}'
- '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
- '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
asarUnpack:
- resources/**
win:
executableName: RoboticsAcademy
requestedExecutionLevel: requireAdministrator
target:
- nsis
icon: resources/icons/icon.ico
nsis:
artifactName: ${name}-${version}-setup.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
installerLanguages:
- en
- es
createDesktopShortcut: true
displayLanguageSelector: true
createStartMenuShortcut: true
allowToChangeInstallationDirectory: true
oneClick: false
perMachine: false
installerIcon: resources/icons/icon.ico
uninstallerIcon: resources/icons/icon.ico
installerHeaderIcon: resources/icons/icon.ico
license: license/license_en_US.txt

mac:
entitlementsInherit: build/entitlements.mac.plist
extendInfo:
- NSCameraUsageDescription: Application requests access to the device's camera.
- NSMicrophoneUsageDescription: Application requests access to the device's microphone.
- NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
notarize: false
dmg:
artifactName: ${name}-${version}.${ext}
linux:
icon: resources/icons/icon.icns
desktop:
Type: 'Application'
Encoding: 'UTF-8'
Name: 'Robotics Academy'
target:
- deb
maintainer: https://jderobot.github.io/RoboticsAcademy/
category: Utility
appImage:
artifactName: ${name}-${version}.${ext}
npmRebuild: false
publish:
provider: github
owner: JdeRobot
repo: RoboticsAcademy-Desktop
releaseType: release
private: false

electronDownload:
mirror:
23 changes: 0 additions & 23 deletions electron.vite.config.1723371720494.mjs

This file was deleted.

23 changes: 0 additions & 23 deletions electron.vite.config.1724091239149.mjs

This file was deleted.

153 changes: 78 additions & 75 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,75 +1,78 @@
{
"name": "RoboticsAcademy",
"version": "2.0.0",
"description": "Cross platform Desktop Application for Robotics Academy.",
"main": "./out/main/index.js",
"author": "Robotics Academy",
"contributors": [
{
"name": "JoseMaria Cañas",
"url": "https://gsyc.urjc.es/jmplaza/"
},
{
"name": "Apoorv Garg",
"url": "https://apoorvgarg.in/"
},
{
"name": "Md. Shariar Kabir",
"email": "[email protected]"
}
],
"homepage": "",
"scripts": {
"format": "prettier --write .",
"lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
"typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
"typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
"typecheck": "npm run typecheck:node && npm run typecheck:web",
"start": "electron-vite preview",
"dev": "electron-vite dev --watch",
"dist": "electron-builder --win",
"build": "npm run typecheck && electron-vite build",
"postinstall": "electron-builder install-app-deps",
"rebuild-sql": "electron-rebuild -f -w sqlite3",
"build:unpack": "npm run build && electron-builder --dir",
"build:win": "npm run build && electron-builder --win",
"build:mac": "electron-vite build && electron-builder --mac",
"build:linux": "electron-vite build && electron-builder --linux"
},
"dependencies": {
"@electron-toolkit/preload": "^3.0.1",
"@electron-toolkit/utils": "^3.0.0",
"electron-settings": "^4.0.4",
"electron-updater": "^6.2.1",
"node-gyp": "^10.2.0",
"sqlite3": "^5.1.7",
"uuid": "^10.0.0"
},
"devDependencies": {
"@electron-toolkit/eslint-config-prettier": "^2.0.0",
"@electron-toolkit/eslint-config-ts": "^2.0.0",
"@electron-toolkit/tsconfig": "^1.0.1",
"@types/node": "^22.1.0",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"autoprefixer": "^10.4.20",
"electron": "^32.1.0",
"electron-builder": "^24.13.3",
"electron-rebuild": "^3.2.9",
"electron-vite": "^2.3.0",
"eslint": "^9.8.0",
"eslint-plugin-react": "^7.35.0",
"flowbite": "^2.5.1",
"flowbite-react": "^0.10.1",
"postcss": "^8.4.41",
"prettier": "^3.3.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.8",
"typescript": "^5.5.4",
"vite": "^5.4.0"
},
"repository": "https://github.com/codezerro/RoboticsAcademy-Desktop.git",
"license": "MIT"
}
{
"name": "RoboticsAcademy",
"version": "2.0.0",
"description": "Cross platform Desktop Application for Robotics Academy.",
"main": "./out/main/index.js",
"author": "Robotics Academy",
"contributors": [
{
"name": "JoseMaria Cañas",
"url": "https://gsyc.urjc.es/jmplaza/"
},
{
"name": "Apoorv Garg",
"url": "https://apoorvgarg.in/"
},
{
"name": "Md. Shariar Kabir",
"email": "[email protected]"
}
],
"homepage": "https://jderobot.github.io/",
"scripts": {
"format": "prettier --write .",
"lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
"typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
"typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
"typecheck": "npm run typecheck:node && npm run typecheck:web",
"start": "electron-vite preview",
"dev": "electron-vite dev --watch",
"dist": "electron-builder --win",
"build": "npm run typecheck && electron-vite build",
"postinstall": "electron-builder install-app-deps",
"rebuild-sql": "electron-rebuild -f -w sqlite3",
"build:unpack": "npm run build && electron-builder --dir",
"build:win": "npm run build && electron-builder --win",
"build:mac": "electron-vite build && electron-builder --mac",
"build:linux": "electron-vite build && electron-builder --linux"
},
"dependencies": {
"@electron-toolkit/preload": "^3.0.1",
"@electron-toolkit/utils": "^3.0.0",
"electron-settings": "^4.0.4",
"electron-updater": "^6.3.9",
"node-gyp": "^10.2.0",
"sqlite3": "^5.1.7",
"uuid": "^10.0.0"
},
"devDependencies": {
"@electron-toolkit/eslint-config-prettier": "^2.0.0",
"@electron-toolkit/eslint-config-ts": "^2.0.0",
"@electron-toolkit/tsconfig": "^1.0.1",
"@types/node": "^22.1.0",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"autoprefixer": "^10.4.20",
"electron": "^32.1.0",
"electron-builder": "^24.13.3",
"electron-rebuild": "^3.2.9",
"electron-vite": "^2.3.0",
"eslint": "^9.8.0",
"eslint-plugin-react": "^7.35.0",
"flowbite": "^2.5.1",
"flowbite-react": "^0.10.1",
"postcss": "^8.4.41",
"prettier": "^3.3.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.8",
"typescript": "^5.5.4",
"vite": "^5.4.0"
},
"repository": {
"type": "git",
"url": "https://github.com/codezerro/RoboticsAcademy-Desktop"
},
"license": "MIT"
}
Binary file modified roboticsacademy.db
Binary file not shown.
2 changes: 1 addition & 1 deletion splashscreen.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h2 style="margin: 0px">Robotics Academy</h2>
<p class="developer">by <span class="orginzationText">JdeRobot</span></p>
</div>
<img src="./resources/loading.svg" class="loading-dots" />
<p class="version">v2.0.0</p>
<p id="version" class="version">v2.0.0</p>
</div>
</body>
</html>
Loading

0 comments on commit fd3a766

Please sign in to comment.