Fix serving local files, fixes #26, #27 (#28)

* Fix serving local files, fixes #26, #27 * Reenable file uploads in the frontend
soundscape-community · Feb 29, 2024 · 4e503a8 · 4e503a8
1 parent b878ad1
commit 4e503a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/backend/backend/urls.py b/backend/backend/urls.py
@@ -36,7 +36,7 @@
 ]
 
 # Serve user file uploads
-if os.environ.get('ENV') == 'local':
+if settings.MEDIA_URL and settings.MEDIA_ROOT :
     # In a local environment, this is used for storing and serving user file uploads.
     urlpatterns.extend(static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT))
 else:

diff --git a/frontend/src/components/Forms/ActivityForm.jsx b/frontend/src/components/Forms/ActivityForm.jsx
@@ -242,7 +242,6 @@ export default class ActivityForm extends React.Component {
                 <Form.Control
                   type="file"
                   accept="image/jpeg, image/jpg, image/png"
-                  disabled={true} // blobbed: disabled image upload
                   name="image_filename"
                   value={values.image_filename}
                   onChange={(event) => {

diff --git a/frontend/src/components/Forms/WaypointForm.jsx b/frontend/src/components/Forms/WaypointForm.jsx
@@ -351,9 +351,7 @@ export default class WaypointForm extends React.Component {
                       <Dropzone
                         accept={{ 'image/jpeg': ['.jpeg', '.jpg'], 'image/png': ['.png'] }}
                         maxFiles={MAX_MEDIA_FILES}
-                        // blobbed: disabled image upload
-                        // disabled={this.shouldDisableImageInput(values)}
-                        disabled={true}
+                        disabled={this.shouldDisableImageInput(values)}
                         onDrop={(acceptedFiles, fileRejections) => {
                           const totalFiles = values.images.length + values.image_files.length + acceptedFiles.length;
                           if (totalFiles > MAX_MEDIA_FILES || fileRejections.length > MAX_MEDIA_FILES) {
@@ -481,9 +479,7 @@ export default class WaypointForm extends React.Component {
                           'audio/aac': ['.aac'],
                         }}
                         maxFiles={MAX_MEDIA_FILES}
-                        // blobbed: disabled blob service endpoint
-                        // disabled={this.shouldDisableAudioInput(values)}
-                        disabled={true}
+                        disabled={this.shouldDisableAudioInput(values)}
                         onDrop={(acceptedFiles, fileRejections) => {
                           const totalFiles =
                             values.audio_clips.length + values.audio_clip_files.length + acceptedFiles.length;