improve pagination

rockstarr-programmerr · rockstarr-programmerr · commit 7fd8723a2c06 · 2021-10-17T00:55:26.000+07:00
diff --git a/public/index.html b/public/index.html
@@ -5,13 +5,13 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>Keep learning</title>
+    <title>Tango</title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but Keep learning doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>We're sorry but Tango doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
diff --git a/src/layouts/LayoutDefault.vue b/src/layouts/LayoutDefault.vue
@@ -10,7 +10,7 @@
         :to="{ name: 'Home' }"
         class="d-flex align-center white--text"
       >
-        Keep learning!
+        Tango
       </router-link>
 
       <v-spacer></v-spacer>
diff --git a/src/mixins/pagination-mixin.ts b/src/mixins/pagination-mixin.ts
@@ -12,6 +12,10 @@ export class PaginationMixin extends Vue {
     return Math.ceil(this.pagination.count / PAGE_SIZE)
   }
 
+  get noPagination (): boolean {
+    return this.pagination.next === null && this.pagination.previous === null
+  }
+
   getList (query?: PaginationQuery): void {
     throw Error('You must implement `getList` function when using `PaginationMixin`')
   }
diff --git a/src/views/classroom/ClassroomList.vue b/src/views/classroom/ClassroomList.vue
@@ -21,6 +21,7 @@
       v-if="loading"
       indeterminate
       color="primary"
+      class="mt-5"
     ></v-progress-circular>
 
     <p v-else-if="noClassrooms" v-text="'You don\'t have any classroom yet.'" />
@@ -68,7 +69,7 @@
         </v-row>
       </v-card-text>
 
-      <v-card-actions>
+      <v-card-actions v-if="!noPagination">
         <v-spacer></v-spacer>
         <v-pagination
           v-model="page"
diff --git a/src/views/reading-exercise/ReadingExerciseList.vue b/src/views/reading-exercise/ReadingExerciseList.vue
@@ -21,6 +21,7 @@
       v-if="loading"
       indeterminate
       color="primary"
+      class="mt-5"
     ></v-progress-circular>
 
     <p v-else-if="noExercises" v-text="'You don\'t have any exercises yet.'" />
@@ -78,7 +79,7 @@
         </v-row>
       </v-card-text>
 
-      <v-card-actions>
+      <v-card-actions v-if="!noPagination">
         <v-spacer></v-spacer>
         <v-pagination
           v-model="page"

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`:to="{ name: 'Home' }"`
`11`	`11`	`class="d-flex align-center white--text"`
`12`	`12`	`>`
`13`		`- Keep learning!`
	`13`	`+ Tango`
`14`	`14`	`</router-link>`
`15`	`15`
`16`	`16`	`<v-spacer></v-spacer>`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ export class PaginationMixin extends Vue {`
`12`	`12`	`return Math.ceil(this.pagination.count / PAGE_SIZE)`
`13`	`13`	`}`
`14`	`14`
	`15`	`+ get noPagination (): boolean {`
	`16`	`+ return this.pagination.next === null && this.pagination.previous === null`
	`17`	`+ }`
	`18`	`+`
`15`	`19`	`getList (query?: PaginationQuery): void {`
`16`	`20`	throw Error('You must implement `getList` function when using `PaginationMixin`')
`17`	`21`	`}`