ish_manager 0.1.8.244 → 0.1.8.248

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63fbcf375a430c186dd0bfca172e3b5826a7bbc417d252eb3e3960af2d7e86bf
-  data.tar.gz: 19314dbe96dc251ea4bd6cfadc466d9a7f4123de691ba8ca61619976d00ed860
+  metadata.gz: 38f82f782d8fee6247ee92d440fd9984c2a560e192f877eb9cfffa591f5c8045
+  data.tar.gz: e29fba83dd1c1426c83a4991dbf4968c4affafae2542c6d0cf490cb12aed3344
 SHA512:
-  metadata.gz: 74dbbf731cdf117c165a7ec7fa8117c3425559ef1848ffc22342dc597fd0c6e440c43ef1e1c6b0dfa730e642888de1485d18ed192e15065ece9eb198e4412865
-  data.tar.gz: 48a6f72e6bfa6f8260b1c8d25c1639665d1cc097a2ac90bb0548652836e4415e888879a593fd3d78b3d1991db8b7ae413ad355cd463586b45ee42c1854e254b1
+  metadata.gz: 28c18da1165de872522f64252f6e0fdfec5217b5806d4527b7b38717826c39041241521762917f799fe14d320bd08de59fa05ebeb9157286c9792134a1d5e5d9
+  data.tar.gz: 6e984c0cf9031c26bd6f29f86ab9f0f9ad977b22527e848f57c39cb456398ee5fdc5e722cabd75fc163d3e23b9ccb2f81cc604178300312157ea6e13db8f683d

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

@@ -11,12 +11,14 @@
  * 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
  *= require ish_manager/utils
  *= require ish_manager/jquery-ui
  *= require ish_manager/galleries
+ *= require ish_manager/user_profiles
  */
 
 

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

@@ -1,4 +1,8 @@
 
+.panel-body img.thumb {
+  display: inline;
+}
+
 .large-photos .item {
   border: 1px solid red;
   display: block;

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

@@ -0,0 +1,96 @@
+/* Box sizing rules */
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+/* Remove default margin */
+body,
+h1,
+h2,
+h3,
+h4,
+p,
+figure,
+blockquote,
+dl,
+dd {
+  margin: 0;
+}
+
+/* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */
+ul[role='list'],
+ol[role='list'] {
+  list-style: none;
+}
+
+/* Set core root defaults */
+html:focus-within {
+  scroll-behavior: smooth;
+}
+
+/* Set core body defaults */
+body {
+  min-height: 100vh;
+  text-rendering: optimizeSpeed;
+  line-height: 1.5;
+}
+
+/* A elements that don't have a class get default styles */
+a:not([class]) {
+  text-decoration-skip-ink: auto;
+}
+
+/* Make images easier to work with */
+img,
+picture {
+  max-width: 100%;
+  display: block;
+}
+
+/* Inherit fonts for inputs and buttons */
+input,
+button,
+textarea,
+select {
+  font: inherit;
+}
+
+/* Remove all animations, transitions and smooth scroll for people that prefer not to see them */
+@media (prefers-reduced-motion: reduce) {
+  html:focus-within {
+   scroll-behavior: auto;
+  }
+
+  *,
+  *::before,
+  *::after {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+    scroll-behavior: auto !important;
+  }
+}
+
+
+html, body, div, span, applet, object, iframe,
+p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}

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

@@ -0,0 +1,9 @@
+
+.user-profiles--show {
+  ul ul {
+    margin-left: 1em;
+  }
+  ul li {
+    list-style-type: circle;
+  }
+}

data/app/controllers/ish_manager/maps_controller.rb

@@ -23,6 +23,9 @@ class IshManager::MapsController < IshManager::ApplicationController
 
   def create
     @map = ::Gameui::Map.new(map_params)
+    if map_params[:parent_slug].present?
+      @map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })
+    end
     authorize! :create, @map
 
     respond_to do |format|
@@ -37,6 +40,11 @@ class IshManager::MapsController < IshManager::ApplicationController
   def update
     authorize! :update, @map
     respond_to do |format|
+      if map_params[:parent_slug].present?
+        @map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })
+      else
+        @map.parent = nil
+      end
       if @map.update(map_params)
         format.html { redirect_to map_path(@map), notice: 'Map was successfully updated.' }
       else

data/app/controllers/ish_manager/markers_controller.rb

@@ -27,6 +27,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
 
     respond_to do |format|
       if @marker.save
+        @marker.map.touch
         format.html { redirect_to map_path(@map), notice: 'Marker was successfully created.' }
       else
         format.html { render :new }
@@ -38,6 +39,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
     authorize! :update_marker, @map
     respond_to do |format|
       if @marker.update(marker_params)
+        @marker.map.touch
         format.html { redirect_to maps_path(@map), notice: 'Marker was successfully updated.' }
       else
         format.html { render :edit }
@@ -49,6 +51,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
     @marker = ::Gameui::Marker.find params[:id]
     @map = @marker.map
     authorize! :destroy_marker, @map
+    @marker.map.touch
     @marker.destroy
     respond_to do |format|
       format.html { redirect_to map_path(@map), notice: 'Marker was successfully destroyed.' }
@@ -57,17 +60,17 @@ class IshManager::MarkersController < IshManager::ApplicationController
 
   private
 
-    def set_map
-      @map = ::Gameui::Map.find(params[:map_id] || params[:gameui_marker][:map_id])
-    end
+  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 set_marker
+    @marker = ::Gameui::Marker.find params[:id]
+    @map = @marker.map
+  end
 
-    def marker_params
-      params.require(:gameui_marker).permit!
-    end
+  def marker_params
+    params.require(:gameui_marker).permit!
+  end
 
 end

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -40,15 +40,14 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   end
 
   def create
-    @profile = IshModels::UserProfile.new params[:profile].permit!
-    authorize! :create, @profile
-    @profile.user = User.find_or_create_by( :email => params[:profile][:email] )
-    @profile.user.password ||= (0...12).map { rand(100) }.join
-    if !@profile.user.save
-      puts! @profile.user.errors.messages
-      raise 'cannot save profile.user'
+    @user = User.find_or_create_by( :email => params[:profile][:email] )
+    @user.password ||= (0...12).map { rand(100) }.join
+    @user.profile = IshModels::UserProfile.new params[:profile].permit!
+    authorize! :create, @user.profile
+    if !@user.save
+      raise "cannot save profile.user: #{@profile.user.errors.full_messages} profile errors: #{@profile.errors.full_messages}"
     end
-    if @profile.save
+    if @user.profile.save
       flash[:notice] = "Created profile"
     else
       flash[:alert] = "Cannot create profile: #{@profile.errors.messages}"

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

@@ -12,24 +12,28 @@
         - @map.errors.full_messages.each do |message|
           %li= message
 
-
   .row
+    .col-md-3
+      .field
+        = f.label :name
+        = f.text_field :name
     .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
+
+
+    .col-md-2
       .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_area :description, class: 'tinymce'

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

@@ -28,13 +28,10 @@
   %br
 
   .row
-    .col-md-4
-      %label{} City
-      = select :report, :city_id, @cities_list, :class=>"btn"
-    .col-sm-4
-      = f.label :premium_tier
-      = f.number_field :premium_tier
     .col-md-4
+      .field
+        %label City
+        = select :report, :city_id, @cities_list, :class=>"btn"
       .field
         = f.label :Coordinates
         .panel.panel-default
@@ -48,6 +45,15 @@
               .form-group
                 %label{} Y-coordinate
                 = f.text_field :y, :placeholder => "y", :type => "text", :class=>"form-control"
+    .col-sm-4
+      .field
+        = f.label :premium_tier
+        = f.number_field :premium_tier
+      .field
+        = f.label :user_profile
+        = select :report, :user_profile_id, @user_profiles_list
+    .col-md-4
+      unused
 
   .row
     .col-md-6

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

@@ -0,0 +1,15 @@
+
+.manager-reports--show-mini
+  .row
+    .large-12.columns
+      .title
+        = report.name
+        = link_to '[~]', edit_report_path( report )
+
+      .meta
+        On #{report.created_at.to_s.slice(0, 10)}
+        - if report.city
+          In #{link_to report.city.name, city_path( report.city )}
+
+      - if report.subhead.length > 3
+        .subhead= report.subhead

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

@@ -17,11 +17,11 @@
 
       - if @report.subhead.length > 3
         .subhead= @report.subhead
-        
+
       .descr
         - if @report.photo
           .float-left= image_tag @report.photo.photo.url( :small )
         = raw @report.descr
         .c
-          
+
       .c

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

@@ -10,9 +10,9 @@
       .row
         .col-sm-4
           %ul
-            %li= link_to '[edit]', edit_user_profile_path( profile )
-            %li <b>Email:</b> #{profile.email}
-            %li <b>username:</b> #{profile.username}
+            %li
+              <b>Email:</b> #{link_to profile.email, user_profile_path(profile)}
+              = link_to '[edit]', edit_user_profile_path( profile )
             %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/app/views/ish_manager/user_profiles/show.haml

@@ -0,0 +1,14 @@
+
+.user-profiles--show
+  %ul
+    %li
+      User profile: #{@user_profile.inspect}
+    %li
+      Purchased Items:
+      %ul
+        - @user_profile.premium_purchases.each do |purchase|
+          %li
+            -# = purchase.item_type.constantize.find(purchase.item_id).inspect
+            = render 'ish_manager/reports/show_mini', report: purchase.item_type.constantize.find(purchase.item_id)
+
+

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

@@ -18,7 +18,7 @@
                 - 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 'embed_mini', video: video
+                  = render 'ish_manager/videos/embed_mini', video: video
                 - else
                   .thumb= image_tag video.thumb.url(:thumb)
               .a

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

@@ -12,11 +12,14 @@
     %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
     = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
     = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
-    = stylesheet_link_tag "ish_manager/application", media: "all"
+
     = stylesheet_link_tag "ish_manager/materialize", media: "all"
+    = stylesheet_link_tag "ish_manager/application", media: "all"
     = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
+
     = javascript_include_tag "ish_manager/application"
     = javascript_include_tag "ish_manager/materialize"
+
     = csrf_meta_tags
   %body#application
     .bg-white

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.244
+  version: 0.1.8.248
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,9 +180,11 @@ files:
 - app/assets/stylesheets/ish_manager/jquery-ui.css
 - app/assets/stylesheets/ish_manager/maps.scss
 - app/assets/stylesheets/ish_manager/materialize.css
+- app/assets/stylesheets/ish_manager/reset.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/user_profiles.scss
 - app/assets/stylesheets/ish_manager/utils.scss
 - app/controllers/ish_manager/ally_controller.rb
 - app/controllers/ish_manager/application_controller.rb
@@ -307,6 +309,7 @@ files:
 - app/views/ish_manager/photos/without_gallery.haml
 - app/views/ish_manager/reports/_form.haml
 - app/views/ish_manager/reports/_index.haml
+- app/views/ish_manager/reports/_show_mini.haml
 - app/views/ish_manager/reports/edit.haml
 - app/views/ish_manager/reports/index.haml
 - app/views/ish_manager/reports/new.haml
@@ -338,6 +341,7 @@ files:
 - app/views/ish_manager/user_profiles/edit.haml
 - app/views/ish_manager/user_profiles/index.haml
 - app/views/ish_manager/user_profiles/new.haml
+- app/views/ish_manager/user_profiles/show.haml
 - app/views/ish_manager/users/_index.haml
 - app/views/ish_manager/venues/_form.haml
 - app/views/ish_manager/venues/_index.haml