diff --git a/Gemfile b/Gemfile index 5240bfe..b5e6ed9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,11 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.4.1' +ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' -gem 'bootstrap-sass', '~> 3.3.7' +# gem 'bootstrap-sass', '~> 3.3.7' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Puma as the app server @@ -66,6 +66,6 @@ end gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] group :production do - gem 'pg', '0.20.0' +# gem 'pg', '0.20.0' gem 'fog', '1.42' end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index fa4d619..465c05c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,15 +48,10 @@ GEM archive-zip (0.11.0) io-like (~> 0.3.0) arel (9.0.0) - autoprefixer-rails (9.1.3) - execjs bcrypt (3.1.12) bindex (0.5.0) bootsnap (1.3.2) msgpack (~> 1.0) - bootstrap-sass (3.3.7) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) bootstrap-will_paginate (1.0.0) will_paginate builder (3.2.3) @@ -85,12 +80,12 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) crass (1.0.4) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) dry-inflector (0.1.2) - erubi (1.7.1) + erubi (1.8.0) excon (0.62.0) execjs (2.7.0) ffi (1.9.25) @@ -255,7 +250,7 @@ GEM activesupport (>= 4.2.0) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.1.1) + i18n (1.4.0) concurrent-ruby (~> 1.0) io-like (0.3.0) ipaddress (0.8.3) @@ -282,20 +277,19 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mimemagic (0.3.2) + mimemagic (0.3.3) mini_magick (4.9.2) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.2.4) multi_json (1.13.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.9.1) + mini_portile2 (~> 2.4.0) ovirt-engine-sdk (4.2.5) json (>= 1, < 3) - pg (0.20.0) public_suffix (3.0.3) puma (3.12.0) rack (2.0.6) @@ -327,8 +321,8 @@ GEM thor (>= 0.19.0, < 2.0) rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) rbovirt (0.1.7) nokogiri rest-client (> 1.7.0) @@ -405,7 +399,6 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) bootsnap (>= 1.1.0) - bootstrap-sass (~> 3.3.7) bootstrap-will_paginate (= 1.0.0) byebug capybara (>= 2.15) @@ -417,7 +410,6 @@ DEPENDENCIES jquery-rails listen (>= 3.0.5, < 3.2) mini_magick (~> 4.8) - pg (= 0.20.0) puma (~> 3.11) rails (~> 5.2.1) sass-rails (~> 5.0) @@ -432,7 +424,7 @@ DEPENDENCIES will_paginate (= 3.1.6) RUBY VERSION - ruby 2.4.1p111 + ruby 2.5.1p57 BUNDLED WITH - 1.16.2 + 2.0.1 diff --git a/app/assets/images/169.jpg b/app/assets/images/169.jpg new file mode 100644 index 0000000..dabbdfb Binary files /dev/null and b/app/assets/images/169.jpg differ diff --git a/app/assets/images/dummy.jpg b/app/assets/images/dummy.jpg new file mode 100644 index 0000000..295f5f4 Binary files /dev/null and b/app/assets/images/dummy.jpg differ diff --git a/app/assets/images/gallery1.jpg b/app/assets/images/gallery1.jpg new file mode 100644 index 0000000..9576132 Binary files /dev/null and b/app/assets/images/gallery1.jpg differ diff --git a/app/assets/images/robo.gif b/app/assets/images/robo.gif new file mode 100644 index 0000000..a25b29c Binary files /dev/null and b/app/assets/images/robo.gif differ diff --git a/app/assets/images/wide.jpg b/app/assets/images/wide.jpg new file mode 100644 index 0000000..44ce788 Binary files /dev/null and b/app/assets/images/wide.jpg differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b8866b5..5634835 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,6 @@ // //= require jquery //= require jquery_ujs -//= require bootstrap //= require rails-ujs //= require activestorage //= require turbolinks diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss deleted file mode 100644 index 39d45bf..0000000 --- a/app/assets/stylesheets/conversations.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Conversations controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss deleted file mode 100644 index 2927b7b..0000000 --- a/app/assets/stylesheets/custom.scss +++ /dev/null @@ -1,256 +0,0 @@ -@import "bootstrap-sprockets"; -@import "bootstrap"; - -/* universal */ - -body { - padding-top: 60px; -} - -section { - overflow: auto; -} - -textarea { - resize: vertical; -} - -.center { - text-align: center; -} - -.center h1 { - margin-bottom: 10px; -} - - -/* typography */ - -h1, h2, h3, h4, h5, h6 { - line-height: 1; -} - -h1 { - font-size: 3em; - letter-spacing: -2px; - margin-bottom: 30px; - text-align: center; -} - -h2 { - font-size: 1.2em; - letter-spacing: -1px; - margin-bottom: 30px; - text-align: center; - font-weight: normal; - color: #777; -} - -p { - font-size: 1.1em; - line-height: 1.7em; -} - - -/* header */ - -#logo { - float: left; - margin-right: 10px; - font-size: 1.7em; - color: #fff; - text-transform: uppercase; - letter-spacing: -1px; - padding-top: 9px; - font-weight: bold; -} - -#logo:hover { - color: #fff; - text-decoration: none; -} - -/* footer */ - -footer { - margin-top: 45px; - padding-top: 5px; - border-top: 1px solid #eaeaea; - color: #777; -} - -footer a { - color: #555; -} - -footer a:hover { - color: #222; -} - -footer small { - float: left; -} - -footer ul { - float: right; - list-style: none; -} - -footer ul li { - float: left; - margin-left: 15px; -} - - -/* sidebar */ - -aside { - section.user_info { - margin-top: 20px; - } - section { - padding: 10px 0; - margin-top: 20px; - &:first-child { - border: 0; - padding-top: 0; - } - span { - display: block; - margin-bottom: 3px; - line-height: 1; - } - h1 { - font-size: 1.4em; - text-align: left; - letter-spacing: -1px; - margin-bottom: 3px; - margin-top: 0px; - } - } -} - -.gravatar { - float: left; - margin-right: 10px; -} - -.gravatar_edit { - margin-top: 15px; -} - -/* forms */ - -input, textarea, select, .uneditable-input { - border: 1px solid #bbb; - width: 100%; - margin-bottom: 15px; - -} - -input { - height: auto !important; -} - -#error_explanation { - color: red; - ul { - color: red; - margin: 0 0 30px 0; - } -} - -.field_with_errors { - @extend .has-error; - .form-control { - color: $state-danger-text; - } -} - -/* Users index */ - -.users { - list-style: none; - margin: 0; - li { - overflow: auto; - padding: 10px 0; - border-bottom: 1px solid $gray-lighter; - } -} - -/* projects */ - -.projects { - list-style: none; - padding: 0; - li { - padding: 10px 0; - border-top: 1px solid #e8e8e8; - } - .user { - margin-top: 5em; - padding-top: 0; - } - .content { - display: block; - margin-left: 60px; - img { - display: block; - padding: 5px 0; - } - } - .timestamp { - color: $gray-light; - display: block; - margin-left: 60px; - } - .gravatar { - float: left; - margin-right: 10px; - margin-top: 5px; - } -} - -aside { - textarea { - height: 100px; - margin-bottom: 5px; - } -} - -span.picture { - margin-top: 10px; - input { - border: 0; - } -} - -ul { - padding-left: 0px; - list-style: none; -} - -.messages-list { - max-height: 200px; - overflow-y: auto; - overflow-x: hidden; -} - -.message-sent { - position: relative; - background-color: #D9EDF7; - border-color: #BCE8F1; - margin: 5px 20px; - padding: 10px; - float: right; -} - - -.message-received { - background-color: #F1F0F0; - border-color: #EEEEEE; - margin: 5px 20px; - padding: 10px; - float: left; -} \ No newline at end of file diff --git a/app/assets/stylesheets/messages.scss b/app/assets/stylesheets/messages.scss deleted file mode 100644 index 492f0fa..0000000 --- a/app/assets/stylesheets/messages.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Messages controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss deleted file mode 100644 index 7b9c6ec..0000000 --- a/app/assets/stylesheets/projects.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Projects controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss deleted file mode 100644 index ccb1ed2..0000000 --- a/app/assets/stylesheets/sessions.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Sessions controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/static_pages.scss b/app/assets/stylesheets/static_pages.scss deleted file mode 100644 index d55836c..0000000 --- a/app/assets/stylesheets/static_pages.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the StaticPages controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/styles.css b/app/assets/stylesheets/styles.css new file mode 100644 index 0000000..a13d126 --- /dev/null +++ b/app/assets/stylesheets/styles.css @@ -0,0 +1,260 @@ +.dropdown-menu-right.show { + left: -128px; +} + +@media only screen and (min-width: 768px) { + .sn-btn { + visibility: hidden; + } +} + +@media only screen and (max-width: 768px) { + .al { + text-align: left; + } +} + +.pic { + width: 50px; + padding: 5px; +} + +.img-header { + height: 120px; +} + +.gradient-overlay { + background: #c21500; + background: -webkit-linear-gradient(to left, #c21500, #ffc500); + background: linear-gradient(to left, #c21500, #ffc500); + opacity: 0.5; + position: absolute; + top: 0; + width: 100%; + height: 100vh; +} + +.ihg { + background-color: #08AEEA; + background-image: linear-gradient(315deg, #08AEEA 0%, #2AF598 100%); +} + +.ihp { + background-image: linear-gradient(120deg, #d4fc79 0%, #96e6a1 100%); +} + +.ihws { + background-color: rgba(0, 33, 71, 1); + background-image: radial-gradient(circle farthest-corner at 10% 20%, rgba(47, 183, 186, 1) 0%, rgba(0, 33, 71, 1) 90%); +} + +.ihh { + background-image: radial-gradient(circle farthest-corner at 10% 20%, rgba(221, 221, 221, 1) 0.1%, #bbb 90%); + height: 490px; +} + +.ihh2 { + background-image: radial-gradient(circle 767px at 10.2% 22.1%, rgba(11, 218, 80, 0.63) 0%, rgba(0, 191, 255, 0.5) 90%); + height: 350px; +} + +.ihu { + background-image: radial-gradient(circle 702px at 11% 74.1%, rgb(116, 180, 233) 0%, #00b0ff 90%); +} + +.head-space { + height: 20px; +} + +.ws-text { + visibility: hidden; + display: none; +} + +.my-fab { + position: relative; + left: 86%; + bottom: -42px; +} + +@media only screen and (min-width: 574px) { + .ihh { + height: 450px; + } +} + +@media only screen and (min-width: 768px) { + .img-header { + height: 180px; + } + + .head-space { + height: 60px; + } + + .ihh { + height: 320px; + } + + .ws-text { + visibility: visible; + display: initial; + } + +} + +.m-icn { + vertical-align: middle; + position: relative; + top: -2px; + left: -4px; +} + +.page-footer { + padding-top: 20px; + padding-bottom: 45px; + color: #d4d3d3f8; + background-color: #000; +} + +.page-footer .footer-copyright { + overflow: hidden; + min-height: 42px; + display: flex; + align-items: center; + justify-content: space-between; + padding: 10px 0px; + color: #000; + background-color: #48d8ad; + position: fixed; + bottom: 0px; + width: 100%; + z-index: 2; +} + +.footer-link { + padding: 3px 15px; + color: #6bff15; +} + +.bmd-layout-content { + min-height: calc(100vh - 51px); +} + +.gravatar { + display: block; + margin: auto; +} + +.blk { + display: block; +} + +form.edit_user { + margin-bottom: 0; +} + +.cls-btn { + font-size: 25px !important; + top: -10px; + right: -20px; +} + +.snd-btn { + top: 10px; + right: 5px; +} + +ul { + list-style-type: none; + margin: 0; + padding: 0; +} + +.msg { + display: block; + padding: 2px 10px; + max-width: 90%; +} + +.message-sent .msg { + background-color: #00ff55a6; + border-radius: 10px 10px 2px 10px; +} + +.message-sent { + justify-content: flex-end; +} + +.message-received .msg { + background-color: #6f00ff4d; + border-radius: 2px 10px 10px 10px; +} + +.chat { + padding: 0 8px; + margin: 5px 18px; + font-size: 18px; + line-height: 1.8; + position: relative; + display: flex; +} + +.messages-list { + overflow: auto; + max-height: 320px; +} + +.new_message { + margin: 0; +} + +.card-close { + top: 0; + right: 0; +} + +a.toggle-window { + color: rgb(0, 255, 85); + font-size: 19px; +} + +a:hover { + color: rgb(69, 105, 98); + text-decoration: none; +} + +#project_picture { + width: 100%; +} + +#project_content { + height: 200px; + border-right: 1px solid #a0a3a77a; +} +.vdivider{ + overflow: hidden; + border-right: 1px solid #e9ecef; +} + + +/*/////////////////////// ScrollBar //////////////////////////*/ +/* width */ +::-webkit-scrollbar { + width: 6px; +} + +/* Track */ +::-webkit-scrollbar-track { + background: #f1f1f1; +} + +/* Handle */ +::-webkit-scrollbar-thumb { + background: #888; +} + +/* Handle on hover */ +::-webkit-scrollbar-thumb:hover { + background: #555; +} \ No newline at end of file diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss deleted file mode 100644 index 31a2eac..0000000 --- a/app/assets/stylesheets/users.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Users controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/views/conversations/_conversation.html.erb b/app/views/conversations/_conversation.html.erb index 915b4d8..bf02da8 100644 --- a/app/views/conversations/_conversation.html.erb +++ b/app/views/conversations/_conversation.html.erb @@ -1,24 +1,28 @@ -
  • -
    -
    - <%= link_to conversation.opposed_user(user).email, '', class: 'toggle-window' %> - <%= link_to "x", close_conversation_path(conversation), class: "btn btn-default btn-xs pull-right", remote: true, method: :post %> -
    +
  • +
    +
    +
    +
    + <%= link_to conversation.opposed_user(user).email, '', class: 'toggle-window px-2' %> +
    + <%= link_to "close".html_safe, close_conversation_path(conversation), class: "btn btn-danger bmd-btn-icon card-close", remote: true, method: :post %> +
    - -
    -
    • \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 09ebbe4..20a3509 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,71 +1,138 @@ - - Robodarshan - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - + + Robodarshan + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + - -
    -
    - <%= link_to "Robodarshan", root_path, id: "logo" %> - + -
    -
    - <% flash.each do |message_type, message| %> - <%= content_tag(:div, message, class: "alert alert-#{message_type}") %> - <% end %> +
    + - <%= yield %> +
    + <% if logged_in? %> + <%= link_to "Profile", current_user , :class => "dropdown-item"%> + <%= link_to "Settings", edit_user_path(current_user) , :class => "dropdown-item"%> +
    + <%= link_to "Log out", logout_path, method: :delete , :class => "dropdown-item"%> + <% else %> + <%= link_to "Log in", login_path , :class => "dropdown-item"%> + <%= link_to "Sign up", signup_path, :class => "dropdown-item"%> + <% end %> +
    +
    +
    + + +
    + +
    +
    + Robodarshan +
    +
      + <%= link_to "Home", root_path , :class => "list-group-item"%> + <%= link_to "Our Projects", project_under_rbd_path , :class => "list-group-item"%> + <%= link_to "Workshops and Tutorials", workshops_path , :class => "list-group-item"%> + <%= link_to "Gallery", gallery_path , :class => "list-group-item"%> + <% if logged_in? %> + <% if current_user.admin? %> + <%= link_to "Approve projects", '/projects_approve', method: :get , :class => "list-group-item"%> + <%= link_to "Choose Admin", '/admin_approve', method: :get , :class => "list-group-item"%> + <% end %> + <%= link_to "chat", '/chat' , :class => "list-group-item"%> + <%= link_to "Users", users_path , :class => "list-group-item"%> + + <% end %> +
    -
    - - -
    - - +
    + + <% flash.each do |message_type, message| %> + <%= content_tag(:div, message, class: "alert text-center alert-#{message_type}") %> + <% end %> + <%= yield %> +
    +
    +
    +
    +
    +
    +
    +

    Robodarshan

    +

    Indian Institute of Engineering Science and Technology, Shibpur

    + +
    +
    + +91-8967120574
    robodarshan@gmail.com +

    P.O. - Botanic Garden
    Howrah - 711103
    West Bengal, India

    +
    +
    +
    +
    +
    +
    Links
    + <%= link_to "Contact Us", '#', class: "footer-link" %> + <%= link_to "Team", '#', class: "footer-link" %> +
    +
    +
    +
    +
    +
    + © 2018 Robodarshan | IIEST +
    +
    +
    +
    + + + + + + + \ No newline at end of file diff --git a/app/views/messages/_message.html.erb b/app/views/messages/_message.html.erb index cda0647..a4ab50c 100644 --- a/app/views/messages/_message.html.erb +++ b/app/views/messages/_message.html.erb @@ -1,7 +1,5 @@ -
  • -
    -
    - <%= message.body %> -
    -
    -
    • \ No newline at end of file +
    +

    + <%= message.body %> +

    +
    \ No newline at end of file diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index a385f2b..ac137b3 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -1,18 +1,47 @@ -
  • - <%= link_to gravatar_for(project.user, size: 50), project.user %> - <%= link_to project.user.name, project.user %> - - <%= project.title %> - <%= project.content %> - <% project.pictures.each do |p| %> - <%= image_tag p.url %> - <% end %> - - - Posted <%= time_ago_in_words(project.created_at) %> ago. - <% if current_user?(project.user) %> - <%= link_to "delete", project, method: :delete, data: { confirm: "You sure?"} %> - <%= link_to "edit", "/projects/#{project.id}/edit", method: :get %> - <% end %> - -
    • \ No newline at end of file +
    +
    +
    +
    +
    + <%= link_to gravatar_for(project.user, size: 50), project.user %> +
    +
    +

    + <%= project.title %> +

    + <%= link_to project.user.name, project.user, :class => "text-muted h6" %> + + Posted + <%= time_ago_in_words(project.created_at) %> ago. + +
    +
    +
    + <% if project.picture? %> +
    + <% else %> +
    + <% end %> +
    Project Details
    +

    + <%= project.content %> +

    +
    + <% if project.picture? %> +
    + Responsive image +
    + <% end %> +
    +
    +
    +
    + <% if current_user?(project.user) %> + <%= link_to "delete", project, method: :delete, data: { confirm: "You sure to Delete?"}, :class => 'btn btn-danger' %> +
    + <%= link_to "edit", "/projects/#{project.id}/edit", method: :get, :class => 'btn btn-info' %> + <% end %> +
    +
    +
    +
    \ No newline at end of file diff --git a/app/views/projects/edit.html.erb b/app/views/projects/edit.html.erb index 08e0e03..3b753ca 100644 --- a/app/views/projects/edit.html.erb +++ b/app/views/projects/edit.html.erb @@ -1,8 +1,6 @@ <% if logged_in? %>
    -
    <%= render 'shared/project_form' %> -
    <% else %>

    Please login first !

    diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 9fa3fce..c293271 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -1,9 +1,5 @@ <% if logged_in? %> -
    -
    - <%= render 'shared/project_form' %> -
    -
    - <% else %> -

    Please login first !

    - <% end %> +<%= render 'shared/project_form' %> +<% else %> +

    Please login first !

    +<% end %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index fbcca34..9734515 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,19 +1,26 @@ <% provide(:title, "Log in") %> -

    Log in

    - -
    -
    - <%= form_for(:session, url: login_path) do |f| %> - - <%= f.label :email %> - <%= f.email_field :email, class: 'form-control' %> - - <%= f.label :password %> - <%= f.password_field :password, class: 'form-control' %> - - <%= f.submit "Log in", class: "btn btn-primary" %> - <% end %> - -

    New user? <%= link_to "Sign up now!", signup_path %>

    +
    +
    +
    +
    +

    Account Login

    + <%= form_for(:session, url: login_path) do |f| %> +
    + <%= f.label :email, class: 'bmd-label-floating' %> + <%= f.email_field :email, class: 'form-control' %> +
    +
    + <%= f.label :password, class: 'bmd-label-floating' %> + <%= f.password_field :password, class: 'form-control' %> +
    +
    + <%= f.submit "Log in", class: "btn btn-success" %> +
    + <% end %> +

    New user? + <%= link_to "Sign up now!", signup_path %> +

    +
    +
    -
    +
    \ No newline at end of file diff --git a/app/views/shared/_feed.html.erb b/app/views/shared/_feed.html.erb index dc838ff..f848902 100644 --- a/app/views/shared/_feed.html.erb +++ b/app/views/shared/_feed.html.erb @@ -1,6 +1,6 @@ <% if @feed_items.any? %> -
      +
      <%= render @feed_items %> -
    +
    <%= will_paginate @feed_items %> <% end %> \ No newline at end of file diff --git a/app/views/shared/_project_form.html.erb b/app/views/shared/_project_form.html.erb index 869c07f..d927900 100644 --- a/app/views/shared/_project_form.html.erb +++ b/app/views/shared/_project_form.html.erb @@ -1,28 +1,60 @@ -<%= form_for(@project) do |f| %> - <%= render 'shared/error_messages', object: f.object %> -
    - <%= f.text_area :title, placeholder: "Write the title of the project" %> - <%= f.text_area :content, placeholder: "Write project's discription " %> - <%= f.label :send_for_approval, class: 'checkbox' do %> - <%= f.check_box :send_for_approval %> - Send for approval -<% end %> +
    +
    +
    +
    +

    Project

    + <%= form_for(@project) do |f| %> +
    +
    +
    + <%= f.label :project_title, class: 'bmd-label-floating' %> + <%= f.text_field :title, class: 'form-control'%> +
    +
    + + <%= f.file_field :picture, accept: 'image/jpeg,image/gif,image/png', class: 'btn btn-info' %> + +
    +
    +
    +
    + <%= f.text_area :content, class: 'form-control' %> + <%= f.label :full_description_of_the_project, class: 'bmd-label-floating' %> +
    +
    +
    +
    + <%= f.label :send_for_approval, class: 'checkbox' do %> +
    + <%= f.check_box :send_for_approval %> + Send for approval +
    + <% end %> +
    + + <%= f.label :pictures %> + <%= f.file_field :pictures, multiple: true, accept: 'image/jpeg,image/gif,image/png' %> + +
    + <%= f.submit "Post", class: "btn btn-success" %> + <% end %> +
    + +
    +
    - - - <%= f.label :pictures %> - <%= f.file_field :pictures, multiple: true, accept: 'image/jpeg,image/gif,image/png' %> - +
    + + <%= f.submit "Post", class: "btn btn-primary" %> <% end %> - + \ No newline at end of file diff --git a/app/views/shared/_user_info.html.erb b/app/views/shared/_user_info.html.erb index 57e7144..b4685f4 100644 --- a/app/views/shared/_user_info.html.erb +++ b/app/views/shared/_user_info.html.erb @@ -1,5 +1,20 @@ -<%= link_to gravatar_for(current_user, size: 50), current_user %> -

    <%= current_user.name %>

    -<%= link_to "view my profile", current_user %> - -<%= pluralize(current_user.projects.count, "Project") %> \ No newline at end of file +
    +
    +
    + <%= link_to gravatar_for(current_user, size: 150), current_user %> +
    +
    +

    + <%= current_user.name %> +

    +
    + <%= link_to "View Profile", current_user %> +
    + + <%= pluralize(current_user.projects.count, "Project") %> +
    + <%= link_to "Start a new Project", new_project_path , class: "btn btn-raised btn-success" %> +
    +
    +
    +
    \ No newline at end of file diff --git a/app/views/static_pages/chat.html.erb b/app/views/static_pages/chat.html.erb index 9176c2d..8a0e4c2 100644 --- a/app/views/static_pages/chat.html.erb +++ b/app/views/static_pages/chat.html.erb @@ -1,24 +1,32 @@ -
    -
    -
      - <% @conversations.each do |conversation| %> - <%= render 'conversations/conversation', conversation: conversation, user: current_user %> - <% end %> -
    +
    +
    +
    +

    Chat

    +

    Some text here

    - -
    -
    -
    -

    User list

    -
    -
    +
    +
    +
    +
    +
    +

    + User List +

      <% @users.each do |user| %> -
    • <%= link_to user.name, conversations_path(user_id: user), remote: true, method: :post %>
      • +
    • + <%= link_to user.name, conversations_path(user_id: user), remote: true, method: :post, class: 'list-group-item list-group-item-action' %> +
      • <% end %>
    +
    +
      + <% @conversations.each do |conversation| %> + <%= render 'conversations/conversation', conversation: conversation, user: current_user %> + <% end %> +
    +
    \ No newline at end of file diff --git a/app/views/static_pages/gallery.html.erb b/app/views/static_pages/gallery.html.erb index 173840f..8f09df5 100644 --- a/app/views/static_pages/gallery.html.erb +++ b/app/views/static_pages/gallery.html.erb @@ -1,2 +1,120 @@ -

    StaticPages#gallery

    -

    Find me in app/views/static_pages/gallery.html.erb

    +
    +
    +
    +

    Gallery

    +

    Some text here

    +
    +
    +
    +
    +
    +
    +
    +
    Album title
    +
    Album details
    +
    +
    + Responsive image +
    +
    +
    +
    + Responsive image +
    +
    + Responsive image +
    +
    +
    +
    +
    +
    +
    + Responsive image +
    +
    + Responsive image +
    +
    + Responsive image +
    +
    + Responsive image +
    +
    +
    + +
    +
    +
    +
    +
    Album title
    +
    Album details
    +
    +
    +
    +
    + Responsive image +
    +
    + Responsive image +
    +
    +
    +
    + Responsive image +
    +
    +
    +
    +
    + Responsive image +
    +
    + Responsive image +
    +
    + Responsive image +
    +
    + Responsive image +
    +
    +
    + +
    +
    +
    +
    + +
    + + \ No newline at end of file diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb index 992e8b4..e8c4e24 100644 --- a/app/views/static_pages/home.html.erb +++ b/app/views/static_pages/home.html.erb @@ -1,34 +1,77 @@ <% provide(:title, "Home") %> <% if logged_in? %> +
    - -
    -

    Projects

    - <%= render 'shared/feed' %> +
    + <%= render 'shared/user_info' %> +
    +
    +
    +

    Projects

    + <%= render 'shared/feed' %> +
    +
    - <% else %> - -
    -

    Robodarshan

    -

    - ROBODARSHAN, the Robotics Society of IIEST Shibpur, is one of the most active student societies helping in inculcating among students the scientific temper & zeal to show how robotics is closely related to our daily world and how they make our lives easier by "AUTOMATON". -

    -

    - Founded in 2009, the club became an official part of "Centre for Creative Expressions" in 2011 and since then the club has been progressing with leaps and bounds. Thanks to the intelligent students who become active members of this club enabling smooth functioning by occupying key positions of responsibilities. The club now operates under "HJBSIC-ROBODARSHAN", along with Student’s Innovation Centre, under the able guidance of Prof. Syed Minhaz Hossain, our professor-in-charge as well as our mentor. -

    -

    - We believe “There’s nothing a bot can’t do!!” -

    -

    Want to manage your project in collaboration with Robodarshan, <%= link_to "Sign up now!", signup_path, class: "btn btn-lg btn-primary" %> +

    +
    +
    +
    +
    +

    Robodarshan

    +

    + ROBODARSHAN, the Robotics Society of IIEST Shibpur, is one of the most active student societies helping in + inculcating among students the scientific temper & zeal to show how robotics is closely related to our daily + world and how they make our lives easier by "AUTOMATON".

    +
    +
    + Responsive image +
    +
    +
    +
    +
    +
    +
    +
    +
    + Responsive image +
    +
    +

    Who we are

    +

    + Founded in 2009, the club became an official part of "Centre for Creative Expressions" in 2011 and since then + the + club has been progressing with leaps and bounds. Thanks to the intelligent students who become active members + of + this club enabling smooth functioning by occupying key positions of responsibilities. The club now operates + under + "HJBSIC-ROBODARSHAN", along with Student’s Innovation Centre, under the able guidance of Prof. Subhasis + Bhaumik, our professor-in-charge as well as our mentor.

    +
    +
    +
    -<% end %> +
    +
    +
    +
    +

    Robodarshan

    +
    +

    + We believe “There’s nothing a bot can’t do!!” +

    +

    Want to manage your project in collaboration with Robodarshan

    + <%= link_to "Sign up now!", signup_path, class: "btn btn-lg btn-success" %> +
    +
    +
    +
    +
    + +
    +
    + <% end %> \ No newline at end of file diff --git a/app/views/static_pages/project_under_rbd.html.erb b/app/views/static_pages/project_under_rbd.html.erb index 4ca65a6..e59e98d 100644 --- a/app/views/static_pages/project_under_rbd.html.erb +++ b/app/views/static_pages/project_under_rbd.html.erb @@ -1,8 +1,20 @@ -

    Our Projects

    +
    +
    +
    +

    Our Projects

    +

    These are the projects created by our super enthusiastic students

    +
    +
    <% @users.each do |user| %> <% user.projects.each do |project| %> <% if project.approved? %> -
  • <%= render project %>
    • -<% end %> +
    +
    +
    + <%= render project %> +
    +
    +
    <% end %> <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/static_pages/workshops.html.erb b/app/views/static_pages/workshops.html.erb index d6ac8ec..2a55432 100644 --- a/app/views/static_pages/workshops.html.erb +++ b/app/views/static_pages/workshops.html.erb @@ -1,2 +1,96 @@ -

    StaticPages#workshops

    -

    Find me in app/views/static_pages/workshops.html.erb

    +
    +
    +
    +

    Workshops

    +

    Some text here

    +
    +
    +
    +
    +
    +
    Featured
    +
    +
    + +
    +
    +
    +

    some text here

    +
    +
    +
    +
    +
    +

    All Workshops

    +
    +
    +
    +
    + Responsive image +
    +
    +
    +

    Line following bot with Arduino

    +
    +
    +
    +
    +
    +
    +
    Details
    +

    Details of the project....

    +
    +
    +
    Attached Materials
    +

    Here we have provided the required materials to help and speed up your development! + Happy + tinkering ;)

    +
    Download 1
    +
    Download 2
    +
    Download 3
    +
    +
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb index fbbca67..998d333 100644 --- a/app/views/users/_user.html.erb +++ b/app/views/users/_user.html.erb @@ -1,12 +1,18 @@ -
  • - <%= gravatar_for user, size: 50 %> - <%= link_to user.name, user %> - <% if user != current_user %> -
  • <%= link_to "Message me", conversations_path(user_id: user), remote: true, method: :post %>(<%= link_to "see chats", chat_path %>)
    • - <% end %> - <% if current_user.admin? && !current_user?(user) %> - | <%= link_to "delete", user, method: :delete, - data: { confirm: "You sure?" } %> - <% end %> - - \ No newline at end of file +
    +
    +
    + <%= gravatar_for user, size: 100 %> + <%= link_to user.name, user, class: 'h5 pt-2' %> + <% if user != current_user %> +
    + <%= link_to "Message me", conversations_path(user_id: user), remote: true, method: :post %> +
    + (<%= link_to "see chats", chat_path %>) + <% end %> + <% if current_user.admin? && !current_user?(user) %> +
    + <%= link_to "delete", user, method: :delete, data: { confirm: "You sure?" } %> + <% end %> +
    +
    +
    \ No newline at end of file diff --git a/app/views/users/admin_approve.html.erb b/app/views/users/admin_approve.html.erb index aeabb66..47aa22d 100644 --- a/app/views/users/admin_approve.html.erb +++ b/app/views/users/admin_approve.html.erb @@ -1,18 +1,22 @@ - -<% @users.each do |user| %> -<% if user != current_user %> - -<%= form_for(user) do |f| %> -
  • -<%= gravatar_for user, size: 50 %> - <%= link_to user.name, user %> -
    • - -<%= f.label :admin, class: 'checkbox' do %> - <%= f.check_box :admin %> - Make Admin -<% end %> -<%= f.submit "Confirm", class: "btn btn-primary" %> -<% end %> -<% end %> -<% end %> \ No newline at end of file +
    +
    + <% @users.each do |user| %> + <% if user != current_user %> +
    +
    +
    + <%= gravatar_for user, size: 100 %> + <%= link_to user.name, user, class: 'h5 my-1 blk' %> + <%= form_for(user) do |f| %> + <%= f.label :admin, class: 'checkbox' do %> + <%= f.check_box :admin %>Admin + <% end %> + <%= f.submit "Apply", class: "btn btn-primary" %> +
    +
    +
    + <% end %> + <% end %> + <% end %> +
    +
    \ No newline at end of file diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 15de3d5..e7b3045 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,10 +1,14 @@ <% provide(:title, 'All users') %> -

    All users

    +
    +
    +

    All Users

    +
    +
    <%= will_paginate %> - -
      - <%= render @users %> -
    - +
    +
    + <%= render @users %> +
    +
    <%= will_paginate %> \ No newline at end of file diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 7e235a3..ba7ccc1 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,27 +1,39 @@ <% provide(:title, 'Sign up') %> -

    Sign up

    - -
    -
    - <%= form_for(@user, url: signup_path) do |f| %> - <%= render 'shared/error_messages', object: f.object %> - - <%= f.label :name %> - <%= f.text_field :name, class: 'form-control' %> - - <%= f.label :email %> - <%= f.email_field :email, class: 'form-control' %> - - <%= f.label :enroll, "Enrollment ID" %> - <%= f.number_field :enroll, class: 'form-control' %> - - <%= f.label :password %> - <%= f.password_field :password, class: 'form-control' %> - - <%= f.label :password_confirmation, "Confirmation" %> - <%= f.password_field :password_confirmation, class: 'form-control' %> - - <%= f.submit "Create my account", class: "btn btn-primary" %> - <% end %> +
    +
    +
    +
    +

    Account Login

    + <%= form_for(@user, url: signup_path) do |f| %> + <%= render 'shared/error_messages', object: f.object %> +
    + <%= f.label :name, class: 'bmd-label-floating' %> + <%= f.text_field :name, class: 'form-control' %> +
    +
    + <%= f.label :email, class: 'bmd-label-floating' %> + <%= f.email_field :email, class: 'form-control' %> +
    +
    + <%= f.label :enroll, "Enrollment ID", class: 'bmd-label-floating' %> + <%= f.number_field :enroll, class: 'form-control' %> +
    +
    + <%= f.label :password, class: 'bmd-label-floating' %> + <%= f.password_field :password, class: 'form-control' %> +
    +
    + <%= f.label :password_confirmation, "Confirmation", class: 'bmd-label-floating' %> + <%= f.password_field :password_confirmation, class: 'form-control' %> +
    +
    + <%= f.submit "Create my account", class: "btn btn-success" %> +
    + <% end %> +

    Already registered? + <%= link_to "Log in!", login_path %> +

    +
    +
    \ No newline at end of file diff --git a/app/views/users/projects_approve.html.erb b/app/views/users/projects_approve.html.erb index 01569a9..f2e4f53 100644 --- a/app/views/users/projects_approve.html.erb +++ b/app/views/users/projects_approve.html.erb @@ -1,15 +1,19 @@ -<% @users.each do |user| %> -<% user.projects.each do |project| %> -<% if project.send_for_approval? %> - -<%= form_for(project) do |f| %> -<%= render project %> -<%= f.label :approved, class: 'checkbox' do %> - <%= f.check_box :approved %> - Approve -<% end %> -<%= f.submit "Confirm", class: "btn btn-primary" %> -<% end %> -<% end %> -<% end %> -<% end %> \ No newline at end of file +
    + <% @users.each do |user| %> + <% user.projects.each do |project| %> + <% if project.send_for_approval? %> + <%= form_for(project) do |f| %> + <%= render project %> +
    + <%= f.label :approved, class: 'checkbox py-3 mb-1' do %> + <%= f.check_box :approved %> + Approved + <% end %> + <%= f.submit "Confirm", class: "btn btn-primary" %> + <% end %> +
    + <% end %> +
    + <% end %> + <% end %> +
    \ No newline at end of file diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b4f917b..b3ae51f 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,21 +1,29 @@ <% provide(:title, @user.name) %> -
    - -
    - <% if @user.projects.any? %> -

    Projects (<%= @user.projects.count %>)

    +
    +
    +
    + +
    +
    + <%= gravatar_for @user %> +
    +
    +

    + <%= @user.name %> +

    +
    +
    + +
    +
    + <% if @user.projects.any? %> +

    Projects (<%= @user.projects.count %>)

      <%= render @projects %>
    <%= will_paginate @projects %> - <% end %> -
    + <% end %> +
    +
    \ No newline at end of file diff --git a/db/seeds.rb b/db/seeds.rb index 3faea55..d54698c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,9 +5,9 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) -User.create!(name: "kate", - enroll: "211111111", - email: "kate@gmail.com", - password: "thoughtworks", - password_confirmation: "thoughtworks", +User.create!(name: "superuser", + enroll: "123456789", + email: "su@gmail.com", + password: "123456", + password_confirmation: "123456", admin: true)