@@ -80,4 +81,12 @@
No achievements to display.
+<% end %>
+
+<% if @user.public_analytics %>
+
+ <%= link_to user_analytics_path(@user.username), class: 'text-gray-400 hover:text-lime-300 text-sm' do %>
+ View Analytics
+ <% end %>
+
<% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 7cafbc0..99d0edf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,7 +23,7 @@
mount Sidekiq::Web => '/sidekiq'
# Other routes
- get 'analytics', to: 'analytics#index'
+ get '/:username/analytics', to: 'analytics#index', as: :user_analytics
get "up" => "rails/health#show", as: :rails_health_check
root to: 'pages#home'
resources :links, only: [:index, :show, :new, :create, :edit, :update, :destroy]
diff --git a/db/migrate/20240824060759_add_public_analytics_to_users.rb b/db/migrate/20240824060759_add_public_analytics_to_users.rb
new file mode 100644
index 0000000..a6479ae
--- /dev/null
+++ b/db/migrate/20240824060759_add_public_analytics_to_users.rb
@@ -0,0 +1,5 @@
+class AddPublicAnalyticsToUsers < ActiveRecord::Migration[7.1]
+ def change
+ add_column :users, :public_analytics, :boolean, default: false
+ end
+end
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index d8f892a..a753cb8 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.1].define(version: 2024_08_21_092726) do
+ActiveRecord::Schema[7.1].define(version: 2024_08_24_060759) do
create_table "achievement_views", force: :cascade do |t|
t.integer "achievement_id", null: false
t.integer "user_id", null: false
@@ -132,6 +132,7 @@
t.string "username"
t.string "full_name"
t.string "tags", default: "[]"
+ t.boolean "public_analytics", default: false
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
t.index ["username"], name: "index_users_on_username", unique: true
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 8183217..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-services:
- app:
- image: ghcr.io/loftwah/linkarooie:latest
- ports:
- - "80:3000"
- env_file:
- - .env
- environment:
- - RAILS_ENV=production
- - REDIS_URL=redis://redis:6379/0
- volumes:
- - ./storage:/rails/storage
- depends_on:
- - redis
- user: "1000:1000" # This assumes the rails user has UID and GID 1000
-
- redis:
- image: redis:6-alpine
- volumes:
- - redis_data:/data
-
- sidekiq:
- image: ghcr.io/loftwah/linkarooie:latest
- command: bundle exec sidekiq
- environment:
- - RAILS_ENV=production
- - REDIS_URL=redis://redis:6379/0
- volumes:
- - ./storage:/rails/storage
- depends_on:
- - redis
- user: "1000:1000" # This assumes the rails user has UID and GID 1000
-
-volumes:
- redis_data:
\ No newline at end of file
diff --git a/env.example b/env.example
new file mode 100644
index 0000000..53c430f
--- /dev/null
+++ b/env.example
@@ -0,0 +1,8 @@
+SECRET_KEY_BASE=
+AXIOM_API_KEY=
+GEOCODER_API_KEY=
+DO_TOKEN=
+SPACES_ACCESS_KEY_ID=
+SPACES_SECRET_ACCESS_KEY=
+SPACES_REGION=
+SPACES_BUCKET_NAME=
\ No newline at end of file
diff --git a/gather.sh b/gather.sh
new file mode 100755
index 0000000..894ea45
--- /dev/null
+++ b/gather.sh
@@ -0,0 +1,165 @@
+#!/bin/bash
+
+# Default output method
+output_method="stdout"
+output_content=""
+
+# Detect the operating system
+os_type="$(uname -s)"
+
+# Determine the clipboard command based on the OS
+if [[ "$os_type" == "Darwin" ]]; then
+ clipboard_command="pbcopy"
+elif [[ "$os_type" == "Linux" ]]; then
+ clipboard_command="xclip -selection clipboard"
+ # Check if xclip is installed
+ if ! command -v xclip &> /dev/null; then
+ echo "xclip is not installed. Please install it using: sudo apt install xclip"
+ exit 1
+ fi
+else
+ echo "Unsupported OS type: $os_type"
+ exit 1
+fi
+
+# Usage message
+usage() {
+ echo "Usage: $0 [-o output_method] [-f output_file]"
+ echo " -o, --output Output method: stdout, clipboard, or file (default: stdout)"
+ echo " -f, --file Output file path (required if output method is file)"
+ exit 1
+}
+
+# Parse command-line arguments
+while [[ "$1" != "" ]]; do
+ case $1 in
+ -o | --output ) shift
+ output_method=$1
+ ;;
+ -f | --file ) shift
+ output_file=$1
+ ;;
+ -h | --help ) usage
+ exit
+ ;;
+ * ) usage
+ exit 1
+ esac
+ shift
+done
+
+# Function to output content based on selected output method
+output() {
+ local content="$1"
+ output_content+="$content\n"
+}
+
+# Function to finalize output
+finalize_output() {
+ case $output_method in
+ "stdout") echo -e "$output_content" ;;
+ "clipboard") echo -e "$output_content" | $clipboard_command ;; # Use appropriate clipboard command
+ "file") echo -e "$output_content" > "$output_file" ;;
+ *) echo "Invalid output method"; exit 1 ;;
+ esac
+}
+
+# Check if file output is specified but no file is given
+if [[ $output_method == "file" && -z $output_file ]]; then
+ echo "Error: Output file must be specified when using file output method."
+ usage
+fi
+
+# Start the script output
+output "=== Directory Structure and File Contents ===\n"
+
+# Functions for tasks
+show_tree() {
+ local dir="$1"
+ output "Tree for $dir:\n"
+ output "$(tree "$dir")\n"
+}
+
+show_file_content() {
+ local file="$1"
+ output "Contents of $file:\n"
+ output "$(cat "$file")\n"
+}
+
+# Main tasks
+show_tree "app"
+show_tree "db"
+
+output "=== Contents of Ruby Files in db/ ===\n"
+for file in db/*.rb; do
+ output "File: $file\n"
+ output "$(cat "$file")\n"
+done
+
+show_tree "config"
+
+output "=== Config Files ===\n"
+show_file_content "config/database.yml"
+
+output "=== Contents of Ruby Files in config/environments/ ===\n"
+for file in config/environments/*.rb; do
+ output "File: $file\n"
+ output "$(cat "$file")\n"
+done
+
+show_file_content "config/routes.rb"
+show_file_content "config/tailwind.config.js"
+
+show_tree "terraform"
+
+output "=== Terraform Files ===\n"
+find ./terraform -type f -name "*.tf" -exec sh -c 'echo "Processing file: $1"; cat "$1"' _ {} \; | while read -r line; do output "$line\n"; done
+
+output "=== App Directory Files (Ruby and HTML ERB) ===\n"
+find ./app -type f \( -name "*.rb" -o -name "*.html.erb" \) -exec sh -c 'echo "Processing file: $1"; cat "$1"' _ {} \; | while read -r line; do output "$line\n"; done
+
+output "=== GitHub Workflow Files ===\n"
+for file in .github/workflows/*.yml; do
+ output "File: $file\n"
+ output "$(cat "$file")\n"
+done
+
+show_tree "bin"
+
+output "=== Spec Directory Files (Ruby) ===\n"
+find spec -type f -name "*.rb" -exec sh -c 'for file; do echo "$file"; cat "$file"; done' _ {} + | while read -r line; do output "$line\n"; done
+
+output "=== Public Directory (One Level Deep) ===\n"
+output "$(tree -L 1 public)\n"
+
+output "=== Rake Files in lib/tasks/ ===\n"
+for file in lib/tasks/*.rake; do
+ output "File: $file\n"
+ output "$(cat "$file")\n"
+done
+
+output "=== Other Configurations and Files ===\n"
+show_file_content "Procfile.dev"
+show_file_content "Gemfile"
+show_file_content "docker-compose.prod.yml"
+show_file_content "Dockerfile"
+show_file_content ".ruby-version"
+show_file_content "package.json"
+
+output "=== Vite Configuration Files ===\n"
+for file in vite.config.*; do
+ output "File: $file\n"
+ output "$(cat "$file")\n"
+done
+
+show_file_content ".gitignore"
+show_file_content ".dockerignore"
+
+output "=== Generated env.example from .env ===\n"
+output "$(sed 's/=.*/=/' .env)\n"
+
+# End of script
+output "=== End of Output ===\n"
+
+# Finalize output
+finalize_output
diff --git a/public/uploads/og_images/loftwah_og.png b/public/uploads/og_images/loftwah_og.png
index 1f3f07f..390f383 100644
Binary files a/public/uploads/og_images/loftwah_og.png and b/public/uploads/og_images/loftwah_og.png differ
diff --git a/spec/controllers/analytics_controller_spec.rb b/spec/controllers/analytics_controller_spec.rb
index cb1418a..9e94515 100644
--- a/spec/controllers/analytics_controller_spec.rb
+++ b/spec/controllers/analytics_controller_spec.rb
@@ -1,4 +1,3 @@
-# spec/controllers/analytics_controller_spec.rb
require 'rails_helper'
RSpec.describe AnalyticsController, type: :controller do
@@ -11,12 +10,14 @@
describe "GET #index" do
it "returns a success response" do
- get :index
+ get :index, params: { username: user.username }
expect(response).to be_successful
end
- it "assigns the correct instance variables" do
- get :index
+ it "sets the correct instance variables" do
+ get :index, params: { username: user.username }
+
+ expect(controller.instance_variable_get(:@user)).to eq(user)
expect(controller.instance_variable_get(:@total_page_views)).to be_a(Integer)
expect(controller.instance_variable_get(:@total_link_clicks)).to be_a(Integer)
expect(controller.instance_variable_get(:@total_achievement_views)).to be_a(Integer)
@@ -27,5 +28,20 @@
expect(controller.instance_variable_get(:@daily_views)).to be_a(Hash)
expect(controller.instance_variable_get(:@browser_data)).to be_a(Hash)
end
+
+ context "when viewing another user's analytics" do
+ let(:other_user) { create(:user, public_analytics: true) }
+
+ it "allows viewing public analytics" do
+ get :index, params: { username: other_user.username }
+ expect(response).to be_successful
+ end
+
+ it "redirects when trying to view private analytics" do
+ other_user.update(public_analytics: false)
+ get :index, params: { username: other_user.username }
+ expect(response).to redirect_to(root_path)
+ end
+ end
end
-end
+end
\ No newline at end of file
diff --git a/spec/requests/analytics_spec.rb b/spec/requests/analytics_spec.rb
index f68a122..12b09b6 100644
--- a/spec/requests/analytics_spec.rb
+++ b/spec/requests/analytics_spec.rb
@@ -1,7 +1,7 @@
require 'rails_helper'
RSpec.describe 'Analytics', type: :request do
- describe 'GET /index' do
+ describe 'GET /:username/analytics' do
let(:user) { create(:user) }
before do
@@ -9,9 +9,28 @@
end
it 'returns http success' do
- get analytics_path
- puts response.body # Add this line to print the response body in case of an error
+ get user_analytics_path(username: user.username)
expect(response).to have_http_status(:success)
end
+
+ it 'renders the correct content' do
+ get user_analytics_path(username: user.username)
+ expect(response.body).to include('Analytics') # Adjust this to match your actual content
+ end
+
+ context "when viewing another user's analytics" do
+ let(:other_user) { create(:user, public_analytics: true) }
+
+ it "allows viewing public analytics" do
+ get user_analytics_path(username: other_user.username)
+ expect(response).to have_http_status(:success)
+ end
+
+ it "redirects when trying to view private analytics" do
+ other_user.update(public_analytics: false)
+ get user_analytics_path(username: other_user.username)
+ expect(response).to redirect_to(root_path)
+ end
+ end
end
-end
+end
\ No newline at end of file
diff --git a/stop_processes.sh b/stop_processes.sh
new file mode 100755
index 0000000..cb80519
--- /dev/null
+++ b/stop_processes.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Function to stop a process by its name or port
+stop_process() {
+ local NAME=$1
+ local PID_COMMAND=$2
+ local PID=$($PID_COMMAND)
+
+ if [ -n "$PID" ]; then
+ kill -9 $PID
+ echo "Stopped $NAME process."
+ else
+ echo "No $NAME process running."
+ fi
+}
+
+# Stop Rails server running on port 3000
+PORT=3000
+stop_process "Rails server on port $PORT" "lsof -i tcp:$PORT -t"
+
+# Stop any running Sidekiq processes
+stop_process "Sidekiq" "pgrep -f sidekiq"
+
+# Stop any running Vite processes
+stop_process "Vite" "pgrep -f vite"
+
+echo "All specified processes have been checked and stopped if running."
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
deleted file mode 100644
index d19212a..0000000
--- a/test/application_system_test_case.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require "test_helper"
-
-class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
- driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
-end
diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb
deleted file mode 100644
index 6340bf9..0000000
--- a/test/channels/application_cable/connection_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "test_helper"
-
-module ApplicationCable
- class ConnectionTest < ActionCable::Connection::TestCase
- # test "connects with cookies" do
- # cookies.signed[:user_id] = 42
- #
- # connect
- #
- # assert_equal connection.user_id, "42"
- # end
- end
-end
diff --git a/test/controllers/.keep b/test/controllers/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/controllers/links_controller_test.rb b/test/controllers/links_controller_test.rb
deleted file mode 100644
index 159a290..0000000
--- a/test/controllers/links_controller_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class LinksControllerTest < ActionDispatch::IntegrationTest
- # test "the truth" do
- # assert true
- # end
-end
diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/fixtures/links.yml b/test/fixtures/links.yml
deleted file mode 100644
index 79bbba3..0000000
--- a/test/fixtures/links.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
- title: MyString
- url: MyString
- user: one
-
-two:
- title: MyString
- url: MyString
- user: two
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
deleted file mode 100644
index d7a3329..0000000
--- a/test/fixtures/users.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-# This model initially had no columns defined. If you add columns to the
-# model remove the "{}" from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-# column: value
diff --git a/test/helpers/.keep b/test/helpers/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/integration/.keep b/test/integration/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/mailers/.keep b/test/mailers/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/models/.keep b/test/models/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/models/link_test.rb b/test/models/link_test.rb
deleted file mode 100644
index c4a0f6e..0000000
--- a/test/models/link_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class LinkTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
deleted file mode 100644
index 5c07f49..0000000
--- a/test/models/user_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class UserTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end
diff --git a/test/system/.keep b/test/system/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/test_helper.rb b/test/test_helper.rb
deleted file mode 100644
index 0c22470..0000000
--- a/test/test_helper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-ENV["RAILS_ENV"] ||= "test"
-require_relative "../config/environment"
-require "rails/test_help"
-
-module ActiveSupport
- class TestCase
- # Run tests in parallel with specified workers
- parallelize(workers: :number_of_processors)
-
- # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
- fixtures :all
-
- # Add more helper methods to be used by all tests here...
- end
-end