From 3a40026cf851f92979c6c06dcc1e76ab74787623 Mon Sep 17 00:00:00 2001 From: Cailean Finn Date: Wed, 26 Jun 2024 19:54:16 +0100 Subject: [PATCH] routes sorted --- app.py | 32 +++++++++++++++++++++++++++++++- public/css/styles.css | 1 + templates/article.html | 19 +++++++++++++++++++ templates/list.html | 2 +- 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 templates/article.html diff --git a/app.py b/app.py index 4481ee2..1f04f75 100644 --- a/app.py +++ b/app.py @@ -31,10 +31,41 @@ def exhibitions(): def conference(): return render_template('list.html', title='Conferences') +@app.route('//') +def event_article(type, title): + data = get_content_by_title(title, type) + print(data) + return render_template('article.html', title=title) + + def get_all_content(type): content_list = [] entries = client.entries({'content_type': type}) for entry in entries: + + date_time_obj = getattr(entry, f'{type}_date_time') + date_str, time_str = format_datetime(date_time_obj) + end_time_str = getattr(entry, f'{type}_end_date_time') + end_time_str = end_time_str.strftime('%I%p').upper().lstrip('0') + content = { + 'title': getattr(entry, f'title_of_{type}'), + 'information': getattr(entry, f'{type}_information'), + 'image': 'https:{0}'.format(getattr(entry, f'{type}_reference_image').url()), + 'artists': getattr(entry, f'{type}_artists'), + 'date': date_str, + 'time': time_str, + 'end_time': end_time_str, + 'location': getattr(entry, f'{type}_location') + } + content_list.append(content) + return content_list + +def get_content_by_title(title, pre_type): + content_list = [] + type = pre_type[:-1] + entries = client.entries({'query': title, 'limit': 1}) + for entry in entries: + date_time_obj = getattr(entry, f'{type}_date_time') date_str, time_str = format_datetime(date_time_obj) end_time_str = getattr(entry, f'{type}_end_date_time') @@ -50,7 +81,6 @@ def get_all_content(type): 'location': getattr(entry, f'{type}_location') } content_list.append(content) - print(content_list) return content_list def format_datetime(dt): diff --git a/public/css/styles.css b/public/css/styles.css index f7de759..724007b 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -86,6 +86,7 @@ hr { padding-right: 50px; overflow-y: scroll; box-sizing: border-box; /* Include padding in the height calculation */ + flex: 1; } #main-text { diff --git a/templates/article.html b/templates/article.html new file mode 100644 index 0000000..2465119 --- /dev/null +++ b/templates/article.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} + +{% block title %}{{ title }}{% endblock %} + +{% block content %} +<div id="main-wrapper"> + {% include '_nav.html' %} + <div id="main-container"> + <div id="article-container"> + + </div> + </div> + <hr> + <div id="page-header"> + <div>/{{ title }}</div> + </div> +</div> +<div id="container"></div> +{% endblock content %} \ No newline at end of file diff --git a/templates/list.html b/templates/list.html index 0fb7996..f9319ef 100644 --- a/templates/list.html +++ b/templates/list.html @@ -12,7 +12,7 @@ <div id="main-container"> <div id="list-container"> {% for event in content %} - <a href='/'> + <a href='/{{ title.lower() }}/{{ event.title }}'> <div class="list"> <div class="list-image"> <img src="{{ event.image }}" alt="{{ event.title }}">