fix paths

This commit is contained in:
koalasat 2024-09-18 12:51:21 +02:00
parent 8b329b9567
commit 496499261a
No known key found for this signature in database
GPG Key ID: 2F7F61C6146AB157
3 changed files with 40 additions and 25 deletions

11
.gitignore vendored
View File

@ -642,7 +642,7 @@ frontend/static/import_export*
frontend/static/drf_spectacular_sidecar/ frontend/static/drf_spectacular_sidecar/
frontend/src/components/PaymentMethods/Icons/code* frontend/src/components/PaymentMethods/Icons/code*
frontend/src/components/PaymentMethods/Icons/webp* frontend/src/components/PaymentMethods/Icons/webp*
frontend/static/frontend/** frontend/static/frontend
docs/.jekyll-cache* docs/.jekyll-cache*
docs/_site* docs/_site*
node node
@ -650,13 +650,12 @@ desktopApp/release-builds
# frontend statics # frontend statics
frontend/templates/frontend/*.html frontend/templates/frontend/*.html
mobile/html/Web.bundle/static/* mobile/html/Web.bundle
mobile/html/Web.bundle/*.html desktopApp/static
desktopApp/static/*
desktopApp/*.html desktopApp/*.html
web/static/* web/static
web/*.html web/*.html
nodeapp/static/* nodeapp/static
nodeapp/*.html nodeapp/*.html
# Protocol Buffers # Protocol Buffers

View File

@ -2,10 +2,10 @@
<html> <html>
<head> <head>
<meta http-equiv="onion-location" content="{{ ONION_LOCATION }}" /> <meta http-equiv="onion-location" content="{{ ONION_LOCATION }}" />
<link rel="shortcut icon" href="./static/assets/images/favicon-96x96.png" /> <link rel="shortcut icon" href="<%= htmlWebpackPlugin.options.basePath %>static/assets/images/favicon-96x96.png" />
<link rel="icon" type="image/png" href="./static/assets/images/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.options.basePath %>static/assets/images/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="./static/assets/images/favicon-96x96.png" sizes="96x96"> <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.options.basePath %>static/assets/images/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="./static/assets/images/favicon-192x192.png" sizes="192x192"> <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.options.basePath %>static/assets/images/favicon-192x192.png" sizes="192x192">
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
@ -13,18 +13,18 @@
<% if (pro) { %> <% if (pro) { %>
<title>RoboSats PRO - Simple and Private Bitcoin Exchange</title> <title>RoboSats PRO - Simple and Private Bitcoin Exchange</title>
<link rel="stylesheet" href="./static/css_pro/fonts.css"/> <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.basePath %>static/css_pro/fonts.css"/>
<link rel="stylesheet" type="text/css" href="./static/css_pro/react-grid-layout.css"/> <link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.basePath %>static/css_pro/react-grid-layout.css"/>
<link rel="stylesheet" type="text/css" href="./static/css_pro/react-resizable.css"/> <link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.basePath %>static/css_pro/react-resizable.css"/>
<% } else { %> <% } else { %>
<title>RoboSats - Simple and Private Bitcoin Exchange</title> <title>RoboSats - Simple and Private Bitcoin Exchange</title>
<link rel="stylesheet" href="./static/css/fonts.css"/> <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.basePath %>static/css/fonts.css"/>
<% } %> <% } %>
<link rel="stylesheet" type="text/css" href="./static/css/loader.css"/> <link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.basePath %>static/css/loader.css"/>
<link rel="stylesheet" type="text/css" href="./static/css/index.css"/> <link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.basePath %>static/css/index.css"/>
<link rel="stylesheet" type="text/css" href="./static/css/leaflet.css"/> <link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.basePath %>static/css/leaflet.css"/>
</head> </head>
<body> <body>
<noscript> <noscript>

View File

@ -32,7 +32,7 @@ const configNode: Configuration = {
path: path.resolve(__dirname, 'static/frontend'), path: path.resolve(__dirname, 'static/frontend'),
filename: `main.v${version}.[contenthash].js`, filename: `main.v${version}.[contenthash].js`,
clean: true, clean: true,
publicPath: './static/frontend/', publicPath: '/static/frontend/',
}, },
plugins: [ plugins: [
// Django // Django
@ -44,6 +44,7 @@ const configNode: Configuration = {
filename: path.resolve(__dirname, 'templates/frontend/basic.html'), filename: path.resolve(__dirname, 'templates/frontend/basic.html'),
inject: 'body', inject: 'body',
robosatsSettings: 'web-basic', robosatsSettings: 'web-basic',
basePath: '/',
}), }),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, 'templates/frontend/index.ejs'), template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@ -53,6 +54,7 @@ const configNode: Configuration = {
filename: path.resolve(__dirname, 'templates/frontend/pro.html'), filename: path.resolve(__dirname, 'templates/frontend/pro.html'),
inject: 'body', inject: 'body',
robosatsSettings: 'web-pro', robosatsSettings: 'web-pro',
basePath: '/',
}), }),
// Node App // Node App
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
@ -63,6 +65,7 @@ const configNode: Configuration = {
filename: path.resolve(__dirname, '../nodeapp/basic.html'), filename: path.resolve(__dirname, '../nodeapp/basic.html'),
inject: 'body', inject: 'body',
robosatsSettings: 'selfhosted-basic', robosatsSettings: 'selfhosted-basic',
basePath: '/',
}), }),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, 'templates/frontend/index.ejs'), template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@ -72,6 +75,7 @@ const configNode: Configuration = {
filename: path.resolve(__dirname, '../nodeapp/pro.html'), filename: path.resolve(__dirname, '../nodeapp/pro.html'),
inject: 'body', inject: 'body',
robosatsSettings: 'selfhosted-pro', robosatsSettings: 'selfhosted-pro',
basePath: '/',
}), }),
new FileManagerPlugin({ new FileManagerPlugin({
events: { events: {
@ -94,6 +98,7 @@ const configNode: Configuration = {
filename: path.resolve(__dirname, '../desktopApp/index.html'), filename: path.resolve(__dirname, '../desktopApp/index.html'),
inject: 'body', inject: 'body',
robosatsSettings: 'desktop-basic', robosatsSettings: 'desktop-basic',
basePath: '/',
}), }),
new FileManagerPlugin({ new FileManagerPlugin({
events: { events: {
@ -116,6 +121,7 @@ const configNode: Configuration = {
filename: path.resolve(__dirname, '../web/basic.html'), filename: path.resolve(__dirname, '../web/basic.html'),
inject: 'body', inject: 'body',
robosatsSettings: 'web-basic', robosatsSettings: 'web-basic',
basePath: '/',
}), }),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, 'templates/frontend/index.ejs'), template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@ -125,6 +131,7 @@ const configNode: Configuration = {
filename: path.resolve(__dirname, '../web/pro.html'), filename: path.resolve(__dirname, '../web/pro.html'),
inject: 'body', inject: 'body',
robosatsSettings: 'web-pro', robosatsSettings: 'web-pro',
basePath: '/',
}), }),
new FileManagerPlugin({ new FileManagerPlugin({
events: { events: {
@ -188,6 +195,12 @@ const configMobile: Configuration = {
}, },
], ],
}, },
output: {
path: path.resolve(__dirname, '../mobile/html/Web.bundle/static/frontend'),
filename: `main.v${version}.[contenthash].js`,
clean: true,
publicPath: './static/frontend/',
},
plugins: [ plugins: [
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, 'templates/frontend/index.ejs'), template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@ -197,6 +210,7 @@ const configMobile: Configuration = {
filename: path.resolve(__dirname, '../mobile/html/Web.bundle/index.html'), filename: path.resolve(__dirname, '../mobile/html/Web.bundle/index.html'),
inject: 'body', inject: 'body',
robosatsSettings: 'mobile-basic', robosatsSettings: 'mobile-basic',
basePath: './',
}), }),
new FileManagerPlugin({ new FileManagerPlugin({
events: { events: {
@ -204,19 +218,21 @@ const configMobile: Configuration = {
copy: [ copy: [
{ {
source: path.resolve(__dirname, 'static/css'), source: path.resolve(__dirname, 'static/css'),
destination: path.resolve(__dirname, '../mobile/html/Web.bundle/static'), destination: path.resolve(__dirname, '../mobile/html/Web.bundle/static/css'),
},
{
source: path.resolve(__dirname, 'static/assets/sounds'),
destination: path.resolve(__dirname, '../mobile/html/Web.bundle/assets/sounds'),
},
{
source: path.resolve(__dirname, 'static/federation'),
destination: path.resolve(__dirname, '../mobile/html/Web.bundle/assets/federation'),
}, },
], ],
}, },
}, },
}), }),
], ],
output: {
path: path.resolve(__dirname, '../mobile/html/Web.bundle/static/frontend'),
filename: `main.v${version}.[contenthash].js`,
clean: true,
publicPath: './static/frontend/',
},
}; };
export default [configNode, configMobile]; export default [configNode, configMobile];