From d48f7f53ea35910522869c35fd71604bce804f57 Mon Sep 17 00:00:00 2001 From: gps996 Date: Wed, 25 Oct 2017 11:12:47 +1100 Subject: [PATCH] mailer updates --- app/assets/javascripts/new_users.coffee | 3 + app/assets/stylesheets/new_users.scss | 3 + app/controllers/new_users_controller.rb | 75 +++++++++++++++++++ app/helpers/new_users_helper.rb | 2 + app/models/new_user.rb | 2 + app/views/new_users/_form.html.erb | 17 +++++ app/views/new_users/_new_user.json.jbuilder | 2 + app/views/new_users/edit.html.erb | 6 ++ app/views/new_users/index.html.erb | 31 ++++++++ app/views/new_users/index.json.jbuilder | 1 + app/views/new_users/new.html.erb | 5 ++ app/views/new_users/show.html.erb | 19 +++++ app/views/new_users/show.json.jbuilder | 1 + app/views/user_mailer/welcome_email.text.erb | 9 +++ config/routes.rb | 1 + db/migrate/20171025000508_create_new_users.rb | 11 +++ db/schema.rb | 49 +++++++++++- test/controllers/new_users_controller_test.rb | 48 ++++++++++++ test/fixtures/new_users.yml | 11 +++ test/models/new_user_test.rb | 7 ++ test/system/new_users_test.rb | 9 +++ 21 files changed, 309 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/new_users.coffee create mode 100644 app/assets/stylesheets/new_users.scss create mode 100644 app/controllers/new_users_controller.rb create mode 100644 app/helpers/new_users_helper.rb create mode 100644 app/models/new_user.rb create mode 100644 app/views/new_users/_form.html.erb create mode 100644 app/views/new_users/_new_user.json.jbuilder create mode 100644 app/views/new_users/edit.html.erb create mode 100644 app/views/new_users/index.html.erb create mode 100644 app/views/new_users/index.json.jbuilder create mode 100644 app/views/new_users/new.html.erb create mode 100644 app/views/new_users/show.html.erb create mode 100644 app/views/new_users/show.json.jbuilder create mode 100644 app/views/user_mailer/welcome_email.text.erb create mode 100644 db/migrate/20171025000508_create_new_users.rb create mode 100644 test/controllers/new_users_controller_test.rb create mode 100644 test/fixtures/new_users.yml create mode 100644 test/models/new_user_test.rb create mode 100644 test/system/new_users_test.rb diff --git a/app/assets/javascripts/new_users.coffee b/app/assets/javascripts/new_users.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/new_users.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/new_users.scss b/app/assets/stylesheets/new_users.scss new file mode 100644 index 0000000..a52d949 --- /dev/null +++ b/app/assets/stylesheets/new_users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the new_users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/new_users_controller.rb b/app/controllers/new_users_controller.rb new file mode 100644 index 0000000..e565fe9 --- /dev/null +++ b/app/controllers/new_users_controller.rb @@ -0,0 +1,75 @@ +class NewUsersController < ApplicationController + before_action :set_new_user, only: [:show, :edit, :update, :destroy] + + # GET /new_users + # GET /new_users.json + def index + @new_users = NewUser.all + end + + # GET /new_users/1 + # GET /new_users/1.json + def show + end + + # GET /new_users/new + def new + @new_user = NewUser.new + end + + # GET /new_users/1/edit + def edit + end + + # POST /new_users + # POST /new_users.json + def create + @new_user = NewUser.new(params [:new_user]) + + respond_to do |format| + if @new_user.save + UserMailer.welcome_email(@new_user).deliver_later + format.html { redirect_to @new_user, notice: 'New user was successfully created.' } + format.json { render json :new_user, status: :created, location: @new_user } + else + format.html { render action: 'new' } + format.json { render json: @new_user.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /new_users/1 + # PATCH/PUT /new_users/1.json + def update + respond_to do |format| + if @new_user.update(new_user_params) + format.html { redirect_to @new_user, notice: 'New user was successfully updated.' } + format.json { render :show, status: :ok, location: @new_user } + else + format.html { render :edit } + format.json { render json: @new_user.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /new_users/1 + # DELETE /new_users/1.json + def destroy + @new_user.destroy + respond_to do |format| + format.html { redirect_to new_users_url, notice: 'New user was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_new_user + @new_user = NewUser.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def new_user_params + params.require(:new_user).permit(:name, :email, :login) + end +end diff --git a/app/helpers/new_users_helper.rb b/app/helpers/new_users_helper.rb new file mode 100644 index 0000000..ec29819 --- /dev/null +++ b/app/helpers/new_users_helper.rb @@ -0,0 +1,2 @@ +module NewUsersHelper +end diff --git a/app/models/new_user.rb b/app/models/new_user.rb new file mode 100644 index 0000000..90bafdc --- /dev/null +++ b/app/models/new_user.rb @@ -0,0 +1,2 @@ +class NewUser < ApplicationRecord +end diff --git a/app/views/new_users/_form.html.erb b/app/views/new_users/_form.html.erb new file mode 100644 index 0000000..6cace45 --- /dev/null +++ b/app/views/new_users/_form.html.erb @@ -0,0 +1,17 @@ +<%= simple_form_for(@new_user) do |f| %> + <%= f.error_notification %> + +
+ + <%= f.input :name %> + + <%= f.input :email %> + + <%= f.input :login %> + +
+ +
+ <%= f.button :submit %> +
+<% end %> diff --git a/app/views/new_users/_new_user.json.jbuilder b/app/views/new_users/_new_user.json.jbuilder new file mode 100644 index 0000000..a56cc36 --- /dev/null +++ b/app/views/new_users/_new_user.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! new_user, :id, :name, :email, :login, :created_at, :updated_at +json.url new_user_url(new_user, format: :json) diff --git a/app/views/new_users/edit.html.erb b/app/views/new_users/edit.html.erb new file mode 100644 index 0000000..c142585 --- /dev/null +++ b/app/views/new_users/edit.html.erb @@ -0,0 +1,6 @@ +

Editing New User

+ +<%= render 'form', new_user: @new_user %> + +<%= link_to 'Show', @new_user %> | +<%= link_to 'Back', new_users_path %> diff --git a/app/views/new_users/index.html.erb b/app/views/new_users/index.html.erb new file mode 100644 index 0000000..947a3e7 --- /dev/null +++ b/app/views/new_users/index.html.erb @@ -0,0 +1,31 @@ +

<%= notice %>

+ +

New Users

+ + + + + + + + + + + + + <% @new_users.each do |new_user| %> + + + + + + + + + <% end %> + +
NameEmailLogin
<%= new_user.name %><%= new_user.email %><%= new_user.login %><%= link_to 'Show', new_user %><%= link_to 'Edit', edit_new_user_path(new_user) %><%= link_to 'Destroy', new_user, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New New User', new_new_user_path %> diff --git a/app/views/new_users/index.json.jbuilder b/app/views/new_users/index.json.jbuilder new file mode 100644 index 0000000..18d4b95 --- /dev/null +++ b/app/views/new_users/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @new_users, partial: 'new_users/new_user', as: :new_user diff --git a/app/views/new_users/new.html.erb b/app/views/new_users/new.html.erb new file mode 100644 index 0000000..64f26dd --- /dev/null +++ b/app/views/new_users/new.html.erb @@ -0,0 +1,5 @@ +

New New User

+ +<%= render 'form', new_user: @new_user %> + +<%= link_to 'Back', new_users_path %> diff --git a/app/views/new_users/show.html.erb b/app/views/new_users/show.html.erb new file mode 100644 index 0000000..56fca7b --- /dev/null +++ b/app/views/new_users/show.html.erb @@ -0,0 +1,19 @@ +

<%= notice %>

+ +

+ Name: + <%= @new_user.name %> +

+ +

+ Email: + <%= @new_user.email %> +

+ +

+ Login: + <%= @new_user.login %> +

+ +<%= link_to 'Edit', edit_new_user_path(@new_user) %> | +<%= link_to 'Back', new_users_path %> diff --git a/app/views/new_users/show.json.jbuilder b/app/views/new_users/show.json.jbuilder new file mode 100644 index 0000000..47fea63 --- /dev/null +++ b/app/views/new_users/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "new_users/new_user", new_user: @new_user diff --git a/app/views/user_mailer/welcome_email.text.erb b/app/views/user_mailer/welcome_email.text.erb new file mode 100644 index 0000000..5d1f368 --- /dev/null +++ b/app/views/user_mailer/welcome_email.text.erb @@ -0,0 +1,9 @@ +Welcome to ArtHouse.com, <%= @user.name %> +=============================================== + +You have successfully signed up to ArtHouse.com, +your username is: <%= @user.login %>. + +To login to the site, just follow this link: <%= @url %>. + +Thanks for joining and have a great day! diff --git a/config/routes.rb b/config/routes.rb index f89387c..94c8c70 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + resources :new_users resources :products devise_for :users diff --git a/db/migrate/20171025000508_create_new_users.rb b/db/migrate/20171025000508_create_new_users.rb new file mode 100644 index 0000000..e97357b --- /dev/null +++ b/db/migrate/20171025000508_create_new_users.rb @@ -0,0 +1,11 @@ +class CreateNewUsers < ActiveRecord::Migration[5.1] + def change + create_table :new_users do |t| + t.string :name + t.string :email + t.string :login + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 26c0391..aeea741 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,17 +10,60 @@ # # It's strongly recommended that you check this file into your version control system. +ActiveRecord::Schema.define(version: 20171025000508) do + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "email" + t.string "login" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end -ActiveRecord::Schema.define(version: 20171019225502) do - - create_table "users", force: :cascade do |t| + create_table "new_users", force: :cascade do |t| t.string "name" t.string "email" t.string "login" t.datetime "created_at", null: false t.datetime "updated_at", null: false + end + create_table "order_groups", force: :cascade do |t| + t.datetime "order_date" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_order_groups_on_user_id" + end + + create_table "orders", force: :cascade do |t| + t.datetime "order_date" + t.integer "product_id" + t.integer "ordergroup_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["ordergroup_id"], name: "index_orders_on_ordergroup_id" + t.index ["product_id"], name: "index_orders_on_product_id" + end + + create_table "payments", force: :cascade do |t| + t.datetime "payment_date" + t.text "description" + t.float "total_amount" + t.integer "ordergroup_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["ordergroup_id"], name: "index_payments_on_ordergroup_id" + end + + create_table "products", force: :cascade do |t| + t.text "description" + t.string "price" + t.text "image" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_products_on_user_id" end create_table "users", force: :cascade do |t| diff --git a/test/controllers/new_users_controller_test.rb b/test/controllers/new_users_controller_test.rb new file mode 100644 index 0000000..0d6f7dc --- /dev/null +++ b/test/controllers/new_users_controller_test.rb @@ -0,0 +1,48 @@ +require 'test_helper' + +class NewUsersControllerTest < ActionDispatch::IntegrationTest + setup do + @new_user = new_users(:one) + end + + test "should get index" do + get new_users_url + assert_response :success + end + + test "should get new" do + get new_new_user_url + assert_response :success + end + + test "should create new_user" do + assert_difference('NewUser.count') do + post new_users_url, params: { new_user: { email: @new_user.email, login: @new_user.login, name: @new_user.name } } + end + + assert_redirected_to new_user_url(NewUser.last) + end + + test "should show new_user" do + get new_user_url(@new_user) + assert_response :success + end + + test "should get edit" do + get edit_new_user_url(@new_user) + assert_response :success + end + + test "should update new_user" do + patch new_user_url(@new_user), params: { new_user: { email: @new_user.email, login: @new_user.login, name: @new_user.name } } + assert_redirected_to new_user_url(@new_user) + end + + test "should destroy new_user" do + assert_difference('NewUser.count', -1) do + delete new_user_url(@new_user) + end + + assert_redirected_to new_users_url + end +end diff --git a/test/fixtures/new_users.yml b/test/fixtures/new_users.yml new file mode 100644 index 0000000..5b855a9 --- /dev/null +++ b/test/fixtures/new_users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + email: MyString + login: MyString + +two: + name: MyString + email: MyString + login: MyString diff --git a/test/models/new_user_test.rb b/test/models/new_user_test.rb new file mode 100644 index 0000000..2c18e78 --- /dev/null +++ b/test/models/new_user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class NewUserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/system/new_users_test.rb b/test/system/new_users_test.rb new file mode 100644 index 0000000..2fdacd8 --- /dev/null +++ b/test/system/new_users_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class NewUsersTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit new_users_url + # + # assert_selector "h1", text: "NewUser" + # end +end