From 2834c6df77e1b7a60a741e85d8f9696476751023 Mon Sep 17 00:00:00 2001 From: Minank-KP <107191059+Minank-KP@users.noreply.github.com> Date: Wed, 15 Feb 2023 21:17:46 +0000 Subject: [PATCH 1/4] week 5 assignment completed --- .../app/assets/stylesheets/light-mode.css | 904 ++++++++++++++++++ .../app/controllers/activities_controller.rb | 6 + .../app/controllers/application_controller.rb | 1 + .../controllers/static_pages_controller.rb | 8 + .../app/helpers/static_pages_helper.rb | 2 + week_5/activity-tracker/app/models/user.rb | 6 + .../app/views/activities/_activity.html.erb | 57 +- .../app/views/activities/_form.html.erb | 81 +- .../app/views/activities/edit.html.erb | 15 +- .../app/views/activities/index.html.erb | 14 +- .../app/views/activities/new.html.erb | 14 +- .../app/views/activities/show.html.erb | 9 +- .../app/views/activities/stats.html.erb | 15 + .../app/views/layouts/application.html.erb | 12 +- .../app/views/shared/_navbar.html.erb | 14 + .../app/views/static_pages/about.html.erb | 2 + .../app/views/static_pages/index.html.erb | 14 + .../config/initializers/devise.rb | 2 +- week_5/activity-tracker/config/routes.rb | 14 +- .../20230214171052_devise_create_users.rb | 44 + week_5/activity-tracker/db/schema.rb | 14 +- .../static_pages_controller_test.rb | 13 + .../activity-tracker/test/fixtures/users.yml | 11 + .../activity-tracker/test/models/user_test.rb | 7 + 24 files changed, 1174 insertions(+), 105 deletions(-) create mode 100644 week_5/activity-tracker/app/assets/stylesheets/light-mode.css create mode 100644 week_5/activity-tracker/app/controllers/static_pages_controller.rb create mode 100644 week_5/activity-tracker/app/helpers/static_pages_helper.rb create mode 100644 week_5/activity-tracker/app/models/user.rb create mode 100644 week_5/activity-tracker/app/views/activities/stats.html.erb create mode 100644 week_5/activity-tracker/app/views/shared/_navbar.html.erb create mode 100644 week_5/activity-tracker/app/views/static_pages/about.html.erb create mode 100644 week_5/activity-tracker/app/views/static_pages/index.html.erb create mode 100644 week_5/activity-tracker/db/migrate/20230214171052_devise_create_users.rb create mode 100644 week_5/activity-tracker/test/controllers/static_pages_controller_test.rb create mode 100644 week_5/activity-tracker/test/fixtures/users.yml create mode 100644 week_5/activity-tracker/test/models/user_test.rb diff --git a/week_5/activity-tracker/app/assets/stylesheets/light-mode.css b/week_5/activity-tracker/app/assets/stylesheets/light-mode.css new file mode 100644 index 00000000..a50f474f --- /dev/null +++ b/week_5/activity-tracker/app/assets/stylesheets/light-mode.css @@ -0,0 +1,904 @@ +:root { + /* Colors */ + --primary: #49c195; + --secondary: #5e5e5e; + --success: #28a745; + --info: #17a2b8; + --warning: #ffc107; + --danger: #dc3545; + --focus: #007bff; + --alternate: #712cf9; + + /* Borders */ + --primary-border: #349672; + --secondary-border: #d3d3d3; + --success-border: #28a745; + --info-border: #17a2b8; + --warning-border: #ffc107; + --danger-border: #dc3545; + --focus-border: #007bff; + --alternate-border: #8f33b1; + + /* Text */ + --text: #212529; + --text-disabled: #6c757d; + --placeholder-text: #6c757d; + --primary-text: #bf27a3; + --secondary-text:white; + --success-text: #28a745; + --info-text: #17a2b8; + --warning-text: #ca370f; + --danger-text: #14c422; + --focus-text: #007bff; + --alternate-text: #e3872b; + + /* Table */ + --table-border: #dee2e6; + --table-hover: #f8f9fa; + + /* Other */ + --switchery-background: #dee2e6; + --loader-img: #212529; + --form-control-bg: #f8f9fa; + --form-control-border: #ced4da; + --primary-checkbox: #0077cc; + --toggle-light-mode-text: #212529; + --profile-update-detail: #0077cc; +} + +/* Placeholder for input */ +::-webkit-input-placeholder { + /* WebKit, Blink, Edge */ + color: var(--placeholder-text) !important; +} + +:-moz-placeholder { + /* Mozilla Firefox 4 to 18 */ + color: var(--placeholder-text) !important; + opacity: 1; +} + +::-moz-placeholder { + /* Mozilla Firefox 19+ */ + color: var(--placeholder-text) !important; + opacity: 1; +} + +:-ms-input-placeholder { + /* Internet Explorer 10-11 */ + color: var(--placeholder-text) !important; +} + +::-ms-input-placeholder { + /* Microsoft Edge */ + color: var(--placeholder-text) !important; +} + +::placeholder { + /* Most modern browsers support this now. */ + color: var(--placeholder-text) !important; +} + +input { + color: var(--text) !important; + background: var(--form-control-bg); + border: 1px solid var(--form-control-border); +} + +/* Text color */ +body { + color: var(--text); + background:white; +} + +a { + /* TODO: Change link colors */ + color: white !important; +} + +.text-primary { + color: var(--primary-text) !important; +} + +.text-secondary { + color: var(--secondary-text) !important; +} + +.text-alternate { + color: var(--alternate-text) !important; +} + +/* Top Bar */ +.bg-royal { + background-image: linear-gradient(to right, #1b1b1b, #000000) !important; +} + +/* Title-Nav Bar */ +.app-theme-gray .app-header { + background: #030607; + -webkit-box-shadow: -1px 14px 44px -4px rgba(0, 0, 0, 0.65); + -moz-box-shadow: -1px 14px 44px -4px rgba(0, 0, 0, 0.65); + box-shadow: -1px 14px 44px -4px rgba(0, 0, 0, 0.65); +} + +.horizontal-nav-menu>li>a span::before { + background: var(--primary); +} + +.app-theme-gray .app-page-title { + border-bottom: none; +} + +.header-mobile-open { + background: #1a1a1a; + border-color: #151515; +} + +/* IRIS LOGO */ +.app-header__logo { + background: var(--primary); +} + +/* Page Title -- Bread crumb Bar */ +.app-theme-gray .app-page-title { + background: #1a1a1a; +} + +.app-page-title .page-title-wrapper::before { + background: var(--primary); +} + +/* show/hide menu bar */ +.app-theme-gray .app-inner-bar { + background: #262626; + border-bottom: none; +} + +/* menu */ +.dropdown-menu { + background-color: #262626; +} + +.header-mobile-open .horizontal-nav-menu { + background-color: #212121; +} + +.header-mobile-open .horizontal-nav-menu>li { + border-color: #1f1f1f; +} + +/* side bar color */ +.app-inner-layout__sidebar { + background: #1e1e1e !important; + color: white; +} + +.dropdown-item { + color: white; +} + +.dropdown-item:hover, +.dropdown-item:focus { + color: #fff; + background: var(--primary-border); +} + +.dropdown-item.active, +.dropdown-item:active { + color: #fff; + text-decoration: none; + background-color: var(--primary); +} + +.app-inner-layout.app-inner-layout-page .app-inner-layout__wrapper .app-inner-layout__sidebar { + border-right: none; +} + +.app-main__inner { + background: #1a1a1a; +} + +/* content body */ +.app-inner-layout__wrapper { + background: #1a1a1a; +} + +/* HEADER */ + +.header-btn-lg::before { + background: #474747; +} + +.grid-menu [class*="col-"] { + border-right: #474747 solid 0; + border-bottom: #474747 solid 1px; +} + +.nav-item.nav-item-header { + color: var(--secondary-text); +} + +.divider { + background: #474747; +} + +/* When scrolling up to the top, a small bar or 2 appears. Color of bar is this */ +.app-theme-gray.app-container { + background: rgb(26, 26, 26); +} + +/* FOOTER */ +.app-wrapper-footer .app-footer { + border: none; +} + +.app-theme-gray .app-footer { + background: #131313; +} + +.footer-dots .dots-separator { + background: #474747; +} + +.list-group-item { + background-color: transparent; +} + +.border-light { + border-color: #2a2a2a !important; +} + +.widget-numbers { + color: var(--text); +} + +/* FORMS */ + +select { + background-color: #f5f5f5; + border-color: #ddd; + color: #333; +} + +.form-control { + background: #f5f5f5; + border-color: #ddd; + color: #333; +} + +.form-control:focus { + background-color: #eee; + border-color: #66afe9; + color: #333; +} + +.form-control:disabled, +.form-control[readonly] { + background-color: #292929 !important; +} + +.input-group-text { + background-color: #f5f5f5; + border: 1px solid #ddd; + color: #333; +} + +.custom-select { + color: #333; + background-color: #f5f5f5; + border-color: #ddd; +} + +.custom-select:focus { + border-color: #66afe9; + box-shadow: 0 0 0 0.2rem #ccebff; +} + +.custom-control-label::before { + background-color: #f5f5f5; + border-color: #ddd; +} + +.custom-control-input:checked~.custom-control-label::before { + background-color: #66afe9; + border-color: #66afe9; +} + +/* Progress Bar */ + +.progress { + background-color: transparent; +} + +.progress-bar { + background-color: var(--primary); +} + +/* Select2 */ + +.select2-container--bootstrap4 .select2-selection { + background-color: var(--form-control-bg); + border: 1px solid #1a1a1a; + color: white !important; +} + +.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered { + color: white; + padding: 0; +} + +.select2-container--open .select2-dropdown { + color: #fff; + background-color: #262626; +} + +.select2-container--bootstrap4 .select2-results__option[aria-selected=true] { + background-color: var(--primary); + color: #fff; +} + +.select2-container--bootstrap4 .select2-results__option--highlighted[aria-selected] { + background-color: var(--primary); +} + +.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field { + background-color: var(--form-control-bg); + border-color: #1a1a1a; + color: #fff; +} + +.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice { + background-color: #333131; + border-color: #1a1a1a; + color: #fff; +} + +.select2-container--bootstrap4.select2-container--focus .select2-selection, +.select2-container--bootstrap4.select2-container--open .select2-selection { + border-color: #1a1a1a; +} + +/* Daterangepicker */ + +.daterangepicker { + color: var(--text); +} + +.daterangepicker .calendar-table { + background-color: #262626; + border: #232323; +} + +.daterangepicker td.off, +.daterangepicker td.off.in-range, +.daterangepicker td.off.start-date, +.daterangepicker td.off.end-date { + background-color: #202020; + color: var(--text-disabled); +} + +.daterangepicker td.active, +.daterangepicker td.active:hover { + background-color: var(--primary); +} + +.daterangepicker td.available:hover, +.daterangepicker th.available:hover { + background-color: var(--primary); +} + +.daterangepicker select.hourselect, +.daterangepicker select.minuteselect, +.daterangepicker select.secondselect, +.daterangepicker select.ampmselect { + background-color: var(--form-control-bg); + border-color: var(--form-control-border); +} + +/* FullCalendar */ + +.fc-state-active { + background-color: #464646 !important; + color: #fff !important; +} + +/* Tooltip */ + +.popover-body { + background: #262626; + color: #fff; +} + +.bs-popover-right .arrow::after, +.bs-popover-auto[x-placement^="right"] .arrow::after { + border-right-color: #262626; +} + +.ui-widget.ui-widget-content { + border-color: #232323; +} + +.ui-widget-content { + border-color: #232323; + background: #262626; + color: var(--text); +} + +.ui-widget-shadow { + -webkit-box-shadow: 0px 0px 5px #222; + box-shadow: 0px 0px 5px #222; +} + +/* CARD STYLES */ +.card { + background-color: #f7f7f7; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); +} + +.card-body { + background: #fff; + color: #333; + position: relative; + display: flex; + flex-direction: column; + min-width: 0; + word-wrap: break-word; + background-clip: border-box; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 0.25rem; +} + +.card-deck { + display: flex; + flex-direction: column; +} + +.card-deck .card { + margin-bottom: 15px; +} + +@media (min-width: 576px) { + .card-deck { + flex-flow: row wrap; + margin-right: -15px; + margin-left: -15px; + } + .card-deck .card { + display: flex; + flex: 1 0 0%; + flex-direction: column; + margin-right: 15px; + margin-bottom: 15px; + margin-left: 15px; + } +} + +.ui-widget-header { + border: 1px solid #ccc; + background: #f7f7f7; + color: #333; + font-weight: bold; +} + +.card-header { + background: #f7f7f7 !important; + color: #333; +} + +.card-header>.nav .nav-link.active { + color: var(--primary); +} + +.card-footer { + background: #f7f7f7 !important; + color: #333; +} + +.card-title { + color: rgb(0, 0, 0); +} + +.card-subtitle { + color: var(--secondary-text); +} + +.card:hover { + transform: scale(1.015); + transition: all 0.25s ease; + } + + +/* MODAL STYLES */ + +.modal-body { + background: #2d2d2d; + color: white; +} + +.modal-content { + background-color: #2d2d2d; + border: none; +} + +.modal-header { + background: #262626 !important; + border-bottom: 1px solid #1f1f1f; + color: white; +} + +.modal-footer { + background: #262626 !important; + border-top: 1px solid #1f1f1f; + color: white; +} + +.modal-dialog { + box-shadow: 0 0.76875rem 2.4875rem rgb(20 20 20 / 30%), 0 1.3375rem 1.70625rem rgb(20 20 20 / 30%), 0 0.55rem 0.53125rem rgb(0 0 0 / 5%), 0 0.225rem 0.4375rem rgb(20 20 20 / 30%); + border-radius: 0.25rem; +} + +.card-title { + color: rgb(22, 22, 22); + text-align: center; +} + +.card-subtitle { + color: rgb(111, 118, 219); +} + + +/* BUTTON STYLES */ + +.btn { + color: white; +} + +.btn-light { + background-color: #2f2f2f; + border-color: #242424; +} + +.btn-light.btn-shadow:hover { + box-shadow: 0 0.125rem 0.625rem #262626, 0 0.0625rem 0.125rem #262626; +} + +.btn-light:hover, +.btn-light:focus, +.btn-light:active { + background-color: #363636; + border-color: #1c1c1c; + color: #fff; +} + +.btn-light.btn-shadow { + box-shadow: 0 0.125rem 0.625rem #262626, 0 0.0625rem 0.125rem #262626; +} + +.btn-primary { + background-color: var(--primary); + border-color: var(--primary-border); +} + +.btn-primary:hover { + background-color: var(--primary-border); + border-color: var(--primary); +} + +.btn-secondary { + background-color: var(--secondary); + border-color: var(--secondary-border); +} + +.btn-success { + background-color: var(--success); + border-color: var(--success-border); +} + +.btn-info { + background-color: var(--info); + border-color: var(--info-border); +} + +.btn-warning { + background-color: var(--warning); + border-color: var(--warning-border); +} + +.btn-danger { + background-color: var(--danger); + border-color: var(--danger-border); +} + +.btn-focus { + background-color: var(--focus); + border-color: var(--focus-border); +} + +.btn-alternate { + background-color: var(--alternate); + border-color: var(--alternate-border); +} + +.btn-outline-primary { + border-color: var(--primary-border); +} + +.btn-outline-secondary { + border-color: var(--secondary-border); +} + +.btn-outline-success { + border-color: var(--success-border); +} + +.btn-outline-info { + border-color: var(--info-border); +} + +.btn-outline-warning { + border-color: var(--warning-border); +} + +.btn-outline-danger { + border-color: var(--danger-border); +} + +/* Bootstrap Alerts */ + +.alert { + color: #ffffff !important; +} + +.alert-primary { + background-color: var(--primary); + border-color: var(--primary-border); +} + +.alert-success { + background-color: var(--success); + border-color: var(--success-border); +} + +.alert-info { + background-color: var(--info); + border-color: var(--info-border); +} + +.alert-warning { + background-color: var(--warning); + border-color: var(--warning-border); +} + +.alert-danger { + color: #fff; + background-color: var(--danger); + border-color: var(--danger-border); +} + +.close { + color: #fff; +} + +.close:hover { + color: inherit; +} + +/* bootstrap backgrounds */ + + +.bg-primary { + background-color: var(--primary) !important; +} + +.bg-secondary { + background-color: var(--secondary) !important; +} + +.bg-success { + background-color: var(--success) !important; +} + +.bg-info { + background-color: var(--info) !important; +} + +.bg-warning { + background-color: var(--warning) !important; +} + +.bg-danger { + background-color: var(--danger) !important; +} + +.bg-focus { + background-color: var(--focus) !important; +} + +.bg-alternate { + background-color: var(--alternate) !important; +} + +/* Bootstrap Badges */ + +.badge-primary { + background-color: var(--primary); +} + +.badge-secondary { + background-color: var(--secondary); +} + +.badge-info { + background-color: var(--info); +} + +.badge-success { + background-color: var(--success); +} + +.badge-warning { + background-color: var(--warning); +} + +.badge-danger { + background-color: var(--danger); +} + +/* TABLE */ + +tr { + border-color: var(--table-border); +} + +.table thead th { + vertical-align: bottom; + border-color: var(--table-border); + background: #1f1f1f; +} + +.table tbody tr { + background: #242424; +} + +.table-bordered th, +.table-bordered td { + border-color: var(--table-border); +} + +.table-striped tbody tr:nth-child(odd) { + background-color: #212121 !important; +} + +.table { + border-color: var(--table-border); +} + +.table-hover tbody tr:hover { + background-color: var(--table-hover) !important; +} + +.table-primary { + background-color: var(--primary); +} + +.table-primary:hover { + background-color: var(--primary-border) !important; +} + +.table th, +.table td { + border-color: var(--table-border); +} + +/* Datatable */ + +/* pagination buttons (selected) */ +.pagination li a { + color: var(--primary); + background-color: #383838; + border: 1px solid #262626; +} + +/*other pagination buttons*/ +.page-item.disabled .page-link, +.pagination .disabled.page-number .page-link { + color: var(--text-disabled) !important; + background-color: #383838; + border-color: #262626; +} + +.pagination li a:hover { + background-color: #555555; + border-color: #262626; +} + +.pagination li.disabled a { + background-color: #383838; + border-color: #262626; +} + +.page-item.active .page-link, +.pagination .active.page-number .page-link { + background-color: var(--primary); + border-color: var(--primary-border); +} + +/* Copy button */ +div.dt-button-info { + background-color: #212121 !important; + border-color: #111 !important; + box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.3); +} + +div.dt-button-info h2 { + border-color: #1a1a1a !important; + background-color: #262626 !important; +} + +/* Dashboard Buttons */ + +/* TODO: Add transparent background dashboard images before uncommenting */ +/*.option_buttons {*/ +/* border-color: #444 !important;*/ +/*}*/ + +/*.button-label {*/ +/* color: var(--text) !important;*/ +/*}*/ + +/*DARK MODE TOGGLE */ +.toggle-link, +.toggle-link:active, +.toggle-link:focus { + color: #fff; +} + +/* Miscalleneous */ + +.tabs-animated .nav-link::before { + background-color: var(--primary); +} + +.tabs-animated-shadow .nav-link::before { + box-shadow: 0 16px 26px -10px var(--primary-border), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(31, 36, 64, 0.2); +} + +.font-icon-wrapper { + border-color: var(--table-border); +} + +.font-icon-wrapper:hover { + color: transparent; +} + + +.toggle-handle, +.toggle-handle:hover { + background-color: var(--switchery-background); +} + +/* jQuery TagsInput */ +[data-theme="dark"] div.tagsinput { + border: 1px solid var(--form-control-border) !important; + background: var(--form-control-bg) !important; + padding: 5px; + width: 300px; + height: 100px; + overflow-y: auto; +} + +[data-theme="dark"] div.tagsinput span.tag { + border: 1px solid #a5d24a; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + display: block; + float: left; + padding: 5px; + text-decoration: none; + background: #a0db2d !important; + color: #341 !important; + margin-right: 5px; + margin-bottom: 5px; + font-family: helvetica; + font-size: 13px; +} \ No newline at end of file diff --git a/week_5/activity-tracker/app/controllers/activities_controller.rb b/week_5/activity-tracker/app/controllers/activities_controller.rb index a1dc90c1..763f5b22 100644 --- a/week_5/activity-tracker/app/controllers/activities_controller.rb +++ b/week_5/activity-tracker/app/controllers/activities_controller.rb @@ -10,6 +10,12 @@ def index def show end + def stats + @total_duration = Activity.sum(:duration) + @total_calories = Activity.sum(:calories) + end + + # GET /activities/new def new @activity = Activity.new diff --git a/week_5/activity-tracker/app/controllers/application_controller.rb b/week_5/activity-tracker/app/controllers/application_controller.rb index 09705d12..6b4dcfa8 100644 --- a/week_5/activity-tracker/app/controllers/application_controller.rb +++ b/week_5/activity-tracker/app/controllers/application_controller.rb @@ -1,2 +1,3 @@ class ApplicationController < ActionController::Base + before_action :authenticate_user! end diff --git a/week_5/activity-tracker/app/controllers/static_pages_controller.rb b/week_5/activity-tracker/app/controllers/static_pages_controller.rb new file mode 100644 index 00000000..487a0e3f --- /dev/null +++ b/week_5/activity-tracker/app/controllers/static_pages_controller.rb @@ -0,0 +1,8 @@ +class StaticPagesController < ApplicationController + skip_before_action :authenticate_user!, only: %i[index] + def index + end + + def about + end +end diff --git a/week_5/activity-tracker/app/helpers/static_pages_helper.rb b/week_5/activity-tracker/app/helpers/static_pages_helper.rb new file mode 100644 index 00000000..2d63e79e --- /dev/null +++ b/week_5/activity-tracker/app/helpers/static_pages_helper.rb @@ -0,0 +1,2 @@ +module StaticPagesHelper +end diff --git a/week_5/activity-tracker/app/models/user.rb b/week_5/activity-tracker/app/models/user.rb new file mode 100644 index 00000000..47567994 --- /dev/null +++ b/week_5/activity-tracker/app/models/user.rb @@ -0,0 +1,6 @@ +class User < ApplicationRecord + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :validatable +end diff --git a/week_5/activity-tracker/app/views/activities/_activity.html.erb b/week_5/activity-tracker/app/views/activities/_activity.html.erb index aab462e3..1e8af9f0 100644 --- a/week_5/activity-tracker/app/views/activities/_activity.html.erb +++ b/week_5/activity-tracker/app/views/activities/_activity.html.erb @@ -1,27 +1,34 @@ -
-

- Title: - <%= activity.title %> -

- -

- Activity type: - <%= activity.activity_type %> -

- -

- Start: - <%= activity.start %> -

- -

- Duration: - <%= activity.duration %> -

- -

- Calories: - <%= activity.calories %> -

+
+

<%= activity.title %>

+
+
+
+
<%= activity.activity_type %>
+
+
+
+
+ <%= link_to "".html_safe, edit_activity_path(activity), class: "btn btn-sm btn-secondary" %> +
+
+ <%= button_to "".html_safe, activity, method: :delete, class: "btn btn-sm btn-secondary" %> +
+
+
+
+
+
+
<%= activity.start.in_time_zone.strftime("%d %b, %Y %I:%M %p") %>
+
+
+
+
+
<%= activity.calories %>
+
+
+
<%= activity.duration %>
+
+
+
diff --git a/week_5/activity-tracker/app/views/activities/_form.html.erb b/week_5/activity-tracker/app/views/activities/_form.html.erb index 6d4079c4..644a4dec 100644 --- a/week_5/activity-tracker/app/views/activities/_form.html.erb +++ b/week_5/activity-tracker/app/views/activities/_form.html.erb @@ -1,42 +1,55 @@ -<%= form_with(model: activity) do |form| %> - <% if activity.errors.any? %> -
-

<%= pluralize(activity.errors.count, "error") %> prohibited this activity from being saved:

- - -
- <% end %> -
- <%= form.label :title, style: "display: block" %> - <%= form.text_field :title %> -
+
+ <%= form.label :title, style: "display: block" %> + <%= form.text_field :title, class: "form-control mt-2" %> +
-
- <%= form.label :activity_type, style: "display: block" %> - <%= form.text_field :activity_type %> -
+
+ <%= form.label :activity_type, style: "display: block" %> + <%= form.text_field :activity_type, class:"form-control mt-2" %> +
-
- <%= form.label :start, style: "display: block" %> - <%= form.datetime_field :start %> -
+
+ <%= form.label :start, style: "display: block" %> + <%= form.datetime_field :start, class:"form-control mt-2" %> +
-
- <%= form.label :duration, style: "display: block" %> - <%= form.text_field :duration %> -
+
+
+
+ <%= form.label :duration, style: "display: block" %> + <%= form.text_field :duration, class:"form-control mt-2" %> +
+
+
+
+ <%= form.label :calories, style: "display: block" %> + <%= form.number_field :calories, class:"form-control mt-2" %> +
+
+
-
- <%= form.label :calories, style: "display: block" %> - <%= form.number_field :calories %> -
-
- <%= form.submit %> +
+ <%= form.submit class: "btn mt-2 btn-primary text-dark"%> +
+ <% end %> + +
-<% end %> + diff --git a/week_5/activity-tracker/app/views/activities/edit.html.erb b/week_5/activity-tracker/app/views/activities/edit.html.erb index 4774a05e..b6009c16 100644 --- a/week_5/activity-tracker/app/views/activities/edit.html.erb +++ b/week_5/activity-tracker/app/views/activities/edit.html.erb @@ -1,10 +1,5 @@ -

Editing activity

- -<%= render "form", activity: @activity %> - -
- -
- <%= link_to "Show this activity", @activity %> | - <%= link_to "Back to activities", activities_path %> -
+
+

Edit Activity

+ <%= render "form", activity: @activity %> +
+
\ No newline at end of file diff --git a/week_5/activity-tracker/app/views/activities/index.html.erb b/week_5/activity-tracker/app/views/activities/index.html.erb index 776f9042..376c9d4a 100644 --- a/week_5/activity-tracker/app/views/activities/index.html.erb +++ b/week_5/activity-tracker/app/views/activities/index.html.erb @@ -1,14 +1,12 @@

<%= notice %>

-

Activities

+

Activities<%= link_to "".html_safe, new_activity_path %>

-
+
<% @activities.each do |activity| %> - <%= render activity %> -

- <%= link_to "Show this activity", activity %> -

+
+ <%= render activity %> +
<% end %>
- -<%= link_to "New activity", new_activity_path %> +<%= link_to "Back to Home", root_path %> diff --git a/week_5/activity-tracker/app/views/activities/new.html.erb b/week_5/activity-tracker/app/views/activities/new.html.erb index 855a5899..2ddd6ffc 100644 --- a/week_5/activity-tracker/app/views/activities/new.html.erb +++ b/week_5/activity-tracker/app/views/activities/new.html.erb @@ -1,9 +1,5 @@ -

New activity

- -<%= render "form", activity: @activity %> - -
- -
- <%= link_to "Back to activities", activities_path %> -
+
+

New activity

+ <%= render "form", activity: @activity %> +
+
\ No newline at end of file diff --git a/week_5/activity-tracker/app/views/activities/show.html.erb b/week_5/activity-tracker/app/views/activities/show.html.erb index 73be1e19..42393a84 100644 --- a/week_5/activity-tracker/app/views/activities/show.html.erb +++ b/week_5/activity-tracker/app/views/activities/show.html.erb @@ -1,10 +1,3 @@

<%= notice %>

-<%= render @activity %> - -
- <%= link_to "Edit this activity", edit_activity_path(@activity) %> | - <%= link_to "Back to activities", activities_path %> - - <%= button_to "Destroy this activity", @activity, method: :delete %> -
+<%= render @activity %> \ No newline at end of file diff --git a/week_5/activity-tracker/app/views/activities/stats.html.erb b/week_5/activity-tracker/app/views/activities/stats.html.erb new file mode 100644 index 00000000..e0903570 --- /dev/null +++ b/week_5/activity-tracker/app/views/activities/stats.html.erb @@ -0,0 +1,15 @@ +
+
+
+
+

User Activity Statistics

+
+
+

+

Total duration - <%= @total_duration %>


+

Total calories burned - <%=@total_calories %>

+

+ Back to Activities +
+
+
\ No newline at end of file diff --git a/week_5/activity-tracker/app/views/layouts/application.html.erb b/week_5/activity-tracker/app/views/layouts/application.html.erb index 9c1804b3..be1b1389 100644 --- a/week_5/activity-tracker/app/views/layouts/application.html.erb +++ b/week_5/activity-tracker/app/views/layouts/application.html.erb @@ -8,11 +8,17 @@ <%= csp_meta_tag %> <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> - <%= stylesheet_link_tag "dark-mode", "data-turbo-track": "reload" %> + <%= stylesheet_link_tag "light-mode", "data-turbo-track": "reload" %> + <%= javascript_importmap_tags %> - + - <%= yield %> + <%= render "shared/navbar" %> +

<%= notice %>

+

<%= alert %>

+
+ <%= yield %> +
diff --git a/week_5/activity-tracker/app/views/shared/_navbar.html.erb b/week_5/activity-tracker/app/views/shared/_navbar.html.erb new file mode 100644 index 00000000..175b8147 --- /dev/null +++ b/week_5/activity-tracker/app/views/shared/_navbar.html.erb @@ -0,0 +1,14 @@ + + diff --git a/week_5/activity-tracker/app/views/static_pages/about.html.erb b/week_5/activity-tracker/app/views/static_pages/about.html.erb new file mode 100644 index 00000000..5199267d --- /dev/null +++ b/week_5/activity-tracker/app/views/static_pages/about.html.erb @@ -0,0 +1,2 @@ +

About Us

+ diff --git a/week_5/activity-tracker/app/views/static_pages/index.html.erb b/week_5/activity-tracker/app/views/static_pages/index.html.erb new file mode 100644 index 00000000..a9868714 --- /dev/null +++ b/week_5/activity-tracker/app/views/static_pages/index.html.erb @@ -0,0 +1,14 @@ +

Welcome to Activity Tracker App



+ +<% if user_signed_in? %> +

Logged in as: <%= current_user.email %>



+ Activities

+ Edit Account settings

+ <%= button_to "Log out", destroy_user_session_path , method: :delete %> +<% else %> +

New here ? , Then ->

+ Sign up

+

Already signed up , Then ->

+ Sign in

+ +<% end %> \ No newline at end of file diff --git a/week_5/activity-tracker/config/initializers/devise.rb b/week_5/activity-tracker/config/initializers/devise.rb index ddce73fb..91de1780 100644 --- a/week_5/activity-tracker/config/initializers/devise.rb +++ b/week_5/activity-tracker/config/initializers/devise.rb @@ -25,7 +25,7 @@ # note that it will be overwritten if you use your own mailer class # with default "from" parameter. config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' - + config.navigational_formats = ['*/*', :html , :turbo_stream] # Configure the class responsible to send e-mails. # config.mailer = 'Devise::Mailer' diff --git a/week_5/activity-tracker/config/routes.rb b/week_5/activity-tracker/config/routes.rb index ba195b7b..de16be2f 100644 --- a/week_5/activity-tracker/config/routes.rb +++ b/week_5/activity-tracker/config/routes.rb @@ -1,8 +1,10 @@ Rails.application.routes.draw do - resources :activities - - # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html - - # Defines the root path route ("/") - root "activities#index" + devise_for :users + root "static_pages#index" + get "about", to: "static_pages#about" + resources :activities do + collection do + get 'stats' + end + end end diff --git a/week_5/activity-tracker/db/migrate/20230214171052_devise_create_users.rb b/week_5/activity-tracker/db/migrate/20230214171052_devise_create_users.rb new file mode 100644 index 00000000..43927dbd --- /dev/null +++ b/week_5/activity-tracker/db/migrate/20230214171052_devise_create_users.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +class DeviseCreateUsers < ActiveRecord::Migration[7.0] + def change + create_table :users do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + # t.integer :sign_in_count, default: 0, null: false + # t.datetime :current_sign_in_at + # t.datetime :last_sign_in_at + # t.string :current_sign_in_ip + # t.string :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + t.timestamps null: false + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + # add_index :users, :confirmation_token, unique: true + # add_index :users, :unlock_token, unique: true + end +end diff --git a/week_5/activity-tracker/db/schema.rb b/week_5/activity-tracker/db/schema.rb index 2e77949c..94ff2aa6 100644 --- a/week_5/activity-tracker/db/schema.rb +++ b/week_5/activity-tracker/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_02_05_151240) do +ActiveRecord::Schema[7.0].define(version: 2023_02_14_171052) do create_table "activities", force: :cascade do |t| t.string "title" t.string "activity_type" @@ -21,4 +21,16 @@ t.datetime "updated_at", null: false end + create_table "users", force: :cascade do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["email"], name: "index_users_on_email", unique: true + t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + end + end diff --git a/week_5/activity-tracker/test/controllers/static_pages_controller_test.rb b/week_5/activity-tracker/test/controllers/static_pages_controller_test.rb new file mode 100644 index 00000000..2126daec --- /dev/null +++ b/week_5/activity-tracker/test/controllers/static_pages_controller_test.rb @@ -0,0 +1,13 @@ +require "test_helper" + +class StaticPagesControllerTest < ActionDispatch::IntegrationTest + test "should get index" do + get static_pages_index_url + assert_response :success + end + + test "should get about" do + get static_pages_about_url + assert_response :success + end +end diff --git a/week_5/activity-tracker/test/fixtures/users.yml b/week_5/activity-tracker/test/fixtures/users.yml new file mode 100644 index 00000000..d7a33292 --- /dev/null +++ b/week_5/activity-tracker/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/week_5/activity-tracker/test/models/user_test.rb b/week_5/activity-tracker/test/models/user_test.rb new file mode 100644 index 00000000..5c07f490 --- /dev/null +++ b/week_5/activity-tracker/test/models/user_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +class UserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 437f566d7f3c46ddb58f9937ecf846906344bab6 Mon Sep 17 00:00:00 2001 From: Minank-KP <107191059+Minank-KP@users.noreply.github.com> Date: Thu, 23 Feb 2023 21:56:16 +0000 Subject: [PATCH 2/4] half completed --- .../app/assets/stylesheets/light-mode.css | 7 +++ .../app/controllers/activities_controller.rb | 12 ++-- .../users/confirmations_controller.rb | 30 +++++++++ .../users/omniauth_callbacks_controller.rb | 30 +++++++++ .../controllers/users/passwords_controller.rb | 34 ++++++++++ .../users/registrations_controller.rb | 62 +++++++++++++++++++ .../controllers/users/sessions_controller.rb | 27 ++++++++ .../controllers/users/unlocks_controller.rb | 30 +++++++++ .../activity-tracker/app/models/activity.rb | 1 + week_5/activity-tracker/app/models/user.rb | 2 + .../app/views/activities/_activity.html.erb | 2 +- .../app/views/activities/index.html.erb | 12 ++-- .../app/views/activities/new.html.erb | 3 +- .../app/views/activities/show.html.erb | 4 +- .../app/views/layouts/application.html.erb | 2 - .../app/views/shared/_navbar.html.erb | 8 ++- .../app/views/static_pages/index.html.erb | 2 +- .../views/users/confirmations/new.html.erb | 16 +++++ .../mailer/confirmation_instructions.html.erb | 5 ++ .../views/users/mailer/email_changed.html.erb | 7 +++ .../users/mailer/password_change.html.erb | 3 + .../reset_password_instructions.html.erb | 8 +++ .../users/mailer/unlock_instructions.html.erb | 7 +++ .../app/views/users/passwords/edit.html.erb | 25 ++++++++ .../app/views/users/passwords/new.html.erb | 16 +++++ .../views/users/registrations/edit.html.erb | 43 +++++++++++++ .../views/users/registrations/new.html.erb | 29 +++++++++ .../app/views/users/sessions/new.html.erb | 26 ++++++++ .../users/shared/_error_messages.html.erb | 15 +++++ .../app/views/users/shared/_links.html.erb | 25 ++++++++ .../app/views/users/unlocks/new.html.erb | 16 +++++ week_5/activity-tracker/config/routes.rb | 6 +- ...0230223183705_add_user_id_to_activities.rb | 6 ++ week_5/activity-tracker/db/schema.rb | 4 +- 34 files changed, 506 insertions(+), 19 deletions(-) create mode 100644 week_5/activity-tracker/app/controllers/users/confirmations_controller.rb create mode 100644 week_5/activity-tracker/app/controllers/users/omniauth_callbacks_controller.rb create mode 100644 week_5/activity-tracker/app/controllers/users/passwords_controller.rb create mode 100644 week_5/activity-tracker/app/controllers/users/registrations_controller.rb create mode 100644 week_5/activity-tracker/app/controllers/users/sessions_controller.rb create mode 100644 week_5/activity-tracker/app/controllers/users/unlocks_controller.rb create mode 100644 week_5/activity-tracker/app/views/users/confirmations/new.html.erb create mode 100644 week_5/activity-tracker/app/views/users/mailer/confirmation_instructions.html.erb create mode 100644 week_5/activity-tracker/app/views/users/mailer/email_changed.html.erb create mode 100644 week_5/activity-tracker/app/views/users/mailer/password_change.html.erb create mode 100644 week_5/activity-tracker/app/views/users/mailer/reset_password_instructions.html.erb create mode 100644 week_5/activity-tracker/app/views/users/mailer/unlock_instructions.html.erb create mode 100644 week_5/activity-tracker/app/views/users/passwords/edit.html.erb create mode 100644 week_5/activity-tracker/app/views/users/passwords/new.html.erb create mode 100644 week_5/activity-tracker/app/views/users/registrations/edit.html.erb create mode 100644 week_5/activity-tracker/app/views/users/registrations/new.html.erb create mode 100644 week_5/activity-tracker/app/views/users/sessions/new.html.erb create mode 100644 week_5/activity-tracker/app/views/users/shared/_error_messages.html.erb create mode 100644 week_5/activity-tracker/app/views/users/shared/_links.html.erb create mode 100644 week_5/activity-tracker/app/views/users/unlocks/new.html.erb create mode 100644 week_5/activity-tracker/db/migrate/20230223183705_add_user_id_to_activities.rb diff --git a/week_5/activity-tracker/app/assets/stylesheets/light-mode.css b/week_5/activity-tracker/app/assets/stylesheets/light-mode.css index a50f474f..79c6f209 100644 --- a/week_5/activity-tracker/app/assets/stylesheets/light-mode.css +++ b/week_5/activity-tracker/app/assets/stylesheets/light-mode.css @@ -619,6 +619,11 @@ select { border-color: var(--alternate-border); } +.btn-new { + background-color: #712cf9; + +} + .btn-outline-primary { border-color: var(--primary-border); } @@ -643,6 +648,8 @@ select { border-color: var(--danger-border); } + + /* Bootstrap Alerts */ .alert { diff --git a/week_5/activity-tracker/app/controllers/activities_controller.rb b/week_5/activity-tracker/app/controllers/activities_controller.rb index 763f5b22..e9331e96 100644 --- a/week_5/activity-tracker/app/controllers/activities_controller.rb +++ b/week_5/activity-tracker/app/controllers/activities_controller.rb @@ -3,7 +3,7 @@ class ActivitiesController < ApplicationController # GET /activities or /activities.json def index - @activities = Activity.all + @activities=Activity.where(user_id: current_user.id) end # GET /activities/1 or /activities/1.json @@ -11,8 +11,8 @@ def show end def stats - @total_duration = Activity.sum(:duration) - @total_calories = Activity.sum(:calories) + @total_duration = Activity.where(user_id: current_user.id).sum(:duration) + @total_calories = Activity.where(user_id: current_user.id).sum(:calories) end @@ -28,10 +28,10 @@ def edit # POST /activities or /activities.json def create @activity = Activity.new(activity_params) - + @activity.user_id=current_user.id respond_to do |format| if @activity.save - format.html { redirect_to activity_url(@activity), notice: "Activity was successfully created." } + format.html { redirect_to activities_url, notice: "Activity was successfully created." } format.json { render :show, status: :created, location: @activity } else format.html { render :new, status: :unprocessable_entity } @@ -58,7 +58,7 @@ def destroy @activity.destroy respond_to do |format| - format.html { redirect_to activities_url, notice: "Activity was successfully destroyed." } + format.html { redirect_to activities_url,status: :see_other, notice: "Activity was successfully destroyed." } format.json { head :no_content } end end diff --git a/week_5/activity-tracker/app/controllers/users/confirmations_controller.rb b/week_5/activity-tracker/app/controllers/users/confirmations_controller.rb new file mode 100644 index 00000000..fa535c0a --- /dev/null +++ b/week_5/activity-tracker/app/controllers/users/confirmations_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class Users::ConfirmationsController < Devise::ConfirmationsController + # GET /resource/confirmation/new + # def new + # super + # end + + # POST /resource/confirmation + # def create + # super + # end + + # GET /resource/confirmation?confirmation_token=abcdef + # def show + # super + # end + + # protected + + # The path used after resending confirmation instructions. + # def after_resending_confirmation_instructions_path_for(resource_name) + # super(resource_name) + # end + + # The path used after confirmation. + # def after_confirmation_path_for(resource_name, resource) + # super(resource_name, resource) + # end +end diff --git a/week_5/activity-tracker/app/controllers/users/omniauth_callbacks_controller.rb b/week_5/activity-tracker/app/controllers/users/omniauth_callbacks_controller.rb new file mode 100644 index 00000000..593f547d --- /dev/null +++ b/week_5/activity-tracker/app/controllers/users/omniauth_callbacks_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController + # You should configure your model like this: + # devise :omniauthable, omniauth_providers: [:twitter] + + # You should also create an action method in this controller like this: + # def twitter + # end + + # More info at: + # https://github.com/heartcombo/devise#omniauth + + # GET|POST /resource/auth/twitter + # def passthru + # super + # end + + # GET|POST /users/auth/twitter/callback + # def failure + # super + # end + + # protected + + # The path used when OmniAuth fails + # def after_omniauth_failure_path_for(scope) + # super(scope) + # end +end diff --git a/week_5/activity-tracker/app/controllers/users/passwords_controller.rb b/week_5/activity-tracker/app/controllers/users/passwords_controller.rb new file mode 100644 index 00000000..259dbb08 --- /dev/null +++ b/week_5/activity-tracker/app/controllers/users/passwords_controller.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +class Users::PasswordsController < Devise::PasswordsController + # GET /resource/password/new + # def new + # super + # end + + # POST /resource/password + # def create + # super + # end + + # GET /resource/password/edit?reset_password_token=abcdef + # def edit + # super + # end + + # PUT /resource/password + # def update + # super + # end + + # protected + + # def after_resetting_password_path_for(resource) + # super(resource) + # end + + # The path used after sending reset password instructions + # def after_sending_reset_password_instructions_path_for(resource_name) + # super(resource_name) + # end +end diff --git a/week_5/activity-tracker/app/controllers/users/registrations_controller.rb b/week_5/activity-tracker/app/controllers/users/registrations_controller.rb new file mode 100644 index 00000000..b9e664fe --- /dev/null +++ b/week_5/activity-tracker/app/controllers/users/registrations_controller.rb @@ -0,0 +1,62 @@ +# frozen_string_literal: true + +class Users::RegistrationsController < Devise::RegistrationsController + # before_action :configure_sign_up_params, only: [:create] + # before_action :configure_account_update_params, only: [:update] + + # GET /resource/sign_up + # def new + # super + # end + + # POST /resource + # def create + # super + # end + + # GET /resource/edit + # def edit + # super + # end + + # PUT /resource + # def update + # super + # end + + # DELETE /resource + # def destroy + # super + # end + + # GET /resource/cancel + # Forces the session data which is usually expired after sign + # in to be expired now. This is useful if the user wants to + # cancel oauth signing in/up in the middle of the process, + # removing all OAuth session data. + # def cancel + # super + # end + + # protected + + # If you have extra params to permit, append them to the sanitizer. + # def configure_sign_up_params + # devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute]) + # end + + # If you have extra params to permit, append them to the sanitizer. + # def configure_account_update_params + # devise_parameter_sanitizer.permit(:account_update, keys: [:attribute]) + # end + + # The path used after sign up. + # def after_sign_up_path_for(resource) + # super(resource) + # end + + # The path used after sign up for inactive accounts. + # def after_inactive_sign_up_path_for(resource) + # super(resource) + # end +end diff --git a/week_5/activity-tracker/app/controllers/users/sessions_controller.rb b/week_5/activity-tracker/app/controllers/users/sessions_controller.rb new file mode 100644 index 00000000..a0f9b48e --- /dev/null +++ b/week_5/activity-tracker/app/controllers/users/sessions_controller.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +class Users::SessionsController < Devise::SessionsController + # before_action :configure_sign_in_params, only: [:create] + + # GET /resource/sign_in + # def new + # super + # end + + # POST /resource/sign_in + # def create + # super + # end + + # DELETE /resource/sign_out + # def destroy + # super + # end + + # protected + + # If you have extra params to permit, append them to the sanitizer. + # def configure_sign_in_params + # devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute]) + # end +end diff --git a/week_5/activity-tracker/app/controllers/users/unlocks_controller.rb b/week_5/activity-tracker/app/controllers/users/unlocks_controller.rb new file mode 100644 index 00000000..2c410dc0 --- /dev/null +++ b/week_5/activity-tracker/app/controllers/users/unlocks_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class Users::UnlocksController < Devise::UnlocksController + # GET /resource/unlock/new + # def new + # super + # end + + # POST /resource/unlock + # def create + # super + # end + + # GET /resource/unlock?unlock_token=abcdef + # def show + # super + # end + + # protected + + # The path used after sending unlock password instructions + # def after_sending_unlock_instructions_path_for(resource) + # super(resource) + # end + + # The path used after unlocking the resource + # def after_unlock_path_for(resource) + # super(resource) + # end +end diff --git a/week_5/activity-tracker/app/models/activity.rb b/week_5/activity-tracker/app/models/activity.rb index a99f990d..c3923dac 100644 --- a/week_5/activity-tracker/app/models/activity.rb +++ b/week_5/activity-tracker/app/models/activity.rb @@ -1,2 +1,3 @@ class Activity < ApplicationRecord + belongs_to :user end diff --git a/week_5/activity-tracker/app/models/user.rb b/week_5/activity-tracker/app/models/user.rb index 47567994..4cf0bb9a 100644 --- a/week_5/activity-tracker/app/models/user.rb +++ b/week_5/activity-tracker/app/models/user.rb @@ -3,4 +3,6 @@ class User < ApplicationRecord # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable devise :database_authenticatable, :registerable, :recoverable, :rememberable, :validatable + + has_many :activities end diff --git a/week_5/activity-tracker/app/views/activities/_activity.html.erb b/week_5/activity-tracker/app/views/activities/_activity.html.erb index 1e8af9f0..c8d899db 100644 --- a/week_5/activity-tracker/app/views/activities/_activity.html.erb +++ b/week_5/activity-tracker/app/views/activities/_activity.html.erb @@ -12,7 +12,7 @@ <%= link_to "".html_safe, edit_activity_path(activity), class: "btn btn-sm btn-secondary" %>
- <%= button_to "".html_safe, activity, method: :delete, class: "btn btn-sm btn-secondary" %> + <%= button_to "".html_safe, activity, method: :delete, form: {data: {turbo_confirm: "Are you sure?"}} , class: "btn btn-sm btn-secondary" %>
diff --git a/week_5/activity-tracker/app/views/activities/index.html.erb b/week_5/activity-tracker/app/views/activities/index.html.erb index 376c9d4a..0c07eb33 100644 --- a/week_5/activity-tracker/app/views/activities/index.html.erb +++ b/week_5/activity-tracker/app/views/activities/index.html.erb @@ -3,10 +3,14 @@

Activities<%= link_to "".html_safe, new_activity_path %>

- <% @activities.each do |activity| %> -
- <%= render activity %> -
+ <% if @activities.nil? %> +

No Activities to show

+ <% else %> + <% @activities.each do |activity| %> +
+ <%= render activity %> +
+ <% end %> <% end %>
<%= link_to "Back to Home", root_path %> diff --git a/week_5/activity-tracker/app/views/activities/new.html.erb b/week_5/activity-tracker/app/views/activities/new.html.erb index 2ddd6ffc..a3e82518 100644 --- a/week_5/activity-tracker/app/views/activities/new.html.erb +++ b/week_5/activity-tracker/app/views/activities/new.html.erb @@ -2,4 +2,5 @@

New activity

<%= render "form", activity: @activity %>
- \ No newline at end of file + + Back to Activities

diff --git a/week_5/activity-tracker/app/views/activities/show.html.erb b/week_5/activity-tracker/app/views/activities/show.html.erb index 42393a84..42883dea 100644 --- a/week_5/activity-tracker/app/views/activities/show.html.erb +++ b/week_5/activity-tracker/app/views/activities/show.html.erb @@ -1,3 +1,5 @@

<%= notice %>

-<%= render @activity %> \ No newline at end of file +<%= render @activity %> +

+Back to Activities

diff --git a/week_5/activity-tracker/app/views/layouts/application.html.erb b/week_5/activity-tracker/app/views/layouts/application.html.erb index be1b1389..8ab39dde 100644 --- a/week_5/activity-tracker/app/views/layouts/application.html.erb +++ b/week_5/activity-tracker/app/views/layouts/application.html.erb @@ -15,8 +15,6 @@ <%= render "shared/navbar" %> -

<%= notice %>

-

<%= alert %>

<%= yield %>
diff --git a/week_5/activity-tracker/app/views/shared/_navbar.html.erb b/week_5/activity-tracker/app/views/shared/_navbar.html.erb index 175b8147..395844af 100644 --- a/week_5/activity-tracker/app/views/shared/_navbar.html.erb +++ b/week_5/activity-tracker/app/views/shared/_navbar.html.erb @@ -1,14 +1,20 @@ diff --git a/week_5/activity-tracker/app/views/static_pages/index.html.erb b/week_5/activity-tracker/app/views/static_pages/index.html.erb index a9868714..155e9906 100644 --- a/week_5/activity-tracker/app/views/static_pages/index.html.erb +++ b/week_5/activity-tracker/app/views/static_pages/index.html.erb @@ -4,7 +4,7 @@

Logged in as: <%= current_user.email %>



Activities

Edit Account settings

- <%= button_to "Log out", destroy_user_session_path , method: :delete %> + <%= button_to "Log out", destroy_user_session_path , method: :delete , form: {data: {turbo_confirm: "Do you want to Logout"}} %> <% else %>

New here ? , Then ->

Sign up

diff --git a/week_5/activity-tracker/app/views/users/confirmations/new.html.erb b/week_5/activity-tracker/app/views/users/confirmations/new.html.erb new file mode 100644 index 00000000..4af186b2 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/confirmations/new.html.erb @@ -0,0 +1,16 @@ +

Resend confirmation instructions

+ +<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> + <%= render "users/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> +
+ +
+ <%= f.submit "Resend confirmation instructions" %> +
+<% end %> + +<%= render "users/shared/links" %> diff --git a/week_5/activity-tracker/app/views/users/mailer/confirmation_instructions.html.erb b/week_5/activity-tracker/app/views/users/mailer/confirmation_instructions.html.erb new file mode 100644 index 00000000..dc55f64f --- /dev/null +++ b/week_5/activity-tracker/app/views/users/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +

Welcome <%= @email %>!

+ +

You can confirm your account email through the link below:

+ +

<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>

diff --git a/week_5/activity-tracker/app/views/users/mailer/email_changed.html.erb b/week_5/activity-tracker/app/views/users/mailer/email_changed.html.erb new file mode 100644 index 00000000..32f4ba80 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/mailer/email_changed.html.erb @@ -0,0 +1,7 @@ +

Hello <%= @email %>!

+ +<% if @resource.try(:unconfirmed_email?) %> +

We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.

+<% else %> +

We're contacting you to notify you that your email has been changed to <%= @resource.email %>.

+<% end %> diff --git a/week_5/activity-tracker/app/views/users/mailer/password_change.html.erb b/week_5/activity-tracker/app/views/users/mailer/password_change.html.erb new file mode 100644 index 00000000..b41daf47 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/mailer/password_change.html.erb @@ -0,0 +1,3 @@ +

Hello <%= @resource.email %>!

+ +

We're contacting you to notify you that your password has been changed.

diff --git a/week_5/activity-tracker/app/views/users/mailer/reset_password_instructions.html.erb b/week_5/activity-tracker/app/views/users/mailer/reset_password_instructions.html.erb new file mode 100644 index 00000000..f667dc12 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +

Hello <%= @resource.email %>!

+ +

Someone has requested a link to change your password. You can do this through the link below.

+ +

<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>

+ +

If you didn't request this, please ignore this email.

+

Your password won't change until you access the link above and create a new one.

diff --git a/week_5/activity-tracker/app/views/users/mailer/unlock_instructions.html.erb b/week_5/activity-tracker/app/views/users/mailer/unlock_instructions.html.erb new file mode 100644 index 00000000..41e148bf --- /dev/null +++ b/week_5/activity-tracker/app/views/users/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +

Hello <%= @resource.email %>!

+ +

Your account has been locked due to an excessive number of unsuccessful sign in attempts.

+ +

Click the link below to unlock your account:

+ +

<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>

diff --git a/week_5/activity-tracker/app/views/users/passwords/edit.html.erb b/week_5/activity-tracker/app/views/users/passwords/edit.html.erb new file mode 100644 index 00000000..863ffbb2 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/passwords/edit.html.erb @@ -0,0 +1,25 @@ +

Change your password

+ +<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> + <%= render "users/shared/error_messages", resource: resource %> + <%= f.hidden_field :reset_password_token %> + +
+ <%= f.label :password, "New password" %>
+ <% if @minimum_password_length %> + (<%= @minimum_password_length %> characters minimum)
+ <% end %> + <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %> +
+ +
+ <%= f.label :password_confirmation, "Confirm new password" %>
+ <%= f.password_field :password_confirmation, autocomplete: "new-password" %> +
+ +
+ <%= f.submit "Change my password" %> +
+<% end %> + +<%= render "users/shared/links" %> diff --git a/week_5/activity-tracker/app/views/users/passwords/new.html.erb b/week_5/activity-tracker/app/views/users/passwords/new.html.erb new file mode 100644 index 00000000..3b30b06d --- /dev/null +++ b/week_5/activity-tracker/app/views/users/passwords/new.html.erb @@ -0,0 +1,16 @@ +

Forgot your password?

+ +<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= render "users/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+ +
+ <%= f.submit "Send me reset password instructions" %> +
+<% end %> + +<%= render "users/shared/links" %> diff --git a/week_5/activity-tracker/app/views/users/registrations/edit.html.erb b/week_5/activity-tracker/app/views/users/registrations/edit.html.erb new file mode 100644 index 00000000..038cd945 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/registrations/edit.html.erb @@ -0,0 +1,43 @@ +

Edit <%= resource_name.to_s.humanize %>

+ +<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> + <%= render "users/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+ + <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> +
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
+ <% end %> + +
+ <%= f.label :password %> (leave blank if you don't want to change it)
+ <%= f.password_field :password, autocomplete: "new-password" %> + <% if @minimum_password_length %> +
+ <%= @minimum_password_length %> characters minimum + <% end %> +
+ +
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, autocomplete: "new-password" %> +
+ +
+ <%= f.label :current_password %> (we need your current password to confirm your changes)
+ <%= f.password_field :current_password, autocomplete: "current-password" %> +
+ +
+ <%= f.submit "Update" %> +
+<% end %> + +

Cancel my account

+ +

Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>

+ +<%= link_to "Back", :back %> diff --git a/week_5/activity-tracker/app/views/users/registrations/new.html.erb b/week_5/activity-tracker/app/views/users/registrations/new.html.erb new file mode 100644 index 00000000..61d1e4c7 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/registrations/new.html.erb @@ -0,0 +1,29 @@ +

Sign up

+ +<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= render "users/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+ +
+ <%= f.label :password %> + <% if @minimum_password_length %> + (<%= @minimum_password_length %> characters minimum) + <% end %>
+ <%= f.password_field :password, autocomplete: "new-password" %> +
+ +
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, autocomplete: "new-password" %> +
+ +
+ <%= f.submit "Sign up" %> +
+<% end %> + +<%= render "users/shared/links" %> diff --git a/week_5/activity-tracker/app/views/users/sessions/new.html.erb b/week_5/activity-tracker/app/views/users/sessions/new.html.erb new file mode 100644 index 00000000..4d58a142 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/sessions/new.html.erb @@ -0,0 +1,26 @@ +

Log in

+ +<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+ <% f.label :email %>
+ <%= f.email_field :email, class:"form-control",placeholder:"Email" ,autofocus: true, autocomplete: "email" %> +
+ +
+ <% f.label :password %>
+ <%= f.password_field :password,class:"form-control",placeholder:"Password", autocomplete: "current-password" %> +
+
+ <% if devise_mapping.rememberable? %> +
+ <%= f.check_box :remember_me , class:"form-check-input" %> + <%= f.label :remember_me %> +
+ <% end %> +
+
+ <%= f.submit "Log in" ,class:"btn btn-primary" %> +
+<% end %> +
+<%= render "users/shared/links" %> diff --git a/week_5/activity-tracker/app/views/users/shared/_error_messages.html.erb b/week_5/activity-tracker/app/views/users/shared/_error_messages.html.erb new file mode 100644 index 00000000..ba7ab887 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/shared/_error_messages.html.erb @@ -0,0 +1,15 @@ +<% if resource.errors.any? %> +
+

+ <%= I18n.t("errors.messages.not_saved", + count: resource.errors.count, + resource: resource.class.model_name.human.downcase) + %> +

+ +
+<% end %> diff --git a/week_5/activity-tracker/app/views/users/shared/_links.html.erb b/week_5/activity-tracker/app/views/users/shared/_links.html.erb new file mode 100644 index 00000000..facaffc8 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/shared/_links.html.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Log in", new_session_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name),class:"btn btn-info" %>
+<% end %> +
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to "Forgot your password?", new_password_path(resource_name),class:"btn btn-info" %>
+<% end %> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), method: :post %>
+ <% end %> +<% end %> diff --git a/week_5/activity-tracker/app/views/users/unlocks/new.html.erb b/week_5/activity-tracker/app/views/users/unlocks/new.html.erb new file mode 100644 index 00000000..2f4fab84 --- /dev/null +++ b/week_5/activity-tracker/app/views/users/unlocks/new.html.erb @@ -0,0 +1,16 @@ +

Resend unlock instructions

+ +<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= render "users/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+ +
+ <%= f.submit "Resend unlock instructions" %> +
+<% end %> + +<%= render "users/shared/links" %> diff --git a/week_5/activity-tracker/config/routes.rb b/week_5/activity-tracker/config/routes.rb index de16be2f..3d040acb 100644 --- a/week_5/activity-tracker/config/routes.rb +++ b/week_5/activity-tracker/config/routes.rb @@ -1,5 +1,9 @@ Rails.application.routes.draw do - devise_for :users + devise_for :users, controllers: { + sessions: 'users/sessions', + registrations: 'users/registrations', + passwords: 'users/passwords' + } root "static_pages#index" get "about", to: "static_pages#about" resources :activities do diff --git a/week_5/activity-tracker/db/migrate/20230223183705_add_user_id_to_activities.rb b/week_5/activity-tracker/db/migrate/20230223183705_add_user_id_to_activities.rb new file mode 100644 index 00000000..77401dea --- /dev/null +++ b/week_5/activity-tracker/db/migrate/20230223183705_add_user_id_to_activities.rb @@ -0,0 +1,6 @@ +class AddUserIdToActivities < ActiveRecord::Migration[7.0] + def change + add_column :activities, :user_id, :integer + add_index :activities, :user_id + end +end diff --git a/week_5/activity-tracker/db/schema.rb b/week_5/activity-tracker/db/schema.rb index 94ff2aa6..12902582 100644 --- a/week_5/activity-tracker/db/schema.rb +++ b/week_5/activity-tracker/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_02_14_171052) do +ActiveRecord::Schema[7.0].define(version: 2023_02_23_183705) do create_table "activities", force: :cascade do |t| t.string "title" t.string "activity_type" @@ -19,6 +19,8 @@ t.integer "calories" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "user_id" + t.index ["user_id"], name: "index_activities_on_user_id" end create_table "users", force: :cascade do |t| From 9539c5fd95bc3652c72a29108c9cb35e94b79da1 Mon Sep 17 00:00:00 2001 From: Minank-KP <107191059+Minank-KP@users.noreply.github.com> Date: Fri, 24 Feb 2023 21:15:44 +0000 Subject: [PATCH 3/4] week 6 assignment done --- week_5/activity-tracker/Gemfile | 6 +- week_5/activity-tracker/Gemfile.lock | 14 +++++ .../app/controllers/activities_controller.rb | 22 ++++++- .../activity-tracker/app/models/activity.rb | 2 + week_5/activity-tracker/app/models/type.rb | 2 + .../app/views/activities/_activity.html.erb | 5 ++ .../app/views/activities/_form.html.erb | 16 ++++- .../app/views/activities/index.html.erb | 6 +- .../app/views/shared/_navbar.html.erb | 3 + week_5/activity-tracker/config/routes.rb | 1 + .../db/migrate/20230223230401_create_types.rb | 9 +++ ...te_active_storage_tables.active_storage.rb | 57 ++++++++++++++++++ week_5/activity-tracker/db/schema.rb | 38 +++++++++++- .../lh/gg/lhggljjue94x9eo87d7tvza580d2 | Bin 0 -> 8510 bytes .../o7/ov/o7ov5fpwny2z92nfuhq0g6sqte93 | Bin 0 -> 4660 bytes .../activity-tracker/test/fixtures/types.yml | 7 +++ .../activity-tracker/test/models/type_test.rb | 7 +++ 17 files changed, 185 insertions(+), 10 deletions(-) create mode 100644 week_5/activity-tracker/app/models/type.rb create mode 100644 week_5/activity-tracker/db/migrate/20230223230401_create_types.rb create mode 100644 week_5/activity-tracker/db/migrate/20230224045742_create_active_storage_tables.active_storage.rb create mode 100644 week_5/activity-tracker/storage/lh/gg/lhggljjue94x9eo87d7tvza580d2 create mode 100644 week_5/activity-tracker/storage/o7/ov/o7ov5fpwny2z92nfuhq0g6sqte93 create mode 100644 week_5/activity-tracker/test/fixtures/types.yml create mode 100644 week_5/activity-tracker/test/models/type_test.rb diff --git a/week_5/activity-tracker/Gemfile b/week_5/activity-tracker/Gemfile index 6a97ca54..7f78e313 100644 --- a/week_5/activity-tracker/Gemfile +++ b/week_5/activity-tracker/Gemfile @@ -46,7 +46,7 @@ gem "bootsnap", require: false # gem "sassc-rails" # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] -# gem "image_processing", "~> 1.2" +gem "image_processing", "~> 1.2" group :development, :test do # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem @@ -75,4 +75,6 @@ gem "rails-controller-testing" gem 'bootstrap', '~> 5.2.2' -gem 'devise' \ No newline at end of file +gem 'prawn', '~> 2.4' + +gem 'devise' diff --git a/week_5/activity-tracker/Gemfile.lock b/week_5/activity-tracker/Gemfile.lock index bc7790d9..8fbbb479 100644 --- a/week_5/activity-tracker/Gemfile.lock +++ b/week_5/activity-tracker/Gemfile.lock @@ -107,6 +107,9 @@ GEM activesupport (>= 5.0) i18n (1.12.0) concurrent-ruby (~> 1.0) + image_processing (1.12.2) + mini_magick (>= 4.9.5, < 5) + ruby-vips (>= 2.0.17, < 3) importmap-rails (1.1.5) actionpack (>= 6.0.0) railties (>= 6.0.0) @@ -127,6 +130,7 @@ GEM marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) + mini_magick (4.12.0) mini_mime (1.1.2) minitest (5.17.0) msgpack (1.6.0) @@ -143,7 +147,11 @@ GEM nokogiri (1.14.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) + pdf-core (0.9.0) popper_js (2.11.6) + prawn (2.4.0) + pdf-core (~> 0.9.0) + ttfunk (~> 1.7) public_suffix (5.0.1) puma (5.6.5) nio4r (~> 2.0) @@ -189,6 +197,8 @@ GEM actionpack (>= 5.2) railties (>= 5.2) rexml (3.2.5) + ruby-vips (2.1.4) + ffi (~> 1.12) rubyzip (2.3.2) sassc (2.4.0) ffi (~> 1.9) @@ -215,6 +225,7 @@ GEM thor (1.2.1) tilt (2.0.11) timeout (0.3.1) + ttfunk (1.7.0) turbo-rails (1.3.2) actionpack (>= 6.0.0) activejob (>= 6.0.0) @@ -244,13 +255,16 @@ PLATFORMS x86_64-linux DEPENDENCIES + bigdecimal (~> 1.2, >= 1.2.7) bootsnap bootstrap (~> 5.2.2) capybara debug devise + image_processing (~> 1.2) importmap-rails jbuilder + prawn (~> 2.4) puma (~> 5.0) rails (~> 7.0.4) rails-controller-testing diff --git a/week_5/activity-tracker/app/controllers/activities_controller.rb b/week_5/activity-tracker/app/controllers/activities_controller.rb index e9331e96..dea747a1 100644 --- a/week_5/activity-tracker/app/controllers/activities_controller.rb +++ b/week_5/activity-tracker/app/controllers/activities_controller.rb @@ -15,6 +15,26 @@ def stats @total_calories = Activity.where(user_id: current_user.id).sum(:calories) end + def pdf + require "prawn" + pdf1 = Prawn::Document.new + pdf1.text current_user.email,align: :center ,size: 30,style: :bold + pdf1.text "\nActivities\n",align: :center ,size: 25,style: :bold + @activities=Activity.where(user_id: current_user.id) + if @activities.any? + @activities.each do |activity| + pdf1.text activity.title,size: 20,style: :bold + act_img=StringIO.open(activity.image.download) + pdf1.image act_img,fit: [300,300] + pdf1.text activity.activity_type,size: 15 + # pdf1.text activity.duration.to_s,size: 15 + # pdf1.text activity.calories,size: 15 + end + else + pdf1.text "No Activity",size: 20,style: :bold + end + send_data(pdf1.render,filename: "#{current_user.email}.pdf",type: 'application/pdf' , disposition: 'inline') + end # GET /activities/new def new @@ -71,6 +91,6 @@ def set_activity # Only allow a list of trusted parameters through. def activity_params - params.require(:activity).permit(:title, :activity_type, :start, :duration, :calories) + params.require(:activity).permit(:title, :activity_type, :start, :duration, :calories, :image) end end diff --git a/week_5/activity-tracker/app/models/activity.rb b/week_5/activity-tracker/app/models/activity.rb index c3923dac..ff7c92e2 100644 --- a/week_5/activity-tracker/app/models/activity.rb +++ b/week_5/activity-tracker/app/models/activity.rb @@ -1,3 +1,5 @@ class Activity < ApplicationRecord belongs_to :user + validates :calories, numericality: { only_integer: true } + has_one_attached :image end diff --git a/week_5/activity-tracker/app/models/type.rb b/week_5/activity-tracker/app/models/type.rb new file mode 100644 index 00000000..e17f3568 --- /dev/null +++ b/week_5/activity-tracker/app/models/type.rb @@ -0,0 +1,2 @@ +class Type < ApplicationRecord +end diff --git a/week_5/activity-tracker/app/views/activities/_activity.html.erb b/week_5/activity-tracker/app/views/activities/_activity.html.erb index c8d899db..eecd762a 100644 --- a/week_5/activity-tracker/app/views/activities/_activity.html.erb +++ b/week_5/activity-tracker/app/views/activities/_activity.html.erb @@ -2,6 +2,11 @@

<%= activity.title %>

+
+
+ <%= image_tag activity.image ,class: 'img-fluid' %> +
+
<%= activity.activity_type %>
diff --git a/week_5/activity-tracker/app/views/activities/_form.html.erb b/week_5/activity-tracker/app/views/activities/_form.html.erb index 644a4dec..14ee233a 100644 --- a/week_5/activity-tracker/app/views/activities/_form.html.erb +++ b/week_5/activity-tracker/app/views/activities/_form.html.erb @@ -19,10 +19,13 @@ <%= form.text_field :title, class: "form-control mt-2" %>
-
- <%= form.label :activity_type, style: "display: block" %> - <%= form.text_field :activity_type, class:"form-control mt-2" %> +
+
+ +
+ <%= form.collection_select :activity_type, Type.order(:id), :name, :name %>
+
<%= form.label :start, style: "display: block" %> @@ -44,6 +47,11 @@
+
+ <%= form.label :image, style: "display: block" %> + <%= form.file_field :image %> +
+
<%= form.submit class: "btn mt-2 btn-primary text-dark"%> @@ -53,3 +61,5 @@
+ + diff --git a/week_5/activity-tracker/app/views/activities/index.html.erb b/week_5/activity-tracker/app/views/activities/index.html.erb index 0c07eb33..374dc477 100644 --- a/week_5/activity-tracker/app/views/activities/index.html.erb +++ b/week_5/activity-tracker/app/views/activities/index.html.erb @@ -3,14 +3,14 @@

Activities<%= link_to "".html_safe, new_activity_path %>

- <% if @activities.nil? %> -

No Activities to show

- <% else %> + <% if @activities.any? %> <% @activities.each do |activity| %>
<%= render activity %>
<% end %> + <% else %> +

No Activities to show

<% end %>
<%= link_to "Back to Home", root_path %> diff --git a/week_5/activity-tracker/app/views/shared/_navbar.html.erb b/week_5/activity-tracker/app/views/shared/_navbar.html.erb index 395844af..1799c14c 100644 --- a/week_5/activity-tracker/app/views/shared/_navbar.html.erb +++ b/week_5/activity-tracker/app/views/shared/_navbar.html.erb @@ -12,6 +12,9 @@
  • Stats
    • +
  • + Download +
  • About Us
    • diff --git a/week_5/activity-tracker/config/routes.rb b/week_5/activity-tracker/config/routes.rb index 3d040acb..ead2fd3e 100644 --- a/week_5/activity-tracker/config/routes.rb +++ b/week_5/activity-tracker/config/routes.rb @@ -4,6 +4,7 @@ registrations: 'users/registrations', passwords: 'users/passwords' } + get "activities/pdf" , to: "activities#pdf" root "static_pages#index" get "about", to: "static_pages#about" resources :activities do diff --git a/week_5/activity-tracker/db/migrate/20230223230401_create_types.rb b/week_5/activity-tracker/db/migrate/20230223230401_create_types.rb new file mode 100644 index 00000000..554dba11 --- /dev/null +++ b/week_5/activity-tracker/db/migrate/20230223230401_create_types.rb @@ -0,0 +1,9 @@ +class CreateTypes < ActiveRecord::Migration[7.0] + def change + create_table :types do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/week_5/activity-tracker/db/migrate/20230224045742_create_active_storage_tables.active_storage.rb b/week_5/activity-tracker/db/migrate/20230224045742_create_active_storage_tables.active_storage.rb new file mode 100644 index 00000000..8a7bfe18 --- /dev/null +++ b/week_5/activity-tracker/db/migrate/20230224045742_create_active_storage_tables.active_storage.rb @@ -0,0 +1,57 @@ +# This migration comes from active_storage (originally 20170806125915) +class CreateActiveStorageTables < ActiveRecord::Migration[5.2] + def change + # Use Active Record's configured type for primary and foreign keys + primary_key_type, foreign_key_type = primary_and_foreign_key_types + + create_table :active_storage_blobs, id: primary_key_type do |t| + t.string :key, null: false + t.string :filename, null: false + t.string :content_type + t.text :metadata + t.string :service_name, null: false + t.bigint :byte_size, null: false + t.string :checksum + + if connection.supports_datetime_with_precision? + t.datetime :created_at, precision: 6, null: false + else + t.datetime :created_at, null: false + end + + t.index [ :key ], unique: true + end + + create_table :active_storage_attachments, id: primary_key_type do |t| + t.string :name, null: false + t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type + t.references :blob, null: false, type: foreign_key_type + + if connection.supports_datetime_with_precision? + t.datetime :created_at, precision: 6, null: false + else + t.datetime :created_at, null: false + end + + t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true + t.foreign_key :active_storage_blobs, column: :blob_id + end + + create_table :active_storage_variant_records, id: primary_key_type do |t| + t.belongs_to :blob, null: false, index: false, type: foreign_key_type + t.string :variation_digest, null: false + + t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true + t.foreign_key :active_storage_blobs, column: :blob_id + end + end + + private + def primary_and_foreign_key_types + config = Rails.configuration.generators + setting = config.options[config.orm][:primary_key_type] + primary_key_type = setting || :primary_key + foreign_key_type = setting || :bigint + [primary_key_type, foreign_key_type] + end +end diff --git a/week_5/activity-tracker/db/schema.rb b/week_5/activity-tracker/db/schema.rb index 12902582..459cdbc8 100644 --- a/week_5/activity-tracker/db/schema.rb +++ b/week_5/activity-tracker/db/schema.rb @@ -10,7 +10,35 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_02_23_183705) do +ActiveRecord::Schema[7.0].define(version: 2023_02_24_045742) do + create_table "active_storage_attachments", force: :cascade do |t| + t.string "name", null: false + t.string "record_type", null: false + t.bigint "record_id", null: false + t.bigint "blob_id", null: false + t.datetime "created_at", null: false + t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" + t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true + end + + create_table "active_storage_blobs", force: :cascade do |t| + t.string "key", null: false + t.string "filename", null: false + t.string "content_type" + t.text "metadata" + t.string "service_name", null: false + t.bigint "byte_size", null: false + t.string "checksum" + t.datetime "created_at", null: false + t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true + end + + create_table "active_storage_variant_records", force: :cascade do |t| + t.bigint "blob_id", null: false + t.string "variation_digest", null: false + t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true + end + create_table "activities", force: :cascade do |t| t.string "title" t.string "activity_type" @@ -23,6 +51,12 @@ t.index ["user_id"], name: "index_activities_on_user_id" end + create_table "types", force: :cascade do |t| + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "users", force: :cascade do |t| t.string "email", default: "", null: false t.string "encrypted_password", default: "", null: false @@ -35,4 +69,6 @@ t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end + add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" + add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" end diff --git a/week_5/activity-tracker/storage/lh/gg/lhggljjue94x9eo87d7tvza580d2 b/week_5/activity-tracker/storage/lh/gg/lhggljjue94x9eo87d7tvza580d2 new file mode 100644 index 0000000000000000000000000000000000000000..57e2fa60a7503bc01fb64b0d8a8b7dbd07a583f7 GIT binary patch literal 8510 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 L0q%ZyJ^OzEQKr*n literal 0 HcmV?d00001 diff --git a/week_5/activity-tracker/storage/o7/ov/o7ov5fpwny2z92nfuhq0g6sqte93 b/week_5/activity-tracker/storage/o7/ov/o7ov5fpwny2z92nfuhq0g6sqte93 new file mode 100644 index 0000000000000000000000000000000000000000..c6cbee242387ba3131838f477717cd9e3ece8cdc GIT binary patch literal 4660 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 UYb=g}W{nj~#wW`c@NbX*A4~X8CjbBd literal 0 HcmV?d00001 diff --git a/week_5/activity-tracker/test/fixtures/types.yml b/week_5/activity-tracker/test/fixtures/types.yml new file mode 100644 index 00000000..7d412240 --- /dev/null +++ b/week_5/activity-tracker/test/fixtures/types.yml @@ -0,0 +1,7 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + +two: + name: MyString diff --git a/week_5/activity-tracker/test/models/type_test.rb b/week_5/activity-tracker/test/models/type_test.rb new file mode 100644 index 00000000..3156d0a7 --- /dev/null +++ b/week_5/activity-tracker/test/models/type_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +class TypeTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 297f7ba555a1b254ba0bbbd883b3808dc2516634 Mon Sep 17 00:00:00 2001 From: Minank-KP <107191059+Minank-KP@users.noreply.github.com> Date: Sat, 25 Feb 2023 22:00:41 +0000 Subject: [PATCH 4/4] some more features added --- week_5/activity-tracker/Gemfile.lock | 1 - .../app/controllers/activities_controller.rb | 16 +++++++++++----- .../app/helpers/activities_helper.rb | 6 ++++++ .../app/views/activities/_activity.html.erb | 2 +- .../app/views/activities/index.html.erb | 7 ++++++- .../app/views/shared/_flash.html.erb | 10 ++++++++++ .../app/views/shared/_navbar.html.erb | 7 ++++++- .../r0/xjr0mp1qjyyboxv9171k1spbr5qh} | Bin 8 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 week_5/activity-tracker/app/views/shared/_flash.html.erb rename week_5/activity-tracker/storage/{o7/ov/o7ov5fpwny2z92nfuhq0g6sqte93 => xj/r0/xjr0mp1qjyyboxv9171k1spbr5qh} (100%) diff --git a/week_5/activity-tracker/Gemfile.lock b/week_5/activity-tracker/Gemfile.lock index 8fbbb479..724d0351 100644 --- a/week_5/activity-tracker/Gemfile.lock +++ b/week_5/activity-tracker/Gemfile.lock @@ -255,7 +255,6 @@ PLATFORMS x86_64-linux DEPENDENCIES - bigdecimal (~> 1.2, >= 1.2.7) bootsnap bootstrap (~> 5.2.2) capybara diff --git a/week_5/activity-tracker/app/controllers/activities_controller.rb b/week_5/activity-tracker/app/controllers/activities_controller.rb index dea747a1..c0a107ea 100644 --- a/week_5/activity-tracker/app/controllers/activities_controller.rb +++ b/week_5/activity-tracker/app/controllers/activities_controller.rb @@ -19,20 +19,26 @@ def pdf require "prawn" pdf1 = Prawn::Document.new pdf1.text current_user.email,align: :center ,size: 30,style: :bold - pdf1.text "\nActivities\n",align: :center ,size: 25,style: :bold + pdf1.text "\nActivities\n\n",align: :center ,size: 25,style: :bold @activities=Activity.where(user_id: current_user.id) if @activities.any? @activities.each do |activity| - pdf1.text activity.title,size: 20,style: :bold + pdf1.text "Activity Title : #{activity.title}",size: 20,style: :bold act_img=StringIO.open(activity.image.download) pdf1.image act_img,fit: [300,300] - pdf1.text activity.activity_type,size: 15 - # pdf1.text activity.duration.to_s,size: 15 - # pdf1.text activity.calories,size: 15 + pdf1.text "Activity Type : #{activity.activity_type}",size: 15 + pdf1.text "Activity Duration : #{activity.duration}",size: 15, inline_format: true + pdf1.text "Calories Burnt : #{activity.calories}",size: 15, inline_format: true + pdf1.start_new_page end else pdf1.text "No Activity",size: 20,style: :bold end + + pdf1.text "User Total Statistics\n\n",align: :center ,size: 25,style: :bold + stats + pdf1.text "Total Duration : #{@total_duration}",size: 20,align: :center, inline_format: true + pdf1.text "Calories Burnt : #{@total_calories}",size: 20,align: :center, inline_format: true send_data(pdf1.render,filename: "#{current_user.email}.pdf",type: 'application/pdf' , disposition: 'inline') end diff --git a/week_5/activity-tracker/app/helpers/activities_helper.rb b/week_5/activity-tracker/app/helpers/activities_helper.rb index 4e9784cc..08e9a699 100644 --- a/week_5/activity-tracker/app/helpers/activities_helper.rb +++ b/week_5/activity-tracker/app/helpers/activities_helper.rb @@ -1,2 +1,8 @@ module ActivitiesHelper + def flash_class(level) + case level + when :notice then 'alert alert-success' + when :alert then 'alert alert-danger' + end + end end diff --git a/week_5/activity-tracker/app/views/activities/_activity.html.erb b/week_5/activity-tracker/app/views/activities/_activity.html.erb index eecd762a..14fb4b53 100644 --- a/week_5/activity-tracker/app/views/activities/_activity.html.erb +++ b/week_5/activity-tracker/app/views/activities/_activity.html.erb @@ -3,7 +3,7 @@

    <%= activity.title %>

    -
    +
    <%= image_tag activity.image ,class: 'img-fluid' %>
    diff --git a/week_5/activity-tracker/app/views/activities/index.html.erb b/week_5/activity-tracker/app/views/activities/index.html.erb index 374dc477..4f2a68f6 100644 --- a/week_5/activity-tracker/app/views/activities/index.html.erb +++ b/week_5/activity-tracker/app/views/activities/index.html.erb @@ -1,4 +1,9 @@ -

    <%= notice %>

    +<% if notice %> + +<% end %>

    Activities<%= link_to "".html_safe, new_activity_path %>

    diff --git a/week_5/activity-tracker/app/views/shared/_flash.html.erb b/week_5/activity-tracker/app/views/shared/_flash.html.erb new file mode 100644 index 00000000..9d6adaf4 --- /dev/null +++ b/week_5/activity-tracker/app/views/shared/_flash.html.erb @@ -0,0 +1,10 @@ +
    + <% flash.each do |key,value| %> + + <% end %> +
    \ No newline at end of file diff --git a/week_5/activity-tracker/app/views/shared/_navbar.html.erb b/week_5/activity-tracker/app/views/shared/_navbar.html.erb index 1799c14c..cd024075 100644 --- a/week_5/activity-tracker/app/views/shared/_navbar.html.erb +++ b/week_5/activity-tracker/app/views/shared/_navbar.html.erb @@ -5,7 +5,7 @@     diff --git a/week_5/activity-tracker/storage/o7/ov/o7ov5fpwny2z92nfuhq0g6sqte93 b/week_5/activity-tracker/storage/xj/r0/xjr0mp1qjyyboxv9171k1spbr5qh similarity index 100% rename from week_5/activity-tracker/storage/o7/ov/o7ov5fpwny2z92nfuhq0g6sqte93 rename to week_5/activity-tracker/storage/xj/r0/xjr0mp1qjyyboxv9171k1spbr5qh