hey

app/__init__.py

@@ -1,7 +1,7 @@
-from flask import Flask
+from flask import Flask, redirect, url_for
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
-from flask_login import LoginManager
+from flask_login import LoginManager, current_user
 from celery import Celery
 from config import Config
 import redis
@@ -93,7 +93,7 @@ def create_app(config_class=Config):
     try:
         logger.info("Importing and registering dashboard blueprint...")
         from .routes.dashboard import dashboard_bp
-        app.register_blueprint(dashboard_bp)
+        app.register_blueprint(dashboard_bp, url_prefix='/dashboard')
         logger.info("Dashboard blueprint registered successfully")
     except Exception as e:
         logger.error(f"Error registering dashboard blueprint: {e}")
@@ -141,7 +141,14 @@ def create_app(config_class=Config):
     # Add a simple route directly to the app
     @app.route('/')
     def index():
-        return 'Application is running! Try /test for the test endpoint.'
+        if current_user.is_authenticated:
+            try:
+                return redirect(url_for('dashboard.index'))
+            except:
+                # Fallback to facebook_ads if dashboard is not available
+                return redirect(url_for('facebook_ads.index'))
+        else:
+            return redirect(url_for('auth.login'))
     
     logger.info("Application initialization complete")
     return app

app/models/__init__.py

@@ -5,6 +5,7 @@ from app import db
 from datetime import datetime
 from flask_login import UserMixin
 from werkzeug.security import generate_password_hash, check_password_hash
+from .facebook_ad import FacebookAd
 
 class User(UserMixin, db.Model):
     id = db.Column(db.Integer, primary_key=True)

app/models/facebook_ad.py

@@ -6,6 +6,8 @@ import json
 class FacebookAd(db.Model):
     """Model for storing Facebook ads data."""
     
+    __tablename__ = 'facebook_ads'
+    
     id = db.Column(db.Integer, primary_key=True)
     ad_id = db.Column(db.String(255), index=True, unique=True)
     advertiser = db.Column(db.String(255), index=True)
@@ -46,8 +48,6 @@ class FacebookAd(db.Model):
         else:
             self.image_urls_json = json.dumps(value)
     
-    image_urls = property(get_image_urls, set_image_urls)
-    
     def get_links(self):
         """Get links as a list."""
         if not self.links_json:
@@ -64,8 +64,6 @@ class FacebookAd(db.Model):
         else:
             self.links_json = json.dumps(value)
     
-    links = property(get_links, set_links)
-    
     def get_metadata(self):
         """Get metadata as a dictionary."""
         if not self.metadata_json:
@@ -82,8 +80,6 @@ class FacebookAd(db.Model):
         else:
             self.metadata_json = json.dumps(value)
     
-    metadata = property(get_metadata, set_metadata)
-    
     def get_topics(self):
         """Get topics as a list."""
         if not self.topics_json:
@@ -100,8 +96,6 @@ class FacebookAd(db.Model):
         else:
             self.topics_json = json.dumps(value)
     
-    topics = property(get_topics, set_topics)
-    
     def get_entities(self):
         """Get entities as a list of dictionaries."""
         if not self.entities_json:
@@ -118,8 +112,6 @@ class FacebookAd(db.Model):
         else:
             self.entities_json = json.dumps(value)
     
-    entities = property(get_entities, set_entities)
-    
     @classmethod
     def from_scraper_data(cls, data, user_id=None):
         """Create a FacebookAd instance from scraper data."""
@@ -142,20 +134,6 @@ class FacebookAd(db.Model):
         
         return ad
     
-    def get_image_urls_limited(self, limit=None):
-        """Get image URLs, optionally limited to a specific number."""
-        urls = self.get_image_urls()
-        if limit and len(urls) > limit:
-            return urls[:limit]
-        return urls
-    
-    def get_links_limited(self, limit=None):
-        """Get links, optionally limited to a specific number."""
-        links = self.get_links()
-        if limit and len(links) > limit:
-            return links[:limit]
-        return links
-    
     def to_dict(self):
         """Convert the ad to a dictionary for API responses."""
         return {
@@ -171,4 +149,4 @@ class FacebookAd(db.Model):
             'topics': self.get_topics(),
             'created_at': self.created_at.isoformat() if self.created_at else None,
             'updated_at': self.updated_at.isoformat() if self.updated_at else None
-        } 
+        }

app/routes/dashboard.py

@@ -1,7 +1,6 @@
 from flask import Blueprint, render_template, request
 from flask_login import login_required
-from ..models import Ad
-from ..services.ai_processor import AIPipeline
+from ..models import FacebookAd
 
 dashboard_bp = Blueprint('dashboard', __name__)
 
@@ -11,11 +10,16 @@ def index():
     page = request.args.get('page', 1, type=int)
     per_page = 10
     query = request.args.get('query', '')
-    sentiment_filter = request.args.get('sentiment', '')
     
-    ads = Ad.query.filter(
-        Ad.content.contains(query),
-        Ad.sentiment.contains(sentiment_filter)
-    ).paginate(page=page, per_page=per_page)
+    # Use FacebookAd model with correct filter
+    if query:
+        ads = FacebookAd.query.filter(
+            FacebookAd.content.contains(query)
+        ).paginate(page=page, per_page=per_page)
+    else:
+        ads = FacebookAd.query.paginate(page=page, per_page=per_page)
     
-    return render_template('dashboard.html', ads=ads, query=query, sentiment_filter=sentiment_filter)
+    return render_template('dashboard/index.html', 
+                         ads=ads, 
+                         query=query,
+                         title="Dashboard")

app/templates/base.html

@@ -21,11 +21,13 @@
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav me-auto">
                     {% if current_user.is_authenticated %}
+                        {# Temporarily disabled until Google Ads blueprint is fixed
                         <li class="nav-item">
                             <a class="nav-link" href="{{ url_for('google_ads.dashboard') }}">
                                 <i class="fab fa-google"></i> Google Ads
                             </a>
                         </li>
+                        #}
                         <li class="nav-item">
                             <a class="nav-link" href="{{ url_for('facebook_ads.index') }}">
                                 <i class="fab fa-facebook"></i> Facebook Ads

app/templates/dashboard/index.html

@@ -0,0 +1,69 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container mt-4">
+    <h1>{{ title }}</h1>
+    
+    <!-- Search Form -->
+    <form method="GET" action="{{ url_for('dashboard.index') }}" class="mb-4">
+        <div class="input-group">
+            <input type="text" class="form-control" name="query" value="{{ query }}" placeholder="Search ads...">
+            <button type="submit" class="btn btn-primary">Search</button>
+        </div>
+    </form>
+
+    <!-- Ads List -->
+    <div class="row">
+        {% if ads.items %}
+            {% for ad in ads.items %}
+            <div class="col-md-6 mb-4">
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title">Ad #{{ ad.id }}</h5>
+                        <p class="card-text">{{ ad.content[:200] }}...</p>
+                        <div class="mt-2">
+                            <a href="{{ url_for('facebook_ads.ad_detail', ad_id=ad.id) }}" class="btn btn-sm btn-primary">View Details</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {% endfor %}
+        {% else %}
+            <div class="col-12">
+                <div class="alert alert-info">
+                    No ads found. Try a different search query.
+                </div>
+            </div>
+        {% endif %}
+    </div>
+
+    <!-- Pagination -->
+    {% if ads.pages > 1 %}
+    <nav aria-label="Page navigation" class="mt-4">
+        <ul class="pagination justify-content-center">
+            {% if ads.has_prev %}
+            <li class="page-item">
+                <a class="page-link" href="{{ url_for('dashboard.index', page=ads.prev_num, query=query) }}">Previous</a>
+            </li>
+            {% endif %}
+
+            {% for page_num in ads.iter_pages(left_edge=2, left_current=2, right_current=3, right_edge=2) %}
+                {% if page_num %}
+                    <li class="page-item {% if page_num == ads.page %}active{% endif %}">
+                        <a class="page-link" href="{{ url_for('dashboard.index', page=page_num, query=query) }}">{{ page_num }}</a>
+                    </li>
+                {% else %}
+                    <li class="page-item disabled"><span class="page-link">...</span></li>
+                {% endif %}
+            {% endfor %}
+
+            {% if ads.has_next %}
+            <li class="page-item">
+                <a class="page-link" href="{{ url_for('dashboard.index', page=ads.next_num, query=query) }}">Next</a>
+            </li>
+            {% endif %}
+        </ul>
+    </nav>
+    {% endif %}
+</div>
+{% endblock %} 

requirements.txt

@@ -14,7 +14,7 @@ requests==2.31.0
 beautifulsoup4==4.12.3
 selenium==4.17.2
 transformers==4.37.2
-torch==2.1.2
+torch==2.2.2
 textblob==0.17.1
 spacy==3.7.2
 en-core-web-sm @ https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.7.1/en_core_web_sm-3.7.1-py3-none-any.whl