Desktop app fix 2

This commit is contained in:
koalasat
2025-08-12 13:11:51 +02:00
parent f79d3789b6
commit 392f31d1e4
3 changed files with 959 additions and 123 deletions

View File

@ -65,7 +65,7 @@ jobs:
path: | path: |
desktopApp/static desktopApp/static
desktopApp/*.html desktopApp/*.html
- name: 'Archive Django Static Build Results' - name: 'Archive Web Static Build Results'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: web-main-static name: web-main-static

File diff suppressed because it is too large Load Diff

View File

@ -91,14 +91,7 @@ const configNode = (env: any, argv: { mode: string }): Configuration => {
robosatsSettings: 'selfhosted-pro', robosatsSettings: 'selfhosted-pro',
basePath: '/', basePath: '/',
}), }),
new CopyWebpackPlugin({
patterns: [
{
from: path.resolve(__dirname, 'static'),
to: path.resolve(__dirname, '../nodeapp/static'),
},
],
}),
// Desktop App // Desktop App
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, 'templates/frontend/index.ejs'), template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@ -111,14 +104,7 @@ const configNode = (env: any, argv: { mode: string }): Configuration => {
robosatsSettings: 'desktop-basic', robosatsSettings: 'desktop-basic',
basePath: '/', basePath: '/',
}), }),
new CopyWebpackPlugin({
patterns: [
{
from: path.resolve(__dirname, 'static'),
to: path.resolve(__dirname, '../desktopApp/static'),
},
],
}),
// Web App // Web App
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, 'templates/frontend/index.ejs'), template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@ -142,11 +128,23 @@ const configNode = (env: any, argv: { mode: string }): Configuration => {
robosatsSettings: 'web-pro', robosatsSettings: 'web-pro',
basePath: '/', basePath: '/',
}), }),
new CopyWebpackPlugin({ new CopyWebpackPlugin({
patterns: [ patterns: [
// Copy to nodeapp
{ {
from: path.resolve(__dirname, 'static'), from: path.resolve(__dirname, 'static'),
to: path.resolve(__dirname, '../web/static'), to: path.resolve(__dirname, '../../../nodeapp/static'),
},
// Copy to desktopApp
{
from: path.resolve(__dirname, 'static'),
to: path.resolve(__dirname, '../../../desktopApp/static'),
},
// Copy to web
{
from: path.resolve(__dirname, 'static'),
to: path.resolve(__dirname, '../../../web/static'),
}, },
], ],
}), }),