From 99193fb27f9b6f8e02e322bfb1797d9bd2c52b73 Mon Sep 17 00:00:00 2001 From: Ronaq13 Date: Mon, 10 Apr 2017 21:31:11 +0530 Subject: [PATCH] nothing changed --- .byebug_history | 12 + .gitignore | 2 + .idea/workspace.xml | 374 +++++++++++++------------ app/controllers/student_controller.rb | 10 + app/views/layouts/application.html.erb | 12 +- app/views/mentor/addNewCourse.html.erb | 5 +- app/views/student/doingCourse.html.erb | 5 +- app/views/student/profile.html.erb | 2 +- app/views/student/settings.html.erb | 4 +- 9 files changed, 236 insertions(+), 190 deletions(-) diff --git a/.byebug_history b/.byebug_history index 169731d..a7e9c89 100644 --- a/.byebug_history +++ b/.byebug_history @@ -1,4 +1,16 @@ c +profile_photo_name +c +newProfilPhoto +newProfilePhoto +profilePhoto +params[:profile_photo] +params +c +newFileName +new_image +params["profile_picture"] +c coursesIdArray coursesIdArray.pop() c diff --git a/.gitignore b/.gitignore index 050c9d9..8873a12 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /log/* !/log/.keep /tmp + +public/uploads/* \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9062411..3fb1302 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,7 +4,17 @@ - + + + + + + + + + + + @@ -22,7 +32,87 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86,10 +177,10 @@ DEFINITION_ORDER - @@ -106,9 +197,9 @@ + - @@ -145,51 +236,15 @@ - - - - - - - - - - - - - - - - - - - - - @@ -203,15 +258,7 @@ @@ -359,6 +384,7 @@ + + + + @@ -602,6 +631,10 @@ + + + + 1489737712487 @@ -621,12 +654,13 @@ - - + + - + @@ -690,26 +724,10 @@ - - - - - - - - - - - - - - - - @@ -717,7 +735,6 @@ - @@ -816,7 +833,6 @@ - @@ -834,13 +850,6 @@ - - - - - - - @@ -859,7 +868,6 @@ - @@ -905,42 +913,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -948,7 +924,6 @@ - @@ -956,7 +931,6 @@ - @@ -964,7 +938,6 @@ - @@ -972,17 +945,6 @@ - - - - - - - - - - - @@ -1004,60 +966,114 @@ - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + + + + + + + + - + - - + + - + + + + + + - + - + - - + + - + - - + + - + diff --git a/app/controllers/student_controller.rb b/app/controllers/student_controller.rb index 54d3031..a8de297 100644 --- a/app/controllers/student_controller.rb +++ b/app/controllers/student_controller.rb @@ -17,12 +17,22 @@ def changeSettings changedAge = params[:age] changedGender = params[:gender] + + profilePhoto = params[:profile_photo] + profile_photo_name = current_user.id.to_s + "." + profilePhoto.original_filename.split(".")[1] + + + File.open(Rails.root.join('public', 'uploads','users', profile_photo_name), 'wb') do |file| + file.write(profilePhoto.read) + end + user = User.find(current_user.id) user.update_attribute(:email, changedEmail) user.update_attribute(:username, changedUserName) user.update_attribute(:short_bio,changedShortBio) user.update_attribute(:age,changedAge) user.update_attribute(:gender, changedGender) + user.update_attribute(:photo, profile_photo_name) return redirect_to '/profile' end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 74dd9c5..1dccda7 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -58,8 +58,16 @@ end %> - -
+ <% if current_user.photo %> + +
+ +  <%= value %> +
+ <%else%> + + <%end%> +
My Courses Accomplishment Profile diff --git a/app/views/mentor/addNewCourse.html.erb b/app/views/mentor/addNewCourse.html.erb index 062edec..1713ad3 100644 --- a/app/views/mentor/addNewCourse.html.erb +++ b/app/views/mentor/addNewCourse.html.erb @@ -1,11 +1,12 @@ - <%= form_tag '/nowAddingCourse' do%> + <%= form_tag '/nowAddingCourse', :multipart => true do%>

Category : <%= text_field_tag 'category',nil,placeholder: "Web, Android, others" %>

Title : <%= text_field_tag 'title' %>

Subtitle : <%= text_field_tag 'subtitle' %>

Level : <%= text_field_tag 'level',nil,placeholder: "Hard,easy,medium" %>

-

Image : <%= text_field_tag 'image' %>

+ +

Image : <%= file_field_tag :profile_picture %>

Video Link : <%= text_field_tag 'teaser_video' %>

Summary : <%= text_field_tag 'summary' %>

Short_summary : <%= text_field_tag 'short_summary' %>

diff --git a/app/views/student/doingCourse.html.erb b/app/views/student/doingCourse.html.erb index f8ca9e1..90ed74b 100644 --- a/app/views/student/doingCourse.html.erb +++ b/app/views/student/doingCourse.html.erb @@ -16,9 +16,7 @@ <%course.videos.each do |c|%> <%numOfVideos += 1%>
-
+

<%= c.desc %>

@@ -35,7 +33,6 @@ tmpLink = '/doneVideo/' + c.link.split('/')[-1].to_s + '/' + course.id.to_s - %> <%if courseIsDone%> diff --git a/app/views/student/profile.html.erb b/app/views/student/profile.html.erb index 0f9694d..0af0907 100644 --- a/app/views/student/profile.html.erb +++ b/app/views/student/profile.html.erb @@ -1,5 +1,5 @@ - +

Email ID : <%= current_user.email %>

User Name : <%= current_user.username %>

Short Bio : <%= current_user.short_bio %>

diff --git a/app/views/student/settings.html.erb b/app/views/student/settings.html.erb index 4d06b95..cf5aeee 100644 --- a/app/views/student/settings.html.erb +++ b/app/views/student/settings.html.erb @@ -1,10 +1,10 @@ - <%= form_tag '/changeSettings' do%> + <%= form_tag '/changeSettings', :multipart => true do%>

Email ID : <%= text_field_tag 'email_id', current_user.email %>

User Name : <%= text_field_tag 'user_name', current_user.username %>

Short Bio : <%= text_field_tag 'short_bio', current_user.short_bio %>

Age : <%= number_field_tag 'age', current_user.age %> years

- +

Profile Photo : <%= file_field_tag :profile_photo %>

Gender :