ish_manager 0.1.8.253 → 0.1.8.257

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

@@ -6,4 +6,4 @@
   ul li {
     list-style-type: circle;
   }
-}
+}

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

@@ -14,13 +14,13 @@ ul:not(.browser-default).bullets, {
   align-content: flex-start;
 
   height: 3em;
-  line-height: 3em; 
+  line-height: 3em;
 
   width: 100%;
-  margin: 0 0 1em 0;
+  margin: 1em 0 0 0;
   padding: 0;
 
   > * {
     padding-right: 1em;
   }
-}
+}

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

@@ -0,0 +1,11 @@
+
+.videos--index {
+  .item {
+    margin-bottom: 3em;
+  }
+
+  /* clear nth! */
+  .row div:nth-child(2n+1) {
+    clear:left
+  }
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -25,6 +25,7 @@ module IshManager
     end
 
     def set_lists
+      # alphabetized! : )
       @cities_list = City.list
       @galleries_list = Gallery.all.list
       @locations_list = ::Gameui::Map.list

data/app/controllers/ish_manager/galleries_controller.rb

@@ -2,33 +2,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   before_action :set_lists
 
-  def index
-    authorize! :index, Gallery
-    @galleries = Gallery.unscoped.where( :is_done.in => [false, nil], :is_trash.in => [false, nil],
-      :user_profile => current_user.profile ).order_by( :created_at => :desc )
-    if params[:q]
-      @galleries = @galleries.where({ :name => /#{params[:q]}/i })
-      @galleries.selector.delete('is_done')
-    end
-    @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
-
-    render params[:render_type]
-  end
-
-  def shared_with_me
-    authorize! :index, Gallery
-    @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
-      ).order_by( :created_at => :desc
-      ).page( params[:shared_galleries_page] ).per( 10 )
-    render params[:render_type]
-  end
-
-  def new
-    @gallery = Gallery.new
-    authorize! :new, @gallery
-    @cities_list = City.list
-    @tags_list = Tag.list
-  end
+  # alphabetized! : )
 
   def create
     params[:gallery][:shared_profiles] ||= []
@@ -45,18 +19,78 @@ class IshManager::GalleriesController < IshManager::ApplicationController
       redirect_to edit_gallery_path(@gallery)
     else
       puts! @gallery.errors.messages
-      flash[:alert] = 'No Luck. ' + @gallery.errors.inspect
-      @cities_list = City.list
-      @tags_list = Tag.list
+      flash[:alert] = "Cannot create the gallery: #{@gallery.errors.full_messages}"
       render :action => 'new'
     end
   end
 
+  def destroy
+    @gallery = Gallery.unscoped.find params[:id]
+    authorize! :destroy, @gallery
+    @gallery.is_trash = true
+    @gallery.save
+    flash[:notice] = 'Logically deleted gallery.'
+    redirect_to galleries_path
+  end
+
   def edit
     @gallery = Gallery.unscoped.find params[:id]
     authorize! :edit, @gallery
   end
 
+  def index
+    authorize! :index, Gallery
+    @galleries = Gallery.unscoped.where( :is_done.in => [false, nil], :is_trash.in => [false, nil],
+      :user_profile => current_user.profile ).order_by( :created_at => :desc )
+    if params[:q]
+      @galleries = @galleries.where({ :name => /#{params[:q]}/i })
+      @galleries.selector.delete('is_done')
+    end
+    @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
+
+    render params[:render_type]
+  end
+
+  def j_show
+    @gallery = Gallery.unscoped.find( params[:id] )
+    authorize! :show, @gallery
+    respond_to do |format|
+      format.json do
+        jjj = {}
+        jjj[:photos] = @gallery.photos.map do |ph|
+          { :thumbnail_url => ph.photo.url( :thumb ),
+          :delete_type => 'DELETE',
+          :delete_url => photo_path(ph) }
+        end
+        render :json => jjj
+      end
+    end
+  end
+
+  def new
+    @gallery = Gallery.new
+    authorize! :new, @gallery
+  end
+
+  def shared_with_me
+    authorize! :index, Gallery
+    @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
+      ).order_by( :created_at => :desc
+      ).page( params[:shared_galleries_page] ).per( 10 )
+    render params[:render_type]
+  end
+
+  def show
+    begin
+      @gallery = Gallery.unscoped.find_by :slug => params[:id]
+    rescue
+      @gallery = Gallery.unscoped.find params[:id]
+    end
+    authorize! :show, @gallery
+    @photos = @gallery.photos.unscoped.where({ :is_trash => false })
+    @deleted_photos = @gallery.photos.unscoped.where({ :is_trash => true })
+  end
+
   def update
     @gallery = Gallery.unscoped.find params[:id]
     old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
@@ -81,41 +115,5 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     end
   end
 
-  def show
-    begin
-      @gallery = Gallery.unscoped.find_by :galleryname => params[:id]
-    rescue
-      @gallery = Gallery.unscoped.find params[:id]
-    end
-    authorize! :show, @gallery
-    @photos = @gallery.photos.unscoped.where({ :is_trash => false })
-    @deleted_photos = @gallery.photos.unscoped.where({ :is_trash => true })
-  end
-
-  def destroy
-    @gallery = Gallery.unscoped.find params[:id]
-    authorize! :destroy, @gallery
-    @gallery.is_trash = true
-    @gallery.save
-    flash[:notice] = 'Logically deleted gallery.'
-    redirect_to galleries_path
-  end
-
-  def j_show
-    @gallery = Gallery.unscoped.find( params[:id] )
-    authorize! :show, @gallery
-    respond_to do |format|
-      format.json do
-        jjj = {}
-        jjj[:photos] = @gallery.photos.map do |ph|
-          { :thumbnail_url => ph.photo.url( :thumb ),
-          :delete_type => 'DELETE',
-          :delete_url => photo_path(ph) }
-        end
-        render :json => jjj
-      end
-    end
-  end
-
 end
 

data/app/controllers/ish_manager/maps_controller.rb

@@ -54,6 +54,8 @@ class IshManager::MapsController < IshManager::ApplicationController
       @map.image = image
     end
 
+    @map.config = JSON.parse map_params[:config]
+
     respond_to do |format|
       if map_params[:parent_slug].present?
         @map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })

data/app/controllers/ish_manager/markers_controller.rb

@@ -4,12 +4,6 @@ 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
@@ -59,7 +53,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
     respond_to do |format|
       if @marker.update(marker_params)
         @marker.map.touch
-        format.html { redirect_to maps_path(@map), notice: 'Marker was successfully updated.' }
+        format.html { redirect_to location_map_editor_path(@map.id), notice: 'Marker was successfully updated.' }
       else
         format.html { render :edit }
       end

data/app/controllers/ish_manager/photos_controller.rb

@@ -30,12 +30,12 @@ class IshManager::PhotosController < IshManager::ApplicationController
 
   def j_create
     # find this gallery
-    if params[:galleryname]
-      gallery = Gallery.unscoped.where( :galleryname => params[:galleryname] ).first
-      gallery ||= Gallery.unscoped.find params[:galleryname]
+    if params[:slug]
+      gallery = Gallery.unscoped.where( :slug => params[:slug] ).first
+      gallery ||= Gallery.unscoped.find params[:slug]
     elsif params[:gallery_id] # this one, let's normalize on id everywhere in manager.
       gallery = Gallery.unscoped.find( params[:gallery_id] )
-      gallery ||= Gallery.unscoped.where( :galleryname => params[:gallery_id] ).first
+      gallery ||= Gallery.unscoped.where( :slug => params[:gallery_id] ).first
     end
     authorize! :create_photo, gallery
 

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -6,7 +6,6 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   def index
     @user_profiles = IshModels::UserProfile.all.includes( :user )
     authorize! :index, IshModels::UserProfile
-    render layout: 'ish_manager/application_no_materialize'
   end
 
   def show
@@ -23,6 +22,11 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     @profile = IshModels::UserProfile.find params[:id]
     authorize! :update, @profile
 
+    if params[:photo]
+      photo = Photo.new :photo => params[:photo]
+      @profile.profile_photo = photo
+    end
+
     flag = @profile.update_attributes params[:profile].permit!
 
     if flag
@@ -47,6 +51,12 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     @user.password ||= (0...12).map { rand(100) }.join
     @user.profile = IshModels::UserProfile.new params[:profile].permit!
     authorize! :create, @user.profile
+
+    if params[:photo]
+      photo = Photo.new :photo => params[:photo]
+      @profile.profile_photo = photo
+    end
+
     if !@user.save
       raise "cannot save profile.user: #{@profile.user.errors.full_messages} profile errors: #{@profile.errors.full_messages}"
     end

data/app/mailers/ish_manager/application_mailer.rb

@@ -20,7 +20,7 @@ module IshManager
       @gallery        = gallery
       @domain         = Rails.application.config.action_mailer.default_url_options[:host]
       @galleries_path = IshManager::Engine.routes.url_helpers.galleries_path
-      @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.galleryname)
+      @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.slug)
       mail( :to => '314658@gmail.com',
             :bcc => profiles.map { |p| p.email },
             :subject => 'You got new shared galleries on pi manager' ).deliver

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

@@ -11,8 +11,8 @@
       = f.label :name
       = f.text_field :name
     .col.s6
-      = f.label :galleryname
-      = f.text_field :galleryname
+      = f.label :slug
+      = f.text_field :slug
 
   .row
     .col.s4

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

@@ -17,16 +17,15 @@
         .panel-body
           %h3
             = link_to '[~]', edit_gallery_path( g )
-            = link_to g.name, gallery_path(g.galleryname)
+            = link_to g.name, gallery_path(g.slug)
+            (#{g.photos.length})
           = render 'meta', :item => g
-
-          -# = render 'meta', :item => g
           - if g.photos.length == 0
             = image_missing
           - else
             .thumbnails
               - g.photos.limit( n_thumbs ).each do |photo|
-                = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.galleryname)
+                = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
 
     - if @galleries.respond_to? :total_pages
       = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'

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

@@ -11,5 +11,5 @@
           %i.material-icons visibility
         - else
           %i.material-icons visibility_off
-      galleryname :: #{gallery.galleryname}
+      slug :: #{gallery.slug}
       = render 'meta', :item => gallery

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

@@ -44,11 +44,18 @@
 
   .row
     .col.s6
-      = f.label :labels
-      = f.text_area :labels
+      = f.label "Labels"
+      = f.text_area :labels, class: 'large'
+      %pre.small
+        description
+        map
+        markers
+        newsitems
     .col.s6
-      = f.label :config
-      = f.text_area :config
-
+      = f.label "Config"
+      = f.text_area :config, class: 'large'
+      %pre.small
+        description.collapsible: bool
+        map_panel_type: "MapPanel" | "MapPanelNoZoom" | "ThreePanelV1"
   .actions
     = f.submit 'Save'

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

@@ -1,7 +1,8 @@
 
 .item{ style: "display: flex; flex-direction: column;" }
   = render 'map_meta_row', map: map
-  %ul{ style: "margin-left: 5em;" }
-    - map.childs.each do |m|
-      %li
-        = render 'index_item', map: m
+  - if map.childs.length > 0
+    %ul{ style: "margin-left: 5em;" }
+      - map.childs.each do |m|
+        %li
+          = render 'index_item', map: m

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

@@ -1,9 +1,11 @@
 
-.flat-row
-  .a= link_to map.slug, map_path(map)
-  .a= button_to '~', edit_map_path(map), method: :get
-  .a= button_to 'map editor', location_map_editor_path(map.id), method: :get
-  .a= button_to '+marker', new_map_marker_path(map), method: :get
-  .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
-  .a= link_to '[api]', api_map_path(map)
-  .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
+.maps--map-meta-row
+  .flat-row
+    .a= link_to map.name, map_path(map)
+    .a= button_to '~', edit_map_path(map), method: :get
+    .a= button_to 'map editor', location_map_editor_path(map.id), method: :get
+    .a= button_to '+marker', new_map_marker_path(map), method: :get
+    .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
+    .a= link_to '[api]', api_map_path(map)
+    .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
+  .a= map.slug

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

@@ -1,3 +1,4 @@
-%h1 Editing map
 
+= render 'map_meta_row', map: @map
+%h1 Editing map
 = render 'form'

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

@@ -8,7 +8,7 @@
         - if n.photo.gallery.blank?
           = link_to image_tag( n.photo.photo.url(:small) ), n.photo.photo.url(:large), :rel => 'lightbox[newsitem]'
         - else
-          = link_to image_tag( n.photo.photo.url(:small) ), gallery_path( n.photo.gallery.galleryname, n.photo.gallery.photos.index(n.photo) )
+          = link_to image_tag( n.photo.photo.url(:small) ), gallery_path( n.photo.gallery.slug, n.photo.gallery.photos.index(n.photo) )
       .meta= render 'ish_manager/photos/meta', :photo => n.photo
 
   - if n.report
@@ -29,7 +29,7 @@
   - if !n.gallery.blank?
     .Ngallery
 
-      %h3= link_to n.gallery.name, gallery_path(n.gallery.galleryname, 0)
+      %h3= link_to n.gallery.name, gallery_path(n.gallery.slug, 0)
       .meta
         #{t('newsitems.gallery', :username => n.gallery.username, :date => pretty_date(n.gallery.created_at))}
         - unless n.gallery.city.blank?
@@ -42,7 +42,7 @@
       - unless 0 == n.gallery.photos.length
         .thumbnails
           - n.gallery.photos.where( :is_trash => false )[0...8].each do |photo|
-            = link_to image_tag( photo.photo.url(:thumb), :alt => photo.name ), photo.photo.url(:small), :rel => "lightbox[#{n.gallery.galleryname}]"
+            = link_to image_tag( photo.photo.url(:thumb), :alt => photo.name ), photo.photo.url(:small), :rel => "lightbox[#{n.gallery.slug}]"
       .c
 
   - if n.video_id

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

@@ -5,5 +5,5 @@
     - unless photo.user.blank?
       By #{ link_to photo.user.username, user_path(photo.user.username) }
     - unless photo.gallery.blank?
-      In #{ link_to photo.gallery.name, gallery_path(photo.gallery.galleryname, 0) }
+      In #{ link_to photo.gallery.name, gallery_path(photo.gallery.slug, 0) }
   = photo.name unless photo.name.blank?

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

@@ -1,34 +1,47 @@
+-#
+-# ish_manager / user_profiles / _form
+-#
 
 - url = profile.persisted? ? profile_path( profile.id ) : profiles_path
 
-= form_for profile, :as => :profile, :url => url do |f|
-  .input-field
-    %label name
-    = f.text_field :name
-
-  .input-field
-    %label email
-    = f.text_field :email
-
-  .input-field
-    = f.select :role_name, options_for_select( [[nil, nil]] + IshModels::UserProfile::ROLES.map { |r| [ r, r ] }, :selected => profile.role_name )
-    %label role name
-
-  .input-field
-    = f.select :current_city, options_for_select( @cities_list, :selected => profile.current_city_id )
-    %label City
-
-  .input-field
-    = f.label :fb_access_token
-    = f.text_field :fb_access_token
-  .input-field
-    = f.label :fb_long_access_token
-    = f.text_field :fb_long_access_token
-
-  .input-field
-    = f.select :bookmarked_location_ids, options_for_select( @locations_list, selected: profile.bookmarked_location_ids), {}, { multiple: true }
-    %label Bookmarked Locations
-
-  = f.submit 'Save', :class => %w(button)
+.row
+  .col.s6
+    = form_for profile, :html => { :multipart => true }, :as => :profile, :url => url do |f|
+      .input-field
+        %label name
+        = f.text_field :name
+
+      .input-field
+        %label email
+        = f.text_field :email
+
+      .input-field
+        %label Change profile pic
+        %br
+        = file_field_tag :photo
+        = image_tag profile.profile_photo.photo.url(:thumb) rescue nil
+        %br
+        %br
+
+      .input-field
+        = f.select :role_name, options_for_select( [[nil, nil]] + IshModels::UserProfile::ROLES.map { |r| [ r, r ] }, :selected => profile.role_name )
+        %label role name
+
+      .input-field
+        = f.select :current_city, options_for_select( @cities_list, :selected => profile.current_city_id )
+        %label City
+
+      .input-field
+        = f.label :fb_access_token
+        = f.text_field :fb_access_token
+      .input-field
+        = f.label :fb_long_access_token
+        = f.text_field :fb_long_access_token
+
+      .input-field
+        = f.select :bookmarked_location_ids, options_for_select( @locations_list, selected: profile.bookmarked_location_ids), {}, { multiple: true }
+        %label Bookmarked Locations
+
+      = f.submit 'Save', :class => %w(button)
 
 

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

@@ -1,3 +1,6 @@
+-#
+-# ish_manager / user_profiles / index
+-#
 
 %h5
   User Profiles (#{@user_profiles.count})
@@ -17,10 +20,15 @@
             %li <b>Role:</b> #{profile.role_name}
             %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
             %li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
+            %li
+              <b>Profile Photo:</b>
+              = image_tag profile.profile_photo.photo.url(:thumb) rescue nil
+            %li <b>Address:</b> #{profile.addresses[0].inspect}
+
         .col.s8
           %h5 Shared galleries
           - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|
-            &gt; #{link_to g.name, gallery_path(g.galleryname)} <br />
+            &gt; #{link_to g.name, gallery_path(g.slug)} <br />
             = render 'meta', :item => g
           <hr />
 
@@ -29,12 +37,10 @@
             = render 'ish_manager/newsitems/item', n: n, profile_id: profile.id
           <hr />
 
-          %h5 Bookmarked Locations
-          %ul
+          %h5 Bookmarked Locations (#{profile.bookmarked_locations.length})
+          %ul.browser-default
             - profile.bookmarked_locations.each do |n|
               %li
                 = n.slug
 
-      .row
-        Address:
-        = profile.addresses[0].inspect
+

data/app/views/ish_manager/videos/_embed.erb

@@ -1,4 +1,4 @@
 
 <div class="video-embed">
   <iframe width="560" height="315" src="//www.youtube.com/embed/<%= video.youtube_id %>" frameborder="0" allowfullscreen></iframe>
-</div>
+</div>

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

@@ -1,34 +1,33 @@
 
 - videos ||= @videos
 
-.row.videos--index
-  .col.s12
-    %h5
-      Videos (#{videos.count})
-      = link_to '[+]', new_video_path
-    %br
+.videos--index
 
-    = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+  %h5
+    Videos (#{videos.count})
+    = link_to '[+]', new_video_path
 
+  = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+
+  .row
     - videos.each do |video|
-      .panel
-        .panel-content
-          .row
-            .col.s6
-              .float-left
-                - if video.youtube_id.present?
-                  -## doesn't work with private videos, which are most
-                  -# .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
-                  = render 'ish_manager/videos/embed_mini', video: video
-                - else
-                  .thumb= image_tag video.thumb.url(:thumb)
-              .a
-                = link_to video.name, video_path( video )
-                .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-                = link_to '[~]', edit_video_path( video )
-              = render 'meta', :item => video
-              .c
+      .col.s6
+        .item.panel
+          .panel-content
+            .float-left
+              - if video.youtube_id.present?
+                -## doesn't work with private videos, which are most
+                -# .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
+                = render 'ish_manager/videos/embed_mini', video: video
+              - else
+                .thumb= image_tag video.thumb.url(:thumb)
+            .a
+              = link_to video.name, video_path( video )
+              .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+              = link_to '[~]', edit_video_path( video )
+            = render 'meta', :item => video
+            .c
 
-    = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+  = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
 %hr
 

data/lib/ish_manager.rb

@@ -10,4 +10,4 @@ module IshManager
 
   module Gameui
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.253
+  version: 0.1.8.257
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-17 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -190,6 +190,7 @@ files:
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
 - app/assets/stylesheets/ish_manager/user_profiles.scss
 - app/assets/stylesheets/ish_manager/utils.scss
+- app/assets/stylesheets/ish_manager/videos.scss
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/campaigns_controller.rb
 - app/controllers/ish_manager/cities_controller.rb