elabs 3.0.0 → 4.0.0

data/app/assets/stylesheets/elabs/lib/fontawesome/_icons.scss

@@ -127,7 +127,7 @@ readers do not read off random characters that represent icons */
 //.#{$fa-css-prefix}-broom:before { content: fa-content($fa-var-broom); }
 //.#{$fa-css-prefix}-brush:before { content: fa-content($fa-var-brush); }
 //.#{$fa-css-prefix}-btc:before { content: fa-content($fa-var-btc); }
-//.#{$fa-css-prefix}-bug:before { content: fa-content($fa-var-bug); }
+.#{$fa-css-prefix}-bug:before { content: fa-content($fa-var-bug); }
 //.#{$fa-css-prefix}-building:before { content: fa-content($fa-var-building); }
 //.#{$fa-css-prefix}-bullhorn:before { content: fa-content($fa-var-bullhorn); }
 //.#{$fa-css-prefix}-bullseye:before { content: fa-content($fa-var-bullseye); }
@@ -214,8 +214,8 @@ readers do not read off random characters that represent icons */
 //.#{$fa-css-prefix}-cloudsmith:before { content: fa-content($fa-var-cloudsmith); }
 //.#{$fa-css-prefix}-cloudversify:before { content: fa-content($fa-var-cloudversify); }
 //.#{$fa-css-prefix}-cocktail:before { content: fa-content($fa-var-cocktail); }
-//.#{$fa-css-prefix}-code:before { content: fa-content($fa-var-code); }
-//.#{$fa-css-prefix}-code-branch:before { content: fa-content($fa-var-code-branch); }
+.#{$fa-css-prefix}-code:before { content: fa-content($fa-var-code); }
+.#{$fa-css-prefix}-code-branch:before { content: fa-content($fa-var-code-branch); }
 //.#{$fa-css-prefix}-codepen:before { content: fa-content($fa-var-codepen); }
 //.#{$fa-css-prefix}-codiepie:before { content: fa-content($fa-var-codiepie); }
 //.#{$fa-css-prefix}-coffee:before { content: fa-content($fa-var-coffee); }
@@ -333,7 +333,7 @@ readers do not read off random characters that represent icons */
 //.#{$fa-css-prefix}-euro-sign:before { content: fa-content($fa-var-euro-sign); }
 //.#{$fa-css-prefix}-exchange-alt:before { content: fa-content($fa-var-exchange-alt); }
 .#{$fa-css-prefix}-exclamation:before { content: fa-content($fa-var-exclamation); }
-//.#{$fa-css-prefix}-exclamation-circle:before { content: fa-content($fa-var-exclamation-circle); }
+.#{$fa-css-prefix}-exclamation-circle:before { content: fa-content($fa-var-exclamation-circle); }
 //.#{$fa-css-prefix}-exclamation-triangle:before { content: fa-content($fa-var-exclamation-triangle); }
 //.#{$fa-css-prefix}-expand:before { content: fa-content($fa-var-expand); }
 //.#{$fa-css-prefix}-expand-arrows-alt:before { content: fa-content($fa-var-expand-arrows-alt); }
@@ -414,7 +414,7 @@ readers do not read off random characters that represent icons */
 //.#{$fa-css-prefix}-free-code-camp:before { content: fa-content($fa-var-free-code-camp); }
 //.#{$fa-css-prefix}-freebsd:before { content: fa-content($fa-var-freebsd); }
 //.#{$fa-css-prefix}-frog:before { content: fa-content($fa-var-frog); }
-//.#{$fa-css-prefix}-frown:before { content: fa-content($fa-var-frown); }
+.#{$fa-css-prefix}-frown:before { content: fa-content($fa-var-frown); }
 //.#{$fa-css-prefix}-frown-open:before { content: fa-content($fa-var-frown-open); }
 //.#{$fa-css-prefix}-fulcrum:before { content: fa-content($fa-var-fulcrum); }
 //.#{$fa-css-prefix}-futbol:before { content: fa-content($fa-var-futbol); }
@@ -431,11 +431,11 @@ readers do not read off random characters that represent icons */
 //.#{$fa-css-prefix}-gift:before { content: fa-content($fa-var-gift); }
 //.#{$fa-css-prefix}-git:before { content: fa-content($fa-var-git); }
 //.#{$fa-css-prefix}-git-square:before { content: fa-content($fa-var-git-square); }
-//.#{$fa-css-prefix}-github:before { content: fa-content($fa-var-github); }
+.#{$fa-css-prefix}-github:before { content: fa-content($fa-var-github); }
 //.#{$fa-css-prefix}-github-alt:before { content: fa-content($fa-var-github-alt); }
 //.#{$fa-css-prefix}-github-square:before { content: fa-content($fa-var-github-square); }
 //.#{$fa-css-prefix}-gitkraken:before { content: fa-content($fa-var-gitkraken); }
-//.#{$fa-css-prefix}-gitlab:before { content: fa-content($fa-var-gitlab); }
+.#{$fa-css-prefix}-gitlab:before { content: fa-content($fa-var-gitlab); }
 //.#{$fa-css-prefix}-gitter:before { content: fa-content($fa-var-gitter); }
 //.#{$fa-css-prefix}-glass-martini:before { content: fa-content($fa-var-glass-martini); }
 //.#{$fa-css-prefix}-glass-martini-alt:before { content: fa-content($fa-var-glass-martini-alt); }
@@ -541,7 +541,7 @@ readers do not read off random characters that represent icons */
 //.#{$fa-css-prefix}-inbox:before { content: fa-content($fa-var-inbox); }
 //.#{$fa-css-prefix}-indent:before { content: fa-content($fa-var-indent); }
 //.#{$fa-css-prefix}-industry:before { content: fa-content($fa-var-industry); }
-//.#{$fa-css-prefix}-infinity:before { content: fa-content($fa-var-infinity); }
+.#{$fa-css-prefix}-infinity:before { content: fa-content($fa-var-infinity); }
 .#{$fa-css-prefix}-info:before { content: fa-content($fa-var-info); }
 //.#{$fa-css-prefix}-info-circle:before { content: fa-content($fa-var-info-circle); }
 //.#{$fa-css-prefix}-instagram:before { content: fa-content($fa-var-instagram); }/* stylelint-disable */
@@ -805,7 +805,7 @@ readers do not read off random characters that represent icons */
 //.#{$fa-css-prefix}-rocket:before { content: fa-content($fa-var-rocket); }
 //.#{$fa-css-prefix}-rocketchat:before { content: fa-content($fa-var-rocketchat); }
 //.#{$fa-css-prefix}-rockrms:before { content: fa-content($fa-var-rockrms); }
-//.#{$fa-css-prefix}-rss:before { content: fa-content($fa-var-rss); }
+.#{$fa-css-prefix}-rss:before { content: fa-content($fa-var-rss); }
 //.#{$fa-css-prefix}-rss-square:before { content: fa-content($fa-var-rss-square); }
 //.#{$fa-css-prefix}-ruble-sign:before { content: fa-content($fa-var-ruble-sign); }
 //.#{$fa-css-prefix}-ruler:before { content: fa-content($fa-var-ruler); }
@@ -887,7 +887,7 @@ readers do not read off random characters that represent icons */
 //.#{$fa-css-prefix}-spa:before { content: fa-content($fa-var-spa); }
 //.#{$fa-css-prefix}-space-shuttle:before { content: fa-content($fa-var-space-shuttle); }
 //.#{$fa-css-prefix}-speakap:before { content: fa-content($fa-var-speakap); }
-//.#{$fa-css-prefix}-spinner:before { content: fa-content($fa-var-spinner); }
+.#{$fa-css-prefix}-spinner:before { content: fa-content($fa-var-spinner); }
 //.#{$fa-css-prefix}-splotch:before { content: fa-content($fa-var-splotch); }
 //.#{$fa-css-prefix}-spotify:before { content: fa-content($fa-var-spotify); }
 //.#{$fa-css-prefix}-spray-can:before { content: fa-content($fa-var-spray-can); }
@@ -897,7 +897,7 @@ readers do not read off random characters that represent icons */
 //.#{$fa-css-prefix}-stack-exchange:before { content: fa-content($fa-var-stack-exchange); }
 //.#{$fa-css-prefix}-stack-overflow:before { content: fa-content($fa-var-stack-overflow); }
 //.#{$fa-css-prefix}-stamp:before { content: fa-content($fa-var-stamp); }
-//.#{$fa-css-prefix}-star:before { content: fa-content($fa-var-star); }
+.#{$fa-css-prefix}-star:before { content: fa-content($fa-var-star); }
 //.#{$fa-css-prefix}-star-half:before { content: fa-content($fa-var-star-half); }
 //.#{$fa-css-prefix}-star-half-alt:before { content: fa-content($fa-var-star-half-alt); }
 //.#{$fa-css-prefix}-staylinked:before { content: fa-content($fa-var-staylinked); }

data/app/assets/stylesheets/elabs/lib/knacss/_knacss-variables.scss

@@ -27,6 +27,14 @@ $font-family-monospace : consolas, courier, monospace; // font for code and samp
 $font-size-base : 1.6rem !default;
 
 $font-sizes: (
+        smaller: (
+                mobile  : 1rem,
+                desktop : 1.2rem
+        ),
+        small: (
+               mobile   : 1.2rem,
+               desktop  : 1.4rem
+        ),
         base: (
                 mobile  : 1.4rem,
                 desktop : $font-size-base
@@ -200,8 +208,8 @@ $variants-list: (
   (show,         $color-primary,    $white,      none),
   (edit,         $color-primary,    $white,      none),
   (success,      $color-success,    $white,      none),
-  (info,         $color-info,       $black,      none),
-  (notice,       $color-info,       $black,      none),
+  (info,         $color-info,       $white,      none),
+  (notice,       $color-info,       $white,      none),
   (warning,      $color-warning,    $black,      none),
   (lock,         $color-warning,    $black,      none),
   (danger,       $color-danger,     $white,      none),

data/app/assets/stylesheets/elabs/style.scss

@@ -8,6 +8,7 @@
 @import 'app/mixins/classifier-card';
 @import 'app/mixins/content-card';
 @import 'app/mixins/content-full';
+@import 'app/mixins/content-inline';
 @import 'app/mixins/icon';
 
 /* ------------------
@@ -41,6 +42,7 @@
 @import 'app/buttons';
 @import 'app/comments';
 @import 'app/content';
+@import 'app/content_statuses';
 @import 'app/content_uploads';
 @import 'app/empty';
 @import 'app/errors';
@@ -52,13 +54,17 @@
 @import 'app/link-to-top';
 @import 'app/medias';
 @import 'app/modals';
-@import 'app/nsfw';
 @import 'app/pagination';
+@import 'app/tables';
 @import 'app/tabs';
 @import 'app/tags';
 @import 'app/toolbars';
+@import 'app/typo';
 @import 'app/users';
 
+// Widgets
+@import 'app/widgets/git-cards';
+
 // Admin zone
 @import 'app/admin-members/forms';
 @import 'app/admin-members/indexes';
@@ -71,3 +77,7 @@
 
 // Overrides
 @import 'lib/codemirror';
+@import 'lib/hljs';
+
+// Fixes
+@import 'fixes';

data/app/controllers/elabs/admin/admin_application_controller.rb

@@ -12,7 +12,7 @@ module Elabs
 
       def authenticate_admin!
         authenticate_user!
-        redirect_to user_url(current_user.id), status: :unauthorized unless current_user.admin?
+        redirect_to user_url(current_user), status: :unauthorized unless current_user.admin?
       end
     end
   end

data/app/controllers/elabs/admin/admin_content_application_controller.rb

@@ -47,8 +47,8 @@ module Elabs
 
       # Use callbacks to share common setup or constraints between actions.
       def set_entity
-        id      = params[:id] || params["#{self.class::SINGULAR_NAME}_id"]
-        @entity = self.class::MODEL.find(id)
+        slug = params[:slug] || params["#{self.class::SINGULAR_NAME}_slug"]
+        @entity = self.class::MODEL.find_by_slug(slug)
         create_instance_variable self.class::SINGULAR_NAME
       end
 

data/app/controllers/elabs/admin/languages_controller.rb

@@ -65,7 +65,7 @@ module Elabs
 
       # Use callbacks to share common setup or constraints between actions.
       def set_language
-        @language = Language.find(params[:id])
+        @language = Language.find_by_iso639_1(params[:iso639_1])
       end
 
       # Never trust parameters from the scary internet, only allow the white list through.

data/app/controllers/elabs/admin/licenses_controller.rb

@@ -65,7 +65,7 @@ module Elabs
 
       # Use callbacks to share common setup or constraints between actions.
       def set_license
-        @license = License.find(params[:id])
+        @license = License.find_by_slug(params[:slug])
       end
 
       # Never trust parameters from the scary internet, only allow the white list through.

data/app/controllers/elabs/admin/tags_controller.rb

@@ -44,7 +44,7 @@ module Elabs
 
       # Use callbacks to share common setup or constraints between actions.
       def set_tag
-        @tag = Tag.find(params[:id])
+        @tag = Tag.find_by_slug(params[:slug])
       end
 
       # Never trust parameters from the scary internet, only allow the white list through.

data/app/controllers/elabs/admin/users_controller.rb

@@ -31,7 +31,7 @@ module Elabs
 
       # Use callbacks to share common setup or constraints between actions.
       def set_admin_user
-        @user = User.find(params[:id])
+        @user = User.find_by_username(params[:username])
       end
 
       # Never trust parameters from the scary internet, only allow the white list through.

data/app/controllers/elabs/albums_controller.rb

@@ -19,7 +19,7 @@ module Elabs
 
     # Use callbacks to share common setup or constraints between actions.
     def set_album
-      @album         = Album.find_publicly_visible(params[:id])
+      @album         = Album.find_publicly_visible(params[:slug])
       @album_uploads = @album.uploads.for_relation
     end
   end

data/app/controllers/elabs/articles_controller.rb

@@ -19,7 +19,7 @@ module Elabs
 
     # Use callbacks to share common setup or constraints between actions.
     def set_article
-      @article = Article.find_publicly_visible(params[:id])
+      @article = Article.find_publicly_visible(params[:slug])
     end
   end
 end

data/app/controllers/elabs/content_application_controller.rb

@@ -36,7 +36,8 @@ module Elabs
     def build_comment
       @comment = Comment.new(comment_params)
       params.each do |key, value|
-        @comment.content_id = value if %w[album_id article_id note_id project_id upload_id].include? key
+        # find the content by slug if needed
+        @comment.content_id = find_related_id_by_slug(key.chomp('_slug'), 'slug', value) if %w[album_slug article_slug note_slug project_slug upload_slug].include? key
       end
       @comment.content_type = params[:controller].classify
       @comment.user         = current_user if user_signed_in?

data/app/controllers/elabs/elabs_public_controller.rb

@@ -25,11 +25,12 @@ module Elabs
 
       params.each do |p|
         # No need to do this with "album_id" as there is no action requiring it (as for a /albums/xxx/uploads)
-        next unless %w[tag_id project_id].include? p[0]
+        next unless %w[tag_slug project_slug].include? p[0]
 
-        foreign_table                = p[0].chomp('_id').pluralize.to_sym
+        foreign_table                = p[0].chomp('_slug').pluralize.to_sym
         orm_request                  = orm_request.joins(foreign_table)
-        where_clauses[foreign_table] = { id: p[1] }
+        id                           = find_related_id_by_slug(p[0].chomp('_slug'), 'slug', p[1])
+        where_clauses[foreign_table] = { id: id }
         next
       end
 
@@ -37,11 +38,14 @@ module Elabs
     end
 
     def build_request_where(orm_request)
-      allowed_scopes_ids = self.class::ALLOWED_NESTED_FROM.map { |n| "#{n}_id" }
-      clean_list         = allowed_scopes_ids.reject { |s| %w[tag_id project_id].include? s }
-
-      params.each do |p|
-        orm_request = orm_request.where(p[0] => p[1]) if clean_list.include? p[0]
+      nested_resource_fields = extract_nested_resource_fields_from_params
+
+      # Find nested resources filters in request params
+      nested_resource_fields.each do |field, details|
+        nested_param_value = params[field]
+        # Find Id from slug
+        id          = find_related_id_by_slug(details[:type], details[:slug_field], nested_param_value)
+        orm_request = orm_request.where("#{details[:type]}_id" => id)
       end
 
       orm_request
@@ -76,5 +80,21 @@ module Elabs
       end
       orm_request
     end
+
+    def find_related_id_by_slug(type, slug_field, slug_value)
+      "Elabs::#{type.classify}".constantize.select(:id).find_by(slug_field => slug_value).id
+    end
+
+    def extract_nested_resource_fields_from_params
+      slug_parameters = {}
+      self.class::ALLOWED_NESTED_FROM.each do |n|
+        model      = "Elabs::#{n.classify}".constantize
+        slug_field = model.const_defined?(:SLUG_FIELD) ? model::SLUG_FIELD : :id
+        slug_parameters["#{n}_#{slug_field}"] = { type: n, slug_field: slug_field }
+      end
+      # Remove HABTM possible nesting as they are handled in another place
+      # and slug fields that are not present in params
+      slug_parameters.reject { |field| %w[tag_slug project_slug].include?(field) || !params.include?(field) }
+    end
   end
 end

data/app/controllers/elabs/languages_controller.rb

@@ -30,7 +30,7 @@ module Elabs
 
     # Use callbacks to share common setup or constraints between actions.
     def set_language
-      @language = Language.find(params[:id])
+      @language = Language.find_by_iso639_1(params[:iso639_1])
     end
   end
 end

data/app/controllers/elabs/licenses_controller.rb

@@ -25,7 +25,7 @@ module Elabs
 
     # Use callbacks to share common setup or constraints between actions.
     def set_license
-      @license = License.find(params[:id])
+      @license = License.find_by_slug(params[:slug])
     end
   end
 end

data/app/controllers/elabs/member/albums_controller.rb

@@ -1,7 +1,7 @@
 module Elabs
   module Member
     class AlbumsController < MemberContentApplicationController
-      ALLOWED_FIELDS    = %i[name description sfw published hidden_in_history language_id license_id tags_list].freeze
+      ALLOWED_FIELDS    = %i[name description sfw published hidden_in_history language_id license_id tags_list minor_update update_description].freeze
       ALLOWED_RELATIONS = { project_ids: [], upload_ids: [] }.freeze
       MODEL             = Album
       PLURAL_NAME       = 'albums'.freeze

data/app/controllers/elabs/member/articles_controller.rb

@@ -1,7 +1,7 @@
 module Elabs
   module Member
     class ArticlesController < MemberContentApplicationController
-      ALLOWED_FIELDS    = %i[title excerpt content sfw published published_at hidden_in_history license_id language_id tags_list].freeze
+      ALLOWED_FIELDS    = %i[title excerpt content sfw published published_at hidden_in_history license_id language_id tags_list minor_update update_description].freeze
       ALLOWED_RELATIONS = { project_ids: [] }.freeze
       MODEL             = Article
       PLURAL_NAME       = 'articles'.freeze

data/app/controllers/elabs/member/markdown_previewer_controller.rb

@@ -0,0 +1,11 @@
+module Elabs
+  module Member
+    class MarkdownPreviewerController < ElabsApplicationController
+      self.allow_forgery_protection = false
+
+      def preview
+        render locals: { text: params['text'] }
+      end
+    end
+  end
+end

data/app/controllers/elabs/member/member_content_application_controller.rb

@@ -97,8 +97,8 @@ module Elabs
 
       # Use callbacks to share common setup or constraints between actions.
       def set_entity
-        id      = params[:id] || params["#{self.class::SINGULAR_NAME}_id"]
-        @entity = self.class::MODEL.by_member(current_user.id).find(id)
+        slug = params[:slug] || params["#{self.class::SINGULAR_NAME}_slug"]
+        @entity = self.class::MODEL.by_member(current_user.id).find_by_slug(slug)
         create_instance_variable self.class::SINGULAR_NAME
       end
 

data/app/controllers/elabs/member/notes_controller.rb

@@ -1,7 +1,7 @@
 module Elabs
   module Member
     class NotesController < MemberContentApplicationController
-      ALLOWED_FIELDS    = %i[content sfw hidden_in_history published license_id language_id tags_list].freeze
+      ALLOWED_FIELDS    = %i[content sfw hidden_in_history published license_id language_id tags_list minor_update update_description].freeze
       ALLOWED_RELATIONS = { project_ids: [] }.freeze
       MODEL             = Note
       PLURAL_NAME       = 'notes'.freeze

data/app/controllers/elabs/member/projects_controller.rb

@@ -1,7 +1,7 @@
 module Elabs
   module Member
     class ProjectsController < MemberContentApplicationController
-      ALLOWED_FIELDS    = %i[name short_description description main_url sfw published hidden_in_history license_id language_id tags_list].freeze
+      ALLOWED_FIELDS    = %i[name short_description description main_url sources_url docs_url sfw published hidden_in_history license_id language_id tags_list minor_update update_description].freeze
       ALLOWED_RELATIONS = {}.freeze
       MODEL             = Project
       PLURAL_NAME       = 'projects'.freeze

data/app/controllers/elabs/member/uploads_controller.rb

@@ -1,7 +1,7 @@
 module Elabs
   module Member
     class UploadsController < MemberContentApplicationController
-      ALLOWED_FIELDS    = %i[title description sfw published hidden_in_history language_id license_id file tags_list].freeze
+      ALLOWED_FIELDS    = %i[title description sfw published hidden_in_history language_id license_id file tags_list minor_update update_description].freeze
       ALLOWED_RELATIONS = { album_ids: [], project_ids: [] }.freeze
       MODEL             = Upload
       PLURAL_NAME       = 'uploads'.freeze

data/app/controllers/elabs/notes_controller.rb

@@ -19,7 +19,7 @@ module Elabs
 
     # Use callbacks to share common setup or constraints between actions.
     def set_note
-      @note = Note.find_publicly_visible(params[:id])
+      @note = Note.find_publicly_visible(params[:slug])
     end
   end
 end

data/app/controllers/elabs/projects_controller.rb

@@ -24,7 +24,7 @@ module Elabs
 
     # Use callbacks to share common setup or constraints between actions.
     def set_project
-      @project = Project.find_publicly_visible(params[:id])
+      @project = Project.find_publicly_visible(params[:slug])
     end
   end
 end

data/app/controllers/elabs/tags_controller.rb

@@ -25,12 +25,7 @@ module Elabs
 
     # Use callbacks to share common setup or constraints between actions.
     def set_tag
-      @tag = Tag.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def tag_params
-      params.require(:tag).permit(:name)
+      @tag = Tag.find_by_slug(params[:slug])
     end
   end
 end

data/app/controllers/elabs/uploads_controller.rb

@@ -18,7 +18,7 @@ module Elabs
 
     # Use callbacks to share common setup or constraints between actions.
     def set_upload
-      @upload = Upload.find_publicly_visible(params[:id])
+      @upload = Upload.find_publicly_visible(params[:slug])
     end
   end
 end

data/app/controllers/elabs/users_controller.rb

@@ -25,7 +25,7 @@ module Elabs
 
     # Use callbacks to share common setup or constraints between actions.
     def set_user
-      @user = User.find(params[:id])
+      @user = User.find_by_username(params[:username])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.