Merge pull request #37 from rkshaon/rkshaon

deploy, backend, frontend

backend/book_api/admin.py

@@ -30,7 +30,7 @@ class BookAdmin(admin.ModelAdmin):
     list_display = [
         'id', 'book_code', 'title', 'cover', 'edition',
         'isbn', 'published_date', 'language',
-        'is_deleted',
+        'is_deleted', 'uploader',
     ]
 
     @admin.display(boolean=True)

backend/book_api/models.py

@@ -117,6 +117,10 @@ class Book(models.Model):
     def cover(self) -> bool:
         return bool(self.cover_image)
 
+    @property
+    def uploader(self):
+        return self.added_by
+
     def __str__(self):
         authors = ", ".join([
             author.full_name for author in self.authors.all()

backend/user_api/admin.py

@@ -6,10 +6,12 @@
 @admin.register(User)
 class UserAdmin(admin.ModelAdmin):
     list_display = (
-        'id', 'username', 'email', 'role', 'is_active',
+        'id', 'full_name', 'username', 'email', 'role', 'is_active',
         'is_staff', 'is_superuser',
     )
-    list_display_links = ('id', 'username', 'email')
+    list_display_links = ['id', 'full_name', 'username', 'email']
     list_filter = ('role', 'is_active', 'is_staff')
-    search_fields = ('username', 'email')
+    search_fields = [
+        'username', 'email', 'full_name'
+    ]
     readonly_fields = ('id',)

backend/user_api/migrations/0003_user_middle_name_alter_user_first_name_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.1.1 on 2024-09-12 18:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user_api', '0002_remove_user_is_private'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='middle_name',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

backend/user_api/models.py

@@ -32,6 +32,15 @@ class User(AbstractUser):
         (3, 'Reader'),
     )
 
+    first_name = models.CharField(
+        max_length=255, blank=True, null=True
+    )
+    middle_name = models.CharField(
+        max_length=255, blank=True, null=True
+    )
+    last_name = models.CharField(
+        max_length=255, blank=True, null=True
+    )
     email = models.EmailField(unique=True)
     username = models.CharField(
         max_length=50,
@@ -47,5 +56,24 @@ class User(AbstractUser):
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = ['username', 'role']
 
+    @property
+    def full_name(self) -> str:
+        name = ""
+
+        if self.first_name:
+            name += f"{self.first_name}"
+
+        if self.middle_name:
+            if name:
+                name += f" {self.middle_name}"
+            else:
+                name += f"{self.middle_name}"
+
+        if self.last_name:
+            if name:
+                name += f" {self.last_name}"
+            else:
+                name += f"{self.last_name}"
+
     def __str__(self):
         return self.email

deploy.sh

@@ -47,5 +47,6 @@ python manage.py migrate
 echo -e "${BLUE}Restart Backend Gunicorn Service${RESET}"
 echo -e "${YELLOW}=======================================${RESET}"
 systemctl restart gunicorn-bookshelf.service 
+systemctl status gunicorn-bookshelf.service 
 
 echo -e "${RED}Finish${RESET}..."

frontend/src/pages/HomePage.vue

@@ -6,18 +6,34 @@
         Explore a vast collection of books, share your reviews, and connect with other book lovers.
       </p>
     </div>
+    <div class="flex justify-between mt-8 mb-8">
+      <div v-if="previousPage" class="flex-1">
+        <button @click="fetchBooks(previousPage)" class="bg-blue-500 text-white py-2 px-4 rounded hover:bg-blue-600">
+          Previous
+        </button>
+      </div>
+      <div class="flex-1"></div>
+      <div v-if="nextPage" class="flex-1 text-right">
+        <button @click="fetchBooks(nextPage)" class="bg-blue-500 text-white py-2 px-4 rounded hover:bg-blue-600">
+          Next
+        </button>
+      </div>
+    </div>
     <div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-6">
       <BookCardComponent v-for="(book, index) in books" :key="index" :book="book" />
     </div>
     <div class="flex justify-between mt-8">
-      <button v-if="previousPage" @click="fetchBooks(previousPage)"
-        class="bg-blue-500 text-white py-2 px-4 rounded hover:bg-blue-600">
-        Previous
-      </button>
-      <button v-if="nextPage" @click="fetchBooks(nextPage)"
-        class="bg-blue-500 text-white py-2 px-4 rounded hover:bg-blue-600">
-        Next
-      </button>
+      <div v-if="previousPage" class="flex-1">
+        <button @click="fetchBooks(previousPage)" class="bg-blue-500 text-white py-2 px-4 rounded hover:bg-blue-600">
+          Previous
+        </button>
+      </div>
+      <div class="flex-1"></div>
+      <div v-if="nextPage" class="flex-1 text-right">
+        <button @click="fetchBooks(nextPage)" class="bg-blue-500 text-white py-2 px-4 rounded hover:bg-blue-600">
+          Next
+        </button>
+      </div>
     </div>
   </main>
 </template>