From 296f2e667076fb92582d395b20a3a6e804ac6575 Mon Sep 17 00:00:00 2001 From: Sharath Balaji T Date: Thu, 9 Feb 2023 15:07:20 +0000 Subject: [PATCH 1/5] Authentication added --- week_4/activity-tracker/Gemfile | 2 + week_4/activity-tracker/Gemfile.lock | 14 + .../app/controllers/activities_controller.rb | 76 +++++ .../app/controllers/application_controller.rb | 1 + .../controllers/static_pages_controller.rb | 7 + .../app/helpers/activities_helper.rb | 2 + .../app/helpers/static_pages_helper.rb | 2 + .../activity-tracker/app/models/activity.rb | 2 + week_4/activity-tracker/app/models/user.rb | 6 + .../app/views/activities/_activity.html.erb | 34 ++ .../views/activities/_activity.json.jbuilder | 2 + .../app/views/activities/_form.html.erb | 49 +++ .../app/views/activities/edit.html.erb | 17 + .../app/views/activities/index.html.erb | 24 ++ .../app/views/activities/index.json.jbuilder | 1 + .../app/views/activities/new.html.erb | 16 + .../app/views/activities/show.html.erb | 17 + .../app/views/activities/show.json.jbuilder | 1 + .../app/views/activities/stats.html.erb | 14 + .../app/views/layouts/application.html.erb | 2 + .../app/views/static_pages/about.html.erb | 2 + .../app/views/static_pages/index.html.erb | 11 + .../config/initializers/devise.rb | 312 ++++++++++++++++++ .../config/locales/devise.en.yml | 65 ++++ week_4/activity-tracker/config/routes.rb | 14 +- .../20230209142024_create_activities.rb | 13 + .../20230209144158_devise_create_users.rb | 44 +++ week_4/activity-tracker/db/schema.rb | 24 +- .../controllers/activities_controller_test.rb | 18 - .../static_pages_controller_test.rb | 13 + .../test/fixtures/activities.yml | 15 + .../activity-tracker/test/fixtures/users.yml | 13 +- .../test/models/activity_test.rb | 7 + .../activity-tracker/test/models/user_test.rb | 7 + .../test/system/activities_test.rb | 49 +++ 35 files changed, 871 insertions(+), 25 deletions(-) create mode 100644 week_4/activity-tracker/app/controllers/activities_controller.rb create mode 100644 week_4/activity-tracker/app/controllers/static_pages_controller.rb create mode 100644 week_4/activity-tracker/app/helpers/activities_helper.rb create mode 100644 week_4/activity-tracker/app/helpers/static_pages_helper.rb create mode 100644 week_4/activity-tracker/app/models/activity.rb create mode 100644 week_4/activity-tracker/app/models/user.rb create mode 100644 week_4/activity-tracker/app/views/activities/_activity.html.erb create mode 100644 week_4/activity-tracker/app/views/activities/_activity.json.jbuilder create mode 100644 week_4/activity-tracker/app/views/activities/_form.html.erb create mode 100644 week_4/activity-tracker/app/views/activities/edit.html.erb create mode 100644 week_4/activity-tracker/app/views/activities/index.html.erb create mode 100644 week_4/activity-tracker/app/views/activities/index.json.jbuilder create mode 100644 week_4/activity-tracker/app/views/activities/new.html.erb create mode 100644 week_4/activity-tracker/app/views/activities/show.html.erb create mode 100644 week_4/activity-tracker/app/views/activities/show.json.jbuilder create mode 100644 week_4/activity-tracker/app/views/activities/stats.html.erb create mode 100644 week_4/activity-tracker/app/views/static_pages/about.html.erb create mode 100644 week_4/activity-tracker/app/views/static_pages/index.html.erb create mode 100644 week_4/activity-tracker/config/initializers/devise.rb create mode 100644 week_4/activity-tracker/config/locales/devise.en.yml create mode 100644 week_4/activity-tracker/db/migrate/20230209142024_create_activities.rb create mode 100644 week_4/activity-tracker/db/migrate/20230209144158_devise_create_users.rb create mode 100644 week_4/activity-tracker/test/controllers/static_pages_controller_test.rb create mode 100644 week_4/activity-tracker/test/fixtures/activities.yml create mode 100644 week_4/activity-tracker/test/models/activity_test.rb create mode 100644 week_4/activity-tracker/test/models/user_test.rb create mode 100644 week_4/activity-tracker/test/system/activities_test.rb diff --git a/week_4/activity-tracker/Gemfile b/week_4/activity-tracker/Gemfile index 413b15ae..83bc8ff5 100644 --- a/week_4/activity-tracker/Gemfile +++ b/week_4/activity-tracker/Gemfile @@ -48,6 +48,8 @@ gem "bootsnap", require: false # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] # gem "image_processing", "~> 1.2" +gem "devise" + group :development, :test do # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem gem "debug", platforms: %i[ mri mingw x64_mingw ] diff --git a/week_4/activity-tracker/Gemfile.lock b/week_4/activity-tracker/Gemfile.lock index e8909a06..c6e4f082 100644 --- a/week_4/activity-tracker/Gemfile.lock +++ b/week_4/activity-tracker/Gemfile.lock @@ -68,6 +68,7 @@ GEM tzinfo (~> 2.0) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) + bcrypt (3.1.18) bindex (0.8.1) bootsnap (1.15.0) msgpack (~> 1.2) @@ -87,6 +88,12 @@ GEM debug (1.7.1) irb (>= 1.5.0) reline (>= 0.3.1) + devise (4.8.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) erubi (1.12.0) globalid (1.0.0) activesupport (>= 5.0) @@ -127,6 +134,7 @@ GEM nio4r (2.5.8) nokogiri (1.14.0-x86_64-linux) racc (~> 1.4) + orm_adapter (0.5.0) public_suffix (5.0.1) puma (5.6.5) nio4r (~> 2.0) @@ -168,6 +176,9 @@ GEM regexp_parser (2.6.1) reline (0.3.2) io-console (~> 0.5) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) rexml (3.2.5) rubyzip (2.3.2) selenium-webdriver (4.7.1) @@ -192,6 +203,8 @@ GEM railties (>= 6.0.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) + warden (1.2.9) + rack (>= 2.0.9) web-console (4.2.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) @@ -216,6 +229,7 @@ DEPENDENCIES bootsnap capybara debug + devise importmap-rails jbuilder puma (~> 5.0) diff --git a/week_4/activity-tracker/app/controllers/activities_controller.rb b/week_4/activity-tracker/app/controllers/activities_controller.rb new file mode 100644 index 00000000..0c8fbcd7 --- /dev/null +++ b/week_4/activity-tracker/app/controllers/activities_controller.rb @@ -0,0 +1,76 @@ +class ActivitiesController < ApplicationController + before_action :set_activity, only: %i[ show edit update destroy ] + + # GET /activities or /activities.json + def index + @activities = Activity.all + end + + # GET /activities/1 or /activities/1.json + def show + end + + # GET /activities/new + def new + @activity = Activity.new + end + + # GET /activities/1/edit + def edit + end + +# GET /activities/stats/ +def stats + @total_duration = Activity.sum(:duration) + @total_calories = Activity.sum(:calories) +end + + # POST /activities or /activities.json + def create + @activity = Activity.new(activity_params) + + respond_to do |format| + if @activity.save + format.html { redirect_to activity_url(@activity), notice: "Activity was successfully created." } + format.json { render :show, status: :created, location: @activity } + else + format.html { render :new, status: :unprocessable_entity } + format.json { render json: @activity.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /activities/1 or /activities/1.json + def update + respond_to do |format| + if @activity.update(activity_params) + format.html { redirect_to activity_url(@activity), notice: "Activity was successfully updated." } + format.json { render :show, status: :ok, location: @activity } + else + format.html { render :edit, status: :unprocessable_entity } + format.json { render json: @activity.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /activities/1 or /activities/1.json + def destroy + @activity.destroy + + respond_to do |format| + format.html { redirect_to activities_url, notice: "Activity was successfully destroyed." } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_activity + @activity = Activity.find(params[:id]) + end + + # Only allow a list of trusted parameters through. + def activity_params + params.require(:activity).permit(:title, :activity_type, :start, :duration, :calories) + end +end diff --git a/week_4/activity-tracker/app/controllers/application_controller.rb b/week_4/activity-tracker/app/controllers/application_controller.rb index 09705d12..6610e6d0 100644 --- a/week_4/activity-tracker/app/controllers/application_controller.rb +++ b/week_4/activity-tracker/app/controllers/application_controller.rb @@ -1,2 +1,3 @@ class ApplicationController < ActionController::Base + end diff --git a/week_4/activity-tracker/app/controllers/static_pages_controller.rb b/week_4/activity-tracker/app/controllers/static_pages_controller.rb new file mode 100644 index 00000000..0653f7b3 --- /dev/null +++ b/week_4/activity-tracker/app/controllers/static_pages_controller.rb @@ -0,0 +1,7 @@ +class StaticPagesController < ApplicationController + def index + end + + def about + end +end diff --git a/week_4/activity-tracker/app/helpers/activities_helper.rb b/week_4/activity-tracker/app/helpers/activities_helper.rb new file mode 100644 index 00000000..4e9784cc --- /dev/null +++ b/week_4/activity-tracker/app/helpers/activities_helper.rb @@ -0,0 +1,2 @@ +module ActivitiesHelper +end diff --git a/week_4/activity-tracker/app/helpers/static_pages_helper.rb b/week_4/activity-tracker/app/helpers/static_pages_helper.rb new file mode 100644 index 00000000..2d63e79e --- /dev/null +++ b/week_4/activity-tracker/app/helpers/static_pages_helper.rb @@ -0,0 +1,2 @@ +module StaticPagesHelper +end diff --git a/week_4/activity-tracker/app/models/activity.rb b/week_4/activity-tracker/app/models/activity.rb new file mode 100644 index 00000000..a99f990d --- /dev/null +++ b/week_4/activity-tracker/app/models/activity.rb @@ -0,0 +1,2 @@ +class Activity < ApplicationRecord +end diff --git a/week_4/activity-tracker/app/models/user.rb b/week_4/activity-tracker/app/models/user.rb new file mode 100644 index 00000000..47567994 --- /dev/null +++ b/week_4/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_4/activity-tracker/app/views/activities/_activity.html.erb b/week_4/activity-tracker/app/views/activities/_activity.html.erb new file mode 100644 index 00000000..6bd5a5d0 --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/_activity.html.erb @@ -0,0 +1,34 @@ +
+

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

+ +

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

+ +

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

+ +

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

+ +

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

+ +
+
+ \ No newline at end of file diff --git a/week_4/activity-tracker/app/views/activities/_activity.json.jbuilder b/week_4/activity-tracker/app/views/activities/_activity.json.jbuilder new file mode 100644 index 00000000..8efbd331 --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/_activity.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! activity, :id, :title, :activity_type, :start, :duration, :calories, :created_at, :updated_at +json.url activity_url(activity, format: :json) diff --git a/week_4/activity-tracker/app/views/activities/_form.html.erb b/week_4/activity-tracker/app/views/activities/_form.html.erb new file mode 100644 index 00000000..233246c0 --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/_form.html.erb @@ -0,0 +1,49 @@ +
<%= form_with(model: activity) do |form| %> + <% if activity.errors.any? %> +
+

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

+ +
    + <% activity.errors.each do |error| %> +
  • <%= error.full_message %>
    • + <% end %> +
+
+ <% end %> + +
+ <%= form.label :title, style: "display: block" %> + <%= form.text_field :title %> +
+ +
+ <%= form.label :activity_type, style: "display: block" %> + <%= form.text_field :activity_type %> +
+ +
+ <%= form.label :start, style: "display: block" %> + <%= form.datetime_field :start %> +
+ +
+ <%= form.label :duration, style: "display: block" %> + <%= form.text_field :duration %> +
+ +
+ <%= form.label :calories, style: "display: block" %> + <%= form.number_field :calories %> +
+ +
+ <%= form.submit %> +
+<% end %> +
+ \ No newline at end of file diff --git a/week_4/activity-tracker/app/views/activities/edit.html.erb b/week_4/activity-tracker/app/views/activities/edit.html.erb new file mode 100644 index 00000000..61d0fa46 --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/edit.html.erb @@ -0,0 +1,17 @@ +

Editing activity

+ +<%= render "form", activity: @activity %> + +
+ +
+ <%= link_to "Show this activity", @activity %> | + <%= link_to "Back to activities", activities_path %> +
+
+ \ No newline at end of file diff --git a/week_4/activity-tracker/app/views/activities/index.html.erb b/week_4/activity-tracker/app/views/activities/index.html.erb new file mode 100644 index 00000000..63b5707f --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/index.html.erb @@ -0,0 +1,24 @@ +
+

<%= notice %>

+ +

Activities

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

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

+ <% end %> +
+ +<%= link_to "New activity", new_activity_path %>
+<%= link_to "Go to Statistics", stats_activities_path %>
+<%= link_to "Return to Home", static_pages_index_path %> +
+ \ No newline at end of file diff --git a/week_4/activity-tracker/app/views/activities/index.json.jbuilder b/week_4/activity-tracker/app/views/activities/index.json.jbuilder new file mode 100644 index 00000000..865f89ee --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @activities, partial: "activities/activity", as: :activity diff --git a/week_4/activity-tracker/app/views/activities/new.html.erb b/week_4/activity-tracker/app/views/activities/new.html.erb new file mode 100644 index 00000000..8e0c0631 --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/new.html.erb @@ -0,0 +1,16 @@ +

New activity

+ +<%= render "form", activity: @activity %> + +
+ +
+ <%= link_to "Back to activities", activities_path %> +
+
+ \ No newline at end of file diff --git a/week_4/activity-tracker/app/views/activities/show.html.erb b/week_4/activity-tracker/app/views/activities/show.html.erb new file mode 100644 index 00000000..88a0508d --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/show.html.erb @@ -0,0 +1,17 @@ +

<%= 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 %> +
+
+ \ No newline at end of file diff --git a/week_4/activity-tracker/app/views/activities/show.json.jbuilder b/week_4/activity-tracker/app/views/activities/show.json.jbuilder new file mode 100644 index 00000000..a145d0a8 --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "activities/activity", activity: @activity diff --git a/week_4/activity-tracker/app/views/activities/stats.html.erb b/week_4/activity-tracker/app/views/activities/stats.html.erb new file mode 100644 index 00000000..87938ae4 --- /dev/null +++ b/week_4/activity-tracker/app/views/activities/stats.html.erb @@ -0,0 +1,14 @@ +
+

Activity Statistics


+ +

Total Duration: <%= @total_duration %>


+

Total Calories: <%= @total_calories %>

+<%=link_to "Back to Activities",activities_path%> +
+ + \ No newline at end of file diff --git a/week_4/activity-tracker/app/views/layouts/application.html.erb b/week_4/activity-tracker/app/views/layouts/application.html.erb index 5f65d83d..7dcb6845 100644 --- a/week_4/activity-tracker/app/views/layouts/application.html.erb +++ b/week_4/activity-tracker/app/views/layouts/application.html.erb @@ -11,6 +11,8 @@ +

<%= notice %>

+

<%= alert %>

<%= yield %> diff --git a/week_4/activity-tracker/app/views/static_pages/about.html.erb b/week_4/activity-tracker/app/views/static_pages/about.html.erb new file mode 100644 index 00000000..30597a44 --- /dev/null +++ b/week_4/activity-tracker/app/views/static_pages/about.html.erb @@ -0,0 +1,2 @@ +

ABOUT

+

This is a fitness app

diff --git a/week_4/activity-tracker/app/views/static_pages/index.html.erb b/week_4/activity-tracker/app/views/static_pages/index.html.erb new file mode 100644 index 00000000..593476b3 --- /dev/null +++ b/week_4/activity-tracker/app/views/static_pages/index.html.erb @@ -0,0 +1,11 @@ +

Welcome to Activity Tracker!!!

+<%if user_signed_in? %> +
Logged in as: <%=current_user.email%>
+<%=link_to "Edit Account Settings",edit_user_registration_path%>
+<%=link_to "Go to Activities",activities_path%> +<%=button_to "Logout",destroy_user_session_path, method: :delete %> + +<%else%> +<%=link_to "Sign In",new_user_session_path%>
+<%=link_to "Sign Up",new_user_registration_path%> +<%end%> \ No newline at end of file diff --git a/week_4/activity-tracker/config/initializers/devise.rb b/week_4/activity-tracker/config/initializers/devise.rb new file mode 100644 index 00000000..3b356302 --- /dev/null +++ b/week_4/activity-tracker/config/initializers/devise.rb @@ -0,0 +1,312 @@ +# frozen_string_literal: true + +# Assuming you have not yet modified this file, each configuration option below +# is set to its default value. Note that some are commented out while others +# are not: uncommented lines are intended to protect your configuration from +# breaking changes in upgrades (i.e., in the event that future versions of +# Devise change the default values for those options). +# +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # Devise will use the `secret_key_base` as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = 'fac0545f7e70c8124f48234ad41bb033390f4883041a97453906691b6f8e5aa4dc389323a0f281b55d5b0043c678ff8a191f076d95957ca6c8bdad359989e6a5' + + # ==> Controller configuration + # Configure the parent class to the devise controllers. + # config.parent_controller = 'DeviseController' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # 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' + + # Configure the parent class responsible to send e-mails. + # config.parent_mailer = 'ActionMailer::Base' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [:email] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [:email] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [:email] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. + # For API-only applications to support authentication "out-of-the-box", you will likely want to + # enable this with :database unless you are using a custom strategy. + # The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 401 status code should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # When false, Devise will not attempt to reload routes on eager load. + # This can reduce the time taken to boot the app but if your application + # requires the Devise mappings to be loaded during boot time the application + # won't boot properly. + # config.reload_routes = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 12. If + # using other algorithms, it sets how many times you want the password to be hashed. + # The number of stretches used for generating the hashed password are stored + # with the hashed password. This allows you to change the stretches without + # invalidating existing passwords. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # algorithm), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 12 + + # Set up a pepper to generate the hashed password. + # config.pepper = 'd5b79854880679951fc11725a8ce5bd633488e799fcae6389b8554185dc826974a5a89aaf7e13dc0ef8c3ff2e0fc1ccaae8f7e5c42bcf4716dc301855a129b36' + + # Send a notification to the original email when the user's email is changed. + # config.send_email_changed_notification = false + + # Send a notification email when the user's password is changed. + # config.send_password_change_notification = false + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. + # You can also set it to nil, which will allow the user to access the website + # without confirming their account. + # Default is 0.days, meaning the user cannot access the website without + # confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [:email] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 6..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [:email] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = true + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [:email] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # When set to false, does not sign a user in automatically after their password is + # reset. Defaults to true, so a user is signed in automatically after a reset. + # config.sign_in_after_reset_password = true + + # ==> Configuration for :encryptable + # Allow you to use another hashing or encryption algorithm besides bcrypt (default). + # You can use :sha1, :sha512 or algorithms from others authentication tools as + # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20 + # for default behavior) and :restful_authentication_sha1 (then you should set + # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using OmniAuth, Devise cannot automatically set OmniAuth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' + + # ==> Turbolinks configuration + # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly: + # + # ActiveSupport.on_load(:devise_failure_app) do + # include Turbolinks::Controller + # end + + # ==> Configuration for :registerable + + # When set to false, does not sign a user in automatically after their password is + # changed. Defaults to true, so a user is signed in automatically after changing a password. + # config.sign_in_after_change_password = true +end diff --git a/week_4/activity-tracker/config/locales/devise.en.yml b/week_4/activity-tracker/config/locales/devise.en.yml new file mode 100644 index 00000000..260e1c4b --- /dev/null +++ b/week_4/activity-tracker/config/locales/devise.en.yml @@ -0,0 +1,65 @@ +# Additional translations at https://github.com/heartcombo/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your email address has been successfully confirmed." + send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid %{authentication_keys} or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account is locked." + not_found_in_database: "Invalid %{authentication_keys} or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your email address before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock instructions" + email_changed: + subject: "Email Changed" + password_change: + subject: "Password Changed" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password has been changed successfully. You are now signed in." + updated_not_active: "Your password has been changed successfully." + registrations: + destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address." + updated: "Your account has been updated successfully." + updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/week_4/activity-tracker/config/routes.rb b/week_4/activity-tracker/config/routes.rb index 7ff20da4..17c7ac6a 100644 --- a/week_4/activity-tracker/config/routes.rb +++ b/week_4/activity-tracker/config/routes.rb @@ -1,7 +1,13 @@ Rails.application.routes.draw do - - # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html + devise_for :users + get 'static_pages/index' + get 'about',to:"static_pages#about" + resources :activities do + collection do + get 'stats' + end + end - # Defines the root path route ("/") - # root "articles#index" + root 'static_pages#index' + end diff --git a/week_4/activity-tracker/db/migrate/20230209142024_create_activities.rb b/week_4/activity-tracker/db/migrate/20230209142024_create_activities.rb new file mode 100644 index 00000000..d0fe3b06 --- /dev/null +++ b/week_4/activity-tracker/db/migrate/20230209142024_create_activities.rb @@ -0,0 +1,13 @@ +class CreateActivities < ActiveRecord::Migration[7.0] + def change + create_table :activities do |t| + t.string :title + t.string :activity_type + t.datetime :start + t.decimal :duration + t.integer :calories + + t.timestamps + end + end +end diff --git a/week_4/activity-tracker/db/migrate/20230209144158_devise_create_users.rb b/week_4/activity-tracker/db/migrate/20230209144158_devise_create_users.rb new file mode 100644 index 00000000..43927dbd --- /dev/null +++ b/week_4/activity-tracker/db/migrate/20230209144158_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_4/activity-tracker/db/schema.rb b/week_4/activity-tracker/db/schema.rb index a3b04951..db3b9cf3 100644 --- a/week_4/activity-tracker/db/schema.rb +++ b/week_4/activity-tracker/db/schema.rb @@ -10,5 +10,27 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 0) do +ActiveRecord::Schema[7.0].define(version: 2023_02_09_144158) do + create_table "activities", force: :cascade do |t| + t.string "title" + t.string "activity_type" + t.datetime "start" + t.decimal "duration" + t.integer "calories" + 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 + 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_4/activity-tracker/test/controllers/activities_controller_test.rb b/week_4/activity-tracker/test/controllers/activities_controller_test.rb index 3968a7cc..dec4d257 100644 --- a/week_4/activity-tracker/test/controllers/activities_controller_test.rb +++ b/week_4/activity-tracker/test/controllers/activities_controller_test.rb @@ -2,16 +2,9 @@ class ActivitiesControllerTest < ActionDispatch::IntegrationTest setup do - sign_in users(:steve) @activity = activities(:one) end - test "should not get index if signed out" do - sign_out users(:steve) - get activities_url - assert_response :redirect - end - test "should get index" do get activities_url assert_response :success @@ -52,15 +45,4 @@ class ActivitiesControllerTest < ActionDispatch::IntegrationTest assert_redirected_to activities_url end - - test "should get stats" do - get stats_activities_url - assert_response :success - expected_calories = Activity.sum(&:calories) - expected_duration = Activity.sum(&:duration) - cal = assigns(:total_calories) - dur = assigns(:total_duration) - assert_equal(expected_calories, cal) - assert_equal(expected_duration, dur) - end end diff --git a/week_4/activity-tracker/test/controllers/static_pages_controller_test.rb b/week_4/activity-tracker/test/controllers/static_pages_controller_test.rb new file mode 100644 index 00000000..2126daec --- /dev/null +++ b/week_4/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_4/activity-tracker/test/fixtures/activities.yml b/week_4/activity-tracker/test/fixtures/activities.yml new file mode 100644 index 00000000..3700c6c5 --- /dev/null +++ b/week_4/activity-tracker/test/fixtures/activities.yml @@ -0,0 +1,15 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + activity_type: MyString + start: 2023-02-09 14:20:25 + duration: 9.99 + calories: 1 + +two: + title: MyString + activity_type: MyString + start: 2023-02-09 14:20:25 + duration: 9.99 + calories: 1 diff --git a/week_4/activity-tracker/test/fixtures/users.yml b/week_4/activity-tracker/test/fixtures/users.yml index 9c53789f..d7a33292 100644 --- a/week_4/activity-tracker/test/fixtures/users.yml +++ b/week_4/activity-tracker/test/fixtures/users.yml @@ -1,2 +1,11 @@ -steve: - email: steve@example.com \ No newline at end of file +# 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_4/activity-tracker/test/models/activity_test.rb b/week_4/activity-tracker/test/models/activity_test.rb new file mode 100644 index 00000000..c07a8b91 --- /dev/null +++ b/week_4/activity-tracker/test/models/activity_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +class ActivityTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/week_4/activity-tracker/test/models/user_test.rb b/week_4/activity-tracker/test/models/user_test.rb new file mode 100644 index 00000000..5c07f490 --- /dev/null +++ b/week_4/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 diff --git a/week_4/activity-tracker/test/system/activities_test.rb b/week_4/activity-tracker/test/system/activities_test.rb new file mode 100644 index 00000000..15feb5a2 --- /dev/null +++ b/week_4/activity-tracker/test/system/activities_test.rb @@ -0,0 +1,49 @@ +require "application_system_test_case" + +class ActivitiesTest < ApplicationSystemTestCase + setup do + @activity = activities(:one) + end + + test "visiting the index" do + visit activities_url + assert_selector "h1", text: "Activities" + end + + test "should create activity" do + visit activities_url + click_on "New activity" + + fill_in "Activity type", with: @activity.activity_type + fill_in "Calories", with: @activity.calories + fill_in "Duration", with: @activity.duration + fill_in "Start", with: @activity.start + fill_in "Title", with: @activity.title + click_on "Create Activity" + + assert_text "Activity was successfully created" + click_on "Back" + end + + test "should update Activity" do + visit activity_url(@activity) + click_on "Edit this activity", match: :first + + fill_in "Activity type", with: @activity.activity_type + fill_in "Calories", with: @activity.calories + fill_in "Duration", with: @activity.duration + fill_in "Start", with: @activity.start + fill_in "Title", with: @activity.title + click_on "Update Activity" + + assert_text "Activity was successfully updated" + click_on "Back" + end + + test "should destroy Activity" do + visit activity_url(@activity) + click_on "Destroy this activity", match: :first + + assert_text "Activity was successfully destroyed" + end +end From d0139d8a6319e1d693072ecb2310608ff9f48c05 Mon Sep 17 00:00:00 2001 From: Sharath Balaji T Date: Thu, 9 Feb 2023 16:26:41 +0000 Subject: [PATCH 2/5] rails test successful --- .../app/controllers/static_pages_controller.rb | 1 + .../app/views/static_pages/about.html.erb | 1 + .../app/views/static_pages/index.html.erb | 1 + week_4/activity-tracker/config/routes.rb | 1 + week_4/activity-tracker/test/fixtures/users.yml | 10 +++++----- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/week_4/activity-tracker/app/controllers/static_pages_controller.rb b/week_4/activity-tracker/app/controllers/static_pages_controller.rb index 0653f7b3..f435c36d 100644 --- a/week_4/activity-tracker/app/controllers/static_pages_controller.rb +++ b/week_4/activity-tracker/app/controllers/static_pages_controller.rb @@ -1,4 +1,5 @@ class StaticPagesController < ApplicationController + def index end diff --git a/week_4/activity-tracker/app/views/static_pages/about.html.erb b/week_4/activity-tracker/app/views/static_pages/about.html.erb index 30597a44..af0d8c90 100644 --- a/week_4/activity-tracker/app/views/static_pages/about.html.erb +++ b/week_4/activity-tracker/app/views/static_pages/about.html.erb @@ -1,2 +1,3 @@

ABOUT

This is a fitness app

+<%= link_to "Return to Home", static_pages_index_path %> \ No newline at end of file diff --git a/week_4/activity-tracker/app/views/static_pages/index.html.erb b/week_4/activity-tracker/app/views/static_pages/index.html.erb index 593476b3..70c2121c 100644 --- a/week_4/activity-tracker/app/views/static_pages/index.html.erb +++ b/week_4/activity-tracker/app/views/static_pages/index.html.erb @@ -3,6 +3,7 @@
Logged in as: <%=current_user.email%>
<%=link_to "Edit Account Settings",edit_user_registration_path%>
<%=link_to "Go to Activities",activities_path%> +<%=link_to "About",about_path%> <%=button_to "Logout",destroy_user_session_path, method: :delete %> <%else%> diff --git a/week_4/activity-tracker/config/routes.rb b/week_4/activity-tracker/config/routes.rb index 17c7ac6a..4e456246 100644 --- a/week_4/activity-tracker/config/routes.rb +++ b/week_4/activity-tracker/config/routes.rb @@ -1,6 +1,7 @@ Rails.application.routes.draw do devise_for :users get 'static_pages/index' + get 'static_pages/about' get 'about',to:"static_pages#about" resources :activities do collection do diff --git a/week_4/activity-tracker/test/fixtures/users.yml b/week_4/activity-tracker/test/fixtures/users.yml index d7a33292..32025fd8 100644 --- a/week_4/activity-tracker/test/fixtures/users.yml +++ b/week_4/activity-tracker/test/fixtures/users.yml @@ -4,8 +4,8 @@ # 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 +steve: + email: steve@example.com + +jane: + email: jane@example.com \ No newline at end of file From 9fee638e2f917137040d06382d430f9bcf12c9a9 Mon Sep 17 00:00:00 2001 From: Sharath Balaji T Date: Mon, 13 Feb 2023 10:27:37 +0000 Subject: [PATCH 3/5] week5 assignment completed --- .../app/assets/stylesheets/dark-mode.css | 6 +- .../app/controllers/activities_controller.rb | 6 ++ .../controllers/static_pages_controller.rb | 7 ++ .../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 | 17 ++-- .../app/views/activities/index.html.erb | 21 ++--- .../app/views/activities/new.html.erb | 14 ++-- .../app/views/activities/show.html.erb | 10 +-- .../app/views/activities/stats.html.erb | 14 ++++ .../views/devise/confirmations/new.html.erb | 16 ++++ .../mailer/confirmation_instructions.html.erb | 5 ++ .../devise/mailer/email_changed.html.erb | 7 ++ .../devise/mailer/password_change.html.erb | 3 + .../reset_password_instructions.html.erb | 8 ++ .../mailer/unlock_instructions.html.erb | 7 ++ .../app/views/devise/passwords/edit.html.erb | 25 ++++++ .../app/views/devise/passwords/new.html.erb | 29 +++++++ .../views/devise/registrations/edit.html.erb | 65 +++++++++++++++ .../views/devise/registrations/new.html.erb | 42 ++++++++++ .../app/views/devise/sessions/new.html.erb | 39 +++++++++ .../devise/shared/_error_messages.html.erb | 15 ++++ .../app/views/devise/shared/_links.html.erb | 25 ++++++ .../app/views/devise/unlocks/new.html.erb | 16 ++++ .../app/views/layouts/application.html.erb | 4 + .../app/views/shared/_navbar.html.erb | 22 +++++ .../app/views/static_pages/about.html.erb | 5 ++ .../app/views/static_pages/index.html.erb | 16 ++++ .../config/initializers/devise.rb | 6 +- week_5/activity-tracker/config/routes.rb | 19 +++-- .../20230212051334_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 ++ 37 files changed, 601 insertions(+), 103 deletions(-) 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/devise/confirmations/new.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/mailer/confirmation_instructions.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/mailer/email_changed.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/mailer/password_change.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/mailer/reset_password_instructions.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/mailer/unlock_instructions.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/passwords/edit.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/passwords/new.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/registrations/edit.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/registrations/new.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/sessions/new.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/shared/_error_messages.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/shared/_links.html.erb create mode 100644 week_5/activity-tracker/app/views/devise/unlocks/new.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/20230212051334_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/dark-mode.css b/week_5/activity-tracker/app/assets/stylesheets/dark-mode.css index 83283ca3..67ca318a 100644 --- a/week_5/activity-tracker/app/assets/stylesheets/dark-mode.css +++ b/week_5/activity-tracker/app/assets/stylesheets/dark-mode.css @@ -504,7 +504,9 @@ select { .card-subtitle { color: rgb(111, 118, 219); } - +.orange-text { + color: #ffa500; + } /* MODAL STYLES */ .modal-body { @@ -530,7 +532,7 @@ select { } .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%); + 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; } diff --git a/week_5/activity-tracker/app/controllers/activities_controller.rb b/week_5/activity-tracker/app/controllers/activities_controller.rb index a1dc90c1..45036e58 100644 --- a/week_5/activity-tracker/app/controllers/activities_controller.rb +++ b/week_5/activity-tracker/app/controllers/activities_controller.rb @@ -19,6 +19,12 @@ def new def edit end +# GET /activities/stats/ +def stats + @total_duration = Activity.sum(:duration) + @total_calories = Activity.sum(:calories) +end + # POST /activities or /activities.json def create @activity = Activity.new(activity_params) 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..0653f7b3 --- /dev/null +++ b/week_5/activity-tracker/app/controllers/static_pages_controller.rb @@ -0,0 +1,7 @@ +class StaticPagesController < ApplicationController + 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..804b3f6c 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..b61cb5b9 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:

- -
    - <% activity.errors.each do |error| %> -
  • <%= error.full_message %>
    • +
    +
    +
    + <%= form_with(model: activity) do |form| %> + <% if activity.errors.any? %> +
    +

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

    + +
      + <% activity.errors.each do |error| %> +
    • <%= error.full_message %>
      • + <% end %> +
    +
    <% end %> -
-
- <% 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..ff8ff316 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,9 @@ -

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 %> +
+
+
+ <%= link_to "Show this activity", @activity ,class:"btn btn-info"%> | + <%= link_to "Back to activities", activities_path,class:"btn btn-alternate" %>
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..04c87b57 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,17 @@ -

<%= notice %>

+

<%= 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 "Go to Statistics", stats_activities_path,class:"btn btn-info" %> | +<%= link_to "Return to Home", static_pages_index_path,class:"btn btn-alternate" %> +
\ No newline at end of file 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..fa2f88d0 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,8 @@ +

<%= 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 %> +
+
+ <%= link_to "Back to activities", activities_path,class:"btn btn-alternate" %>
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..6eb436ae --- /dev/null +++ b/week_5/activity-tracker/app/views/activities/stats.html.erb @@ -0,0 +1,14 @@ +
+
+

Activities Statistics


+
+

Total Duration: <%= @total_duration %>


+

Total Calories: <%= @total_calories %>

+
+
+
+
+ <%=link_to "Back to Activities",activities_path,class:"btn btn-info"%> +
+ + diff --git a/week_5/activity-tracker/app/views/devise/confirmations/new.html.erb b/week_5/activity-tracker/app/views/devise/confirmations/new.html.erb new file mode 100644 index 00000000..b12dd0cb --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/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 "devise/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 "devise/shared/links" %> diff --git a/week_5/activity-tracker/app/views/devise/mailer/confirmation_instructions.html.erb b/week_5/activity-tracker/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 00000000..dc55f64f --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/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/devise/mailer/email_changed.html.erb b/week_5/activity-tracker/app/views/devise/mailer/email_changed.html.erb new file mode 100644 index 00000000..32f4ba80 --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/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/devise/mailer/password_change.html.erb b/week_5/activity-tracker/app/views/devise/mailer/password_change.html.erb new file mode 100644 index 00000000..b41daf47 --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/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/devise/mailer/reset_password_instructions.html.erb b/week_5/activity-tracker/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 00000000..f667dc12 --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/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/devise/mailer/unlock_instructions.html.erb b/week_5/activity-tracker/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 00000000..41e148bf --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/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/devise/passwords/edit.html.erb b/week_5/activity-tracker/app/views/devise/passwords/edit.html.erb new file mode 100644 index 00000000..5fbb9ff0 --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/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 "devise/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 "devise/shared/links" %> diff --git a/week_5/activity-tracker/app/views/devise/passwords/new.html.erb b/week_5/activity-tracker/app/views/devise/passwords/new.html.erb new file mode 100644 index 00000000..d531a156 --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/passwords/new.html.erb @@ -0,0 +1,29 @@ +
+
+
+
+

Forgot your password?

+ +<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> +
+ +
+ <%= f.submit "Send me reset password instructions", class: "btn mt-2 btn-info text-light" %> +
+<% end %> +
+
+
+ +
+
+
+ <%= render "devise/shared/links" %> +
+
+
\ No newline at end of file diff --git a/week_5/activity-tracker/app/views/devise/registrations/edit.html.erb b/week_5/activity-tracker/app/views/devise/registrations/edit.html.erb new file mode 100644 index 00000000..e8b63c3a --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/registrations/edit.html.erb @@ -0,0 +1,65 @@ + +
+
+
+
+

Edit <%= resource_name.to_s.humanize %>

+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> +

+ + <% 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", class: "form-control mt-1" %> + <% if @minimum_password_length %> +
+ <%= @minimum_password_length %> characters minimum + <% end %> +
+ +
+ <%= f.label :password_confirmation %> + <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "form-control mt-1" %> +
+ +
+ <%= f.label :current_password %> (we need your current password to confirm your changes)
+ <%= f.password_field :current_password, autocomplete: "current-password" , class: "form-control mt-1" %> +
+ +
+ <%= f.submit "Update" , class: "btn mt-2 btn-success text-light"%> +
+<% end %> +
+
+
+
+
+ +
+
+
+
+

Cancel my account

+
+

Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete , class: "btn mt-2 btn-danger text-light"%>

+
+
+
+
+
+
+
+ <%= link_to "Back", :back, class: "btn mt-2 btn-warning text-light" %> +
+
diff --git a/week_5/activity-tracker/app/views/devise/registrations/new.html.erb b/week_5/activity-tracker/app/views/devise/registrations/new.html.erb new file mode 100644 index 00000000..ac98a292 --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/registrations/new.html.erb @@ -0,0 +1,42 @@ +
+
+
+
+

Sign up

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

Log in

+
+<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+ <%= f.label :email %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> +
+ +
+ <%= f.label :password %> + <%= f.password_field :password, autocomplete: "current-password", class: "form-control mt-1" %> +
+ + <% if devise_mapping.rememberable? %> +
+ <%= f.check_box :remember_me %> + <%= f.label :remember_me %> +
+ <% end %> + +
+ <%= f.submit "Log in", class: "btn mt-2 btn-info text-light" %> +
+<% end %> +
+
+
+
+
+
+
+ <%= render "devise/shared/links"%> +
+
+
\ No newline at end of file diff --git a/week_5/activity-tracker/app/views/devise/shared/_error_messages.html.erb b/week_5/activity-tracker/app/views/devise/shared/_error_messages.html.erb new file mode 100644 index 00000000..ba7ab887 --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/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) + %> +

+
    + <% resource.errors.full_messages.each do |message| %> +
  • <%= message %>
    • + <% end %> +
+
+<% end %> diff --git a/week_5/activity-tracker/app/views/devise/shared/_links.html.erb b/week_5/activity-tracker/app/views/devise/shared/_links.html.erb new file mode 100644 index 00000000..1efd5749 --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/shared/_links.html.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Log in", new_session_path(resource_name),class:"btn btn-alternate" %>
+<% end %> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name),class:"btn btn-warning" %> +<% end %> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to "Forgot your password?", new_password_path(resource_name),class:"btn btn-primary" %>
+<% end %> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) ,class:"btn btn-info"%>
+<% 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),class:"btn btn-warning" %>
+<% 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,class:"btn btn-success" %>
+ <% end %> +<% end %> diff --git a/week_5/activity-tracker/app/views/devise/unlocks/new.html.erb b/week_5/activity-tracker/app/views/devise/unlocks/new.html.erb new file mode 100644 index 00000000..ffc34de8 --- /dev/null +++ b/week_5/activity-tracker/app/views/devise/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 "devise/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+ +
+ <%= f.submit "Resend unlock instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> 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..06f6ca86 100644 --- a/week_5/activity-tracker/app/views/layouts/application.html.erb +++ b/week_5/activity-tracker/app/views/layouts/application.html.erb @@ -9,10 +9,14 @@ <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> <%= stylesheet_link_tag "dark-mode", "data-turbo-track": "reload" %> + <%= javascript_importmap_tags %> + <%= render partial: '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..b9d8e4b2 --- /dev/null +++ b/week_5/activity-tracker/app/views/shared/_navbar.html.erb @@ -0,0 +1,22 @@ + + 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..6eb820dc --- /dev/null +++ b/week_5/activity-tracker/app/views/static_pages/about.html.erb @@ -0,0 +1,5 @@ +
+

ABOUT

+

This is a fitness app


+<%= link_to "Return to Home", static_pages_index_path,class:"btn btn-alternate" %> +
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..491327b1 --- /dev/null +++ b/week_5/activity-tracker/app/views/static_pages/index.html.erb @@ -0,0 +1,16 @@ +
+
+

Welcome to Activity Tracker!!!

+ <%if user_signed_in? %> +
Logged in as: <%=current_user.email%>


+
+ <%=link_to "Edit Account Settings",edit_user_registration_path,class:"btn btn-info"%> + <%=link_to "Go to Activities",activities_path,class:"btn btn-success"%> + <%=button_to "Logout",destroy_user_session_path, method: :delete,class:"btn btn-danger" %> +
+<%else%> +
+
<%=link_to "Sign In",new_user_session_path,class:"btn btn-info"%>

+ <%=link_to "Sign Up",new_user_registration_path,class:"btn btn-alternate"%> +
+<%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..18d9f4b4 100644 --- a/week_5/activity-tracker/config/initializers/devise.rb +++ b/week_5/activity-tracker/config/initializers/devise.rb @@ -14,7 +14,7 @@ # confirmation, reset password and unlock tokens in the database. # Devise will use the `secret_key_base` as its `secret_key` # by default. You can change it below and use your own secret key. - # config.secret_key = 'b91c3d33b0ea3d14b7d73e33c60c8c5f20f8bc41502b362f36423ee304b3b43c96eb6db12df69901517973c93d88b748e13224536f8f0d39c5a817681d0ba997' + # config.secret_key = 'e44c878881ea4061a1ac4512eec7c382cede9f53a310eb0731aba722b6910cf0658f0b664e05d56275ea36a8978d49c1d328bc08c9acf50867a479533a8507c6' # ==> Controller configuration # Configure the parent class to the devise controllers. @@ -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' @@ -126,7 +126,7 @@ config.stretches = Rails.env.test? ? 1 : 12 # Set up a pepper to generate the hashed password. - # config.pepper = '17f197f4e1eef57f71ad82cb4e2cb593a2814de7fab83b84699d67550112f2dd46a63b59a182faf93c275c6abd5ab7d5c6272b1149fee4882b7057cd2d25fc50' + # config.pepper = '4ad24de44f9d73be101c662705e250e08ab51b166546b9221d35f57f51dbd68b6108f12d4400a7e170a4f7f1fd21163e6bb5e17663ef3ca7a2c692818c434fe9' # Send a notification to the original email when the user's email is changed. # config.send_email_changed_notification = false diff --git a/week_5/activity-tracker/config/routes.rb b/week_5/activity-tracker/config/routes.rb index ba195b7b..c76e893b 100644 --- a/week_5/activity-tracker/config/routes.rb +++ b/week_5/activity-tracker/config/routes.rb @@ -1,8 +1,17 @@ Rails.application.routes.draw do - resources :activities - - # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html + get 'static_pages/index' + get 'static_pages/about' + get 'about',to:"static_pages#about" + + devise_for :users + resources :activities do + collection do + get 'stats' + end + end + + root 'static_pages#index' + + - # Defines the root path route ("/") - root "activities#index" end diff --git a/week_5/activity-tracker/db/migrate/20230212051334_devise_create_users.rb b/week_5/activity-tracker/db/migrate/20230212051334_devise_create_users.rb new file mode 100644 index 00000000..43927dbd --- /dev/null +++ b/week_5/activity-tracker/db/migrate/20230212051334_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..86e8aafd 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_12_051334) 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..b8a728da --- /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 +# +steve: + email: steve@example.com + +jane: + email: jane@example.com 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 dee7af48573eded536cc475e63d427a69f79f3ff Mon Sep 17 00:00:00 2001 From: Sharath Balaji T Date: Mon, 13 Feb 2023 11:32:31 +0000 Subject: [PATCH 4/5] Added Style to the views --- .../app/views/activities/show.html.erb | 5 +- .../app/views/activities/stats.html.erb | 4 +- .../app/views/devise/passwords/new.html.erb | 50 ++++---- .../views/devise/registrations/edit.html.erb | 118 +++++++++--------- .../views/devise/registrations/new.html.erb | 80 ++++++------ .../app/views/devise/sessions/new.html.erb | 72 +++++------ 6 files changed, 163 insertions(+), 166 deletions(-) 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 fa2f88d0..c485feae 100644 --- a/week_5/activity-tracker/app/views/activities/show.html.erb +++ b/week_5/activity-tracker/app/views/activities/show.html.erb @@ -1,7 +1,6 @@
-

<%= notice %>

- -<%= render @activity %> +

<%= notice %>

+ <%= render @activity %>
<%= link_to "Back to activities", activities_path,class:"btn btn-alternate" %> diff --git a/week_5/activity-tracker/app/views/activities/stats.html.erb b/week_5/activity-tracker/app/views/activities/stats.html.erb index 6eb436ae..878d989c 100644 --- a/week_5/activity-tracker/app/views/activities/stats.html.erb +++ b/week_5/activity-tracker/app/views/activities/stats.html.erb @@ -5,10 +5,10 @@

Total Duration: <%= @total_duration %>


Total Calories: <%= @total_calories %>

-
+
- <%=link_to "Back to Activities",activities_path,class:"btn btn-info"%> + <%=link_to "Back to Activities",activities_path,class:"btn btn-info"%>
diff --git a/week_5/activity-tracker/app/views/devise/passwords/new.html.erb b/week_5/activity-tracker/app/views/devise/passwords/new.html.erb index d531a156..39ca053d 100644 --- a/week_5/activity-tracker/app/views/devise/passwords/new.html.erb +++ b/week_5/activity-tracker/app/views/devise/passwords/new.html.erb @@ -1,29 +1,27 @@
-
-
-
-

Forgot your password?

- -<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - <%= render "devise/shared/error_messages", resource: resource %> - -
- <%= f.label :email %> - <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> -
- -
- <%= f.submit "Send me reset password instructions", class: "btn mt-2 btn-info text-light" %> +
+
+
+

Forgot your password?

+ <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> +
+ +
+ <%= f.submit "Send me reset password instructions", class: "btn mt-2 btn-info text-light" %> +
+ <% end %> +
-<% end %> -
-
-
- -
-
-
- <%= render "devise/shared/links" %> -
-
+
+
+
+
+ <%= render "devise/shared/links" %> +
+
\ No newline at end of file diff --git a/week_5/activity-tracker/app/views/devise/registrations/edit.html.erb b/week_5/activity-tracker/app/views/devise/registrations/edit.html.erb index e8b63c3a..ee2844b5 100644 --- a/week_5/activity-tracker/app/views/devise/registrations/edit.html.erb +++ b/week_5/activity-tracker/app/views/devise/registrations/edit.html.erb @@ -1,65 +1,65 @@
-
-
-
-

Edit <%= resource_name.to_s.humanize %>

-
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> - <%= render "devise/shared/error_messages", resource: resource %> - -
- <%= f.label :email %> - <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> -

- - <% 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", class: "form-control mt-1" %> - <% if @minimum_password_length %> -
- <%= @minimum_password_length %> characters minimum - <% end %> +
+
+
+

Edit <%= resource_name.to_s.humanize %>

+
+ <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> +

+ + <% 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", class: "form-control mt-1" %> + <% if @minimum_password_length %> +
+ <%= @minimum_password_length %> characters minimum + <% end %> +
+ +
+ <%= f.label :password_confirmation %> + <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "form-control mt-1" %> +
+ +
+ <%= f.label :current_password %> (we need your current password to confirm your changes)
+ <%= f.password_field :current_password, autocomplete: "current-password" , class: "form-control mt-1" %> +
+ +
+ <%= f.submit "Update" , class: "btn mt-2 btn-success text-light"%> +
+ <% end %> +
+
+
- -
- <%= f.label :password_confirmation %> - <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "form-control mt-1" %> -
- -
- <%= f.label :current_password %> (we need your current password to confirm your changes)
- <%= f.password_field :current_password, autocomplete: "current-password" , class: "form-control mt-1" %> -
- -
- <%= f.submit "Update" , class: "btn mt-2 btn-success text-light"%> -
-<% end %> -
-
-
-
-
-
-
-

Cancel my account

-
-

Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete , class: "btn mt-2 btn-danger text-light"%>

-
-
-
-
-
-
-
- <%= link_to "Back", :back, class: "btn mt-2 btn-warning text-light" %> -
-
+
+
+
+

Cancel my account

+
+

Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete , class: "btn mt-2 btn-danger text-light"%>

+
+
+
+
+
+
+ <%= link_to "Back", :back, class: "btn mt-2 btn-warning text-light" %> +
+
+
\ No newline at end of file diff --git a/week_5/activity-tracker/app/views/devise/registrations/new.html.erb b/week_5/activity-tracker/app/views/devise/registrations/new.html.erb index ac98a292..47f9ef1e 100644 --- a/week_5/activity-tracker/app/views/devise/registrations/new.html.erb +++ b/week_5/activity-tracker/app/views/devise/registrations/new.html.erb @@ -1,42 +1,42 @@
-
-
-
-

Sign up

-
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= render "devise/shared/error_messages", resource: resource %> - -
- <%= f.label :email %> - <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> -
- -
- <%= f.label :password %> - <% if @minimum_password_length %> - (<%= @minimum_password_length %> characters minimum) - <% end %>
- <%= f.password_field :password, autocomplete: "new-password", class: "form-control mt-1" %> -
- -
- <%= f.label :password_confirmation %> - <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "form-control mt-1" %> -
- -
- <%= f.submit "Sign up", class: "btn mt-2 btn-info text-light" %> -
-<% end %> -
-
-
-
-
-
-
- <%= render "devise/shared/links" %> -
-
+
+
+
+

Sign up

+
+ <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> +
+ +
+ <%= f.label :password %> + <% if @minimum_password_length %> + (<%= @minimum_password_length %> characters minimum) + <% end %>
+ <%= f.password_field :password, autocomplete: "new-password", class: "form-control mt-1" %> +
+ +
+ <%= f.label :password_confirmation %> + <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "form-control mt-1" %> +
+ +
+ <%= f.submit "Sign up", class: "btn mt-2 btn-info text-light" %> +
+ <% end %> +
+
+
+
+
+
+
+ <%= render "devise/shared/links" %> +
+
diff --git a/week_5/activity-tracker/app/views/devise/sessions/new.html.erb b/week_5/activity-tracker/app/views/devise/sessions/new.html.erb index 1d8496d3..cdc730ec 100644 --- a/week_5/activity-tracker/app/views/devise/sessions/new.html.erb +++ b/week_5/activity-tracker/app/views/devise/sessions/new.html.erb @@ -1,39 +1,39 @@
-
-
-
-

Log in

-
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
- <%= f.label :email %> - <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> -
- -
- <%= f.label :password %> - <%= f.password_field :password, autocomplete: "current-password", class: "form-control mt-1" %> -
- - <% if devise_mapping.rememberable? %> -
- <%= f.check_box :remember_me %> - <%= f.label :remember_me %> +
+
+
+

Log in

+
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+ <%= f.label :email %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control mt-1" %> +
+ +
+ <%= f.label :password %> + <%= f.password_field :password, autocomplete: "current-password", class: "form-control mt-1" %> +
+ + <% if devise_mapping.rememberable? %> +
+ <%= f.check_box :remember_me %> + <%= f.label :remember_me %> +
+ <% end %> + +
+ <%= f.submit "Log in", class: "btn mt-2 btn-info text-light" %> +
+ <% end %> +
+
+
+
+
+
+
+ <%= render "devise/shared/links"%> +
- <% end %> - -
- <%= f.submit "Log in", class: "btn mt-2 btn-info text-light" %> -
-<% end %> -
-
-
-
-
-
-
- <%= render "devise/shared/links"%> -
-
\ No newline at end of file From 1d4ca15f352460d4b2e1f3b9c518375624d1d758 Mon Sep 17 00:00:00 2001 From: Sharath Balaji T Date: Tue, 14 Feb 2023 21:19:20 +0000 Subject: [PATCH 5/5] Toasts added --- .../app/assets/stylesheets/dark-mode.css | 32 ++++++++++++++ .../app/views/activities/index.html.erb | 2 +- .../app/views/activities/show.html.erb | 2 +- .../app/views/activities/stats.html.erb | 2 - .../app/views/layouts/application.html.erb | 44 ++++++++++++++++++- .../app/views/shared/_navbar.html.erb | 4 +- .../app/views/static_pages/index.html.erb | 4 +- 7 files changed, 81 insertions(+), 9 deletions(-) diff --git a/week_5/activity-tracker/app/assets/stylesheets/dark-mode.css b/week_5/activity-tracker/app/assets/stylesheets/dark-mode.css index 67ca318a..d02d8a15 100644 --- a/week_5/activity-tracker/app/assets/stylesheets/dark-mode.css +++ b/week_5/activity-tracker/app/assets/stylesheets/dark-mode.css @@ -129,6 +129,18 @@ a { border-bottom: none; } +.border-solid-success{ + border: 4px solid #1a573a; + } + +.border-solid-info{ + border: 4px solid #0e4c66; + } + + .border-solid-danger{ + border: 4px solid #721326; + } + .header-mobile-open { background: #1a1a1a; border-color: #151515; @@ -483,6 +495,25 @@ select { font-weight: bold; } +.font-style{ + font-family:Brush Script MT; + font-size: x-large; + font-weight: 800; +} +.font-st{ + font-family:Brush Script MT; + font-weight: 800; +} +.font-sle{ + font-family:Georgia; + font-size: x-large; + font-weight: 800; +} + +.font-sty{ + font-family: Papyrus; +} + .card-header { background: #212121 !important; color: white; @@ -673,6 +704,7 @@ select { border-color: var(--danger-border); } + .close { color: #fff; } 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 04c87b57..6e9c582b 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,4 @@ -

<%= notice %>

+

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 c485feae..8e7c8996 100644 --- a/week_5/activity-tracker/app/views/activities/show.html.erb +++ b/week_5/activity-tracker/app/views/activities/show.html.erb @@ -1,5 +1,5 @@
-

<%= notice %>

+ <%= render @activity %>
diff --git a/week_5/activity-tracker/app/views/activities/stats.html.erb b/week_5/activity-tracker/app/views/activities/stats.html.erb index 878d989c..6bc18c5d 100644 --- a/week_5/activity-tracker/app/views/activities/stats.html.erb +++ b/week_5/activity-tracker/app/views/activities/stats.html.erb @@ -10,5 +10,3 @@
<%=link_to "Back to Activities",activities_path,class:"btn btn-info"%>
- - 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 06f6ca86..ab19ea7b 100644 --- a/week_5/activity-tracker/app/views/layouts/application.html.erb +++ b/week_5/activity-tracker/app/views/layouts/application.html.erb @@ -15,7 +15,49 @@ <%= render partial: 'shared/navbar' %> -

<%= notice %>

+ + <%if notice%> + <%if notice=='Activity was successfully destroyed.'%> +
+
+
+
+

Activity Tracker

 +
+
+ <%= notice %> +
+
+
+
+ <%elsif notice=='Activity was successfully updated.'%> +
+
+
+
+

Activity Tracker

 +
+
+ <%= notice %> +
+
+
+
+ <%else%> +
+
+
+
+

Activity Tracker

 +
+
+ <%= notice %> +
+
+
+
+ <%end%> + <%end%>

<%= 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 b9d8e4b2..ef0df167 100644 --- a/week_5/activity-tracker/app/views/shared/_navbar.html.erb +++ b/week_5/activity-tracker/app/views/shared/_navbar.html.erb @@ -8,13 +8,13 @@ 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 491327b1..b17b9489 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 @@ -1,8 +1,8 @@
-

Welcome to Activity Tracker!!!

+

Welcome to Activity Tracker!!!

<%if user_signed_in? %> -
Logged in as: <%=current_user.email%>


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


<%=link_to "Edit Account Settings",edit_user_registration_path,class:"btn btn-info"%> <%=link_to "Go to Activities",activities_path,class:"btn btn-success"%>