Skip to content

Commit

Permalink
Merge branch 'main' into remove-babel-bloat
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielfang97
danielfang97 authored Oct 16, 2024
2 parents 09fab74 + 473de20 commit 3a7d3f0
Show file tree
Hide file tree
Showing 28 changed files with 24 additions and 62 deletions.
15 changes: 8 additions & 7 deletions frontend/components/Admin/Theme.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,19 @@ export default function Theme() {
formData.append('baseColor', baseColor);
formData.append('removePublicEnabled', removePublicEnabled);
formData.append('showModuleInteractions', showModuleInteractions);
if (logoFile) {
formData.append('logo', logoFile);
}
// if (logoFile) {
// formData.append('logo', logoFile);
// }

try {
const response = await fetch(url, { method: 'POST', headers, body: formData });
const data = await response.json();
console.log(data);

console.log(response);
const data = await response.text();

if (response.ok) {
console.log(localStorage.getItem('theme'));
// localStorage.setItem('theme', JSON.stringify(data.requestBody));

console.log(data);

if (data.requestBody) {
// Get the current theme from local storage
Expand All @@ -107,6 +107,7 @@ export default function Theme() {

// Store the updated theme in local storage
localStorage.setItem('theme', JSON.stringify(currentTheme));
console.log(localStorage);
}
} else {
alert("Error saving theme");
Expand Down
5 changes: 1 addition & 4 deletions frontend/components/Viewing/PageJSON/Types/CombinatorialDerivation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,7 @@
],

"pages": [
"Details",
"$TABLES[Variable Components]",
"Other Properties",
"Member of these Collections",
"Attachments"
"Other Properties"
]
}
5 changes: 1 addition & 4 deletions frontend/components/Viewing/PageJSON/Types/CombinatorialDerivation3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,7 @@
],

"pages": [
"Details",
"$TABLES[Variable Components]",
"Other Properties",
"Member of these Collections",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/ComponentReference3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@
"tables": [
],
"pages": [
"Details",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/Cut.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
"tables": [
],
"pages": [
"Details",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/Cut3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
"tables": [
],
"pages": [
"Details",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/EntireSequence3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
"tables": [
],
"pages": [
"Details",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/ExternallyDefined3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@
"tables": [
],
"pages": [
"Details",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/FunctionalComponent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@
}
],
"pages": [
"Details",
"$TABLES[MapsTo]",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/Interface3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
],
"pages": [
"$TABLES[Features]",
"Details",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/LocalSubComponent3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@
}
],
"pages": [
"Details",
"$TABLES[Locations]",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/MapsTo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@
"tables": [
],
"pages": [
"Details",
"Other Properties",
"Attachments"
"Other Properties"
]
}
1 change: 0 additions & 1 deletion frontend/components/Viewing/PageJSON/Types/Participation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
}
],
"pages": [
"Details",
"$TABLES[Measures]",
"Other Properties"
]
Expand Down
1 change: 0 additions & 1 deletion frontend/components/Viewing/PageJSON/Types/Participation3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
}
],
"pages": [
"Details",
"$TABLES[Measures]",
"Other Properties"
]
Expand Down
1 change: 0 additions & 1 deletion frontend/components/Viewing/PageJSON/Types/Range.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
],
"tables": [],
"pages": [
"Details",
"Other Properties"
]
}
1 change: 0 additions & 1 deletion frontend/components/Viewing/PageJSON/Types/Range3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
],
"tables": [],
"pages": [
"Details",
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/SequenceAnnotation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@
],
"tables": [],
"pages": [
"Details",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/SequenceFeature3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@
}
],
"pages": [
"Details",
"$TABLES[Locations]",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/SubComponent3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@
}
],
"pages": [
"Details",
"$TABLES[Locations]",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/VariableComponent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@
}
],
"pages": [
"Details",
"$TABLES[Variants]",
"Other Properties",
"Attachments"
"Other Properties"
]
}
4 changes: 1 addition & 3 deletions frontend/components/Viewing/PageJSON/Types/VariableFeature3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@
}
],
"pages": [
"Details",
"$TABLES[Variants]",
"Other Properties",
"Attachments"
"Other Properties"
]
}
1 change: 0 additions & 1 deletion frontend/components/Viewing/Sections/Attachments/AttachmentsTable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import styles from '../../../../styles/view.module.css';
*/
export default function AttachmentsTable(properties) {
const header = createHeader(properties.headers);
console.log(properties);
if (properties.attachments && properties.attachments.length === 0 && !properties.owner) return null;

return (
Expand Down
Binary file added images/WorkshopDemoPt2.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/WorkshopDemoPt2.pdf
View file
Binary file not shown.
Binary file added images/workshop1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/workshop2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/workshop3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/workshop4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3a7d3f0

Please sign in to comment.