make web version work, add dockerfile

This commit is contained in:
2025-08-04 23:28:58 +02:00
parent fb81499fed
commit d1322d117a
6 changed files with 76 additions and 42 deletions

7
Dockerfile Normal file
View File

@@ -0,0 +1,7 @@
FROM nginx:alpine
COPY ./build/web /usr/share/nginx/html
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]

View File

@@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
android = {
enable = true;
emulator.enable = false;
@@ -39,4 +38,15 @@
# Needed by flutter_secure_storage
libsecret.dev
];
processes.web-server = {
exec = "python -m http.server 8080 -d build/web";
};
scripts = {
web-to-container.exec = ''
flutter build web --release
docker build -t sheetless .
'';
};
}

View File

@@ -1,6 +1,7 @@
import 'dart:convert';
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:http/http.dart' as http;
import 'package:logging/logging.dart';
import 'package:path_provider/path_provider.dart'; // For cache storage
@@ -21,10 +22,7 @@ class ApiClient {
final response = await http.post(
Uri.parse(url),
headers: {'Content-Type': 'application/json'},
body: jsonEncode({
'email': username,
'password': password,
}),
body: jsonEncode({'email': username, 'password': password}),
);
if (response.statusCode == 200) {
@@ -59,7 +57,8 @@ class ApiClient {
return response;
} else {
log.warning(
'GET request failed: ${response.statusCode} ${response.body}');
'GET request failed: ${response.statusCode} ${response.body}',
);
}
} catch (e) {
log.warning('Error during GET request', e);
@@ -68,7 +67,9 @@ class ApiClient {
}
Future<http.Response?> post(
String endpoint, Map<String, dynamic> body) async {
String endpoint,
Map<String, dynamic> body,
) async {
try {
final url = '$baseUrl$endpoint';
final headers = {
@@ -86,7 +87,8 @@ class ApiClient {
return response;
} else {
log.info(
'POST request failed: ${response.statusCode} ${response.body}');
'POST request failed: ${response.statusCode} ${response.body}',
);
}
} catch (e) {
log.info('Error during POST request: $e');
@@ -112,7 +114,8 @@ class ApiClient {
return response;
} else {
log.info(
'POST Form Data request failed: ${response.statusCode} ${response.body}');
'POST Form Data request failed: ${response.statusCode} ${response.body}',
);
}
} catch (e) {
log.info('Error during POST Form Data request: $e');
@@ -135,7 +138,8 @@ class ApiClient {
.toList();
} else {
log.warning(
'Failed to fetch sheets with status: ${response.statusCode}');
'Failed to fetch sheets with status: ${response.statusCode}',
);
log.info('Response: ${response.body}');
}
} catch (e) {
@@ -145,6 +149,25 @@ class ApiClient {
return List.empty();
}
Future<Uint8List?> fetchPdfFileData(String sheetUuid) async {
try {
final response = await get('/sheet/pdf/$sheetUuid', isBinary: true);
if (response != null && response.statusCode == 200) {
log.info("PDF downloaded");
return response.bodyBytes;
} else {
log.warning(
"Failed to fetch PDF from API. Status: ${response?.statusCode}",
);
}
} catch (e) {
log.warning("Error fetching PDF", e);
}
return null;
}
Future<File?> getPdfFileCached(String sheetUuid) async {
try {
final cacheDir = await getTemporaryDirectory();
@@ -156,16 +179,11 @@ class ApiClient {
return cachedFile;
}
final response = await get('/sheet/pdf/$sheetUuid', isBinary: true);
if (response != null && response.statusCode == 200) {
await cachedFile.writeAsBytes(response.bodyBytes);
log.info("PDF downloaded and cached at: $cachedPdfPath");
return cachedFile;
} else {
log.warning(
"Failed to fetch PDF from API. Status: ${response?.statusCode}");
}
final pdfFileData = await fetchPdfFileData(sheetUuid);
await cachedFile.writeAsBytes(
pdfFileData!,
); // TODO: proper error handling
log.info("PDF cached at: $cachedPdfPath");
} catch (e) {
log.warning("Error fetching PDF", e);
}

View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
import 'package:pdfrx/pdfrx.dart';
import 'login_page.dart';
@@ -12,6 +13,8 @@ void main() {
}
});
pdfrxFlutterInitialize(); // Needed for web
runApp(const MyApp());
}
@@ -22,10 +25,7 @@ class MyApp extends StatelessWidget {
Widget build(BuildContext context) {
return MaterialApp(
title: 'Sheetless',
theme: ThemeData(
useMaterial3: true,
primarySwatch: Colors.blue,
),
theme: ThemeData(useMaterial3: true, primarySwatch: Colors.blue),
home: const LoginPage(),
);
}

View File

@@ -1,3 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_drawing_board/flutter_drawing_board.dart';
@@ -43,13 +44,21 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
}
Future<bool> loadPdf() async {
if (kIsWeb) {
var data = await widget.apiClient.fetchPdfFileData(widget.sheet.uuid);
if (data == null) {
throw Exception("Failed fetching pdf file");
}
document = await PdfDocument.openData(data);
} else {
var file = await widget.apiClient.getPdfFileCached(widget.sheet.uuid);
if (file == null) {
throw Exception("Failed fetching pdf file");
}
document = await PdfDocument.openFile(file.path);
}
return true;
}

View File

@@ -21,7 +21,7 @@
<meta name="description" content="A new Flutter project.">
<!-- iOS meta tags & icons -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="sheetless">
<link rel="apple-touch-icon" href="icons/Icon-192.png">
@@ -33,16 +33,6 @@
<link rel="manifest" href="manifest.json">
</head>
<body>
<script src='https://cdn.jsdelivr.net/npm/pdfjs-dist@4.6.82/build/pdf.min.mjs' type='module'></script>
<script type='module'>
var { pdfjsLib } = globalThis;
pdfjsLib.GlobalWorkerOptions.workerSrc = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@4.6.82/build/pdf.worker.mjs';
var pdfRenderOptions = {
cMapUrl: 'https://cdn.jsdelivr.net/npm/pdfjs-dist@4.6.82/cmaps/',
cMapPacked: true,
}
</script>
<script src="flutter_bootstrap.js" async></script>
</body>
</html>