diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
new file mode 100644
index 0000000..4671d69
--- /dev/null
+++ b/.github/workflows/linters.yml
@@ -0,0 +1,44 @@
+name: Linters
+
+on: pull_request
+
+env:
+ FORCE_COLOR: 1
+
+jobs:
+ rubocop:
+ name: Rubocop
+ runs-on: ubuntu-22.04
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-ruby@v1
+ with:
+ ruby-version: 3.1.x
+ - name: Setup Rubocop
+ run: |
+ gem install --no-document rubocop -v '>= 1.0, < 2.0' # https://docs.rubocop.org/en/stable/installation/
+ [ -f .rubocop.yml ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/ror/.rubocop.yml
+ - name: Rubocop Report
+ run: rubocop --color
+ stylelint:
+ name: Stylelint
+ runs-on: ubuntu-22.04
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-node@v3
+ with:
+ node-version: "18.x"
+ - name: Setup Stylelint
+ run: |
+ npm install --save-dev stylelint@13.x stylelint-scss@3.x stylelint-config-standard@21.x stylelint-csstree-validator@1.x
+ [ -f .stylelintrc.json ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/ror/.stylelintrc.json
+ - name: Stylelint Report
+ run: npx stylelint "**/*.{css,scss}"
+ nodechecker:
+ name: node_modules checker
+ runs-on: ubuntu-22.04
+ steps:
+ - uses: actions/checkout@v3
+ - name: Check node_modules existence
+ run: |
+ if [ -d "node_modules/" ]; then echo -e "\e[1;31mThe node_modules/ folder was pushed to the repo. Please remove it from the GitHub repository and try again."; echo -e "\e[1;32mYou can set up a .gitignore file with this folder included on it to prevent this from happening in the future." && exit 1; fi
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index e16dc71..e72bec7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@
# Ignore master key for decrypting credentials and more.
/config/master.key
+
+# .gitignore
+node_modules/
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..c99d2e7
--- /dev/null
+++ b/.rspec
@@ -0,0 +1 @@
+--require spec_helper
diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..07baeb4
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,60 @@
+AllCops:
+ NewCops: enable
+ Exclude:
+ - "db/**/*"
+ - "bin/*"
+ - "config/**/*"
+ - "Guardfile"
+ - "Rakefile"
+ - "node_modules/**/*"
+
+ DisplayCopNames: true
+
+Layout/LineLength:
+ Max: 120
+Metrics/MethodLength:
+ Include:
+ - "app/controllers/*"
+ - "app/models/*"
+ Max: 20
+Metrics/AbcSize:
+ Include:
+ - "app/controllers/*"
+ - "app/models/*"
+ Max: 50
+Metrics/ClassLength:
+ Max: 150
+Metrics/BlockLength:
+ AllowedMethods: ['describe']
+ Max: 30
+
+Style/Documentation:
+ Enabled: false
+Style/ClassAndModuleChildren:
+ Enabled: false
+Style/EachForSimpleLoop:
+ Enabled: false
+Style/AndOr:
+ Enabled: false
+Style/DefWithParentheses:
+ Enabled: false
+Style/FrozenStringLiteralComment:
+ EnforcedStyle: never
+
+Layout/HashAlignment:
+ EnforcedColonStyle: key
+Layout/ExtraSpacing:
+ AllowForAlignment: false
+Layout/MultilineMethodCallIndentation:
+ Enabled: true
+ EnforcedStyle: indented
+Lint/RaiseException:
+ Enabled: false
+Lint/StructNewOverride:
+ Enabled: false
+Style/HashEachMethods:
+ Enabled: false
+Style/HashTransformKeys:
+ Enabled: false
+Style/HashTransformValues:
+ Enabled: false
\ No newline at end of file
diff --git a/.stylelintrc.json b/.stylelintrc.json
new file mode 100644
index 0000000..dd5d140
--- /dev/null
+++ b/.stylelintrc.json
@@ -0,0 +1,37 @@
+{
+ "extends": ["stylelint-config-standard"],
+ "plugins": ["stylelint-scss", "stylelint-csstree-validator"],
+ "rules": {
+ "at-rule-no-unknown": [
+ true,
+ {
+ "ignoreAtRules": [
+ "tailwind",
+ "apply",
+ "variants",
+ "responsive",
+ "screen"
+ ]
+ }
+ ],
+ "scss/at-rule-no-unknown": [
+ true,
+ {
+ "ignoreAtRules": [
+ "tailwind",
+ "apply",
+ "variants",
+ "responsive",
+ "screen"
+ ]
+ }
+ ],
+ "csstree/validator": true
+ },
+ "ignoreFiles": [
+ "build/**",
+ "dist/**",
+ "**/reset*.css",
+ "**/bootstrap*.css"
+ ]
+}
diff --git a/Gemfile b/Gemfile
index b559af4..ed02a96 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,31 +1,31 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-ruby "3.2.2"
+ruby '3.2.2'
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.8"
+gem 'rails', '~> 7.0.8'
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
-gem "sprockets-rails"
+gem 'sprockets-rails'
# Use postgresql as the database for Active Record
-gem "pg", "~> 1.1"
+gem 'pg', '~> 1.1'
# Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
+gem 'puma', '~> 5.0'
# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
-gem "importmap-rails"
+gem 'importmap-rails'
# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
-gem "turbo-rails"
+gem 'turbo-rails'
# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
-gem "stimulus-rails"
+gem 'stimulus-rails'
# Build JSON APIs with ease [https://github.com/rails/jbuilder]
-gem "jbuilder"
+gem 'jbuilder'
# Use Redis adapter to run Action Cable in production
# gem "redis", "~> 4.0"
@@ -37,10 +37,10 @@ gem "jbuilder"
# gem "bcrypt", "~> 3.1.7"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
+gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
# Reduces boot times through caching; required in config/boot.rb
-gem "bootsnap", require: false
+gem 'bootsnap', require: false
# Use Sass to process CSS
# gem "sassc-rails"
@@ -50,12 +50,15 @@ gem "bootsnap", require: false
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 ]
+ gem 'debug', platforms: %i[mri mingw x64_mingw]
+
+ # Rspec
+ gem 'rspec-rails'
end
group :development do
# Use console on exceptions pages [https://github.com/rails/web-console]
- gem "web-console"
+ gem 'web-console'
# Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
# gem "rack-mini-profiler"
@@ -66,7 +69,10 @@ end
group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
- gem "capybara"
- gem "selenium-webdriver"
-
+ gem 'capybara'
+ gem 'selenium-webdriver'
end
+
+gem 'devise', '~> 4.9'
+
+gem 'rubocop', '>= 1.0', '< 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 700b38f..03b2123 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,6 +68,9 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
+ ast (2.4.2)
+ base64 (0.1.1)
+ bcrypt (3.1.19)
bindex (0.8.1)
bootsnap (1.16.0)
msgpack (~> 1.2)
@@ -87,6 +90,13 @@ GEM
debug (1.8.0)
irb (>= 1.5.0)
reline (>= 0.3.1)
+ devise (4.9.3)
+ bcrypt (~> 3.0)
+ orm_adapter (~> 0.1)
+ railties (>= 4.1.0)
+ responders
+ warden (~> 1.2.3)
+ diff-lcs (1.5.0)
erubi (1.12.0)
globalid (1.2.1)
activesupport (>= 6.1)
@@ -102,6 +112,8 @@ GEM
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
+ json (2.6.3)
+ language_server-protocol (3.17.0.3)
loofah (2.21.4)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
@@ -128,6 +140,14 @@ GEM
nio4r (2.5.9)
nokogiri (1.15.4-x64-mingw-ucrt)
racc (~> 1.4)
+ nokogiri (1.15.4-x86_64-linux)
+ racc (~> 1.4)
+ orm_adapter (0.5.0)
+ parallel (1.23.0)
+ parser (3.2.2.4)
+ ast (~> 2.4.1)
+ racc
+ pg (1.5.4)
pg (1.5.4-x64-mingw-ucrt)
psych (5.1.1.1)
stringio
@@ -166,13 +186,49 @@ GEM
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
+ rainbow (3.1.1)
rake (13.0.6)
rdoc (6.5.0)
psych (>= 4.0.0)
regexp_parser (2.8.2)
reline (0.3.9)
io-console (~> 0.5)
+ responders (3.1.1)
+ actionpack (>= 5.2)
+ railties (>= 5.2)
rexml (3.2.6)
+ rspec-core (3.12.2)
+ rspec-support (~> 3.12.0)
+ rspec-expectations (3.12.3)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.12.0)
+ rspec-mocks (3.12.6)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.12.0)
+ rspec-rails (6.0.3)
+ actionpack (>= 6.1)
+ activesupport (>= 6.1)
+ railties (>= 6.1)
+ rspec-core (~> 3.12)
+ rspec-expectations (~> 3.12)
+ rspec-mocks (~> 3.12)
+ rspec-support (~> 3.12)
+ rspec-support (3.12.1)
+ rubocop (1.56.4)
+ base64 (~> 0.1.1)
+ json (~> 2.3)
+ language_server-protocol (>= 3.17.0)
+ parallel (~> 1.10)
+ parser (>= 3.2.2.3)
+ rainbow (>= 2.2.2, < 4.0)
+ regexp_parser (>= 1.8, < 3.0)
+ rexml (>= 3.2.5, < 4.0)
+ rubocop-ast (>= 1.28.1, < 2.0)
+ ruby-progressbar (~> 1.7)
+ unicode-display_width (>= 2.4.0, < 3.0)
+ rubocop-ast (1.29.0)
+ parser (>= 3.2.1.0)
+ ruby-progressbar (1.13.0)
rubyzip (2.3.2)
selenium-webdriver (4.14.0)
rexml (~> 3.2, >= 3.2.5)
@@ -198,6 +254,9 @@ GEM
concurrent-ruby (~> 1.0)
tzinfo-data (1.2023.3)
tzinfo (>= 1.0.0)
+ unicode-display_width (2.5.0)
+ warden (1.2.9)
+ rack (>= 2.0.9)
web-console (4.2.1)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
@@ -213,16 +272,20 @@ GEM
PLATFORMS
x64-mingw-ucrt
+ x86_64-linux
DEPENDENCIES
bootsnap
capybara
debug
+ devise (~> 4.9)
importmap-rails
jbuilder
pg (~> 1.1)
puma (~> 5.0)
rails (~> 7.0.8)
+ rspec-rails
+ rubocop (>= 1.0, < 2.0)
selenium-webdriver
sprockets-rails
stimulus-rails
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..b8f260c
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 HassanShakur
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index 7db80e4..cbad11f 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,173 @@
-# README
+
-This README would normally document whatever steps are necessary to get the
-application up and running.
+
-Things you may want to cover:
+# 📗 Table of Contents
-* Ruby version
+- [📗 Table of Contents](#-table-of-contents)
+- [📖 \[budget-app\] ](#-budget-app-)
+ - [🛠 Built With ](#-built-with-)
+ - [Tech Stack ](#tech-stack-)
+ - [Key Features ](#key-features-)
+ - [🚀 Live Demo ](#-live-demo-)
+ - [💻 Getting Started ](#-getting-started-)
+ - [Prerequisites](#prerequisites)
+ - [Setup](#setup)
+ - [👥 Authors ](#-authors-)
+ - [🔭 Future Features ](#-future-features-)
+ - [🤝 Contributing ](#-contributing-)
+ - [⭐️ Show your support ](#️-show-your-support-)
+ - [🙏 Acknowledgments ](#-acknowledgments-)
+ - [📝 License ](#-license-)
-* System dependencies
+
-* Configuration
+# 📖 [budget-app]
-* Database creation
+**[budget-app]** is a Ruby on Rails application that allows users to create budgets and track their expenses.
-* Database initialization
+## 🛠 Built With
-* How to run the test suite
+### Tech Stack
-* Services (job queues, cache servers, search engines, etc.)
+
+Ruby
+
+
-* Deployment instructions
+
+Rails
+
+
-* ...
+
+Postgresql
+
+
+
+
+
+### Key Features
+
+- **Create new transaction groups.**
+- **Create new transactions.**
+- **View all transactions.**
+- **View all transaction groups.**
+- **View all transactions for a specific group.**
+
+(back to top)
+
+
+
+## 🚀 Live Demo
+
+ See Project 🚀
+
+ Presentation video
+
+
+
+## 💻 Getting Started
+
+To get a local copy up and running, follow these steps.
+
+### Prerequisites
+
+In order to run this project you need to have `ruby`, `rails` and `postgres` installed.
+
+### Setup
+
+Clone this repository to your desired folder:
+
+```sh
+ cd my-folder
+ git clone github.com/microhass/budget-app.git
+```
+
+Then navigate to `budget-app` folder:
+
+```sh
+cd budget-app
+```
+
+Install necessary dependencies:
+
+```sh
+bundle install
+```
+
+Then start the app server:
+
+```sh
+rails serve
+```
+
+Visit [http://127.0.0.1:3000/](localhost) to view the app.
+
+
+(back to top)
+
+
+
+## 👥 Authors
+
+👤 **Hassan Shakur**
+
+- GitHub: [@hassanShakur](https://github.com/hassanShakur)
+- Twitter: [@HassShakur](https://twitter.com/HassShakur)
+- LinkedIn: [hassanShakur](https://linkedin.com/in/hassanShakur)
+
+(back to top)
+
+
+
+## 🔭 Future Features
+
+- [ ] **Implement the desktop version of the app.**
+- [ ] **Improve on the mobile UI and UX.**
+- [ ] **Add more features to the app.**
+- [ ] **Add more tests.**
+
+(back to top)
+
+
+
+## 🤝 Contributing
+
+Contributions, issues, and feature requests are welcome!
+
+Feel free to check the [issues page](../../issues/).
+
+(back to top)
+
+
+
+## ⭐️ Show your support
+
+> If you'd like to contribute to this project, feel free to fork the repository and make changes as you see fit. Please submit a pull request with your changes and I'll review them as soon as possible.
+
+(back to top)
+
+
+
+## 🙏 Acknowledgments
+
+> I would like to thank my coding partners and mentor for the support, and Microverse for the opportunity.
+>
+> Special thanks to [Gregoire Vella on Behance](https://www.behance.net/gregoirevella) for the design inspiration.
+
+(back to top)
+
+
+
+## 📝 License
+
+This project is [MIT](./LICENSE) licensed.
+
+(back to top)
diff --git a/app/assets/fonts/proximanova-regular.otf b/app/assets/fonts/proximanova-regular.otf
new file mode 100644
index 0000000..8aca013
Binary files /dev/null and b/app/assets/fonts/proximanova-regular.otf differ
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 288b9ab..6eee397 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,3 +13,250 @@
*= require_tree .
*= require_self
*/
+
+@font-face {
+ font-family: 'Proxima Nova';
+ src: url('proximanova-regular.otf') format('opentype');
+}
+
+* {
+ margin: 0;
+ padding: 0;
+ box-sizing: border-box;
+ transition: all 0.3s ease-in-out;
+ font-family: 'Proxima Nova', sans-serif;
+}
+
+a {
+ color: inherit;
+ text-decoration: none;
+}
+
+body {
+ background-color: #2b2b2b;
+}
+
+main {
+ max-width: 500px;
+ margin: 0 auto;
+ padding-bottom: 2rem;
+ font-family: 'Roboto', sans-serif;
+ font-size: 16px;
+ color: #434b54;
+ min-height: 740px;
+ margin-top: 2vh;
+ border-radius: 5px;
+ background-color: #fff;
+}
+
+#notice,
+#alert {
+ text-align: center;
+ padding: 0.5rem;
+ background-color: #3778c2;
+ color: #fff;
+}
+
+.header {
+ background-color: #3778c2;
+ color: #fff;
+ padding: 1rem 0.6rem;
+}
+
+.header h1 {
+ font-size: 1.4rem;
+}
+
+.grid-display {
+ display: grid;
+}
+
+#splash-screen {
+ width: 100%;
+ height: 80vh;
+ grid-template-rows: 3fr 1fr;
+}
+
+#splash-screen h1 {
+ place-items: center;
+}
+
+#splash-links {
+ gap: 1rem;
+ padding: 10%;
+}
+
+#user-info {
+ background-color: #3778c2;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 0.5rem;
+ border-bottom: 1px solid #fff;
+}
+
+.btn {
+ display: grid;
+ place-items: center;
+ border-radius: 3px;
+ padding: 0.8rem;
+ width: 90%;
+ margin: 0 auto;
+ margin-top: 10px;
+}
+
+#user-info p {
+ color: #fff;
+ font-size: 0.8rem;
+}
+
+#user-info .btn {
+ background-color: red;
+ color: #fff;
+ width: fit-content;
+ padding: 0.7rem 2rem;
+ margin-bottom: 15px;
+}
+
+#user-info .btn:hover {
+ background-color: #fa3131;
+ cursor: pointer;
+}
+
+.btn.pri,
+input[type='submit'] {
+ background-color: #3778c2;
+ color: #fff;
+ padding: 0.8rem;
+ margin: 10px auto;
+}
+
+.btn.pri:hover {
+ background-color: #5b8cc4;
+}
+
+.btn.sec {
+ background-color: transparent;
+ color: #434b54 !important;
+}
+
+.btn.sec:hover {
+ background-color: #ededed;
+}
+
+.btn.action {
+ background-color: #5fb523;
+ color: #fff;
+}
+
+.btn.action:hover {
+ background-color: #78b74b;
+}
+
+#splash-links a {
+ height: 3rem;
+}
+
+#form {
+ display: grid;
+ padding: 1rem 4%;
+}
+
+#form > a,
+#back {
+ text-align: center;
+ margin-top: 10px;
+ color: #434b546a;
+}
+
+#back {
+ margin-top: 20px;
+}
+
+#form h2 {
+ text-align: center;
+ padding: 1rem;
+ margin-bottom: 2rem;
+}
+
+#form form {
+ gap: 1rem;
+}
+
+#form form,
+form > div {
+ display: grid;
+}
+
+input,
+button {
+ outline: none;
+ border: none;
+ padding: 0.8rem 0;
+}
+
+.field input {
+ border-bottom: 1px solid #2b2b2b76;
+ font-size: 14px;
+}
+
+.actions {
+ margin-top: 2rem;
+}
+
+#groups {
+ gap: 1rem;
+ padding: 1rem;
+ background-color: #f5f5f5;
+}
+
+#group {
+ grid-template-columns: 1fr 3fr 1fr;
+ gap: 1.4rem;
+ padding: 0.6rem;
+ background-color: #fff;
+ border-radius: 5px;
+}
+
+#group:hover {
+ background-color: #d1d1d190;
+}
+
+#group .img-div {
+ width: 100%;
+ height: 80px;
+ overflow: hidden;
+ border-radius: 2px;
+}
+
+#group img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
+
+.group-info {
+ justify-content: space-between;
+}
+
+#transactions {
+ gap: 1rem;
+ margin-top: 3rem;
+}
+
+#entity {
+ gap: 1rem;
+ padding: 0.6rem;
+ border-bottom: 1px solid #2b2b2b76;
+}
+
+#entity > div {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+#date {
+ opacity: 0.5;
+ font-size: 12px;
+}
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 09705d1..7b2e7be 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,2 +1,21 @@
class ApplicationController < ActionController::Base
+ protect_from_forgery with: :exception
+ before_action :update_allowed_parameters, if: :devise_controller?
+
+ def after_sign_in_path_for(_resource)
+ authenticated_root_path
+ end
+
+ def after_sign_out_path_for(_resource)
+ unauthenticated_root_path
+ end
+
+ protected
+
+ def update_allowed_parameters
+ devise_parameter_sanitizer.permit(:sign_up) { |u| u.permit(:name, :email, :password) }
+ devise_parameter_sanitizer.permit(:account_update) do |u|
+ u.permit(:name, :email, :password, :current_password)
+ end
+ end
end
diff --git a/app/controllers/entities_controller.rb b/app/controllers/entities_controller.rb
new file mode 100644
index 0000000..d500046
--- /dev/null
+++ b/app/controllers/entities_controller.rb
@@ -0,0 +1,36 @@
+class EntitiesController < ApplicationController
+ before_action :authenticate_user!
+ before_action :set_group, only: %i[new create]
+ before_action :set_entity, only: %i[show edit update destroy]
+
+ def new
+ @entity = Entity.new
+ end
+
+ def create
+ @entity = Entity.new(entity_params)
+ @entity.author_id = current_user.id
+
+ respond_to do |format|
+ if @entity.save
+ format.html { redirect_to group_path(@group), notice: 'Entity was successfully created.' }
+ else
+ format.html { render :new, status: :unprocessable_entity }
+ end
+ end
+ end
+
+ private
+
+ def set_entity
+ @entity = Entity.find(params[:id])
+ end
+
+ def set_group
+ @group = Group.find(params[:group_id])
+ end
+
+ def entity_params
+ params.require(:entity).permit(:name, :amount, group_ids: [])
+ end
+end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
new file mode 100644
index 0000000..99b3706
--- /dev/null
+++ b/app/controllers/groups_controller.rb
@@ -0,0 +1,60 @@
+class GroupsController < ApplicationController
+ before_action :authenticate_user!
+ before_action :set_group, only: %i[show edit update destroy]
+
+ def index
+ # show only groups that belong to the current user
+ @groups = current_user.groups
+ end
+
+ def show
+ @transactions = @group.entities
+ end
+
+ def new
+ @group = Group.new
+ end
+
+ def edit; end
+
+ def create
+ @group = Group.new(group_params)
+ @group.user = current_user
+
+ respond_to do |format|
+ if @group.save
+ format.html { redirect_to groups_url, notice: 'Group was successfully created.' }
+ else
+ format.html { render :new, status: :unprocessable_entity }
+ end
+ end
+ end
+
+ def update
+ respond_to do |format|
+ if @group.update(group_params)
+ format.html { redirect_to group_url(@group), notice: 'Group was successfully updated.' }
+ else
+ format.html { render :edit, status: :unprocessable_entity }
+ end
+ end
+ end
+
+ def destroy
+ @group.destroy
+
+ respond_to do |format|
+ format.html { redirect_to groups_url, notice: 'Group was successfully destroyed.' }
+ end
+ end
+
+ private
+
+ def set_group
+ @group = Group.find(params[:id])
+ end
+
+ def group_params
+ params.require(:group).permit(:name, :icon)
+ end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..7b17fd4
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,58 @@
+class UsersController < ApplicationController
+ before_action :set_user, only: %i[show edit update destroy]
+
+ # GET /users/new
+ def new
+ @user = User.new
+ end
+
+ # POST /users or /users.json
+ def create
+ @user = User.new(user_params)
+
+ respond_to do |format|
+ if @user.save
+ format.html { redirect_to user_url(@user), notice: 'User was successfully created.' }
+ format.json { render :show, status: :created, location: @user }
+ else
+ format.html { render :new, status: :unprocessable_entity }
+ format.json { render json: @user.errors, status: :unprocessable_entity }
+ end
+ end
+ end
+
+ # PATCH/PUT /users/1 or /users/1.json
+ def update
+ respond_to do |format|
+ if @user.update(user_params)
+ format.html { redirect_to user_url(@user), notice: 'User was successfully updated.' }
+ format.json { render :show, status: :ok, location: @user }
+ else
+ format.html { render :edit, status: :unprocessable_entity }
+ format.json { render json: @user.errors, status: :unprocessable_entity }
+ end
+ end
+ end
+
+ # DELETE /users/1 or /users/1.json
+ def destroy
+ @user.destroy
+
+ respond_to do |format|
+ format.html { redirect_to users_url, notice: 'User was successfully destroyed.' }
+ format.json { head :no_content }
+ end
+ end
+
+ private
+
+ # Use callbacks to share common setup or constraints between actions.
+ def set_user
+ @user = User.find(params[:id])
+ end
+
+ # Only allow a list of trusted parameters through.
+ def user_params
+ params.require(:user).permit(:name)
+ end
+end
diff --git a/app/helpers/entities_helper.rb b/app/helpers/entities_helper.rb
new file mode 100644
index 0000000..7437498
--- /dev/null
+++ b/app/helpers/entities_helper.rb
@@ -0,0 +1,2 @@
+module EntitiesHelper
+end
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
new file mode 100644
index 0000000..c091b2f
--- /dev/null
+++ b/app/helpers/groups_helper.rb
@@ -0,0 +1,2 @@
+module GroupsHelper
+end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
new file mode 100644
index 0000000..2310a24
--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,2 @@
+module UsersHelper
+end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
deleted file mode 100644
index d394c3d..0000000
--- a/app/jobs/application_job.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ApplicationJob < ActiveJob::Base
- # Automatically retry jobs that encountered a deadlock
- # retry_on ActiveRecord::Deadlocked
-
- # Most jobs are safe to ignore if the underlying records are no longer available
- # discard_on ActiveJob::DeserializationError
-end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 3c34c81..286b223 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,4 +1,4 @@
class ApplicationMailer < ActionMailer::Base
- default from: "from@example.com"
- layout "mailer"
+ default from: 'from@example.com'
+ layout 'mailer'
end
diff --git a/app/models/entity.rb b/app/models/entity.rb
new file mode 100644
index 0000000..1dad8f5
--- /dev/null
+++ b/app/models/entity.rb
@@ -0,0 +1,6 @@
+class Entity < ApplicationRecord
+ validates :name, presence: true
+ validates :groups, presence: true
+ validates :amount, presence: true, numericality: { greater_than: 0 }
+ has_and_belongs_to_many :groups
+end
diff --git a/app/models/group.rb b/app/models/group.rb
new file mode 100644
index 0000000..486a5aa
--- /dev/null
+++ b/app/models/group.rb
@@ -0,0 +1,6 @@
+class Group < ApplicationRecord
+ validates :name, presence: true
+ validates :icon, presence: true
+ belongs_to :user
+ has_and_belongs_to_many :entities
+end
diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 0000000..0c8328b
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,10 @@
+class User < ApplicationRecord
+ # Include default devise modules. Others available are:
+ # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+ devise :database_authenticatable, :registerable,
+ :recoverable, :rememberable, :validatable
+
+ validates :name, presence: true
+ has_many :entities, dependent: :destroy
+ has_many :groups, dependent: :destroy
+end
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
new file mode 100644
index 0000000..b12dd0c
--- /dev/null
+++ b/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/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
new file mode 100644
index 0000000..dc55f64
--- /dev/null
+++ b/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/app/views/devise/mailer/email_changed.html.erb b/app/views/devise/mailer/email_changed.html.erb
new file mode 100644
index 0000000..32f4ba8
--- /dev/null
+++ b/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/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
new file mode 100644
index 0000000..b41daf4
--- /dev/null
+++ b/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/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
new file mode 100644
index 0000000..f667dc1
--- /dev/null
+++ b/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/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
new file mode 100644
index 0000000..41e148b
--- /dev/null
+++ b/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/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
new file mode 100644
index 0000000..5fbb9ff
--- /dev/null
+++ b/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/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
new file mode 100644
index 0000000..0f61a3c
--- /dev/null
+++ b/app/views/devise/passwords/new.html.erb
@@ -0,0 +1,17 @@
+
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
new file mode 100644
index 0000000..588f9d9
--- /dev/null
+++ b/app/views/devise/registrations/edit.html.erb
@@ -0,0 +1,48 @@
+
+
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.text_field :name, autofocus: true, autocomplete: "name", placeholder: 'Full Name' %>
+
+
+
+ <%= f.email_field :email, autocomplete: "email", placeholder: 'Email' %>
+
+
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
+ <% end %>
+
+
+ <%= f.label :password %> (leave blank if you don't want to change it)
+ <%= f.password_field :password, autocomplete: "new-password" %>
+ <% if @minimum_password_length %>
+
+ <%= @minimum_password_length %> characters minimum
+ <% end %>
+
+
+
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+
+
+
+ <%= f.label :current_password %> (we need your )
+ <%= f.password_field :current_password, autocomplete: "current-password", placeholder: 'Enter current password to confirm your changes' %>
+
+
+
+ <%= f.submit "Update" %>
+
+ <% end %>
+
+
Cancel my account
+
+
Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?", turbo_confirm: "Are you sure?" }, method: :delete %>
+
+ <%= link_to "Back", :back %>
+
+
+ <%= 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 %>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+ <%= link_to "Sign up", new_registration_path(resource_name), class: 'sec btn' %>
+<% end %>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+<% end %>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end %>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end %>
+
+<%- if devise_mapping.omniauthable? %>
+ <%- resource_class.omniauth_providers.each do |provider| %>
+ <%= button_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), data: { turbo: false } %>
+ <% end %>
+<% end %>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
new file mode 100644
index 0000000..ffc34de
--- /dev/null
+++ b/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/app/views/entities/_entity.html.erb b/app/views/entities/_entity.html.erb
new file mode 100644
index 0000000..7da21d3
--- /dev/null
+++ b/app/views/entities/_entity.html.erb
@@ -0,0 +1,11 @@
+
+
+
Transaction: <%= entity.name %>
+
$<%= entity.amount %>
+
+
+
+ <%= entity.created_at.strftime("%d %b %Y") %>
+ at <%= entity.created_at.strftime("%I:%M %p") %>
+
+
+
<%= pluralize(entity.errors.count, "error") %> prohibited this entity from being saved:
+
+
+ <% entity.errors.each do |error| %>
+ - <%= error.full_message %>
+ <% end %>
+
+
+ <%= form.text_field :name, placeholder: 'Name' %>
+
+
+
+ <%= form.text_field :amount, placeholder: 'Amount' %>
+
+
+
+ <%= form.label :group_ids, 'Groups (Hold Ctrl & select)' %>
+ <%= form.collection_select :group_ids, current_user.groups.all, :id, :name, {prompt: 'Select Group'}, {multiple: true} %>
+
+
+
+ <%= form.submit %>
+
+<% end %>
diff --git a/app/views/entities/new.html.erb b/app/views/entities/new.html.erb
new file mode 100644
index 0000000..65c9e4f
--- /dev/null
+++ b/app/views/entities/new.html.erb
@@ -0,0 +1,11 @@
+
diff --git a/app/views/entities/show.json.jbuilder b/app/views/entities/show.json.jbuilder
new file mode 100644
index 0000000..0337c8d
--- /dev/null
+++ b/app/views/entities/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'entities/entity', entity: @entity
diff --git a/app/views/groups/_form.html.erb b/app/views/groups/_form.html.erb
new file mode 100644
index 0000000..2b0dd23
--- /dev/null
+++ b/app/views/groups/_form.html.erb
@@ -0,0 +1,25 @@
+<%= form_with(model: group) do |form| %>
+ <% if group.errors.any? %>
+
+
<%= pluralize(group.errors.count, "error") %> prohibited this group from being saved:
+
+
+ <% group.errors.each do |error| %>
+ - <%= error.full_message %>
+ <% end %>
+
+
+ <%= form.text_field :name, placeholder: 'Name' %>
+
+
+
+ <%= form.text_field :icon, placeholder: 'Icon' %>
+
+
+
+ <%= form.submit %>
+
+<% end %>
diff --git a/app/views/groups/_group.html.erb b/app/views/groups/_group.html.erb
new file mode 100644
index 0000000..357c463
--- /dev/null
+++ b/app/views/groups/_group.html.erb
@@ -0,0 +1,17 @@
+<%= link_to group_path(group) do %>
+
+
+ <%= image_tag group.icon %>
+
+
+
+
<%= group.name %>
+
<%= group.created_at.strftime("%d %b %Y") %>
+
+
+
+ $<%= group.entities.sum(:amount) %>
+
+
+
+
+
+
+ <%= render @groups %>
+
+
+ <%= link_to "Add new category", new_group_path, class: 'action btn' %>
+
+
+ <%= image_tag @group.icon %>
+
+
+
+
<%= @group.name %>
+
+ Total Transaction Amount: $<%= @group.entities.sum(:amount) %>
+
+
+
+ <%= render partial: 'entities/entity', collection: @group.entities.order(created_at: :desc) %>
+
+ <%= link_to "Add a new transaction", new_group_entity_path(@group), class: 'action btn' %>
+
+
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 03fc2f6..584ba32 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
- BudgetApp
+ Budgetize
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
@@ -11,6 +11,16 @@
- <%= yield %>
+
+ <%= notice %>
+ <%= alert %>
+ <% if user_signed_in? then %>
+
+
Logged in as <%= current_user.email %>
+ <%= button_to "Logout" , destroy_user_session_path, method: :delete, class: 'btn' %>
+
+
Budgetize
+
+
+ <%= link_to "Login", new_user_session_path, class: 'pri btn' %>
+ <%= link_to "Sign Up", new_user_registration_path, class: 'sec btn' %>
+
+