fix: Revert "feat: js compiled url store (#4568)" (#4675)

This reverts commit 8cb67f9.
ietf-tools · Oct 28, 2022 · 69c0f4d · 69c0f4d
1 parent 3bf997b
commit 69c0f4d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 75 deletions.
diff --git a/client/agenda/AgendaDetailsModal.vue b/client/agenda/AgendaDetailsModal.vue
@@ -152,7 +152,6 @@ import {
 } from 'naive-ui'
 
 import { useAgendaStore } from './store'
-import { getUrl } from '../shared/urls'
 
 // PROPS
 
@@ -206,22 +205,10 @@ const eventDetails = computed(() => {
     title: props.event.type === 'regular' ? `${props.event.groupName} (${props.event.acronym})` : props.event.name,
     showAgenda: props.event.flags.showAgenda,
     materialsUrl: materialsUrl,
-    detailsUrl: getUrl('meetingDetails', {
-      meetingNumber: agendaStore.meeting.number,
-      eventAcronym: props.event.acronym
-    }),
-    tarUrl: getUrl('meetingMaterialsTar', {
-      meetingNumber: agendaStore.meeting.number,
-      eventAcronym: props.event.acronym
-    }),
-    pdfUrl: getUrl('meetingMaterialsPdf', {
-      meetingNumber: agendaStore.meeting.number,
-      eventAcronym: props.event.acronym
-    }),
-    notepadUrl: getUrl('meetingNotes', {
-      meetingNumber: agendaStore.meeting.number,
-      eventAcronym: props.event.type === 'plenary' ? 'plenary' : props.event.acronym
-    })
+    detailsUrl: `/meeting/${agendaStore.meeting.number}/session/${props.event.acronym}/`,
+    tarUrl: `/meeting/${agendaStore.meeting.number}/agenda/${props.event.acronym}-drafts.tgz`,
+    pdfUrl: `/meeting/${agendaStore.meeting.number}/agenda/${props.event.acronym}-drafts.pdf`,
+    notepadUrl: `https://notes.ietf.org/notes-ietf-${agendaStore.meeting.number}-${props.event.type === 'plenary' ? 'plenary' : props.event.acronym}`,
   }
 })
 

diff --git a/client/agenda/AgendaFilter.vue b/client/agenda/AgendaFilter.vue
@@ -60,7 +60,7 @@ n-drawer(v-model:show='state.isShown', placement='bottom', :height='state.drawer
                 )
                 template(#trigger)
                   span.badge BoF
-                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.
+                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.
 </template>
 
 <script setup>
@@ -77,7 +77,6 @@ import {
 } from 'naive-ui'
 
 import { useAgendaStore } from './store'
-import { getUrl } from '../shared/urls'
 
 // STORES
 

diff --git a/client/agenda/AgendaMobileBar.vue b/client/agenda/AgendaMobileBar.vue
@@ -32,7 +32,6 @@ import {
 
 import { useAgendaStore } from './store'
 import { useSiteStore } from '../shared/store';
-import { getUrl } from '../shared/urls'
 
 // MESSAGE PROVIDER
 
@@ -65,11 +64,11 @@ function downloadIcs (key) {
   let icsUrl = ''
   if (agendaStore.pickerMode) {
     const sessionKeywords = agendaStore.scheduleAdjusted.map(s => s.sessionKeyword)
-    icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${sessionKeywords.join(',')}`
+    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${sessionKeywords.join(',')}`
   } else if (agendaStore.selectedCatSubs.length > 0) {
-    icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${agendaStore.selectedCatSubs.join(',')}`
+    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${agendaStore.selectedCatSubs.join(',')}`
   } else {
-    icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}`
+    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics`
   }
   if (key === 'subscribe') {
     window.location.assign(`webcal://${window.location.host}${icsUrl}`)

diff --git a/client/agenda/AgendaQuickAccess.vue b/client/agenda/AgendaQuickAccess.vue
@@ -120,8 +120,7 @@ import {
 } from 'naive-ui'
 
 import { useAgendaStore } from './store'
-import { useSiteStore } from '../shared/store'
-import { getUrl } from '../shared/urls'
+import { useSiteStore } from '../shared/store';
 
 // MESSAGE PROVIDER
 
@@ -182,11 +181,11 @@ function downloadIcs (key) {
   let icsUrl = ''
   if (agendaStore.pickerMode) {
     const sessionKeywords = agendaStore.scheduleAdjusted.map(s => s.sessionKeyword)
-    icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${sessionKeywords.join(',')}`
+    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${sessionKeywords.join(',')}`
   } else if (agendaStore.selectedCatSubs.length > 0) {
-    icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${agendaStore.selectedCatSubs.join(',')}`
+    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${agendaStore.selectedCatSubs.join(',')}`
   } else {
-    icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}`
+    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics`
   }
   if (key === 'subscribe') {
     window.location.assign(`webcal://${window.location.host}${icsUrl}`)

diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue
@@ -202,7 +202,6 @@ import AgendaDetailsModal from './AgendaDetailsModal.vue'
 
 import { useAgendaStore } from './store'
 import { useSiteStore } from '../shared/store'
-import { getUrl } from '../shared/urls'
 
 // MESSAGE PROVIDER
 
@@ -276,20 +275,14 @@ const meetingEvents = computed(() => {
           id: `lnk-${item.id}-tar`,
           label: 'Download meeting materials as .tar archive',
           icon: 'file-zip',
-          href: getUrl('meetingMaterialsTar', {
-            meetingNumber: agendaStore.meeting.number,
-            eventAcronym: item.acronym
-          }),
+          href: `/meeting/${agendaStore.meeting.number}/agenda/${item.acronym}-drafts.tgz`,
           color: 'brown'
         })
         links.push({
           id: `lnk-${item.id}-pdf`,
           label: 'Download meeting materials as PDF file',
           icon: 'file-pdf',
-          href: getUrl('meetingMaterialsPdf', {
-            meetingNumber: agendaStore.meeting.number,
-            eventAcronym: item.acronym
-          }),
+          href: `/meeting/${agendaStore.meeting.number}/agenda/${item.acronym}-drafts.pdf`,
           color: 'red'
         })
       }
@@ -298,10 +291,7 @@ const meetingEvents = computed(() => {
           id: `lnk-${item.id}-note`,
           label: 'Notepad for note-takers',
           icon: 'journal-text',
-          href: getUrl('meetingNotes', {
-            meetingNumber: agendaStore.meeting.number,
-            eventAcronym: item.type === 'plenary' ? 'plenary' : item.acronym
-          }),
+          href: `https://notes.ietf.org/notes-ietf-${agendaStore.meeting.number}-${item.type === 'plenary' ? 'plenary' : item.acronym}`,
           color: 'blue'
         })
       }
@@ -414,10 +404,7 @@ const meetingEvents = computed(() => {
               id: `lnk-${item.id}-rec`,
               label: 'Session recording',
               icon: 'film',
-              href: getUrl('meetingMeetechoRecordings', {
-                meetingNumber: agendaStore.meeting.number,
-                eventAcronym: item.acronym.toUpperCase()
-              }),
+              href: `https://www.meetecho.com/ietf${agendaStore.meeting.number}/recordings#${item.acronym.toUpperCase()}`,
               color: 'purple'
             })
           }

diff --git a/client/shared/urls.js b/client/shared/urls.js