From a43f6714de81e1a625eab9441f58553a333ef96b Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 14:20:27 +0800 Subject: [PATCH 01/13] add: project explore api --- .../project_categories_controller.rb | 4 +++ app/controllers/projects_controller.rb | 10 ++++-- app/models/project.rb | 5 ++- app/models/project_category.rb | 6 ++++ app/queries/projects/list_query.rb | 3 +- .../pinned_index.json.jbuilder | 1 + .../projects/banner_recommend.json.jbuilder | 35 +++++++++++++++++++ app/views/projects/index.json.jbuilder | 2 +- config/routes.rb | 2 ++ ..._some_columns_to_project_detail_feature.rb | 7 ++++ 10 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 app/views/project_categories/pinned_index.json.jbuilder create mode 100644 app/views/projects/banner_recommend.json.jbuilder create mode 100644 db/migrate/20211027032626_add_some_columns_to_project_detail_feature.rb diff --git a/app/controllers/project_categories_controller.rb b/app/controllers/project_categories_controller.rb index 106ff7f22..67a040fef 100644 --- a/app/controllers/project_categories_controller.rb +++ b/app/controllers/project_categories_controller.rb @@ -5,6 +5,10 @@ class ProjectCategoriesController < ApplicationController @project_categories = q.result(distinct: true) end + def pinned_index + @project_categories = ProjectCategory.where.not(pinned_index: 0).order(pinned_index: :desc) + end + def group_list @project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc) # projects = Project.no_anomory_projects.visible diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4f48e53dc..fc0bc41e1 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -6,7 +6,7 @@ class ProjectsController < ApplicationController before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend about menu_list] before_action :require_profile_completed, only: [:create, :migrate] - before_action :load_repository, except: %i[index group_type_list migrate create recommend] + before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_recommend] before_action :authorizate_user_can_edit_project!, only: %i[update] before_action :project_public?, only: %i[fork_users praise_users watch_users] @@ -30,8 +30,8 @@ class ProjectsController < ApplicationController def index scope = current_user.logged? ? Projects::ListQuery.call(params, current_user.id) : Projects::ListQuery.call(params) - # @projects = kaminari_paginate(scope) - @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units) + @projects = kaminari_paginate(scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)) + # @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units) category_id = params[:category_id] @total_count = @@ -199,6 +199,10 @@ class ProjectsController < ApplicationController @projects = Project.recommend.includes(:repository, :project_category, :owner).order(visits: :desc) end + def banner_recommend + @projects = Project.recommend.where.not(recommend_index: 0).includes(:project_category, :owner, :project_language).order(recommend_index: :desc) + end + def about @project_detail = @project.project_detail @attachments = Array(@project_detail&.attachments) if request.get? diff --git a/app/models/project.rb b/app/models/project.rb index 03cad7ca7..d36c13efc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -55,8 +55,9 @@ # platform :integer default("0") # default_branch :string(255) default("master") # website :string(255) -# order_index :integer default("0") # lesson_url :string(255) +# is_pinned :boolean default("0") +# recommend_index :integer default("0") # # Indexes # @@ -79,6 +80,7 @@ + class Project < ApplicationRecord include Matchable include Publicable @@ -134,6 +136,7 @@ class Project < ApplicationRecord scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)} scope :recommend, -> { visible.project_statics_select.where(recommend: true) } + scope :pinned, -> {where(is_pinned: true)} delegate :content, to: :project_detail, allow_nil: true delegate :name, to: :license, prefix: true, allow_nil: true diff --git a/app/models/project_category.rb b/app/models/project_category.rb index 67b802998..df8962e00 100644 --- a/app/models/project_category.rb +++ b/app/models/project_category.rb @@ -8,6 +8,12 @@ # projects_count :integer default("0") # created_at :datetime not null # updated_at :datetime not null +# ancestry :string(255) +# pinned_index :integer default("0") +# +# Indexes +# +# index_project_categories_on_ancestry (ancestry) # class ProjectCategory < ApplicationRecord diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 4658408d2..4f514b610 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -11,7 +11,8 @@ class Projects::ListQuery < ApplicationQuery end def call - q = Project.visible.by_name_or_identifier(params[:search]) + q = params[:pinned].present? ? Project.pinned : Project + q = q.visible.by_name_or_identifier(params[:search]) scope = q .with_project_type(params[:project_type]) diff --git a/app/views/project_categories/pinned_index.json.jbuilder b/app/views/project_categories/pinned_index.json.jbuilder new file mode 100644 index 000000000..c2f2e024c --- /dev/null +++ b/app/views/project_categories/pinned_index.json.jbuilder @@ -0,0 +1 @@ +json.project_categories @project_categories, :id, :name diff --git a/app/views/projects/banner_recommend.json.jbuilder b/app/views/projects/banner_recommend.json.jbuilder new file mode 100644 index 000000000..ca672373a --- /dev/null +++ b/app/views/projects/banner_recommend.json.jbuilder @@ -0,0 +1,35 @@ +json.partial! "commons/success" +json.projects do + json.array! @projects do |project| + owner = project.owner + json.id project.id + json.identifier project.identifier + json.name project.name + json.visits project.visits + json.author do + json.name owner.try(:show_real_name) + json.type owner.type + json.login owner.login + json.image_url url_to_avatar(owner) + end + + json.category do + if project.project_category.blank? + json.nil! + else + json.id project.project_category.id + json.name project.project_category.name + end + end + + json.language do + if project.project_language.blank? + json.nil! + else + json.id project.project_language.id + json.name project.project_language.name + end + end + end +end + diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index 96ab89c00..874f60974 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -1,4 +1,4 @@ -json.total_count @total_count +json.total_count @projects.total_count json.projects @projects do |project| # json.partial! "/projects/project_detail", project: project json.id project.id diff --git a/config/routes.rb b/config/routes.rb index 7f78cc8dd..c4afbe4c3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -159,6 +159,7 @@ Rails.application.routes.draw do resources :project_categories, only: [:index, :show] do get :group_list, on: :collection + get :pinned_index, on: :collection end resources :project_languages, only: [:index, :show] resources :ignores, only: [:index, :show] @@ -184,6 +185,7 @@ Rails.application.routes.draw do post :migrate get :group_type_list get :recommend + get :banner_recommend end end diff --git a/db/migrate/20211027032626_add_some_columns_to_project_detail_feature.rb b/db/migrate/20211027032626_add_some_columns_to_project_detail_feature.rb new file mode 100644 index 000000000..4a4aef328 --- /dev/null +++ b/db/migrate/20211027032626_add_some_columns_to_project_detail_feature.rb @@ -0,0 +1,7 @@ +class AddSomeColumnsToProjectDetailFeature < ActiveRecord::Migration[5.2] + def change + add_column :project_categories, :pinned_index, :integer, default: 0 + add_column :projects, :is_pinned, :boolean, default: false + add_column :projects, :recommend_index, :integer, default: 0 + end +end From 0970a402c8743e645c4f906955bc786051606804 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 14:38:30 +0800 Subject: [PATCH 02/13] fix --- app/models/project_category.rb | 3 +++ app/views/project_categories/pinned_index.json.jbuilder | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/project_category.rb b/app/models/project_category.rb index df8962e00..a8362af69 100644 --- a/app/models/project_category.rb +++ b/app/models/project_category.rb @@ -20,4 +20,7 @@ class ProjectCategory < ApplicationRecord include Projectable has_ancestry + def logo_url + "" + end end diff --git a/app/views/project_categories/pinned_index.json.jbuilder b/app/views/project_categories/pinned_index.json.jbuilder index c2f2e024c..db3997ebd 100644 --- a/app/views/project_categories/pinned_index.json.jbuilder +++ b/app/views/project_categories/pinned_index.json.jbuilder @@ -1 +1 @@ -json.project_categories @project_categories, :id, :name +json.project_categories @project_categories, :id, :name, :logo_url From 91852d7957dd22f5c56f16000f4b8bda9adc6470 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 16:50:18 +0800 Subject: [PATCH 03/13] add: project explore management --- .../javascripts/admins/projects/index.js | 137 ++++++++++++++++++ .../admins/project_categories_controller.rb | 6 +- app/controllers/admins/projects_controller.rb | 30 ++++ app/models/project.rb | 12 +- .../project_categories/_form_modal.html.erb | 13 +- .../admins/project_categories/_list.html.erb | 2 + app/views/admins/projects/edit.js.erb | 2 + app/views/admins/projects/index.html.erb | 5 +- .../projects/shared/_form_modal.html.erb | 26 ++++ .../admins/projects/shared/_list.html.erb | 17 ++- config/routes.rb | 2 +- 11 files changed, 242 insertions(+), 10 deletions(-) create mode 100644 app/assets/javascripts/admins/projects/index.js create mode 100644 app/views/admins/projects/edit.js.erb create mode 100644 app/views/admins/projects/shared/_form_modal.html.erb diff --git a/app/assets/javascripts/admins/projects/index.js b/app/assets/javascripts/admins/projects/index.js new file mode 100644 index 000000000..55da8e455 --- /dev/null +++ b/app/assets/javascripts/admins/projects/index.js @@ -0,0 +1,137 @@ +/* + * @Description: Do not edit + * @Date: 2021-08-31 11:16:45 + * @LastEditors: viletyy + * @Author: viletyy + * @LastEditTime: 2021-08-31 14:19:46 + * @FilePath: /forgeplus/app/assets/javascripts/admins/system_notifications/index.js + */ +$(document).on('turbolinks:load', function(){ + + var showSuccessNotify = function() { + $.notify({ + message: '操作成功' + },{ + type: 'success' + }); + } + + // close user + $('.project-list-container').on('click', '.recommend-action', function(){ + var $closeAction = $(this); + var $uncloseAction = $closeAction.siblings('.unrecommend-action'); + + var keywordID = $closeAction.data('id'); + customConfirm({ + content: '确认将该项目设置为推荐项目吗?', + ok: function(){ + $.ajax({ + url: '/admins/projects/' + keywordID, + method: 'PUT', + dataType: 'json', + data: { + project: { + recommend: true, + recommend_index: 1 + } + }, + success: function() { + showSuccessNotify(); + $closeAction.hide(); + $uncloseAction.show(); + $(".project-item-"+keywordID).children('td').eq(5).text("√") + } + }); + } + }); + }); + + // unclose user + $('.project-list-container').on('click', '.unrecommend-action', function(){ + var $uncloseAction = $(this); + var $closeAction = $uncloseAction.siblings('.recommend-action'); + + var keywordID = $uncloseAction.data('id'); + customConfirm({ + content: '确认取消该推荐项目吗？', + ok: function () { + $.ajax({ + url: '/admins/projects/' + keywordID, + method: 'PUT', + dataType: 'json', + data: { + project: { + recommend: false, + recommend: 1 + } + }, + success: function() { + showSuccessNotify(); + $closeAction.show(); + $uncloseAction.hide(); + $(".project-item-"+keywordID).children('td').eq(5).text("") + } + }); + } + }) + }); + + + // close user + $('.project-list-container').on('click', '.pinned-action', function(){ + var $closeAction = $(this); + var $uncloseAction = $closeAction.siblings('.unpinned-action'); + + var keywordID = $closeAction.data('id'); + customConfirm({ + content: '确认将该项目设置为精选项目吗?', + ok: function(){ + $.ajax({ + url: '/admins/projects/' + keywordID, + method: 'PUT', + dataType: 'json', + data: { + project: { + is_pinned: true, + } + }, + success: function() { + showSuccessNotify(); + $closeAction.hide(); + $uncloseAction.show(); + $(".project-item-"+keywordID).children('td').eq(4).text("√") + } + }); + } + }); + }); + + // unclose user + $('.project-list-container').on('click', '.unpinned-action', function(){ + var $uncloseAction = $(this); + var $closeAction = $uncloseAction.siblings('.pinned-action'); + + var keywordID = $uncloseAction.data('id'); + customConfirm({ + content: '确认取消该精选项目吗？', + ok: function () { + $.ajax({ + url: '/admins/projects/' + keywordID, + method: 'PUT', + dataType: 'json', + data: { + project: { + is_pinned: false, + } + }, + success: function() { + showSuccessNotify(); + $closeAction.show(); + $uncloseAction.hide(); + $(".project-item-"+keywordID).children('td').eq(4).text("") + } + }); + } + }) + }); +}) \ No newline at end of file diff --git a/app/controllers/admins/project_categories_controller.rb b/app/controllers/admins/project_categories_controller.rb index ba83e841d..282faf771 100644 --- a/app/controllers/admins/project_categories_controller.rb +++ b/app/controllers/admins/project_categories_controller.rb @@ -22,7 +22,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController max_position_items = ProjectCategory.select(:id, :position).pluck(:position).reject!(&:blank?) max_position = max_position_items.present? ? max_position_items.max.to_i : 0 - @project_category = ProjectCategory.new(name: @name,position: max_position) + @project_category = ProjectCategory.new(name: @name,position: max_position, pinned_index: params[:project_category][:pinned_index].to_i) if @project_category.save redirect_to admins_project_categories_path flash[:success] = '创建成功' @@ -33,7 +33,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController end def update - if @project_category.update_attribute(:name, @name) + if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i}) redirect_to admins_project_categories_path flash[:success] = '更新成功' else @@ -43,7 +43,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController end def destroy - if @project_language.destroy + if @project_category.destroy redirect_to admins_project_categories_path flash[:success] = "删除成功" else diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb index 9e06eb1c9..4175f7250 100644 --- a/app/controllers/admins/projects_controller.rb +++ b/app/controllers/admins/projects_controller.rb @@ -1,4 +1,5 @@ class Admins::ProjectsController < Admins::BaseController + before_action :find_project, only: [:edit, :update] def index sort_by = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_on' @@ -8,6 +9,26 @@ class Admins::ProjectsController < Admins::BaseController @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score) end + def edit ;end + + def update + respond_to do |format| + if @project.update_attributes(project_update_params) + format.html do + redirect_to admins_projects_path + flash[:sucess] = "更新成功" + end + format.js {render_ok} + else + format.html do + redirect_to admins_projects_path + flash[:danger] = "更新失败" + end + format.js {render_js_error} + end + end + end + def destroy project = Project.find_by!(id: params[:id]) ActiveRecord::Base.transaction do @@ -21,4 +42,13 @@ class Admins::ProjectsController < Admins::BaseController redirect_to admins_projects_path flash[:danger] = "删除失败" end + + private + def find_project + @project = Project.find_by_id(params[:id]) + end + + def project_update_params + params.require(:project).permit(:is_pinned, :recommend, :recommend_index) + end end \ No newline at end of file diff --git a/app/models/project.rb b/app/models/project.rb index d36c13efc..aa2e152cf 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -130,7 +130,7 @@ class Project < ApplicationRecord has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id after_create :init_project_common, :incre_user_statistic, :incre_platform_statistic after_save :check_project_members, :reset_cache_data - before_save :set_invite_code, :reset_unmember_followed + before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned before_destroy :decre_project_common after_destroy :decre_user_statistic, :decre_platform_statistic scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} @@ -214,6 +214,16 @@ class Project < ApplicationRecord end end + def set_recommend_and_is_pinned + self.recommend = self.recommend_index.zero? ? false : true + # 私有项目不允许设置精选和推荐 + unless self.is_public + self.recommend = false + self.recommend_index = 0 + self.is_pinned = false + end + end + def self.search_project(search) ransack(name_or_identifier_cont: search) end diff --git a/app/views/admins/project_categories/_form_modal.html.erb b/app/views/admins/project_categories/_form_modal.html.erb index fd20936b6..84e43416a 100644 --- a/app/views/admins/project_categories/_form_modal.html.erb +++ b/app/views/admins/project_categories/_form_modal.html.erb @@ -9,7 +9,18 @@ <%= form_for @project_category, url: {controller: "project_categories", action: "#{type}"} do |p| %>
- <%= p.text_field :name,class: "form-control input-lg",placeholder: "分类名称",required: true, maxlength: 64%> +
+ + <%= p.text_field :name,class: "form-control input-lg",placeholder: "分类名称",required: true, maxlength: 64%> +
+
+ + <%= p.number_field :pinned_index,class: "form-control input-lg",placeholder: "精选级别",required: true%> +
diff --git a/app/views/admins/project_categories/_list.html.erb b/app/views/admins/project_categories/_list.html.erb index 1d3316817..b8b55afa4 100644 --- a/app/views/admins/project_categories/_list.html.erb +++ b/app/views/admins/project_categories/_list.html.erb @@ -3,6 +3,7 @@ 序号 名称 + <%= sort_tag('精选', name: 'pinned_index', path: admins_project_categories_path) %> <%= sort_tag('项目数', name: 'projects_count', path: admins_project_categories_path) %> <%= sort_tag('创建时间', name: 'created_at', path: admins_project_categories_path) %> 操作 @@ -16,6 +17,7 @@ <%= link_to(project_category.name, "/projects?category_id=#{project_category.id}", target: '_blank') %> + <%= project_category.pinned_index == 0 ? "" : "√" %> <%= project_category.projects_count %> <%= project_category.created_at&.strftime('%Y-%m-%d %H:%M') %> diff --git a/app/views/admins/projects/edit.js.erb b/app/views/admins/projects/edit.js.erb new file mode 100644 index 000000000..9bb97d4b2 --- /dev/null +++ b/app/views/admins/projects/edit.js.erb @@ -0,0 +1,2 @@ +$("#projects-modals").html("<%= j render(partial: 'admins/projects/shared/form_modal', locals: {type: 'update'}) %>") +$(".project-change-modal").modal('show'); \ No newline at end of file diff --git a/app/views/admins/projects/index.html.erb b/app/views/admins/projects/index.html.erb index c2cdd3946..af93598c9 100644 --- a/app/views/admins/projects/index.html.erb +++ b/app/views/admins/projects/index.html.erb @@ -12,4 +12,7 @@
<%= render partial: 'admins/projects/shared/list', locals: { projects: @projects } %> -
\ No newline at end of file +
+ +
+
diff --git a/app/views/admins/projects/shared/_form_modal.html.erb b/app/views/admins/projects/shared/_form_modal.html.erb new file mode 100644 index 000000000..359d3bdd3 --- /dev/null +++ b/app/views/admins/projects/shared/_form_modal.html.erb @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb index fe8d96e9d..90ce5c4ad 100644 --- a/app/views/admins/projects/shared/_list.html.erb +++ b/app/views/admins/projects/shared/_list.html.erb @@ -5,6 +5,8 @@ ID 项目名称 公开 + 精选 + 推荐 issue 资源 版本库 @@ -12,8 +14,8 @@ 里程碑 成员 管理员 - <%= sort_tag('创建时间', name: 'created_on', path: admins_projects_path) %> - 操作 + <%= sort_tag('创建时间', name: 'created_on', path: admins_projects_path) %> + 操作 @@ -26,6 +28,8 @@ <%= link_to(project.name, "/projects/#{project&.owner&.login}/#{project.identifier}", target: '_blank') %> <%= project.is_public ? '√' : '' %> + <%= project.is_pinned ? '√' : '' %> + <%= project.recommend ? '√' : '' %> <%= project.issues.size %> <%= project.attachments.size %> <%= project&.project_score.try(:changeset_num).to_i %> @@ -37,8 +41,15 @@ <%= project.created_on&.strftime('%Y-%m-%d %H:%M') %> + <% if project.is_public %> + <%= javascript_void_link '精选', class: 'action pinned-action', data: { id: project.id }, style: project.is_pinned ? 'display: none;' : '' %> + <%= javascript_void_link '取消精选', class: 'action unpinned-action', data: { id: project.id }, style: project.is_pinned ? '' : 'display: none;' %> + <%= javascript_void_link '推荐', class: 'action recommend-action', data: { id: project.id }, style: project.recommend ? 'display: none;' : '' %> + <%= javascript_void_link '取消推荐', class: 'action unrecommend-action', data: { id: project.id }, style: project.recommend ? '' : 'display: none;' %> + <%= link_to "设置推荐等级", edit_admins_project_path(project.id), remote: true, class: "action", style: project.recommend ? '' : 'display: none;' %> + <% end %> <%= link_to "删除", admins_project_path(project.id), method: :delete, data:{confirm: "确认删除的吗？"}, class: "delete-project-action" %> - + <% end %> <% else %> diff --git a/config/routes.rb b/config/routes.rb index c4afbe4c3..5d40ca42c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -909,7 +909,7 @@ Rails.application.routes.draw do resources :courses, only: [:index, :destroy, :update] - resources :projects, only: [:index, :destroy] + resources :projects, only: [:index, :edit, :update, :destroy] resources :disciplines, only: [:index, :create, :edit, :update, :destroy] do post :adjust_position, on: :member From f0580720e3908f266e7a34f275ffd5ba527a647a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 16:58:31 +0800 Subject: [PATCH 04/13] fix --- app/assets/javascripts/admins/projects/index.js | 2 ++ app/views/admins/projects/shared/_list.html.erb | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admins/projects/index.js b/app/assets/javascripts/admins/projects/index.js index 55da8e455..19374ab47 100644 --- a/app/assets/javascripts/admins/projects/index.js +++ b/app/assets/javascripts/admins/projects/index.js @@ -20,6 +20,7 @@ $(document).on('turbolinks:load', function(){ $('.project-list-container').on('click', '.recommend-action', function(){ var $closeAction = $(this); var $uncloseAction = $closeAction.siblings('.unrecommend-action'); + var $editAction = $closeAction.siblings('.edit-recommend-action'); var keywordID = $closeAction.data('id'); customConfirm({ @@ -39,6 +40,7 @@ $(document).on('turbolinks:load', function(){ showSuccessNotify(); $closeAction.hide(); $uncloseAction.show(); + $editAction.show(); $(".project-item-"+keywordID).children('td').eq(5).text("√") } }); diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb index 90ce5c4ad..96b85a989 100644 --- a/app/views/admins/projects/shared/_list.html.erb +++ b/app/views/admins/projects/shared/_list.html.erb @@ -1,9 +1,9 @@ - - - + + + @@ -46,7 +46,7 @@ <%= javascript_void_link '取消精选', class: 'action unpinned-action', data: { id: project.id }, style: project.is_pinned ? '' : 'display: none;' %> <%= javascript_void_link '推荐', class: 'action recommend-action', data: { id: project.id }, style: project.recommend ? 'display: none;' : '' %> <%= javascript_void_link '取消推荐', class: 'action unrecommend-action', data: { id: project.id }, style: project.recommend ? '' : 'display: none;' %> - <%= link_to "设置推荐等级", edit_admins_project_path(project.id), remote: true, class: "action", style: project.recommend ? '' : 'display: none;' %> + <%= link_to "设置推荐等级", edit_admins_project_path(project.id), remote: true, class: "action edit-recommend-action", style: project.recommend ? '' : 'display: none;' %> <% end %> <%= link_to "删除", admins_project_path(project.id), method: :delete, data:{confirm: "确认删除的吗？"}, class: "delete-project-action" %> From cc0e01cc471c5a5790d17434c647f1f8cb4ef0e8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 17:06:35 +0800 Subject: [PATCH 05/13] fix --- app/views/projects/banner_recommend.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/projects/banner_recommend.json.jbuilder b/app/views/projects/banner_recommend.json.jbuilder index ca672373a..fe9861f85 100644 --- a/app/views/projects/banner_recommend.json.jbuilder +++ b/app/views/projects/banner_recommend.json.jbuilder @@ -5,6 +5,7 @@ json.projects do json.id project.id json.identifier project.identifier json.name project.name + json.description project.description json.visits project.visits json.author do json.name owner.try(:show_real_name) From 274e5090ceee56b13f0a4a740c2ec8c39146bd7a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 17:07:48 +0800 Subject: [PATCH 06/13] fix --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index aa2e152cf..e8760acf1 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -133,7 +133,7 @@ class Project < ApplicationRecord before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned before_destroy :decre_project_common after_destroy :decre_user_statistic, :decre_platform_statistic - scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} + scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :user_id, :forked_count, :description, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)} scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)} scope :recommend, -> { visible.project_statics_select.where(recommend: true) } scope :pinned, -> {where(is_pinned: true)} From 43dc966cf99580796dda532c4db9750d8201f032 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Oct 2021 18:02:21 +0800 Subject: [PATCH 07/13] add: project category upload logo --- app/assets/javascripts/admin.js | 35 +++++ app/assets/stylesheets/admin.scss | 146 ++++++++++++++++++ .../admins/project_categories_controller.rb | 10 +- app/models/project_category.rb | 10 +- .../project_categories/_form_modal.html.erb | 19 ++- .../admins/project_categories/edit.js.erb | 19 ++- .../projects/shared/_form_modal.html.erb | 2 +- 7 files changed, 234 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 0cab04359..d738e5caa 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -99,3 +99,38 @@ $(document).on("turbolinks:before-cache", function () { $(function () { }); + +$(document).on('turbolinks:load', function() { + + $('.logo-item-left').on("change", 'input[type="file"]', function () { + var $fileInput = $(this); + var file = this.files[0]; + var imageType = /image.*/; + if (file && file.type.match(imageType)) { + var reader = new FileReader(); + reader.onload = function () { + var $box = $fileInput.parent(); + $box.find('img').attr('src', reader.result).css('display', 'block'); + $box.addClass('has-img'); + }; + reader.readAsDataURL(file); + } else { + } + }); + + $('.attachment-item-left').on("change", 'input[type="file"]', function () { + var $fileInput = $(this); + var file = this.files[0]; + var imageType = /image.*/; + if (file && file.type.match(imageType)) { + var reader = new FileReader(); + reader.onload = function () { + var $box = $fileInput.parent(); + $box.find('img').attr('src', reader.result).css('display', 'block'); + $box.addClass('has-img'); + }; + reader.readAsDataURL(file); + } else { + } + }); +}) \ No newline at end of file diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index a401fc379..03c3970a6 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -58,3 +58,149 @@ input.form-control { position: absolute; } +.logo-item { + display: flex; + + &-img { + display: block; + width: 80px; + height: 80px; + background: #e9ecef; + } + + &-upload { + cursor: pointer; + position: absolute; + top: 0; + width: 80px; + height: 80px; + background: #e9ecef; + border: 1px solid #ced4da; + + &::before { + content: ''; + position: absolute; + top: 27px; + left: 39px; + width: 2px; + height: 26px; + background: #495057; + } + + &::after { + content: ''; + position: absolute; + top: 39px; + left: 27px; + width: 26px; + height: 2px; + background: #495057; + } + } + + &-left { + position: relative; + width: 80px; + height: 80px; + + &.has-img { + .logo-item-upload { + display: none; + } + + &:hover { + .logo-item-upload { + display: block; + background: rgba(145, 145, 145, 0.8); + } + } + } + } + + &-right { + display: flex; + flex-direction: column; + justify-content: space-between; + color: #777777; + font-size: 0.8rem; + } + + &-title { + color: #23272B; + font-size: 1rem; + } +} + +.attachment-item { + display: flex; + + &-img { + display: block; + width: 160px; + height: 160px; + background: #e9ecef; + } + + &-upload { + cursor: pointer; + position: absolute; + top: 0; + width: 160px; + height: 160px; + background: #e9ecef; + border: 1px solid #ced4da; + + &::before { + content: ''; + position: absolute; + top: 54px; + left: 78px; + width: 2px; + height: 52px; + background: #495057; + } + + &::after { + content: ''; + position: absolute; + top: 78px; + left: 54px; + width: 52px; + height: 2px; + background: #495057; + } + } + + &-left { + position: relative; + width: 160px; + height: 160px; + + &.has-img { + .attachment-item-upload { + display: none; + } + + &:hover { + .attachment-item-upload { + display: block; + background: rgba(145, 145, 145, 0.8); + } + } + } + } + + &-right { + padding-top: 100px; + display: flex; + flex-direction: column; + justify-content: space-between; + color: #777777; + font-size: 0.8rem; + } + + &-title { + color: #23272B; + font-size: 1rem; + } +} \ No newline at end of file diff --git a/app/controllers/admins/project_categories_controller.rb b/app/controllers/admins/project_categories_controller.rb index 282faf771..8b1dd1f77 100644 --- a/app/controllers/admins/project_categories_controller.rb +++ b/app/controllers/admins/project_categories_controller.rb @@ -33,7 +33,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController end def update - if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i}) + if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i}) && save_image_file(params[:logo], 'logo') redirect_to admins_project_categories_path flash[:success] = '更新成功' else @@ -80,4 +80,12 @@ class Admins::ProjectCategoriesController < Admins::BaseController flash[:danger] = '分类已存在' end end + + def save_image_file(file, type) + return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile) + + file_path = Util::FileManage.source_disk_filename(@project_category, type) + File.delete(file_path) if File.exist?(file_path) # 删除之前的文件 + Util.write_file(file, file_path) + end end \ No newline at end of file diff --git a/app/models/project_category.rb b/app/models/project_category.rb index a8362af69..4bba5423e 100644 --- a/app/models/project_category.rb +++ b/app/models/project_category.rb @@ -21,6 +21,14 @@ class ProjectCategory < ApplicationRecord has_ancestry def logo_url - "" + image_url('logo') end + + private + + def image_url(type) + return nil unless Util::FileManage.exists?(self, type) + Util::FileManage.source_disk_file_url(self, type) + end + end diff --git a/app/views/admins/project_categories/_form_modal.html.erb b/app/views/admins/project_categories/_form_modal.html.erb index 84e43416a..f638b4d0e 100644 --- a/app/views/admins/project_categories/_form_modal.html.erb +++ b/app/views/admins/project_categories/_form_modal.html.erb @@ -7,7 +7,7 @@ - <%= form_for @project_category, url: {controller: "project_categories", action: "#{type}"} do |p| %> + <%= form_for @project_category, url: {controller: "project_categories", action: "#{type}"}, html: { enctype: 'multipart/form-data' } do |p| %>
- <%= p.number_field :pinned_index,class: "form-control input-lg",placeholder: "精选级别",required: true%> + <%= p.number_field :pinned_index,class: "form-control input-lg",placeholder: "精选等级",required: true%> +
+
+ <% logo_img = @project_category.logo_url %> +
+ + <%= file_field_tag(:logo, accept: 'image/png,image/jpg,image/jpeg',style: "display: none", value: params[:logo]) %> + +
+
+
网站导航logo
+
格式：PNG、JPG
+
尺寸：高度38px以内，宽等比例缩放
+
diff --git a/app/views/admins/project_categories/edit.js.erb b/app/views/admins/project_categories/edit.js.erb index a8636cfce..86d1d2ee2 100644 --- a/app/views/admins/project_categories/edit.js.erb +++ b/app/views/admins/project_categories/edit.js.erb @@ -1,2 +1,19 @@ $("#project-category-modals").html("<%= j render(partial: 'admins/project_categories/form_modal', locals: {type: 'update'}) %>") -$(".project-category-change-modal").modal('show'); \ No newline at end of file +$(".project-category-change-modal").modal('show'); + + +$('.logo-item-left').on("change", 'input[type="file"]', function () { + var $fileInput = $(this); + var file = this.files[0]; + var imageType = /image.*/; + if (file && file.type.match(imageType)) { + var reader = new FileReader(); + reader.onload = function () { + var $box = $fileInput.parent(); + $box.find('img').attr('src', reader.result).css('display', 'block'); + $box.addClass('has-img'); + }; + reader.readAsDataURL(file); + } else { + } +}); diff --git a/app/views/admins/projects/shared/_form_modal.html.erb b/app/views/admins/projects/shared/_form_modal.html.erb index 359d3bdd3..b9796756a 100644 --- a/app/views/admins/projects/shared/_form_modal.html.erb +++ b/app/views/admins/projects/shared/_form_modal.html.erb @@ -13,7 +13,7 @@ - <%= p.number_field :recommend_index,class: "form-control input-lg"%> + <%= p.number_field :recommend_index,class: "form-control input-lg",required: true%>
From 9aff90c03a6c64e89db1e73b166b47ec0c2f61ab Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 10:52:44 +0800 Subject: [PATCH 08/13] fix --- app/assets/javascripts/admins/projects/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admins/projects/index.js b/app/assets/javascripts/admins/projects/index.js index 19374ab47..dbf710ea5 100644 --- a/app/assets/javascripts/admins/projects/index.js +++ b/app/assets/javascripts/admins/projects/index.js @@ -52,6 +52,7 @@ $(document).on('turbolinks:load', function(){ $('.project-list-container').on('click', '.unrecommend-action', function(){ var $uncloseAction = $(this); var $closeAction = $uncloseAction.siblings('.recommend-action'); + var $editAction = $closeAction.siblings('.edit-recommend-action'); var keywordID = $uncloseAction.data('id'); customConfirm({ @@ -64,13 +65,14 @@ $(document).on('turbolinks:load', function(){ data: { project: { recommend: false, - recommend: 1 + recommend_index: 0 } }, success: function() { showSuccessNotify(); $closeAction.show(); $uncloseAction.hide(); + $editAction.hide(); $(".project-item-"+keywordID).children('td').eq(5).text("") } }); From 2b6d5e694e96201b312b2a0d41e0de1bd55f9dd7 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 10:56:30 +0800 Subject: [PATCH 09/13] fix --- app/views/admins/project_categories/_form_modal.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/project_categories/_form_modal.html.erb b/app/views/admins/project_categories/_form_modal.html.erb index f638b4d0e..fc58d3345 100644 --- a/app/views/admins/project_categories/_form_modal.html.erb +++ b/app/views/admins/project_categories/_form_modal.html.erb @@ -29,7 +29,7 @@
-
网站导航logo
+
logo
格式：PNG、JPG
尺寸：高度38px以内，宽等比例缩放
From 3f690fd9a01fc67fd9b8f4d7eebeafbf1d0d9b46 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 11:00:32 +0800 Subject: [PATCH 10/13] add: pinned projects size --- app/controllers/admins/project_categories_controller.rb | 2 +- app/views/admins/project_categories/_list.html.erb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/admins/project_categories_controller.rb b/app/controllers/admins/project_categories_controller.rb index 8b1dd1f77..3b5065a16 100644 --- a/app/controllers/admins/project_categories_controller.rb +++ b/app/controllers/admins/project_categories_controller.rb @@ -5,7 +5,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController def index sort_by = ProjectCategory.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at' sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc' - q = ProjectCategory.ransack(name_cont: params[:name]) + q = ProjectCategory.includes(:projects).ransack(name_cont: params[:name]) project_categories = q.result(distinct: true).order("#{sort_by} #{sort_direction}") @project_categories = paginate(project_categories) diff --git a/app/views/admins/project_categories/_list.html.erb b/app/views/admins/project_categories/_list.html.erb index b8b55afa4..1a460a486 100644 --- a/app/views/admins/project_categories/_list.html.erb +++ b/app/views/admins/project_categories/_list.html.erb @@ -5,6 +5,7 @@ + @@ -19,6 +20,7 @@ +
序号ID项目名称序号ID项目名称 公开 精选 推荐名称 <%= sort_tag('精选', name: 'pinned_index', path: admins_project_categories_path) %> <%= sort_tag('项目数', name: 'projects_count', path: admins_project_categories_path) %>精选项目数 <%= sort_tag('创建时间', name: 'created_at', path: admins_project_categories_path) %> 操作
<%= project_category.pinned_index == 0 ? "" : "√" %> <%= project_category.projects_count %><%= project_category.projects.where(is_pinned: true).size %> <%= project_category.created_at&.strftime('%Y-%m-%d %H:%M') %> <%= link_to "编辑", edit_admins_project_category_path(project_category), remote: true, class: "action" %> From 81ab0b01c04b055d7d312e47feb2ab82392ef548 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 14:21:42 +0800 Subject: [PATCH 11/13] fix: banner recommend remove login require --- app/controllers/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index fc0bc41e1..4c4aa3a00 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -4,7 +4,7 @@ class ProjectsController < ApplicationController include ProjectsHelper include Acceleratorable - before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend about menu_list] + before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend banner_recommend about menu_list] before_action :require_profile_completed, only: [:create, :migrate] before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_recommend] before_action :authorizate_user_can_edit_project!, only: %i[update] From 8698829678b72fc6929c6f622b2b958188361726 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 15:28:33 +0800 Subject: [PATCH 12/13] fix: organization recommend api --- .../organizations/organizations_controller.rb | 7 +++++-- app/models/organization.rb | 2 +- app/models/organization_extension.rb | 8 ++++++++ .../organizations/recommend.json.jbuilder | 16 +++++++++++----- ...9_add_recommend_to_organization_extensions.rb | 5 +++++ 5 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20211028065339_add_recommend_to_organization_extensions.rb diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb index f019e8d39..dcec6c050 100644 --- a/app/controllers/organizations/organizations_controller.rb +++ b/app/controllers/organizations/organizations_controller.rb @@ -69,8 +69,7 @@ class Organizations::OrganizationsController < Organizations::BaseController def recommend recommend = %W(xuos Huawei_Technology openatom_foundation pkecosystem TensorLayer) - @organizations = Organization.with_visibility(%w(common)) - .where(login: recommend).select(:id, :login, :firstname, :lastname, :nickname) + @organizations = Organization.includes(:organization_extension).where(organization_extensions: {recommend: true}).to_a.each_slice(group_size).to_a end private @@ -81,6 +80,10 @@ class Organizations::OrganizationsController < Organizations::BaseController :max_repo_creation, :nickname) end + def group_size + params.fetch(:group_size, 4) + end + def password params.fetch(:password, "") end diff --git a/app/models/organization.rb b/app/models/organization.rb index 4fd0886da..a967e4782 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -76,7 +76,7 @@ class Organization < Owner validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false validates :login, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" } - delegate :description, :website, :location, :repo_admin_change_team_access, + delegate :description, :website, :location, :repo_admin_change_team_access, :recommend, :visibility, :max_repo_creation, :num_projects, :num_users, :num_teams, to: :organization_extension, allow_nil: true scope :with_visibility, ->(visibility) { joins(:organization_extension).where(organization_extensions: {visibility: visibility}) if visibility.present? } diff --git a/app/models/organization_extension.rb b/app/models/organization_extension.rb index 8b9946cd7..4b0935208 100644 --- a/app/models/organization_extension.rb +++ b/app/models/organization_extension.rb @@ -15,6 +15,7 @@ # num_projects :integer default("0") # num_users :integer default("0") # num_teams :integer default("0") +# recommend :boolean default("0") # # Indexes # @@ -30,6 +31,8 @@ class OrganizationExtension < ApplicationRecord enum visibility: {common: 0, limited: 1, privacy: 2} + before_save :set_recommend + def self.build(organization_id, description, website, location, repo_admin_change_team_access, visibility, max_repo_creation) self.create!(organization_id: organization_id, description: description, @@ -39,4 +42,9 @@ class OrganizationExtension < ApplicationRecord visibility: visibility, max_repo_creation: max_repo_creation) end + + private + def set_recommend + self.recommend = false unless self.common? + end end diff --git a/app/views/organizations/organizations/recommend.json.jbuilder b/app/views/organizations/organizations/recommend.json.jbuilder index 262cc23dd..340634e02 100644 --- a/app/views/organizations/organizations/recommend.json.jbuilder +++ b/app/views/organizations/organizations/recommend.json.jbuilder @@ -1,6 +1,12 @@ -json.organizations @organizations do |organization| - json.id organization.id - json.name organization.login - json.nickname organization.nickname.blank? ? organization.name : organization.nickname - json.avatar_url url_to_avatar(organization) +json.organizations do + + json.array! @organizations.each do |group| + json.array! group.each do |organization| + json.id organization.id + json.name organization.login + json.nickname organization.real_name + json.avatar_url url_to_avatar(organization) + json.website organization.website + end + end end \ No newline at end of file diff --git a/db/migrate/20211028065339_add_recommend_to_organization_extensions.rb b/db/migrate/20211028065339_add_recommend_to_organization_extensions.rb new file mode 100644 index 000000000..39a8d08b3 --- /dev/null +++ b/db/migrate/20211028065339_add_recommend_to_organization_extensions.rb @@ -0,0 +1,5 @@ +class AddRecommendToOrganizationExtensions < ActiveRecord::Migration[5.2] + def change + add_column :organization_extensions, :recommend, :boolean, default: false + end +end From 11d102f2400ca26004906c4aa79c807ccc953707 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 28 Oct 2021 15:32:49 +0800 Subject: [PATCH 13/13] fix --- app/controllers/organizations/organizations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb index dcec6c050..00a7588b5 100644 --- a/app/controllers/organizations/organizations_controller.rb +++ b/app/controllers/organizations/organizations_controller.rb @@ -81,7 +81,7 @@ class Organizations::OrganizationsController < Organizations::BaseController end def group_size - params.fetch(:group_size, 4) + params.fetch(:group_size, 4).to_i end def password