Add sort modes

app.py

@@ -158,6 +158,7 @@ def about():

                                
                                
                                
                            
                                
                                    
                                        
                                            158  
                                            @app.route("/search")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            159  
                                            def search():
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            160  
                                                query = flask.request.args.get("q")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        161 +
                                            sorting = flask.request.args.get("sort", "default")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            162  
                                                page_number = flask.request.args.get("page", 1, type=int)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            163  
                                                if flask.session.get("username"):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            164  
                                                    default_page_length = db.session.get(User, flask.session.get("username")).default_page_length
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -165,8 +166,18 @@ def search():

                                
                                
                                
                            
                                
                                    
                                        
                                            166  
                                                    default_page_length = 16
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            167  
                                                page_length = flask.request.args.get("per_page", default_page_length, type=int)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            168  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        168 -
                                            results = Repo.query.filter(Repo.name.ilike(f"%{query}%")).filter_by(visibility=2).paginate(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        169 -
                                                    page=page_number, per_page=page_length)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        169 +
                                            results = Repo.query.filter(Repo.name.ilike(f"%{query}%")).filter_by(visibility=2)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        170 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        171 +
                                            match sorting:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        172 +
                                                case "popularity":
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        173 +
                                                    results = results.outerjoin(RepoFavourite).group_by(Repo.route).order_by(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        174 +
                                                                db.func.count(RepoFavourite.id).desc())
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        175 +
                                                case "newest":
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        176 +
                                                    results = results.order_by(Repo.creation_date.desc())
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        177 +
                                                case "oldest":
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        178 +
                                                    results = results.order_by(Repo.creation_date)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        179 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        180 +
                                            results = results.paginate(page=page_number, per_page=page_length)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            181  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            182  
                                                if results.has_next:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            183  
                                                    next_page = results.next_num
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -189,6 +200,7 @@ def search():

                                
                                
                                
                            
                                
                                    
                                        
                                            200  
                                            @app.route("/user-search")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            201  
                                            def user_search():
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            202  
                                                query = flask.request.args.get("q")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        203 +
                                            sorting = flask.request.args.get("sort", "default")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            204  
                                                page_number = flask.request.args.get("page", 1, type=int)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            205  
                                                if flask.session.get("username"):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            206  
                                                    default_page_length = db.session.get(User, flask.session.get("username")).default_page_length
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -196,8 +208,18 @@ def user_search():

                                
                                
                                
                            
                                
                                    
                                        
                                            208  
                                                    default_page_length = 16
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            209  
                                                page_length = flask.request.args.get("per_page", default_page_length, type=int)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            210  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        199 -
                                            results = User.query.filter(User.username.ilike(f"%{query}%")).paginate(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        200 -
                                                    page=page_number, per_page=page_length)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        211 +
                                            results = User.query.filter(User.username.ilike(f"%{query}%"))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        212 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        213 +
                                            match sorting:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        214 +
                                                case "popularity":
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        215 +
                                                    results = results.outerjoin(UserFollow, User.username == UserFollow.followed_username).group_by(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        216 +
                                                            User.username).order_by(db.func.count(UserFollow.id).desc())
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        217 +
                                                case "newest":
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        218 +
                                                    results = results.order_by(User.creation_date.desc())
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        219 +
                                                case "oldest":
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        220 +
                                                    results = results.order_by(User.creation_date)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        221 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        222 +
                                            results = results.paginate(page=page_number, per_page=page_length)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            223  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            224  
                                                if results.has_next:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            225  
                                                    next_page = results.next_num
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/home.html

@@ -14,10 +14,22 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            14  
                                                    <h2>{% trans %}Search{% endtrans %}</h2>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            15  
                                                    <form action="/search" method="get" role="search" class="buttonbox">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            16  
                                                        <input type="text" name="q" placeholder="{% trans %}Search repositories...{% endtrans %}" aria-label="{% trans %}Repository search{% endtrans %}">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        17 +
                                                    <select name="sort" aria-label="{% trans %}Sort by{% endtrans %}">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        18 +
                                                        <option value="default" selected>{% trans %}Default{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        19 +
                                                        <option value="popularity">{% trans %}Popularity{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        20 +
                                                        <option value="newest">{% trans %}Newest{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        21 +
                                                        <option value="oldest">{% trans %}Oldest{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        22 +
                                                    </select>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            23  
                                                        <button type="submit">{% trans %}Search{% endtrans %}</button>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            24  
                                                    </form>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            25  
                                                    <form action="/user-search" method="get" role="search" class="buttonbox">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            26  
                                                        <input type="text" name="q" placeholder="{% trans %}Search users...{% endtrans %}" aria-label="{% trans %}User search{% endtrans %}">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        27 +
                                                    <select name="sort" aria-label="{% trans %}Sort by{% endtrans %}">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        28 +
                                                        <option value="default" selected>{% trans %}Default{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        29 +
                                                        <option value="popularity">{% trans %}Popularity{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        30 +
                                                        <option value="newest">{% trans %}Recently registered{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        31 +
                                                        <option value="oldest">{% trans %}Oldest{% endtrans %}</option>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        32 +
                                                    </select>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            33  
                                                        <button type="submit">{% trans %}Search{% endtrans %}</button>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            34  
                                                    </form>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            35  
                                                </x-frame>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/user-profile.html

@@ -38,12 +38,14 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            38  
                                                    <form action="?action=follow" method="POST">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            39  
                                                        <button type="submit">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            40  
                                                            {% if relationship %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        41 -
                                                            {% trans %}Stop following{% endtrans %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        41 +
                                                            {% trans counter=user.followers|length %}Stop following ({{ counter }}){% endtrans %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            42  
                                                            {% else %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        43 -
                                                            {% trans %}Follow{% endtrans %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        43 +
                                                            {% trans counter=user.followers|length %}Follow ({{ counter }}){% endtrans %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            44  
                                                            {% endif %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            45  
                                                        </button>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            46  
                                                    </form>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        47 +
                                            {% else %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        48 +
                                                {% trans counter=user.followers|length %}{{ counter }} followers{% endtrans %}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            49  
                                                {% endif %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            50  
                                            {% endblock %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            51