Small fixes

README.md

@@ -51,5 +51,6 @@ So, here the story begins...
   - Rest a little and feel proud of yourself that you've done your first open-source contribution!
 
 ### Want to join us?
-[Join us in slack!](https://join.slack.com/t/findopensourc-prt7834/shared_invite/enQtNzQ5MTIyMzU4NTgzLTg5MGYwMTdhYWIzMGE4ZDc5ZWRlMWI1YTEyNjAzN2ZjNTc4NmMzMjI2NmYzM2U5NTEyMDI2ZTk0MGVhNWU1ZDk)
+Join us in Slack and let us know what you would like to work on (even if there's no issue for that!):
+[Join us in slack!](https://join.slack.com/t/open-source-mentor/shared_invite/enQtODAwOTkzODcxOTA1LTllODUyMzcxZTk4MmZjZWFhM2IxOTUzYTU5N2UwNmFlNDhmY2MxOGM0NjA3OTBlMzIxNTYzNGJiYzU0ODQzZjE)
 

app/controllers/projects_controller.rb

@@ -6,8 +6,8 @@ class ProjectsController < ApplicationController
   before_action :authenticate_user!
   before_action :authorize!, only: %i[edit update destroy]
   before_action :current_project, only: %i[show edit update destroy]
-  # before_action :repo, only: %i[edit update destroy]
-  # before_action :repos, only: %i[edit update destroy]
+  before_action :fetch_repo_by_name, only: %i[new edit create]
+  after_action  :fetch_repos, only: %i[new edit create]
 
   def index
     @projects = Project.all
@@ -17,44 +17,18 @@ def show; end
 
   def new
     @project = Project.new
-    @repos   = repos
-    @repo    = repo
-  end
-
-  def repos
-    @client      = Octokit::Client.new
-    @github_user = @client.user(current_user.nickname)
-    @repos       = @client.repos(@github_user.login, query: { type: 'owner', sort: 'asc' })
-  end
-
-  def repo
-    @repos.map(&:name)
-  end
-
-  def edit
-    current_project
-    @repos   = repos
-    @repo    = repo
-  end
-
-  def repo
-    @repos.map {|r| r.name }
   end
 
   def edit; end
 
   def create
     @project = Project.new(project_params)
-    @repos   = repos
-    @repo    = repo
 
     respond_to do |format|
       if @project.save
         format.html { redirect_to @project, notice: 'Project was successfully created.' }
-        format.json { render :show, status: :created, location: @project }
       else
         format.html { render :new }
-        format.json { render json: @project.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -73,20 +47,27 @@ def destroy
     @project.destroy
     respond_to do |format|
       format.html { redirect_to projects_url, notice: 'Project was successfully destroyed.' }
-      format.json { head :no_content }
     end
   end
 
   private
 
+  def fetch_repos
+    @repos = ::Project::FetchRepos.call(current_user)
+  end
+
+  def fetch_repo_by_name
+    @repo = fetch_repos.map(&:name)
+  end
+
   def current_project
     @project = Project.find(params[:id])
   end
 
   def project_params
     params.require(:project).permit!
   end
-  
+
   def authorize!
     current_project
     authorize(@project || Project)

app/helpers/callable.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Callable
+  extend ActiveSupport::Concern
+  class_methods do
+    def call(*args)
+      new(*args).call
+    end
+  end
+end

app/services/project/fetch_repos.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class Project
+  class FetchRepos
+    include Callable
+
+    attr_reader :current_user
+
+    def initialize(current_user)
+      @current_user = current_user
+    end
+
+    def call
+      client.repos(github_user.login, query: { type: 'owner', sort: 'asc' })
+    end
+
+    private
+
+    def client
+      Octokit::Client.new
+    end
+
+    def github_user
+      client.user(current_user.nickname)
+    end
+  end
+end

app/views/layouts/_navbar.html.erb

@@ -18,7 +18,7 @@
         <% if user_signed_in? %>
           <%= link_to 'Sign Out', destroy_user_session_path, method: :delete, class: "nav-link"  %>
         <% else %>
-          <%= link_to "Sign in with Github", user_github_omniauth_authorize_path, class: "nav-link"  %>
+          <%= link_to "Sign in with Github", root_path, class: "nav-link"  %>
         <% end %>
       </li>
     </ul>

app/views/welcome/index.html.erb

@@ -1,4 +1,4 @@
-<main role="main">
+ <main role="main">
   <section class="jumbotron text-center">
     <div class="container">
       <h1 class="jumbotron-heading">Find OpenSource Mentor</h1>