Various improvements

- Switch to Git submodules for dependancies
- Migrate from FontAwesome to ForkAwesome, which has more icons I need and is fully FOSS
- Update repository link
- Update contact links
This commit is contained in:
MassiveBox 2022-08-14 10:23:20 +02:00
parent 3a8985cdd6
commit a3e765e19e
12 changed files with 108 additions and 55 deletions

1
.gitignore vendored
View file

@ -1,2 +1 @@
deps/*
project.geany

12
.gitmodules vendored Normal file
View file

@ -0,0 +1,12 @@
[submodule "deps/bulma"]
path = deps/bulma
url = https://github.com/jgthms/bulma
[submodule "deps/forkawesome"]
path = deps/forkawesome
url = https://github.com/ForkAwesome/Fork-Awesome
[submodule "deps/jquery"]
path = deps/jquery
url = https://github.com/jquery/jquery/tree/3.6.0
[submodule "deps/rssparser"]
path = deps/rssparser
url = https://github.com/rbren/rss-parser

View file

@ -1,14 +1,11 @@
# MassiveBox's Homepage
A simple HTML, CSS and JQuery homepage built with Bulma.
In order to run, you have to place these contents in the `deps` folder:
A simple HTML, CSS and JQuery static homepage built with Bulma.
| Resource | File name |
| ------------------------------------------------------------ | ------------------------- |
| https://raw.githubusercontent.com/jgthms/bulma/master/css/bulma.min.css | ./deps/bulma.min.css |
| https://use.fontawesome.com/releases/v5.3.1/js/all.js | ./deps/fontawesome.min.js |
| https://code.jquery.com/jquery-3.6.0.min.js | ./deps/jquery.min.js |
| https://raw.githubusercontent.com/rbren/rss-parser/master/dist/rss-parser.min.js | ./deps/rss-parser.min.js |
Don't forget to clone the repo with `--recurse-submodules` to get all dependancies:
- Bulma for the base CSS of the website
- ForkAwesome for awesome FOSS icons
- jQuery because plain JS is boring
- RSS Parser because Pleroma's feed is in RSS format
This ensures that no CDN is pinged by the end user, which safeguards their privacy.
You may want to edit the .html files by using your Matomo code. You may also want to edit your privacy policy links so that they actually lead to your privacy policy.
You can check out a live version at https://massivebox.net or https://massivebox.codeberg.page/website.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

View file

@ -23,9 +23,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Contacts - MassiveBox</title>
<link rel="stylesheet" href="deps/bulma.min.css">
<script src="deps/jquery.min.js"></script>
<script src="deps/fontawesome.min.js"></script>
<link rel="stylesheet" href="deps/bulma/css/bulma.min.css">
<link rel="stylesheet" href="deps/forkawesome/css/fork-awesome.min.css">
<script src="deps/jquery/dist/jquery.min.js"></script>
<link rel="icon" type="image/x-icon" href="/assets/favicon.ico">
<meta charset="UTF-8" />
@ -70,10 +70,10 @@
<div id="navbarBasicExample" class="navbar-menu">
<div class="navbar-end">
<a class="navbar-item" href="./"><span class="icon-text"><span class="icon"><i class="fas fa-home"></i></span><span>Home</span></span></a>
<a class="navbar-item" href="projects.html"><span class="icon-text"><span class="icon"><i class="fas fa-swatchbook"></i></span><span>Projects</span></span></a>
<a class="navbar-item" href="https://blog.massivebox.net" target="_blank" rel="noopener noreferrer"><span class="icon-text"><span class="icon"><i class="fas fa-blog"></i></span><span>Blog</span></span></a>
<a class="navbar-item" href="contact.html"><span class="icon-text"><span class="icon"><i class="fas fa-envelope"></i></span><span>Contact</span></span></a>
<a class="navbar-item" href="./"><span class="icon-text"><span class="icon"><i class="fa fa-home"></i></span><span>Home</span></span></a>
<a class="navbar-item" href="projects.html"><span class="icon-text"><span class="icon"><i class="fa fa-cloud"></i></span><span>Projects</span></span></a>
<a class="navbar-item" href="https://blog.massivebox.net" target="_blank" rel="noopener noreferrer"><span class="icon-text"><span class="icon"><i class="fa fa-feed"></i></span><span>Blog</span></span></a>
<a class="navbar-item" href="contact.html"><span class="icon-text"><span class="icon"><i class="fa fa-envelope"></i></span><span>Contact</span></span></a>
</div>
</div>
</nav>
@ -84,15 +84,15 @@
<p class="title">Contact me</p>
<p class="subtitle"><br>
Feel free to contact me whenever you want, as long as you're not asking something obvious or spamming.<br>
I prefer being contacted on Session or Telegram.<br>
I don't guarantee that I will respond.
</p>
</div>
<div id="contact"><br>
<ul>
<li><p class="subtitle"><span class="icon"><i class="fas fa-envelope"></i></span> <b>Email:</b> hello<span class="icon"><i class="fas fa-at"></i></span>massivebox.eu.org</p></li>
<li><p class="subtitle"><span class="icon"><i class="fas fa-lock"></i></span> <b>Session</b> (ONS name): <code>massivebox</code></p></li>
<li><p class="subtitle"><span class="icon"><i class="fas fa-plane"></i></span> <b>Telegram:</b> <code>massive_box</code></p></li>
<li><p class="subtitle"><span class="icon"><i class="fa fa-envelope"></i></span> <b>Email:</b> <a href="mailto:hello@massivebox.net">hello@massivebox.net</a></p></li>
<li><p class="subtitle"><span class="icon"><i class="fa fa-matrix-org"></i></span> <b>Matrix:</b> <a href="https://matrix.to/#/@massivebox:massivebox.net">@massivebox:massivebox.net</a></p></li>
<li><p class="subtitle"><span class="icon"><i class="fa fa-lock"></i></span> <b>Session</b> (ONS name): <code>massivebox</code></p></li>
<li><p class="subtitle"><span class="icon"><i class="fa fa-telegram"></i></span> <b>Telegram:</b> <a href="https://t.me/massivebox">@MassiveBox</a></p></li>
</ul>
</div>
<div id="maurizio">
@ -128,9 +128,9 @@
<footer class="footer">
<div class="content has-text-centered">
<p>
Website by MassiveBox, handcrafted in Italy with <span class="icon has-text-danger"><i class="fas fa-heart"></i></span>.<br>
Released under GPL3. <a href="https://codeberg.org/massivebox/website" target="_blank" rel="noopener noreferrer">Source code</a><br>
Icons by <a href="https://fontawesome.com" target="_blank" rel="noopener noreferrer">FontAwesome</a> (CC BY 4.0) - All logos in this page are copyright of their owner - <a href="/pages/privacy.html" target="_blank" rel="noopener noreferrer">Privacy</a>
Website by MassiveBox, handcrafted in Italy with <span class="icon has-text-danger"><i class="fa fa-heart"></i></span>.<br>
Released under GPL3. <a href="https://gitea.massivebox.net/massivebox/website" target="_blank" rel="noopener noreferrer">Source code</a><br>
All logos in this page are copyright of their owner - <a href="/pages/privacy.html" target="_blank" rel="noopener noreferrer">Privacy</a>
</p>
</div>
</footer>

1
deps/bulma vendored Submodule

@ -0,0 +1 @@
Subproject commit 64f739c0c939b5dedbf8dfb4595f7192d1e766a5

1
deps/forkawesome vendored Submodule

@ -0,0 +1 @@
Subproject commit a99579ae3e735ee70e51ed62dfcee3172b5b2db7

1
deps/jquery vendored Submodule

@ -0,0 +1 @@
Subproject commit 0cc1ad64ab0f482c13d6edd2a5226f309dd00006

1
deps/rssparser vendored Submodule

@ -0,0 +1 @@
Subproject commit e2e2f4d03a74811fd4dc624381b0f336bcdde962

View file

@ -23,9 +23,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Home - MassiveBox</title>
<link rel="stylesheet" href="deps/bulma.min.css">
<script src="deps/jquery.min.js"></script>
<script src="deps/fontawesome.min.js"></script>
<link rel="stylesheet" href="deps/bulma/css/bulma.min.css">
<link rel="stylesheet" href="deps/forkawesome/css/fork-awesome.min.css">
<script src="deps/jquery/dist/jquery.min.js"></script>
<link rel="icon" type="image/x-icon" href="/assets/favicon.ico">
<meta charset="UTF-8" />
@ -51,13 +51,6 @@
<body>
<section class="hero is-small is-black">
<div class="hero-body">
<p>
This website is available on <u><a href="https://lokinet.org/" target="_blank" rel="noopener noreferrer">Lokinet</a></u>: <u><a href="http://i455hht9c6q6nsw3gk66wdheoo9yteauhjsdumi333ajpor86pay.loki/">SNApp URL</a></u>.
</p>
</div>
</section>
<section class="hero is-primary is-fullheight" style="padding: 2vw 7vw 2vw 7vw; background: #050732 !important">
@ -77,10 +70,10 @@
<div id="navbarBasicExample" class="navbar-menu">
<div class="navbar-end">
<a class="navbar-item" href="./"><span class="icon-text"><span class="icon"><i class="fas fa-home"></i></span><span>Home</span></span></a>
<a class="navbar-item" href="projects.html"><span class="icon-text"><span class="icon"><i class="fas fa-swatchbook"></i></span><span>Projects</span></span></a>
<a class="navbar-item" href="https://blog.massivebox.net" target="_blank" rel="noopener noreferrer"><span class="icon-text"><span class="icon"><i class="fas fa-blog"></i></span><span>Blog</span></span></a>
<a class="navbar-item" href="contact.html"><span class="icon-text"><span class="icon"><i class="fas fa-envelope"></i></span><span>Contact</span></span></a>
<a class="navbar-item" href="./"><span class="icon-text"><span class="icon"><i class="fa fa-home"></i></span><span>Home</span></span></a>
<a class="navbar-item" href="projects.html"><span class="icon-text"><span class="icon"><i class="fa fa-cloud"></i></span><span>Projects</span></span></a>
<a class="navbar-item" href="https://blog.massivebox.net" target="_blank" rel="noopener noreferrer"><span class="icon-text"><span class="icon"><i class="fa fa-feed"></i></span><span>Blog</span></span></a>
<a class="navbar-item" href="contact.html"><span class="icon-text"><span class="icon"><i class="fa fa-envelope"></i></span><span>Contact</span></span></a>
</div>
</div>
</nav>
@ -277,13 +270,13 @@
</div>
</section>
<script src="deps/rss-parser.min.js"></script>
<script src="deps/rssparser/dist/rss-parser.min.js"></script>
<script>
let parser = new RSSParser();
parser.parseURL('/feed.atom', function(err, feed) {
if (err) {
$("#mastodonfeed").html(`<p><span class="icon has-text-danger"><i class="fas fa-times"></i></span> Error parsing Pleroma RSS feed. Try refreshing the page.</p>`);
$("#mastodonfeed").html(`<p><span class="icon has-text-danger"><i class="fa fa-times"></i></span> Error parsing Pleroma RSS feed. Try refreshing the page.</p>`);
}
feed.items.forEach(function(entry) {
date = new Date(Date.parse(entry.isoDate));
@ -298,7 +291,7 @@
<div class="media-content">
<div class="content">
<p><strong>MassiveBox</strong> <small><a href="https://blob.cat/massivebox" target="_blank" rel="noopener noreferrer">massivebox@blob.cat</a></small> <small>`+date.getDate()+"/"+(date.getMonth()+1)+"/"+date.getFullYear()+`</small></p>
`+entry.content+`
`+entry.content.replace(/:(\S*):/gm, '<img src="/emoji/$1" width="16" alt="$1" loading="lazy">')+`
</div>
</div>
</article>
@ -312,9 +305,9 @@
<footer class="footer">
<div class="content has-text-centered">
<p>
Website by MassiveBox, handcrafted in Italy with <span class="icon has-text-danger"><i class="fas fa-heart"></i></span>.<br>
Released under GPL3. <a href="https://codeberg.org/massivebox/website" target="_blank" rel="noopener noreferrer">Source code</a><br>
Icons by <a href="https://fontawesome.com" target="_blank" rel="noopener noreferrer">FontAwesome</a> (CC BY 4.0) - All logos in this page are copyright of their owner - <a href="/pages/privacy.html" target="_blank" rel="noopener noreferrer">Privacy</a>
Website by MassiveBox, handcrafted in Italy with <span class="icon has-text-danger"><i class="fa fa-heart"></i></span>.<br>
Released under GPL3. <a href="https://gitea.massivebox.net/massivebox/website" target="_blank" rel="noopener noreferrer">Source code</a><br>
All logos in this page are copyright of their owner - <a href="/pages/privacy.html" target="_blank" rel="noopener noreferrer">Privacy</a>
</p>
</div>
</footer>

48
project.geany Normal file
View file

@ -0,0 +1,48 @@
[editor]
line_wrapping=false
line_break_column=72
auto_continue_multiline=true
[file_prefs]
final_new_line=true
ensure_convert_new_lines=false
strip_trailing_spaces=false
replace_tabs=false
[indentation]
indent_width=4
indent_type=0
indent_hard_tab_width=8
detect_indent=false
detect_indent_width=false
indent_mode=2
[project]
name=website
base_path=/home/massive/DEV/websito3
description=
[long line marker]
long_line_behaviour=1
long_line_column=72
[files]
current_page=5
FILE_NAME_0=10976;HTML;0;EUTF-8;0;1;0;%2Fhome%2Fmassive%2FDEV%2Fwebsito3%2Findex.html;0;4
FILE_NAME_1=5552;HTML;0;EUTF-8;0;1;0;%2Fhome%2Fmassive%2FDEV%2Fwebsito3%2Fcontact.html;0;4
FILE_NAME_2=6960;HTML;0;EUTF-8;0;1;0;%2Fhome%2Fmassive%2FDEV%2Fwebsito3%2Fprojects.html;0;4
FILE_NAME_3=382;None;0;EUTF-8;0;1;0;%2Fhome%2Fmassive%2FDEV%2Fwebsito3%2F.gitmodules;0;4
FILE_NAME_4=446;Markdown;0;EUTF-8;0;1;0;%2Fhome%2Fmassive%2FDEV%2Fwebsito3%2FREADME.md;0;4
FILE_NAME_5=13;None;0;EUTF-8;0;1;0;%2Fhome%2Fmassive%2FDEV%2Fwebsito3%2F.gitignore;0;4
[VTE]
last_dir=/home/massive/DEV/leo exploit
[prjorg]
source_patterns=*.c;*.C;*.cpp;*.cxx;*.c++;*.cc;*.m;
header_patterns=*.h;*.H;*.hpp;*.hxx;*.h++;*.hh;
ignored_dirs_patterns=.*;CVS;
ignored_file_patterns=*.o;*.obj;*.a;*.lib;*.so;*.dll;*.lo;*.la;*.class;*.jar;*.pyc;*.mo;*.gmo;
generate_tag_prefs=0
show_empty_dirs=true
external_dirs=

View file

@ -23,9 +23,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Projects - MassiveBox</title>
<link rel="stylesheet" href="deps/bulma.min.css">
<script src="deps/jquery.min.js"></script>
<script src="deps/fontawesome.min.js"></script>
<link rel="stylesheet" href="deps/bulma/css/bulma.min.css">
<link rel="stylesheet" href="deps/forkawesome/css/fork-awesome.min.css">
<script src="deps/jquery/dist/jquery.min.js"></script>
<link rel="icon" type="image/x-icon" href="/assets/favicon.ico">
<meta charset="UTF-8" />
@ -70,10 +70,10 @@
<div id="navbarBasicExample" class="navbar-menu">
<div class="navbar-end">
<a class="navbar-item" href="./"><span class="icon-text"><span class="icon"><i class="fas fa-home"></i></span><span>Home</span></span></a>
<a class="navbar-item" href="projects.html"><span class="icon-text"><span class="icon"><i class="fas fa-swatchbook"></i></span><span>Projects</span></span></a>
<a class="navbar-item" href="https://blog.massivebox.net" target="_blank" rel="noopener noreferrer"><span class="icon-text"><span class="icon"><i class="fas fa-blog"></i></span><span>Blog</span></span></a>
<a class="navbar-item" href="contact.html"><span class="icon-text"><span class="icon"><i class="fas fa-envelope"></i></span><span>Contact</span></span></a>
<a class="navbar-item" href="./"><span class="icon-text"><span class="icon"><i class="fa fa-home"></i></span><span>Home</span></span></a>
<a class="navbar-item" href="projects.html"><span class="icon-text"><span class="icon"><i class="fa fa-cloud"></i></span><span>Projects</span></span></a>
<a class="navbar-item" href="https://blog.massivebox.net" target="_blank" rel="noopener noreferrer"><span class="icon-text"><span class="icon"><i class="fa fa-feed"></i></span><span>Blog</span></span></a>
<a class="navbar-item" href="contact.html"><span class="icon-text"><span class="icon"><i class="fa fa-envelope"></i></span><span>Contact</span></span></a>
</div>
</div>
</nav>
@ -159,9 +159,9 @@
<footer class="footer">
<div class="content has-text-centered">
<p>
Website by MassiveBox, handcrafted in Italy with <span class="icon has-text-danger"><i class="fas fa-heart"></i></span>.<br>
Released under GPL3. <a href="https://codeberg.org/massivebox/website" target="_blank" rel="noopener noreferrer">Source code</a><br>
Icons by <a href="https://fontawesome.com" target="_blank" rel="noopener noreferrer">FontAwesome</a> (CC BY 4.0) - All logos in this page are copyright of their owner - <a href="/pages/privacy.html" target="_blank" rel="noopener noreferrer">Privacy</a>
Website by MassiveBox, handcrafted in Italy with <span class="icon has-text-danger"><i class="fa fa-heart"></i></span>.<br>
Released under GPL3. <a href="https://gitea.massivebox.net/massivebox/website" target="_blank" rel="noopener noreferrer">Source code</a><br>
All logos in this page are copyright of their owner - <a href="/pages/privacy.html" target="_blank" rel="noopener noreferrer">Privacy</a>
</p>
</div>
</footer>