Skip to content

Commit

Permalink
chore: merge branch 'main' into feat/rfc
Browse files Browse the repository at this point in the history
  • Loading branch information
rjsparks committed Dec 5, 2023
2 parents e3ba021 + 5006ea5 commit 03e161b
Show file tree
Hide file tree
Showing 42 changed files with 550 additions and 285 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,19 @@ jobs:
echo "Running tests..."
if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then
echo "Lower coverage failures will be ignored."
./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test --ignore-lower-coverage
HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test --ignore-lower-coverage
else
./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test
HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test
fi
coverage xml
- name: Upload geckodriver.log
uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: geckodriverlog
path: geckodriver.log

- name: Upload Coverage Results to Codecov
uses: codecov/[email protected]
with:
Expand Down Expand Up @@ -161,4 +168,4 @@ jobs:
with:
name: playwright-legacy-results-${{ matrix.project }}
path: playwright/test-results/
if-no-files-found: ignore
if-no-files-found: ignore
59 changes: 51 additions & 8 deletions client/agenda/AgendaMobileBar.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
<template lang="pug">
.agenda-mobile-bar(v-if='siteStore.viewport < 990')
n-dropdown(
:options='jumpToDayOptions'
size='huge'
:show-arrow='true'
trigger='click'
@select='jumpToDay'
)
button
i.bi.bi-arrow-down-circle
button(@click='agendaStore.$patch({ filterShown: true })')
i.bi.bi-filter-square-fill.me-2
span Filters
i.bi.bi-funnel
n-badge.ms-2(:value='agendaStore.selectedCatSubs.length', processing)
button(@click='agendaStore.$patch({ calendarShown: true })')
i.bi.bi-calendar3.me-2
span Cal
i.bi.bi-calendar3
n-dropdown(
:options='downloadIcsOptions'
size='huge'
Expand All @@ -15,14 +22,13 @@
@select='downloadIcs'
)
button
i.bi.bi-calendar-check.me-2
span .ics
i.bi.bi-download
button(@click='agendaStore.$patch({ settingsShown: !agendaStore.settingsShown })')
i.bi.bi-gear
</template>

<script setup>
import { h } from 'vue'
import { computed, h } from 'vue'
import {
NBadge,
Expand All @@ -43,13 +49,34 @@ const message = useMessage()
const agendaStore = useAgendaStore()
const siteStore = useSiteStore()
// Meeting Days
const jumpToDayOptions = computed(() => {
const days = []
if (agendaStore.isMeetingLive) {
days.push({
label: 'Jump to Now',
key: 'now',
icon: () => h('i', { class: 'bi bi-arrow-down-right-square text-red' })
})
}
for (const day of agendaStore.meetingDays) {
days.push({
label: `Jump to ${day.label}`,
key: day.slug,
icon: () => h('i', { class: 'bi bi-arrow-down-right-square' })
})
}
return days
})
// Download Ics Options
const downloadIcsOptions = [
{
label: 'Subscribe... (webcal)',
key: 'subscribe',
icon: () => h('i', { class: 'bi bi-calendar-week text-blue' })
icon: () => h('i', { class: 'bi bi-calendar-week' })
},
{
label: 'Download... (.ics)',
Expand All @@ -60,6 +87,20 @@ const downloadIcsOptions = [
// METHODS
function jumpToDay (dayId) {
if (dayId === 'now') {
const lastEventId = agendaStore.findCurrentEventId()
if (lastEventId) {
document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
} else {
message.warning('There is no event happening right now.')
}
} else {
document.getElementById(`agenda-day-${dayId}`)?.scrollIntoView(true)
}
}
function downloadIcs (key) {
message.loading('Generating calendar file... Download will begin shortly.')
let icsUrl = ''
Expand Down Expand Up @@ -102,6 +143,8 @@ function downloadIcs (key) {
color: #FFF;
padding: 0 15px;
transition: all .4s ease;
text-align: center;
flex: 1 1;
& + button {
margin-left: 1px;
Expand Down
2 changes: 1 addition & 1 deletion client/agenda/AgendaScheduleList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ const meetingEvents = computed(() => {
if (item.links.calendar) {
links.push({
id: `lnk-${item.id}-calendar`,
label: isMobile.value ? `Calendar (.ics) entry for this session` : `Calendar (.ics) entry for ${item.acronym} session on ${item.adjustedStart.toFormat('fff')}`,
label: 'Calendar (.ics) entry for this session',
icon: 'calendar-check',
href: item.links.calendar,
color: 'pink'
Expand Down
8 changes: 8 additions & 0 deletions client/embedded.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import { createApp } from 'vue'
import { createPinia } from 'pinia'
import piniaPersist from 'pinia-plugin-persist'
import Embedded from './Embedded.vue'

// Initialize store (Pinia)

const pinia = createPinia()
pinia.use(piniaPersist)

// Mount App

const mountEls = document.querySelectorAll('div.vue-embed')
Expand All @@ -9,5 +16,6 @@ for (const mnt of mountEls) {
componentName: mnt.dataset.component,
componentId: mnt.dataset.componentId
})
app.use(pinia)
app.mount(mnt)
}
96 changes: 48 additions & 48 deletions dev/coverage-action/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dev/coverage-action/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"chart.js": "3.5.1",
"chartjs-node-canvas": "4.1.6",
"lodash": "4.17.21",
"luxon": "3.4.3"
"luxon": "3.4.4"
},
"devDependencies": {
"eslint": "8.52.0",
"eslint": "8.53.0",
"eslint-config-standard": "17.1.0",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-node": "11.1.0",
Expand Down
Loading

0 comments on commit 03e161b

Please sign in to comment.