diff --git a/app/controllers/logs_controller.rb b/app/controllers/logs_controller.rb index 02f4947..1e93f9c 100644 --- a/app/controllers/logs_controller.rb +++ b/app/controllers/logs_controller.rb @@ -2,12 +2,11 @@ class LogsController < ApplicationController before_action :ensure_valid_user - before_action :set_log, only: [:show, :edit, :update, :destroy] - before_action :set_recipe, only: [:new, :create] + before_action :set_log, only: [:show, :update, :destroy] before_action :require_recipe, only: [:new, :create] def index - @logs = Log.for_user(current_user).order(:date) + @logs = Log.for_user(current_user).order(:date).page(params[:page]).per(params[:per]) end def show @@ -45,9 +44,9 @@ class LogsController < ApplicationController @log.source_recipe = @recipe if @log.save - redirect_to logs_path, notice: 'Log Entry was successfully created.' + render json: { success: true } else - render :new + render json: @log.errors, status: :unprocessable_entity end end diff --git a/app/javascript/components/AppDateTime.vue b/app/javascript/components/AppDateTime.vue index 256f77f..37dabe3 100644 --- a/app/javascript/components/AppDateTime.vue +++ b/app/javascript/components/AppDateTime.vue @@ -79,7 +79,7 @@ h = h.toString().padStart(2, "0"); } - return h + ":" + m + " " + meridiem; + return h + ":" + m + meridiem; } else { return ""; diff --git a/app/javascript/components/AppNavbar.vue b/app/javascript/components/AppNavbar.vue index dbe6545..3b36536 100644 --- a/app/javascript/components/AppNavbar.vue +++ b/app/javascript/components/AppNavbar.vue @@ -16,8 +16,9 @@ Recipes Ingredients Calculator - About + Log Notes + About Admin diff --git a/app/javascript/components/AppTextField.vue b/app/javascript/components/AppTextField.vue new file mode 100644 index 0000000..6088e16 --- /dev/null +++ b/app/javascript/components/AppTextField.vue @@ -0,0 +1,48 @@ + + + + + \ No newline at end of file diff --git a/app/javascript/components/LogEdit.vue b/app/javascript/components/LogEdit.vue new file mode 100644 index 0000000..85a9c4f --- /dev/null +++ b/app/javascript/components/LogEdit.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/app/javascript/components/LogShow.vue b/app/javascript/components/LogShow.vue new file mode 100644 index 0000000..b49d99e --- /dev/null +++ b/app/javascript/components/LogShow.vue @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/javascript/components/RecipeEdit.vue b/app/javascript/components/RecipeEdit.vue index 37631ca..30978c8 100644 --- a/app/javascript/components/RecipeEdit.vue +++ b/app/javascript/components/RecipeEdit.vue @@ -1,65 +1,37 @@