diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb new file mode 100644 index 0000000..9c43976 --- /dev/null +++ b/app/controllers/categories_controller.rb @@ -0,0 +1,34 @@ +class CategoriesController < ApplicationController + before_action :authenticate_user! + + def index + @categories = Category.all + end + + def show + @category = Category.find(params[:id]) + end + + def new + @category = Category.new + end + + def create + @category = Category.new(category_params) + @category.user = current_user + + if @category.save + redirect_to categories_path, notice: 'Category created successfully.' + else + flash.now[:alert] = 'Error creating category:' + flash.now[:alert_details] = @category.errors.full_messages.join(', ') + render :new + end + end + + private + + def category_params + params.require(:category).permit(:name, :icon) + end +end diff --git a/app/controllers/splash_controller.rb b/app/controllers/splash_controller.rb index 4111fb9..66189c7 100644 --- a/app/controllers/splash_controller.rb +++ b/app/controllers/splash_controller.rb @@ -1,5 +1,7 @@ class SplashController < ApplicationController skip_before_action :authenticate_user!, only: [:index] - def index; end + def index + redirect_to authenticated_root_path if user_signed_in? + end end diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb new file mode 100644 index 0000000..e06f315 --- /dev/null +++ b/app/helpers/categories_helper.rb @@ -0,0 +1,2 @@ +module CategoriesHelper +end diff --git a/app/models/category.rb b/app/models/category.rb index 26ec0ae..0fbfb01 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,5 +1,6 @@ class Category < ApplicationRecord belongs_to :user has_many :expense_category_associations + has_one_attached :icon, dependent: :destroy has_many :expenses, through: :expense_category_associations end diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb new file mode 100644 index 0000000..362ab90 --- /dev/null +++ b/app/views/categories/index.html.erb @@ -0,0 +1,52 @@ +<%= render partial: 'layouts/shared/navbar', locals: { back_destination: '', page_name: 'Categories', link: { destination: destroy_user_session_path, label: 'Log Out' } } %> +<%= render partial: "layouts/shared/messages" %> + +
+
+ <% @categories.each do |category| %> +
+ <%= link_to category_path(category), class: "nav-link" do %> +
+
+
+
+ <% if category.icon.attached? %> + <%= image_tag category.icon, style: 'width: 80px; height: 80px;', class: 'img-fluid rounded' %> + <% else %> +
+ No Icon Available +
+ <% end %> +
+
+
+
+

<%= category.name %>

+

<%= category.created_at.strftime("%d %b %Y %H:%M") %>

+
+
+
+
+ +
$1500
+
+
+
+
+ <% end %> +
+ <% end %> +
+ +
+
+
+
+
+ <%= link_to "Add new category", new_category_path, class: "btn btn-success btn-lg mb-1" %> +
+
+
+
+
+
diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb new file mode 100644 index 0000000..9f0cd0e --- /dev/null +++ b/app/views/categories/new.html.erb @@ -0,0 +1,30 @@ +<%= render partial: 'layouts/shared/navbar', locals: { back_destination: root_path, page_name: 'New Category', link: { destination: destroy_user_session_path, label: 'Log Out' } } %> + +
+
+
+
+
+ New Category +
+
+ <%= form_with(model: @category, url: categories_path, method: :post) do |form| %> +
+ <%= form.label :name, class: "form-label" %> + <%= form.text_field :name, class: "form-control" %> +
+ +
+ <%= form.label :icon, class: "form-label" %> + <%= form.file_field :icon, class: "form-control" %> +
+ +
+ <%= form.submit 'Save', class: "btn btn-primary" %> +
+ <% end %> +
+
+
+
+
diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb new file mode 100644 index 0000000..1ae33cb --- /dev/null +++ b/app/views/categories/show.html.erb @@ -0,0 +1,33 @@ +<%= render partial: 'layouts/shared/navbar', locals: { back_destination: root_path, page_name: 'Transactions', link: { destination: destroy_user_session_path, label: 'Log Out' } } %> + +
+
+
+
+
+
+ <% if @category.icon.attached? %> + <%= image_tag @category.icon, style: 'width: 80px; height: 80px;', class: 'img-fluid rounded' %> + <% else %> +
+ No Icon Available +
+ <% end %> +
+
+
+
+

<%= @category.name %>

+

<%= @category.created_at.strftime("%d %b %Y %H:%M") %>

+
+
+
+
+ +
$1500
+
+
+
+
+
+
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 78f3b49..b5bd5a7 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,4 +1,5 @@ <%= render partial: 'layouts/shared/navbar', locals: { back_destination: root_path, page_name: 'Sign Up', link: { destination: new_user_session_path, label: 'Log In' } } %> +<%= render partial: "layouts/shared/messages" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 1c5565f..9b1f0e0 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,4 +1,5 @@ <%= render partial: 'layouts/shared/navbar', locals: { back_destination: root_path, page_name: 'Log In', link: { destination: new_user_registration_path, label: 'Sign Up' } } %> +<%= render partial: "layouts/shared/messages" %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 16f3c1c..c679cb1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,9 +14,8 @@ - <%= render partial: "layouts/shared/messages" %> <%= yield %> - + diff --git a/app/views/layouts/shared/_messages.html.erb b/app/views/layouts/shared/_messages.html.erb index ad7dd4c..c04d6db 100644 --- a/app/views/layouts/shared/_messages.html.erb +++ b/app/views/layouts/shared/_messages.html.erb @@ -1,4 +1,4 @@ -
+
<% if notice.present? %> diff --git a/app/views/splash/index.html.erb b/app/views/splash/index.html.erb index 97b876f..63545d5 100644 --- a/app/views/splash/index.html.erb +++ b/app/views/splash/index.html.erb @@ -1,3 +1,5 @@ +<%= render partial: "layouts/shared/messages" %> +
diff --git a/config/routes.rb b/config/routes.rb index 1b69477..c0e24cd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,13 @@ Rails.application.routes.draw do devise_for :users - resources :users - root "splash#index" + resources :categories do + resources :expenses + end + + authenticated :user do + root 'categories#index', as: :authenticated_root + end + + root 'splash#index' end diff --git a/db/migrate/20230920122901_create_active_storage_tables.active_storage.rb b/db/migrate/20230920122901_create_active_storage_tables.active_storage.rb new file mode 100644 index 0000000..8a7bfe1 --- /dev/null +++ b/db/migrate/20230920122901_create_active_storage_tables.active_storage.rb @@ -0,0 +1,57 @@ +# This migration comes from active_storage (originally 20170806125915) +class CreateActiveStorageTables < ActiveRecord::Migration[5.2] + def change + # Use Active Record's configured type for primary and foreign keys + primary_key_type, foreign_key_type = primary_and_foreign_key_types + + create_table :active_storage_blobs, id: primary_key_type do |t| + t.string :key, null: false + t.string :filename, null: false + t.string :content_type + t.text :metadata + t.string :service_name, null: false + t.bigint :byte_size, null: false + t.string :checksum + + if connection.supports_datetime_with_precision? + t.datetime :created_at, precision: 6, null: false + else + t.datetime :created_at, null: false + end + + t.index [ :key ], unique: true + end + + create_table :active_storage_attachments, id: primary_key_type do |t| + t.string :name, null: false + t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type + t.references :blob, null: false, type: foreign_key_type + + if connection.supports_datetime_with_precision? + t.datetime :created_at, precision: 6, null: false + else + t.datetime :created_at, null: false + end + + t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true + t.foreign_key :active_storage_blobs, column: :blob_id + end + + create_table :active_storage_variant_records, id: primary_key_type do |t| + t.belongs_to :blob, null: false, index: false, type: foreign_key_type + t.string :variation_digest, null: false + + t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true + t.foreign_key :active_storage_blobs, column: :blob_id + end + end + + private + def primary_and_foreign_key_types + config = Rails.configuration.generators + setting = config.options[config.orm][:primary_key_type] + primary_key_type = setting || :primary_key + foreign_key_type = setting || :bigint + [primary_key_type, foreign_key_type] + end +end diff --git a/db/schema.rb b/db/schema.rb index db4c982..74eb1ce 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,10 +10,38 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_09_18_142338) do +ActiveRecord::Schema[7.0].define(version: 2023_09_20_122901) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "active_storage_attachments", force: :cascade do |t| + t.string "name", null: false + t.string "record_type", null: false + t.bigint "record_id", null: false + t.bigint "blob_id", null: false + t.datetime "created_at", null: false + t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" + t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true + end + + create_table "active_storage_blobs", force: :cascade do |t| + t.string "key", null: false + t.string "filename", null: false + t.string "content_type" + t.text "metadata" + t.string "service_name", null: false + t.bigint "byte_size", null: false + t.string "checksum" + t.datetime "created_at", null: false + t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true + end + + create_table "active_storage_variant_records", force: :cascade do |t| + t.bigint "blob_id", null: false + t.string "variation_digest", null: false + t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true + end + create_table "categories", force: :cascade do |t| t.string "name" t.string "icon" @@ -55,6 +83,8 @@ t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end + add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" + add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" add_foreign_key "categories", "users" add_foreign_key "expense_category_associations", "categories" add_foreign_key "expense_category_associations", "expenses" diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb new file mode 100644 index 0000000..0a3c392 --- /dev/null +++ b/test/controllers/categories_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CategoriesControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end