Skip to content

Commit cafddb0

Browse files
LeGmaskLeGmask
authored
Merge pull request #11 from schoolsyst/LeGmask/issue1
Fixes #1
2 parents a964878 + e9b4fc6 commit cafddb0

15 files changed

+7037
-615
lines changed

‎.github/workflows/ci-workflow.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ jobs:
1919
uses: actions/setup-node@v1
2020
with:
2121
node-version: 12.x
22+
- run: sudo apt-get install -y zip
2223
- run: npm i --dev && cd ./webapp && npm i --dev && npm run build:dev && cd ../
23-
- run: npm run dist:linux
24+
- run: npm run make
2425
- uses: actions/upload-artifact@master
2526
with:
26-
name: schoolsyst-desktop.appImage
27-
path: dist/**.AppImage
27+
name: schoolsyst-desktop.deb
28+
path: out/make/**.deb
29+
- uses: actions/upload-artifact@master
30+
with:
31+
name: schoolsyst-desktop-linux.zip
32+
path: out/make/**.zip
2833

2934
windows:
3035
runs-on: windows-latest
@@ -38,8 +43,8 @@ jobs:
3843
with:
3944
node-version: 12.x
4045
- run: npm i --dev; cd .\webapp; npm i --dev; npm run build:dev; cd ..\ # Install webapp and build in dev (api doesn't accept cross orgin request)
41-
- run: npm run dist:win # (build the desktop app)
46+
- run: npm run make # (build the desktop app)
4247
- uses: actions/upload-artifact@master
4348
with:
44-
name: schoolsyst-desktop.exe
45-
path: dist/**.exe
49+
name: schoolsyst-desktop Setup.exe
50+
path: out/make/squirrel.windows/x64/**.exe

‎.gitignore

+107-104
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,107 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
7-
lerna-debug.log*
8-
9-
# Diagnostic reports (https://nodejs.org/api/report.html)
10-
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
11-
12-
# Runtime data
13-
pids
14-
*.pid
15-
*.seed
16-
*.pid.lock
17-
18-
# Directory for instrumented libs generated by jscoverage/JSCover
19-
lib-cov
20-
21-
# Coverage directory used by tools like istanbul
22-
coverage
23-
*.lcov
24-
25-
# nyc test coverage
26-
.nyc_output
27-
28-
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
29-
.grunt
30-
31-
# Bower dependency directory (https://bower.io/)
32-
bower_components
33-
34-
# node-waf configuration
35-
.lock-wscript
36-
37-
# Compiled binary addons (https://nodejs.org/api/addons.html)
38-
build/Release
39-
40-
# Dependency directories
41-
node_modules/
42-
jspm_packages/
43-
44-
# TypeScript v1 declaration files
45-
typings/
46-
47-
# TypeScript cache
48-
*.tsbuildinfo
49-
50-
# Optional npm cache directory
51-
.npm
52-
53-
# Optional eslint cache
54-
.eslintcache
55-
56-
# Microbundle cache
57-
.rpt2_cache/
58-
.rts2_cache_cjs/
59-
.rts2_cache_es/
60-
.rts2_cache_umd/
61-
62-
# Optional REPL history
63-
.node_repl_history
64-
65-
# Output of 'npm pack'
66-
*.tgz
67-
68-
# Yarn Integrity file
69-
.yarn-integrity
70-
71-
# dotenv environment variables file
72-
.env
73-
.env.test
74-
75-
# parcel-bundler cache (https://parceljs.org/)
76-
.cache
77-
78-
# Next.js build output
79-
.next
80-
81-
# Nuxt.js build / generate output
82-
.nuxt
83-
dist
84-
85-
# Gatsby files
86-
.cache/
87-
# Comment in the public line in if your project uses Gatsby and *not* Next.js
88-
# https://nextjs.org/blog/next-9-1#public-directory-support
89-
# public
90-
91-
# vuepress build output
92-
.vuepress/dist
93-
94-
# Serverless directories
95-
.serverless/
96-
97-
# FuseBox cache
98-
.fusebox/
99-
100-
# DynamoDB Local files
101-
.dynamodb/
102-
103-
# TernJS port file
104-
.tern-port
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
lerna-debug.log*
8+
9+
# Diagnostic reports (https://nodejs.org/api/report.html)
10+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
11+
12+
# Runtime data
13+
pids
14+
*.pid
15+
*.seed
16+
*.pid.lock
17+
18+
# Directory for instrumented libs generated by jscoverage/JSCover
19+
lib-cov
20+
21+
# Coverage directory used by tools like istanbul
22+
coverage
23+
*.lcov
24+
25+
# nyc test coverage
26+
.nyc_output
27+
28+
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
29+
.grunt
30+
31+
# Bower dependency directory (https://bower.io/)
32+
bower_components
33+
34+
# node-waf configuration
35+
.lock-wscript
36+
37+
# Compiled binary addons (https://nodejs.org/api/addons.html)
38+
build/Release
39+
40+
# Dependency directories
41+
node_modules/
42+
jspm_packages/
43+
44+
# TypeScript v1 declaration files
45+
typings/
46+
47+
# TypeScript cache
48+
*.tsbuildinfo
49+
50+
# Optional npm cache directory
51+
.npm
52+
53+
# Optional eslint cache
54+
.eslintcache
55+
56+
# Microbundle cache
57+
.rpt2_cache/
58+
.rts2_cache_cjs/
59+
.rts2_cache_es/
60+
.rts2_cache_umd/
61+
62+
# Optional REPL history
63+
.node_repl_history
64+
65+
# Output of 'npm pack'
66+
*.tgz
67+
68+
# Yarn Integrity file
69+
.yarn-integrity
70+
71+
# dotenv environment variables file
72+
.env
73+
.env.test
74+
75+
# parcel-bundler cache (https://parceljs.org/)
76+
.cache
77+
78+
# Next.js build output
79+
.next
80+
81+
# Nuxt.js build / generate output
82+
.nuxt
83+
dist
84+
85+
# Gatsby files
86+
.cache/
87+
# Comment in the public line in if your project uses Gatsby and *not* Next.js
88+
# https://nextjs.org/blog/next-9-1#public-directory-support
89+
# public
90+
91+
# vuepress build output
92+
.vuepress/dist
93+
94+
# Serverless directories
95+
.serverless/
96+
97+
# FuseBox cache
98+
.fusebox/
99+
100+
# DynamoDB Local files
101+
.dynamodb/
102+
103+
# TernJS port file
104+
.tern-port
105+
106+
# Executable generated buy electron-forge
107+
out/

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "webapp"]
22
path = webapp
33
url = https://github.com/schoolsyst/webapp.git
4+
[submodule "design"]
5+
path = design
6+
url = https://github.com/schoolsyst/design.git

‎app.js

-38
This file was deleted.

‎build/logo_schoolsyst.ico

-21.1 KB
Binary file not shown.

‎build/logo_schoolsyst.png

-18.5 KB
Binary file not shown.

‎design

Submodule design added at 79d1900

‎forge.config.js

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
const path = require('path');
2+
module.exports = {
3+
make_targets: {
4+
win32: [
5+
"squirrel"
6+
],
7+
darwin: [
8+
"zip"
9+
],
10+
linux: [
11+
"deb",
12+
"zip"
13+
]
14+
},
15+
electronPackagerConfig: {
16+
icon: path.join(__dirname, "design/logo/app-icon.png"),
17+
packageManager: "yarn",
18+
asar: true,
19+
ignore: [
20+
".git(ignore|modules)",
21+
"(webapp)\/(?!dist)\\S+",
22+
"license",
23+
"nodemon.config.json",
24+
"README.md",
25+
"setup.js"
26+
]
27+
},
28+
electronWinstallerConfig: {
29+
name: "schoolsyst-desktop",
30+
iconUrl: "https://raw.githubusercontent.com/schoolsyst/design/master/logo/app-icon.ico",
31+
setupIcon: path.join(__dirname, "design/logo/app-icon.ico"),
32+
loadingGif: path.join(__dirname, "design/logo-animations/loading-overlay.gif")
33+
},
34+
electronInstallerDebian: {},
35+
electronInstallerRedhat: {},
36+
github_repository: {
37+
owner: "schoolsyst",
38+
name: "desktop"
39+
},
40+
windowsStoreConfig: {
41+
packageName: "com.schoolsyst.desktop",
42+
name: "schoolsyst-desktop"
43+
},
44+
publishers: [
45+
{
46+
name: '@electron-forge/publisher-github',
47+
platforms: ['win32', 'linux'],
48+
config: {
49+
owner: 'schoolsyst',
50+
name: 'desktop'
51+
}
52+
}
53+
]
54+
}

0 commit comments

Comments
 (0)