ish_manager 0.1.8.252 → 0.1.8.253

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce1f4be644e4657cfd435c7d86997e039ad652cc8685338b4631755da901da63
-  data.tar.gz: dea2c34dbd447eb1161d01852ff402e19fc0475d478c6e37e9064bff5170bba1
+  metadata.gz: f22a877e38fa81c26881bef942e43cef7f203b84aeb78867478b46e1e215d0e9
+  data.tar.gz: d40cd5edbdb7bd40024f2de398f9b37b8d9df25da62f187b7ac67f28b637945f
 SHA512:
-  metadata.gz: 9272f4cf891018c0a5cd97193c24e21c2c0b80185f9ebf54d01213d12f9359a4f9e5e1460fadcb186b8f64a703a6fe17a016b046907543118cd602cf226b6b71
-  data.tar.gz: e05796ed3cf5417795eeef7434450490efe1b741031b2e011f55c7040f532fc9c366d9db11258dd3d84ece4dee9cc0a088abb77008200f9eb959153db2a15ce4
+  metadata.gz: 0fa6e95114f3f01275e8cfe1567ba98d42ccc7b1e8edf7c85b7fb89cf1357559dbe8f4f73ef7411475872b0f342d38f4c90278e6133ace095f341008d13274d8
+  data.tar.gz: 6d4b9633e0e8de2ad33b0351affeca4ab4360cfc616ff34474183713e2ea4506b26e3fcf597b632efe0d8ccdff9feb0b1904c1d4ba52bbd08a5acd669d1d0728

data/app/assets/stylesheets/ish_manager/{application.css → application.scss}

@@ -10,8 +10,6 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
- *= require ish_manager/bootstrap
- *= require ish_manager/reset
  *= require_self
  *= require ish_manager/tags
  *= require ish_manager/maps
@@ -22,49 +20,62 @@
  *= require ish_manager/user_profiles
  */
 
+ body {
+  background: #dedede;
+  font-size: 20px;
+}
 
 /**
  * utils
  */
+
+/* A */
+
+.addToggle + * {
+  display: none;
+}
+.alert {
+  boroder: 1px solid yellow;
+  padding: .8em;
+}
+
+/* B */
+
 .bg-white {
   background: url('/assets/bg/confectionary.png');
   padding-bottom: 1em;
 }
 
-body {
-  background: #dedede;
+.blue {
+  background: #5bc0de;
+  color: white;
+}
+
+.border-red {
+  border: 1px solid red;
+  padding: 1em;
 }
 
+/* C */
+
 .center {
   text-align: center;
 }
 
-.inline {
-  display: inline-block;
+.clearfix {
+  clear: both;
 }
 
-.notice {
-  border: 1px solid green;
-  padding: .8em;
-}
-.alert {
-  boroder: 1px solid yellow;
-  padding: .8em;
+.collapse-expand {
+  cursor: pointer;
 }
 
-hr {
-  background: red;
-  height: 1px !important;
-}
+/* D */
+/* E */
+/* F */
 
-.thumb {
-  background: dedede;
-  border: 1px solid red;
-  width: 100px;
-  height: 100px;
-}
-.large-photos img {
-  width: 100%;
+.flex-row {
+  display: flex;
 }
 
 .float-left {
@@ -74,40 +85,31 @@ hr {
 .float-right {
   float: right;
 }
-.clearfix {
-  clear: both;
-}
-.blue {
-  background: #5bc0de;
-  color: white;
-}
-
-.panel-content {
-  padding: .5em;
+hr {
+  background: red;
+  height: 1px !important;
 }
 
-.collapse-expand {
-  cursor: pointer;
-}
+/* I */
 
-.youtube_img {
-  width: 100px;
+.inline {
+  display: inline-block;
 }
-
 ul.inline li {
   display: inline;
 }
 
-.border-red,
-.red-border {
-  border: 1px solid red;
-  padding: 1em;
+/* L */
+textarea.large {
+  height: 400px;
 }
 
-.addToggle + * {
-  display: none;
+.large-photos img {
+  width: 100%;
 }
 
+/* M */
+
 .menu-secondary {}
 .menu-secondary li {
   display: inline;
@@ -117,12 +119,47 @@ ul.inline li {
   background: white;
 }
 
+.panel-content {
+  padding: .5em;
+}
+.thumb {
+  background: dedede;
+  border: 1px solid red;
+  width: 100px;
+  height: 100px;
+}
+ul.inline li {
+  padding-right: 1em;
+}
+
+.notice {
+  border: 1px solid green;
+  padding: .8em;
+}
+
+.youtube_img {
+  width: 100px;
+}
+
+
+
+
+
+
+
+
 /**
  * manager...
  */
 
 .manager--main-header {
   background: url('/assets/bg/weather.png');
+  ul {
+    li {
+      display: inline;
+      padding: 1em;
+    }
+  }
 }
 .manager--main-header hr {
   margin-top: 0;
@@ -138,17 +175,6 @@ ul.inline li {
   border-bottom: 1px solid red;
 }
 
-/**
- * pagination
- */
-
-/* nav.pagination {
-  padding-left: 1em;
-  background: transparent;
-}
-nav.pagination
-*/
-
 
 /**
  * reports
@@ -161,41 +187,6 @@ nav.pagination
 }
 
 
-/**
- * ally, stock watches
- */
-.price {
-  /* margin-left: 1em; */
-}
-.descriptive {
-  line-height: 2em;
-}
-.price::before {
-  content: "$";
-  position: absolute;
-  top: 1em;
-  left: 0;
-}
-table.stock_watches td {
-  border-right: 1px solid cyan;
-  padding: 15px;
-}
-table.stock_watches .trashy {
-  background: #cecece;
-}
-
-.stock-option {
-  /* border: 1px solid red; */
-  border-radius: 5px;
-  display: inline-block;
-  padding: 5px;
-  box-shadow: 2px 2px 5px grey;
-  margin: 5px;
-}
-.stock-option:hover {
-  box-shadow: 3px 3px 5px grey;
-}
-
 /*
  * newsitems
  */

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

@@ -5,7 +5,6 @@
   position: absolute;
 }
 
-
 .maps-index {
   h1 {
     padding-bottom: 10px;

data/app/controllers/ish_manager/application_controller.rb

@@ -26,15 +26,15 @@ module IshManager
 
     def set_lists
       @cities_list = City.list
+      @galleries_list = Gallery.all.list
       @locations_list = ::Gameui::Map.list
+      @maps_list = ::Gameui::Map.list
+      @reports_list = Report.all.list
       @sites_list = Site.all.list
+      @tags_list = Tag.list
+      @user_profiles_list = IshModels::UserProfile.all.list
       @venues_list = Venue.all.list
-
-      @reports_list = Report.all.list
-      @galleries_list = Gallery.all.list
       @videos_list = Video.all.list
-      @user_profiles_list = IshModels::UserProfile.all.list
-      @tags_list = Tag.list
     end
 
     def access_denied exception

data/app/controllers/ish_manager/features_controller.rb

@@ -2,7 +2,7 @@
 class IshManager::FeaturesController < IshManager::ApplicationController
 
   before_action :set_lists
-  
+
   def new
     if params[:city_id]
       @city = City.find params[:city_id]
@@ -70,7 +70,7 @@ class IshManager::FeaturesController < IshManager::ApplicationController
       @feature = @tag.features.find params[:id]
       authorize! :edit_feature, @tag
     end
-   
+
     if params[:venue_id]
       @venue = Tag.find params[:venue_id]
       @feature = @venue.features.find params[:id]
@@ -81,13 +81,13 @@ class IshManager::FeaturesController < IshManager::ApplicationController
 
   def update
     unless params[:city_id].blank?
-      @city = City.find params[:city_id] 
+      @city = City.find params[:city_id]
       authorize! :update_feature, @city
       @feature = @city.features.find params[:id]
       redirect_path = city_path( @city )
     end
     unless params[:site_id].blank?
-      @site = Site.find params[:site_id] 
+      @site = Site.find params[:site_id]
       authorize! :update_feature, @site
       @feature = @site.features.find params[:id]
       redirect_path = site_path( @site )
@@ -98,7 +98,7 @@ class IshManager::FeaturesController < IshManager::ApplicationController
       @feature = @tag.features.find params[:id]
       redirect_path = tag_path( @tag )
     end
-    
+
     authorize! :update, @feature
 
     if @feature.update_attributes params[:feature].permit!
@@ -111,7 +111,7 @@ class IshManager::FeaturesController < IshManager::ApplicationController
     else
       flash[:alert] = 'No Luck. ' + @feature.errors.messages
       render :action => :edit
-    end    
+    end
   end
 
   def index
@@ -145,6 +145,6 @@ class IshManager::FeaturesController < IshManager::ApplicationController
     end
     redirect_to request.referrer
   end
-  
+
 end
 

data/app/controllers/ish_manager/maps_controller.rb

@@ -5,8 +5,8 @@ class IshManager::MapsController < IshManager::ApplicationController
 
   def index
     authorize! :index, ::Gameui::Map
-    @maps = ::Gameui::Map.where( parent_slug: "" )
-    @all_maps = Gameui::Map.all
+    @maps = ::Gameui::Map.where( parent_slug: "" ).order( slug: :asc )
+    @all_maps = Gameui::Map.all.order( slug: :asc )
   end
 
   def show

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -1,28 +1,7 @@
 class IshManager::NewsitemsController < IshManager::ApplicationController
   before_action :set_lists
 
-  def new
-    @newsitem = Newsitem.new
-
-    @cities_list   = City.list
-    @maps_list     = ::Gameui::Map.list
-    @sites_list    = Site.list
-    @tags_list     = Tag.list
-
-    if params[:city_id]
-      @city = City.find params[:city_id]
-      @newsitem.city = @city
-    end
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @newsitem.site = @site
-    end
-    if params[:tag_id]
-      @tag = Tag.unscoped.find params[:tag_id]
-      @newsitem.tag = @tag
-    end
-    authorize! :new, @newsitem
-  end
+  ## Alphabetized : )
 
   def create
     @newsitem = Newsitem.new params[:newsitem].permit!
@@ -35,6 +14,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     @resource ||= IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
     @resource ||= ::Gameui::Map.find params[:newsitem][:map_id] if !params[:newsitem][:map_id].blank?
     @resource.newsitems << @newsitem
+    @resource.touch
 
     authorize! :create_newsitem, @resource
 
@@ -46,13 +26,13 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     url = case @resource.class.name
     when "City"
       edit_city_path( @resource.id )
+    when "IshModels::UserProfile"
+      user_profiles_path
+    when "Site"
+      edit_site_path( @resource.id )
     when "Tag"
       @resource.site.touch
       tag_path( @resource.id )
-    when "Site"
-      edit_site_path( @resource.id )
-    when "IshModels::UserProfile"
-      user_profiles_path
     else
       root_path
     end
@@ -72,103 +52,84 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
   end
 
   def destroy
-    authorize! :destroy, Newsitem
-    if params[:city_id]
-      flag = City.find( params[:city_id] ).newsitems.find( params[:id] ).destroy
-      url = edit_city_path( params[:city_id] )
+    @newsitem = Newsitem.find params[:id]
+    authorize! :destroy, @newsitem
+
+    if @newsitem.destroy
+      City.find(@newsitem.city_id).touch if @newsitem.city_id
+      Site.find(@newsitem.site_id).touch if @newsitem.site_id
+      Tag.find(@newsitem.tag_id).touch if @newsitem.tag_id
+
+      flash[:notice] = "Destroyed the newsitem."
+    else
+      flash[:alert] = "Cannot destroy the newsitem: #{@newsitem.errors.full_messages}."
     end
-    if profile_id = params[:user_profile_id]
-      profile = IshModels::UserProfile.find profile_id
-      flag = profile.newsitems.find( params[:id] ).destroy
-      url = profile_path( profile_id )
+
+    redirect_to request.referrer ? request.referrer : '/'
+  end
+
+  def edit
+    @newsitem = Newsitem.find( params[:id] )
+    authorize! :edit, @newsitem
+
+    ## @TODO: what on earth is this?
+    out = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
+    @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
+
+  end
+
+  def index
+    @resource = Site.find( params[:site_id] ) if params[:site_id]
+    @resource = City.find( params[:site_id] ) if params[:city_id]
+
+    authorize! :newsitems_index, @resource
+    @newsitems = @resource.newsitems
+  end
+
+  def new
+    @newsitem = Newsitem.new
+
+    if params[:city_id]
+      @city = City.find params[:city_id]
+      @newsitem.city = @city
     end
     if params[:site_id]
-      site = Site.find( params[:site_id] )
-      flag = site.newsitems.find( params[:id] ).destroy
-      if flag
-        site.touch
-      end
-      url = edit_site_path( params[:site_id] )
+      @site = Site.find params[:site_id]
+      @newsitem.site = @site
     end
     if params[:tag_id]
-      tag = Tag.find( params[:tag_id] )
-      flag = tag.newsitems.find( params[:id] ).destroy
-      url = tag_path( params[:tag_id] )
+      @tag = Tag.unscoped.find params[:tag_id]
+      @newsitem.tag = @tag
     end
-
-    flash[:notice] = "Success? #{flag.inspect}"
-    redirect_to request.referrer ? request.referrer : '/'
+    authorize! :new, @newsitem
   end
 
   def update
-    if params[:site_id] || params[:newsitem][:site_id]
-      if params[:site_id]
-        @site = Site.find params[:site_id]
-      end
-      if params[:newsitem][:site_id]
-        @site = Site.find params[:newsitem][:site_id]
-      end
-      @site.touch
-      @newsitem = @site.newsitems.find params[:id]
-      url = edit_site_path( @site )
-    end
+    @newsitem = Newsitem.find params[:id]
+    authorize! :update, @newsitem
+
+    ## @TODO: re-add site management here, probably.
 
     if params[:city_id]
       @city = City.find params[:city_id]
       @newsitem = @city.newsitems.find params[:id]
       url = edit_city_path( @city )
     end
+
     if params[:photo]
       photo = Photo.new :photo => params[:photo]
       photo.user_profile = current_user.profile
       @newsitem.photo = photo
     end
-    authorize! :update, @newsitem
-    flag = @newsitem.update_attributes params[:newsitem].permit!
 
+    flag = @newsitem.update_attributes params[:newsitem].permit!
     if flag
       flash[:notice] = 'Success'
     else
       flash[:alert] = "No Luck: #{@newsitem.errors.messages}"
     end
 
-    redirect_to url
-  end
-
-  def edit
-    out = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
-    @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
-
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @newsitem = @site.newsitems.find( params[:id] )
-    end
-    if params[:city_id]
-      @city = City.find params[:city_id]
-      @newsitem = @city.newsitems.find( params[:id] )
-    end
-    authorize! :edit, @newsitem
-
-  end
-
-  def index
-    @resource = Site.find( params[:site_id] ) if params[:site_id]
-    @resource = City.find( params[:site_id] ) if params[:city_id]
-
-    authorize! :newsitems_index, @resource
-    @newsitems = @resource.newsitems
-  end
-
-  private
-
-  def set_lists
-    @videos_list    = Video.list
-    @galleries_list = Gallery.list
-    @reports_list   = Report.list
-    @sites_list     = Site.list
-    @cities_list    = City.list
-    @tags_list      = Tag.list
-    @user_profiles_list = IshModels::UserProfile.list
+    redirect_to edit_newsitem_path(@newsitem)
   end
 
 end

data/app/controllers/ish_manager/reports_controller.rb

@@ -3,11 +3,48 @@ class IshManager::ReportsController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  def create
+    @report = Report.new params[:report].permit!
+    @report.user_profile = current_user.profile # @TODO: this should not be hard-coded
+    authorize! :create, @report
+
+    flag = @report.save
+    respond_to do |format|
+      if flag
+
+        ## @TODO: I'm sure there is a better way
+        if params[:report][:photo]
+          photo = Photo.new
+          photo.photo = params[:report][:photo]
+          photo.is_public = @report.is_public
+          photo.is_trash = false
+          photo.report_id = @report.id
+          photo.save
+        end
+
+        format.html do
+          redirect_to report_path(@report), :notice => 'Report was successfully created.'
+        end
+        format.json { render :json => @report, :status => :created, :location => @report } # TODO: remove, I got the api now.
+      else
+        format.html do
+          flash[:alert] = @report.errors.full_messages
+          @tags_list = Tag.all.list
+          @sites_list = Site.all.list
+          @cities_list = City.all.list
+
+          render :action => "new"
+        end
+        format.json { render :json => @report.errors, :status => :unprocessable_entity } # @TODO: remove, right? no api here.
+      end
+    end
+  end
+
   def index
     authorize! :index, Report
-    @reports = Report.unscoped.order_by( :created_at => :desc 
+    @reports = Report.unscoped.order_by( :created_at => :desc
                                        ).where( :is_trash => false, :user_profile => current_user.profile
-                                              ).page( params[:reports_page] 
+                                              ).page( params[:reports_page]
                                                     ).per( Report::PER_PAGE )
     if false === params[:site]
       @reports = @reports.where( :site_id => nil )
@@ -74,76 +111,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
     end
   end
 
-  def create
-    @report = Report.new params[:report].permit!
-    @report.user_profile = current_user.profile
-    authorize! :create, @report
-
-    @site = Site.where( :id => params[:report][:site_id] ).first
-    @site ||= Site.find_by :domain => 'piousbox.com', :lang => :en 
-
-    if @site
-      redirect_path = site_reports_path( @site.id )
-    end
-    if params[:report][:city_id]
-      redirect_path = city_path( params[:report][:city_id] )
-    end
-
-    # @report.user = @current_user || User.where( :username => 'anon' ).first
-    # @report.username = @report.user.username
-    @report[:lang] = @locale
-    @report.name_seo ||= @report.id
-    @report.is_feature = false
-    @report.site = @site
-
-    saved = @report.save
-
-    respond_to do |format|
-      if saved
-
-        if params[:report][:photo]
-          # photo
-          photo = Photo.new 
-          photo.photo = params[:report][:photo]
-          # photo.user = @report.user
-          photo.is_public = @report.is_public
-          photo.is_trash = false
-          photo.report_id = @report.id
-          photo.save
-        end
-        
-        # for homepage
-        # @TODO: move this to the model
-        if @report.is_public
-          n = Newsitem.new
-          n.report = @report
-          n.descr = @report.subhead
-          # n.user = @report.user
-          @site.newsitems << n
-          @site.touch
-          if @site.save
-          else
-            flash[:alert] = (flash[:alert]||'') + 'City could not be saved (newsitem). '
-          end
-        end
-
-        format.html do
-          redirect_to redirect_path, :notice => 'Report was successfully created (but newsitem, no information).' 
-        end
-        format.json { render :json => @report, :status => :created, :location => @report }
-      else
-        format.html do
-          flash[:alert] = @report.errors.messages
-          @tags_list = Tag.all.where( :is_public => true ).list
-          @sites_list = Site.all.list
-          @cities_list = City.all.list
 
-          render :action => "new"
-        end
-        format.json { render :json => @report.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
 
 end