From 884335a9fed27437caa6a02ba0423de5c23a0cfe Mon Sep 17 00:00:00 2001 From: raj Date: Mon, 5 Jun 2017 21:46:36 +0100 Subject: [PATCH 1/4] adjusting size --- app/assets/javascripts/user_workouts.coffee.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/user_workouts.coffee.erb b/app/assets/javascripts/user_workouts.coffee.erb index f50e135..bf96587 100644 --- a/app/assets/javascripts/user_workouts.coffee.erb +++ b/app/assets/javascripts/user_workouts.coffee.erb @@ -30,7 +30,7 @@ $ -> $('#workout_grid').hide() $('#workout_form').fadeIn( 500 ) #$('#new_user_workout').fadeIn( 500 ) - $('#load_image').html( "" ).addClass( "workout_image" ) + $('#load_image').html( "" ).addClass( "workout_image" ) From 8ab20f8600ab393331e055c43686dca6a390297d Mon Sep 17 00:00:00 2001 From: raj Date: Mon, 5 Jun 2017 21:46:56 +0100 Subject: [PATCH 2/4] adding css design --- app/assets/stylesheets/user_workouts.scss | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/user_workouts.scss b/app/assets/stylesheets/user_workouts.scss index 845a111..caa50ad 100644 --- a/app/assets/stylesheets/user_workouts.scss +++ b/app/assets/stylesheets/user_workouts.scss @@ -1,7 +1,18 @@ +.center_text { text-align: center} + +.txt_color_grey { color: grey } + .display_design { margin-bottom: 15px } .workout_image { float:left;display:block;background-color:grey;padding:4px } .workout_name { float:left;margin-left:15px } -.grey-background { background-color: grey } \ No newline at end of file +.grey-background { background-color: grey } + +.user_workout_input { font-family:'Roboto';font-weight:900;font-size:70px;line-height:75px;width:80%; } + +.user_workout_save { font-family:'Roboto';font-weight:900;font-size:45px;line-height:75px; } + +input, +input::-webkit-input-placeholder { font-size:30px;line-height:75px; } \ No newline at end of file From cf1f2e8e12cd49ec8d929933d60d272f90d55f8c Mon Sep 17 00:00:00 2001 From: raj Date: Mon, 5 Jun 2017 21:47:10 +0100 Subject: [PATCH 3/4] haml form --- app/views/user_workouts/_form.html.haml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/app/views/user_workouts/_form.html.haml b/app/views/user_workouts/_form.html.haml index 58a7dfa..3e7cfbe 100644 --- a/app/views/user_workouts/_form.html.haml +++ b/app/views/user_workouts/_form.html.haml @@ -11,15 +11,20 @@ - @user_workout.errors.full_messages.each do |msg| %li= msg - .row - .col-xs-4 + .row.form-group + .col-xs-3{:style => "text-align:center;"} %span#load_image - .col-xs-4 - %b SETS - %h2 3 - .col-xs-4 - %b REPS - %h2 12 + .col-xs-2.center_text + -#%h2.user_workout_input 30 + = f.number_field :weight, class: 'user_workout_input center_text', placeholder: 'wts' + .col-xs-2.center_text + -#%h2.user_workout_input 3 + = f.number_field :set, class: 'user_workout_input center_text', placeholder: 'sets' + .col-xs-2.center_text + -#%h2.user_workout_input 12 + = f.number_field :rep, class: 'user_workout_input center_text', placeholder: 'reps' + .col-xs-3{:style => "text-align:center;bottom:0"} + = f.submit 'save', class: 'user_workout_save txt_color_grey' -#.form-group -# = f.label :set, class: 'col-sm-2 control-label' From 73738e7d24cdd9b537d92c4d275c69ea72c22ecb Mon Sep 17 00:00:00 2001 From: raj Date: Wed, 20 Sep 2017 20:45:53 +0100 Subject: [PATCH 4/4] changes to be reviewed --- .../{user_workouts.coffee.erb => user_workouts.coffee} | 8 -------- app/controllers/user_workouts_controller.rb | 3 +++ app/views/user_workouts/_form.html.haml | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) rename app/assets/javascripts/{user_workouts.coffee.erb => user_workouts.coffee} (90%) diff --git a/app/assets/javascripts/user_workouts.coffee.erb b/app/assets/javascripts/user_workouts.coffee similarity index 90% rename from app/assets/javascripts/user_workouts.coffee.erb rename to app/assets/javascripts/user_workouts.coffee index bf96587..b380691 100644 --- a/app/assets/javascripts/user_workouts.coffee.erb +++ b/app/assets/javascripts/user_workouts.coffee @@ -15,8 +15,6 @@ $ -> $('#workout_form').hide() - # $('#new_user_workout').hide() - $(document).on 'click', '.select_workout', -> @@ -26,15 +24,9 @@ $ -> console.log w._name() image_tag_builder = '<' + '%= ' + 'image_tag ' + w._image_url() + ' %>' - $('#workout_grid').hide() $('#workout_form').fadeIn( 500 ) - #$('#new_user_workout').fadeIn( 500 ) $('#load_image').html( "" ).addClass( "workout_image" ) - - $(document).on 'click', '#search_id', -> - - # $('#new_user_workout').hide() $('#workout_form').hide() diff --git a/app/controllers/user_workouts_controller.rb b/app/controllers/user_workouts_controller.rb index d2bd41f..f1712ba 100644 --- a/app/controllers/user_workouts_controller.rb +++ b/app/controllers/user_workouts_controller.rb @@ -26,6 +26,7 @@ def edit # POST /user_workouts # POST /user_workouts.json def create + raise user_workout_params.inspect @user_workout = UserWorkout.new(user_workout_params) respond_to do |format| @@ -79,6 +80,8 @@ def user_workout_params end def _workout + foo = Hash.new + foo[1] Workout end end diff --git a/app/views/user_workouts/_form.html.haml b/app/views/user_workouts/_form.html.haml index 3e7cfbe..2598500 100644 --- a/app/views/user_workouts/_form.html.haml +++ b/app/views/user_workouts/_form.html.haml @@ -14,6 +14,7 @@ .row.form-group .col-xs-3{:style => "text-align:center;"} %span#load_image + = f.hidden_field :workout_id, value: 1 .col-xs-2.center_text -#%h2.user_workout_input 30 = f.number_field :weight, class: 'user_workout_input center_text', placeholder: 'wts'