Skip to content

Commit 9cce10b

Browse files
authored
Merge pull request #7 from jahidhimon/development
Fixes #6
2 parents 0dced12 + 8e8e4a2 commit 9cce10b

File tree

16 files changed

+513
-5
lines changed

16 files changed

+513
-5
lines changed

.github/workflows/fly-deploy.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# See https://fly.io/docs/app-guides/continuous-deployment-with-github-actions/
2+
3+
name: Fly Deploy
4+
on:
5+
push:
6+
branches:
7+
- main
8+
jobs:
9+
deploy:
10+
name: Deploy app
11+
runs-on: ubuntu-latest
12+
concurrency: deploy-group # optional: ensure only one action runs at a time
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: superfly/flyctl-actions/setup-flyctl@master
16+
- run: flyctl deploy --remote-only
17+
env:
18+
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

.idea/.gitignore

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dataSources.xml

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/outface.iml

Lines changed: 335 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ gem 'stimulus-rails'
2828
# Use Tailwind CSS [https://github.com/rails/tailwindcss-rails]
2929
gem 'tailwindcss-rails'
3030

31+
3132
# Build JSON APIs with ease [https://github.com/rails/jbuilder]
3233
gem 'jbuilder'
3334

@@ -77,3 +78,7 @@ group :test do
7778
end
7879

7980
gem 'devise', '~> 4.9'
81+
82+
gem "dockerfile-rails", ">= 1.6", :group => :development
83+
84+
gem "aws-sdk-s3", "~> 1.162", :require => false

Gemfile.lock

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,22 @@ GEM
7777
tzinfo (~> 2.0)
7878
addressable (2.8.6)
7979
public_suffix (>= 2.0.2, < 6.0)
80+
aws-eventstream (1.3.0)
81+
aws-partitions (1.975.0)
82+
aws-sdk-core (3.205.0)
83+
aws-eventstream (~> 1, >= 1.3.0)
84+
aws-partitions (~> 1, >= 1.651.0)
85+
aws-sigv4 (~> 1.9)
86+
jmespath (~> 1, >= 1.6.1)
87+
aws-sdk-kms (1.91.0)
88+
aws-sdk-core (~> 3, >= 3.205.0)
89+
aws-sigv4 (~> 1.5)
90+
aws-sdk-s3 (1.162.0)
91+
aws-sdk-core (~> 3, >= 3.205.0)
92+
aws-sdk-kms (~> 1)
93+
aws-sigv4 (~> 1.5)
94+
aws-sigv4 (1.9.1)
95+
aws-eventstream (~> 1, >= 1.0.2)
8096
base64 (0.2.0)
8197
bcrypt (3.1.20)
8298
bigdecimal (3.1.6)
@@ -110,6 +126,8 @@ GEM
110126
railties (>= 4.1.0)
111127
responders
112128
warden (~> 1.2.3)
129+
dockerfile-rails (1.6.17)
130+
rails (>= 3.0.0)
113131
drb (2.2.1)
114132
erubi (1.12.0)
115133
faker (3.2.3)
@@ -144,6 +162,7 @@ GEM
144162
jbuilder (2.11.5)
145163
actionview (>= 5.0.0)
146164
activesupport (>= 5.0.0)
165+
jmespath (1.6.2)
147166
listen (3.9.0)
148167
rb-fsevent (~> 0.10, >= 0.10.3)
149168
rb-inotify (~> 0.9, >= 0.9.10)
@@ -318,11 +337,13 @@ PLATFORMS
318337
x86_64-linux
319338

320339
DEPENDENCIES
340+
aws-sdk-s3 (~> 1.162)
321341
bootsnap
322342
bullet
323343
capybara
324344
debug
325345
devise (~> 4.9)
346+
dockerfile-rails (>= 1.6)
326347
faker
327348
guard
328349
image_processing (~> 1.2)

app/controllers/follow_controller.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ def destroy
1212
Follow.where(follower_id: current_user.account.id, followee_id: @account.id).limit(1).first.destroy
1313
redirect_back fallback_location: profile_path(@account)
1414
end
15+
def index
16+
@account = Account.find(params[:id])
17+
@followers = Follow.where(followee_id: params[:id])
18+
end
1519
end

0 commit comments

Comments
 (0)