Skip to content

Commit

Permalink
Merge pull request #430 from ruxailab/CooperatorsModerated
Browse files Browse the repository at this point in the history
Cooperators moderated
  • Loading branch information
jvJUCA authored Apr 11, 2024
2 parents be474ea + 764b789 commit 82d0e1d
Show file tree
Hide file tree
Showing 44 changed files with 1,641 additions and 793 deletions.
17 changes: 17 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"projects": {
"default": "retlab-dev",
"dev": "retlab-dev",
"production": "retlab"
},
"targets": {
"retlab-dev": {
"hosting": {
"ruxailab-dev": [
"ruxailab-dev"
]
}
}
},
"etags": {}
}
51 changes: 51 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"firestore": {
"rules": "firestore.rules",
"indexes": "firestore.indexes.json"
},
"functions": {
"predeploy": [
"npm --prefix \"$RESOURCE_DIR\" run lint"
],
"source": "functions"
},
"hosting": {
"site": "ruxailab-dev",
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
},
"emulators": {
"auth": {
"port": 9099
},
"functions": {
"port": 5001
},
"firestore": {
"port": 8081
},
"hosting": {
"port": 5000
},
"ui": {
"enabled": true
},
"singleProjectMode": true,
"storage": {
"port": 9199
}
},
"storage": {
"rules": "storage.rules"
}
}
4 changes: 4 additions & 0 deletions firestore.indexes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"indexes": [],
"fieldOverrides": []
}
9 changes: 9 additions & 0 deletions firestore.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
rules_version = '2';
service cloud.firestore {
match /databases/{database}/documents {
match /{document=**} {
allow read, write: if
request.time < timestamp.date(2025, 10, 18);
}
}
}
1 change: 1 addition & 0 deletions public/Schedule.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"
/>
<link
href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
rel="stylesheet"
/>
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"
Expand Down
27 changes: 27 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,33 @@ export default {
</script>

<style>
* {
margin: 0;
padding: 0;
box-sizing: border-box;
font-family: 'Poppins', sans-serif !important;
}
.v-application .display-3 {
font-size: 3.75rem !important;
font-weight: 300;
line-height: 3.75rem;
letter-spacing: -0.0083333333em !important;
font-family: 'Poppins', sans-serif !important;
}
.v-application .display-2 {
font-size: 3rem !important;
font-weight: 400;
line-height: 3.125rem;
letter-spacing: normal !important;
font-family: 'Poppins', sans-serif !important;
}
.v-application .display-1 {
font-size: 2.125rem !important;
font-weight: 400;
line-height: 2.5rem;
letter-spacing: 0.0073529412em !important;
font-family: 'Poppins', sans-serif !important;
}
.ProseMirror:focus {
outline: none;
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/atoms/AddDescBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ export default {
}),
computed: {
question() {
return this.$store.state.Tests.Test.testStructure[this.heuristicIndex].questions[this.questionIndex]
return this.$store.state.Tests.Test.testStructure[this.heuristicIndex]
.questions[this.questionIndex]
},
testAnswerDocLength() {
if(!this.$store.getters.testAnswerDocument) {
if (!this.$store.getters.testAnswerDocument) {
return 0
}
const heuristicAnswers = this.$store.getters.testAnswerDocument
Expand Down Expand Up @@ -177,7 +178,6 @@ export default {
background-color: rgba(185, 185, 185, 0.308);
}
.subtitleView {
font-family: Roboto;
font-style: normal;
font-weight: 200;
font-size: 18.1818px;
Expand Down
1 change: 0 additions & 1 deletion src/components/atoms/AddOptionBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ export default {
background-color: rgba(185, 185, 185, 0.308);
}
.subtitleView {
font-family: Roboto;
font-style: normal;
font-weight: 200;
font-size: 18.1818px;
Expand Down
9 changes: 2 additions & 7 deletions src/components/atoms/CardSignIn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
v-model="loading"
class="text-center"
>
<v-progress-circular
indeterminate
color="#fca326"
size="50"
/>
<v-progress-circular indeterminate color="#fca326" size="50" />
<div class="white-text mt-3">
{{ $t('common.loading') }}
</div>
Expand Down Expand Up @@ -69,7 +65,7 @@
<v-row align="center" justify="center" style="height: 100%">
<v-col class="text-div">
<div
class="display-3 mb-4 white--text mobile-center"
class="mb-4 white--text mobile-center"
style="font-size: 60px; font-weight: 500"
>
{{ $t('titles.manager') }}
Expand Down Expand Up @@ -241,7 +237,6 @@ export default {

<style scoped>
.card-title {
font-family: Roboto;
font-style: normal;
font-weight: 300;
font-size: 48px;
Expand Down
1 change: 0 additions & 1 deletion src/components/atoms/CardSignUp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ export default {

<style scoped>
.card-title {
font-family: Roboto;
font-style: normal;
font-weight: 300;
font-size: 48px;
Expand Down
7 changes: 0 additions & 7 deletions src/components/atoms/ImportImage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,6 @@ export default {
</script>

<style>
* {
margin: 0;
padding: 0;
box-sizing: border-box;
font-family: 'Poppins', sans-serif;
}
.input {
width: 100%;
}
Expand Down
38 changes: 30 additions & 8 deletions src/components/atoms/IntrosComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@
<div class="background-gradient" :style="backgroundImage">
<v-row class="ml-0" align="center" justify="center" style="height: 100%">
<div class="text-div">
<div class="display-3mb-4 white--text mobile-center" style="font-size: 60px; font-weight: 500">
<div
class="mb-4 white--text mobile-center"
style="font-size: 60px; font-weight: 500"
>
{{ $t('titles.drawer.' + title) }}
</div>
<v-img class="mb-5 hidden-md-and-up" contain :src="require('../../assets/manager/' + image)" max-height="350" />
<v-img
class="mb-5 hidden-md-and-up"
contain
:src="require('../../assets/manager/' + image)"
max-height="350"
/>
<div style="font-size: 22px" class="white--text mb-4 mobile-center">
{{ main }}
</div>
Expand All @@ -15,8 +23,12 @@
</button>
</div>

<v-img class="hidden-sm-and-down" contain max-width="40%" max-height="400"
:src="require('../../assets/manager/' + image)"
<v-img
class="hidden-sm-and-down"
contain
max-width="40%"
max-height="400"
:src="require('../../assets/manager/' + image)"
/>
</v-row>
</div>
Expand All @@ -27,18 +39,28 @@
<div class="learn-text">
{{ $t('pages.intros.learnMore') }}
</div>
<v-card elevation="4" class="ma-0 pa-0" style="border-radius: 10px !important">
<v-card
elevation="4"
class="ma-0 pa-0"
style="border-radius: 10px !important"
>
<v-list class="ma-0 pa-0">
<div v-for="(item, i) in items" :key="i">
<v-list-item class="py-5" :ripple="false" style="border-radius: 10px !important"
@click="emitCallFunc(item.func)"
<v-list-item
class="py-5"
:ripple="false"
style="border-radius: 10px !important"
@click="emitCallFunc(item.func)"
>
<v-list-item-avatar size="50" :color="item.iconColor">
<v-icon dark size="35" v-text="item.icon" />
</v-list-item-avatar>

<v-list-item-content>
<v-list-item-title style="font-size: 25px" v-text="item.title" />
<v-list-item-title
style="font-size: 25px"
v-text="item.title"
/>
<v-list-item-subtitle v-text="item.subtitle" />
</v-list-item-content>
</v-list-item>
Expand Down
19 changes: 9 additions & 10 deletions src/components/atoms/ModeratedTasks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
<v-row justify="center">
<v-col cols="12" class="pa-5">
<span class="cardsTitle ml-5">Tasks</span>
<br>
<span class="cardsSubtitle ml-5 mb-1">Create tasks for your evaluators</span>
<br />
<span class="cardsSubtitle ml-5 mb-1"
>Create tasks for your evaluators</span
>
<v-row justify="center">
<v-col cols="8">
<v-card
Expand Down Expand Up @@ -49,7 +51,7 @@
mdi-drag
</v-icon>
<span class="cardsTitle ml-3">{{ task.taskName }}</span>
<br>
<br />
<span class="cardsSubtitle ml-9">Task Description</span>
<v-icon class="delete-icon" @click="deleteTask(index)">
mdi-delete
Expand Down Expand Up @@ -102,13 +104,13 @@
<v-card-actions>
<v-btn dark color="red" @click="closeAddTaskModal">
<v-icon class="mr-1">
mdi-close
</v-icon>Cancel
mdi-close </v-icon
>Cancel
</v-btn>
<v-btn dark color="orange" @click="addTask">
<v-icon class="mr-1">
mdi-content-save
</v-icon>Save
mdi-content-save </v-icon
>Save
</v-btn>
</v-card-actions>
</v-card>
Expand All @@ -120,7 +122,6 @@
import draggable from 'vuedraggable'
export default {
components: { draggable },
data: () => ({
tasks: [],
Expand Down Expand Up @@ -209,15 +210,13 @@ export default {
}
.cardsTitle {
color: #455a64;
font-family: 'Poppins', Helvetica;
font-size: 18px;
font-style: normal;
font-weight: 600;
line-height: normal;
}
.cardsSubtitle {
color: #455a64;
font-family: 'Poppins', Helvetica;
font-size: 15px;
font-style: normal;
font-weight: 400;
Expand Down
1 change: 0 additions & 1 deletion src/components/atoms/NewHeuristicButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ export default {

<style scoped>
.subtitleView {
font-family: Roboto;
font-style: normal;
font-weight: 200;
font-size: 18.1818px;
Expand Down
2 changes: 0 additions & 2 deletions src/components/atoms/QuestionHelpBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,12 @@ export default {

<style scoped>
.titleView {
font-family: Roboto;
font-style: normal;
font-weight: 500;
font-size: 25px;
line-height: 1.3em;
}
.subtitleView {
font-family: Roboto;
font-style: normal;
font-size: 18.1818px;
line-height: 1.3em;
Expand Down
1 change: 0 additions & 1 deletion src/components/molecules/FormDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ export default {

<style scoped>
.subtitleView {
font-family: Roboto;
font-style: normal;
font-weight: 200;
font-size: 18.1818px;
Expand Down
1 change: 0 additions & 1 deletion src/components/molecules/HeuristicsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,6 @@ export default {
color: #dbdde4;
}
.subtitleView {
font-family: 'Poppins', Helvetica;
font-style: normal;
font-weight: 500;
font-size: 18.18px;
Expand Down
1 change: 0 additions & 1 deletion src/components/molecules/ListTasks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ export default {

<style scoped>
.subtitleView {
font-family: Roboto;
font-style: normal;
font-weight: 200;
font-size: 18.1818px;
Expand Down
Loading

0 comments on commit 82d0e1d

Please sign in to comment.