From 725dd6a2a5ea2fecd2c7a3f6ae6e3ab262f460e6 Mon Sep 17 00:00:00 2001
From: Lucas David Erkana <lderkana21x@gmail.com>
Date: Tue, 11 Jul 2023 15:54:49 +0200
Subject: [PATCH 1/4] Allow user to add a photo

rails generate migration AddPhotoToUsers photo:string
rails db:migrate
update user_controllers.rb
-update user.rb
-Create registrations_controller.rb
-update resistration/new.html.erb
-Then update routes
-Apply stuling to photo display
---
 app/assets/stylesheets/mobile_nav.css          | 10 ++++++++++
 app/controllers/registrations_controller.rb    |  9 +++++++++
 app/controllers/users_controller.rb            | 10 +++++++++-
 app/models/user.rb                             |  2 +-
 app/views/devise/registrations/new.html.erb    |  3 +++
 app/views/layouts/application.html.erb         | 18 ++++++++++++------
 config/routes.rb                               |  2 +-
 .../20230711111807_add_photo_to_users.rb       |  5 +++++
 db/schema.rb                                   |  3 ++-
 9 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 app/controllers/registrations_controller.rb
 create mode 100644 db/migrate/20230711111807_add_photo_to_users.rb

diff --git a/app/assets/stylesheets/mobile_nav.css b/app/assets/stylesheets/mobile_nav.css
index c489e7e..fa497eb 100644
--- a/app/assets/stylesheets/mobile_nav.css
+++ b/app/assets/stylesheets/mobile_nav.css
@@ -67,6 +67,16 @@
   padding: 20px;
 }
 
+.avatar-img {
+  width: 200px; /* Adjust the width to your desired size */
+  height: 210px; /* Adjust the height to your desired size */
+}
+
+.rounded-circle {
+  border-radius: 50%; /* Make the image circular by setting border-radius to 50% */
+  overflow: hidden; /* Hide any content that exceeds the circular boundaries */
+}
+
 .profile-info-container p {
   margin-top: 5px;
   text-align: center;
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
new file mode 100644
index 0000000..ab78ab7
--- /dev/null
+++ b/app/controllers/registrations_controller.rb
@@ -0,0 +1,9 @@
+# app/controllers/registrations_controller.rb
+class RegistrationsController < Devise::RegistrationsController
+    private
+  
+    def sign_up_params
+      params.require(:user).permit(:name, :email, :password, :password_confirmation, :photo)
+    end
+  end
+  
\ No newline at end of file
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 779f395..050ed65 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -19,7 +19,12 @@ def edit; end
 
   # POST /users or /users.json
   def create
+    
     @user = User.new(user_params)
+    @user.photo = params[:user][:photo]
+    puts "Photo URL: #{params[:user][:photo]}"
+    puts "User Photo: #{@user.photo}"
+    puts "User: #{@user}"
 
     respond_to do |format|
       if @user.save
@@ -31,6 +36,9 @@ def create
       end
     end
   end
+  
+  
+  
 
   # PATCH/PUT /users/1 or /users/1.json
   def update
@@ -64,6 +72,6 @@ def set_user
 
   # Only allow a list of trusted parameters through.
   def user_params
-    params.require(:user).permit(:name)
+    params.require(:user).permit(:name, :email, :password, :password_confirmation, :photo)
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index da4bea6..c680471 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,6 +6,6 @@ class User < ApplicationRecord
 
   has_many :categories, foreign_key: 'author_id'
   has_many :entities, foreign_key: 'author_id'
-
+  attribute :photo, :string
   validates :name, presence: true, length: { maximum: 50 }
 end
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index f42e671..c0d8a5e 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -21,6 +21,9 @@
       <%= f.label :name %>
       <%= f.text_field :name, autofocus: true,  placeholder: "Full name", required: true  %>
 
+      <%= f.label :photo %>
+      <%= f.text_field :photo, placeholder: "Photo URL", required: false %>
+
       <%= f.label :email %>
       <%= f.email_field :email,  autocomplete: "email", placeholder: "Email", required: true  %>
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2f74cf4..6048c02 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,12 +16,18 @@
   <div id="mobile-nav-container">
   <button id="close-mobile-nave"><i class="fa-solid fa-xmark"></i></button>
     <!-- Mobile navigation menu -->
-    <div class="profile-info-container ">
-      <div class="profile-img">
-        <i class="fa-solid fa-user"></i>
-      </div>
-      <p><%= current_user.name.split(' ').first %></p>
-    </div>
+<div class="profile-info-container">
+  <div class="profile-img">
+    <% if user_signed_in? && current_user.photo.present? %>
+      <%= image_tag current_user.photo, class: "avatar-img rounded-circle" %>
+    <% else %>
+      <i class="fa-solid fa-user"></i>
+    <% end %>
+  </div>
+  <p><%= current_user.name.split(' ').first %></p>
+</div>
+
+
     <ul id="mobile-nav-menu">
       <!-- Add your navigation links here -->
       <li class="nav-link"><%= link_to  "Settings", '' %></li>
diff --git a/config/routes.rb b/config/routes.rb
index 30c921b..253a9b1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  devise_for :users
+  devise_for :users, controllers: { registrations: 'registrations' }
 
   get '/splash', to: 'splashes#index'
 
diff --git a/db/migrate/20230711111807_add_photo_to_users.rb b/db/migrate/20230711111807_add_photo_to_users.rb
new file mode 100644
index 0000000..19d57bf
--- /dev/null
+++ b/db/migrate/20230711111807_add_photo_to_users.rb
@@ -0,0 +1,5 @@
+class AddPhotoToUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :users, :photo, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c56ff73..257a5cc 100644
--- a/db/schema.rb
+++ b/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_07_10_140614) do
+ActiveRecord::Schema[7.0].define(version: 2023_07_11_111807) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -51,6 +51,7 @@
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string "unconfirmed_email"
+    t.string "photo"
     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

From 44e97864e3f2307cc32290ebef602315414c2926 Mon Sep 17 00:00:00 2001
From: Lucas David Erkana <lderkana21x@gmail.com>
Date: Tue, 11 Jul 2023 15:58:13 +0200
Subject: [PATCH 2/4] Fix linters

---
 app/controllers/registrations_controller.rb | 11 +++++------
 app/controllers/users_controller.rb         |  4 ----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index ab78ab7..31d7af5 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,9 +1,8 @@
 # app/controllers/registrations_controller.rb
 class RegistrationsController < Devise::RegistrationsController
-    private
-  
-    def sign_up_params
-      params.require(:user).permit(:name, :email, :password, :password_confirmation, :photo)
-    end
+  private
+
+  def sign_up_params
+    params.require(:user).permit(:name, :email, :password, :password_confirmation, :photo)
   end
-  
\ No newline at end of file
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 050ed65..4aa1ded 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -19,7 +19,6 @@ def edit; end
 
   # POST /users or /users.json
   def create
-    
     @user = User.new(user_params)
     @user.photo = params[:user][:photo]
     puts "Photo URL: #{params[:user][:photo]}"
@@ -36,9 +35,6 @@ def create
       end
     end
   end
-  
-  
-  
 
   # PATCH/PUT /users/1 or /users/1.json
   def update

From 837298b860b8e24748252bda337928fb82c53a05 Mon Sep 17 00:00:00 2001
From: Lucas David Erkana <lderkana21x@gmail.com>
Date: Tue, 11 Jul 2023 16:06:02 +0200
Subject: [PATCH 3/4] Update README.md

---
 README.md | 152 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 139 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 7db80e4..204392d 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,150 @@
-# README
+# 📗 Table of Contents
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
+- [📗 Table of Contents](#-table-of-contents)
+  - [📖 TDD Project ](#-oop-school-library--)
+  - [🛠 Built With ](#-built-with-)
+  - [Tech Stack ](#tech-stack-)
+  - [Key Features](#key-features)
+  - [🚀 Live Demo](#live-demo)
+  - [📽️ Video Presentation](#video)
+  - [💻 Getting Started ](#-getting-started-)
+  - [Prerequisites](#prerequisites)
+  - [Setup](#setup)
+  - [Install](#install)
+  - [Usage](#usage)
+  - [Authors ](#authors-)
+  - [🔭 Future Features ](#-future-features-)
+  - [🤝 Contributing ](#-contributing-)
+  - [⭐️ Show your support ](#️-show-your-support-)
+  - [🙏 Acknowledgments ](#-acknowledgments-)
+  - [📝 License ](#-license-)
 
-Things you may want to cover:
+## 📖 SpendSmart<a name="about-project"></a>
+SpendSmart is a web-based budgeting application built using Ruby on Rails and PostgreSQL. With SpendSmart, users can effortlessly track their income and expenses, gaining full control over their finances. 💰💼
 
-* Ruby version
+## 🛠 Built With <a name="built-with"></a>
 
-* System dependencies
+## Tech Stack <a name="tech-stack"></a>
 
-* Configuration
+- [Ruby](https://www.ruby-lang.org/en/)
+- [Ruby on Rails](https://rubyonrails.org/)
+- [PostgreSQL](https://www.postgresql.org/)
 
-* Database creation
+## Key Features
 
-* Database initialization
+- [ ] **Register an account**
+- [ ] **Login registered account**
+- [ ] **Create categories and transactions**
+- [ ] **Upload Profile photo**
 
-* How to run the test suite
+<p align="right">(<a href="#readme-top">back to top</a>)</p>
 
-* Services (job queues, cache servers, search engines, etc.)
+### 🚀 Live Demo <a name="live-demo"></a>
 
-* Deployment instructions
+- [SpendSmart](#)
 
-* ...
+### 📽️ Video Presentation <a name="video"></a>
+
+[Video Presentation ] (https://www.loom.com/share/5d571397947b49f0a677c66a047801e0?sid=14c5b6cf-58cf-45bb-bf08-e4a63cb61bbb)-Powered by Loom
+
+<p align="right">(<a href="#readme-top">back to top</a>)</p>
+
+## 💻 Getting Started <a name="getting-started"></a>
+
+To get a local copy up and running, follow these steps.
+
+## Prerequisites
+
+In order to run this project you need to install the following on your machine:
+- [Ruby](https://www.ruby-lang.org/en/)
+- [Ruby on Rails](https://rubyonrails.org/)
+- [PostgreSQL](https://www.postgresql.org/)
+
+## Setup
+
+Clone this repository to your desired folder:
+
+Example commands:
+
+-  Clone this repository using GitBash or the command Terminal:
+
+```sh
+git clone https://github.com/Lucash2022/SpendSmart.git
+
+ cd SpendSmart
+```
+
+## Install
+
+- Inside the project directory, install the project's dependencies:
+
+```sh
+  bundle install 
+```
+
+- Create the app's database
+
+```sh
+rails db:create
+```
+   
+- Setup the app's database
+  
+```sh
+ rails db:setup
+```
+## Usage
+
+```sh
+rails server
+```
+- Runs the app local server
+
+
+## Authors <a name="authors"></a>
+
+👤 **Lucas Erkana**
+
+- GitHub: [@Lucash2022](https://github.com/Lucash2022)
+- Twitter: [@Lucas_David_22](https://twitter.com/@Lucas_David_22)
+- LinkedIn: [Lucas Erkana](https://www.linkedin.com/in/lucas-erkana/)
+- Frontend Mentor - [@PLucash2022](https://www.frontendmentor.io/profile/Lucash2022)
+
+<p align="right">(<a href="#readme-top">back to top</a>)</p>
+
+## 🔭 Future Features <a name="future-features"></a>
+
+- [ ] **Delete and edit transactions**
+- [ ] **User profile settings**
+
+<p align="right">(<a href="#readme-top">back to top</a>)</p>
+
+## 🤝 Contributing <a name="contributing"></a>
+
+Contributions, issues, and feature requests are welcome!
+
+Feel free to check the [issues page](https://github.com/Lucash2022/SpendSmart/issues).
+
+<p align="right">(<a href="#readme-top">back to top</a>)</p>
+
+## ⭐️ Show your support <a name="support"></a>
+
+If you like this project please leave a star. Thank you 🙏
+
+<p align="right">(<a href="#readme-top">back to top</a>)</p>
+
+## 🙏 Acknowledgments <a name="acknowledgements"></a>
+
+- I would like to thank Microverse for the great project idea. ❤️
+ - Credit goes to [Gregoire Vella on Behance](https://www.behance.net/gregoirevella) whose original design was used.
+
+ Icons were used from [Flaticon](https://www.flaticon.com/)
+
+<p align="right">(<a href="#readme-top">back to top</a>)</p>
+
+## 📝 License <a name="license"></a>
+
+This project is [MIT](./LICENSE) licensed.
+
+
+<p align="right">(<a href="#readme-top">back to top</a>)</p>

From 46957d5086175635979eb64b6ca8d34bc5ccea21 Mon Sep 17 00:00:00 2001
From: Lucas David Erkana <lderkana21x@gmail.com>
Date: Tue, 11 Jul 2023 16:32:46 +0200
Subject: [PATCH 4/4] Configure for Deployement

---
 bin/render-build.sh               |  8 ++++++++
 config/database.yml               |  4 +---
 config/environments/production.rb |  2 +-
 config/puma.rb                    |  4 ++--
 render.yaml                       | 18 ++++++++++++++++++
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 bin/render-build.sh
 create mode 100644 render.yaml

diff --git a/bin/render-build.sh b/bin/render-build.sh
new file mode 100644
index 0000000..24b31ca
--- /dev/null
+++ b/bin/render-build.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# exit on error
+set -o errexit
+
+bundle install
+bundle exec rake assets:precompile
+bundle exec rake assets:clean
+bundle exec rake db:migrate
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
index 0ac6c6d..38f5659 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -84,6 +84,4 @@ test:
 #
 production:
   <<: *default
-  database: SpendSmart_production
-  username: SpendSmart
-  password: <%= ENV["SPENDSMART_DATABASE_PASSWORD"] %>
+  url: <%= ENV['DATABASE_URL'] %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b011b28..2d5842b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -22,7 +22,7 @@
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? || ENV['RENDER'].present?
 
   # Compress CSS using a preprocessor.
   # config.assets.css_compressor = :sass
diff --git a/config/puma.rb b/config/puma.rb
index daaf036..81dae67 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -30,14 +30,14 @@
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
 #
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+workers ENV.fetch("WEB_CONCURRENCY") { 4 }
 
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code
 # before forking the application. This takes advantage of Copy On Write
 # process behavior so workers use less memory.
 #
-# preload_app!
+preload_app!
 
 # Allow puma to be restarted by `bin/rails restart` command.
 plugin :tmp_restart
diff --git a/render.yaml b/render.yaml
new file mode 100644
index 0000000..80752bd
--- /dev/null
+++ b/render.yaml
@@ -0,0 +1,18 @@
+databases:
+  - name: spendsmart
+    databaseName: spendsmart
+    user: spendsmart_user
+
+services:
+  - type: web
+    name: spendsmart
+    runtime: ruby
+    buildCommand: "./bin/render-build.sh"
+    startCommand: "bundle exec puma -C config/puma.rb"
+    envVars:
+      - key: DATABASE_URL
+        fromDatabase:
+          name: spendsmart
+          property: connectionString
+      - key: RAILS_MASTER_KEY
+        sync: false
\ No newline at end of file