ish_manager 0.1.8.192 → 0.1.8.193

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec96843a9a08d33c1dcf7eea155691f9e81b845ee5703fb92444b0f6d741d9c
-  data.tar.gz: 5da730750b29ad51d10203af20c7da39a1bd80d32fa38da31b9467f84e65ce8d
+  metadata.gz: b29db077f5d27347c78f2fdf53bf710557d9c1137c8fb0160fdac9e527c143de
+  data.tar.gz: acf462ef763dc763ae6ea6746d813cf15388b4b3655370af3628fdf35863ac86
 SHA512:
-  metadata.gz: aaf9cdf34e17558cc7d0b7a0e6101f452a6a121773585ba2515cdbbea3076a74a552ea2a3baee74cf37645336f53a46b5fc56f7764433a23ca60016a2b296917
-  data.tar.gz: 4547ed08d0bb63e427d8ab20586b14fb014299ccfda049caa679aacda6b89b8c7e55f24ad5040c2a86bc0cb5779e6bdc37234dca5cdf5d34d1b210fdd165fc01
+  metadata.gz: 5c3612fb922cfa6963c993b47ad4e9f7792effb87c6eb1c22f2501cf1d3be03735990366cd7d9243ae546b862c7e9ca2a0918135be1eb7a678c51981e69645f5
+  data.tar.gz: '09f2af0d7130f9c03736d18f83b6cbd0951be34caf312918e42153a70ee58afd5f586baa5a50f0246b186e87be7f44af22f3a065db863ce792bb4260c5f0fbfe'

data/app/assets/stylesheets/ish_manager/application.css

@@ -13,6 +13,8 @@
  *= require ish_manager/bootstrap
  *= require_self
  *= require ish_manager/tags
+ *= require ish_manager/maps
+ *= require ish_manager/utils
  */
 
 

data/app/assets/stylesheets/ish_manager/maps.scss

@@ -0,0 +1,59 @@
+
+.maps-index {
+  h1 {
+    padding-bottom: 10px;
+    border-bottom: 10px solid #cecece;
+  }
+  .item {
+    display: flex;
+    flex-direction: row;
+    padding-bottom: 10px;
+    border-bottom: 2px solid #cecece;
+
+    input[type='submit'] {
+      font-size: 1.1em;
+      padding: 0.3em;
+    }
+
+    .row {
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      align-content: flex-start;
+
+      height: 3em;
+      line-height: 3em; 
+
+      width: 100%;
+      margin: 0 0 1em 0;
+      padding: 0;
+
+      > * {
+        padding-right: 1em;
+      }
+    }
+  }
+}
+
+.maps-show {
+  .the-map {
+    position: relative;
+
+    .marker {
+      border: 1px solid yellow;
+    }
+  }
+}
+
+.markers--form {
+  /* width: 300px;
+  margin: auto; */
+}
+
+.markers-list {
+  .item {
+    border: 1px solid #d59d05; /* brown*/
+    padding: .5em;
+    margin: 1em 0 0 0;
+  }
+}

data/app/assets/stylesheets/ish_manager/utils.scss

@@ -0,0 +1,26 @@
+
+ul:not(.browser-default).errors,
+ul:not(.browser-default).bullets, {
+  > li {
+    list-style-type: circle;
+    margin-left: 1em;
+  }
+}
+
+.flat-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-content: flex-start;
+
+  height: 3em;
+  line-height: 3em; 
+
+  width: 100%;
+  margin: 0 0 1em 0;
+  padding: 0;
+
+  > * {
+    padding-right: 1em;
+  }
+}

data/app/controllers/ish_manager/maps_controller.rb

@@ -0,0 +1,66 @@
+
+class IshManager::MapsController < IshManager::ApplicationController
+
+  before_action :set_map, only: [:show, :edit, :update, :destroy]
+
+  def index
+    authorize! :index, ::Gameui::Map
+    @maps = ::Gameui::Map.all
+  end
+
+  def show
+    authorize! :show, @map
+  end
+
+  def new
+    authorize! :new, ::Gameui::Map
+    @map = ::Gameui::Map.new
+  end
+
+  def edit
+    authorize! :edit, @map
+  end
+
+  def create
+    @map = ::Gameui::Map.new(map_params)
+    authorize! :create, @map
+
+    respond_to do |format|
+      if @map.save
+        format.html { redirect_to gameui_map_path(@map.id), notice: 'Map was successfully created.' }
+      else
+        format.html { render :new }
+      end
+    end
+  end
+
+  def update
+    authorize! :update, @map
+    respond_to do |format|
+      if @map.update(map_params)
+        format.html { redirect_to @map, notice: 'Map was successfully updated.' }
+      else
+        format.html { render :edit }
+      end
+    end
+  end
+
+  def destroy
+    authorize! :destroy, @map
+    @map.destroy
+    respond_to do |format|
+      format.html { redirect_to gameui_maps_path, notice: 'Map was successfully destroyed.' }
+    end
+  end
+
+  private
+
+    def set_map
+      @map = ::Gameui::Map.find(params[:id])
+    end
+
+    def map_params
+      params.require(:gameui_map).permit!
+    end
+
+end

data/app/controllers/ish_manager/markers_controller.rb

@@ -0,0 +1,73 @@
+
+class IshManager::MarkersController < IshManager::ApplicationController
+
+  before_action :set_map, except: [ :destroy, :edit, :update ]
+  before_action :set_marker, only: [ :edit, :update ]
+
+=begin
+  def index
+    authorize! :markers, ::Gameui::Map
+  end
+=end
+
+  def new
+    authorize! :new_marker, ::Gameui::Map
+    @marker = ::Gameui::Marker.new
+  end
+
+  def edit
+    authorize! :edit_marker, @map
+  end
+
+  def create
+    @marker = ::Gameui::Marker.new(marker_params)
+    @marker.map = @map
+    authorize! :create_marker, @map
+    @map_id = @map.id
+
+    respond_to do |format|
+      if @marker.save
+        format.html { redirect_to gameui_map_path(@map.id), notice: 'Marker was successfully created.' }
+      else
+        format.html { render :new }
+      end
+    end
+  end
+
+  def update
+    authorize! :update_marker, @map
+    respond_to do |format|
+      if @marker.update(marker_params)
+        format.html { redirect_to @map, notice: 'Marker was successfully updated.' }
+      else
+        format.html { render :edit }
+      end
+    end
+  end
+
+  def destroy
+    @marker = ::Gameui::Marker.find params[:id]
+    @map = @marker.map
+    authorize! :destroy_marker, @map
+    @marker.destroy
+    respond_to do |format|
+      format.html { redirect_to @map, notice: 'Marker was successfully destroyed.' }
+    end
+  end
+
+  private
+
+    def set_map
+      @map = ::Gameui::Map.find(params[:map_id] || params[:gameui_marker][:map_id])
+    end
+
+    def set_marker
+      @marker = ::Gameui::Marker.find params[:id]
+      @map = @marker.map
+    end
+
+    def marker_params
+      params.require(:gameui_marker).permit!
+    end
+
+end

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -23,14 +23,13 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
   def create
     @newsitem = Newsitem.new params[:newsitem].permit!
-    @resource = City.find params[:city_id]              if params[:city_id]
-    @resource = City.find params[:newsitem][:city_id]   if !params[:newsitem][:city_id].blank?
-    @resource = Site.find params[:site_id]              if params[:site_id]
-    @resource = Site.find params[:newsitem][:site_id]   if !params[:newsitem][:site_id].blank?
-    @resource = Tag.find params[:tag_id]                if params[:tag_id]
-    @resource = Tag.find params[:newsitem][:tag_id]     if !params[:newsitem][:tag_id].blank?
-
-    @resource = IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
+    @resource ||= City.find params[:city_id]              if params[:city_id]
+    @resource ||= City.find params[:newsitem][:city_id]   if !params[:newsitem][:city_id].blank? # blank? required
+    @resource ||= Site.find params[:site_id]              if params[:site_id]
+    @resource ||= Site.find params[:newsitem][:site_id]   if !params[:newsitem][:site_id].blank?
+    @resource ||= Tag.find params[:tag_id]                if params[:tag_id]
+    @resource ||= Tag.find params[:newsitem][:tag_id]     if !params[:newsitem][:tag_id].blank?
+    @resource ||= IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
     @resource.newsitems << @newsitem
 
     authorize! :create_newsitem, @resource
@@ -42,7 +41,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
     url = case @resource.class.name
     when "City"
-      edit_city_path( @resouce.id )
+      edit_city_path( @resource.id )
     when "Tag"
       @resource.site.touch
       tag_path( @resource.id )

data/app/helpers/ish_manager/application_helper.rb

@@ -22,6 +22,7 @@ module IshManager
     def pretty_date date
       date.to_s[0, 10]
     end
+    def pp_date a; pretty_date a; end
 
     def resource_path resource
       case resource.class.name
@@ -34,5 +35,20 @@ module IshManager
       end
     end
 
+    #
+    # api paths
+    #
+    def api_city_path city
+      "/api/cities/view/#{city.cityname}.json"
+    end
+
+    def api_map_path map
+      "/api/maps/view/#{map.slug}"
+    end
+
+    def api_marker_path marker
+      "/api/markers/view/#{marker.slug}"
+    end
+
   end
 end

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -6,6 +6,7 @@
         %i.fa.fa-compress.collapse-expand#collapseHeader
         .content
           %ul.nav.nav-pills
+            %li{ :class => params[:controller] == 'ish_manager/maps' ? 'active' : '' }= link_to 'GameUi::Maps', gameui_maps_path
             %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
             %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
             %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path

data/app/views/ish_manager/application/_meta.haml

@@ -1,6 +1,9 @@
 
 .meta
+  - if defined?(item.premium_tier) && item.premium_tier > 0
+    <b>$#{item.premium_tier}</b>
   <b>On</b> #{item.created_at.to_s[0...10]}
+
   - if item.city
     <b>In City:</b> #{link_to item.city.name, city_path( item.city )}
   - if item.tag

data/app/views/ish_manager/cities/_header.haml

@@ -1,5 +1,7 @@
 
-%h2 #{@city.name} #{link_to image_edit, edit_city_path(@city)}
+%h2 
+  #{@city.name} #{link_to image_edit, edit_city_path(@city)}
+  = link_to 'API', api_city_path(@city)
 %ul
   %li <#{@city.x}, #{@city.y}>
   %li Cityname: <em>#{@city.cityname}</em>

data/app/views/ish_manager/galleries/_form.haml

@@ -1,4 +1,8 @@
 
+-#
+-# ish_manager / galleries / _form
+-#
+
 - url ||= galleries_path
 
 = form_for gallery, :url => url do |f|
@@ -47,5 +51,11 @@
     .col-sm-3
       = f.check_box :is_trash
       = f.label :is_trash
+    .col-sm-3
+      = f.label :premium_tier
+      = f.number_field :premium_tier
+    .col-sm-3
+      = f.label :username
+      = f.text_field :username
     .col-sm-3
       = f.submit 'Submit'

data/app/views/ish_manager/galleries/index.haml

@@ -4,7 +4,7 @@
 
 = render 'ish_manager/sites/header', :site => @site if @site
 
-.title.hide
+-# .title.hide
   .row
     .col-sm-12.col-md-12
       %h1.center Galleries

data/app/views/ish_manager/maps/_form.haml

@@ -0,0 +1,40 @@
+
+= form_for @map do |f|
+  - if @map.errors.any?
+    #error_explanation
+      %h2= "#{pluralize(@map.errors.count, "error")} prohibited this map from being saved:"
+      %ul
+        - @map.errors.full_messages.each do |message|
+          %li= message
+
+  
+  .row
+    .col-md-3
+      .field
+        = f.label :slug
+        = f.text_field :slug
+    .col-md-3
+      .field
+        = f.label :parent_slug
+        = f.text_field :parent_slug
+    .col-md-3
+      .field
+        = f.label :w
+        = f.number_field :w
+    .col-md-3
+      .field
+        = f.label :h
+        = f.number_field :h
+  .field
+    = f.label :description
+    = f.text_field :description
+  .field
+    = f.label :img_path
+    = f.text_field :img_path
+  .row
+    .col-md-4
+      .field
+        = f.label :ordering_type
+        = select_tag :ordering_type, options_for_select(::Gameui::Map::ORDERING_TYPES)
+  .actions
+    = f.submit 'Save'

data/app/views/ish_manager/maps/_map_flat_row.haml

@@ -0,0 +1,8 @@
+
+.flat-row
+  .a= link_to map.slug, map
+  .a= button_to '~', edit_gameui_map_path(map), method: :get
+  .a <b>#{map.w}x#{map.h}_#{map.slug}</b>
+  .a= button_to '+marker', new_gameui_map_marker_path(map), method: :get
+  .a= link_to '[api]', api_map_path(map)
+  .a= button_to 'x', map, method: :delete, data: { confirm: 'Are you sure?' }

data/app/views/ish_manager/maps/edit.haml

@@ -0,0 +1,3 @@
+%h1 Editing map
+
+= render 'form'

data/app/views/ish_manager/maps/index.haml

@@ -0,0 +1,19 @@
+
+.maps-index
+  %h1 Maps #{link_to '[+]', new_gameui_map_path}
+  - @maps.each do |map|
+    .item
+      .col
+        = render 'map_flat_row', map: map
+        %p= map.description
+        = image_tag map.img_path, width: 400
+      .col
+        .row
+          .a Markers (#{map.markers.length})
+          .a #{button_to '+', new_gameui_map_marker_path(map), method: :get}
+        %ul.markers
+          - map.markers.each do |marker|
+            %li
+              = marker.slug
+              = link_to '[~]', edit_gameui_marker_path(marker)
+

data/app/views/ish_manager/maps/new.haml

@@ -0,0 +1,4 @@
+%h1 New map
+
+= render 'form'
+

data/app/views/ish_manager/maps/show.haml

@@ -0,0 +1,20 @@
+
+.maps-show
+  = render 'map_flat_row', map: @map
+  .descr= @map.description
+
+  .the-map
+    = image_tag @map.img_path, width: @map.w
+    - @map.markers.each do |marker|
+      .marker{ style: "position: absolute; left: #{marker.x}px; top: #{marker.y}px;" }= image_tag marker.img_path
+
+  .markers-list
+    - @map.markers.each do |marker|
+      .item
+        .flat-row
+          .a= marker.slug
+          .a= button_to '~', edit_gameui_marker_path(marker), method: :get
+          .a= button_to 'x', marker, method: :delete, data: { confirm: 'Are you sure?' }
+          .a= link_to '[api]', api_marker_path(marker)
+        %ul.bullets
+          %li <b>item_type:</b> #{marker.item_type}

data/app/views/ish_manager/markers/_form.haml

@@ -0,0 +1,75 @@
+
+.markers--form
+
+  = form_for @marker do |f|
+    -# = f.hidden_field :map_id, value: (params['map_id']||@map_id)
+
+    - if @marker.errors.any?
+      #error_explanation
+        %p= "#{pluralize(@marker.errors.count, "error")} prohibited this map from being saved:"
+        %ul.errors
+          - @marker.errors.full_messages.each do |message|
+            %li= message
+
+    .row
+      .col-md-1
+        = f.label :map
+        = f.text_field :map_id, value: @marker.map_id || params[:map_id]
+      .col-md-5
+        .field
+          = f.label :name
+          = f.text_field :name
+      .col-md-6
+        .field
+          = f.label :slug
+          = f.text_field :slug
+    .row
+      .col-md-3
+        .field
+          = f.label :w
+          = f.number_field :w
+      .col-md-3
+        .field
+          = f.label :h
+          = f.number_field :h
+      .col-md-3
+        .field
+          = f.label :x
+          = f.number_field :x
+      .col-md-3
+        .field
+          = f.label :y
+          = f.number_field :y
+    .field
+      = f.label :img_path
+      = f.text_field :img_path
+    .field
+      = f.label :title_img_path
+      = f.text_field :title_img_path
+    .row
+      .col-md-3  
+      .col-md-6
+        .field
+          = f.label :description
+          = f.text_area :description
+    .row
+      .col-md-4
+        .field
+          = f.label :item_type
+          = f.select :item_type, options_for_select(::Gameui::Marker::ITEM_TYPES)
+      .col-md-4
+        .field
+          = f.label :ordering
+          = f.text_field :ordering
+      .col-md-4
+    .row
+      .col-md-3  
+      .col-md-6
+        .row
+          .col-md-6
+            .field
+              = f.check_box :is_active
+              = f.label :is_active
+          .col-md-6
+            .actions
+              = f.submit 'Save'

data/app/views/ish_manager/markers/edit.haml

@@ -0,0 +1,4 @@
+
+Editing marker for map `#{@map.slug}`
+
+= render 'form'

data/app/views/ish_manager/markers/new.haml

@@ -0,0 +1,4 @@
+%h1 New marker for #{@map.slug}
+
+= render 'form'
+

data/app/views/ish_manager/newsitems/_index.haml

@@ -30,6 +30,7 @@
                 Desc: #{n.descr}
               %li Report id: #{n.report_id}
               %li Gallery id: #{n.gallery_id}
+              %li username: #{n.username}
               - if n.photo
                 %li Photo id: #{n.photo.id}
             = render 'ish_manager/newsitems/item', :newsitem => n

data/app/views/ish_manager/reports/index.haml

@@ -25,9 +25,10 @@
           %br
           .gray
             - if report.site
-              Site #{report.site.domain}/#{report.site.lang}
-              %br
-            = report.created_at
+              Site <b>#{report.site.domain}/#{report.site.lang}</b>
+            - if report.city
+              City <b>#{report.city.name}</b>
+            = pp_date report.created_at
           - if report.photo
             = image_tag report.photo.photo.url :thumb
           

data/app/views/ish_manager/user_profiles/index.haml

@@ -12,6 +12,7 @@
           %ul
             %li= link_to '[edit]', edit_user_profile_path( profile )
             %li <b>Email:</b> #{profile.email}
+            %li <b>username:</b> #{profile.username}
             %li <b>Name:</b> #{profile.name}
             %li <b>Role:</b> #{profile.role_name}
             %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}

data/config/routes.rb

@@ -28,7 +28,7 @@ IshManager::Engine.routes.draw do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
     resources :newsitems
   end
-
+  
   resources :invoices do
     # resources :payments
   end
@@ -37,6 +37,13 @@ IshManager::Engine.routes.draw do
   get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
   resources :leads
 
+  namespace 'gameui' do
+    resources 'maps' do
+      resources 'markers'
+    end
+    resources 'markers' # redundant
+  end
+
   resources :newsitems
 
   resources :orders

data/lib/ish_manager.rb

@@ -7,4 +7,7 @@ require 'kaminari/actionview'
 
 module IshManager
   # Your code goes here...
-end
+
+  module Gameui
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.192
+  version: 0.1.8.193
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,10 +150,12 @@ files:
 - app/assets/javascripts/ish_manager/materialize.js
 - app/assets/stylesheets/ish_manager/application.css
 - app/assets/stylesheets/ish_manager/bootstrap.css
+- app/assets/stylesheets/ish_manager/maps.scss
 - app/assets/stylesheets/ish_manager/materialize.css
 - app/assets/stylesheets/ish_manager/tags.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
+- app/assets/stylesheets/ish_manager/utils.scss
 - app/controllers/ish_manager/ally_controller.rb
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/campaigns_controller.rb
@@ -165,6 +167,8 @@ files:
 - app/controllers/ish_manager/galleries_controller.rb
 - app/controllers/ish_manager/invoices_controller.rb
 - app/controllers/ish_manager/leads_controller.rb
+- app/controllers/ish_manager/maps_controller.rb
+- app/controllers/ish_manager/markers_controller.rb
 - app/controllers/ish_manager/newsitems_controller.rb
 - app/controllers/ish_manager/orders_controller.rb
 - app/controllers/ish_manager/payments_controller.rb
@@ -251,6 +255,15 @@ files:
 - app/views/ish_manager/leads/edit.haml
 - app/views/ish_manager/leads/index.haml
 - app/views/ish_manager/leads/new.haml
+- app/views/ish_manager/maps/_form.haml
+- app/views/ish_manager/maps/_map_flat_row.haml
+- app/views/ish_manager/maps/edit.haml
+- app/views/ish_manager/maps/index.haml
+- app/views/ish_manager/maps/new.haml
+- app/views/ish_manager/maps/show.haml
+- app/views/ish_manager/markers/_form.haml
+- app/views/ish_manager/markers/edit.haml
+- app/views/ish_manager/markers/new.haml
 - app/views/ish_manager/newsitems/_form.haml
 - app/views/ish_manager/newsitems/_index.haml
 - app/views/ish_manager/newsitems/_item.haml