Merge 1

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.2'
+ruby '2.6.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.2', '>= 5.2.2.1'
@@ -30,6 +30,8 @@ gem 'bootsnap', '>= 1.1.0', require: false
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'faker'
+  gem 'populator'
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
 end
 

Gemfile.lock

@@ -1,150 +1,154 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
       arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    bootsnap (1.4.3)
+    bootsnap (1.7.7)
       msgpack (~> 1.0)
-    builder (3.2.3)
-    byebug (11.0.1)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    erubi (1.8.0)
-    ffi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    builder (3.2.4)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    erubi (1.10.0)
+    faker (2.18.0)
+      i18n (>= 1.6, < 2)
+    ffi (1.15.3)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.2.3)
+    loofah (2.11.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    msgpack (1.2.9)
-    nio4r (2.3.1)
-    nokogiri (1.10.2)
-      mini_portile2 (~> 2.4.0)
-    pg (1.1.4)
-    puma (3.12.1)
-    rack (2.0.7)
+    marcel (1.0.1)
+    method_source (1.0.0)
+    mini_mime (1.1.0)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    msgpack (1.4.2)
+    nio4r (2.5.7)
+    nokogiri (1.12.0)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    pg (1.2.3)
+    populator (1.0.0)
+    puma (3.12.6)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     ruby_dep (1.5.0)
-    spring (2.0.2)
-      activesupport (>= 4.2)
+    spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (3.7.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bootsnap (>= 1.1.0)
   byebug
+  faker
   listen (>= 3.0.5, < 3.2)
   pg
+  populator
   puma (~> 3.11)
   rails (~> 5.2.2, >= 5.2.2.1)
   spring
   spring-watcher-listen (~> 2.0.0)
   tzinfo-data
 
 RUBY VERSION
-   ruby 2.6.2p47
+   ruby 2.6.6p146
 
 BUNDLED WITH
    2.0.1

README.md

@@ -1,5 +1,5 @@
 ## NOTE: This repo has not been updated in a while.
-
+#Senay is collaborating now
 You may find that the versions of React, Rails, and Ruby are _NOT_ the most current. Feel free to update this repo and make a PR with new versions. Also, please let me know if you run into any bugs.
 
 # React + Rails No-Fluff Boilerplate

app/controllers/api/artists_categories_controller.rb

@@ -0,0 +1,7 @@
+class Api::ArtistsCategoriesController < ApplicationController
+  def index
+    @artists_categories = ArtistCategory.all
+    render json: @artists_categories
+  end
+end
+

app/controllers/api/artists_controller.rb

@@ -0,0 +1,73 @@
+class Api::ArtistsController < ApplicationController
+  def index
+    @artists = Artist.all
+    #  artists = []
+    # @artists.each do |artist|
+    #   artistHash = artist[:id] 
+    #   artistHash = { }
+    #   @artistReviews = Review.artistreview(artist[:id])
+    #   ids = []
+    # @artistReviews.each do |rev| ids.push rev[:id] end
+
+    #   artistHash["reviews"] = ids
+    #   artists.push artistHash
+    # end
+    render json: @artists
+  end
+
+  def create
+    @artist = Artist.new(artist_params)
+    if @artist.save
+      p @artist
+      p "aaaaaaaaa"
+      session[:artist_id] = @artist.id
+      session[:identity] = "artist"
+      # redirect_to '/gallery'
+    else
+      render json: {error: @artist.errors.messages}
+      # redirect_to '/register'
+    end
+  end
+
+  def show
+    @artist = Artist.find(params[:id])
+      render json: @artist
+  end
+
+  def update
+    @artist = Artist.find(params[:id])
+
+    if @artist.update(artist_params)
+      render json: @artist
+    else
+      render json: {error: @artist.errors.messages}
+    end
+  end
+
+
+  def destroy
+    @artist = Artist.find(params[:id])
+   if @artist.destroy
+      head :no_content
+   else
+    render json: {error: @artist.errors.messages}
+   end
+  end
+
+
+
+
+  private
+
+  def artist_params
+  params.require(:artist).permit(
+    :first_name,
+    :last_name,
+    :email,
+    :password,
+    # :password_confirmation,
+    :phone_number
+  )
+  end
+
+end

app/controllers/api/categories_controller.rb

@@ -0,0 +1,52 @@
+class Api::CategoriesController < ApplicationController
+  def index
+    @categories = Category.all
+    render json: @categories
+  end
+
+  def create
+    @category = Category.new(category_params)
+    if @category.save
+      render json: @category
+
+    else
+      render json: {error: @category.errors.messages}
+
+    end
+  end
+
+  def show
+    @category = Category.find params[:id]
+    render json: @category
+  end
+
+  def update
+    @category = Category.find(params[:id])
+
+    if @category.update(category_params)
+      render json: @category
+    else
+      render json: {error: @category.errors.messages}
+    end
+  end
+
+  def delete
+    @category = Category.find params[:id]
+
+    if @category.destory
+      head :no_content
+    else
+      render json: {error: @category.errors.messages}
+    end
+  end
+
+  private
+
+def category_params
+  params.require(:category).permit(
+    :name
+  )
+end
+
+
+end