Skip to content

Commit 69c0f4d

Browse files
rjsparksrjsparks
authored
fix: Revert "feat: js compiled url store (ietf-tools#4568)" (ietf-tools#4675)
This reverts commit 8cb67f9.
1 parent 3bf997b commit 69c0f4d

6 files changed

Lines changed: 16 additions & 75 deletions

File tree

‎client/agenda/AgendaDetailsModal.vue‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ import {
152152
} from 'naive-ui'
153153
154154
import { useAgendaStore } from './store'
155-
import { getUrl } from '../shared/urls'
156155
157156
// PROPS
158157
@@ -206,22 +205,10 @@ const eventDetails = computed(() => {
206205
title: props.event.type === 'regular' ? `${props.event.groupName} (${props.event.acronym})` : props.event.name,
207206
showAgenda: props.event.flags.showAgenda,
208207
materialsUrl: materialsUrl,
209-
detailsUrl: getUrl('meetingDetails', {
210-
meetingNumber: agendaStore.meeting.number,
211-
eventAcronym: props.event.acronym
212-
}),
213-
tarUrl: getUrl('meetingMaterialsTar', {
214-
meetingNumber: agendaStore.meeting.number,
215-
eventAcronym: props.event.acronym
216-
}),
217-
pdfUrl: getUrl('meetingMaterialsPdf', {
218-
meetingNumber: agendaStore.meeting.number,
219-
eventAcronym: props.event.acronym
220-
}),
221-
notepadUrl: getUrl('meetingNotes', {
222-
meetingNumber: agendaStore.meeting.number,
223-
eventAcronym: props.event.type === 'plenary' ? 'plenary' : props.event.acronym
224-
})
208+
detailsUrl: `/meeting/${agendaStore.meeting.number}/session/${props.event.acronym}/`,
209+
tarUrl: `/meeting/${agendaStore.meeting.number}/agenda/${props.event.acronym}-drafts.tgz`,
210+
pdfUrl: `/meeting/${agendaStore.meeting.number}/agenda/${props.event.acronym}-drafts.pdf`,
211+
notepadUrl: `https://notes.ietf.org/notes-ietf-${agendaStore.meeting.number}-${props.event.type === 'plenary' ? 'plenary' : props.event.acronym}`,
225212
}
226213
})
227214

‎client/agenda/AgendaFilter.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ n-drawer(v-model:show='state.isShown', placement='bottom', :height='state.drawer
6060
)
6161
template(#trigger)
6262
span.badge BoF
63-
span #[a(:href='getUrl(`bofDefinition`)', target='_blank') Birds of a Feather] sessions (BoFs) are initial discussions about a particular topic of interest to the IETF community.
63+
span #[a(href='https://www.ietf.org/how/bofs/', target='_blank') Birds of a Feather] sessions (BoFs) are initial discussions about a particular topic of interest to the IETF community.
6464
</template>
6565

6666
<script setup>
@@ -77,7 +77,6 @@ import {
7777
} from 'naive-ui'
7878
7979
import { useAgendaStore } from './store'
80-
import { getUrl } from '../shared/urls'
8180
8281
// STORES
8382

‎client/agenda/AgendaMobileBar.vue‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {
3232
3333
import { useAgendaStore } from './store'
3434
import { useSiteStore } from '../shared/store';
35-
import { getUrl } from '../shared/urls'
3635
3736
// MESSAGE PROVIDER
3837
@@ -65,11 +64,11 @@ function downloadIcs (key) {
6564
let icsUrl = ''
6665
if (agendaStore.pickerMode) {
6766
const sessionKeywords = agendaStore.scheduleAdjusted.map(s => s.sessionKeyword)
68-
icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${sessionKeywords.join(',')}`
67+
icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${sessionKeywords.join(',')}`
6968
} else if (agendaStore.selectedCatSubs.length > 0) {
70-
icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${agendaStore.selectedCatSubs.join(',')}`
69+
icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${agendaStore.selectedCatSubs.join(',')}`
7170
} else {
72-
icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}`
71+
icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics`
7372
}
7473
if (key === 'subscribe') {
7574
window.location.assign(`webcal://${window.location.host}${icsUrl}`)

‎client/agenda/AgendaQuickAccess.vue‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ import {
120120
} from 'naive-ui'
121121
122122
import { useAgendaStore } from './store'
123-
import { useSiteStore } from '../shared/store'
124-
import { getUrl } from '../shared/urls'
123+
import { useSiteStore } from '../shared/store';
125124
126125
// MESSAGE PROVIDER
127126
@@ -182,11 +181,11 @@ function downloadIcs (key) {
182181
let icsUrl = ''
183182
if (agendaStore.pickerMode) {
184183
const sessionKeywords = agendaStore.scheduleAdjusted.map(s => s.sessionKeyword)
185-
icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${sessionKeywords.join(',')}`
184+
icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${sessionKeywords.join(',')}`
186185
} else if (agendaStore.selectedCatSubs.length > 0) {
187-
icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${agendaStore.selectedCatSubs.join(',')}`
186+
icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${agendaStore.selectedCatSubs.join(',')}`
188187
} else {
189-
icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}`
188+
icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics`
190189
}
191190
if (key === 'subscribe') {
192191
window.location.assign(`webcal://${window.location.host}${icsUrl}`)

‎client/agenda/AgendaScheduleList.vue‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ import AgendaDetailsModal from './AgendaDetailsModal.vue'
202202
203203
import { useAgendaStore } from './store'
204204
import { useSiteStore } from '../shared/store'
205-
import { getUrl } from '../shared/urls'
206205
207206
// MESSAGE PROVIDER
208207
@@ -276,20 +275,14 @@ const meetingEvents = computed(() => {
276275
id: `lnk-${item.id}-tar`,
277276
label: 'Download meeting materials as .tar archive',
278277
icon: 'file-zip',
279-
href: getUrl('meetingMaterialsTar', {
280-
meetingNumber: agendaStore.meeting.number,
281-
eventAcronym: item.acronym
282-
}),
278+
href: `/meeting/${agendaStore.meeting.number}/agenda/${item.acronym}-drafts.tgz`,
283279
color: 'brown'
284280
})
285281
links.push({
286282
id: `lnk-${item.id}-pdf`,
287283
label: 'Download meeting materials as PDF file',
288284
icon: 'file-pdf',
289-
href: getUrl('meetingMaterialsPdf', {
290-
meetingNumber: agendaStore.meeting.number,
291-
eventAcronym: item.acronym
292-
}),
285+
href: `/meeting/${agendaStore.meeting.number}/agenda/${item.acronym}-drafts.pdf`,
293286
color: 'red'
294287
})
295288
}
@@ -298,10 +291,7 @@ const meetingEvents = computed(() => {
298291
id: `lnk-${item.id}-note`,
299292
label: 'Notepad for note-takers',
300293
icon: 'journal-text',
301-
href: getUrl('meetingNotes', {
302-
meetingNumber: agendaStore.meeting.number,
303-
eventAcronym: item.type === 'plenary' ? 'plenary' : item.acronym
304-
}),
294+
href: `https://notes.ietf.org/notes-ietf-${agendaStore.meeting.number}-${item.type === 'plenary' ? 'plenary' : item.acronym}`,
305295
color: 'blue'
306296
})
307297
}
@@ -414,10 +404,7 @@ const meetingEvents = computed(() => {
414404
id: `lnk-${item.id}-rec`,
415405
label: 'Session recording',
416406
icon: 'film',
417-
href: getUrl('meetingMeetechoRecordings', {
418-
meetingNumber: agendaStore.meeting.number,
419-
eventAcronym: item.acronym.toUpperCase()
420-
}),
407+
href: `https://www.meetecho.com/ietf${agendaStore.meeting.number}/recordings#${item.acronym.toUpperCase()}`,
421408
color: 'purple'
422409
})
423410
}

‎client/shared/urls.js‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)