Skip to content

Commit 4c2b0ac

Browse files
lassejacolassejaco
committed
Merge branch 'main' into dev
2 parents 57efe5b + 3dcf3f1 commit 4c2b0ac

72 files changed

Lines changed: 6678 additions & 2332 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎devcon-api/src/services/email-templates.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
]
3535
},
3636
"accreditationConfirmation": {
37-
"html": "<!doctype html><html><head><meta name='viewport' content='width=device-width'><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Devcon.org - Accreditation Confirmed</title><style>/* ------------------------------------- RESPONSIVE AND MOBILE FRIENDLY STYLES ------------------------------------- */@media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important;}table[class=body] p, table[class=body] ul, table[class=body] ol, table[class=body] td, table[class=body] span, table[class=body] a {font-size: 16px !important;}table[class=body] .wrapper, table[class=body] .article {padding: 10px !important;}table[class=body] .content {padding: 0 !important;}table[class=body] .container {padding: 0 !important; width: 100% !important;}table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important;}table[class=body] .btn table {width: 100% !important;}table[class=body] .btn a {width: 100% !important;}table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important;}}/* ------------------------------------- PRESERVE THESE STYLES IN THE HEAD ------------------------------------- */@media all {.ExternalClass {width: 100%;}.ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;}#MessageViewBody a {color: inherit; text-decoration: none; font-size: inherit; font-family: inherit; font-weight: inherit; line-height: inherit;}.btn-primary table td:hover {background-color: #F8F8F8 !important;}.btn-primary a {background-color: #FFFFFF !important; border-color: #30354b !important; border-style: solid; border-width: 2px; color: #30354b;}.btn-primary a:hover {background-color: #F8F8F8 !important; border-color: #30354b !important; border-style: solid; border-width: 2px;}}</style></head><body style='background-color: #F8F8F8; font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;'><table role='presentation' border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #F8F8F8;'><tr><td style='font-family: sans-serif; font-size: 14px; vertical-align: top;'>&nbsp;</td><td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 580px; padding: 10px; width: 580px;'><div class='content' style='box-sizing: border-box; display: block; Margin: 0 auto; max-width: 580px; padding: 10px;'><!-- START LOGO --><div class='footer' style='clear: both; Margin-top: 10px; text-align: center; width: 100%; padding-bottom: 15px;'><img src='https://devconnect.org/devconnect-arg/devconnect-arg-logo.png' alt='Devconnect.org' width='200' height='62' border='0' style='border:0;'></div><!-- END FOOTER --><!-- START CENTERED WHITE CONTAINER --><table role='presentation' class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 3px;'><!-- START MAIN CONTENT AREA --><tr><td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;color: #30354b;'><table role='presentation' border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'><tr><td style='font-family: sans-serif; font-size: 14px; vertical-align: top;'><h2 style='font-family: sans-serif; font-weight: normal; margin: 0; Margin-bottom: 15px;'>🎉 Accreditation Confirmed!</h2><p style='font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;'>Dear {%Name%},<br/><br/>Congratulations! Your accreditation has been confirmed. You can now access your insurance information using the link below.<br/></p><table role='presentation' border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'><tbody><tr><td align='center' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;'><table role='presentation' border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr><td style='font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #30354b; text-align: center;'><a href='{%AccreditationLink%}' target='_blank' style='display: inline-block; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize;'>View Accreditation Details</a></td></tr></tbody></table></td></tr></tbody></table><p style='font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;'>If you have any questions, please don't hesitate to contact our support team.<br/></p></td></tr></table></td></tr><!-- END MAIN CONTENT AREA --></table><!-- START FOOTER --><div class='footer' style='clear: both; Margin-top: 10px; text-align: center; width: 100%;'><table role='presentation' border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'><tr><td class='content-block' style='font-family: sans-serif; vertical-align: top; padding-top: 10px; font-size: 12px; color: #9098a1; text-align: center;'><span class='apple-link' style='color: #9098a1; font-size: 12px; text-align: center;'>You are receiving this email as a service notification from devconnect.org.</span><br/>It's not possible to unsubscribe from these emails.</td></tr><tr><td class='content-block' style='font-family: sans-serif; vertical-align: top; padding-top: 10px; font-size: 12px; color: #9098a1; text-align: center;'>If you didn't expect this email, please contact us at <a href='mailto:support@devcon.org' style='text-decoration: underline; color: #9098a1; font-size: 12px; text-align: center;'>support@devcon.org</a>.</td></tr><tr><td class='content-block powered-by' style='font-family: sans-serif; vertical-align: top; padding-bottom: 10px; padding-top: 10px; font-size: 12px; color: #9098a1; text-align: center;'>© 2025 — Devconnect.org</td></tr></table></div><!-- END FOOTER --><!-- END CENTERED WHITE CONTAINER --></div></td><td style='font-family: sans-serif; font-size: 14px; vertical-align: top;'>&nbsp;</td></tr></table></body></html>",
37+
"html": "<!doctype html><html><head><meta name='viewport' content='width=device-width'><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Devcon.org - Accreditation Confirmed</title><style>/* ------------------------------------- RESPONSIVE AND MOBILE FRIENDLY STYLES ------------------------------------- */@media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important;}table[class=body] p, table[class=body] ul, table[class=body] ol, table[class=body] td, table[class=body] span, table[class=body] a {font-size: 16px !important;}table[class=body] .wrapper, table[class=body] .article {padding: 10px !important;}table[class=body] .content {padding: 0 !important;}table[class=body] .container {padding: 0 !important; width: 100% !important;}table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important;}table[class=body] .btn table {width: 100% !important;}table[class=body] .btn a {width: 100% !important;}table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important;}}/* ------------------------------------- PRESERVE THESE STYLES IN THE HEAD ------------------------------------- */@media all {.ExternalClass {width: 100%;}.ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;}#MessageViewBody a {color: inherit; text-decoration: none; font-size: inherit; font-family: inherit; font-weight: inherit; line-height: inherit;}.btn-primary table td:hover {background-color: #F8F8F8 !important;}.btn-primary a {background-color: #FFFFFF !important; border-color: #30354b !important; border-style: solid; border-width: 2px; color: #30354b;}.btn-primary a:hover {background-color: #F8F8F8 !important; border-color: #30354b !important; border-style: solid; border-width: 2px;}}</style></head><body style='background-color: #F8F8F8; font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;'><table role='presentation' border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #F8F8F8;'><tr><td style='font-family: sans-serif; font-size: 14px; vertical-align: top;'>&nbsp;</td><td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 580px; padding: 10px; width: 580px;'><div class='content' style='box-sizing: border-box; display: block; Margin: 0 auto; max-width: 580px; padding: 10px;'><!-- START LOGO --><div class='footer' style='clear: both; Margin-top: 10px; text-align: center; width: 100%; padding-bottom: 15px;'><img src='https://devconnect.org/devconnect-arg/devconnect-arg-logo.png' alt='Devconnect.org' width='200' height='62' border='0' style='border:0;'></div><!-- END FOOTER --><!-- START CENTERED WHITE CONTAINER --><table role='presentation' class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 3px;'><!-- START MAIN CONTENT AREA --><tr><td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;color: #30354b;'><table role='presentation' border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'><tr><td style='font-family: sans-serif; font-size: 14px; vertical-align: top;'><h2 style='font-family: sans-serif; font-weight: normal; margin: 0; Margin-bottom: 15px;'>🎉 Accreditation Confirmed!</h2><p style='font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;'>Dear {%Name%},<br/><br/>Congratulations! Your accreditation has been confirmed. You can now access your insurance information using the link below.<br/></p><table role='presentation' border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'><tbody><tr><td align='center' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;'><table role='presentation' border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr><td style='font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #30354b; text-align: center;'><a href='{%AccreditationLink%}' target='_blank' style='display: inline-block; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize;'>View Accreditation Details</a></td></tr></tbody></table></td></tr></tbody></table><p style='font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;'>For claiming of accredited wristbands, please refer to the <a href='{%AccreditationGuideUrl%}' style='color: #2563EB; text-decoration: underline;'>Accreditation Guide</a> for details on dates, times, and accreditation desk locations.<br/><br/>To save time during the busy set-up period, we strongly encourage each organization to assign one representative to collect all wristbands. The organization lead or designated representative must present <u>the approved team member name list from their Portal</u> at the accreditation desk when claiming the wristbands.<br/></p><p style='font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;'>If you have any questions, please don't hesitate to contact our support team.<br/></p></td></tr></table></td></tr><!-- END MAIN CONTENT AREA --></table><!-- START FOOTER --><div class='footer' style='clear: both; Margin-top: 10px; text-align: center; width: 100%;'><table role='presentation' border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'><tr><td class='content-block' style='font-family: sans-serif; vertical-align: top; padding-top: 10px; font-size: 12px; color: #9098a1; text-align: center;'><span class='apple-link' style='color: #9098a1; font-size: 12px; text-align: center;'>You are receiving this email as a service notification from devconnect.org.</span><br/>It's not possible to unsubscribe from these emails.</td></tr><tr><td class='content-block' style='font-family: sans-serif; vertical-align: top; padding-top: 10px; font-size: 12px; color: #9098a1; text-align: center;'>If you didn't expect this email, please contact us at <a href='mailto:support@devcon.org' style='text-decoration: underline; color: #9098a1; font-size: 12px; text-align: center;'>support@devcon.org</a>.</td></tr><tr><td class='content-block powered-by' style='font-family: sans-serif; vertical-align: top; padding-bottom: 10px; padding-top: 10px; font-size: 12px; color: #9098a1; text-align: center;'>© 2025 — Devconnect.org</td></tr></table></div><!-- END FOOTER --><!-- END CENTERED WHITE CONTAINER --></div></td><td style='font-family: sans-serif; font-size: 14px; vertical-align: top;'>&nbsp;</td></tr></table></body></html>",
3838
"text": [
3939
"# 🎉 Accreditation Confirmed!",
4040
"",
@@ -44,6 +44,10 @@
4444
"",
4545
"View Accreditation Details - {%AccreditationLink%}",
4646
"",
47+
"For claiming of accredited wristbands, please refer to the Accreditation Guide ({%AccreditationGuideUrl%}) for details on dates, times, and accreditation desk locations.",
48+
"",
49+
"To save time during the busy set-up period, we strongly encourage each organization to assign one representative to collect all wristbands. The organization lead or designated representative must present the approved team member name list from their Portal at the accreditation desk when claiming the wristbands.",
50+
"",
4751
"If you have any questions, please don't hesitate to contact our support team.",
4852
"",
4953
"********************",

‎devcon-api/src/services/email.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ export async function sendAccreditationConfirmationEmail(
4646
) {
4747
const properties = {
4848
Name: name,
49-
AccreditationLink: accreditationLink
49+
AccreditationLink: accreditationLink,
50+
AccreditationGuideUrl: SERVER_CONFIG.ACCREDITATION_GUIDE_URL
5051
}
5152

5253
return sendMail(

‎devcon-api/src/utils/config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ export const SERVER_CONFIG = {
5151
SMTP_SERVICE: process.env.SMTP_SERVICE,
5252
SMTP_USERNAME: process.env.SMTP_USERNAME,
5353
SMTP_PASSWORD: process.env.SMTP_PASSWORD,
54+
55+
ACCREDITATION_GUIDE_URL: process.env.ACCREDITATION_GUIDE_URL || '',
5456
}
5557

5658
export const PRETALX_CONFIG = {

‎devconnect-app/netlify.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212

1313
[build.environment]
1414
PNPM_FLAGS = "--filter devconnect-app..."
15+
NODE_OPTIONS = "--max-old-space-size=4096"

‎devconnect-app/next.config.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ const nextConfig: NextConfig = {
44
/* config options here */
55
devIndicators: false,
66
transpilePackages: ['lib'],
7+
logging: {
8+
fetches: {
9+
fullUrl: true,
10+
},
11+
},
712
webpack: (config, { isServer }) => {
813
if (!isServer) {
914
// Fallbacks for Node.js modules in client-side code

‎devconnect-app/package.json‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"version": "0.1.0",
44
"private": true,
55
"scripts": {
6-
"dev": "next dev --turbo",
7-
"build": "next build",
6+
"dev": "next dev --turbopack",
7+
"build": "NODE_OPTIONS='--max-old-space-size=4096' next build",
88
"start": "next start",
99
"lint": "next lint",
1010
"format": "prettier --write .",
@@ -28,7 +28,7 @@
2828
"@getpara/react-sdk": "2.0.0-alpha.63",
2929
"@getpara/wagmi-v2-integration": "2.0.0-alpha.63",
3030
"@leapwallet/cosmos-social-login-capsule-provider": "^0.0.44",
31-
"@netlify/plugin-nextjs": "^5.11.6",
31+
"@netlify/plugin-nextjs": "^5.13.5",
3232
"@notionhq/client": "^4.0.1",
3333
"@panzoom/panzoom": "^4.6.0",
3434
"@parcnet-js/app-connector": "^1.1.10",
@@ -46,6 +46,7 @@
4646
"@solana/web3.js": "^1.98.4",
4747
"@supabase/ssr": "^0.7.0",
4848
"@supabase/supabase-js": "^2.52.0",
49+
"@svgr/webpack": "^8.1.0",
4950
"@tanstack/react-query": "^5.83.0",
5051
"@types/moment": "^2.13.0",
5152
"@yudiel/react-qr-scanner": "^2.3.1",
@@ -58,14 +59,14 @@
5859
"long": "^5.3.2",
5960
"lucide-react": "^0.525.0",
6061
"moment": "^2.30.1",
61-
"next": "15.4.4",
62+
"next": "16.0.0-beta.0",
6263
"next-themes": "^0.4.6",
6364
"panzoom": "^9.4.3",
6465
"pino-pretty": "^13.1.1",
6566
"qrcode": "^1.5.4",
6667
"qrcode.react": "^4.2.0",
67-
"react": "^19.0.0",
68-
"react-dom": "^19.0.0",
68+
"react": "19.2.0",
69+
"react-dom": "19.2.0",
6970
"react-swipeable-views": "^0.14.0",
7071
"react-swipeable-views-react-18-fix": "^0.14.1",
7172
"sass": "^1.44.0",
@@ -82,16 +83,22 @@
8283
"@tailwindcss/postcss": "^4",
8384
"@types/node": "^20",
8485
"@types/qrcode": "^1.5.5",
85-
"@types/react": "^19",
86-
"@types/react-dom": "^19",
86+
"@types/react": "19.2.2",
87+
"@types/react-dom": "19.2.1",
8788
"@types/react-swipeable-views": "^0.13.6",
8889
"eslint": "^9",
89-
"eslint-config-next": "15.4.4",
90+
"eslint-config-next": "16.0.0-beta.0",
9091
"null-loader": "^4.0.1",
9192
"prettier": "^3.6.2",
9293
"tailwindcss": "^4",
9394
"tsx": "^4.20.3",
9495
"tw-animate-css": "^1.3.5",
9596
"typescript": "^5"
97+
},
98+
"pnpm": {
99+
"overrides": {
100+
"@types/react": "19.2.2",
101+
"@types/react-dom": "19.2.1"
102+
}
96103
}
97104
}

0 commit comments

Comments
 (0)