JetBrains page + additional fixes

6 files changed, 145 insertions, 13 deletions

diff --git a/.DS_Store b/.DS_Store
index 9460f41..8fc4c97 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/assets/.DS_Store b/assets/.DS_Store
index 58ef8bb..cfad618 100644
--- a/assets/.DS_Store
+++ b/assets/.DS_Store
diff --git a/assets/css/main.css b/assets/css/main.css
index 6b7462b..a1e5f5c 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -148,4 +148,27 @@ pre {
     padding: 10px 20px;
     border-radius: 5px;
     border: 1px solid black;
+}
+
+#jb-grid {
+    display: grid;
+    grid-template-columns: repeat(6, 1fr);
+}
+
+.jb-product {
+    color: black;
+}
+
+#jb-experiences {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+}
+
+#homepage {
+    min-height: calc(100vh - 57px);
+}
+
+.footer-link:hover {
+    color: white;
+    text-decoration: none;
 }
\ No newline at end of file
diff --git a/includes/footer.php b/includes/footer.php
index 31f2f60..917ed1c 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -2,7 +2,7 @@
     <div id="footer-container">
         <div id="footer" class="container">
             <p>
-                <a href="#" class="footer-link">Link</a> · <a href="#" class="footer-link">Link</a> · <a href="#" class="footer-link">Link</a> · <a href="#" class="footer-link">Link</a> · <a href="#" class="footer-link">Link</a> · <a href="#" class="footer-link">Link</a> · <a href="#" class="footer-link">Link</a>
+                <a href="#" class="footer-link">Legal Notices</a> · <a href="/jetbrains" class="footer-link">Minteck and JetBrains</a> · <a href="#" class="footer-link">Copyright</a> · <a href="#" class="footer-link">Website source code</a> · <a href="#" class="footer-link">Report an issue with this website</a>
             </p>
             <div id="footer-links">
 
diff --git a/index.php b/index.php
index e982712..9bf460c 100644
--- a/index.php
+++ b/index.php
@@ -1,14 +1,36 @@
 <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; global $Parsedown; ?>
 <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; ?>
 
-<div id="hero">
-    <br>
-    <img src="/assets/img/icon.svg" id="hero-img" alt="">
-    <br>
-    <br>
+<div id="homepage">
+    <div id="hero">
+        <br>
+        <img src="/assets/img/icon.svg" id="hero-img" alt="">
+        <br>
+        <br>
+        <br>
+        <h1>Minteck</h1>
+        <h4>Your typical keyboard-addicted pony</h4>
+    </div>
+
     <br>
-    <h1>Minteck</h1>
-    <h4>Your typical keyboard-addicted pony</h4>
+
+    <div class="container">
+        <div class="row">
+            <?php foreach (json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/includes/fetcher/projects.json"), true) as $project): if (!$project['archive'] && $project['showcase']): ?>
+                <div class="col-lg-4">
+                    <div class="card stylized-card">
+                        <div class="card-body">
+                            <img class="stylized-card-icon" <?php if (!isset($project["icon"])): ?>style="background: hsla(<?= hexdec(substr($project['id'], 0, 2)) ?>, 100%, 50%, 0.1) !important;"<?php endif; ?> src="<?= isset($project["icon"]) ? $project["icon"] . "?width=96" : "/assets/img/letters/" . getLetters($project['name']) . ".png" ?>" alt="">
+                            <h4 class="card-title"><?= $project["name"] ?></h4>
+                            <p class="card-text"><?= preg_replace('/[|.?!;](.*)/m', '', strip_tags($Parsedown->line(trim($project["description"])))) ?></p>
+                            <a href="?<?= $project["id"] ?>" class="btn btn-outline-light">View Project</a>
+                            <div class="small text-muted" style="margin-top:10px;">Updated <?= timeAgo($project['date']) ?></div>
+                        </div>
+                    </div>
+                </div>
+            <?php endif; endforeach; ?>
+        </div>
+    </div>
 </div>
 
 <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file
diff --git a/jetbrains/index.php b/jetbrains/index.php
index 339a0fe..23b3f8e 100644
--- a/jetbrains/index.php
+++ b/jetbrains/index.php
@@ -1,11 +1,99 @@
-<?php $title = "Social"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; global $Parsedown; ?>
+<?php $title = "Minteck and JetBrains"; require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; global $Parsedown; ?>
 <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php"; ?>
 
 <br>
+<div style="margin-top: -25px;padding-top:10px;" class="bg-white text-black">
+    <div class="container text-center text-black">
+        supported by<br>
+        <img src="/assets/proprietary/jetbrains_full.svg" alt="JetBrains">
+        <p class="text-black">(this does <b class="text-black">NOT</b> mean sponsorship or endorsement of my projects by JetBrains)</p>
+        <br>
+    </div>
+</div>
+
+<div class="bg-white text-black">
+    <div class="container text-center text-black">
+        <h2 class="text-black">I use the following products from JetBrains:</h2>
+        <div id="jb-grid">
+            <div>
+                <img src="/assets/proprietary/webstorm.svg" alt="">
+                <div class="jb-product">WebStorm</div>
+            </div>
+            <div>
+                <img src="/assets/proprietary/phpstorm.svg" alt="">
+                <div class="jb-product">PhpStorm</div>
+            </div>
+            <div>
+                <img src="/assets/proprietary/toolbox.svg" alt="">
+                <div class="jb-product">Toolbox</div>
+            </div>
+            <div>
+                <img src="/assets/proprietary/teamcity.svg" alt="">
+                <div class="jb-product">TeamCity</div>
+            </div>
+            <div>
+                <img src="/assets/proprietary/youtrack.svg" alt="">
+                <div class="jb-product">YouTrack</div>
+            </div>
+            <div>
+                <img src="/assets/proprietary/qodana.svg" alt="" style="width:100px;">
+                <div class="jb-product">Qodana</div>
+            </div>
+        </div>
+        <br>
+
+        <div id="jb-experiences" class="text-start">
+            <div>
+                <div class="text-center">
+                    <img src="/assets/proprietary/webstorm_full.svg" style="width:440px;">
+                </div>
+                <p class="text-black">JavaScript is one of the first programming languages I used, and the way I develop in this language changed throughout the years. Today, WebStorm's intelligent autocompletion helps me code in JavaScript faster than ever and makes me spend more time designing new features rather than writing actual code.</p>
+            </div>
+            <div>
+                <div class="text-center">
+                    <img src="/assets/proprietary/phpstorm_full.svg" style="width:440px;">
+                </div>
+                <p class="text-black">I started programming in PHP back in 2019, and the way I use the language now changed a lot. PhpStorm helps me make sure my code uses new optimized features from new versions of PHP so I can always keep my code up-to-date with the language.</p>
+            </div>
+            <div>
+                <div class="text-center">
+                    <img src="/assets/proprietary/teamcity_full.svg" style="width:440px;">
+                </div>
+                <p class="text-black">TeamCity was such a total change for me. I didn't want to use CI before because it always seemed complicated, but TeamCity makes it very easy to create build configurations and deploy my code to production servers as soon as possible. It is also compatible with a wide range of languages, and your own build script.</p>
+            </div>
+            <div>
+                <div class="text-center">
+                    <img src="/assets/proprietary/youtrack_full.svg" style="width:440px;">
+                </div>
+                <p class="text-black">YouTrack is my personal favorite issue tracker. GitLab's issue tracker is bundled to a Git repository which may not be ideal to track issues related to infrastructure, it's also much more limited than YouTrack. YouTrack allows to connect a Git repository and TeamCity build configuration with the issue tracker.</p>
+            </div>
+            <div>
+                <div class="text-center">
+                    <img src="/assets/proprietary/toolbox_full.svg" style="width:440px;">
+                </div>
+                <p class="text-black">With JetBrains' Toolbox app, I never need to worry about running the latest version of the IDEs, they are all updated automatically whenever a new version releases. With a single click, I can install the latest version of my favorite IDEs. And I can install a new IDE whenever I need it with a single click.</p>
+            </div>
+            <div>
+                <div class="text-center">
+                    <img src="/assets/proprietary/qodana_full.svg" style="width:440px;">
+                </div>
+                <p class="text-black">JetBrains' IDEs already provide code insights, but Qodana summarizes everything and displays fixes publicly so other developers who may not have access to the IDEs can improve the code quality. Qodana makes improving my code more intuitive and an after-programming task, so I focus on writing code instead.</p>
+            </div>
+        </div>
+        <br>
+        <p class="text-black">JetBrains has been giving me free licenses to help me develop my open-source projects for <b class="text-black"><?= (int)date('m') > 4 ? (int)date('Y') - 2020 : (int)date('Y') - 2021 ?> year<?= ((int)date('m') > 4 ? (int)date('Y') - 2020 : (int)date('Y') - 2021) > 1 ? "s" : "" ?></b>, huge thanks to them for supporting me!</p>
+        <br>
+    </div>
+</div>
+
+<br>
 <div class="container">
-    Copyright © 2000-<?= date('Y') ?> JetBrains s.r.o. JetBrains, the JetBrains logo, YouTrack, the YouTrack logo, TeamCity, the TeamCity logo, Qodana, the Qodana logo, WebStorm, the WebStorm logo, PhpStorm and the PhpStorm logo are registered trademarks of JetBrains s.r.o.
+    <p class="small">
+        Copyright © 2000-<?= date('Y') ?> JetBrains s.r.o. JetBrains, the JetBrains logo, YouTrack, the YouTrack logo, TeamCity, the TeamCity logo, Qodana, the Qodana logo, JetBrains Toolbox, the JetBrains Toolbox logo, WebStorm, the WebStorm logo, PhpStorm and the PhpStorm logo are registered trademarks of JetBrains s.r.o.
+    </p>
+</div>
 
-    <pre>
+<!--
 <!> Link back to jetbrains.com <!>
 Logo: square: min 50px; bg from color palette (see screenshot) or photograph (does not compromise legibility)
 > Please note that free product subscriptions granted by JetBrains do not constitute sponsorship or endorsement.
@@ -13,7 +101,6 @@ Logo: square: min 50px; bg from color palette (see screenshot) or photograph (do
 > product license for your meetup/event, OSS project, programming course, or particular community activity.
 > You may also use JetBrains Brand logos or other brand assets for this purpose. You may, for example, say
 > ‘supported by JetBrains’ or ‘product subscriptions provided by JetBrains’.
-    </pre>
-</div>
+-->
 
 <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file