Skip to content

Fix for root apps #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tim-webflow wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fix for root apps #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
672b352
Adapt for base URL that could be /
tim-webflow Apr 3, 2026
d187970
Remove this because it deals with page routing
tim-webflow Apr 3, 2026
291ac5f
Debugging by logging
tim-webflow Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion astro.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ export default defineConfig({
: undefined,
},
},
});
});
17 changes: 12 additions & 5 deletions src/components/FileUploader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default function FileUploader() {
const loadFiles = async () => {
try {
setLoading(true);
const response = await fetch(`${import.meta.env.BASE_URL}/api/list-assets`);
const response = await fetch(`${import.meta.env.BASE_URL}api/list-assets`);

if (!response.ok) {
throw new Error("Failed to load files");
Expand Down Expand Up @@ -119,7 +119,7 @@ export default function FileUploader() {
formData.append("file", file);


const response = await fetch(`${import.meta.env.BASE_URL}/api/upload`, {
const response = await fetch(`${import.meta.env.BASE_URL}api/upload`, {
method: "POST",
body: formData,
});
Expand Down Expand Up @@ -154,8 +154,7 @@ export default function FileUploader() {
setProgress(0);

try {
const assetsPrefix = import.meta.env.ASSETS_PREFIX || "";
const BASE_CF_URL = `${assetsPrefix}/api/multipart-upload`;
const BASE_CF_URL = `${import.meta.env.BASE_URL}api/multipart-upload`;
const key = file.name;
const CHUNK_SIZE = 5 * 1024 * 1024; // 5MB
const totalParts = Math.ceil(file.size / CHUNK_SIZE);
Expand Down Expand Up @@ -527,7 +526,7 @@ export default function FileUploader() {
const fileLink =
file.link ||
(file.key
? `${import.meta.env.ASSETS_PREFIX}/api/asset?key=${file.key}`
? `${import.meta.env.BASE_URL}api/asset?key=${file.key}`
: "");
const uploadDate =
file.dateUploaded || file.uploaded || new Date().toISOString();
Expand Down Expand Up @@ -636,6 +635,14 @@ export default function FileUploader() {
</div>
)}
</div>
<div>
Environment variables:
<ul>
<li>
BASE_URL: {import.meta.env.BASE_URL}
</li>
</ul>
</div>

<style
dangerouslySetInnerHTML={{
Expand Down
9 changes: 3 additions & 6 deletions src/pages/files.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
---
import Layout from '../layouts/Layout.astro';

// Get the assets prefix from environment
const assetsPrefix = Astro.locals.runtime?.env?.ASSETS_PREFIX || '/app';
---

<Layout title="File Uploader">
Expand Down Expand Up @@ -76,7 +73,7 @@ const assetsPrefix = Astro.locals.runtime?.env?.ASSETS_PREFIX || '/app';
</Layout>

<script>
const assetsPrefix = '${assetsPrefix}';
const assetsPrefix = import.meta.env.BASE_URL;

// DOM elements
const uploadForm = document.getElementById('uploadForm') as HTMLFormElement;
Expand Down Expand Up @@ -161,7 +158,7 @@ const assetsPrefix = Astro.locals.runtime?.env?.ASSETS_PREFIX || '/app';
loadingFiles.classList.remove('hidden');
filesList.innerHTML = '';

const response = await fetch(`${assetsPrefix}/api/list-assets`);
const response = await fetch(`${assetsPrefix}api/list-assets`);
if (!response.ok) {
throw new Error('Failed to load files');
}
Expand Down Expand Up @@ -244,7 +241,7 @@ const assetsPrefix = Astro.locals.runtime?.env?.ASSETS_PREFIX || '/app';
progressBar.style.width = `${progress}%`;
progressText.textContent = `Uploading ${file.name}...`;

const response = await fetch(`${assetsPrefix}/api/upload`, {
const response = await fetch(`${assetsPrefix}api/upload`, {
method: 'POST',
body: formData
});
Expand Down