diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index e998eb1a473d3dae299055140cc93ed339aea720..6e3c9a8d1c6509f1e0d0cfe1bb76e41086a2395c 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -3,6 +3,12 @@ class EventsController < ApplicationController
@new_event_validation = EventValidation.new
@new_event_error = ""
end
+
+ def edit
+ @update_event_validation = EventValidation.new
+ @update_event_error = ""
+ end
+
def generate_event
@new_event_validation = EventValidation.new(params["new_event_validation"].permit(:title, :description, :active, :scheduledAt, :creator, :invitees))
@@ -13,5 +19,15 @@ class EventsController < ApplicationController
render 'new', status: :unprocessable_entity
end
end
+
+ def update_generated_event
+ @update_event_validation = EventValidation.new(params["update_event_validation"].permit(:id, :title, :description, :active, :scheduledAt, :creator, :invitees))
+ if @update_event_validation.valid?
+ update_event(@update_event_validation)
+ else
+ puts @update_event_validation.errors.full_messages
+ render 'new', status: :unprocessable_entity
+ end
+ end
end
\ No newline at end of file
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index a71267097bf9348c18f5a031edba9d97cd47446f..cb7a382d99bb77307dcfa624fc85775caef2c075 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -1,74 +1,62 @@
<body>
<header class="mb-auto">
<div>
- <h3 style="color: White;" class="float-md-start mb-0" >Calendar</h3>
- <nav class="nav nav-masthead justify-content-center float-md-end">
- <a class="nav-link active" aria-current="page" href="/">Home</a>
- <a class="nav-link" href="/login">Login</a>
- <a style="padding-right:10px;" class="nav-link" href="/sign_up">Sign up</a>
- </nav>
+ <a href = "/"><%= image_tag("Logo.png", width: '50px')%></a>
+ <nav class="nav nav-masthead justify-content-center float-md-end">
+ <a class="nav-link active" aria-current="page" href="/">Home</a>
+ <a class="nav-link" href="/home/reminder_email_test">Reminder</a>
+ <a class="nav-link" href="/home/test_auth">Auth</a>
+ <a class="nav-link" href="/home/invite_test">Invite</a>
+ <a class="nav-link" href="/create_event">Create Event</a>
+ <a class="nav-link" href="/home/events_test">Get My Events</a>
+ <a style="padding-right:10px;" class="nav-link" href="/home/test_log_out">Log out</a>
+ </nav>
</div>
</header>
-
-
- <%= link_to "Back", :back, class: "btn btn-success" %>
- <div class="row">
- <div class="col-md-4 offset-md-2 text-box">
- <h2 class="text-center">Edit <%= resource_name.to_s.humanize %></h2>
-
- <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
- <%= render "devise/shared/error_messages", resource: resource %>
- <div class="paragraph">
+ <div class="row pt-5">
+ <div class="col-md-6 offset-md-3 text-box">
+ <h3 class="text-center", style="color: White;">Create Event</h3>
+
+ <%= form_for @update_event_validation, as: :update_event_validation, url: update_event_send_path do |f| %>
+ <%= f.hidden_field :id, value: params["id"] %>
+
+ <div class = "paragraph">
<div class="field row", style="margin-top: 10px;">
- <%= f.label :email, class: "col-sm-4 text-sm-end"%>
- <%= f.email_field :email, autofocus: true, autocomplete: "email", class:"col-sm-7" %>
+ <%= f.label :title, "Title:", class: "form-label col-sm-4 text-sm-end" %><br />
+ <%= f.text_field :title, class: "col-sm-7", required: true %>
</div>
- <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
- <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
- <% end %>
+ <div class="field row", style="margin-top: 10px;">
+ <%= f.label :description, "Description:", class: "form-label col-sm-4 text-sm-end" %><br />
+ <%= f.text_field :description, class:"col-sm-7", required: true %>
+ </div>
- <div class="field row", style="mh3 class="text-center"> Invited Events </h3>
- <p class="text-center">Events that you have been invited to will appear here</p>
- </div>
- <% end %>
- <% if @crh3 class="text-center"> Invited Events </h3>
- <p class="text-center">Events that you have been invited to will appear here</p>
- </div>
- <% end %>
- <% if @crargin-top: 10px;>
- <%= f.label :password, class: "col-sm-4 text-sm-end" %>
- <div class="col-sm-7">
- <div class="row">
- <%= f.password_field :password, autocomplete: "new-password", class: "col" %>
- </div>
- <% if @minimum_password_length %>
- <em class="row"><%= @minimum_password_length %> characters minimum</em>
- <% end %>
- </div>
+ <div class="field row", style="margin-top: 10px;">
+ <%= f.label :active, "Active:", class: "form-label col-sm-4 text-sm-end" %>
+ <%= f.text_field :active, class:"col-sm-7", required: true %>
</div>
<div class="field row", style="margin-top: 10px;">
- <%= f.label :password_confirmation, class: "col-sm-4 text-sm-end"%><br />
- <%= f.password_field :password_confirmation, autocomplete: "new-password", class:"col-sm-7" %>
+ <%= f.label :scheduledAt, "Scheduled at:", class: "form-label col-sm-4 text-sm-end" %>
+ <%= f.text_field :scheduledAt, class:"col-sm-7", required: true %>
</div>
- <div class="field row", style="margin-top: 10px;" >
- <%= f.label :current_password, class: "col-sm-4 text-sm-end" %>
- <%= f.password_field :current_password, autocomplete: "current-password", class:"col-sm-7" %>
+ <div class="field row", style="margin-top: 10px;">
+ <%= f.label :creator, "Creator:", class: "form-label col-sm-4 text-sm-end" %>
+ <%= f.text_field :creator, class:"col-sm-7", required: true %>
</div>
- </div>
- <div class="actions text-center">
- <%= f.submit "Update", class: "btn btn-info text-center margin_top" %>
- </div>
- <% end %>
- </div>
- <div class="col-md-4 text-box paragraph text-center">
- <h2>Cancel my account</h2>
- <p>If you want to delete your account click the button below</p>
+ <div class="field row", style="margin-top: 10px;">
+ <%= f.label :invitees, "Invites:", class: "form-label col-sm-4 text-sm-end" %>
+ <%= f.text_field :invitees, class:"col-sm-7", required: true %>
+ </div>
- <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class:"btn btn-danger" %>
- </div>
+ <div class="actions text-center">
+ <%= f.submit "Update Event", class: "btn btn-success text-center margin_top" %>
+ </div>
+ </div>
+ <% end %>
+ </div>
+ </div>
</body>
\ No newline at end of file
diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb
index cd22f8b7fba632603cba3a587c6b5104439d05dd..6429c8e884384629c1d689d7d988b7f0c4080875 100644
--- a/app/views/events/new.html.erb
+++ b/app/views/events/new.html.erb
@@ -2,16 +2,15 @@
<header class="mb-auto">
<div style="padding-left:20px;">
<a href = "/"><%= image_tag("Logo.png", width: '50px')%></a>
- <nav class="nav nav-masthead justify-content-center float-md-end">
- <a class="nav-link active" aria-current="page" href="/">Home</a>
- <a class="nav-link" href="/home/reminder_email_test">Reminder</a>
- <a class="nav-link" href="/home/test_auth">Auth</a>
- <a class="nav-link" href="/home/invite_test">Invite</a>
- <a class="nav-link" href="/create_event">Create Event</a>
- <a class="nav-link" href="/home/events_test">Get My Events</a>
- <a class="nav-link" href="/home/update_event_test">Update Event</a>
- <a style="padding-right:10px;" class="nav-link" href="/home/test_log_out">Log out</a>
- </nav>
+ <nav class="nav nav-masthead justify-content-center float-md-end">
+ <a class="nav-link active" aria-current="page" href="/">Home</a>
+ <a class="nav-link" href="/home/reminder_email_test">Reminder</a>
+ <a class="nav-link" href="/home/test_auth">Auth</a>
+ <a class="nav-link" href="/home/invite_test">Invite</a>
+ <a class="nav-link" href="/create_event">Create Event</a>
+ <a class="nav-link" href="/home/events_test">Get My Events</a>
+ <a style="padding-right:10px;" class="nav-link" href="/home/test_log_out">Log out</a>
+ </nav>
</div>
</header>
<div class="row pt-5">
@@ -50,10 +49,6 @@
<%= f.text_field :invitees, class:"col-sm-7", required: true %>
</div>
-
-
-
-
<div class="actions text-center">
<%= submit_tag "Create Event", class: "btn btn-success text-center margin_top" %>
</div>
diff --git a/app/views/home/home.html.erb b/app/views/home/home.html.erb
index 8ef3d4a0010ffd6dfafc957938ba4c6001530b06..709804ea0b69206cd7ad955557c9b4e020f5cf53 100644
--- a/app/views/home/home.html.erb
+++ b/app/views/home/home.html.erb
@@ -33,7 +33,6 @@
<a class="nav-link" href="/home/invite_test">Invite</a>
<a class="nav-link" href="/create_event">Create Event</a>
<a class="nav-link" href="/home/events_test">Get My Events</a>
- <a class="nav-link" href="/home/update_event_test">Update Event</a>
<a style="padding-right:10px;" class="nav-link" href="/home/test_log_out">Log out</a>
</nav>
</div>
@@ -87,7 +86,7 @@
<td><%= event["description"] %></td>
<td><%= event["scheduledAt"] %></td>
<td><% event["invitees"].each do |user| %><%= user%> <% end %></td>
- <td><%= link_to "Edit Event", root_path, class:"btn btn-info"%></td>
+ <td><%= link_to "Edit Event", update_event_path(id: event["id"]), class:"btn btn-info"%></td>
<td><%= link_to "Delete Event", delete_event_path(event), method: 'post', class:"btn btn-info"%></td>
</tr>
diff --git a/app/views/passwords/new.html.erb b/app/views/passwords/new.html.erb
index 3dbd72c591b7312d4176027ad2a209160e395e79..7c9d48c84bd22d67e2dfe988bda9e9e3aeae76d6 100644
--- a/app/views/passwords/new.html.erb
+++ b/app/views/passwords/new.html.erb
@@ -1,23 +1,31 @@
-<div class="row pt-5">
- <div class="col-md-6 offset-md-3 text-box white-text">
+ <header class="mb-auto">
+ <div style="padding-left:20px;">
+ <a href = "/"><%= image_tag("Logo.png", width: '50px') %></a>
+ <nav class="nav nav-masthead justify-content-center float-md-end">
+ <a class="nav-link active" aria-current="page" href="/">Home</a>
+ <a class="nav-link" href="/login">Login</a>
+ <a style="padding-right:10px;" class="nav-link" href="/sign_up">Sign up</a>
+ </nav>
+ </div>
+ </header>
+ <div class="row pt-5">
+ <div class="col-md-6 offset-md-3 text-box white-text">
- <h2 class="text-center">Forgot your password?</h2>
- <%= form_for @reset_password_email_validation, as: :reset_password_email_validation, url: reset_password_email_setup_path do |f| %>
+ <h2 class="text-center">Forgot your password?</h2>
+ <%= form_for @reset_password_email_validation, as: :reset_password_email_validation, url: reset_password_email_setup_path do |f| %>
- <div class="field row paragraph">
- <%= f.label :email, class: "col-sm-4 text-sm-end" %><br />
- <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "col-sm-7 margin_top" %>
- </div>
+ <div class="field row paragraph">
+ <%= f.label :email, class: "col-sm-4 text-sm-end" %><br />
+ <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "col-sm-7 margin_top" %>
+ </div>
- <div class="actions text-center">
- <%= f.submit "Send me reset password instructions", class: "btn btn-info margin_top" %>
+ <div class="actions text-center">
+ <%= f.submit "Send me reset password instructions", class: "btn btn-info margin_top" %>
+ <%= link_to "Log In", login_path, class: "btn btn-info text-center margin_top" %>
+ <%= link_to "Sign Up", sign_up_path, class: "btn btn-info text-center margin_top" %>
+ </div>
+
+ <% end %>
</div>
- <% end %>
- </div>
-</div>
-<div class="col offset-sm-3">
- <%= link_to "Log In", login_path, class: "btn btn-info text-center margin_top" %>
-</div>
-<div class="col offset-sm-3">
- <%= link_to "Sign Up", sign_up_path, class: "btn btn-info text-center margin_top" %>
-</div>
+ </div>
+
diff --git a/config/routes.rb b/config/routes.rb
index 6d30ea1f5ed7389fda631256a3478c6c77b9d795..dcb685cef1f356efe008e043e034bc4993028208 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,5 +28,7 @@ Rails.application.routes.draw do
get 'home/update_event_test', to: 'home#update_event_test'
get 'create_event', to: 'events#new'
post 'create_event/send', to: 'events#generate_event'
+ get 'update_event', to: 'events#edit'
+ post 'update_event/send', to: 'events#update_generated_event'
post 'delete_event_setup', to: 'home#delete_event_setup', as: 'delete_event'
end