diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5e5c51dbc0744ff6f48a7c060f68abdfbc2eb3d1..82fc778cc7f93a5f6e5916f7fe5def2da9ec3e15 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -65,3 +65,7 @@ color: #fff; border-bottom-color: #fff; } + +.white-text { + color:#fff; +} diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f21937be43e4fd0c17cf3bd3dd82d1433f8c010a..281b342195ce47e7ff3b4d2da1c19fd796e97de9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base def auth auth = HTTParty.post('http://172.17.0.1:3001/auth', :headers => { 'Content-Type' => 'application/json', 'Authorization' => session[:jwt_token]}) - if auth["message"] == "User Authenticated." + if auth.code != 401 else session[:logged_in] = false end @@ -47,9 +47,6 @@ class ApplicationController < ActionController::Base session[:user_id] = sign_up['data']['id'] session[:jwt_token] = sign_up.header['authorization'] session[:logged_in] = true - - user = User.new(:auth_id => session[:user_id]) - user.save! redirect_to root_path else @@ -88,9 +85,8 @@ class ApplicationController < ActionController::Base :ids => user_ids }.to_json) - if email_request.code == 401 + if email_request.code == 404 emails = nil - session[:logged_in] == false else emails = email_request["emails"] end @@ -210,7 +206,11 @@ class ApplicationController < ActionController::Base event_request = HTTParty.post('http://172.17.0.1:3003/my_created_events', :body => { :id => id }) - return event_request + if event_request.code == 404 + return nil + else + return event_request + end end end @@ -225,6 +225,7 @@ class ApplicationController < ActionController::Base return nil else return event_request + end end end @@ -257,5 +258,4 @@ class ApplicationController < ActionController::Base end # render created_event end - end end \ No newline at end of file diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 4a12d181e80b16f6677ba5ace8948751f30fca96..2e6997da680719a92fe60052e20e69752664668c 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -4,8 +4,8 @@ require "cgi" class HomeController < ApplicationController def home - @events = get_my_events(session[:user_id]) - puts @events + @invited_events = get_my_events(session[:user_id]) + @created_events = get_my_created_events(session[:user_id]) end def test @@ -58,7 +58,7 @@ class HomeController < ApplicationController end def generate_event - event = EventValidation.new(:id => "2", :title => "this is a test title", :description => "this is a test description", :active => true, :scheduledAt => (Time.now + 1.hours), :creator => session[:user_id], :invitees => [session[:user_id]]) + event = EventValidation.new(:id => "2", :title => "this is a test title", :description => "this is a test description", :active => true, :scheduledAt => (Time.now + 1.hours), :creator => session[:user_id], :invitees => [session[:user_id], 3]) end def events_test @@ -72,8 +72,9 @@ class HomeController < ApplicationController redirect_to root_path end - def delete_event_test - delete_event(generate_event) + def delete_event_setup + event = EventValidation.new(:id => params["id"], :title => params["title"], :description => params["description"], :active => params["active"], :scheduledAt => params["scheduledAt"], :creator => params["creator"], :invitees => params["invitees"]) + delete_event(event) redirect_to root_path end diff --git a/app/views/home/home.html.erb b/app/views/home/home.html.erb index 11c47f7641e37e48b18074e799866839bffe0247..ad8485cf9171db89db7d9c0fcc9beccef0102887 100644 --- a/app/views/home/home.html.erb +++ b/app/views/home/home.html.erb @@ -32,44 +32,76 @@ <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="/home/event_test">Create Event</a> - <a class="nav-link" href="/home/created_event_test">Get My Created Events</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 class="nav-link" href="/home/delete_event_test">Delete Event</a> <a style="padding-right:10px;" class="nav-link" href="/home/test_log_out">Log out</a> </nav> </div> </header> - - <% if @events != nil %> - <table class="table table-dark"> - <tr> - <th scope="col">Event Number</th> - <th scope="col">Title</th> - <th scope="col">Description</th> - <th scope="col">Active</th> - <th scope="col">Scheduled At</th> - <th scope="col">Created At</th> - <th scope="col">Last Updated</th> - <th scope="col">Creator</th> - <th scope="col">Invited Users</th> - </tr> - <% @events.each do |event| %> - <tr> - <td><%= event["id"] %></td> - <td><%= event["title"] %></td> - <td><%= event["description"] %></td> - <td><%= event["active"] %></td> - <td><%= event["scheduledAt"] %></td> - <td><%= event["created_at"] %></td> - <td><%= event["updated_at"] %></td> - <td><%= event["creator"] %></td> - <td><%= event["invitees"] %></td> - </tr> + <div class="row"> + <% if @invited_events != nil %> + <div class="col-sm-10 offset-sm-1 text-box white-text"> + <h3 class="text-center"> Invited Events </h3> + <table class="table white-text"> + <tr> + <th scope="col">Title</th> + <th scope="col">Description</th> + <th scope="col">Scheduled For</th> + <th scope="col">Creator</th> + <th scope="col">Invited Users</th> + </tr> + <% @invited_events.each do |event| %> + <tr> + <td><%= event["title"] %></td> + <td><%= event["description"] %></td> + <td><%= event["scheduledAt"] %></td> + <td><%= event["creator"] %></td> + <td><% event["invitees"].each do |user| %><%= user%> <% end %></td> + </tr> + <% end %> + </table> + </div> + <% else %> + <div class="col-sm-4 offset-sm-2 text-box white-text"> + <h3 class="text-center"> Invited Events </h3> + <p class="text-center">Events that you have been invited to will appear here</p> + </div> <% end %> - <% end %> - </table> + <% if @created_events != nil %> + <div class="col-sm-10 offset-sm-1 text-box white-text"> + <h3 class="text-center"> Created Events </h3> + + <table class="table white-text"> + <tr> + <th scope="col">Title</th> + <th scope="col">Description</th> + <th scope="col">Scheduled For</th> + <th scope="col">Invited Users</th> + <th scope="col"></th> + <th scope="col"></th> + + </tr> + <% @created_events.each do |event| %> + <tr> + <td><%= event["title"] %></td> + <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 "Delete Event", delete_event_path(event), method: 'post', class:"btn btn-info"%></td> + </tr> + <% end %> + </table> + </div> + <% else %> + <div class="col-sm-4 text-box white-text text-center"> + <h3> Create An Event </h3> + <p>Schedule your first event and invite some people</p> + <%= link_to "Create Event", root_path, class: "btn btn-info"%> + </div> + <% end %> + </div> <% else %> <header class="mb-auto"> <div style="padding-left:20px;"> diff --git a/app/views/passwords/edit.html.erb b/app/views/passwords/edit.html.erb index d142c0159808dd1f240dc6ab10959b3f0d6993e7..850ec910d710d5d72cef5c208d3787ee1d5ad2e3 100644 --- a/app/views/passwords/edit.html.erb +++ b/app/views/passwords/edit.html.erb @@ -1,5 +1,5 @@ <div class="row pt-5"> - <div class="col-md-6 offset-md-3 text-box"> + <div class="col-md-6 offset-md-3 text-box white-text"> <h2 class="text-center">Change your password</h2> diff --git a/app/views/passwords/new.html.erb b/app/views/passwords/new.html.erb index faa029c33d4c84c04440b7da10e9c76c5df71850..3dbd72c591b7312d4176027ad2a209160e395e79 100644 --- a/app/views/passwords/new.html.erb +++ b/app/views/passwords/new.html.erb @@ -1,5 +1,5 @@ <div class="row pt-5"> - <div class="col-md-6 offset-md-3 text-box"> + <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| %> diff --git a/app/views/registrations/edit.html.erb b/app/views/registrations/edit.html.erb index 5e905b8f8ea61d4027f7fed0ed378e592f105713..f4065336e16925cd45b2c84aa5f90dfdba3c3cdb 100644 --- a/app/views/registrations/edit.html.erb +++ b/app/views/registrations/edit.html.erb @@ -28,7 +28,15 @@ <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div> <% end %> - <div class="field row", style="margin-top: 10px;"> + <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"> diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb index 258b3fddd11eedfd36116e7781f2512d81a2c332..aaa3ecb2df228a05cc119fdbf39608a2be4c1df9 100644 --- a/app/views/registrations/new.html.erb +++ b/app/views/registrations/new.html.erb @@ -52,7 +52,7 @@ </div> <% end %> <% end %> - <div class="actions text-center", style="padding-left:620px;"> + <div class="actions text-center"> <%= submit_tag "Sign up", class: "btn btn-success text-center margin_top" %> </div> </div> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 51ccc60ce2e900dd574ae05c5202f03fb43b0d6d..2a97ef92374d139663b70564d023f1177468299c 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -10,8 +10,8 @@ </div> </header> <div class="row pt-5 main-row"> - <div class="col-sm-5 offset-sm-4 text-box default_form"> - <h3 style="color: White;" , class="text-center">Log in</h3> + <div class="col-md-4 offset-md-4 text-box default_form"> + <h3 class="text-center white-text">Log in</h3> <%= form_for @login_validation, as: :login_validation, url: login_send_path do |f| %> <div class="paragraph"> @@ -41,26 +41,15 @@ <% end %> <% end %> <div class="row", style="margin-top: 10px;"> - <div class="col-md-4"> - </div> - - - <div class="actions text-center", style="padding-left:195px;"> + <div class="actions col-md-7 col-sm-6 offset-md-4 offset-sm-4" style="padding-left:0px;"> <%= link_to "Forgot Password?", reset_password_email_path, class: 'btn btn-danger' %> <%= link_to "Create Account", sign_up_path, class: "btn btn-info" %> <%= f.submit "Log in", class: "btn btn-success" %> </div> </div> - - <div class=> - </div> </div> <% end %> </div> - - - <div class="row"> - </div> </div> </body> diff --git a/config/routes.rb b/config/routes.rb index 0ddcc7d19f3c7b00fac0929ea4de526255407fa4..6cf66623cb4e3471a0a51859039ef46f63e71702 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,5 +26,5 @@ Rails.application.routes.draw do get 'home/created_event_test', to: 'home#created_event_test' get 'home/events_test', to: 'home#events_test' get 'home/update_event_test', to: 'home#update_event_test' - get 'home/delete_event_test', to: 'home#delete_event_test' + post 'delete_event_setup', to: 'home#delete_event_setup', as: 'delete_event' end