Skip to content

Commit 7f98e3e

Browse files
jsun1590the-incredible-sunrezbytedaviid-wangShalini
authored
I47 quiz creation page (#131)
* Start quiz creation page + add config file * Merged relevant files from i76-authentication_components Squashed commit of the following: commit b5b799c Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 22:11:23 2022 +0800 Squashed commit of the following: commit 31bade5 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 21:50:33 2022 +0800 Make footer bigger commit 574e0e7 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 21:43:16 2022 +0800 Improved textbox sizing commit 91962ed Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 21:27:35 2022 +0800 Made sign up link semi-bold commit 3bd8e28 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 21:26:54 2022 +0800 Put sign up link in center bottom commit 37b4c22 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 21:16:19 2022 +0800 Improve AuthForm size commit 454f2c2 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 20:48:35 2022 +0800 Align header in login page commit a4f04a6 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 20:42:39 2022 +0800 Add shapes vector commit 367ec9c Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 19:53:44 2022 +0800 Fix font weight not changing commit c250c64 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 19:41:27 2022 +0800 Add alt description to logo in AuthHeader commit 532c858 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 19:28:32 2022 +0800 Improve AuthHeader size & placement commit e56707f Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 19:08:20 2022 +0800 Add unofficial logo vector commit fa2a234 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 17:45:25 2022 +0800 Add avatar icon to login page commit 8dba0ff Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 16:40:32 2022 +0800 Improve login button appearance commit 5b33360 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 16:39:21 2022 +0800 Fix spacing & font weight of FormTextBox commit 24d69a0 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Tue Jul 5 16:37:41 2022 +0800 Add drop shadow md to theme commit 0013035 Author: Nicholas Davies <nicholasjohndavies42@gmail.com> Date: Tue Jul 5 05:37:47 2022 +0000 Removed duplicate AuthForm commit f009220 Merge: 49cb8ce 59e10f4 Author: Nicholas Davies <nicholasjohndavies42@gmail.com> Date: Tue Jul 5 05:35:28 2022 +0000 Merge branch 'i43-sign_up_page' into i76-authentication_components commit 49cb8ce Merge: 907c4ad 137c806 Author: Nicholas Davies <nicholasjohndavies42@gmail.com> Date: Tue Jul 5 05:30:06 2022 +0000 Merge branch 'i44-log_in_page' into i76-authentication_components commit 907c4ad Merge: 1d945bb 0ca1e49 Author: Nicholas Davies <nicholasjohndavies42@gmail.com> Date: Tue Jul 5 04:57:40 2022 +0000 Merge remote-tracking branch 'origin/main' into i76-authentication_components commit 59e10f4 Author: jordantgiang <jordantgiang@gmail.com> Date: Mon Jul 4 11:04:00 2022 +0000 Create teal/green box component commit 1d945bb Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Sat Jul 2 20:35:00 2022 +0800 Add form background component commit 0ca1e49 Merge: b39f9e1 0e0e87a Author: jsun1590 <40915904+jsun1590@users.noreply.github.com> Date: Sat Jul 2 20:34:14 2022 +0800 Merge pull request #12 from codersforcauses/renovate/major-jest-monorepo Update dependency babel-jest to v28 commit 0e0e87a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Jul 2 12:30:09 2022 +0000 Update dependency babel-jest to v28 commit 137c806 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Sat Jul 2 20:28:41 2022 +0800 Add AuthForm component commit b39f9e1 Merge: 1511ccb ee4f916 Author: jsun1590 <40915904+jsun1590@users.noreply.github.com> Date: Sat Jul 2 20:28:20 2022 +0800 Merge pull request #36 from codersforcauses/renovate/nuxtjs-tailwindcss-5.x Update dependency @nuxtjs/tailwindcss to v5.1.3 commit 1511ccb Merge: 7235311 734d78a Author: jsun1590 <40915904+jsun1590@users.noreply.github.com> Date: Sat Jul 2 20:27:42 2022 +0800 Merge pull request #28 from codersforcauses/renovate/core-js-3.x Update dependency core-js to v3.23.3 commit 7235311 Merge: dd17d1c 4a3b969 Author: jsun1590 <40915904+jsun1590@users.noreply.github.com> Date: Sat Jul 2 20:27:15 2022 +0800 Merge pull request #71 from codersforcauses/renovate/eslint-8.x Update dependency eslint to v8.19.0 commit 4a3b969 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Jul 2 12:26:46 2022 +0000 Update dependency eslint to v8.19.0 commit 734d78a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Jul 2 12:26:31 2022 +0000 Update dependency core-js to v3.23.3 commit ee4f916 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Jul 2 12:26:16 2022 +0000 Update dependency @nuxtjs/tailwindcss to v5.1.3 commit dd17d1c Merge: e61c409 a56e814 Author: jsun1590 <40915904+jsun1590@users.noreply.github.com> Date: Sat Jul 2 20:25:29 2022 +0800 Merge pull request #64 from codersforcauses/renovate/jest-monorepo Update jest monorepo to v28.1.2 commit e61c409 Merge: 13917b6 3222737 Author: jsun1590 <40915904+jsun1590@users.noreply.github.com> Date: Sat Jul 2 20:25:17 2022 +0800 Merge pull request #35 from codersforcauses/renovate/cypress-10.x Update dependency cypress to v10.3.0 commit 750b101 Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Sat Jul 2 20:18:51 2022 +0800 Switch to new colour system again commit dd8142f Merge: 94807ef 74d293e Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Sat Jul 2 20:15:55 2022 +0800 Merge branch 'i44-log_in_page' of https://github.com/codersforcauses/elucidate into i44-log_in_page commit 94807ef Author: rezbyte <48037381+rezbyte@users.noreply.github.com> Date: Sat Jul 2 20:09:20 2022 +0800 Add TextBox component commit bb3e037 Author: Shalini Mohan <mohan.shalini@outlook.com> Date: Sat Jul 2 17:51:23 2022 +0800 Add shades to default colors commit 74d293e Author: Shalini Mohan <mohan.shalini@outlook.com> Date: Sat Jul 2 17:51:23 2022 +0800 Add shades to default colors commit 2654148 Author: Shalini Mohan <mohan.shalini@outlook.com> Date: Sat Jul 2 17:51:08 2022 +0800 Add new color system commit 67c7c32 Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 08:07:01 2022 +0000 Merge page title and header commit f59f49f Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 07:47:28 2022 +0000 Add page title icon commit 4201e72 Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 07:46:56 2022 +0000 Add new icon commit 14df230 Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 07:11:24 2022 +0000 Rename page commit 8cb67a8 Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 07:09:08 2022 +0000 Input field to component commit 61807a6 Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 05:35:25 2022 +0000 Progress sign-up page styling commit 64aeb04 Author: Carmen <carmen020824@gmail.com> Date: Thu Jun 30 10:48:14 2022 +0000 add header & footer for signup page commit f9cfd52 Author: Shalini Mohan <mohan.shalini@outlook.com> Date: Sat Jul 2 15:37:13 2022 +0800 Finish styling for page: add border to login button + style sign-in link commit ec1432e Author: NicholasJDavies <nicholasjohndavies42@gmail.com> Date: Sat Jul 2 15:35:13 2022 +0800 changed global styling commit c5957ce Merge: 4258c45 56704b8 Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 07:11:34 2022 +0000 Merge branch 'i43-sign_up_page' of https://github.com/codersforcauses/elucidate into i43-sign_up_page commit 4258c45 Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 07:11:24 2022 +0000 Rename page commit c90f4da Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 07:09:08 2022 +0000 Input field to component commit f97357f Author: Shalini Mohan <mohan.shalini@outlook.com> Date: Sat Jul 2 15:02:33 2022 +0800 Style inputs and password reset link commit 1a791a1 Author: Shalini Mohan <mohan.shalini@outlook.com> Date: Sat Jul 2 15:00:44 2022 +0800 Add white to colors commit 56704b8 Author: root <ciaangel11@gmail.com> Date: Sat Jul 2 06:25:56 2022 +0000 Add logo svg commit 8486280 Author: Shalini Mohan <mohan.shalini@outlook.com> Date: Sat Jul 2 14:24:47 2022 +0800 Move Plain CSS to TailwindCSS + Add AuthHeader and AuthFooter commit 3bff1ff Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 06:07:20 2022 +0000 Add global styling commit a003415 Author: jordantgiang <jordantgiang@gmail.com> Date: Sat Jul 2 05:35:25 2022 +0000 Progress sign-up page styling commit 51b6903 Author: Carmen <carmen020824@gmail.com> Date: Thu Jun 30 10:48:14 2022 +0000 add header & footer for signup page commit 3e1845a Author: Shalini Mohan <mohan.shalini@outlook.com> Date: Sat Jul 2 13:17:59 2022 +0800 Add global styling commit adb1c01 Author: jordantgiang <jordantgiang@gmail.com> Date: Fri Jul 1 06:13:10 2022 +0000 basic implementation of sign-up page commit df44807 Author: Shalini Mohan <mohan.shalini@outlook.com> Date: Fri Jul 1 13:39:02 2022 +0800 feat(core): WIP login form commit 775f4d1 Author: Carmen <carmen020824@gmail.com> Date: Thu Jun 30 23:40:45 2022 +0800 Fix duplicate elements commit 3a0144a Merge: 13917b6 8afee3c Author: Carmen <68544566+carrrmenleong@users.noreply.github.com> Date: Thu Jun 30 18:58:47 2022 +0800 add header and footer to sign up page commit 8afee3c Author: Carmen <carmen020824@gmail.com> Date: Thu Jun 30 10:52:01 2022 +0000 delete unwanted files commit 2a852dd Author: Carmen <carmen020824@gmail.com> Date: Thu Jun 30 10:48:14 2022 +0000 add header & footer for signup page commit a56e814 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed Jun 29 13:49:50 2022 +0000 Update jest monorepo to v28.1.2 commit 3222737 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed Jun 29 07:48:29 2022 +0000 Update dependency cypress to v10.3.0 * Add skeleton of quiz creation page * Add some more features * Add components for input boxes + minimum styling * Merge with Branch i76 Authentication Components Continued * Fix unexpected comma error * Fix dependencies * Merge configs from i76 * Fix import in quiz-creation * Move assets to static * Stylize Box + Box Header * WIP Quiz Creation Page: Fix default.vue to fit Quiz Creation Page * Fix Elucidate logo * Add shadow, rounding + button * Add QuizButton * Fix missing background in QuizButton * Fix text colour in QuizButton not changing to background * Make Vetur use pascal case * WIP Quiz Creation: Objectives Box (Almost Completed Page) * Almost Done Quiz Creation Page * Fix stopwatch icon * Create MCQ Page * Fix QuizButton colours * Add QuizButton to quiz-creation * [WIP] background image * Add styling for buttons + make questionbox.vue component * Style QuestionBox * Add all components to page * Adjust styling for red buttons * Add numeric question button * [WIP] Fix layout of answers * [WIP] TIme allocated bubble * [WIP] Add subtitle to Box * Fix placement of red buttons * [WIP] Styling different components * [WIP] Add short answers page + component * [WIP] Add numeric question page * Format * Remove unneeded flex * Add default values * Add defaults * Changed time box's input box to a better version * Fix margins on input boxes * Merge i47 with i46 to get tag box component Co-authored-by: Shalini <shalinimohan2001@users.noreply.github.com> * Improve TagBox * Deleted quiz creation page + add tag box to MCQ Co-authored-by: Shalini <shalinimohan2001@users.noreply.github.com> * Run yarn lint on all files * Update TagBox Component and working on documentation * Work in progress short answer; completed styling for MCQ page Co-authored-by: Shalini <shalinimohan2001@users.noreply.github.com> * fix lock file * lint fix * Finish styling on all question creation pages. Co-authored-by: Shalini <shalinimohan2001@users.noreply.github.com> * Fix all merge issues + all front end styling except rounded shadows * Complete front end + lintfix * remove npm artifact * plugin to inject token to axios * topics and subjects endpoits * integrate subjects and topics * rewrite topics serialiser and views endpoint * generate quiz * complete integration * update deps * lint fix * fix tests Co-authored-by: Shalini Mohan <mohan.shalini@outlook.com> Co-authored-by: rezbyte <48037381+rezbyte@users.noreply.github.com> Co-authored-by: David <david.holt2002@gmail.com> Co-authored-by: Shalini <shalinimohan2001@users.noreply.github.com>
1 parent 1923f9d commit 7f98e3e

34 files changed

+2143
-1603
lines changed

client/.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"editor.codeActionsOnSave": {
66
"source.fixAll": true
77
},
8-
"headwind.runOnSave": false
8+
"headwind.runOnSave": false,
9+
"vetur.completion.tagCasing": "initial"
910
}

client/assets/ambient_shapes.png

21.4 KB
Loading
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<template>
2+
<div class="flex flex-inline">
3+
<label class="text-white mt-3 mr-5 text-l font-bold">{{ header }}</label>
4+
<input class="p-4 m-0 w-[700px] h-2 rounded shadow-md" :type="inputType" />
5+
</div>
6+
</template>
7+
8+
<script>
9+
export default {
10+
name: 'AnswersBox',
11+
props: {
12+
header: String,
13+
inputType: String,
14+
},
15+
};
16+
</script>

client/components/Quiz/Box.vue

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<template>
2+
<div class="mx-50 place-items-center shadow-md">
3+
<div :class="`flex ${isCentered ? 'self-center' : ''}`">
4+
<h1 class="w-full font-bold text-xl bg-green2 p-7 rounded-tl rounded-tr">
5+
{{ title }}
6+
</h1>
7+
</div>
8+
9+
<div class="place-self-center bg-blue2 rounded-br rounded-bl w-fit">
10+
<slot></slot>
11+
</div>
12+
</div>
13+
</template>
14+
15+
<script>
16+
export default {
17+
Name: 'Box',
18+
props: {
19+
title: String,
20+
isCentered: Boolean,
21+
},
22+
};
23+
</script>

client/components/Quiz/MultiselectBox.vue

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<script>
2020
import Multiselect from 'vue-multiselect';
21-
2221
export default {
2322
name: 'MultiselectBox',
2423
components: {
@@ -76,3 +75,24 @@ export default {
7675
</script>
7776

7877
<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
78+
<style>
79+
.beginQuizSelector .multiselect__tag,
80+
.beginQuizSelector .multiselect__option--highlight,
81+
.beginQuizSelector .multiselect__option--highlight::after {
82+
background-color: #fcd47c;
83+
color: black;
84+
}
85+
.beginQuizSelector .multiselect__tag i:hover {
86+
background-color: #d19a24;
87+
color: black;
88+
}
89+
.beginQuizSelector .multiselect__tags {
90+
border-radius: 6px;
91+
font-size: 16px;
92+
border-width: 0px;
93+
}
94+
.beginQuizSelector .multiselect__placeholder {
95+
margin-bottom: 0px;
96+
padding-top: 0px;
97+
}
98+
</style>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<template>
2+
<div class="flex flex-inline mb-5">
3+
<textarea
4+
class="p-0 mx-5 w-[700px] h-[100px] rounded shadow-md"
5+
:type="inputType"
6+
></textarea>
7+
</div>
8+
</template>
9+
10+
<script>
11+
export default {
12+
name: 'QuestionBox',
13+
props: {
14+
inputType: String,
15+
},
16+
};
17+
</script>
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<template>
2+
<div>
3+
<button
4+
:class="`inline-flex rounded-full shadow-sm
5+
${colour} ${textColour}
6+
font-bold px-7 py-1`"
7+
>
8+
<slot />
9+
</button>
10+
</div>
11+
</template>
12+
13+
<script>
14+
import Color from 'color';
15+
export default {
16+
name: 'QuizButton',
17+
props: {
18+
colour: {
19+
type: String,
20+
default: 'bg-red',
21+
validator(v) {
22+
return v.startsWith('bg-');
23+
},
24+
},
25+
},
26+
data() {
27+
return {
28+
// Display white text on dark backgrounds & vice-versa
29+
textColour: 'text-white',
30+
};
31+
},
32+
mounted() {
33+
// Get the class background colour via the final colour
34+
const buttonColour = window
35+
.getComputedStyle(this.$el)
36+
.getPropertyValue('background-color');
37+
38+
if (Color(buttonColour).isLight()) {
39+
this.textColour = 'text-black';
40+
} else {
41+
this.textColour = 'text-white';
42+
}
43+
},
44+
};
45+
</script>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<template>
2+
<div class="flex flex-inline">
3+
<textarea
4+
class="p-0 ml-[13px] w-[700px] h-[100px] rounded shadow-md"
5+
:type="inputType"
6+
></textarea>
7+
</div>
8+
</template>
9+
10+
<script>
11+
export default {
12+
name: 'AnswersBox',
13+
props: {
14+
inputType: String,
15+
},
16+
};
17+
</script>

client/nuxt.config.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ export default {
9797
local: {
9898
token: {
9999
property: 'token',
100-
global: true,
101-
// required: true,
102-
// type: 'Bearer'
100+
maxAge: 604800, // 7 days in seconds
103101
},
104102
refreshToken: {
105103
data: 'token',
@@ -115,5 +113,6 @@ export default {
115113
},
116114
},
117115
},
116+
plugins: ['~/plugins/axios.js'],
118117
},
119118
};

client/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"@fortawesome/vue-fontawesome": "2.0.8",
2323
"@nuxtjs/auth-next": "5.0.0-1648802546.c9880dc",
2424
"@nuxtjs/axios": "5.13.6",
25+
"color": "^4.2.3",
2526
"consola": "2.15.3",
2627
"core-js": "3.24.1",
2728
"nuxt": "2.15.8",

0 commit comments

Comments
 (0)