{{ question?.pytanie }}
+ {{ question?.pytanie }}
();
-
diff --git a/components/RightBar.vue b/components/RightBar.vue
index 51b17fa..437b341 100644
--- a/components/RightBar.vue
+++ b/components/RightBar.vue
@@ -1,13 +1,17 @@
@@ -16,58 +20,59 @@ defineProps<{
- ![]()
+
+ ![]()
+
+
+ Brak mediów
-
+
Pytania podstawowe
-
+
-
-
-
- {{ countBasic + 1 }} / {{ dataBasic?.length }}
+
+
+ {{ countBasic + 1 }} / {{ dataBasic?.length }}
+
Pytania specjalistyczne
-
+
-
-
-
- {{ countAdvanced + 1 }} / {{ dataAdvanced?.length }}
+
+
+
+ {{ countAdvanced + 1 }} / {{ dataAdvanced?.length }}
+
- Czas na zapoznanie się z treścią pytania
- Czas na odpowiedź -
- Czas na odpowiedź -
START
-
-
-
- > = ref([]);
@apply box-border text-white font-bold p-3 rounded-md w-fit cursor-pointer border-[4px] transition duration-100;
}
+.btn:active {
+ @apply duration-0;
+}
+
.btn-answer {
@apply btn bg-blue-500 text-xl;
}
@@ -108,13 +157,21 @@ const questionaries: Ref> = ref([]);
}
.btn-answer:active {
- @apply bg-blue-400 duration-0;
+ @apply bg-blue-400;
}
.btn-major {
@apply btn bg-orange-400 text-base;
}
+.btn-major:hover {
+ @apply bg-orange-200;
+}
+
+.btn-major:active {
+ @apply bg-orange-300;
+}
+
.info-little-box {
@apply inline-block px-[15px] py-[8px] bg-blue-500 text-white font-bold;
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f8e8185..749c11d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,6 +23,9 @@ importers:
array-shuffle:
specifier: ^3.0.0
version: 3.0.0
+ date-fns:
+ specifier: ^4.1.0
+ version: 4.1.0
dotenv:
specifier: ^16.4.7
version: 16.4.7
@@ -1750,6 +1753,9 @@ packages:
csstype@3.1.3:
resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+ date-fns@4.1.0:
+ resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
+
db0@0.2.4:
resolution: {integrity: sha512-hIzftLH1nMsF95zSLjDLYLbE9huOXnLYUTAQ5yKF5amp0FpeD+B15XJa8BvGYSOeSCH4gl2WahB/y1FcUByQSg==}
peerDependencies:
@@ -5819,6 +5825,8 @@ snapshots:
csstype@3.1.3: {}
+ date-fns@4.1.0: {}
+
db0@0.2.4(drizzle-orm@0.40.0(@types/pg@8.11.11)(gel@2.0.0)(pg@8.13.3)):
optionalDependencies:
drizzle-orm: 0.40.0(@types/pg@8.11.11)(gel@2.0.0)(pg@8.13.3)
diff --git a/server/api/basic.get.ts b/server/api/basic.get.ts
index 5026802..be88fe2 100644
--- a/server/api/basic.get.ts
+++ b/server/api/basic.get.ts
@@ -1,7 +1,7 @@
import "dotenv/config";
import { drizzle } from "drizzle-orm/node-postgres";
import { dane, punkty } from "@/src/db/schema";
-import { sql, eq } from "drizzle-orm";
+import { sql, eq, and, or } from "drizzle-orm";
import { BasicQuestion } from "~/types/basic";
import arrayShuffle from "array-shuffle";
@@ -24,14 +24,17 @@ export default defineEventHandler(async (event) => {
.from(dane)
.innerJoin(punkty, eq(dane.nr_pytania, punkty.nr_pytania))
.where(
- sql`(lower(${dane.poprawna_odp})='tak' or lower(${
- dane.poprawna_odp
- })='nie') and ${punkty.liczba_pkt}=${+points}`
+ and(
+ or(
+ sql`lower(${dane.poprawna_odp})='tak'`,
+ sql`lower(${dane.poprawna_odp})='nie'`
+ ),
+ eq(punkty.liczba_pkt, +points)
+ )
);
}
const query = getQuery(event);
const category = query.category;
- console.log(typeof category);
if (typeof category != "undefined" && typeof category != "string") {
throw new Error(
"category argument has to be string (or not to be defined at all)"
- 10 sekund
+
@@ -99,6 +144,10 @@ const questionaries: Ref
+ Czas na zapoznanie się z pytaniem
+ Czas na udzielenie odpowiedzi + +> = ref([]);
:count-basic="countBasic"
:count-advanced="countAdvanced"
@next-question="next()"
+ :now="now"
/>
+ Czas na udzielenie odpowiedzi + +
+
-
+
+
diff --git a/components/TopBar.vue b/components/TopBar.vue
index 33bf668..3360a95 100644
--- a/components/TopBar.vue
+++ b/components/TopBar.vue
@@ -7,19 +7,19 @@ defineProps<{
- START
+
+
@@ -81,6 +86,26 @@ defineProps<{
+
+
10 s
-
{{ questionaries }}
+ {{ questionaries }}
+
diff --git a/package.json b/package.json
index 8277082..022a8cd 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"@nuxt/fonts": "0.10.3",
"@nuxtjs/tailwindcss": "6.13.1",
"array-shuffle": "^3.0.0",
+ "date-fns": "^4.1.0",
"dotenv": "^16.4.7",
"drizzle-orm": "^0.40.0",
"nuxt": "^3.15.4",
diff --git a/pages/exam.vue b/pages/exam.vue
index 185e5f4..ea3c66d 100644
--- a/pages/exam.vue
+++ b/pages/exam.vue
@@ -20,14 +20,16 @@ const {
const countBasic = ref(0);
const countAdvanced = ref(-1);
+const now = ref("basic");
+
const tak_nie_model = ref();
+const abc_model = ref();
async function next() {
if (countBasic.value + 1 < dataBasic.value?.length!) {
questionaries.value.push({
- nr_pytania: question.value?.nr_pytania,
+ question: question.value,
chosen_answer: tak_nie_model.value ?? "",
- correct_answer: question.value?.poprawna_odp?.toLowerCase(),
chosen_is_correct:
tak_nie_model.value == question.value?.poprawna_odp?.toLowerCase(),
liczba_pkt: question.value?.liczba_pkt,
@@ -37,17 +39,50 @@ async function next() {
useHead({
title: `Pytanie ${countBasic.value + 1}/${dataBasic.value?.length}`,
});
- } else {
- // await navigateTo("/advanced");
+ } else if (countAdvanced.value + 1 < dataAdvanced.value?.length!) {
+ if (countAdvanced.value != -1) {
+ questionaries.value.push({
+ question: question.value,
+ chosen_answer: abc_model.value ?? "",
+ chosen_is_correct:
+ abc_model.value == question.value?.poprawna_odp?.toLowerCase(),
+ liczba_pkt: question.value?.liczba_pkt,
+ });
+ } else {
+ now.value = "advanced";
+ }
+ countAdvanced.value++;
+ abc_model.value = "";
}
}
-const question = computed(() => dataBasic.value?.at(countBasic.value));
+async function endExam() {
+ return;
+}
+
+const questionBasic = computed(() =>
+ dataBasic.value?.at(countBasic.value)
+);
+const questionAdvanced = computed(() =>
+ dataAdvanced.value?.at(countAdvanced.value)
+);
+
+const question = computed(() => {
+ if (now.value == "basic") {
+ return questionBasic.value;
+ } else if (now.value == "advanced") {
+ return questionAdvanced.value;
+ } else {
+ return;
+ }
+});
+
const media = computed(() => {
const mediaSplit = question.value?.media?.split(".");
return {
fileType: mediaSplit?.pop()?.toLowerCase(),
fileName: mediaSplit?.join("."),
+ ogName: question.value?.media,
};
});
@@ -74,7 +109,16 @@ const questionaries: Ref> = ref([]);
:time-remaining="`25:00`"
/>
- Wartość punktowa
+ Wartość punktowa
{{ points }}
- Aktualna kategoria (implement)
+ Aktualna kategoria (implement)
{{ category }}
- Czas do końca egzaminu (implement)
+ Czas do końca egzaminu (implement)
{{ timeRemaining }}