diff --git a/.env.example b/.env.example index e570ac7..b8b01f0 100644 --- a/.env.example +++ b/.env.example @@ -1,23 +1,15 @@ PORT= HOST= -NODE_ENV= APP_KEY= -APP_NAME= -APP_VERSION= APP_URL= -REDIS_CONNECTION= REDIS_HOST= REDIS_PORT= REDIS_PASSWORD= -DB_CONNECTION= - MYSQL_HOST= MYSQL_PORT= MYSQL_USER= MYSQL_PASSWORD= MYSQL_DB_NAME= - -SESSION_DRIVER= diff --git a/config/database.ts b/config/database.ts index f4eb162..b9a6854 100644 --- a/config/database.ts +++ b/config/database.ts @@ -19,7 +19,7 @@ const databaseConfig: DatabaseConfig = { | file. | */ - connection: Env.get('DB_CONNECTION'), + connection: 'mysql', connections: { /* diff --git a/config/hash.ts b/config/hash.ts index cd731e6..77b143d 100644 --- a/config/hash.ts +++ b/config/hash.ts @@ -5,7 +5,6 @@ * file. */ -import Env from '@ioc:Adonis/Core/Env' import { HashConfig } from '@ioc:Adonis/Core/Hash' /* @@ -27,7 +26,7 @@ const hashConfig: HashConfig = { | free to change the default value | */ - default: Env.get('HASH_DRIVER', 'argon'), + default: 'argon', list: { /* diff --git a/config/redis.ts b/config/redis.ts index d8b7b2c..de7ddbf 100644 --- a/config/redis.ts +++ b/config/redis.ts @@ -22,7 +22,7 @@ import { RedisConfig } from '@ioc:Adonis/Addons/Redis' | Make sure to check `contracts/redis.ts` file for defining extra connections */ const redisConfig: RedisConfig = { - connection: Env.get('REDIS_CONNECTION'), + connection: 'local', connections: { /* diff --git a/config/session.ts b/config/session.ts index 028d87b..74897ef 100644 --- a/config/session.ts +++ b/config/session.ts @@ -5,7 +5,6 @@ * file. */ -import Env from '@ioc:Adonis/Core/Env' import Application from '@ioc:Adonis/Core/Application' import { SessionConfig } from '@ioc:Adonis/Addons/Session' @@ -36,7 +35,7 @@ const sessionConfig: SessionConfig = { | Note: Switching drivers will make existing sessions invalid. | */ - driver: Env.get('SESSION_DRIVER'), + driver: 'redis', /* |-------------------------------------------------------------------------- diff --git a/contracts/hash.ts b/contracts/hash.ts index ae1c87e..af2da3b 100644 --- a/contracts/hash.ts +++ b/contracts/hash.ts @@ -6,7 +6,6 @@ */ declare module '@ioc:Adonis/Core/Hash' { - import { HashDrivers } from '@ioc:Adonis/Core/Hash' interface HashersList { bcrypt: { diff --git a/env.ts b/env.ts index 2a35c67..3eb1e64 100644 --- a/env.ts +++ b/env.ts @@ -18,12 +18,8 @@ export default Env.rules({ HOST: Env.schema.string({ format: 'host' }), PORT: Env.schema.number(), APP_KEY: Env.schema.string(), - APP_NAME: Env.schema.string(), - APP_VERSION: Env.schema.string(), APP_URL: Env.schema.string(), - NODE_ENV: Env.schema.enum(['development', 'production', 'testing'] as const), - REDIS_CONNECTION: Env.schema.enum(['local'] as const), REDIS_HOST: Env.schema.string(), REDIS_PORT: Env.schema.number(), REDIS_PASSWORD: Env.schema.string.optional(), @@ -33,6 +29,4 @@ export default Env.rules({ MYSQL_USER: Env.schema.string(), MYSQL_PASSWORD: Env.schema.string.optional(), MYSQL_DB_NAME: Env.schema.string(), - - SESSION_DRIVER: Env.schema.string() }) diff --git a/package.json b/package.json index 94391ba..9c47cfb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@linkyjs/core", - "version": "1.0.0", + "version": "1.0.1", "description": "URL Shortener for Developers 💻", "main": "start/kernel.ts", "repository": { diff --git a/start/routes.ts b/start/routes.ts index 826db1e..e5b7e5e 100644 --- a/start/routes.ts +++ b/start/routes.ts @@ -4,11 +4,12 @@ import {HttpContextContract} from "@ioc:Adonis/Core/HttpContext"; import Env from "@ioc:Adonis/Core/Env"; const BASE_URL = Env.get('APP_URL') +const VERSION = require('../package.json') Route.get('/', async ({response}: HttpContextContract) => { return response.status(200).send({ domain: BASE_URL, - version: Env.get('APP_VERSION'), + version: VERSION, source: `${BASE_URL}/source`, healthCheck: `${BASE_URL}/health`, links: `${BASE_URL}/links`