Skip to content
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

move to production #2478

Merged
merged 4 commits into from
Feb 17, 2025
Merged

move to production #2478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67b14a7
reduced padding of the engagement dialog
TroyMoses Feb 16, 2025
0209490
fix glossary issue
OchiengPaul442 Feb 17, 2025
69f478a
Merge pull request #2476 from TroyMoses/fix/engagement-dialog-issue-#…
Baalmart Feb 17, 2025
d07a316
Merge pull request #2477 from airqo-platform/website-clean-air
Baalmart Feb 17, 2025
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
10 changes: 8 additions & 2 deletions website2/src/app/clean-air-forum/glossary/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ const GlossaryPage: React.FC = () => {
const glossaryHTML = renderContent(selectedEvent.glossary_details);
const showGlossaryMain = isValidGlossaryContent(glossaryHTML);

const glossarySections = selectedEvent.sections?.filter((section: any) => {
if (!section.pages.includes('glossary')) return false;
const html = renderContent(section.content);
return html.trim().length > 0;
});

return (
<div className="px-4 lg:px-0 prose max-w-none flex flex-col gap-6">
<Divider className="bg-black p-0 m-0 h-[1px] w-full" />
Expand Down Expand Up @@ -95,9 +101,9 @@ const GlossaryPage: React.FC = () => {
)}

{/* Additional Glossary Sections (if any) */}
{selectedEvent.sections && selectedEvent.sections.length > 0 && (
{glossarySections && glossarySections.length > 0 && (
<>
{selectedEvent.sections.map((section: any) => (
{glossarySections.map((section: any) => (
<SectionDisplay key={section.id} section={section} />
))}
</>
Expand Down
2 changes: 1 addition & 1 deletion website2/src/components/dialogs/EngagementDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ const EngagementDialog = () => {

{/* Right Side */}
<motion.div
className="w-full lg:w-1/2 flex flex-col justify-center gap-6 h-full p-2 md:p-16"
className="w-full lg:w-1/2 flex flex-col justify-center gap-6 h-full p-2 md:p-10"
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ duration: 0.6, delay: 0.3, ease: 'easeOut' }}
Expand Down