Merge pull request #35 from ElectroAAC/develop

Develop

README.md

@@ -91,8 +91,6 @@ This repository follows the semantic commit pattern, with the addition of the ta
   <li> [x] Show lastnews </li>
 </ul>
 
-<br>
-
 ### View character informations
 <ul>
   <li> [x] Show character info </li>
@@ -130,8 +128,7 @@ This repository follows the semantic commit pattern, with the addition of the ta
   <li> [x] Manage Guilds </li>
   <ul>
     <li> [x] Invite Player </li>
-    <li> [ ] Remove Invite </li>
-    <li> [ ] Remove Invite </li>
+    <li> [x] Remove Invite </li>
     <li> [x] Promove Player </li>
     <li> [x] Demote Player </li>
     <li> [x] Change MOTD </li>

backend/.env.example

@@ -1,7 +1,7 @@
 PORT=3333
 HOST=0.0.0.0
 NODE_ENV=development
-APP_KEY=ZBcXCJO_weKSwqTJFUGyBjux1Q3_pnS7
+APP_KEY=YOUR_API_KEY
 DRIVE_DISK=local
 
 DB_CONNECTION=mysql
@@ -14,11 +14,11 @@ MYSQL_DB_NAME=YOUR_DATABASE_GAME
 
 CACHE_VIEWS=false
 
-SMTP_HOST=localhost
-SMTP_PORT=587
-SMTP_USERNAME=<username>
-SMTP_PASSWORD=<password>
+SMTP_HOST=localhost # String. Example: localhost
+SMTP_PORT=YOUR_SMTP_PORT # Number. Example: 587
+SMTP_USERNAME=<username> # String. Example: electro123
+SMTP_PASSWORD=<password> # String. Example: electro123
 
-CHARACTERS_PER_ACCOUNT=MAX_CHARACTERS_PER_ACCOUNT
-CHANGE_NAME=ALLOW_NAME_CHANGE
-POINTS_TO_CHANGE_NAME=PRICE_TO_CHANGE_NAME
+CHARACTERS_PER_ACCOUNT=MAX_CHARACTERS_PER_ACCOUNT # Number. Example: CHARACTERS_PER_ACCOUNT=10
+CHANGE_NAME=ALLOW_NAME_CHANGE # Boolean. Example: CHANGE_NAME=true
+POINTS_TO_CHANGE_NAME=PRICE_TO_CHANGE_NAME # Number. Example: POINTS_TO_CHANGE_NAME=10

backend/README.md

@@ -16,6 +16,9 @@ $ npm install
 # Create database structure
 $ node ace migration:run
 
+# Create account admin and character sample
+$ node ace db:seed
+
 # server with changes watcher
 $ npm run dev
 
@@ -29,10 +32,6 @@ $ npm run start
 | METHOD | ENDPOINT                        | DESCRIPTION                           |
 | :----- | :-------------------------------| :------------------------------------ |
 | GET    | /news/list/:page/:limit         | Get news                              |
-| GET    | /news/listDashboard/:page/:limit| Get news to Dashboard                 |
-| POST   | /news/create-post               | Create new post                       |
-| GET    | /news/find/:id                  | Find post                             |
-| POST   | /news/edit                      | Edit post                             |
 
 <br>
 
@@ -105,7 +104,7 @@ $ npm run start
 | :----- | :------------------------- | :------------------------------------ |
 | GET    | /guilds/:page/:limit       | Get all guilds                        |
 | GET    | /guild/view/:name          | Get guild info                        |
-| GET    | /guild/players-with-guild  | Get guild info                        |
+| GET    | /guild/players-without-guild| Get guild info                        |
 | POST   | /guild/create-guild        | Create Guild                          |
 | POST   | /guild/invite              | Invite character                      |
 | POST   | /guild/invites             | Get all invites                       |
@@ -120,6 +119,22 @@ $ npm run start
 
 <br>
 
+##  🕵🏾‍♂️  Routes Shop
+
+| METHOD | ENDPOINT                        | DESCRIPTION                           |
+| :----- | :-------------------------------| :------------------------------------ |
+| GET    | /shop/category/list             | Get all categories                    |
+| POST   | /shop/category/create           | Create new category                   |
+| PUT    | /shop/category/update           | Update category                       |
+| DELETE | /shop/category/destroy/:id      | Delete category                       |
+| GET    | /shop/item/list                 | Get all items                         |
+| POST   | /shop/item/create               | Create new offer item                 |
+| PUT    | /shop/item/update               | Update offer item                     |
+| DELETE | /shop/item/destroy/:id          | Delete offer item                     |
+| POST   | //shop/purchase                 | Purchase Items                        |
+
+<br>
+
 ##  🕵🏾‍♂️  Routes Dashboard
 
 | METHOD | ENDPOINT                   | DESCRIPTION                               |
@@ -148,4 +163,13 @@ $ npm run start
 | GET    | /dashboard/character/:name      | Find character                            |
 | GET    | /dashboard/character-skills/:id | Find character                            |
 | POST   | /dashboard/character            | Update character                          |
-| POST   | /dashboard/character-skills     | Update characterSkills                    |
+| POST   | /dashboard/character-skills     | Update characterSkills                    |
+
+##  🕵🏾‍♂️  Routes Dashboard - News
+
+| METHOD | ENDPOINT                        | DESCRIPTION                           |
+| :----- | :-------------------------------| :------------------------------------ |
+| GET    | /news/listDashboard/:page/:limit| Get news to Dashboard                 |
+| POST   | /news/create                    | Create new post                       |
+| GET    | /news/find/:id                  | Find post                             |
+| PATCH  | /news/edit                      | Update post                           |

backend/app/Controllers/Account/Characters.ts

@@ -37,14 +37,14 @@ export default class CharactersAccount {
         return ctx.response.status(404).send({ message: 'Vocation invalid'});
       }
 
-      const characterCopy: Player[] = await this.characterView.findByName(vocation.name) as Player[];
+      const characterCopy: Player[] = await this.characterView.getByName(vocation.name) as Player[];
 
       if (!characterCopy.length) {
         console.log("Error find Sample Character: Edit file Vocations in contracts/enums/Vocations and set valid characters to copy names. Name Character to copy: " + vocation.name + " doesn\'t exist.");
         return ctx.response.status(404).send({ message: "Wrong characters configuration. Try again or contact with admin."});
       }
 
-      const newPlayer = Object.assign(characterCopy[0], {
+      const newPlayer = {...characterCopy[0],
         id: null,
         name: data.name.charAt(0).toUpperCase() + data.name.slice(1).toLowerCase(),
         account_id: account.id,
@@ -56,23 +56,11 @@ export default class CharactersAccount {
         posz: 0,
         balance: 0,
         created: 0
-      });
+      };
 
       const result = await this.characterRepository.create(newPlayer);
 
-      const player: Player[] = await this.characterView.findById(result[0]) as Player[];
-
-      if (!player.length) {
-        return ctx.response.status(404).send({ message: "Error. Can't create character. Probably problem with database. Please try again later or contact with admin."});
-      }
-
-      for(let i = 0; i < 7; i++) {
-        const skillExists = await this.characterView.checkSkillId(player[0].id, i);
-
-        if (!skillExists.length) {
-          await this.character.insertSkill(player[0].id, i);
-        }
-      }
+      const player: Player[] = await this.characterView.getById(result[0]) as Player[];
 
       const items_to_copy: Item[] = await this.characterView.getItems(characterCopy[0].id) as Item[];
 

backend/app/Controllers/Account/Main.ts

@@ -3,9 +3,6 @@ import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
 export default class AccountController {
   public async show(ctx: HttpContextContract) {
     const account = ctx.auth.user!;
-    /**
-     * @TODO => Filtrar somente os dados que devem ser retornados a fins de consumo no frontend
-     */
     return account;
   }
 }

backend/app/Controllers/Account/Register.ts

@@ -12,34 +12,24 @@ export default class AccountRegisterController {
       email, 
       name,
       password,
-      salt: "",
+      type: 1,
       premdays: 0,
       lastday: 0,
       key: "",
       blocked: 0,
-      warnings : 0,
-      group_id : 1,
-      vip_time : 1,
-      web_lastlogin : 1298670924,
+      web_lastlogin : 0,
       web_flags : 0,
       email_hash : "",
-      email_verified : 0,
       email_new : "",
       email_new_time : 0,
       created : 0,
       rlname : "",
       location : "",
       country : "",
-      page_access : 0,
       email_code : "0",
       email_next : 0,
       premium_points : 0,
       vote : 0,
-      last_post : 0,
-      flag : "",
-      nickname : "",
-      avatar : "",
-      about_me : ""
     });
 
     await account.save();

backend/app/Controllers/Dashboard/Accounts.ts

@@ -16,7 +16,7 @@ export default class AccountsController {
 
   public async index(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
       const accounts = await this.accountView.getTotalAccounts();
 
@@ -29,7 +29,7 @@ export default class AccountsController {
 
   public async show(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
       const account = await this.accountView.getAccountByName(ctx.request.param('name')) as AccountModel[];
 
@@ -48,7 +48,7 @@ export default class AccountsController {
 
   public async update(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
       const data = await ctx.request.validate(UpdateValidator);
 
       const account = await this.account.validateName(data.id, data.name);

backend/app/Controllers/Dashboard/Guilds.ts

@@ -6,7 +6,7 @@ export default class GuildsController {
 
   public async show(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
       const accounts = await this.guildView.getTotalGuilds();
 

backend/app/Controllers/Dashboard/News.ts

@@ -19,7 +19,7 @@ export default class AccountsController {
 
   public async store(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
       const data = await ctx.request.validate(StoreValidator);
 
@@ -38,7 +38,11 @@ export default class AccountsController {
         created_at: new Date()
       }
 
-      await this.newsRepository.create(news);
+      const result = await this.newsRepository.create(news);
+
+      if (!result.length) {
+        return ctx.response.status(404).send({ message: "Error creating a post."});
+      }
 
       return ctx.response.status(200).send({ status: 200, message: 'New Post created successfully!'});
     } catch (err) {
@@ -48,28 +52,42 @@ export default class AccountsController {
   }
 
   public async show(ctx: HttpContextContract) {
-    await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+    try {
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
-    const page = await this.newsView.findNewsById(ctx.request.param('id'));
-    if (!page.length) {
-      return ctx.response.status(404).send({ message: 'News not found.' });
+      const page = await this.newsView.findNewsById(ctx.request.param('id'));
+      if (!page.length) {
+        return ctx.response.status(404).send({ message: 'News not found.' });
+      }
+      return ctx.response.status(200).send({ status: 200, page });
+    } catch (err) {
+      console.log('Error getNews Query: ', err);
+      return ctx.response.status(400).send({ error: 'An error occurred, check the api console.'});
     }
-    return ctx.response.status(200).send({ status: 200, page });
   }
 
   public async update(ctx: HttpContextContract) {
-    await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+    try {
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
-    const data = await ctx.request.validate(UpdateValidator);
+      const data = await ctx.request.validate(UpdateValidator);
 
-    const account = ctx.auth.user;
+      const account = ctx.auth.user;
 
-    if (!account || !account.id) {
-      return ctx.response.unauthorized();
-    }
+      if (!account || !account.id) {
+        return ctx.response.unauthorized();
+      }
 
-    await this.newsRepository.update(data.news_id, data);
-
-    return ctx.response.status(200).send({ status: 200, message: "Post successfully updated." });
+      const result: any = await this.newsRepository.update(data.news_id, data);
+
+      if (result === 0) {
+        return ctx.response.status(404).send({ message: "Error updating post"});
+      }
+
+      return ctx.response.status(200).send({ status: 200, message: "Post successfully updated." });
+    } catch (err) {
+      console.log('Error updateNews Query: ', err);
+      return ctx.response.status(400).send({ error: 'An error occurred, check the api console.'});
+    }
   }
 }

backend/app/Controllers/Dashboard/PlayerSkills.ts

@@ -8,7 +8,7 @@ export default class PlayersController {
 
   public async show(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
       const skills = await this.skillView.getCharacterSkills(ctx.request.param('id'));
 
@@ -25,7 +25,7 @@ export default class PlayersController {
 
   public async update(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
       const data = await ctx.request.validate(UpdateValidator);
 

backend/app/Controllers/Dashboard/Players.ts

@@ -8,7 +8,7 @@ export default class PlayersController {
 
   public async index(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
       const accounts = await this.characterView.getTotalCharacters();
 
@@ -22,9 +22,9 @@ export default class PlayersController {
 
   public async show(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
-      const character = await this.characterView.findByName(ctx.request.param('name'));
+      const character = await this.characterView.getByName(ctx.request.param('name'));
 
       if (!character.length) {
         return ctx.response.status(404).send({ message: "Character not found!" });
@@ -40,7 +40,7 @@ export default class PlayersController {
 
   public async update(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
       const data = await ctx.request.validate(UpdateValidator);
 

backend/app/Controllers/Dashboard/PremiumPoints.ts

@@ -6,7 +6,7 @@ export default class PremiumPointsController {
 
   public async show(ctx: HttpContextContract) {
     try {
-      await ctx.bouncer.with('DashboardPolicy').authorize('viewList');
+      await ctx.bouncer.with('DashboardPolicy').authorize('admin');
 
       const accounts = await this.accountView.getTopPremiumPoints();