ish_manager 0.1.8.22 → 0.1.8.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dab98bdd473dd73c5e605837baef4929d2c3a2e5
-  data.tar.gz: c5b9dbf5af313ee127c5514b8f8de24cfe3c2826
+  metadata.gz: b7321ef6d866b6c6ef55008414a64bd2838c57aa
+  data.tar.gz: e01b404689d320b94b2dc60d032923b8e96be936
 SHA512:
-  metadata.gz: 055cb68777f29f675ed4329af211d15b81508f1cd87e28c54e2d8a609ff3c38e83f72b4becc4ce70be8dee8b53dc79b71cdccea8e9c27eda5884539ffb4d4feb
-  data.tar.gz: cb1caf9d2acf949542fa9d77c52d58d008ca90f42f7bb677f765e40e5f747334354fb2c453ec273f477aaff970c0eaf28e0b3818adddb89ad3ce647df3f43225
+  metadata.gz: b5cf4cb139bc4bd91696ca450ace3ce18dece7262477628227e8d64a954abcef65c874e18fe5afc937306a9a69a97a2b80ef46a1018ee26b047e4a781250e9dd
+  data.tar.gz: c37b1b4e10aa55eb68feec642265c481b6f92709d332514fc46e0ba0e591c7f8bcbe16356c93658dac69a7ded0b5634ed379a6b8bd12dfed5ca05b29718501d4

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

@@ -40,4 +40,14 @@ hr {
 }  
 .large-photos img {
   width: 100%;
-}
+}
+
+.float-left {
+  float: left;
+}
+.float-right {
+  float: right;
+}
+.clearfix {
+  clear: both;
+}

data/app/controllers/ish_manager/tags_controller.rb

@@ -0,0 +1,53 @@
+
+class IshManager::TagsController < IshManager::ApplicationController
+
+  before_action :set_lists
+
+  def index
+    @tags = Tag.unscoped
+    authorize! :index, Tag.new
+  end
+  
+  def show
+    @tag = Tag.unscoped.find params[:id]
+    authorize! :show, @tag
+  end
+
+  def new
+    @tag = Tag.new
+    authorize! :new, @tag
+  end
+
+  def create
+    @tag = Tag.create params[:tag].permit!
+    authorize! :create, @tag
+    if @tag.save
+      flash[:notice] = 'Success.'
+      redirect_to tags_path
+    else
+      puts! @tag.errors, "error creating tag."
+      flash[:error] = "No luck. #{@tag.errors.messages}" 
+      render :action => :new
+    end
+  end
+
+  def edit
+    @tag = Tag.unscoped.find params[:id]
+    authorize! :edit, @tag
+  end
+
+  def update
+    @tag = Tag.unscoped.find params[:id]
+    authorize! :update, @tag
+    if @tag.update_attributes params[:tag].permit!
+      flash[:notice] = 'Success.'
+      redirect_to tags_path
+    else
+      flash[:error] = 'No luck.'
+      render :action => :new
+    end
+  end
+  
+end
+
+

data/app/controllers/ish_manager/users_controller.rb

@@ -0,0 +1,13 @@
+
+class IshManager::UsersController < IshManager::ApplicationController
+
+  def index
+    @users = User.all
+  end
+
+  def show
+    @user = User.find params[:id]
+  end
+
+end
+

data/app/controllers/ish_manager/venues_controller.rb

@@ -0,0 +1,48 @@
+
+class IshManager::VenuesController < IshManager::ApplicationController
+
+  before_action :set_lists
+
+  def index
+    authorize! :index, Venue
+    @venues = Venue.all
+  end
+
+  def new
+    @venue = Venue.new
+    authorize! :new, @venue
+  end
+
+  def create
+    @venue = Venue.new params[:venue].permit!
+    authorize! :create, @venue
+    if @venue.save
+      redirect_to :action => :index
+    else
+      flash[:alert] = @venue.errors.messages
+      render :action => :new
+    end
+  end
+
+  def edit
+    @venue = Venue.find params[:id]
+    authorize! :edit, @venue
+  end
+
+  def update
+    @venue = Venue.find params[:id]
+    authorize! :update, @venue
+
+    flag = @venue.update_attributes params[:venue].permit!
+    if flag
+      flash[:notice] = 'updated venue'
+      redirect_to :action => :index
+    else
+      flash[:alert] = "No luck: #{@venue.errors.messages}"
+      render :action => :edit
+    end
+  end
+
+end
+
+

data/app/controllers/ish_manager/venues_controller.rb~

@@ -0,0 +1,19 @@
+
+class IshManager::VenuesController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, Venue
+  end
+
+  def create
+  end
+
+  def edit
+  end
+
+  def update
+  end
+
+end
+
+

data/app/controllers/ish_manager/videos_controller.rb

@@ -0,0 +1,96 @@
+
+class IshManager::VideosController < IshManager::ApplicationController
+
+  before_action :set_lists
+  
+  def index
+    authorize! :index, Video.new
+    @videos = Video.all # .where( :site_id => @site.id )
+
+    if params[:city_id]
+      city = City.find params[:city_id]
+      @videos = @videos.where( :city => city )
+    end
+
+    if params[:tag_id]
+      tag = Tag.find params[:tag_id]
+      @videos = @videos.where( :tag => tag )
+    end
+    
+    @videos = @videos.page( params[:videos_page] ).per( Video::PER_PAGE )
+
+    respond_to do |format|
+      format.html do
+        render
+      end
+      format.json do
+        render :json => @videos
+      end
+    end
+  end
+
+  def show
+    @video = Video.where( :youtube_id => params[:youtube_id] ).first
+    @video ||= Video.unscoped.find params[:id]
+    authorize! :show, @video
+
+    respond_to do |format|
+      format.html
+      format.json do
+        render :json => @video
+      end
+    end
+  end
+
+  def new
+    @video = Video.new
+    authorize! :new, @video
+
+    # @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
+    # @cities_list = City.list
+  end
+  
+  def create
+    @video = Video.new params[:video].permit!
+    @video.user = current_user
+    if params[:video][:site_id]
+      @video.site = Site.find params[:video][:site_id]
+    else
+      @video.site = @site
+    end
+    authorize! :create, @video
+    
+    if @video.save
+      flash[:notice] = 'Success'      
+      redirect_to videos_path
+    else
+      flash[:error] = 'No luck'
+      @tags_list = Tag.list
+      @cities_list = City.list
+      render :action => 'new'
+    end
+  end
+  
+  def edit
+    @video = Video.unscoped.find params[:video_id]
+    authorize! :edit, @video
+    
+    @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
+    @cities_list = City.list
+  end
+
+  def update
+    @video = Video.unscoped.find params[:video_id]
+    authorize! :update, @video
+
+    @video.update params[:video].permit!
+    if @video.save
+      flash[:notice] = 'Success.'
+      redirect_to organizer_path
+    else
+      flash[:error] = "No luck: #{@video.errors}"
+      render :edit
+    end
+  end
+  
+end

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

@@ -0,0 +1,7 @@
+
+- if item.errors.any?
+  .error-explanation
+    %h5= t('e.there_are_errors')
+    %ul
+      - item.errors.full_messages.each do |msg|
+        %li= msg

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

@@ -53,6 +53,7 @@
     %ul
       - @city.events.each do |event|
         %li= event.name
+
+    = render :partial => 'ish_manager/venues/index', :locals => { :venues => @city.venues }
         
-    %h3 Venues (#{@city.venues.length})
     %h3 Videos (#{@city.videos.length})

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

@@ -0,0 +1,25 @@
+
+= form_for venue do |f|
+  .a
+    = f.label :name
+    = f.text_field :name
+
+  .a
+    = f.label :name_seo
+    = f.text_field :name_seo
+    
+  .a
+    = f.label :descr
+    = f.text_area :descr
+
+  .a
+    coords
+    = f.text_field :x
+    = f.text_field :y
+
+  .a
+    = f.label :city
+    = f.select :city, options_for_select( @cities_list, :selected => venue.city_id )
+
+  .b
+    = f.submit

data/app/views/ish_manager/venues/_form.haml~

@@ -0,0 +1,7 @@
+
+= form_for venue do |f|
+  .a
+    = f.label :name
+    = f.text_field :name
+  .b
+    = f.submit

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

@@ -0,0 +1,14 @@
+.a
+  .b
+    %h3
+      Venues (#{venues.length})
+      = link_to '[+]', new_venue_path
+    %ol
+      - venues.each do |venue|
+        %li
+          = link_to '[~]', edit_venue_path( venue )
+          .float-left= button_to '[x]', venue_path( venue ), :method => 'delete', :html => { :confirm => 'Are you sure?' }
+          = link_to venue.name, venue_path( venue )
+          %br
+          %br
+          .clearfix

data/app/views/ish_manager/venues/_index.haml~

@@ -0,0 +1,11 @@
+.a
+  .b
+    %h3
+      Venues (#{venues.length})
+      = link_to '[+]', new_venue_path
+    %ul
+      - venues.each do |venue|
+        %li.clearfix
+          = link_to '[~]', edit_venue_path( venue )
+          .float-left= button_to '[x]', venue_path( venue ), :method => 'delete', :html => { :confirm => 'Are you sure?' }
+          = link_to venue.name, venue_path( venue )

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

@@ -0,0 +1,5 @@
+
+edit venue #{@venue.name}
+
+= render :partial => 'form', :locals => { :venue => @venue }
+

data/app/views/ish_manager/venues/edit.haml~

@@ -0,0 +1,4 @@
+
+edit venue #{@venue.name}
+
+= render :partial => 'form', :locals => { :venue => @venue }

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

@@ -0,0 +1,3 @@
+
+= render :partial => 'index', :locals => { :venues => @venues }
+        

data/app/views/ish_manager/venues/index.haml~

@@ -0,0 +1,3 @@
+
+= render :partial => 'venues/index', :locals => { :venues => @venues }
+        

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

@@ -0,0 +1,5 @@
+
+%h1 new venue
+
+= render :partial => 'form', :locals => { :venue => @venue }
+

data/app/views/ish_manager/venues/new.haml~

@@ -0,0 +1,2 @@
+
+%h1 new venue

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

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

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

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

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

@@ -0,0 +1,52 @@
+
+- url = video.persisted? ? update_video_path( video ) : videos_path
+= form_for video, :url => url do |f|
+
+  = render 'form_errors', :item => @video
+ 
+  .field
+    = f.label :youtube_id
+    = f.text_field :youtube_id
+
+  .field
+    = f.label :name
+    = f.text_field :name
+
+  .field
+    = f.label :tag_id
+    = select :video, :tag_id, @tags_list, :selected => params[:tag_id]
+
+  .field
+    = f.label :city_id
+    = select :video, :city_id, @cities_list
+
+  .field
+    = f.label :site_id
+    = select_tag 'video[site_id]', options_for_select( @sites_list )
+    
+  .field
+    = f.label :descr
+    = f.text_field :descr
+
+  .row
+    .large-6.columns
+      = f.label :x
+      = f.text_field :x
+    .large-6.columns
+      = f.label :y
+      = f.text_field :y
+
+  .row
+    .small-4.columns
+      = f.label :is_public
+      = f.check_box :is_public
+    .small-4.columns
+      = f.label :is_trash
+      = f.check_box :is_trash
+    .small-4.columns
+      = f.label :is_feature
+      = f.check_box :is_feature
+
+
+  .action
+    = f.submit

data/app/views/ish_manager/videos/_form.haml~

@@ -0,0 +1,48 @@
+
+- url = video.persisted? ? update_video_path( video ) : videos_path
+= form_for video, :url => url do |f|
+
+  = render 'application/form_errors', :item => @video
+ 
+  .field
+    = f.label :youtube_id
+    = f.text_field :youtube_id
+
+  .field
+    = f.label :name
+    = f.text_field :name
+
+  .field
+    = f.label :tag_id
+    = select :video, :tag_id, @tags_list, :selected => params[:tag_id]
+
+  .field
+    = f.label :city_id
+    = select :video, :city_id, @cities_list
+
+  -# .field
+  -#   = f.label :descr
+  -#   = f.text_field :descr
+
+  .row
+    .large-6.columns
+      = f.label :x
+      = f.text_field :x
+    .large-6.columns
+      = f.label :y
+      = f.text_field :y
+
+  .row
+    .small-4.columns
+      = f.label :is_public
+      = f.check_box :is_public
+    .small-4.columns
+      = f.label :is_trash
+      = f.check_box :is_trash
+    .small-4.columns
+      = f.label :is_feature
+      = f.check_box :is_feature
+
+
+  .action
+    = f.submit

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

@@ -0,0 +1,14 @@
+
+.videos-list
+  - if videos.blank?
+    = t('videos.no_videos')
+  - else
+    = paginate videos, :param_name => :videos_page, :views_prefix => 'templates'
+    - videos.each do |video|
+      .callout
+        %h5= link_to (video.name.blank? ? t('videos.no_title') : video.name), sites_video_path( @site.domain, video.youtube_id )
+        .text-center= render 'videos/embed', :video => video
+        = video.descr
+    = paginate videos, :param_name => :videos_page, :views_prefix => 'templates'
+  .c
+.c

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

@@ -0,0 +1,9 @@
+
+.list-small
+  %ul
+    - videos.each do |v|
+      %li
+        = image_tag( "http://img.youtube.com/vi/#{v.youtube_id}/1.jpg" )
+        = link_to '[~]', edit_video_path( v )
+        = link_to '[_]', video_path( v )
+  = paginate videos, :param_name => :videos_page, :views_prefix => 'templates'

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

@@ -0,0 +1,7 @@
+
+-# videos / edit
+  
+.row
+  .large-12.columns
+    %h2 Edit video
+    = render 'videos/form', :video => @video

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

@@ -0,0 +1,16 @@
+
+.a
+  .row
+    .large-12.columns
+      %h2
+        Videos (#{Video.count})
+        = link_to '[+]', new_video_path
+
+      = paginate @videos, :param_name => :videos_page
+      %ol
+        - @videos.each do |video|
+          %li
+            = video.name
+            = render :partial => 'embed', :locals => { :video => video }
+      = paginate @videos, :param_name => :videos_page
+

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

@@ -0,0 +1,5 @@
+
+.row
+  .large-12.columns
+    %h2= t('videos.new')
+    = render 'form', :video => @video

data/app/views/ish_manager/videos/new.haml~

@@ -0,0 +1,5 @@
+
+.row
+  .large-12.columns
+    %h2= t('videos.new')
+    = render 'videos/form', :video => @video

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

@@ -0,0 +1,16 @@
+
+- content_for :title do
+  #{@video.name} | #{@site.title}
+
+.row
+  .large-12.columns
+
+    %h3
+      - if @video.name.blank?
+        = t('videos.no_title')
+      - else
+        = @video.name
+    = render 'application/meta', :item => @video
+    .text-center= render 'embed', :video => @video
+
+    = render 'disqus'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.22
+  version: 0.1.8.23
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -140,6 +140,11 @@ files:
 - app/controllers/ish_manager/photos_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
 - app/controllers/ish_manager/sites_controller.rb
+- app/controllers/ish_manager/tags_controller.rb
+- app/controllers/ish_manager/users_controller.rb
+- app/controllers/ish_manager/venues_controller.rb
+- app/controllers/ish_manager/venues_controller.rb~
+- app/controllers/ish_manager/videos_controller.rb
 - app/helpers/ish_manager/application_helper.rb
 - app/helpers/ish_manager/images_helper.rb
 - app/jobs/ish_manager/application_job.rb
@@ -147,6 +152,7 @@ files:
 - app/models/ish_manager/ability.rb
 - app/models/ish_manager/ability.rb~
 - app/models/ish_manager/application_record.rb
+- app/views/ish_manager/application/_form_errors.haml
 - app/views/ish_manager/application/_main_footer.haml
 - app/views/ish_manager/application/_main_header.haml
 - app/views/ish_manager/application/_main_header.haml~
@@ -228,7 +234,29 @@ files:
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml
 - app/views/ish_manager/tags/show.haml
+- app/views/ish_manager/venues/_form.haml
+- app/views/ish_manager/venues/_form.haml~
+- app/views/ish_manager/venues/_index.haml
+- app/views/ish_manager/venues/_index.haml~
+- app/views/ish_manager/venues/edit.haml
+- app/views/ish_manager/venues/edit.haml~
+- app/views/ish_manager/venues/index.haml
+- app/views/ish_manager/venues/index.haml~
+- app/views/ish_manager/venues/new.haml
+- app/views/ish_manager/venues/new.haml~
+- app/views/ish_manager/videos/_embed.erb
+- app/views/ish_manager/videos/_embed_half.erb
+- app/views/ish_manager/videos/_form.haml
+- app/views/ish_manager/videos/_form.haml~
 - app/views/ish_manager/videos/_index.haml
+- app/views/ish_manager/videos/_list.haml
+- app/views/ish_manager/videos/_list_small.haml
+- app/views/ish_manager/videos/edit.haml
+- app/views/ish_manager/videos/index.haml
+- app/views/ish_manager/videos/index.haml~
+- app/views/ish_manager/videos/new.haml
+- app/views/ish_manager/videos/new.haml~
+- app/views/ish_manager/videos/show.haml
 - app/views/layouts/ish_manager/application.haml
 - app/views/layouts/ish_manager/application.haml~
 - config/mongoid.yml