From d6b3e16d557d5e5670dccefb0c96bc9094eeae19 Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Thu, 24 Jun 2021 07:42:15 -0700
Subject: [PATCH 01/10] enable sessionless login in development

---
 app/controllers/application_controller.rb | 6 +++++-
 app/views/application/_navbar.html.erb    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d00361d3..ab6ac758 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -73,8 +73,12 @@ def current_semester
   end
 
   def current_user
-    return impersonate_user if ENV['NONAUTH']
+    if Rails.env.development? && ENV['NONAUTH']
+      authorization_header = request.env["HTTP_AUTHORIZATION"]
+      return User.find(authorization_header.split()[1]) if authorization_header
 
+      return impersonate_user
+    end
     @current_user ||= User.includes([{ memberships: [:group] }]).find(session[:user_id])
   end
   helper_method :current_user
diff --git a/app/views/application/_navbar.html.erb b/app/views/application/_navbar.html.erb
index a6eff7df..d5fe6983 100644
--- a/app/views/application/_navbar.html.erb
+++ b/app/views/application/_navbar.html.erb
@@ -83,7 +83,7 @@
             <i class="uk-icon-bell"></i>
           </a>
 
-          <% if @notifications.any? %>
+          <% if @notifications&.any? %>
             <div class="uk-dropdown uk-dropdown-navbar uk-overflow-container notification-dropdown">
               <ul class="uk-list uk-nav uk-nav-navbar">
                 <%= render_notifications(@notifications) %>

From e39770c4375bf8858baceba67b8b0577ced3ca22 Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Thu, 24 Jun 2021 07:42:58 -0700
Subject: [PATCH 02/10] install jbuilder gem

---
 Gemfile      | 3 +++
 Gemfile.lock | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 69830e00..d14b6188 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,6 +46,9 @@ gem 'activity_notification', '~> 2.2', '>= 2.2.1'
 gem 'pundit', '~> 2.1'
 gem "bootsnap", ">= 1.1.0", require: false
 gem 'listen'
+# use jbuilder to provide data for the REST API
+gem 'jbuilder', '~> 2.11', '>= 2.11.2'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
diff --git a/Gemfile.lock b/Gemfile.lock
index fe74faf0..841a6e9b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -137,6 +137,8 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    jbuilder (2.11.2)
+      activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -340,6 +342,7 @@ DEPENDENCIES
   em-http-request
   exception_handler (~> 0.8.0.0)
   factory_bot_rails
+  jbuilder (~> 2.11, >= 2.11.2)
   jquery-rails
   kaminari
   listen

From dd94226214b64418e151c4df1148ca94ddab0d8a Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Thu, 24 Jun 2021 07:44:02 -0700
Subject: [PATCH 03/10] create REST end-point for profile page

---
 app/controllers/profiles_controller.rb     |  5 ++++-
 app/views/profiles/show_self.json.jbuilder | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 app/views/profiles/show_self.json.jbuilder

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 62a9cb4d..0144462a 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -19,7 +19,10 @@ def show_by_id
 
   def show_self
     @user_presenter = current_user.decorate
-    render :show
+    @user = current_user
+    @memberships = Membership.includes(:group).where(user: current_user)
+    # render :show
+    render "show_self.json.jbuilder"
   end
 
   def edit; end
diff --git a/app/views/profiles/show_self.json.jbuilder b/app/views/profiles/show_self.json.jbuilder
new file mode 100644
index 00000000..c893afff
--- /dev/null
+++ b/app/views/profiles/show_self.json.jbuilder
@@ -0,0 +1,21 @@
+json.user do
+  json.full_name @user.full_name
+  # json.compact_name @user.compact_name
+  json.photo_path photo_path(@user_presenter.screen_name)
+  json.profile_url profile_url(@user_presenter.screen_name)
+  json.room @user.room
+  json.cell_phone @user.cell_phone
+  json.email @user.email
+end
+json.memberships(@memberships) do |membership|
+  json.start_date membership.start_date
+  json.end_date membership.end_date
+  json.status membership.status
+
+  group = membership.group
+  json.group do
+    json.id group.id
+    json.url group_url(group)
+    json.name group.name
+  end
+end
\ No newline at end of file

From 6f019972f380eabf280659c74a985cd36baeccbb Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Sat, 26 Jun 2021 21:39:27 +0200
Subject: [PATCH 04/10] update Docker config to support mutliple environmets

---
 .env.example        | 15 +++++++++++++--
 Dockerfile          |  2 +-
 config/database.yml | 14 ++++++--------
 docker-compose.yml  | 14 ++++----------
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/.env.example b/.env.example
index f4332195..908091b2 100644
--- a/.env.example
+++ b/.env.example
@@ -8,6 +8,17 @@ UNSPLASH_SECRET=
 # Only for production
 SECRET_KEY_BASE=
 
-# These two password must be identical
+# value for docker-compose: postgres
+DATABASE_USER=
+# value for docker-compose: postgres
+DATABASE_HOST=
+# value for docke-compose: pek-next
+DATABASE_NAME=
+#
 DATABASE_PASSWORD=
-POSTGRES_PASSWORD=
+
+# available values: development, staging, production
+RAILS_ENV=production
+# enable unless RAILS_ENV is development
+RAILS_SERVE_STATIC_FILES=
+
diff --git a/Dockerfile b/Dockerfile
index 9d6d589c..37d1d34c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ WORKDIR /pek-next
 # Install dependencies
 COPY Gemfile .
 COPY Gemfile.lock .
-RUN bundle install --deployment --without test development --retry 3
+RUN bundle install --deployment --without test --retry 3
 
 # Copy application
 COPY . .
diff --git a/config/database.yml b/config/database.yml
index 6528c3ff..8bb5c6ac 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -8,13 +8,14 @@ default: &default
   adapter: postgresql
   encoding: unicode
   pool: 5
-  host: localhost
-  username: pek-next
-  password: pek-next
+  database: <%= ENV['DATABASE_NAME'] %>
+  username: <%= ENV['DATABASE_USER'] %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>
+  host: <%= ENV['DATABASE_HOST'] %>
 
 development:
   <<: *default
-  database: pek-next
+
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -25,10 +26,7 @@ test:
 
 production: &production
   <<: *default
-  database: <%= ENV['DATABASE_NAME'] %>
-  username: <%= ENV['DATABASE_USER'] %>
-  password: <%= ENV['DATABASE_PASSWORD'] %>
-  host: <%= ENV['DATABASE_HOST'] %>
+
 
 staging:
   <<: *production
diff --git a/docker-compose.yml b/docker-compose.yml
index da7fb8e9..b2a1072e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,9 +6,10 @@ services:
     networks:
       - pek_network
   postgres:
-    image: postgres:9.6
+    image: postgres:13.1
     environment:
       - PGDATA=/var/lib/postgresql/data/pgdata
+      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
     volumes:
       - database_folder:/var/lib/postgresql/data/pgdata
     restart: always
@@ -21,7 +22,7 @@ services:
       - REDIS_URL=redis://redis:6379
     restart: always
     env_file:
-      - .env
+      - .env.back
     depends_on:
       - postgres
       - redis
@@ -30,16 +31,9 @@ services:
   web:
     build: .
     command: sh -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
-    environment:
-      - RAILS_SERVE_STATIC_FILES=true
-      - RAILS_ENV=production
-      - DATABASE_PASSWORD=
-      - DATABASE_USER=postgres
-      - DATABASE_NAME=pek-next
-      - DATABASE_HOST=postgres
     restart: always
     env_file:
-      - .env
+      - .env.back
     volumes:
       - uploads_folder:/pek-next/public/uploads
     ports:

From 40e909b084bd88b9cf2dc17cb2960ab9533b3cec Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Sat, 26 Jun 2021 21:41:30 +0200
Subject: [PATCH 05/10] move rollbar access_token to .env

---
 .env.example                   | 3 ++-
 config/initializers/rollbar.rb | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.env.example b/.env.example
index 908091b2..a50e70cd 100644
--- a/.env.example
+++ b/.env.example
@@ -21,4 +21,5 @@ DATABASE_PASSWORD=
 RAILS_ENV=production
 # enable unless RAILS_ENV is development
 RAILS_SERVE_STATIC_FILES=
-
+# provide rollbar access token for production
+ROLLBAR_ACCESS_TOKEN=
diff --git a/config/initializers/rollbar.rb b/config/initializers/rollbar.rb
index d7e64401..9d1540de 100644
--- a/config/initializers/rollbar.rb
+++ b/config/initializers/rollbar.rb
@@ -2,10 +2,8 @@
   # Without configuration, Rollbar is enabled in all environments.
   # To disable in specific environments, set config.enabled=false.
 
-  config.access_token = '83caf705fc644065b610040b6c7f8ca2'
-
   # Here we'll disable in 'test':
-  unless Rails.env.production?
+  unless ENV['ROLLBAR_ACCESS_TOKEN'].present?
     config.enabled = false
   end
 

From 3848d6dd4baea69886f5d9eabf19229980bf96f0 Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Sat, 26 Jun 2021 22:26:43 +0200
Subject: [PATCH 06/10] fix tests

---
 config/database.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/database.yml b/config/database.yml
index 8bb5c6ac..e541314d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -23,6 +23,9 @@ development:
 test:
   <<: *default
   database: pek-next-test
+  host: localhost
+  username: pek-next
+  password: pek-next
 
 production: &production
   <<: *default

From 1c34f8b8be2540941994dd7daa8a6f1b59bf3a34 Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Sun, 27 Jun 2021 14:19:12 +0200
Subject: [PATCH 07/10] update .env.example

---
 .env.example | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.env.example b/.env.example
index a50e70cd..c8a07c09 100644
--- a/.env.example
+++ b/.env.example
@@ -23,3 +23,5 @@ RAILS_ENV=production
 RAILS_SERVE_STATIC_FILES=
 # provide rollbar access token for production
 ROLLBAR_ACCESS_TOKEN=
+# enable if used with API
+NONAUTH=true

From 3a5ae6bb2ed2b4475972bc9f276cb5e5f669a938 Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Sun, 27 Jun 2021 14:26:36 +0200
Subject: [PATCH 08/10] remove back

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b2a1072e..38db2a86 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       - REDIS_URL=redis://redis:6379
     restart: always
     env_file:
-      - .env.back
+      - .env
     depends_on:
       - postgres
       - redis
@@ -33,7 +33,7 @@ services:
     command: sh -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
     restart: always
     env_file:
-      - .env.back
+      - .env
     volumes:
       - uploads_folder:/pek-next/public/uploads
     ports:

From ea740284f0441b2ff9dab1ad418c55f4ab021625 Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Sun, 4 Jul 2021 17:44:12 +0200
Subject: [PATCH 09/10] remove values from .env.example

---
 .env.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index c8a07c09..ef822e0b 100644
--- a/.env.example
+++ b/.env.example
@@ -18,10 +18,10 @@ DATABASE_NAME=
 DATABASE_PASSWORD=
 
 # available values: development, staging, production
-RAILS_ENV=production
+RAILS_ENV=
 # enable unless RAILS_ENV is development
 RAILS_SERVE_STATIC_FILES=
 # provide rollbar access token for production
 ROLLBAR_ACCESS_TOKEN=
 # enable if used with API
-NONAUTH=true
+NONAUTH=

From 32a71a3b279b68e1cccaa7de2c21d8db5535c0f3 Mon Sep 17 00:00:00 2001
From: SepsiLaszlo <sepsi.laszlo99@gmail.com>
Date: Sun, 18 Jul 2021 08:28:37 +0200
Subject: [PATCH 10/10] remove values from .env.example

---
 Gemfile                  |  2 ++
 Gemfile.lock             | 33 +++++++++++++++++++++++++++++++++
 app/api/api.rb           |  5 +++++
 app/api/userm/profile.rb |  8 ++++++++
 config/routes.rb         |  1 +
 5 files changed, 49 insertions(+)
 create mode 100644 app/api/api.rb
 create mode 100644 app/api/userm/profile.rb

diff --git a/Gemfile b/Gemfile
index d14b6188..02fd2bcf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,6 +48,8 @@ gem "bootsnap", ">= 1.1.0", require: false
 gem 'listen'
 # use jbuilder to provide data for the REST API
 gem 'jbuilder', '~> 2.11', '>= 2.11.2'
+# use grape to provide REST API documentation
+gem 'grape'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
diff --git a/Gemfile.lock b/Gemfile.lock
index 841a6e9b..ae70d2a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -103,6 +103,24 @@ GEM
       activemodel-serializers-xml (>= 1.0)
       activesupport (>= 5.0)
       request_store (>= 1.0)
+    dry-configurable (0.12.1)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5.0)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.6.0)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.2.0)
+    dry-logic (1.2.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-types (1.5.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
     em-http-request (1.1.5)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
@@ -130,6 +148,13 @@ GEM
     ffi (1.15.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
+    grape (1.5.3)
+      activesupport
+      builder
+      dry-types (>= 1.1)
+      mustermann-grape (~> 1.0.0)
+      rack (>= 1.3.0)
+      rack-accept
     hashie (3.6.0)
     http_parser.rb (0.6.0)
     httparty (0.17.1)
@@ -177,6 +202,10 @@ GEM
     multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-grape (1.0.1)
+      mustermann (>= 1.0.0)
     nio4r (2.5.7)
     nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
@@ -204,6 +233,8 @@ GEM
       rspec-rails (>= 3.0.0)
     racc (1.5.2)
     rack (2.2.3)
+    rack-accept (0.4.5)
+      rack (>= 0.4)
     rack-protection (2.0.0)
       rack
     rack-test (1.1.0)
@@ -268,6 +299,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
+    ruby2_keywords (0.0.4)
     rufus-scheduler (3.4.2)
       et-orbi (~> 1.0)
     sass (3.7.4)
@@ -342,6 +374,7 @@ DEPENDENCIES
   em-http-request
   exception_handler (~> 0.8.0.0)
   factory_bot_rails
+  grape
   jbuilder (~> 2.11, >= 2.11.2)
   jquery-rails
   kaminari
diff --git a/app/api/api.rb b/app/api/api.rb
new file mode 100644
index 00000000..84ebfd15
--- /dev/null
+++ b/app/api/api.rb
@@ -0,0 +1,5 @@
+class Api < Grape::API
+  prefix 'api'
+  format 'json'
+  mount Userm::Profile
+end
diff --git a/app/api/userm/profile.rb b/app/api/userm/profile.rb
new file mode 100644
index 00000000..c473927d
--- /dev/null
+++ b/app/api/userm/profile.rb
@@ -0,0 +1,8 @@
+module Userm
+  class Profile < Grape::API
+    get :profile do
+      # Your logic
+      'pro'
+    end
+  end
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index cf63563f..69b2153c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  mount Api => '/'
 
   get '/logout', to: 'sessions#destroy', as: :logout
   get '/login', to: 'sessions#new', as: :login