diff --git a/.ruby-version b/.ruby-version index e4604e3..be94e6f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.1 +3.2.2 diff --git a/Gemfile b/Gemfile index b58aac6..b821788 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '3.2.1' +ruby '3.2.2' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem 'rails', '~> 7.0.5' @@ -74,7 +74,6 @@ group :test do gem 'capybara' # gem 'debug', platforms: %i[mri mingw x64_mingw] gem 'factory_bot_rails' - gem 'rails-controller-testing' gem 'rspec-rails' gem 'selenium-webdriver' gem 'webdrivers' diff --git a/Gemfile.lock b/Gemfile.lock index db52625..0ae2e9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -175,10 +175,6 @@ GEM activesupport (= 7.0.5) bundler (>= 1.15.0) railties (= 7.0.5) - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -287,7 +283,6 @@ DEPENDENCIES pg (~> 1.1) puma (~> 5.0) rails (~> 7.0.5) - rails-controller-testing rails_heroicon rails_live_reload rspec-rails @@ -301,7 +296,7 @@ DEPENDENCIES webdrivers RUBY VERSION - ruby 3.2.1p31 + ruby 3.2.2p53 BUNDLED WITH 2.4.12 diff --git a/README.md b/README.md index be8806a..c7a9b2a 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ - [Tech Stack](#tech-stack) - [Key Features](#key-features) - [πŸš€ Live Demo](#live-demo) + - [Video Link πŸš€](#video-link) - [πŸ’» Getting Started](#getting-started) - [Setup](#setup) - [Prerequisites](#prerequisites) @@ -95,17 +96,22 @@ Clone this repository to your desired folder: ITo begin with, you need to get your Rails application server running. This is like live preview in the browser for rails applications. Run : -```sh - $ bin/dev + Install the required gems: -``` + bundle install -OR + Set up the database: -```sh -$ rails server + rails db:create -``` + rails db:migrate + + rake assets:precompile + + To run the server: + + rails s or ./bin/dev + visit [localhost](http://localhost:3000/) in your browser! @@ -113,6 +119,12 @@ To exit server enter β€œControl (^ )+ C”

(back to top)

+### LIVE DEMO +[Budgetron](https://budgetron.onrender.com) + +### Video Link πŸš€ +[Video here](https://www.loom.com/share/8a34d5db634f4dc1a271b2849bf131f3) + ## πŸ‘₯ Authors diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 681d462..515f16c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,7 +14,7 @@ *= require_self */ - @font-face { - font-family: 'Proxima Nova'; - src: url('Proxima_Nova.otf') format('opentype'); +@font-face { + font-family: 'Proxima Nova'; + src: url('Proxima_Nova.otf') format('opentype'); } diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 5196454..9e989f0 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -3,7 +3,7 @@ class CategoriesController < ApplicationController # GET /categories or /categories.json def index - @categories = Category.includes(:financial_transactions).all + @categories = Category.includes(:financial_transactions).order(created_at: :desc).all end # GET /categories/1 or /categories/1.json diff --git a/app/controllers/financial_transactions_controller.rb b/app/controllers/financial_transactions_controller.rb index 0580141..6bac82d 100644 --- a/app/controllers/financial_transactions_controller.rb +++ b/app/controllers/financial_transactions_controller.rb @@ -29,14 +29,6 @@ def create @financial_transaction.user_id = current_user.id category_id = financial_transaction_params[:category_ids].reject(&:empty?)[0] - # @financial_transaction.create_financial_transaction_categories(category_ids) - - # if category_ids.empty? - # flash[:error] = "Please choose at least one category" - # # render :new # or redirect to the appropriate action - # else - # @financial_transaction.create_financial_transaction_categories(category_ids) - # end respond_to do |format| if @financial_transaction.save diff --git a/app/models/category.rb b/app/models/category.rb index 6b24823..a65082b 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -4,7 +4,7 @@ class Category < ApplicationRecord has_one_attached :icon - has_many :financial_transaction_categories + has_many :financial_transaction_categories, dependent: :destroy has_many :financial_transactions, through: :financial_transaction_categories # Validations diff --git a/app/models/financial_transaction.rb b/app/models/financial_transaction.rb index 39ad7e9..eea613b 100644 --- a/app/models/financial_transaction.rb +++ b/app/models/financial_transaction.rb @@ -1,5 +1,5 @@ class FinancialTransaction < ApplicationRecord - before_save :create_financial_transaction_categories + # before_save :create_financial_transaction_categories belongs_to :user @@ -11,10 +11,10 @@ class FinancialTransaction < ApplicationRecord validates :amount, presence: true, numericality: { greater_than: 0 } validates :category_ids, presence: { message: 'Please choose at least one checkbox' } - def create_financial_transaction_categories() - categories = Category.where(id: category_ids) - categories.each do |cat| - financial_transaction_categories.build(category: cat) - end - end + # def create_financial_transaction_categories() + # categories = Category.where(id: category_ids) + # categories.each do |cat| + # financial_transaction_categories.build(category: cat) + # end + # end end diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb index 16523a6..feec34a 100644 --- a/app/views/categories/show.html.erb +++ b/app/views/categories/show.html.erb @@ -34,8 +34,7 @@
- - Lorem ipsum dolor, sit amet consectetur adipisicing elit. Necessitatibus eligendi qui deleniti + A short description of the category and its purpose.
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 77ccbbd..210867f 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -5,7 +5,7 @@