Skip to content

Commit 2dfb8b9

Browse files
committed
updates
1 parent eb157b4 commit 2dfb8b9

File tree

3 files changed

+55
-14
lines changed

3 files changed

+55
-14
lines changed

index.js

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,8 +994,10 @@ app.get("/sessions/:slug", async (req, res) => {
994994
res.render("programs/session-intensive", response)
995995
}
996996
else if(sessionType == "Concurrent" && sessionType != "External"){
997-
const response = await prepareSessionData(sessionData, req.params.slug)
998-
console.log("Concurrent Session data", response)
997+
// console.log(sessionData)
998+
// const response = parseSessionData(sessionData)
999+
const response = await prepareSessionDataSimple(sessionData, req.params.slug)
1000+
// console.log("Concurrent Session data", response)
9991001
// res.render("programs/sessions/"+req.params.slug+"/session", response)
10001002
res.render("programs/session-concurrent", response)
10011003
}
@@ -1493,7 +1495,42 @@ async function prepareSessionData(sessionData, session){
14931495
return response
14941496
}
14951497

1498+
async function prepareSessionDataSimple(sessionData, session){
1499+
1500+
let response = parseSessionData(sessionData)
1501+
14961502

1503+
const people = await getDatabaseEntries("ea99608272e446cd880cbcb8d2ee1e13", [], {
1504+
"or":[
1505+
{property:"Sessions-Organizer", "rollup": { "any": { "rich_text": { "equals": session } }}},
1506+
{property:"Sessions-Teacher", "rollup": { "any": { "rich_text": { "equals": session } }}},
1507+
{property:"Sessions-Guest", "rollup": { "any": { "rich_text": { "equals": session } }}},
1508+
]
1509+
})
1510+
let teachers = []
1511+
let organizers = []
1512+
let guests = []
1513+
people.map((person) => {
1514+
const personData = parseNotionPage(person)
1515+
if(typeof personData["Sessions-Teacher"] == 'string') personData["Sessions-Teacher"] = [personData["Sessions-Teacher"]]
1516+
if(personData["Sessions-Teacher"] && personData["Sessions-Teacher"].includes(session)){
1517+
personData.role = "teacher"
1518+
teachers.unshift(personData)
1519+
}
1520+
if(personData["Sessions-Organizer"] && personData["Sessions-Organizer"].includes(session)){
1521+
personData.role = "organizer"
1522+
organizers.unshift(personData)
1523+
}
1524+
if(personData["Sessions-Guest"] && personData["Sessions-Guest"].includes(session)){
1525+
personData.role = "guest teacher"
1526+
guests.unshift(personData)
1527+
}
1528+
})
1529+
response.guests = cleanPersonData(guests);
1530+
response.organizers = cleanPersonData(organizers);
1531+
response.teachers = cleanPersonData(teachers);
1532+
return response
1533+
}
14971534

14981535
async function getPageContent(notionId, contentToggleName="web content"){
14991536
const fullPageContent = await getBlocks(notionId);

public/templates/partials/classBoilerplate.hbs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,21 @@
2929
<div class="grid-2">
3030
<h1>How do I apply?</h1>
3131
</div>
32+
{{#if weekendIntensive}}
33+
<div class="grid-2">
3234

35+
36+
37+
38+
<p class="large apply">
39+
<a href="{{applicationLink}}" id="application-link">Sign Up Now</a>
40+
</p>
41+
42+
<p>
43+
Applications are not required for weekend intensives. Signups will remain open as long as seats remain. A limited number of scholarship tickets will be released via the SFPC <a href="/newsletter">email list</a> two weeks before the date of the intensive.
44+
</p>
45+
</div>
46+
{{else}}
3347
<div class="grid-2">
3448

3549

@@ -51,6 +65,7 @@
5165
href="mailto:[email protected]">[email protected]</a> with any questions you have.
5266
</p>
5367
</div>
68+
{{/if}}
5469
</section>
5570
<!-- {{/if}} -->
5671

public/templates/programs/session-concurrent.hbs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686

8787

8888

89-
<section id="classes" class="stacked stacked-4">
9089

9190

9291
<!-- <section class="stacked stacked-4">
@@ -177,23 +176,13 @@
177176
{{> spring25classBlock}}
178177
{{/eq}}
179178
{{#eq [Website-Slug] "summer-25"}}
179+
<h2 id="session-name">Summer 2025</h2>
180180
{{> summer25classBlock}}
181181
{{/eq}}
182182
{{#eq [Website-Slug] "fall-25"}}
183183
{{> fall25classBlock}}
184184
{{/eq}}
185185

186-
</section>
187-
188-
189-
190-
191-
192-
193-
194-
<div class="break-noline"></div>
195-
196-
197186
<section class="intro {{Website-Slug}}" id="introduction">
198187
<p tabindex="0" class="large">
199188
<span id="introduction-text" style="white-space:pre-line">{{#if sessionEnded}}{{#if "Session End Description"}}{{"Session End Description"}}{{else}}{{Description}}{{/if}}{{else}}{{Description}}{{/if}}</span><BR><BR>

0 commit comments

Comments
 (0)