nippo_core 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8377e6389fa4c8f4a6bf7f2671cf80a46b78c0fb
-  data.tar.gz: 6526438189d1fcd30e4dba596ad7c2ac336e9662
+  metadata.gz: 2bb048e8542f800f97507d2c5159631bcf63920a
+  data.tar.gz: dff7e64c3afa052e464fd48cb2b9933f758b2ba6
 SHA512:
-  metadata.gz: 117027c5f86fd9e34266fd763fe96dc3afb435f1c1e917cc2765a1bec0ccd9eec9180c6f453fff6a0e04f30e836ecdd7724a776b770d32ef085b33e55693f95d
-  data.tar.gz: 00f96001be8c7578d3377a552043b6c219988189672c8fd87686306a3278bc7aff06b695b59fb287f03b11cc3573ca14dc3e8f7b513d5954c8eb2dc14ea39df2
+  metadata.gz: a14ddbf89456e67c8d8837719e965bc7d0e15e893fbc4d921af9a982e5d583d6f200ce3f8e655ba4998f94f6970a83f2962863b1f496cc15e18fa76ae7babc3c
+  data.tar.gz: 3fa1aba815dca42db8a5e6f0bb0d041dd066cf9b6283bf0bc1ae00ccadcf8e5ea910abc5dc08a27be3ad8fdb69ac364482e554a31fa1977a8839a0a0aed1f105

data/app/controllers/nippo_core/application_controller.rb

@@ -5,7 +5,7 @@ module NippoCore
 
   private
     def find_group
-      @group = NippoCore::Group.find(params[:group_id])
+      @group = NippoCore::Group.find(params[:group_id] || params[:id])
     end
   end
 end

data/app/controllers/nippo_core/group_member_relations_controller.rb

@@ -1,6 +1,6 @@
 module NippoCore
   class GroupMemberRelationsController < ApplicationController
-    before_action :find_group
+    before_action :find_group, except: :accept
 
     def new
       @group_member_relations = @group.group_member_relations.new
@@ -10,9 +10,20 @@ module NippoCore
     def create
       redirect_to home_path and return unless @group.member?(current_user)
       user = NippoCore::User.find(params[:group_member_relation][:user_id])
-      @group.add_member(user)
+      current_user.add_member(user, @group)
 
       redirect_to group_path(@group)
     end
+
+    def accept
+      @request = NippoCore::GroupMemberRelation.find(params[:group_member_relation_id])
+      current_user.accept_request(@request)
+
+      render layout: nil
+    end
+
+    def unaccepted
+      @requests = @group.unaccepted_requests.limit(5)
+    end
   end
 end

data/app/controllers/nippo_core/groups/users_controller.rb

@@ -0,0 +1,11 @@
+module NippoCore
+  module Groups
+    class UsersController < ApplicationController
+      before_action :find_group
+
+      def unaccepted
+        @requests = @group.unaccepted_requests.limit(5)
+      end
+    end
+  end
+end

data/app/controllers/nippo_core/groups_controller.rb

@@ -1,6 +1,7 @@
 module NippoCore
   class GroupsController < ApplicationController
     before_action :initialize_group, only: [:new, :create]
+    before_action :find_group, only: [:show, :request_join]
 
     def index
       @groups = NippoCore::Group.order(created_at: :desc).page(params[:page]).per(10)
@@ -10,19 +11,25 @@ module NippoCore
     end
 
     def show
-      @group = NippoCore::Group.find(params[:id])
       @reports = @group.reports.order(reported_at: :desc).limit(5)
+      @requests = @group.unaccepted_requests.limit(5)
+      @members = @group.members
     end
 
     def create
       if @group.save
-        @group.add_member(current_user)
+        current_user.add_member(current_user, @group)
         redirect_to root_path
       else
         render 'new', status: 400
       end
     end
 
+    def request_join
+      result = current_user.send_request(@group)
+      render layout: nil
+    end
+
   private
     def initialize_group
       @group = NippoCore::Group.new(group_params.merge(creator: current_user))

data/app/controllers/nippo_core/users/registrations_controller.rb

@@ -1,5 +1,6 @@
 class NippoCore::Users::RegistrationsController < Devise::RegistrationsController
   before_action :configure_sign_up_params, only: [:create]
+  layout 'nippo_core/application'
   # before_action :configure_account_update_params, only: [:update]
 
   # GET /resource/sign_up

data/app/controllers/nippo_core/users/sessions_controller.rb

@@ -1,4 +1,5 @@
 class NippoCore::Users::SessionsController < Devise::SessionsController
+  layout 'nippo_core/application'
   # before_action :configure_sign_in_params, only: [:create]
 
   # GET /resource/sign_in

data/app/models/nippo_core/group.rb

@@ -2,20 +2,26 @@ module NippoCore
   class Group < ApplicationRecord
     belongs_to :creator, class_name: 'NippoCore::User'
     has_many :reports, dependent: :destroy
-    has_many :members, through: :group_member_relations, source: :user
+    has_many :users, through: :group_member_relations
     has_many :group_member_relations, dependent: :destroy
 
     validates :creator, presence: true
     validates :name, presence: true
 
-    def add_member(user)
-      relation = group_member_relations.find_or_initialize_by(user: user, status: false)
-      relation.status = true
-      relation.save
+    def member?(user)
+      group_member_relations.where.not(accepted_at: nil).exists?(user_id: user.id)
     end
 
-    def member?(user)
-      group_member_relations.exists?(user_id: user.id, status: true)
+    # TODO: implement test
+    def unaccepted_requests
+      group_member_relations.where(accepted_at: nil).includes(:user)
+    end
+
+    # TODO: implement test
+    def members
+      NippoCore::User.joins(:group_member_relations)
+                     .where(nippo_core_group_member_relations: {group_id: self.id})
+                     .where.not(nippo_core_group_member_relations: {accepted_at: nil})
     end
   end
 end

data/app/models/nippo_core/group_member_relation.rb

@@ -2,6 +2,8 @@ module NippoCore
   class GroupMemberRelation < ApplicationRecord
     belongs_to :user
     belongs_to :group
+    # TODO: reflect test to optional
+    belongs_to :accepter, class_name: 'NippoCore::User', optional: true
 
     validates :user, presence: true
     validates :group, presence: true

data/app/models/nippo_core/user.rb

@@ -13,5 +13,29 @@ module NippoCore
     validates :last_name, presence: true
     validates :first_name, presence: true
     validates :nickname, presence: true
+
+    def send_request(group)
+      relation = group_member_relations.find_or_initialize_by(group: group)
+      relation.save
+    end
+
+    # TODO: had better check!
+    def add_member(user, group)
+      relation = group.group_member_relations.find_or_initialize_by(user: user, accepted_at: nil)
+      relation.accepted_at = Time.now
+      relation.accepter = self
+      relation.save
+    end
+
+    def accept_request(request)
+      return unless request.group.member?(self)
+      request.accepted_at = Time.now
+      request.accepter = self
+      request.save
+    end
+
+    def request_to?(group)
+      group_member_relations.exists?(group_id: group.id)
+    end
   end
 end

data/app/views/layouts/nippo_core/application.slim

@@ -3,24 +3,34 @@ html
   head
     title
       | 日報
-    = stylesheet_link_tag    "nippo_core/application", media: "all"
+    / = stylesheet_link_tag    "nippo_core/application", media: "all"
+    link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"
+    link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous"
+    script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"
+    css:
+      body { 
+        padding-top: 70px; 
+      }
     = javascript_include_tag "nippo_core/application"
     = csrf_meta_tags
   body
-    header.header
-      div
-        = t('daily report')
-      nav
-        - if user_signed_in?
-          div
-            = current_user.nickname
-        ul
+    header.navbar.navbar-default.navbar-fixed-top
+      .container
+        .navbar-header
+          .navbar-brand
+            = t('daily report')
+        nav.nav.navbar-nav.navbar-right
           - if user_signed_in?
-            li
-              = link_to t('sign out'), destroy_user_session_path, method: :delete
-          - else
-            li
-              = link_to t('sign in'), new_user_session_path
-            li
-              = link_to t('sign up'), new_user_registration_path
-    = yield
+            .navbar-text
+              = current_user.nickname
+          ul.nav.navbar-nav
+            - if user_signed_in?
+              li
+                = link_to t('sign out'), destroy_user_session_path, method: :delete
+            - else
+              li
+                = link_to t('sign in'), new_user_session_path
+              li
+                = link_to t('sign up'), new_user_registration_path
+    .container
+      = yield

data/app/views/nippo_core/application/_link_to_join.slim

@@ -0,0 +1,4 @@
+- if current_user.request_to?(group)
+  = link_to 'Requesting...', '#'
+- else
+  = link_to 'Join us!', group_request_join_path(group), method: :post, remote: true, id: "link-to-join-group_#{group.id}"

data/app/views/nippo_core/group_member_relations/accept.js.erb

@@ -0,0 +1,2 @@
+$request = $("#request_<%= @request.id %>");
+$request.remove();

data/app/views/nippo_core/group_member_relations/new.slim

@@ -1,4 +1,5 @@
 = form_for [@group, @group_member_relations] do |f|
-  .field
-    = f.collection_select :user_id, NippoCore::User.all, :id, :nickname
-  = f.submit
+  .form-group
+    = f.collection_select :user_id, NippoCore::User.all, :id, :nickname, {}, class: 'form-control'
+  button.btn.btn-default
+    | Invite

data/app/views/nippo_core/group_member_relations/unaccepted.slim

@@ -0,0 +1,6 @@
+ul
+  - @requests.each do |request|
+    li id="request_#{request.id}"
+      = request.user.nickname
+      |  
+      = link_to 'accept', group_member_relation_accept_path(group_member_relation_id: request.id), method: :post, remote: true

data/app/views/nippo_core/groups/index.slim

@@ -1,12 +1,12 @@
 h1
   | Group index
-ul
+ul.list-group
   - @groups.each do |group|
-    li
+    li.list-group-item
       = link_to group.name, group
       p
         - if group.member?(current_user)
           | Member
         - else
-          = link_to 'Join us!', '#'
+          = render 'link_to_join', group: group
 = paginate @groups

data/app/views/nippo_core/groups/new.slim

@@ -1,8 +1,9 @@
 = form_for @group do |f|
-  .field
+  .form-group
     = f.label :name
-    = f.text_field :name, placeholder: 'グループ名 (必須)'
-  .field
+    = f.text_field :name, placeholder: 'グループ名 (必須)', class: 'form-control'
+  .form-group
     = f.label :description
-    = f.text_area :description, placeholoder: '説明'
-  = f.submit
+    = f.text_area :description, placeholder: '説明', class: 'form-control'
+  button.btn.btn-default
+    | Create Group

data/app/views/nippo_core/groups/request_join.js.erb

@@ -0,0 +1,2 @@
+let $link = $("#link-to-join-group_<%= @group.id %>");
+$link.attr("href", "#").text("Requesting...");

data/app/views/nippo_core/groups/show.slim

@@ -4,17 +4,37 @@ section
   h2
     | something
   = simple_format @group.description
-section
-  - if @group.member?(current_user)
-    h2
-      | recently activity
+  section
+    h3
+      | Member
     ul
-      - @reports.each do |report|
+      - @members.each do |m|
         li
-          = link_to report.title, [@group, report]
-    = link_to 'more', group_reports_path(group_id: @group.id)
-    = link_to 'new report', new_group_report_path(group_id: @group.id)
+          = m.nickname
+section
+  - if @group.member?(current_user)
+    section
+      h2
+        | recently activity
+      ul
+        - @reports.each do |report|
+          li
+            = link_to report.title, [@group, report]
+      .btn-group
+      = link_to 'more', group_reports_path(group_id: @group.id), class: 'btn btn-link'
+      = link_to 'new report', new_group_report_path(group_id: @group.id), class: 'btn btn-link'
+    section
+      h2
+        | requests
+      ul
+        - @requests.each do |request|
+          li id="request_#{request.id}"
+            = request.user.nickname
+            |  
+            = link_to 'accept', group_member_relation_accept_path(group_member_relation_id: request.id), method: :post, remote: true, id: "link-to-accept-request_#{request.id}"
+      = link_to 'more', unaccepted_group_group_member_relations_path(group_id: @group.id), class: 'btn btn-link'
+      = link_to 'invite_member', new_group_group_member_relation_path(group_id: @group.id), class: 'btn btn-link'
   - else
     h2
       | Join us?
-    | please click here!
+    = render 'link_to_join', group: @group

data/app/views/nippo_core/reports/index.slim

@@ -1,5 +1,5 @@
-ul
+ul.list-group
   - @reports.each do |report|
-    li
+    li.list-group-item
       = link_to report.title, group_report_path(report, group_id: @group.id)
 = paginate @reports

data/app/views/nippo_core/reports/new.slim

@@ -3,6 +3,8 @@ h2
   |  
   = current_user.nickname
 = form_for [@group, @report] do |f|
-  = f.label :body
-  = f.text_area :body
-  = f.submit
+  .form-group
+    = f.label :body
+    = f.text_area :body, class: 'form-control'
+  button.btn.btn-default
+    | Create Report

data/app/views/nippo_core/reports/show.slim

@@ -1,4 +1,6 @@
-h2
-  = @report.title
-div
-  == @report.markdowned_body
+.panel.panel-default
+  .panel-heading
+    h2.panel-title
+      = @report.title
+  div.panel-body
+    == @report.markdowned_body

data/app/views/nippo_core/users/registrations/new.slim

@@ -1,20 +1,20 @@
 h2
   | Sign up
-= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+= form_for resource, as: resource_name, url: registration_path(resource_name) do |f|
   = devise_error_messages!
-  .field
+  .form-group
     = f.label :email
     br
-    = f.email_field :email, autofocus: true
-  .field
+    = f.email_field :email, autofocus: true, class: 'form-control'
+  .form-group
     = f.label :last_name
-    = f.text_field :last_name, placeholder: '苗字 (必須)'
+    = f.text_field :last_name, placeholder: '苗字 (必須)', class: 'form-control'
     = f.label :first_name
-    = f.text_field :first_name, placeholder: '名前 (必須)'
-  .field
+    = f.text_field :first_name, placeholder: '名前 (必須)', class: 'form-control'
+  .form-group
     = f.label :nickname
-    = f.text_field :nickname, placeholder: 'ニックネーム (必須)'
-  .field
+    = f.text_field :nickname, placeholder: 'ニックネーム (必須)', class: 'form-control'
+  .form-group
     = f.label :password
     - if @minimum_password_length
       em
@@ -22,11 +22,12 @@ h2
         = @minimum_password_length
         |  characters minimum)
     br
-    = f.password_field :password, autocomplete: "off"
-  .field
+    = f.password_field :password, autocomplete: "off", class: 'form-control'
+  .form-group
     = f.label :password_confirmation
     br
-    = f.password_field :password_confirmation, autocomplete: "off"
+    = f.password_field :password_confirmation, autocomplete: "off", class: 'form-control'
   .actions
-    = f.submit "Sign up"
+    button.btn.btn-default
+      | Sign UP
 = render "nippo_core/users/shared/links"

data/app/views/nippo_core/users/sessions/new.slim

@@ -1,18 +1,19 @@
 h2
   | Log in
 = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-  .field
+  .form-group
     = f.label :email
     br
-    = f.email_field :email, autofocus: true
-  .field
+    = f.email_field :email, autofocus: true, class: 'form-control'
+  .form-group
     = f.label :password
     br
-    = f.password_field :password, autocomplete: "off"
+    = f.password_field :password, autocomplete: "off", class: 'form-control'
   - if devise_mapping.rememberable?
-    .field
+    .form-group
       = f.check_box :remember_me
       = f.label :remember_me
   .actions
-    = f.submit "Log in"
+    button.btn.btn-default
+      | Log in
 = render "nippo_core/users/shared/links"

data/app/views/nippo_core/users/show.slim

@@ -15,18 +15,20 @@ section
 section
   h2
     | Groups you created
-  ul
+  ul.list-group
     - @created_groups.each do |group|
-      li
+      li.list-group-item
         = link_to group.name, group
-  = link_to 'more', '#'
-  = link_to 'create more', new_group_path
+  .btn-group
+    = link_to 'more', '#', class: 'btn btn-link'
+    = link_to 'create more', new_group_path, class: 'btn btn-link'
 section
   h2
     | Groups you join
-  ul
+  ul.list-group
     - @joined_groups.each do |group|
-      li
+      li.list-group-item
         = link_to group.name, group
-  = link_to 'more', '#'
-  = link_to 'join more', '#'
+  .btn-group
+    = link_to 'more', '#', class: 'btn btn-link'
+    = link_to 'join more', groups_path, class: 'btn btn-link'

data/config/routes.rb

@@ -2,8 +2,16 @@ NippoCore::Engine.routes.draw do
   devise_for :users, class_name: "NippoCore::User", module: :'nippo_core/users'
   resource :users, path: :user, only: :show
   resources :groups, except: [:edit, :update] do
-    resources :group_member_relations, path: :group_members, only: [:new, :create]
+    # resources :users, module: :groups, only: [] do
+    # end
+    resources :group_member_relations, path: :group_members, only: [:new, :create] do
+      get :unaccepted, on: :collection
+    end
     resources :reports, except: [:edit, :update]
+    post :request_join
+  end
+  resources :group_member_relations, path: :group_members, only: [] do
+    post :accept
   end
 
   root 'home#index'

data/db/migrate/20170420155712_create_nippo_core_group_member_relations.rb

@@ -6,7 +6,9 @@ class CreateNippoCoreGroupMemberRelations < ActiveRecord::Migration[5.0]
       t.integer :group_id, null: false, index: true
       t.foreign_key :nippo_core_groups, column: :group_id
       t.integer :authentication, null: false, default: 0
-      t.boolean :status, null: false, default: false
+      t.integer :accepter_id
+      t.foreign_key :nippo_core_users, column: :accepter_id
+      t.datetime :accepted_at
 
       t.timestamps
     end

data/lib/nippo_core/version.rb

@@ -1,3 +1,3 @@
 module NippoCore
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nippo_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Takumu Uyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,8 +164,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: When you install this gem, you can report and share a daily report among
-  your company group, club, teammate etc.
+description: This is a web application you can share and stock a daily report. You
+  can report and share a daily report among your company group, club, teammate etc.
 email:
 - sasurai.usagi3@gmail.com
 executables: []
@@ -182,6 +182,7 @@ files:
 - app/assets/stylesheets/nippo_core/style.sass
 - app/controllers/nippo_core/application_controller.rb
 - app/controllers/nippo_core/group_member_relations_controller.rb
+- app/controllers/nippo_core/groups/users_controller.rb
 - app/controllers/nippo_core/groups_controller.rb
 - app/controllers/nippo_core/home_controller.rb
 - app/controllers/nippo_core/reports_controller.rb
@@ -205,9 +206,13 @@ files:
 - app/policies/application_policy.rb
 - app/policies/nippo_core/report_policy.rb
 - app/views/layouts/nippo_core/application.slim
+- app/views/nippo_core/application/_link_to_join.slim
+- app/views/nippo_core/group_member_relations/accept.js.erb
 - app/views/nippo_core/group_member_relations/new.slim
+- app/views/nippo_core/group_member_relations/unaccepted.slim
 - app/views/nippo_core/groups/index.slim
 - app/views/nippo_core/groups/new.slim
+- app/views/nippo_core/groups/request_join.js.erb
 - app/views/nippo_core/groups/show.slim
 - app/views/nippo_core/home/index.slim
 - app/views/nippo_core/reports/index.slim