upd views

app/assets/stylesheets/application.scss

@@ -56,7 +56,8 @@ input {
 .h-heroes,
 .c-description,
 .g-type,
-.g-tm {
+.g-tm,
+.rune .c-sub {
   display: none;
 }
 
@@ -402,6 +403,7 @@ main {
   .c-sub {
     flex-wrap: wrap;
     flex-direction: row;
+    cursor: pointer;
   }
 }
 

app/controllers/chars_controller.rb

@@ -2,14 +2,8 @@ class CharsController < ApplicationController
   before_action :set_char, only: :show
 
   def index
-    @knight = Char.where(role_id: 1).order('name ASC').load_async
-    @warrior = Char.where(role_id: 2).order('name ASC').load_async
-    @assassin = Char.where(role_id: 3).order('name ASC').load_async
-    @archer = Char.where(role_id: 4).order('name ASC').load_async
-    @mechanic = Char.where(role_id: 5).order('name ASC').load_async
-    @wizard = Char.where(role_id: 6).order('name ASC').load_async
-    @priest = Char.where(role_id: 7).order('name ASC').load_async
-    # @chars = Char.order('name ASC').load_async
+    @roles = Role.all.load_async
+    @chars = Char.order('name ASC').load_async
     # @chars = JSON.parse(File.read('./public/json/heroes.json'))
     # render json: @chars
   end

app/controllers/enchants_controller.rb

@@ -1,19 +1,5 @@
 class EnchantsController < ApplicationController
-  before_action :set_enchant, only: :show
-
   def index
-    @enchants = Enchant.all
+    @enchants = Enchant.all.load_async
   end
-
-  def show
-  end
-
-  private
-    def set_enchant
-      @enchant = Enchant.find(params[:id])
-    end
-
-    def enchant_params
-      params.require(:enchant).permit(:name, :tier, :type)
-    end
 end

app/controllers/gears_controller.rb

@@ -1,22 +1,8 @@
 class GearsController < ApplicationController
-  before_action :set_gear, only: :show
-
   def index
     @roles = Role.order('id ASC').load_async
     @chars = Char.order('name ASC').load_async
     @gears = Gear.order('id ASC').load_async
     @skills = Skill.where('length(parent_id) > 4').load_async
   end
-
-  def show
-  end
-
-  private
-    def set_gear
-      @gear = Gear.find(params[:id])
-    end
-
-    def gear_params
-      params.require(:gear).permit(:name, :description, :tier, :set, :gear_type, :gear_skill)
-    end
 end

app/controllers/perks_controller.rb

@@ -1,19 +1,6 @@
 class PerksController < ApplicationController
-  before_action :set_perk, only: :show
-
   def index
+    @roles = Role.all.load_async
     @perks = Perk.all.load_async
   end
-
-  def show
-  end
-
-  private
-    def set_perk
-      @perk = Perk.find(params[:id])
-    end
-
-    def perk_params
-      params.require(:perk).permit(:name, :description, :tier, :sequence, :perk_type)
-    end
 end

app/controllers/roles_controller.rb

@@ -1,20 +1,6 @@
 class RolesController < ApplicationController
-  before_action :set_role, only: :show
-
   def index
     @roles = Role.all.load_async
     @stats = Stat.all.load_async
   end
-
-  def show
-  end
-
-  private
-    def set_role
-      @role = Role.friendly.find(params[:id])
-    end
-
-    def role_params
-      params.require(:role).permit(:name)
-    end
 end

app/controllers/runes_controller.rb

@@ -1,18 +1,5 @@
 class RunesController < ApplicationController
-  before_action :set_rune, only: :show
   def index
     @runes = Rune.where(tier: ['Legendary', 'Velkazar']).load_async
   end
-
-  def show
-  end
-
-  private
-    def set_rune
-      @rune = Rune.find(params[:id])
-    end
-
-    def rune_params
-      params.require(:rune).permit(:name, :value, :type_gear, :tier)
-    end
 end

app/controllers/search_controller.rb

@@ -1,9 +1,23 @@
 class SearchController < ApplicationController
   def search
-    @chars = Char.order('name ASC').ransack(name_cont: params[:q]).result(distinct: true).limit(10).load_async
-    @gears = Gear.order('name ASC').where.not(gear_type: 'acc').ransack(name_or_description_cont: params[:q]).result(distinct: true).limit(10).load_async
-    @perks = Perk.order('name ASC').ransack(name_or_description_cont: params[:q]).result(distinct: true).limit(10).load_async
-    @skills = Skill.order('name ASC').ransack(name_or_description_cont: params[:q]).result(distinct: true).limit(10).load_async
+    @chars = Char.ransack(name_cont: params[:q])
+                 .result(distinct: true)
+                 .order("name ASC")
+                 .limit(10).load_async
+    @gears = Gear.where.not("gear_type = ? AND gear_type = ? AND tier = ?", "acc", "", "")
+                 .ransack(name_or_description_cont: params[:q])
+                 .result(distinct: true)
+                 .order("name ASC")
+                 .limit(10).load_async
+    @perks = Perk.where.not(perk_type: "t5")
+                 .ransack(name_or_description_cont: params[:q])
+                 .result(distinct: true)
+                 .order("name ASC")
+                 .limit(10).load_async
+    @skills = Skill.ransack(name_or_description_cont: params[:q])
+                   .result(distinct: true)
+                   .order("name ASC")
+                   .limit(10).load_async
 
     respond_to do |format|
       format.html {}

app/controllers/skills_controller.rb

@@ -1,20 +1,6 @@
 class SkillsController < ApplicationController
-  before_action :set_skill, only: :show
-
   def index
     @chars = Char.order('name ASC').load_async
     @skills = Skill.order('skill_number ASC').load_async
   end
-
-  def show
-  end
-
-  private
-    def set_skill
-      @skill = Skill.find(params[:id])
-    end
-
-    def skill_params
-      params.require(:skill).permit(:name, :description, :mana, :cooldown, :skill_number)
-    end
 end

app/controllers/stats_controller.rb

@@ -1,19 +1,5 @@
 class StatsController < ApplicationController
-  before_action :set_stat, only: :show
-
   def index
     @stats = Stat.all
   end
-
-  def show
-  end
-
-  private
-    def set_stat
-      @stat = Stat.find(params[:id])
-    end
-
-    def stat_params
-      params.require(:stat).permit(:name, :value, :stat_type, :notice)
-    end
 end

app/javascript/packs/sup.js

@@ -3,6 +3,9 @@
     $('.h-title').click(function () {
       $(this).next('.h-heroes').fadeToggle('fast').css({ 'display': 'flex', 'flex-wrap': 'wrap', 'justify-content': 'center' });
     });
+    $('.rune h4').click(function () {
+      $(this).next('.c-sub').fadeToggle('fast').css({ 'display': 'flex', 'flex-wrap': 'wrap', 'justify-content': 'center' });
+    });
     $('.main h4').click(function () {
       $(this).next('.g-type').fadeToggle('fast').css({ 'display': 'flex', 'flex-wrap': 'wrap', 'justify-content': 'center' });
       $(this).next('.g-tm').fadeToggle('fast').css({ 'display': 'flex' });
@@ -69,10 +72,10 @@
     });
 
     /* hide null stat */
-    $('.c-stat .r-stat, .h-main .r-stat').find('p').each(function () {
-      $zeroStat = $(this).text();
-      if ($zeroStat === '0')
-        $(this).hide().prev('p').hide();
-    });
+    // $('.c-stat .r-stat, .h-main .r-stat').find('p').each(function () {
+    //   $zeroStat = $(this).text();
+    //   if ($zeroStat === '0')
+    //     $(this).hide().prev('p').hide();
+    // });
   });
 }).call(this);

app/views/chars/index.html.slim

@@ -1,52 +1,11 @@
 title Hero
 
 .main
-  .h-title
-    img src='/images/media/classes/knight.webp' alt='Knight'
-    span Knight
-  .h-heroes
-    - @knight.each do |k|
-      = link_to k, title: k.name do
-        img src='/images/media/heroes/#{k.name.downcase}/portrait.webp' alt=k.name
-  .h-title
-    img src='/images/media/classes/warrior.webp' alt='Warrior'
-    span Warrior
-  .h-heroes
-    - @warrior.each do |w|
-      = link_to w, title: w.name do
-        img src='/images/media/heroes/#{w.name.downcase}/portrait.webp' alt=w.name
-  .h-title
-    img src='/images/media/classes/assassin.webp' alt='Assassin'
-    span Assassin
-  .h-heroes
-    - @assassin.each do |a|
-      = link_to a, title: a.name do
-        img src='/images/media/heroes/#{a.name.downcase}/portrait.webp' alt=a.name
-  .h-title
-    img src='/images/media/classes/archer.webp' alt='Archer'
-    span Archer
-  .h-heroes
-    - @archer.each do |a|
-      = link_to a, title: a.name do
-        img src='/images/media/heroes/#{a.name.downcase}/portrait.webp' alt=a.name
-  .h-title
-    img src='/images/media/classes/mechanic.webp' alt='Mechanic'
-    span Mechanic
-  .h-heroes
-    - @mechanic.each do |m|
-      = link_to m, title: m.name do
-        img src='/images/media/heroes/#{m.name.downcase}/portrait.webp' alt=m.name
-  .h-title
-    img src='/images/media/classes/wizard.webp' alt='Wizard'
-    span Wizard
-  .h-heroes
-    - @wizard.each do |w|
-      = link_to w, title: w.name do
-        img src='/images/media/heroes/#{w.name.downcase}/portrait.webp' alt=w.name
-  .h-title
-    img src='/images/media/classes/priest.webp' alt='Priest'
-    span Priest
-  .h-heroes
-    - @priest.each do |p|
-      = link_to p, title: p.name do
-        img src='/images/media/heroes/#{p.name.downcase}/portrait.webp' alt=p.name
+  - @roles.each do |role|
+    .h-title
+      = image_tag "/images/media/classes/#{role.name.downcase}.webp", alt: role.name
+      span #{role.name}
+    .h-heroes
+      - @chars.where(role_id: role.id).each do |char|
+        = link_to char, title: char.name do
+          = image_tag "/images/media/heroes/#{char.name.downcase}/portrait.webp", alt: char.name

app/views/home/index.html.slim

@@ -5,31 +5,39 @@ title King's Raid DB
     p Hero
     - @chars.each do |char|
       = link_to chars_path do
-        img src="/images/media/heroes/#{char.name.downcase}/portrait.webp" title=char.name alt=char.name
+        = image_tag "/images/media/heroes/#{char.name.downcase}/portrait.webp",
+          title: char.name, alt: char.name
   .home-a
     p Gear
     - @gears.each do |gear|
       = link_to gears_path do
-        img src="/images/media/#{gear.gear_type}/#{gear.name}.webp" title=gear.name alt=gear.name
+        = image_tag "/images/media/#{gear.gear_type}/#{gear.name}.webp",
+          title: gear.name, alt: gear.name
   .home-a
     p Perk
     - @perks.each do |perk|
       = link_to perks_path do
-        img src="/images/media/heroes/#{perk.tier.downcase}/#{perk.sequence}.webp" title="#{perk.tier} - #{perk.name}"
+        = image_tag "/images/media/heroes/#{perk.tier.downcase}/#{perk.sequence}.webp",
+          title: "#{perk.tier} - #{(perk.name)}", alt: perk.name
   .home-a
     p Rune
     - @runes.each do |rune|
       = link_to runes_path do
         - if rune.name == "MP Recovery/Attack"
-          img src="/images/media/runes/MPRA.webp" title="#{rune.tier} #{rune.name} #{rune.value}"
+          = image_tag "/images/media/runes/MPRA.webp",
+            title: "#{rune.tier} #{rune.name} #{rune.value}", alt: rune.name
         - elsif rune.name == "MP Recovery/DMG"
-          img src="/images/media/runes/MPRD.webp" title="#{rune.tier} #{rune.name} #{rune.value}"
+          = image_tag "/images/media/runes/MPRD.webp",
+            title: "#{rune.tier} #{rune.name} #{rune.value}", alt: rune.name
         - elsif rune.tier == "Velkazar"
-          img src="/images/media/runes/Velkazar/#{rune.id}.webp" title="#{rune.name} #{rune.value}"
+          = image_tag "/images/media/runes/Velkazar/#{rune.id}.webp",
+            title: "#{rune.name} #{rune.value}", alt: rune.name
         - else
-          img src="/images/media/runes/#{rune.name}.webp" title="#{rune.tier} #{rune.name} #{rune.value}"
+          = image_tag "/images/media/runes/#{rune.name}.webp",
+            title: "#{rune.tier} #{rune.name} #{rune.value}", alt: rune.name
   .home-a
     p Skill
     - @skills.each do |skill|
       = link_to skills_path do
-        img src="/images/media/heroes/#{skill.char.name.downcase}/s#{skill.skill_number}.webp" title="#{skill.char.name} - #{skill.name}"
+        = image_tag "/images/media/heroes/#{skill.char.name.downcase}/s#{skill.skill_number}.webp",
+          title: "#{skill.char.name} - #{skill.name}", alt: skill.name