From 9f4d3809508c8f275add8c7e501ae91b98ddb1ab Mon Sep 17 00:00:00 2001 From: ComputerTech312 Date: Mon, 14 Oct 2024 00:25:06 +0100 Subject: [PATCH] Fixed some things --- app.py | 68 +++++++++++++++++----------- templates/search.html | 101 +++++++++++++++++++++--------------------- 2 files changed, 93 insertions(+), 76 deletions(-) diff --git a/app.py b/app.py index 682a2a5..71bb9b9 100644 --- a/app.py +++ b/app.py @@ -96,45 +96,47 @@ def vote(id, action): else: vote_data = {} - # If the user has already voted, check for undoing or switching vote - if str(id) in vote_data: + # If no prior vote, apply the new vote + if str(id) not in vote_data: + if action == 'upvote': + quote.votes += 1 + vote_data[str(id)] = 'upvote' + elif action == 'downvote': + quote.votes -= 1 + vote_data[str(id)] = 'downvote' + flash("Thank you for voting!", 'success') + + else: previous_action = vote_data[str(id)] - + if previous_action == action: - # Undo the vote + # If the user clicks the same action again, undo the vote if action == 'upvote': quote.votes -= 1 elif action == 'downvote': quote.votes += 1 - del vote_data[str(id)] # Remove vote from record + del vote_data[str(id)] # Remove the vote record (undo) flash("Your vote has been undone.", 'success') else: - # Switching from upvote to downvote or vice versa - if action == 'upvote': - quote.votes += 2 # From downvote to upvote, effectively +2 - elif action == 'downvote': - quote.votes -= 2 # From upvote to downvote, effectively -2 - vote_data[str(id)] = action # Update vote action + # If the user switches votes (upvote -> downvote or vice versa) + if previous_action == 'upvote' and action == 'downvote': + quote.votes -= 2 # Undo upvote (+1) and apply downvote (-1) + vote_data[str(id)] = 'downvote' + elif previous_action == 'downvote' and action == 'upvote': + quote.votes += 2 # Undo downvote (-1) and apply upvote (+1) + vote_data[str(id)] = 'upvote' flash("Your vote has been changed.", 'success') - else: - # First-time voting on this quote (starting from neutral) - if action == 'upvote': - quote.votes += 1 # Add +1 vote - elif action == 'downvote': - quote.votes -= 1 # Subtract -1 vote - vote_data[str(id)] = action # Store vote action - flash("Thank you for voting!", 'success') # Save the updated vote data to the cookie try: db.session.commit() page = request.args.get('page', 1) resp = make_response(redirect(url_for('browse', page=page))) - resp.set_cookie('votes', json.dumps(vote_data), max_age=60*60*24*365) # Cookie for 1 year + resp.set_cookie('votes', json.dumps(vote_data), max_age=60*60*24*365) # Store vote history in cookies for 1 year return resp except Exception as e: db.session.rollback() - flash(f"Error voting on quote: {e}", 'error') + flash(f"Error while voting: {e}", 'error') return redirect(url_for('browse', page=page)) # Route for displaying a random quote @@ -247,20 +249,36 @@ def delete_quote(quote_id): @app.route('/search', methods=['GET']) def search(): - query = request.args.get('q', '').strip() # Get the search query and trim whitespace + query = request.args.get('q', '').strip() # Get the search query quotes = [] - # Query the counts of approved and pending quotes + # Query counts of approved and pending quotes approved_count = Quote.query.filter_by(status=1).count() pending_count = Quote.query.filter_by(status=0).count() if query: - # Perform the search only if the query is provided + # Perform text search in quotes quotes = Quote.query.filter(Quote.text.like(f'%{query}%'), Quote.status == 1).all() - # Render the search page with the results, counts, and search query return render_template('search.html', quotes=quotes, query=query, approved_count=approved_count, pending_count=pending_count) +@app.route('/read', methods=['GET']) +def read_quote(): + quote_id = request.args.get('id', type=int) # Get the quote number + + if not quote_id: + flash("Quote number is required.", 'error') + return redirect(url_for('search')) + + # Find the quote by ID (only approved quotes) + quote = Quote.query.filter_by(id=quote_id, status=1).first() + + if quote: + return render_template('quote.html', quote=quote) + else: + flash(f"No quote found with ID {quote_id}", 'error') + return redirect(url_for('search')) + # Route for browsing approved quotes @app.route('/browse', methods=['GET']) def browse(): diff --git a/templates/search.html b/templates/search.html index 6fdc565..5eb44b5 100644 --- a/templates/search.html +++ b/templates/search.html @@ -3,12 +3,12 @@ - ircquotes: Search + ircquotes: Search & Read - + - +
@@ -16,85 +16,84 @@ ircquotes
- Search Quotes + Search & Read Quotes
+
- + +
-
Home / Random / Submit / Browse / ModApp / - Search + Search / FAQ
- +
-

Search for Quotes

-
- - -
+
+ +

Search for Quotes by Keyword

+
+ + +
- - {% if query %} -

Search Results for "{{ query }}"

+ +

Read a Quote by Number

+
+ + +
+
- {% if quotes %} - - - - -
- {% for quote in quotes %} -

- - #{{ quote.id }} - - + - ({{ quote.votes }}) - - -

-

{{ quote.text }}

-
- {% endfor %} -
- {% else %} -

No quotes found for "{{ query }}".

+ +
+ {% if query %} +

Search Results for "{{ query }}"

+ {% if quotes %} + + + + +
+ {% for quote in quotes %} +

+ + #{{ quote.id }} + + + + ({{ quote.votes }}) + - +

+

{{ quote.text }}

+
+ {% endfor %} +
+ {% else %} +

No quotes found for "{{ query }}".

+ {% endif %} {% endif %} - {% endif %} +
- - - -
- Home / - Random / - Submit / - Browse / - ModApp / - Search - FAQ -
  {{ approved_count }} quotes approved; {{ pending_count }} quotes pending
- © ircquotes 2024, All Rights Reserved.