Merge pull request #2 from bleriotnoguia/develop

Develop

Author: bleriotnoguia

README.md

@@ -1,6 +1,6 @@
-# JavaScript.cm (built with AdonisJS, inspired by laravel.cm)
+# JavaScript.cm
 
-This repository contains the source code for the javascript.cm website ( javascript community in Cameroon ), inspired by laravel.cm. Laravel Cameroon is the largest community of PHP & Laravel developers residing in Cameroon.
+This repository contains the source code for the [javascript.cm](https://javascript.cm) website ( javascript community in Cameroon ), inspired by [laravel.cm](https://laravel.cm). Laravel Cameroon is the largest community of PHP & Laravel developers residing in Cameroon.
 
 ## Server Requirements
 
@@ -55,11 +55,12 @@ node ace serve --watch
 
 ## Features
 
-- [ ] User Authentication
-- [ ] GitHub Authentication
+- [x] User Authentication
+- [x] GitHub Authentication
 - [ ] Twitter Integration
 - [ ] Article Management
-- [ ] Community Features
+- [ ] Forum
+- [ ] Discussions
 - [ ] Admin Dashboard
 - [ ] Telegram Notifications
 
@@ -73,13 +74,22 @@ node ace serve --watch
 | `node ace migration:run`      | Run database migrations  |
 | `node ace migration:rollback` | Rollback migrations      |
 
+## Stack / Resources
+
+- [AdonisJS](https://adonisjs.com/)
+- [React.js](https://react.dev/)
+- [Inertia.js](https://inertiajs.com/)
+- [TailwindCSS](https://tailwindcss.com/)
+- [MySQL](https://www.mysql.com/)
+- [Lucid ORM](https://lucid.adonisjs.com/)
+
 ## Contributing
 
 Please read the contribution guide before creating an issue or sending a pull request.
 
 ## Security Vulnerabilities
 
-If you discover a security vulnerability in the application, please send an email to support@laravel.cm.
+If you discover a security vulnerability in the application, please send an email to [support@javascript.cm](mailto:support@javascript.cm).
 
 ## License
 

app/controllers/auth/login_controller.ts

@@ -2,24 +2,33 @@ import { loginValidator } from '#validators/login_validator'
 import { HttpContext } from '@adonisjs/core/http'
 import User from '#models/user'
 import { errors } from '@adonisjs/auth'
+
 export default class LoginController {
   async show({ inertia }: HttpContext) {
     return inertia.render('auth/login')
   }
 
   async login({ request, auth, response, session }: HttpContext) {
-    const data = await loginValidator.validate(request.all())
-    const user = await User.verifyCredentials(data.email, data.password)
-
     try {
-      await auth.use('web').login(user)
+      // Validate the request data
+      const data = await loginValidator.validate(request.all())
+
+      // Attempt to verify credentials
+      const user = await User.verifyCredentials(data.email, data.password)
+
+      // Login the user
+      await auth.use('web').login(user, data.remember)
+
       return response.redirect().toRoute('dashboard')
     } catch (error) {
       if (error instanceof errors.E_INVALID_CREDENTIALS) {
         session.flash('errors', { form: 'Invalid credentials' })
         return response.redirect().back()
       }
-      throw error
+
+      // Handle other errors
+      session.flash('errors', { form: 'An error occurred during login' })
+      return response.redirect().back()
     }
   }
 

app/controllers/home_controller.ts

@@ -0,0 +1,18 @@
+import { HttpContext } from '@adonisjs/core/http'
+import Article from '#models/article'
+
+export default class HomeController {
+  async index({ inertia }: HttpContext) {
+    const articles = await Article.query().where('is_published', true).preload('author')
+
+    return inertia.render('home', {
+      stats: {
+        members: 600,
+        developers: 50,
+        participation: 25,
+        githubStars: 10,
+      },
+      articles: articles,
+    })
+  }
+}

app/middleware/silent_auth_middleware.ts

@@ -9,7 +9,9 @@ import type { NextFn } from '@adonisjs/core/types/http'
  */
 export default class SilentAuthMiddleware {
   async handle(ctx: HttpContext, next: NextFn) {
+    // Check authentication without redirecting
     await ctx.auth.check()
+
     return next()
   }
 }

app/models/user.ts

@@ -1,10 +1,11 @@
 import { DateTime } from 'luxon'
-import { BaseModel, beforeSave, column, hasMany } from '@adonisjs/lucid/orm'
+import { BaseModel, column, hasMany } from '@adonisjs/lucid/orm'
 import { compose } from '@adonisjs/core/helpers'
 import hash from '@adonisjs/core/services/hash'
 import { withAuthFinder } from '@adonisjs/auth/mixins/lucid'
 import type { HasMany } from '@adonisjs/lucid/types/relations'
 import Article from '#models/article'
+import { DbRememberMeTokensProvider } from '@adonisjs/auth/session'
 
 const AuthFinder = withAuthFinder(() => hash.use('scrypt'), {
   uids: ['email'],
@@ -57,12 +58,7 @@ export default class User extends compose(BaseModel, AuthFinder) {
   @hasMany(() => Article)
   declare articles: HasMany<typeof Article>
 
-  @beforeSave()
-  static async hashPassword(user: User) {
-    if (user.$dirty.password) {
-      user.password = await hash.make(user.password)
-    }
-  }
+  static rememberMeTokens = DbRememberMeTokensProvider.forModel(User)
 
   /**
    * Serialize the model for Inertia

config/auth.ts

@@ -7,6 +7,7 @@ const authConfig = defineConfig({
   guards: {
     web: sessionGuard({
       useRememberMeTokens: true,
+      rememberMeTokensAge: '1 year',
       provider: sessionUserProvider({
         model: () => import('#models/user'),
       }),

config/inertia.ts

@@ -11,6 +11,7 @@ const inertiaConfig = defineConfig({
    * Data that should be shared with all rendered pages
    */
   sharedData: {
+    appName: 'JavaScript Cameroun',
     auth: (ctx) => {
       return {
         user: ctx.auth.user,

database/migrations/1736839410875_create_users_table.ts

@@ -16,7 +16,6 @@ export default class extends BaseSchema {
       table.boolean('is_admin').defaultTo(false)
       table.boolean('is_sponsor').defaultTo(false)
       table.timestamp('email_verified_at').nullable()
-      table.string('remember_me_token').nullable()
       table.timestamps(true, true)
     })
   }

database/migrations/1740725627468_create_remember_me_tokens_table.ts

@@ -0,0 +1,27 @@
+import { BaseSchema } from '@adonisjs/lucid/schema'
+
+export default class extends BaseSchema {
+  protected tableName = 'remember_me_tokens'
+
+  async up() {
+    this.schema.createTable(this.tableName, (table) => {
+      table.increments()
+      table
+        .integer('tokenable_id')
+        .notNullable()
+        .unsigned()
+        .references('id')
+        .inTable('users')
+        .onDelete('CASCADE')
+
+      table.string('hash').notNullable().unique()
+      table.timestamp('created_at').notNullable()
+      table.timestamp('updated_at').notNullable()
+      table.timestamp('expires_at').notNullable()
+    })
+  }
+
+  async down() {
+    this.schema.dropTable(this.tableName)
+  }
+}

database/seeders/user_seeder.ts

@@ -0,0 +1,28 @@
+import { BaseSeeder } from '@adonisjs/lucid/seeders'
+import User from '#models/user'
+
+export default class UserSeeder extends BaseSeeder {
+  async run() {
+    // Create a test user
+    await User.create({
+      username: 'testuser',
+      name: 'Test User',
+      email: 'test@example.com',
+      password: 'password123',
+      isAdmin: true,
+      isSponsor: false,
+    })
+
+    // You can add more test users if needed
+    await User.create({
+      username: 'regularuser',
+      name: 'Regular User',
+      email: 'regular@example.com',
+      password: 'password123',
+      isAdmin: false,
+      isSponsor: false,
+    })
+
+    console.log('✅ Users seeded successfully')
+  }
+}