diff --git a/README.md b/README.md new file mode 100644 index 0000000..6d599b9 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +˗ˏˋ ★ ˎˊ˗ \ No newline at end of file diff --git a/app.py b/app.py index d96c44f..e00e400 100644 --- a/app.py +++ b/app.py @@ -2,6 +2,7 @@ from flask import Flask, render_template import contentful from dotenv import load_dotenv import os +import markdown load_dotenv() @@ -86,7 +87,7 @@ def process_content(entries, type): content = { 'title': getattr(entry, f'title_of_{type}'), - 'information': getattr(entry, f'{type}_information'), + 'information': markdown.markdown(getattr(entry, f'{type}_information')), 'image': 'https:{0}'.format(getattr(entry, f'{type}_reference_image').url()), 'artists': getattr(entry, f'{type}_artists'), 'dates': dates, diff --git a/public/css/styles.css b/public/css/styles.css index 98ed2f3..7f1b0ec 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -153,7 +153,7 @@ hr { .nav-element { font-size: 30px; - font-family: 'Inter', sans-serif; + font-family: 'JetBrains', monospace; font-weight: 300; color: #0075FF; display: flex; @@ -183,9 +183,8 @@ hr { display: flex; padding-top: 0px; flex-direction: row; - gap: 50px; + gap: 25px; padding-bottom: 0px; - padding-left: 50px; padding-right: 50px; overflow-y: scroll; box-sizing: border-box; /* Include padding in the height calculation */ @@ -199,7 +198,10 @@ hr { gap: 25px; padding-top: 25px; overflow-y: scroll; - padding-bottom: 25px; + padding-bottom: 50px; + padding-right: 25px; + padding-left: 50px; + } #index-info p{ @@ -250,6 +252,10 @@ hr { color:#ffffff; font-weight: 400; flex-wrap: wrap; + justify-content: space-between; + margin-top: 50px; + margin-bottom: 50px; + text-transform: uppercase; } .hyperlink { @@ -264,32 +270,51 @@ hr { padding: 10px; padding-left: 25px; padding-right: 25px; + font-family: 'JetBrains', monospace; border: 1px solid; /* font-family: 'Syne Mono', monospace; */ color: #0075FF; background-color: #ffffff95; } +.hyperlink-home { + display: flex; + flex-direction: row; + gap: 20px; + width: fit-content; + border-color: #0075FF; + background-size: cover; /* or contain, depending on your preference */ + background-repeat:repeat; + font-family: 'JetBrains', monospace; + text-decoration: underline; + + color: #ffffff; + background-color: #0075FF; + font-size: 40px; + font-weight: 300; + padding: 5px; + filter: drop-shadow(0 0 0.25rem black); +} + .hyperlink-header { display: flex; flex-direction: row; gap: 20px; - border: 1px solid; width: fit-content; background-color: #0075FF; background-size: cover; /* or contain, depending on your preference */ background-repeat:repeat; - border-radius: 30px; padding: 10px; padding-left: 25px; padding-right: 25px; color: white; border-color: #0075FF; - transition: transform 0.7s ease-out; + font-family: 'JetBrains', monospace; + text-transform: uppercase; } .hyperlink-header:hover { - transform: scale(1.05); /* Scale up the element */ + /* transform: scale(1.05); Scale up the element */ } .active-page { @@ -318,22 +343,22 @@ hr { align-items: stretch; row-gap: 100px; column-gap: 50px; - justify-content: space-evenly; - padding-top: 40px; - padding-bottom: 40px; + justify-content: space-between; + padding-top: 0px; + padding-bottom: 50px; } .list { display: flex; flex-direction: column; width: 400px; - height: 300px; + min-height: 300px; gap:10px; } .list-image { width: 100%; - height: 500px; + height: 200px; overflow: hidden; position: relative; border-radius: 0px; @@ -367,7 +392,7 @@ hr { font-size: 20px; color: #0075FF; font-weight: 500; - font-family: 'Inter', sans-serif + font-family: 'JetBrains', monospace } .list-details { @@ -379,16 +404,24 @@ hr { row-gap: 5px; column-gap: 20px; flex-wrap: wrap; - font-family: 'Inter', sans-serif; + font-family: 'JetBrains', monospace; } .list-artists { font-size: 15px; - font-family: 'Inter', sans-serif; + font-family: 'JetBrains', monospace; color: black; display: flex; flex-wrap: wrap; flex-direction: row; + text-transform: capitalize; +} + +#list-info-container { + font-size: 18px; + font-family: 'Inter', sans-serif; + line-height: 25px; + font-style: italic; } #page-header { @@ -418,7 +451,7 @@ hr { display: flex; flex-direction: row; gap:10px; - font-family: 'Inter', sans-serif; + font-family: 'JetBrains', monospace; } .page-info-title { @@ -449,7 +482,7 @@ hr { flex-direction: row; width: 100%; height: 100%; - gap: 40px; + gap: 5px; } #article-image { @@ -473,7 +506,9 @@ hr { line-height: 25px; width: 100%; padding-left: 50px; - padding-top: 25px; + padding-right: 50px; + padding-top: 50px; + padding-bottom: 50px; overflow-y: scroll; } @@ -487,11 +522,19 @@ hr { text-indent: 2rem; } +#article-information em { + font-size: 14px; + font-weight: 400; + font-family: 'JetBrains', monospace; +} + #article-title { font-size: 25px; - font-family: 'Inter', sans-serif; + font-family: 'JetBrains', monospace; color: #0075FF; text-transform: uppercase; + display: flex; + justify-content: space-between; } #article-book { @@ -502,10 +545,11 @@ hr { margin-bottom: 50px; width: fit-content; text-transform: uppercase; + font-weight: 300; } #article-artists { - font-family: 'Inter', sans-serif; + font-family: 'JetBrains', monospace; color: #0075FF; text-transform: uppercase; } @@ -524,20 +568,22 @@ hr { overflow-y: hidden; box-sizing: border-box; /* Include padding in the height calculation */ flex: 1; - flex-shrink: 0; width: 100%; height: 100%; + padding-bottom: 0; } #location-list { display: flex; flex-basis: 45%; /* Initial width */ flex-grow: 0; /* Do not grow beyond the flex-basis */ - flex-shrink: 0; /* Do not shrink below the flex-basis */ - background-color: white; + background-color: rgba(255, 255, 255, 0); flex-direction: column; padding-top: 25px; + padding-right: 25px; gap: 25px; + height: 100%; + overflow-y: scroll; } #location-button-list { @@ -546,7 +592,8 @@ hr { display: flex; flex-direction: row; flex-wrap: wrap; - gap:20px 10px; + gap:10px 10px; + font-family: 'JetBrains', monospace; } #location-information { @@ -584,15 +631,17 @@ hr { .location-button { font-size: 20px; - border: 1px solid; + /* border: 1px solid; border-radius: 30px; padding: 10px; padding-left: 25px; padding-right: 25px; - border-color: #0075FF; - color: #0075FF; + border-color: #0075FF; */ + color: white; width: fit-content; cursor: pointer; + background-color: #0075FF; + padding: 5px; } #location-text { @@ -698,11 +747,13 @@ animation: 2s fadeInUp; #location-list { padding-top: 20px; - gap: 0px; + gap: 25px; padding-bottom: 20px; flex-shrink: 0; overflow-y: scroll; flex-basis: 60%; + padding-right: 5px; + padding-left: 5px; justify-content: space-evenly; } @@ -711,7 +762,7 @@ animation: 2s fadeInUp; } .location-button { - font-size: 20px; + font-size: 16px; padding: 10px; } @@ -741,8 +792,11 @@ animation: 2s fadeInUp; order: 2; flex-basis: 0%; flex-direction: column-reverse; - padding-top: 50px; + padding-top: 0px; + padding-left: 0px; + padding-right: 0px; overflow-y: visible; + } diff --git a/public/js/main.js b/public/js/main.js index 65db08f..42e5fab 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -93,7 +93,7 @@ function AddLights() { // Add Ambient Light - const ambientLight = new THREE.AmbientLight(0xffffff, 3); // Soft white light + const ambientLight = new THREE.AmbientLight(0xffffff, 4); // Soft white light scene.add(ambientLight); // Add Directional Light diff --git a/templates/article.html b/templates/article.html index a49fc13..c372773 100644 --- a/templates/article.html +++ b/templates/article.html @@ -9,8 +9,13 @@ {% for article in content %}
-
{{ article.title }}
+
+
{{ article.title }}
+
{{ article.artists | join(', ') }}
+ {% if article.bookUrl %} + + {% endif %}
{% for article in content %} {% if article.dates %} @@ -35,11 +40,8 @@ {% endfor %}
- ˗ˏˋ ★ ˎˊ˗ -
{{ article.information }}
- {% if article.bookUrl %} -
↳ Book
- {% endif %} + +

{{ article.information | replace('\n', '
') | safe }}
diff --git a/templates/base.html b/templates/base.html index 07571b6..28a6779 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,7 +14,7 @@ Beta Festival 2024 {% block title %}{% endblock %} - + diff --git a/templates/index.html b/templates/index.html index 97fe171..e98d618 100644 --- a/templates/index.html +++ b/templates/index.html @@ -8,52 +8,47 @@
-

- Beta is a new festival of art and technology critically engaging with the impact of emerging technologies on society. Taking Ireland’s role as a central node in today's wired world as a starting point, Beta will showcase and celebrate Ireland’s research and artistic communities through a combination of creativity, debate and experimentation. Beta allows members of the public to engage playfully and critically with new technologies essentially beta testing ethical issues facing society. -

-

- Beta is a new festival of art and technology critically engaging with the impact of emerging technologies on society. Taking Ireland’s role as a central node in today's wired world as a starting point, Beta will showcase and celebrate Ireland’s research and artistic communities through a combination of creativity, debate and experimentation. Beta allows members of the public to engage playfully and critically with new technologies essentially beta testing ethical issues facing society. -

-

- Beta is a new festival of art and technology critically engaging with the impact of emerging technologies on society. Taking Ireland’s role as a central node in today's wired world as a starting point, Beta will showcase and celebrate Ireland’s research and artistic communities through a combination of creativity, debate and experimentation. Beta allows members of the public to engage playfully and critically with new technologies essentially beta testing ethical issues facing society. -

-

- Beta is a new festival of art and technology critically engaging with the impact of emerging technologies on society. Taking Ireland’s role as a central node in today's wired world as a starting point, Beta will showcase and celebrate Ireland’s research and artistic communities through a combination of creativity, debate and experimentation. Beta allows members of the public to engage playfully and critically with new technologies essentially beta testing ethical issues facing society. -

-

- Beta is a new festival of art and technology critically engaging with the impact of emerging technologies on society. Taking Ireland’s role as a central node in today's wired world as a starting point, Beta will showcase and celebrate Ireland’s research and artistic communities through a combination of creativity, debate and experimentation. Beta allows members of the public to engage playfully and critically with new technologies essentially beta testing ethical issues facing society. -

-

- Beta is a new festival of art and technology critically engaging with the impact of emerging technologies on society. Taking Ireland’s role as a central node in today's wired world as a starting point, Beta will showcase and celebrate Ireland’s research and artistic communities through a combination of creativity, debate and experimentation. Beta allows members of the public to engage playfully and critically with new technologies essentially beta testing ethical issues facing society. -

-

- Beta is a new festival of art and technology critically engaging with the impact of emerging technologies on society. Taking Ireland’s role as a central node in today's wired world as a starting point, Beta will showcase and celebrate Ireland’s research and artistic communities through a combination of creativity, debate and experimentation. Beta allows members of the public to engage playfully and critically with new technologies essentially beta testing ethical issues facing society. -