Skip to content

Commit 39813c4

Browse files
miermontotomiermontoto
committed
19.0 alpha 3
[general] - added minimal statistics (umami.is) [index] - projects rework ideas - fix projects.js location - styles and tweaks [epiCalendar] - added images
1 parent f48acc7 commit 39813c4

9 files changed

Lines changed: 85 additions & 92 deletions

File tree

‎assets/media/projects/epicalendar1.png‎

75.7 KB
Loading

‎assets/media/projects/epicalendar2.png‎

27.7 KB
Loading

‎src/content/collections/projects/epicalendar.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ links: [{icon: 'ⓘ', url: "/epiCalendar"}]
66
demo: https://epicalendar.mier.info
77
permalink: /epiCalendar/
88
icons: [flask, python, react]
9-
date: 1800-01-01
10-
status: https://dashboard.mier.info/api/badge/2/status?style=flat-square
11-
star: star
9+
img: ['epicalendar1.png', 'epicalendar2.png']
1210
buttons: [
1311
{'url': 'https://epicalendar.mier.info', 'img': '🌐', 'text': 'página web'}
1412
]

‎src/index.njk‎

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,50 @@ js: index
2525
{% import "src/static/macros.njk" as macros %}
2626

2727
<section id="project-section" class="section">
28-
<table id="projects">
29-
<caption><h1>projects.</h1></caption>
30-
<thead hidden>
31-
<tr>
32-
<th>Project</th>
33-
<th>Links</th>
34-
<th>Description</th>
35-
<th>Icons</th>
36-
{# <th>Image</th> #}
37-
</tr>
38-
</thead>
39-
<tbody>
28+
<h1>projects.</h1>
29+
<h2>featured projects</h2>
30+
<div id="featured" class="carded">
31+
{% for project in collections.project %}
32+
{% if project.data.img %}
33+
<div class="project card">
34+
<div class="project-title">
35+
<h3>
36+
{% if project.data.demo %}
37+
<a href="{{ project.data.demo }}" rel="noopener noreferrer">{{ project.data.title }}</a>
38+
{% else %}
39+
{{ project.data.title }}
40+
{% endif %}
41+
</h3>
42+
</div>
43+
44+
<div class="project-img">
45+
<img src="/assets/media/projects/{{ project.data.img | first }}" alt="{{ project.data.title }} image" class="main">
46+
<img src="/assets/media/projects/{{ project.data.img | last }}" alt="{{ project.data.title }} alt image" class="hover">
47+
</div>
48+
49+
<div class="project-links">
50+
{% if project.data.source %}
51+
<a href="{{ project.data.source }}" target="_blank" rel="noopener noreferrer" aria-label="source code for {{ project.data.title }}">
52+
{{ macros.renderIcon('git') }}
53+
</a>
54+
{% endif %}
55+
{% for link in project.data.links %}
56+
<a href="{{ link.url }}" target="_blank" rel="noopener noreferrer">{{ link.icon | safe }}</a>
57+
{% endfor %}
58+
</div>
59+
</div>
60+
{% endif %}
61+
{% endfor %}
62+
</div>
63+
<hr>
64+
<h2>full works list</h2>
65+
<div id="project-list">
66+
<ul>
4067
{% for project in collections.project %}
4168
{{ macros.renderProject(project) }}
4269
{% endfor %}
43-
</tbody>
44-
</table>
70+
</ul>
71+
</div>
4572
</section>
4673

4774
<section id="about-section" class="section">

‎src/static/css/_base.sass‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66
$fonts: 'Courier Prime', monospace
77
$radius: 10px
8-
$weight: 700
8+
$weight: 600

‎src/static/css/index.sass‎

Lines changed: 32 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ $dot: colors.$white
2424
font-size: 3em
2525
user-select: none
2626
font-weight: normal
27-
28-
div
29-
margin-bottom: 1em
27+
margin: 1em 0
3028

3129
ul
3230
display: inline-block
@@ -38,6 +36,8 @@ ul
3836
opacity: 0
3937
overflow: hidden
4038
transition: all 0.5s ease
39+
margin-top: 3em
40+
display: inline-block
4141

4242
&.active
4343
opacity: 1
@@ -49,14 +49,9 @@ ul
4949
ul
5050
margin-right: 1.25em
5151

52-
.sections
53-
margin-top: 5em
54-
55-
.section
56-
display: inline-block
57-
5852
#socials
5953
user-select: none
54+
margin: 1em 0
6055

6156
a
6257
display: inline-block
@@ -81,6 +76,7 @@ ul
8176

8277
#marquee
8378
text-align: center
79+
margin: 1em 0
8480
white-space: nowrap
8581
animation: scroll-right 30s linear infinite
8682
filter: drop-shadow(0 0 3px colors.$white)
@@ -93,49 +89,6 @@ ul
9389
border-radius: 5%
9490
user-select: none
9591

96-
// projects table
97-
#projects
98-
table-layout: auto
99-
border: 2px solid colors.$light
100-
border-radius: base.$radius
101-
margin: 1em
102-
width: 90%
103-
backdrop-filter: blur(10px)
104-
margin-left: auto
105-
margin-right: auto
106-
107-
.project.star .project-title
108-
font-size: 1.5em
109-
110-
.project-title
111-
font-size: 1.25em
112-
113-
.project-icons
114-
vertical-align: middle
115-
116-
.project-icons-container
117-
display: grid
118-
119-
img
120-
font-size: 1.25em
121-
122-
&:not(:last-child)
123-
margin: 6px 0
124-
125-
.project-links
126-
a
127-
text-decoration: none
128-
font-size: 1.25em
129-
130-
td:not(.project-icons):not(.project-links)
131-
padding: 1.5em 0.75em
132-
133-
.project-icons, .project-links
134-
padding: 0.75em
135-
136-
tr:not(:last-child) td
137-
border-bottom: 1px solid colors.$dark
138-
13992
video#background
14093
position: fixed
14194
top: 50%
@@ -167,3 +120,30 @@ video#background
167120

168121
#stop-background
169122
font-size: 1.15em
123+
124+
.project
125+
display: flex
126+
127+
div
128+
margin: 0.5em
129+
130+
.project-img
131+
position: relative
132+
display: inline-block
133+
width: 100%
134+
135+
img
136+
width: 80%
137+
138+
.hover
139+
opacity: 0
140+
position: absolute
141+
top: 0
142+
left: 0
143+
width: 100%
144+
z-index: 2
145+
object-fit: contain
146+
transition: opacity .1s
147+
148+
&:hover
149+
opacity: 1

src/static/js/projects.js renamed to src/static/js/index/projects.js

File renamed without changes.

‎src/static/macros.njk‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,30 @@ permalink: false
1414
{% endmacro %}
1515

1616
{% macro renderProject(project) %}
17-
<tr class="project {{ project.data.star }}" id="{{ project.data.title | slug }}">
18-
<td class="project-title">
17+
<li class="project {{ project.data.star }}" id="{{ project.data.title | slug }}">
18+
<div class="project-title">
1919
{% if project.data.demo %}
2020
<a href="{{ project.data.demo }}" rel="noopener noreferrer">{{ project.data.title }}</a>
2121
{% else %}
2222
{{ project.data.title }}
2323
{% endif %}
24-
</td>
24+
</div>
2525

26-
<td class="project-links">
26+
<div class="project-links">
2727
{% if project.data.source %}
2828
<a href="{{ project.data.source }}" target="_blank" rel="noopener noreferrer" aria-label="source code for {{ project.data.title }}">
2929
{{ renderIcon('git') }}
3030
</a>
3131
{% endif %}
3232
{% for link in project.data.links %}
33-
<br>
3433
<a href="{{ link.url }}" target="_blank" rel="noopener noreferrer">{{ link.icon | safe }}</a>
3534
{% endfor %}
36-
</td>
37-
38-
<td class="project-description">
39-
{{ project.data.desc | safe }}
40-
</td>
41-
42-
<td class="project-icons">
43-
<div class="project-icons-container">
44-
{{ renderIcons(project.data.icons) }}
45-
</div>
46-
</td>
35+
</div>
4736

48-
{# <td class="project-image">
49-
{% if project.data.image %}
50-
<img src="{{ project.data.image }}" alt="{{ project.data.title }} image">
51-
{% endif %}
52-
</td> #}
53-
</tr>
37+
{# <div class="project-icons">
38+
{{ renderIcons(project.data.icons) }}
39+
</div> #}
40+
</li>
5441
{% endmacro %}
5542

5643
{% macro renderExperience(experience) %}

‎src/templates/base.njk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<link rel="icon" href="/assets/favicon.svg" type="image/x-icon">
1919
<title>{{ title or "mier" }}</title>
2020
<script src="https://cdnjs.cloudflare.com/ajax/libs/quicklink/2.3.0/quicklink.umd.js"></script>
21+
<script async src="https://eu.umami.is/script.js" data-website-id="58527f4f-2ded-4fc6-bd20-6ca52c11a9b7"></script>
2122
{% if js %}
2223
{% addScript js %}
2324
{% endif %}

0 commit comments

Comments
 (0)