Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/husky-9.1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
richford authored Oct 30, 2024
2 parents ecd0858 + fdaafe0 commit 84dd46b
Show file tree
Hide file tree
Showing 75 changed files with 495 additions and 285 deletions.
5 changes: 0 additions & 5 deletions .editorconfig

This file was deleted.

14 changes: 13 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,19 @@
"camelcase": "off",
"func-names": 0,
"object-shorthand": 0,
"implicit-arrow-linebreak": 0
"implicit-arrow-linebreak": 0,
"vue/no-undef-components": [
"error",
{
"ignorePatterns": [
"AppSpinner",
"GMapAutocomplete", // vue-google-maps-community-fork
"i18n-t", // vue-i18n
"router-link", // vue-router
"router-view" // vue-router
]
}
]
},
"ignorePatterns": ["**/node_modules/**", "**/dist/**", "**/lib/**", "roar-firebase-functions"]
}
20 changes: 20 additions & 0 deletions .github/workflows/add-pull-request-to-qa-template.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Add Pull Request to QA Project
on:
pull_request:
branches:
- main
types:
- labeled

jobs:
add-to-project:
name: Add to GitHub Project
runs-on: ubuntu-latest
steps:
- name: Add to QA Project
uses: actions/[email protected]
with:
project-url: ${{ secrets.QA_PROJECT_URL }}
github-token: ${{ secrets.ADD_PRS_TO_QA_PROJECTS_TOKEN }}
labeled: '[qa] low priority, [qa] medium priority, [qa] high priority'
label-operator: OR
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ dev-dist
*.local

# Editor directories and files
.editorconfig
.idea
/idea
.vscode/*
Expand Down
24 changes: 24 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@
{
"key": "Cross-Origin-Opener-Policy",
"value": "same-origin-allow-popups"
},
{
"key": "Content-Security-Policy",
"value": "script-src 'self'"
},
{
"key": "Content-Security-Policy",
"value": "frame-ancestors 'self'"
},
{
"key": "X-Content-Type-Options",
"value": "nosniff"
}
]
}
Expand Down Expand Up @@ -55,6 +67,18 @@
{
"key": "Cross-Origin-Opener-Policy",
"value": "same-origin-allow-popups"
},
{
"key": "Content-Security-Policy",
"value": "script-src 'self'"
},
{
"key": "Content-Security-Policy",
"value": "frame-ancestors 'self'"
},
{
"key": "X-Content-Type-Options",
"value": "nosniff"
}
]
}
Expand Down
87 changes: 50 additions & 37 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "roar-dashboard",
"private": true,
"version": "3.0.2",
"version": "3.1.0",
"type": "module",
"scripts": {
"build": "export VITE_FIREBASE_DATA_SOURCE=live && vite build",
Expand Down Expand Up @@ -34,14 +34,14 @@
"@bdelab/roam-apps": "^1.0.0",
"@bdelab/roar-firekit": "9.1.0",
"@bdelab/roar-letter": "1.11.8",
"@bdelab/roar-multichoice": "^1.11.3",
"@bdelab/roar-multichoice": "^1.11.5",
"@bdelab/roar-pa": "2.2.4",
"@bdelab/roar-sre": "1.15.9",
"@bdelab/roar-swr": "^1.12.1",
"@bdelab/roar-utils": "^1.2.1",
"@bdelab/roar-vocab": "^1.8.0",
"@bdelab/roav-crowding": "1.1.16",
"@bdelab/roav-mep": "^1.1.21",
"@bdelab/roav-crowding": "1.1.23",
"@bdelab/roav-mep": "^1.1.28",
"@bdelab/roav-ran": "^1.0.30",
"@levante-framework/core-tasks": "1.0.0-beta.16",
"@sentry/browser": "^8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion roar-firebase-functions
3 changes: 2 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<Head>
<title>{{ isLevante ? '' : 'ROAR:' }} {{ pageTitle }}</title>
<meta name="description" content="A web-based tool to query ROAR assessment data!" />
<meta name="description" content="The Rapid Online Assessment of Reading" />

<!-- Social -->
<meta property="og:title" content="ROAR Web Query" />
Expand All @@ -28,6 +28,7 @@ import { computed, onBeforeMount, onMounted, ref, defineAsyncComponent } from 'v
import { useRoute } from 'vue-router';
import { useRecaptchaProvider } from 'vue-recaptcha';
import { Head } from '@unhead/vue/components';
import PvToast from 'primevue/toast';
import NavBar from '@/components/NavBar.vue';
const SessionTimer = defineAsyncComponent(() => import('@/containers/SessionTimer/SessionTimer.vue'));
Expand Down
Loading

0 comments on commit 84dd46b

Please sign in to comment.