From ff12c3008ee7d6ce2e4af0d7412fa73e3a904bad Mon Sep 17 00:00:00 2001
From: Thilo Wischmeyer <thwischm@gmail.com>
Date: Mon, 1 Feb 2021 13:27:42 +0100
Subject: [PATCH] Replaced list-tile components with their list-item equivalent
---
frontend/src/components/BaseLayout.vue | 16 +++++-----
frontend/src/components/UserOptions.vue | 8 ++---
.../src/components/export/ExportDialog.vue | 4 +--
.../student_list/StudentListMenu.vue | 6 ++--
.../SubmissionTypesOverview.vue | 8 ++---
.../subscriptions/SubscriptionForList.vue | 12 +++----
.../pages/base/TutorReviewerBaseLayout.vue | 16 +++++-----
.../src/pages/reviewer/ReviewerLayout.vue | 16 +++++-----
frontend/src/pages/student/StudentLayout.vue | 32 +++++++++----------
frontend/src/pages/tutor/TutorLayout.vue | 16 +++++-----
functional_tests/test_import.py | 2 +-
11 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/frontend/src/components/BaseLayout.vue b/frontend/src/components/BaseLayout.vue
index d45f7033..48c466eb 100644
--- a/frontend/src/components/BaseLayout.vue
+++ b/frontend/src/components/BaseLayout.vue
@@ -9,29 +9,29 @@
>
<v-toolbar>
<v-list>
- <v-list-tile>
- <v-list-tile-action v-if="mini">
+ <v-list-item>
+ <v-list-item-action v-if="mini">
<v-btn
icon
@click.native.stop="mini = !mini"
>
<v-icon>chevron_right</v-icon>
</v-btn>
- </v-list-tile-action>
- <v-list-tile-content
+ </v-list-item-action>
+ <v-list-item-content
class="title"
>
<slot name="header" />
- </v-list-tile-content>
- <v-list-tile-action v-if="!mini">
+ </v-list-item-content>
+ <v-list-item-action v-if="!mini">
<v-btn
icon
@click.native.stop="mini = !mini"
>
<v-icon>chevron_left</v-icon>
</v-btn>
- </v-list-tile-action>
- </v-list-tile>
+ </v-list-item-action>
+ </v-list-item>
</v-list>
</v-toolbar>
<slot name="sidebar-content" />
diff --git a/frontend/src/components/UserOptions.vue b/frontend/src/components/UserOptions.vue
index 8d3091a0..2b2a239e 100644
--- a/frontend/src/components/UserOptions.vue
+++ b/frontend/src/components/UserOptions.vue
@@ -1,19 +1,19 @@
<template>
<div>
<v-list>
- <v-list-tile
+ <v-list-item
v-if="!isStudent"
@click="showPasswordChangeDialog"
>
Change password
- </v-list-tile>
+ </v-list-item>
<v-divider class="my-2" />
- <v-list-tile @click="logout">
+ <v-list-item @click="logout">
<v-icon left>
exit_to_app
</v-icon>
Logout
- </v-list-tile>
+ </v-list-item>
</v-list>
<component
:is="displayComponent"
diff --git a/frontend/src/components/export/ExportDialog.vue b/frontend/src/components/export/ExportDialog.vue
index 458600ca..4df16b3b 100644
--- a/frontend/src/components/export/ExportDialog.vue
+++ b/frontend/src/components/export/ExportDialog.vue
@@ -30,14 +30,14 @@
>(UNCORRECTED submissions left! Export will be incomplete.)</span>
</v-tooltip>
<v-list>
- <v-list-tile
+ <v-list-item
v-for="(item, i) in menuItems"
:id="'export-list' + i"
:key="i"
@click="item.action"
>
{{ item.display }}
- </v-list-tile>
+ </v-list-item>
</v-list>
<component
:is="displayComponent"
diff --git a/frontend/src/components/student_list/StudentListMenu.vue b/frontend/src/components/student_list/StudentListMenu.vue
index 165590e0..95176ffb 100644
--- a/frontend/src/components/student_list/StudentListMenu.vue
+++ b/frontend/src/components/student_list/StudentListMenu.vue
@@ -12,13 +12,13 @@
<v-icon>menu</v-icon>
</v-btn>
<v-list>
- <v-list-tile
+ <v-list-item
v-for="item in items"
:key="item.title"
@click="item.action"
>
- <v-list-tile-title>{{ item.title }}</v-list-tile-title>
- </v-list-tile>
+ <v-list-item-title>{{ item.title }}</v-list-item-title>
+ </v-list-item>
</v-list>
</v-menu>
</template>
diff --git a/frontend/src/components/submission_type/SubmissionTypesOverview.vue b/frontend/src/components/submission_type/SubmissionTypesOverview.vue
index 90a95209..c10d4c3b 100644
--- a/frontend/src/components/submission_type/SubmissionTypesOverview.vue
+++ b/frontend/src/components/submission_type/SubmissionTypesOverview.vue
@@ -6,15 +6,15 @@
<v-row>
<v-col cols="3">
<v-list id="submission-types-list">
- <v-list-tile
+ <v-list-item
v-for="submissionType in sortedSubmissionTypes"
:key="submissionType.pk"
@click="selectedSubmissionType = submissionType"
>
- <v-list-tile-content>
+ <v-list-item-content>
{{ submissionType.name }}
- </v-list-tile-content>
- </v-list-tile>
+ </v-list-item-content>
+ </v-list-item>
</v-list>
</v-col>
<v-col cols="9">
diff --git a/frontend/src/components/subscriptions/SubscriptionForList.vue b/frontend/src/components/subscriptions/SubscriptionForList.vue
index 28ae948e..710aa986 100644
--- a/frontend/src/components/subscriptions/SubscriptionForList.vue
+++ b/frontend/src/components/subscriptions/SubscriptionForList.vue
@@ -1,21 +1,21 @@
<template>
<v-row>
- <v-list-tile
+ <v-list-item
exact
:to="correctionRoute"
style="width: 100%"
>
<!-- dynamically set css class depending on active -->
- <v-list-tile-content
+ <v-list-item-content
:class="{'inactive-subscription': !active}"
class="mr-3 subscription"
>
{{ name }}
- </v-list-tile-content>
- <v-list-tile-action-text>
+ </v-list-item-content>
+ <v-list-item-action-text>
left: {{ available }}
- </v-list-tile-action-text>
- </v-list-tile>
+ </v-list-item-action-text>
+ </v-list-item>
</v-row>
</template>
diff --git a/frontend/src/pages/base/TutorReviewerBaseLayout.vue b/frontend/src/pages/base/TutorReviewerBaseLayout.vue
index 185d6a2d..cb9c2e98 100644
--- a/frontend/src/pages/base/TutorReviewerBaseLayout.vue
+++ b/frontend/src/pages/base/TutorReviewerBaseLayout.vue
@@ -6,20 +6,20 @@
<template slot="sidebar-content">
<v-list dense>
- <v-list-tile
+ <v-list-item
v-for="(item, i) in generalNavItems"
:key="i"
:to="item.route"
>
- <v-list-tile-action>
+ <v-list-item-action>
<v-icon>{{ item.icon }}</v-icon>
- </v-list-tile-action>
- <v-list-tile-content>
- <v-list-tile-title :id="item.tagId">
+ </v-list-item-action>
+ <v-list-item-content>
+ <v-list-item-title :id="item.tagId">
{{ item.name }}
- </v-list-tile-title>
- </v-list-tile-content>
- </v-list-tile>
+ </v-list-item-title>
+ </v-list-item-content>
+ </v-list-item>
</v-list>
<v-divider />
<slot name="above-subscriptions" />
diff --git a/frontend/src/pages/reviewer/ReviewerLayout.vue b/frontend/src/pages/reviewer/ReviewerLayout.vue
index ff1b2141..2aaf3912 100644
--- a/frontend/src/pages/reviewer/ReviewerLayout.vue
+++ b/frontend/src/pages/reviewer/ReviewerLayout.vue
@@ -4,20 +4,20 @@
slot="above-subscriptions"
dense
>
- <v-list-tile
+ <v-list-item
v-for="(item, i) in subGeneralNavItems"
:key="i"
:to="item.route"
>
- <v-list-tile-action>
+ <v-list-item-action>
<v-icon>{{ item.icon }}</v-icon>
- </v-list-tile-action>
- <v-list-tile-content>
- <v-list-tile-title>
+ </v-list-item-action>
+ <v-list-item-content>
+ <v-list-item-title>
{{ item.name }}
- </v-list-tile-title>
- </v-list-tile-content>
- </v-list-tile>
+ </v-list-item-title>
+ </v-list-item-content>
+ </v-list-item>
</v-list>
</tutor-reviewer-base-layout>
</template>
diff --git a/frontend/src/pages/student/StudentLayout.vue b/frontend/src/pages/student/StudentLayout.vue
index 2229f27d..5dca9d73 100644
--- a/frontend/src/pages/student/StudentLayout.vue
+++ b/frontend/src/pages/student/StudentLayout.vue
@@ -8,21 +8,21 @@
slot="sidebar-content"
dense
>
- <v-list-tile
+ <v-list-item
v-for="(item, i) in generalNavItems"
:key="i"
exact
:to="item.route"
>
- <v-list-tile-action>
+ <v-list-item-action>
<v-icon>{{ item.icon }}</v-icon>
- </v-list-tile-action>
- <v-list-tile-content>
- <v-list-tile-title>
+ </v-list-item-action>
+ <v-list-item-content>
+ <v-list-item-title>
{{ item.name }}
- </v-list-tile-title>
- </v-list-tile-content>
- </v-list-tile>
+ </v-list-item-title>
+ </v-list-item-content>
+ </v-list-item>
<v-divider />
@@ -31,26 +31,26 @@
:exam="exam"
class="elevation-1 exam-info ma-1"
/>
- <v-list-tile
+ <v-list-item
v-for="item in submissionNavItems"
:key="item.route"
exact
:to="item.route"
>
- <v-list-tile-action>
+ <v-list-item-action>
<v-icon v-if="!visited[item.id]">
assignment
</v-icon>
<v-icon v-else>
check
</v-icon>
- </v-list-tile-action>
- <v-list-tile-content>
- <v-list-tile-title>
+ </v-list-item-action>
+ <v-list-item-content>
+ <v-list-item-title>
{{ item.name }}
- </v-list-tile-title>
- </v-list-tile-content>
- </v-list-tile>
+ </v-list-item-title>
+ </v-list-item-content>
+ </v-list-item>
</v-list>
</base-layout>
</template>
diff --git a/frontend/src/pages/tutor/TutorLayout.vue b/frontend/src/pages/tutor/TutorLayout.vue
index 10f9a3c8..6fd1c7bf 100644
--- a/frontend/src/pages/tutor/TutorLayout.vue
+++ b/frontend/src/pages/tutor/TutorLayout.vue
@@ -5,16 +5,16 @@
slot="above-subscriptions"
dense
>
- <v-list-tile :to="'/participant-overview'">
- <v-list-tile-action>
+ <v-list-item :to="'/participant-overview'">
+ <v-list-item-action>
<v-icon> people </v-icon>
- </v-list-tile-action>
- <v-list-tile-content>
- <v-list-tile-title>
+ </v-list-item-action>
+ <v-list-item-content>
+ <v-list-item-title>
{{ "Participants" }}
- </v-list-tile-title>
- </v-list-tile-content>
- </v-list-tile>
+ </v-list-item-title>
+ </v-list-item-content>
+ </v-list-item>
</v-list>
</tutor-reviewer-base-layout>
</template>
diff --git a/functional_tests/test_import.py b/functional_tests/test_import.py
index f573836e..44b1c575 100644
--- a/functional_tests/test_import.py
+++ b/functional_tests/test_import.py
@@ -35,7 +35,7 @@ class TestImport(GradyTestCase):
def test_reviewer_can_import_data(self):
self._login()
self.browser.find_element_by_id("user-options").click()
- self.browser.find_element_by_id("import-data-list-tile").click()
+ self.browser.find_element_by_id("import-data-list-item").click()
self.browser.execute_script(
"document.getElementById('file-input').style.display='block';"
)
--
GitLab