@@ -58,12 +59,57 @@
:loading="isLoading || isFetching"
:allow-filtering="false"
@export-all="exportAll"
+ @selected-org-id="showCode"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/tasks/ManageVariants.vue b/src/components/tasks/ManageVariants.vue
new file mode 100644
index 000000000..e21467d7c
--- /dev/null
+++ b/src/components/tasks/ManageVariants.vue
@@ -0,0 +1,849 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/helpers/query/orgs.js b/src/helpers/query/orgs.js
index 331b5d20a..f569c0d58 100644
--- a/src/helpers/query/orgs.js
+++ b/src/helpers/query/orgs.js
@@ -231,7 +231,13 @@ export const fetchOrgByName = async (orgType, orgName, selectedDistrict, selecte
return axiosInstance.post(':runQuery', requestBody).then(({ data }) => mapFields(data));
};
-export const orgFetcher = async (orgType, selectedDistrict, isSuperAdmin, adminOrgs, select = ['name', 'id']) => {
+export const orgFetcher = async (
+ orgType,
+ selectedDistrict,
+ isSuperAdmin,
+ adminOrgs,
+ select = ['name', 'id', 'currentActivationCode'],
+) => {
if (isSuperAdmin.value) {
const axiosInstance = getAxiosInstance();
const requestBody = getOrgsRequestBody({
diff --git a/src/helpers/query/tasks.js b/src/helpers/query/tasks.js
index 6697f432a..66ac6fdf3 100644
--- a/src/helpers/query/tasks.js
+++ b/src/helpers/query/tasks.js
@@ -5,6 +5,7 @@ import { convertValues, getAxiosInstance, mapFields } from './utils';
export const getTasksRequestBody = ({
registered = true,
+ allData = false,
orderBy,
aggregationQuery,
pageLimit,
@@ -24,9 +25,11 @@ export const getTasksRequestBody = ({
requestBody.structuredQuery.offset = page * pageLimit;
}
- requestBody.structuredQuery.select = {
- fields: select.map((field) => ({ fieldPath: field })),
- };
+ if (!allData) {
+ requestBody.structuredQuery.select = {
+ fields: select.map((field) => ({ fieldPath: field })),
+ };
+ }
}
requestBody.structuredQuery.from = [
@@ -63,13 +66,14 @@ export const getTasksRequestBody = ({
return requestBody;
};
-export const taskFetcher = async (registered = true, select = ['name', 'testData', 'demoData']) => {
+export const taskFetcher = async (registered = true, allData = false, select = ['name', 'testData', 'demoData']) => {
const axiosInstance = getAxiosInstance('app');
const requestBody = getTasksRequestBody({
registered,
+ allData,
aggregationQuery: false,
paginate: false,
- select: select,
+ select: allData ? '' : select,
});
return axiosInstance.post(':runQuery', requestBody).then(({ data }) => mapFields(data));
diff --git a/src/helpers/query/utils.js b/src/helpers/query/utils.js
index b013c2ef3..5a70336e0 100644
--- a/src/helpers/query/utils.js
+++ b/src/helpers/query/utils.js
@@ -70,10 +70,13 @@ export const getProjectId = (project = 'admin') => {
return roarfirekit.value.roarConfig?.[project]?.projectId;
};
-export const getAxiosInstance = (db = 'admin') => {
+export const getAxiosInstance = (db = 'admin', unauthenticated = false) => {
const authStore = useAuthStore();
const { roarfirekit } = storeToRefs(authStore);
const axiosOptions = _get(roarfirekit.value.restConfig, db) ?? {};
+ if (unauthenticated) {
+ delete axiosOptions.headers;
+ }
return axios.create(axiosOptions);
};
@@ -93,7 +96,14 @@ export const exportCsv = (data, filename) => {
document.body.removeChild(a);
};
-export const fetchDocById = async (collection, docId, select, db = 'admin') => {
+export const fetchDocById = async (
+ collection,
+ docId,
+ select,
+ db = 'admin',
+ unauthenticated = false,
+ swallowErrors = false,
+) => {
if (!collection || !docId) {
console.warn(
`fetchDocById: Collection or docId not provided. Called with collection "${collection}" and docId "${docId}"`,
@@ -101,7 +111,7 @@ export const fetchDocById = async (collection, docId, select, db = 'admin') => {
return {};
}
const docPath = `/${collection}/${docId}`;
- const axiosInstance = getAxiosInstance(db);
+ const axiosInstance = getAxiosInstance(db, unauthenticated);
const queryParams = (select ?? []).map((field) => `mask.fieldPaths=${field}`);
const queryString = queryParams.length > 0 ? `?${queryParams.join('&')}` : '';
return axiosInstance
@@ -114,7 +124,9 @@ export const fetchDocById = async (collection, docId, select, db = 'admin') => {
};
})
.catch((error) => {
- console.error(error);
+ if (!swallowErrors) {
+ console.error(error);
+ }
return {
data: `${error.code === '404' ? 'Document not found' : error.message}`,
};
diff --git a/src/pages/HomeParticipant.vue b/src/pages/HomeParticipant.vue
index d46a9a3d6..aef977183 100644
--- a/src/pages/HomeParticipant.vue
+++ b/src/pages/HomeParticipant.vue
@@ -24,7 +24,7 @@
}}
Invitation
+ +Link:
+Code:
+
+ Close
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/tasks/RegisterTask.vue b/src/components/tasks/RegisterTask.vue
deleted file mode 100644
index a5eaf313e..000000000
--- a/src/components/tasks/RegisterTask.vue
+++ /dev/null
@@ -1,547 +0,0 @@
-
- Update a Variant
+ +
-
-
- Register a New Task
- - -
-
- Your task has been created!
-- Redirect to this URL upon task completion. ParticipantId can be any string, completed should be set to true. -
-roar.education/?participantId=[$PARTICIPANT_ID]&completed=[$BOOLEAN]
-
-
-
-
diff --git a/src/pages/Maintenance.vue b/src/pages/MaintenancePage.vue
similarity index 100%
rename from src/pages/Maintenance.vue
rename to src/pages/MaintenancePage.vue
diff --git a/src/pages/RegisterGame.vue b/src/pages/ManageTasksVariants.vue
similarity index 70%
rename from src/pages/RegisterGame.vue
rename to src/pages/ManageTasksVariants.vue
index aa8569094..d22c6968d 100644
--- a/src/pages/RegisterGame.vue
+++ b/src/pages/ManageTasksVariants.vue
@@ -4,19 +4,28 @@
-
- Register Task
+ Manage Tasks
Register a new task or variant.
+ Manage tasks and variants.
-
+
+
+
+
+
+
diff --git a/src/pages/SignIn.vue b/src/pages/SignIn.vue
index 60552fc1d..86e725643 100644
--- a/src/pages/SignIn.vue
+++ b/src/pages/SignIn.vue
@@ -183,7 +183,6 @@ const authWithGoogle = () => {
if (isMobileBrowser()) {
authStore.signInWithGoogleRedirect();
} else {
- // authStore.signInWithGoogleRedirect();
authStore
.signInWithGooglePopup()
.then(async () => {
@@ -214,14 +213,15 @@ const modalPassword = ref('');
const authWithClever = () => {
console.log('---> authWithClever');
- if (isMobileBrowser()) {
- authStore.signInWithCleverRedirect();
- spinner.value = true;
- } else {
- authStore.signInWithCleverRedirect();
- // authStore.signInWithCleverPopup();
- spinner.value = true;
- }
+ const isLocalHost = import.meta.env.DEV;
+ // // if localhost or not testing, use popup
+ // if (isLocalHost) {
+ // authStore.signInWithCleverPopup();
+ // spinner.value = true;
+ // } else {
+ authStore.signInWithCleverRedirect();
+ spinner.value = true;
+ // }
};
const authWithClassLink = () => {
diff --git a/src/router/index.js b/src/router/index.js
index 453961734..ef8e0bbee 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -195,15 +195,16 @@ const routes = [
},
{
- path: '/register-game',
- name: 'RegisterGame',
- component: () => import('../pages/RegisterGame.vue'),
- meta: { pageTitle: 'Register Game', requireAdmin: true, requireSuperAdmin: true },
+ path: '/manage-tasks-variants',
+ name: 'ManageTasksVariants',
+ component: () => import('../pages/ManageTasksVariants.vue'),
+ meta: { pageTitle: 'Manage Tasks', requireAdmin: true, requireSuperAdmin: true },
},
{
path: '/register',
name: 'Register',
component: () => import('../pages/RegisterFamilyUsers.vue'),
+ props: (route) => ({ code: route.query.code }),
children: [
{
name: 'Register',
@@ -403,7 +404,7 @@ const routes = [
{
path: '/maintenance',
name: 'Maintenance',
- component: () => import('../pages/Maintenance.vue'),
+ component: () => import('../pages/MaintenancePage.vue'),
meta: { pageTitle: 'Down for Maintenance' },
},
];
diff --git a/src/router/sidebarActions.js b/src/router/sidebarActions.js
index e9fbff78a..5a0386449 100644
--- a/src/router/sidebarActions.js
+++ b/src/router/sidebarActions.js
@@ -62,9 +62,9 @@ const sidebarActionOptions = [
category: 'Administrations',
},
{
- title: 'Register Task',
+ title: 'Manage Tasks',
icon: 'pi pi-pencil',
- buttonLink: { name: 'RegisterGame' },
+ buttonLink: { name: 'ManageTasksVariants' },
requiresSuperAdmin: true,
requiresAdmin: true,
project: 'ALL',
diff --git a/vite.config.js b/vite.config.js
index b6d4237ad..57e9aa92c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -19,7 +19,7 @@ export default defineConfig({
injectManifest: {
injectionPoint: undefined,
rollupFormat: 'iife',
- globPatterns: ['**/*.{html}'],
+ globPatterns: ['**/*'],
},
manifest: {
// Modify manifest options here...