diff --git a/core/lib/opensearch.py b/core/lib/opensearch.py index 41b91df..3df8c27 100644 --- a/core/lib/opensearch.py +++ b/core/lib/opensearch.py @@ -21,21 +21,23 @@ def initialise_opensearch(): return client -def construct_query(query): +def construct_query(query, fields): + if not fields: + fields = settings.OPENSEARCH_MAIN_SEARCH_FIELDS query = { "size": 5, "query": { "multi_match": { "query": query, - "fields": settings.OPENSEARCH_MAIN_SEARCH_FIELDS, + "fields": fields, } }, } return query -def run_main_query(client, query): - search_query = construct_query(query) +def run_main_query(client, query, fields=None): + search_query = construct_query(query, fields) # fmt: off response = client.search(body=search_query, index=settings.OPENSEARCH_INDEX_MAIN) diff --git a/core/static/logo.svg b/core/static/logo.svg index a0a738f..247dba5 100644 --- a/core/static/logo.svg +++ b/core/static/logo.svg @@ -1,98 +1,9 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - + + + + + + + diff --git a/core/templates/base.html b/core/templates/base.html index d41856c..836da65 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -5,56 +5,108 @@ - Pathogen - {{ request.path_info }} - - - + + + -
-
-
+ +
+
+
+ {% if not user.is_authenticated %} + + Sign up + + + Log in + + {% endif %} + + {% if user.is_authenticated %} + Logout + {% endif %} + +
- -
-
-
- {% block content %} - {% endblock %}
+ +
+
+ {% block content %} + {% endblock %} +
- diff --git a/core/templates/billing.html b/core/templates/billing.html index 2742381..29789af 100644 --- a/core/templates/billing.html +++ b/core/templates/billing.html @@ -1,57 +1,36 @@ {% extends "base.html" %} {% block content %} -

Billing/Plan Management

-
-
-
- -
-
- Products -
-
-
    -
  • - {{ user.first_name }} - First name -
    • -
  • - {{ user.last_name }} - Last name -
    • -
  • - {% for plan in user.plans.all %} - {{ plan.name }} - {% endfor %} - Plans -
    • -
  • - {{ user.paid }} - Paid -
    • -
  • - {{ user.last_payment }} - Last payment -
    • -
-
- -
-
-
- -
-
- Available plans -
-
- {% include "partials/product-list.html" %} -
-
- - -
-
-
+
+

+ User information +

+ + + + + {{ user.first_name }} {{ user.last_name }} + + + + + + {% for plan in user.plans.all %} + {{ plan.name }} + {% endfor %} + + + + + + {{ user.last_payment }} + + + + + + Subscription management + +
+ {% include "partials/product-list.html" %} {% endblock %} diff --git a/core/templates/partials/product-list.html b/core/templates/partials/product-list.html index 1201d3e..ff46ed4 100644 --- a/core/templates/partials/product-list.html +++ b/core/templates/partials/product-list.html @@ -1,50 +1,52 @@ {% load static %} {% for plan in plans %} - {% if plan not in user_plans %} - + + {% if plan in user_plans %} +
+ {% else %} +
{% endif %} -
- Data image -
-

{{ plan.description }}

-
£{{ plan.cost }}
- {% if plan in user_plans %} -
(purchased)
- {% endif %} -
+
- {% if plan not in user_plans %} - - {% endif %} - {% endfor %} - + diff --git a/core/templates/registration/login.html b/core/templates/registration/login.html index b722cee..8bde98d 100644 --- a/core/templates/registration/login.html +++ b/core/templates/registration/login.html @@ -3,29 +3,23 @@ {% load crispy_forms_tags %} {% block content %} -
-
-
-
-
-

Please sign in

-
-
- -
-
- {% csrf_token %} - {{ form|crispy }} - - -
-

Don't have an account? Register here

-
-
+
+
+
+
+
+ + {% csrf_token %} + {{ form|crispy }} +
+ +
-
+
{% endblock %} diff --git a/core/templates/registration/signup.html b/core/templates/registration/signup.html index 2ecfc02..7beef31 100644 --- a/core/templates/registration/signup.html +++ b/core/templates/registration/signup.html @@ -3,25 +3,23 @@ {% load crispy_forms_tags %} {% block content %} -
-
-
-
-
-

Sign up

-
-
- -
-
- {% csrf_token %} - {{ form|crispy }} - -
+
+
+
+
+
+ + {% csrf_token %} + {{ form|crispy }} +
+ +
-
+ {% endblock %} diff --git a/core/templates/ui/drilldown.html b/core/templates/ui/drilldown.html index 8967696..5e35a9c 100644 --- a/core/templates/ui/drilldown.html +++ b/core/templates/ui/drilldown.html @@ -1,59 +1,142 @@ {% extends "base.html" %} {% load static %} {% block content %} -

Welcome to search, {{ user.first_name }}!

- -
-
-
-
- {% csrf_token %} -
- -
- +
+ +
+
+

+ {% csrf_token %} + + + + +

+
+ +
+
+
+
+
+ +
+
- -
-
- {% if results is not None %} -
-
-
-
Results for {{ query }}
-
- - - - - - - - - - - - {% for item in results %} - - - - - - - - - {% endfor %} -
TSmsghostnickchannelnet
{{ item.ts }}{{ item.msg }}{{ item.host }}{{ item.nick }}{{ item.channel }}{{ item.net }}
+
+
+
+
+
+ +
-
- {% endif %} +
+ +
+
+
+ +
+
+
+
+ + +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+
+ +
+ +
+ + {% if results is not None %} + + + + + + + + + + + {% endif %} + + + {% for item in results %} + + + + + + + + + {% endfor %} + +
TSmsghostnickchannelnet
{{ item.ts }}{{ item.msg }}{{ item.host }}{{ item.nick }}{{ item.channel }}{{ item.net }}
+
+

{{ card }} hits

{% endblock %} diff --git a/core/ui/views/drilldown.py b/core/ui/views/drilldown.py index 43801ce..530be1d 100644 --- a/core/ui/views/drilldown.py +++ b/core/ui/views/drilldown.py @@ -1,3 +1,6 @@ +import pprint + +from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.shortcuts import render from django.views import View @@ -5,6 +8,7 @@ from django.views import View from core.lib.opensearch import initialise_opensearch, run_main_query client = initialise_opensearch() +pp = pprint.PrettyPrinter(indent=4) class Drilldown(LoginRequiredMixin, View): @@ -19,14 +23,26 @@ class Drilldown(LoginRequiredMixin, View): def post(self, request): if not request.user.has_plan(self.plan_name): return render(request, "denied.html") + fields = None + if "fields" in request.POST: + fields = request.POST["fields"] + print("FIELD", fields) if "query" in request.POST: query = request.POST["query"] - results = run_main_query(client, query) + # field = results.POST["field"] + # print("FIELD ", field) + results = run_main_query(client, query, fields) + pp.pprint(results) results_parsed = [] if "hits" in results.keys(): if "hits" in results["hits"]: for item in results["hits"]["hits"]: results_parsed.append(item["_source"]) - context = {"query": query, "results": results_parsed} + context = { + "query": query, + "results": results_parsed, + "card": results["hits"]["total"]["value"], + "fields": settings.OPENSEARCH_MAIN_SEARCH_FIELDS, + } return render(request, self.template_name, context) return render(request, self.template_name) diff --git a/core/views.py b/core/views.py index cb3e573..c7caa77 100644 --- a/core/views.py +++ b/core/views.py @@ -39,13 +39,14 @@ class Billing(LoginRequiredMixin, View): class Order(LoginRequiredMixin, View): - def get(self, request, product_id): + def get(self, request, plan_name): + plan = Plan.objects.get(name=plan_name) try: session = stripe.checkout.Session.create( payment_method_types=settings.ALLOWED_PAYMENT_METHODS, mode="subscription", customer=request.user.stripe_id, - line_items=assemble_plan_map(product_id_filter=product_id), + line_items=assemble_plan_map(product_id_filter=plan.product_id), success_url=request.build_absolute_uri(reverse("success")), cancel_url=request.build_absolute_uri(reverse("cancel")), )