Merge branch 'public_website'

Author: Leoglme

.github/workflows/deploy-app.yml

@@ -29,8 +29,14 @@ jobs:
       - name: 🔍 Install dependencies
         run: cd app && npm install
 
+      - name: 📝 Setup Production .env File
+        run: cd app && cp .env.example .env
+
       - name: 🧱 Build application
-        run: cd app && npm run build
+        run: |
+          cd app
+          npm run build
+          cp .env dist/.env
 
       - name: 📤 Deploy to VPS
         uses: easingthemes/ssh-deploy@main

api/.env.example

@@ -13,7 +13,7 @@ MYSQL_HOST=localhost
 MYSQL_PORT=3306
 MYSQL_USER=leo
 MYSQL_PASSWORD=root
-COMPOSE_PROJECT_NAME=ApartEasy
+COMPOSE_PROJECT_NAME=apart-easy
 GOOGLE_CLIENT_ID=19************4f.apps.googleusercontent.com
 GOOGLE_CLIENT_SECRET=GOCSPX-9ZQd**********
 GOOGLE_CALLBACK_URL=http://localhost:3333/api/oauth2/google/callback
@@ -27,7 +27,7 @@ APP_URL=http://localhost:5173
 APP_DOMAIN=aparteasy.dibodev.com
 APP_NAME=ApartEasy
 APP_LOGO=https://i.ibb.co/qRDCDjm/apart-easy.png
-APP_PRIMARY_COLOR="#ff2560"
+APP_PRIMARY_COLOR="#db0a61"
 APP_EMAIL_NO_REPLY=[email protected]
 APP_EMAIL_SUPPORT=[email protected]
 SESSION_DRIVER=cookie

api/.env.production

@@ -9,7 +9,7 @@ [email protected]
 APP_EMAIL_SUPPORT=[email protected]
 APP_LOGO=https://i.ibb.co/qRDCDjm/apart-easy.png
 APP_NAME=ApartEasy
-APP_PRIMARY_COLOR="#ff2560"
+APP_PRIMARY_COLOR="#db0a61"
 APP_URL=https://aparteasy.dibodev.com
 DB_CONNECTION=mysql
 MYSQL_DATABASE=

api/app/Services/FakeService.ts

@@ -1,7 +1,7 @@
 export default class FakeService {
   public static generateRandomHexColor(): string {
     const letters = '0123456789ABCDEF'
-    let color = '#'
+    let color = ''
     for (let i = 0; i < 6; i++) {
       color += letters[Math.floor(Math.random() * 16)]
     }
@@ -10,8 +10,8 @@ export default class FakeService {
 
   public static generateDiceBearURL(name: string, avatarStyle = 'adventurer'): string {
     const backgroundColor = encodeURIComponent(this.generateRandomHexColor())
-    return `https://avatars.dicebear.com/api/${avatarStyle}/${encodeURIComponent(
+    return `https://api.dicebear.com/7.x/${avatarStyle}/svg?seed=${encodeURIComponent(
       name
-    )}.svg?background=${backgroundColor}`
+    )}&backgroundColor=${backgroundColor}`
   }
 }

api/config/app-infos.ts

@@ -1,7 +1,7 @@
 import Env from '@ioc:Adonis/Core/Env'
 export default {
-  color: Env.get('APP_PRIMARY_COLOR', '#ff2560'),
-  name: Env.get('APP_NAME', 'My App'),
+  color: Env.get('APP_PRIMARY_COLOR', '#db0a61'),
+  name: Env.get('APP_NAME', 'ApartEasy'),
   logo: Env.get('APP_LOGO'),
   url: Env.get('APP_URL'),
   domain: Env.get('APP_DOMAIN'),

api/database/migrations/1682443424189_searches_user_to_creator.ts

@@ -8,7 +8,7 @@ export default class SearchesUpdateUserIdToCreatorId extends BaseSchema {
       table.integer('creator_id').unsigned().after('location_id')
     })
 
-    await this.defer(async (db) => {
+    this.defer(async (db) => {
       await db.rawQuery('UPDATE searches SET creator_id = user_id')
     })
 
@@ -24,7 +24,7 @@ export default class SearchesUpdateUserIdToCreatorId extends BaseSchema {
       table.integer('user_id').unsigned().after('location_id')
     })
 
-    await this.defer(async (db) => {
+    this.defer(async (db) => {
       await db.rawQuery('UPDATE searches SET user_id = creator_id')
     })
 

api/database/migrations/1690232737281_remove_location_id_from_searches.ts

@@ -8,15 +8,11 @@ export default class RemoveLocationIdFromSearches extends BaseSchema {
     const hasColumn = await this.schema.hasColumn(this.tableName, 'location_id')
     if (hasColumn) {
       await Database.rawQuery('ALTER TABLE searches DROP FOREIGN KEY searches_location_id_foreign')
-      await this.schema.table(this.tableName, (table) => {
-        table.dropColumn('location_id')
-      })
     }
   }
 
   public async down() {
     const hasColumn = await this.schema.hasColumn(this.tableName, 'location_id')
-
     if (!hasColumn) {
       await this.schema.table(this.tableName, (table) => {
         table
@@ -26,7 +22,9 @@ export default class RemoveLocationIdFromSearches extends BaseSchema {
           .inTable('locations')
           .onDelete('CASCADE')
       })
-      await Database.rawQuery('ALTER TABLE searches ADD CONSTRAINT searches_location_id_foreign FOREIGN KEY (location_id) REFERENCES locations(id) ON DELETE CASCADE')
+      await Database.rawQuery(
+        'ALTER TABLE searches ADD CONSTRAINT searches_location_id_foreign FOREIGN KEY (location_id) REFERENCES locations(id) ON DELETE CASCADE'
+      )
     }
   }
 }

api/database/migrations/1690232737282_replace_dicebear_avatar_old_version.ts

@@ -0,0 +1,22 @@
+import BaseSchema from '@ioc:Adonis/Lucid/Schema'
+import User from 'App/Models/User'
+import FakeService from 'App/Services/FakeService'
+
+export default class ReplaceDiceBearAvatarOldVersion extends BaseSchema {
+  protected tableName = 'users'
+
+  public async up() {
+    // Find all users with old dicebear avatar (e.g., https://avatars.dicebear.com/api/adventurer/Vernon%20Patterson.svg?background=%23392FF7)
+    const users: User[] = await User.query()
+      .where('avatar_url', 'LIKE', '%avatars.dicebear.com%')
+      .exec()
+
+    // Replace old dicebear avatar with new dicebear avatar
+    for (const user of users) {
+      user.avatarUrl = FakeService.generateDiceBearURL(user.name)
+      await user.save()
+    }
+  }
+
+  public async down() {}
+}

api/database/seeders/01_FakeDatas.ts

@@ -12,12 +12,14 @@ import UserLocation from 'App/Models/UserLocation'
 
 export default class FakeDatasSeeder extends BaseSeeder {
   public async run() {
+    let createdUsers: Array<User> = []
+
     // Create users
     const maxUsers: number = 10
     const existingUsers: Array<User> = await User.all()
     if (existingUsers.length < maxUsers) {
       const users = generateUsers(maxUsers)
-      await User.createMany(users)
+      createdUsers = await User.createMany(users)
     }
 
     // Create locations
@@ -40,17 +42,10 @@ export default class FakeDatasSeeder extends BaseSeeder {
     const maxSearches: number = 10
     const existingSearches: Array<Search> = await Search.all()
     if (existingSearches.length < maxSearches) {
-      // 10 users
-      const createdUsers: Array<User> = await User.all()
-      const tenUsers: Array<User> = createdUsers.slice(0, 10)
-
-      // 10 searches
-      const createdSearches: Array<Search> = await Search.all()
-      const tenSearches: Array<Search> = createdSearches.slice(0, 10)
-      const searches = await generateSearches(maxSearches, tenUsers)
-      await Search.createMany(searches)
-      await addUsersToSearches(tenSearches, createdUsers)
-      await addPropertiesToSearches(tenSearches)
+      const searches = await generateSearches(maxSearches, createdUsers)
+      const createdSearches = await Search.createMany(searches)
+      await addUsersToSearches(createdSearches, createdUsers)
+      await addPropertiesToSearches(createdSearches)
     }
   }
 }