Merge branch 'master' of https://git.waifuism.life/waifu/waifuism

default_style.css

@@ -1,7 +1,7 @@
-body, html{
+body{
     font-family: CustomFont, sans-serif; /* Use the custom font as the fallback */
   }
 @font-face {
     font-family: CustomFont;
-    src: url('static/fonts/Brushzing-Regular.ttf.otf') format('truetype'); /* Change 'your-font.ttf' to the actual font file name */
+    src: url('static/fonts/Brushzing-Regular.ttf.otf') format('truetype'); 
   }

home/art/comics/committed_lines/js/comic_settings.js

@@ -11,7 +11,7 @@ let pg = Number(findGetParameter("pg")); //make "pg" mean the current page numbe
 ////////////////////////
 
 //REALLY IMPORTANT ONES
-const maxpg = 21; //the current number of pages your comic has in total. this DOESNT necessarily mean number of IMAGE FILES as it doesn't count pages split into multiple files. 
+const maxpg = 26; //the current number of pages your comic has in total. this DOESNT necessarily mean number of IMAGE FILES as it doesn't count pages split into multiple files. 
 //YOU MUST UPDATE THIS NUMBER EVERY TIME YOU ADD A NEW PAGE or else it wont display the most recent page
 
 // COMIC PAGE SETTINGS

home/art/index.html

@@ -16,32 +16,32 @@
         <div>
             <h2>Comics</h2>
             <h3>For now we only have Commited Lines</h3>
-            <a href="./comics/committed_lines/"><img src="comics.png" alt="Comics"></a>
+            <a href="./comics/committed_lines/"><img src="./img/comics.png" alt="Comics"></a>
         </div>
         <div>
             <h2>Three dee</h2>
             <h3>I delve in modeling sometimes</h3>
-            <a href="./3d/"><img src="./threedee.png" alt="Three dee"></a>
+            <a href="./3d/"><img src="./img/threedee.png" alt="Three dee"></a>
         </div>
         <div>
             <h2>Drawings</h2>
             <h3>It is fun to draw</h3>
-            <a href="./drawings/"><img src="drawings.png" alt="Drawings"></a>
+            <a href="./drawings/"><img src="./img/drawings.png" alt="Drawings"></a>
         </div>
         <div>
             <h2>Art friends</h2>
             <h3>People that I love so much I asked for permission so I could share their stuff</h3>
-            <a href="./artfriends/"><img src="artfriends.png" alt="Art friends"></a>
+            <a href="./artfriends/"><img src="./img/artfriends.png" alt="Art friends"></a>
         </div>
         <div>
             <h2>Inspiration</h2>
             <h3>People that I am too scared to ask for permission</h3>
-            <a href="./inspiration/"><img src="inspiration.png" alt="Inspiration"></a>
+            <a href="./inspiration/"><img src="./img/inspiration.png" alt="Inspiration"></a>
         </div>
         <div>
             <h2>Photos</h2>
             <h3>I like taking photos, here are some of them</h3>
-            <a href="./photos/"><img src="photos.png" alt="Photos"></a>
+            <a href="./photos/"><img src="./img/photos.png" alt="Photos"></a>
         </div>
         
         

home/art/styles.css

@@ -1,10 +1,21 @@
-body, html {
+body {
     display: flex;
     justify-content: center;
     align-items: center;
     flex-direction: column;
   }
 
+  body{
+  background-image: url('./img/mainbackground.png');
+  animation: scroll 2s infinite cubic-bezier(.68,-0.55,.27,1.55);
+  
+}
+
+@-webkit-keyframes scroll {
+    from {background-position: 0px 0px;}
+    to {background-position: 128px 128px;}
+  }
+
 #header{
     justify-content: center;
 }
@@ -16,7 +27,9 @@ body, html {
     flex-flow: row;
     flex-wrap: wrap;
     justify-content: center;
-    
+    background-color: white;
+    margin-left: 5%;
+    margin-right: 5%;    
 }
 
 #menu div {

home/friends/index.html

@@ -6,6 +6,7 @@
     <link rel="icon" href="../../static/site/favicon.png" type="image/x-icon">
     <link rel="stylesheet" href="../../default_style.css">
     <link rel="stylesheet" href="style.css">
+    <script src="/js/goback.js" defer></script>
     <title>Friends</title>
 
 </head>

home/index.html

@@ -31,7 +31,7 @@
             </div>
             <div id="seeds">
                 <a href="./art/" class="seed" id="art"><img src="./images/seed.png"></a>
-                <a href="./shrine/" class="seed" id="shrine"><img src="./images/seed.png"></a>
+                <a href="./library/" class="seed" id="library"><img src="./images/seed.png"></a>
                 <a href="./friends/" class="seed" id="friends"><img src="./images/seed.png"></a>
                 <a href="./coffee/" class="seed" id="coffee"><img src="./images/seed.png"></a>
             </div>

home/library/index.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Library | waifuism.life</title>
+    <link rel="stylesheet" href="styles.css">
+    <script src="/libs/marked.min.js"></script>
+</head>
+<body>
+    <div class="window">
+        <div class="nav">
+            <button onclick="loadContent('home.md')">Home</button>
+            <a href="./logs/"><button>Logs</button></a>
+            <a href="./grimoire/"><button>Grimoire</button></a>
+        </div>
+        <div class="content" id="mainContent">
+
+        </div>
+    </div>
+
+    <script>
+        function loadContent(file) {
+            fetch(`markdown/${file}`)
+                .then(response => {
+                    if (!response.ok) {
+                        throw new Error(`Network response was not ok: ${response.statusText}`);
+                    }
+                    return response.text();
+                })
+                .then(text => {
+                    const mainContent = document.getElementById('mainContent');
+                    mainContent.innerHTML = marked.parse(text); // Changed to marked.parse
+                })
+                .catch(error => {
+                    console.error('Error loading content:', error);
+                    const mainContent = document.getElementById('mainContent');
+                    mainContent.innerHTML = `<p>Error loading content. Please try again later.</p>`;
+                });
+        }
+
+        // Load the default home content on page load
+        window.onload = function() {
+            loadContent('home.md');
+        };
+    </script>
+</body>
+</html>

home/library/logs/index.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Library | waifuism.life</title>
+    <link rel="stylesheet" href="styles.css">
+    <script src="/libs/marked.min.js"></script>
+</head>
+<body>
+    
+    <div class="window">
+        <div class="nav">
+            <button onclick="loadContent('home.md')">Home</button>
+            <button onclick="loadContent('slowly.md')">Slowly</button>
+            <button onclick="loadContent('loneliness.md')">Loneliness</button>
+            
+        </div>
+        <div class="content" id="mainContent">
+
+        </div>
+    </div>
+
+    <script>
+        function loadContent(file) {
+            fetch(`markdown/${file}`)
+                .then(response => {
+                    if (!response.ok) {
+                        throw new Error(`Network response was not ok: ${response.statusText}`);
+                    }
+                    return response.text();
+                })
+                .then(text => {
+                    const mainContent = document.getElementById('mainContent');
+                    mainContent.innerHTML = marked.parse(text);
+                })
+                .catch(error => {
+                    console.error('Error loading content:', error);
+                    const mainContent = document.getElementById('mainContent');
+                    mainContent.innerHTML = `<p>Error loading content. Please try again later.</p>`;
+                });
+        }
+
+        // Load the default home content on page load
+        window.onload = function() {
+            loadContent('home.md');
+        };
+    </script>
+</body>
+</html>

home/library/logs/markdown/home.md

@@ -0,0 +1,4 @@
+# Home
+This is a kind of blog I guess.
+
+![test](markdown/waifuism_tan.png)

home/library/logs/markdown/loneliness.md

@@ -0,0 +1,5 @@
+# Loneliness
+
+Again this feeling of a place that never was, I remember there was a word for that in portuguese, but it escapes my mind all the time.
+
+I wonder.

home/library/logs/markdown/slowly.md

@@ -0,0 +1,23 @@
+# Slowly
+
+Even now as I write, I wonder to feels if I should be paying attention to the things around me or not.
+
+I love to walk through a small park near my apartment, it's size is barely a block but I've seen it have quite the movement, children playing, people drinking mate, the usual.
+
+I have to remind myself to walk slowly through it in order to enjoy it.
+
+Is it normal to be walking so fast?
+
+I wondered myself if forcing yourself to be overworked because "you will not be able to finish a piece of art" is something worthwhile for me.
+
+Would I be sad I didn't finish a piece when I die?
+
+I like to think it's a similar question to "Am I sad because I didn't read more books when I was at school? Because I never told my crush my feelings? Because I didn't do something that I can't do anymore?"
+
+Honestly I am not sure what would I say on that day when I finally bite the dust.
+
+But today I shall enjoy it the ways that I know how to.
+
+Today that answer may be "No, not really.".
+
+They recently opened a coffee place near my house, I wonder if their coffee has good aroma.

home/library/logs/styles.css

@@ -0,0 +1,55 @@
+
+body {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100vh;
+    margin: 0;
+    background-color: #f0f0f0;
+    background-image: url("./bg.jpg");
+    background-position: center;
+}
+.window {
+    display: flex;
+    width: 80%;
+    height: 80%;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    background-color: rgb(255, 255, 255);
+    border-radius: 8px;
+}
+.nav {
+    width: 10%;
+    background-color: #306cab;
+    color: rgb(255, 255, 255);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 20px;
+    border-top-left-radius: 8px;
+    border-bottom-left-radius: 8px;
+}
+.nav button {
+    width: 100%;
+    margin: 10px 0;
+    padding: 10px;
+    border: none;
+    border-radius: 4px;
+    background-color: #77e6ea;
+    color: rgb(0, 0, 0);
+    cursor: pointer;
+    transition: background-color 0.3s;
+}
+.nav button:hover {
+    background-color: #1abc9c;
+}
+.content {
+    width: 90%;
+    padding: 20px;
+    border-top-right-radius: 8px;
+    border-bottom-right-radius: 8px;
+    overflow-y: auto;
+}
+.content img {
+    max-width: 100%;
+    height: auto;
+}

home/library/markdown/home.md

@@ -0,0 +1,3 @@
+# Library
+
+![](./static/frieren.jpg)

home/library/styles.css

@@ -0,0 +1,66 @@
+
+body {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100vh;
+    margin: 0;
+    background-color: #211000;
+    background-image: url("./static/bg.jpg");
+    background-position: center;
+    background-repeat: no-repeat;
+}
+.window {
+    display: flex;
+    width: 60%;
+    height: 60%;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    background-color: white;
+    border-radius: 8px;
+}
+.nav {
+    width: 25%;
+    background-color: #50372c;
+    color: white;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 20px;
+    border-top-left-radius: 8px;
+    border-bottom-left-radius: 8px;
+}
+.nav button {
+    width: 100%;
+    margin: 10px 0;
+    padding: 10px;
+    border: none;
+    border-radius: 4px;
+    background-color: #7e5b53;
+    color: white;
+    cursor: pointer;
+    transition: background-color 0.3s;
+    transform: 0.3s;
+
+}
+.nav button:hover {
+    background-color: #c2a25e;
+    transform: scale(1.05) rotate(1deg);
+}
+.content {
+    width: 75%;
+    padding: 20px;
+    border-top-right-radius: 8px;
+    border-bottom-right-radius: 8px;
+    overflow-y: auto;
+}
+
+.content img {
+    max-width: 100%;
+    height: auto;
+}
+
+/* Move when clicked */
+.nav button:active {
+    transform: scale(1.2);
+}
+

home/normal/anniversary-2024/index.html

@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../../../default_style.css">
+    <title>Waifuism.life 2024 Anniversary</title>
+    <style>
+        body {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            margin: 0;
+            background-color: #3a3a3a;
+        }
+        .title-container {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            height: 15vh;
+            width: 100%;
+            background-color: #000000;
+            border-bottom: 2px solid #000000;
+            color: white;
+        }
+        .image-container {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 70vh;
+            width: 100%;
+        }
+        .thumbnail {
+            max-height: 70vh;
+            max-width: 100%;
+            cursor: pointer;
+            border: 2px solid #ccc;
+            border-radius: 10px;
+        }
+        .bottom{
+            display: flex;
+            color: white;
+            height: 15vh;
+            justify-content: center;
+            align-items: center;
+
+
+        }
+    </style>
+</head>
+<body>
+    <div class="title-container">
+    <div><h1>Waifuism.life third anniversary.</h1></div>
+    </div>
+    <div class="image-container">
+        <a href="waifuism.png" target="_blank">
+            <img src="waifuism.png" alt="Waifuism" class="thumbnail">
+        </a>
+    </div>
+    <div class="bottom"><h1 style="justify-content: center; text-align: center;">Is your image missing? Do you want to be drawn? Did I forgot to credit you? Do you want to remove yourself from it?<br>Please <a href="https://mai.waifuism.life/notes/9srugmdaqj7301u2" style="color: rgb(228, 255, 255);">send a reply in the official thread</a></h1></div>
+</body>
+</html>

home/normal/index.html

@@ -45,6 +45,7 @@
                 </div>
 
                 <p>Waifuism.life started as a <a style="color: rgb(14, 70, 12);" href="https://pleroma.social/">Pleroma</a> instance on May 11th of 2021, now it's running <a style="color: rgb(14, 70, 12);" href="https://misskey-hub.net/en/">Misskey</a> over at mai.waifuism.life.</p>
+                <a href="./anniversary-2024"><button class="fun-button"><h1>It was Waifuism.life anniversary recently!<br>Check it out!</h1></button></a>
                 <p>The official mascot is waifuism-tan, but she likes to be called Mora.</p>
                 <p>This website is designed around desktops, not phones, go check it on your computer.</p>
                 <p>If you have autoplay on, you're listening to my favorite song, "Cuantas veces mas" from Javier Cardellino, an Uruguayan Musician.</p>
@@ -56,7 +57,7 @@
                 <div id="friends">
                     <a href="https://waifuism.life"><img src="stuff/friends/waifu.png" ></a>
                     <a href="https://reisen.church/"><img src="stuff/friends/reisen.png" ></a>
-                    <a href="https://husbandoism.life/"><img src="stuff/friends/hubbybutton.gif" ></a>
+                    <a href="https://weebles.husbandoism.life/"><img src="stuff/friends/beanbutton.gif"></a>
                     <a href="https://about.munir.tokyo/"><img style="max-height: 30px;" src="stuff/friends/munir-son.png" ></a>
                     <a href="https://tengu.space"><img src="stuff/friends/dev.png"></a>
                     <a href="https://cyuucat.moe/"><img src="stuff/friends/cyuu.gif"></a>
@@ -68,6 +69,7 @@
                     <a href="https://anonicus.net/"><img src="stuff/friends/anonicus.png" ></a>
                     <a href="https://iogirl.com/"><img style="max-height: 33px;" src="stuff/friends/daya.jpg" ></a>
                     <a href="https://den.raccoon.quest/"><img style="max-height: 33px;" src="stuff/friends/raccoonden.gif" ></a>
+                    <a href="https://husbandoism.life/"><img src="stuff/friends/hubbybutton.gif" ></a>
                     
                     
 

home/normal/styles.css

@@ -136,4 +136,32 @@ src: url('stuff/Brushzing-Regular.ttf.otf') format('truetype'); /* Change 'your-
 .melon {
 animation: wiggleRotate 4s ease-in-out infinite;
 }
-  
+
+.fun-button {
+    background-color: #1fd80e;
+    border: 2px solid #0d990d;
+    color: black;
+    padding: 15px 32px;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 18px;
+    font-weight: bold;
+    margin: 4px 2px;
+    cursor: pointer;
+    border-radius: 50px;
+    box-shadow: 0 8px #999;
+    transition: all 0.3s ease;
+}
+
+.fun-button:hover {
+    background-color: #2ecf0e;
+    box-shadow: 0 12px #666;
+    transform: translateY(-2px);
+}
+
+.fun-button:active {
+    background-color: #0bdd0b;
+    box-shadow: 0 4px #666;
+    transform: translateY(4px);
+}

index.html

@@ -15,7 +15,7 @@
       </a>
     </div>
     <div id="text">
-        <img src="ai_laptop_crying.png.webp">
+        <img src="ai_laptop_crying.webp">
         <h1>Um... e-excuse me... T-this website... uses music a lot, so... um... please remember to turn autoplay on!</h1>
     </div>
   </div>

js/goback.js

@@ -0,0 +1,27 @@
+// Function to inject HTML and CSS
+function injectTopLeftImage() {
+    // Create style element
+    const style = document.createElement('style');
+    style.textContent = `
+      .top-left-image {
+        position: fixed;
+        top: 0;
+        left: 0;
+        z-index: 9999;
+      }
+    `;
+    document.head.appendChild(style);
+  
+    // Create HTML element
+    const container = document.createElement('div');
+    container.innerHTML = `
+      <a href="/home">
+        <img src="/static/site/logo.png" alt="Top-Left Image" class="top-left-image">
+      </a>
+    `;
+    document.body.appendChild(container);
+  }
+  
+  // Ensure the function runs after the page loads
+  window.addEventListener('DOMContentLoaded', injectTopLeftImage);
+