From 6cbbfb20f508587fac2514a60a524112e7335f2f Mon Sep 17 00:00:00 2001 From: Pawan Date: Fri, 10 May 2019 14:49:13 +0000 Subject: [PATCH] Edit and update action --- app/assets/javascripts/apartmentsws.coffee | 3 + app/assets/stylesheets/apartmentsws.scss | 3 + app/controllers/apartmentsws_controller.rb | 74 +++++++++++++++++++ app/controllers/posts_controller.rb | 1 + app/helpers/apartmentsws_helper.rb | 2 + app/models/apartmentsw.rb | 3 + app/models/user.rb | 6 ++ .../apartmentsws/_apartmentsw.json.jbuilder | 2 + app/views/apartmentsws/_form.html.erb | 30 ++++++++ app/views/apartmentsws/edit.html.erb | 6 ++ .../{posts => apartmentsws}/homepage.html.erb | 0 app/views/apartmentsws/index.html.erb | 38 ++++++++++ app/views/apartmentsws/index.json.jbuilder | 1 + app/views/apartmentsws/new.html.erb | 5 ++ app/views/apartmentsws/show.html.erb | 21 ++++++ app/views/apartmentsws/show.json.jbuilder | 1 + app/views/pages/Untitled | 0 app/views/pages/listfindapt.erb | 4 +- app/views/posts/index.html.erb | 8 -- app/views/posts/new.html.erb | 22 ------ app/views/posts/rental2.html.erb | 7 -- app/views/posts/show.html.erb | 5 -- config/routes.rb | 3 +- .../20190510140316_create_apartmentsws.rb | 12 +++ db/schema.rb | 12 ++- 25 files changed, 223 insertions(+), 46 deletions(-) create mode 100644 app/assets/javascripts/apartmentsws.coffee create mode 100644 app/assets/stylesheets/apartmentsws.scss create mode 100644 app/controllers/apartmentsws_controller.rb create mode 100644 app/helpers/apartmentsws_helper.rb create mode 100644 app/models/apartmentsw.rb create mode 100644 app/views/apartmentsws/_apartmentsw.json.jbuilder create mode 100644 app/views/apartmentsws/_form.html.erb create mode 100644 app/views/apartmentsws/edit.html.erb rename app/views/{posts => apartmentsws}/homepage.html.erb (100%) create mode 100644 app/views/apartmentsws/index.html.erb create mode 100644 app/views/apartmentsws/index.json.jbuilder create mode 100644 app/views/apartmentsws/new.html.erb create mode 100644 app/views/apartmentsws/show.html.erb create mode 100644 app/views/apartmentsws/show.json.jbuilder delete mode 100644 app/views/pages/Untitled delete mode 100644 app/views/posts/index.html.erb delete mode 100644 app/views/posts/new.html.erb delete mode 100644 app/views/posts/rental2.html.erb delete mode 100644 app/views/posts/show.html.erb create mode 100644 db/migrate/20190510140316_create_apartmentsws.rb diff --git a/app/assets/javascripts/apartmentsws.coffee b/app/assets/javascripts/apartmentsws.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/apartmentsws.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/apartmentsws.scss b/app/assets/stylesheets/apartmentsws.scss new file mode 100644 index 0000000..b9f39d8 --- /dev/null +++ b/app/assets/stylesheets/apartmentsws.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the apartmentsws 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/apartmentsws_controller.rb b/app/controllers/apartmentsws_controller.rb new file mode 100644 index 0000000..8b6e7a5 --- /dev/null +++ b/app/controllers/apartmentsws_controller.rb @@ -0,0 +1,74 @@ +class ApartmentswsController < ApplicationController + before_action :set_apartmentsw, only: [:show, :edit, :update, :destroy] + + # GET /apartmentsws + # GET /apartmentsws.json + def index + @apartmentsws = Apartmentsw.all + end + + # GET /apartmentsws/1 + # GET /apartmentsws/1.json + def show + end + + # GET /apartmentsws/new + def new + @apartmentsw = Apartmentsw.new + end + + # GET /apartmentsws/1/edit + def edit + end + + # POST /apartmentsws + # POST /apartmentsws.json + def create + @apartmentsw = Apartmentsw.new(apartmentsw_params) + + respond_to do |format| + if @apartmentsw.save + format.html { redirect_to @apartmentsw, notice: 'Apartmentsw was successfully created.' } + format.json { render :show, status: :created, location: @apartmentsw } + else + format.html { render :new } + format.json { render json: @apartmentsw.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /apartmentsws/1 + # PATCH/PUT /apartmentsws/1.json + def update + respond_to do |format| + if @apartmentsw.update(apartmentsw_params) + format.html { redirect_to @apartmentsw, notice: 'Apartmentsw was successfully updated.' } + format.json { render :show, status: :ok, location: @apartmentsw } + else + format.html { render :edit } + format.json { render json: @apartmentsw.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /apartmentsws/1 + # DELETE /apartmentsws/1.json + def destroy + @apartmentsw.destroy + respond_to do |format| + format.html { redirect_to apartmentsws_url, notice: 'Apartmentsw was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_apartmentsw + @apartmentsw = Apartmentsw.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def apartmentsw_params + params.require(:apartmentsw).permit(:title, :body, :user_id) + end +end diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 2448ac9..0080759 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -1,4 +1,5 @@ class PostsController < ApplicationController + def homepage end diff --git a/app/helpers/apartmentsws_helper.rb b/app/helpers/apartmentsws_helper.rb new file mode 100644 index 0000000..fd42ff1 --- /dev/null +++ b/app/helpers/apartmentsws_helper.rb @@ -0,0 +1,2 @@ +module ApartmentswsHelper +end diff --git a/app/models/apartmentsw.rb b/app/models/apartmentsw.rb new file mode 100644 index 0000000..62a40d7 --- /dev/null +++ b/app/models/apartmentsw.rb @@ -0,0 +1,3 @@ +class Apartmentsw < ActiveRecord::Base + belongs_to :user +end diff --git a/app/models/user.rb b/app/models/user.rb index 634e20d..29f2c04 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,4 +3,10 @@ class User < ActiveRecord::Base # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable devise :database_authenticatable, :registerable, :recoverable, :rememberable, :validatable + + def username + return self.email.split('@')[0].capitalize + end end + + diff --git a/app/views/apartmentsws/_apartmentsw.json.jbuilder b/app/views/apartmentsws/_apartmentsw.json.jbuilder new file mode 100644 index 0000000..19ca7eb --- /dev/null +++ b/app/views/apartmentsws/_apartmentsw.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! apartmentsw, :id, :title, :body, :, :user_id, :created_at, :updated_at +json.url apartmentsw_url(apartmentsw, format: :json) diff --git a/app/views/apartmentsws/_form.html.erb b/app/views/apartmentsws/_form.html.erb new file mode 100644 index 0000000..f28f064 --- /dev/null +++ b/app/views/apartmentsws/_form.html.erb @@ -0,0 +1,30 @@ +<%= form_for(@apartmentsw) do |f| %> + <% if @apartmentsw.errors.any? %> +
+

<%= pluralize(@apartmentsw.errors.count, "error") %> prohibited this apartmentsw from being saved:

+ + +
+ <% end %> + +
+ <%= f.label :title %>
+ <%= f.text_field :title %> +
+
+ <%= f.label :body %>
+ <%= f.text_field :body %> +
+ +
+ <%= f.label :user_id %>
+ <%= f.text_field :user_id %> +
+
+ <%= f.submit %> +
+<% end %> diff --git a/app/views/apartmentsws/edit.html.erb b/app/views/apartmentsws/edit.html.erb new file mode 100644 index 0000000..d232bf7 --- /dev/null +++ b/app/views/apartmentsws/edit.html.erb @@ -0,0 +1,6 @@ +

Editing Apartmentsw

+ +<%= render 'form' %> + +<%= link_to 'Show', @apartmentsw %> | +<%= link_to 'Back', apartmentsws_path %> diff --git a/app/views/posts/homepage.html.erb b/app/views/apartmentsws/homepage.html.erb similarity index 100% rename from app/views/posts/homepage.html.erb rename to app/views/apartmentsws/homepage.html.erb diff --git a/app/views/apartmentsws/index.html.erb b/app/views/apartmentsws/index.html.erb new file mode 100644 index 0000000..fdd95b6 --- /dev/null +++ b/app/views/apartmentsws/index.html.erb @@ -0,0 +1,38 @@ +

<%= notice %>

+ +

Listing Apartmentsws

+ + + + + + + + + + + + + + <% @apartmentsws.each do |apartmentsw| %> + + + + + + + + + + + + + + + <% end %> + +
TitleBodyUser
<%= apartmentsw.title %><%= apartmentsw.body %><%= apartmentsw.user %><%= link_to 'Show', apartmentsw %><%= link_to 'Edit', edit_apartmentsw_path(apartmentsw) %><%= link_to 'Destroy', apartmentsw, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Apartmentsw', new_apartmentsw_path %> diff --git a/app/views/apartmentsws/index.json.jbuilder b/app/views/apartmentsws/index.json.jbuilder new file mode 100644 index 0000000..32d5abf --- /dev/null +++ b/app/views/apartmentsws/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @apartmentsws, partial: 'apartmentsws/apartmentsw', as: :apartmentsw diff --git a/app/views/apartmentsws/new.html.erb b/app/views/apartmentsws/new.html.erb new file mode 100644 index 0000000..0410874 --- /dev/null +++ b/app/views/apartmentsws/new.html.erb @@ -0,0 +1,5 @@ +

New Apartmentsw

+ +<%= render 'form' %> + +<%= link_to 'Back', apartmentsws_path %> diff --git a/app/views/apartmentsws/show.html.erb b/app/views/apartmentsws/show.html.erb new file mode 100644 index 0000000..04a8bbe --- /dev/null +++ b/app/views/apartmentsws/show.html.erb @@ -0,0 +1,21 @@ +

<%= notice %>

+ +

+ Title: + <%= @apartmentsw.title %> +

+ +

+ Body: + <%= @apartmentsw.body %> +

+ + + +

+ User: + <%= @apartmentsw.user%> +

+ +<%= link_to 'Edit', edit_apartmentsw_path(@apartmentsw) %> | +<%= link_to 'Back', apartmentsws_path %> diff --git a/app/views/apartmentsws/show.json.jbuilder b/app/views/apartmentsws/show.json.jbuilder new file mode 100644 index 0000000..c6027f9 --- /dev/null +++ b/app/views/apartmentsws/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "apartmentsws/apartmentsw", apartmentsw: @apartmentsw diff --git a/app/views/pages/Untitled b/app/views/pages/Untitled deleted file mode 100644 index e69de29..0000000 diff --git a/app/views/pages/listfindapt.erb b/app/views/pages/listfindapt.erb index a83452b..c2a9366 100644 --- a/app/views/pages/listfindapt.erb +++ b/app/views/pages/listfindapt.erb @@ -3,8 +3,8 @@

Xplor - Housing at MNSU

We are here to give you a better living experience. Sign Up today and explore hundreds and thousands of options for your time at MNSU.

- List Apartment - Find Apartment + List Apartment + Find Apartment

diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb deleted file mode 100644 index bcb4340..0000000 --- a/app/views/posts/index.html.erb +++ /dev/null @@ -1,8 +0,0 @@ - -

Apartments Posts

-<% @posts.each do |post| %> -

<%= post.title %>

-

<%= post.body %>

- - -<% end %> \ No newline at end of file diff --git a/app/views/posts/new.html.erb b/app/views/posts/new.html.erb deleted file mode 100644 index 6913c48..0000000 --- a/app/views/posts/new.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -
-
-

Add Post

-<%= form_for :post, url: posts_path do |f| %> -

- <%= f.label :location %>
- <%= f.text_field :text %> - -

- -

- <%= f.label :price %>
- <%= f.text_area :body %> -

- - -

- <%=f.submit %> - -

- -<% end %> \ No newline at end of file diff --git a/app/views/posts/rental2.html.erb b/app/views/posts/rental2.html.erb deleted file mode 100644 index 415f6c2..0000000 --- a/app/views/posts/rental2.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -

Apartment listing

-< % @posts.each do |post| %> -

<%= post.title %>

-

<%= post.body %>

- -<% end %> - \ No newline at end of file diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb deleted file mode 100644 index eac85d8..0000000 --- a/app/views/posts/show.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -
-
- -

<%p= @post.title %>

-

<%= @post.body %>

\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 117aa63..3de86d9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,12 +1,13 @@ Rails.application.routes.draw do + resources :apartmentsws devise_for :users devise_scope :user do get '/users/sign_out' => 'devise/sessions#destroy' end - root 'posts#homepage', as:'home' + root 'apartmentsws#homepage', as:'home' get 'about' => 'pages#about', as: 'about' diff --git a/db/migrate/20190510140316_create_apartmentsws.rb b/db/migrate/20190510140316_create_apartmentsws.rb new file mode 100644 index 0000000..21c0a81 --- /dev/null +++ b/db/migrate/20190510140316_create_apartmentsws.rb @@ -0,0 +1,12 @@ +class CreateApartmentsws < ActiveRecord::Migration + def change + create_table :apartmentsws do |t| + t.text :title + t.string :body + + t.references :user, index: true, foreign_key: true + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 949efeb..19f47c5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,17 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20190428181636) do +ActiveRecord::Schema.define(version: 20190510140316) do + + create_table "apartmentsws", force: :cascade do |t| + t.text "title" + t.string "body" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "apartmentsws", ["user_id"], name: "index_apartmentsws_on_user_id" create_table "posts", force: :cascade do |t| t.string "title"