1.3.0 release, added more background, updated texts and fixed links.

This commit is contained in:
Fristi 2021-10-18 00:27:53 +02:00
parent 4e1ebe6136
commit 204dccb0ad
No known key found for this signature in database
GPG key ID: A7451474B7F0D49B
20 changed files with 112 additions and 171 deletions

55
LICENSE Normal file
View file

@ -0,0 +1,55 @@
# Blue Oak Model License
Version 1.0.0
## Purpose
This license gives everyone as much permission to work with
this software as possible, while protecting contributors
from liability.
## Acceptance
In order to receive this license, you must agree to its
rules. The rules of this license are both obligations
under that agreement and conditions to your license.
You must not do anything with this software that triggers
a rule that you cannot or will not follow.
## Copyright
Each contributor licenses you to do everything with this
software that would otherwise infringe that contributor's
copyright in it.
## Notices
You must ensure that everyone who gets a copy of
any part of this software from you, with or without
changes, also gets the text of this license or a link to
<https://blueoakcouncil.org/license/1.0.0>.
## Excuse
If anyone notifies you in writing that you have not
complied with [Notices](#notices), you can keep your
license by taking all practical steps to comply within 30
days after the notice. If you do not do so, your license
ends immediately.
## Patent
Each contributor licenses you to do everything with this
software that would otherwise infringe any patent claims
they can license or become able to license.
## Reliability
No contributor can revoke this license.
## No Liability
***As far as the law allows, this software comes as is,
without any warranty or condition, and no contributor
will be liable to anyone for any damages related to this
software or this license, under any kind of legal claim.***

View file

@ -1,119 +0,0 @@
Creative Commons Legal Code
CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE
AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE
OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS
LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION
OR WORKS PROVIDED HEREUNDER.
Statement of Purpose
The laws of most jurisdictions throughout the world automatically confer exclusive
Copyright and Related Rights (defined below) upon the creator and subsequent
owner(s) (each and all, an "owner") of an original work of authorship and/or
a database (each, a "Work").
Certain owners wish to permanently relinquish those rights to a Work for the
purpose of contributing to a commons of creative, cultural and scientific
works ("Commons") that the public can reliably and without fear of later claims
of infringement build upon, modify, incorporate in other works, reuse and
redistribute as freely as possible in any form whatsoever and for any purposes,
including without limitation commercial purposes. These owners may contribute
to the Commons to promote the ideal of a free culture and the further production
of creative, cultural and scientific works, or to gain reputation or greater
distribution for their Work in part through the use and efforts of others.
For these and/or other purposes and motivations, and without any expectation
of additional consideration or compensation, the person associating CC0 with
a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
and publicly distribute the Work under its terms, with knowledge of his or
her Copyright and Related Rights in the Work and the meaning and intended
legal effect of CC0 on those rights.
1. Copyright and Related Rights. A Work made available under CC0 may be protected
by copyright and related or neighboring rights ("Copyright and Related Rights").
Copyright and Related Rights include, but are not limited to, the following:
i. the right to reproduce, adapt, distribute, perform, display, communicate,
and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or likeness
depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work, subject
to the limitations in paragraph 4(a), below;
v. rights protecting the extraction, dissemination, use and reuse of data
in a Work;
vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal protection
of databases, and under any national implementation thereof, including any
amended or successor version of such directive); and
vii. other similar, equivalent or corresponding rights throughout the world
based on applicable law or treaty, and any national implementations thereof.
2. Waiver. To the greatest extent permitted by, but not in contravention of,
applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
and Related Rights and associated claims and causes of action, whether now
known or unknown (including existing as well as future claims and causes of
action), in the Work (i) in all territories worldwide, (ii) for the maximum
duration provided by applicable law or treaty (including future time extensions),
(iii) in any current or future medium and for any number of copies, and (iv)
for any purpose whatsoever, including without limitation commercial, advertising
or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the
benefit of each member of the public at large and to the detriment of Affirmer's
heirs and successors, fully intending that such Waiver shall not be subject
to revocation, rescission, cancellation, termination, or any other legal or
equitable action to disrupt the quiet enjoyment of the Work by the public
as contemplated by Affirmer's express Statement of Purpose.
3. Public License Fallback. Should any part of the Waiver for any reason be
judged legally invalid or ineffective under applicable law, then the Waiver
shall be preserved to the maximum extent permitted taking into account Affirmer's
express Statement of Purpose. In addition, to the extent the Waiver is so
judged Affirmer hereby grants to each affected person a royalty-free, non
transferable, non sublicensable, non exclusive, irrevocable and unconditional
license to exercise Affirmer's Copyright and Related Rights in the Work (i)
in all territories worldwide, (ii) for the maximum duration provided by applicable
law or treaty (including future time extensions), (iii) in any current or
future medium and for any number of copies, and (iv) for any purpose whatsoever,
including without limitation commercial, advertising or promotional purposes
(the "License"). The License shall be deemed effective as of the date CC0
was applied by Affirmer to the Work. Should any part of the License for any
reason be judged legally invalid or ineffective under applicable law, such
partial invalidity or ineffectiveness shall not invalidate the remainder of
the License, and in such case Affirmer hereby affirms that he or she will
not (i) exercise any of his or her remaining Copyright and Related Rights
in the Work or (ii) assert any associated claims and causes of action with
respect to the Work, in either case contrary to Affirmer's express Statement
of Purpose.
4. Limitations and Disclaimers.
a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered,
licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or warranties
of any kind concerning the Work, express, implied, statutory or otherwise,
including without limitation warranties of title, merchantability, fitness
for a particular purpose, non infringement, or the absence of latent or other
defects, accuracy, or the present or absence of errors, whether or not discoverable,
all to the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without limitation
any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims
responsibility for obtaining any necessary consents, permissions or other
rights required for any use of the Work.
d. Affirmer understands and acknowledges that Creative Commons is not a party
to this document and has no duty or obligation with respect to this CC0 or
use of the Work.

BIN
backgrounds/10.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 802 KiB

BIN
backgrounds/11.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 MiB

BIN
backgrounds/12.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

BIN
backgrounds/13.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 513 KiB

BIN
backgrounds/14.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 MiB

BIN
backgrounds/15.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 KiB

BIN
backgrounds/16.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

BIN
backgrounds/17.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 MiB

BIN
backgrounds/18.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

BIN
backgrounds/19.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 KiB

BIN
backgrounds/20.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

BIN
backgrounds/21.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 KiB

BIN
backgrounds/22.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

BIN
backgrounds/23.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 KiB

View file

@ -2,10 +2,10 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Comfitu.re - Sweet and Cozy</title>
<title>Comfitu.re :: Sweet and Cozy</title>
<link href="style.css?v=1.2.2" rel="stylesheet"/>
<script src="script.js?v=1.2.2" type="application/javascript"></script>
<link href="style.css?v=1.3.0" rel="stylesheet"/>
<script src="script.js?v=1.3.0" type="application/javascript"></script>
</head>
<body>
@ -17,12 +17,12 @@
<pre>
___ __ _ _
/ __|___ _ __ / _(_) |_ _ _ _ _ ___
| (__/ _ \ ' \| _| | _| || |_| '_/ -_) <a href="#changelog">v1.2.2</a>
\___\___/_|_|_|_| |_|\__|\_,_(_)_| \___| by Fristi IN A CAN.
| (__/ _ \ ' \| _| | _| || |_| '_/ -_) <a href="#changelog">v1.3.0</a>
\___\___/_|_|_|_| |_|\__|\_,_(_)_| \___| by Fristi-brot.
</pre>
<a href="#home">Home</a>
| <a href="#about">About</a>
| <a href="#blogs">Blogs</a>
| <a href="#websites">Websites</a>
| <a href="#projects">Projects</a>
| <a href="#contact">Contact</a><br/>
</header>
@ -52,15 +52,14 @@
</pre>
<p>
Hello, welcome to my cozy personal website! 0w0
Hello, welcome to my cozy personal website! -w-
</p>
<p>
I am a webdeveloper and general tinkerer from the Netherlands.
Most of my time is usually spent on PHP/Laravel projects.
In my free time I maintain my Linux server, running a number
of services including a Pleroma microblogging instance, a Nextcloud instance,
a Prosody XMPP instance, as well as some of my websites and some other small things.
I am a programmer and web developer from the Netherlands.
I spend most of my time programming in PHP, and I run a Linux server in my
free time as a hobby. It mainly runs the subcon.town services. I also enjoy
retro video games.
</p>
</div>
@ -68,14 +67,14 @@
<h1>About me</h1>
<p>
Hi, my name is Fristi.
I am a webdeveloper, server admin and general tinkerer from the Netherlands.
I am a programmer, web developer and server admin from the Netherlands.
I'm an easy-going guy with a love for old electronics, games and food. If you wish
to talk to me, hit me up on the <a href="https://kartoffel.cafe/fristi">fediverse!</a>
to talk to me, hit me up on the <a href="https://mk.toast.cafe/@fristi">fediverse!</a>
</p>
<h2>Professional</h2>
<p>
I am mainly a back-end webdeveloper, specializing in PHP and the Laravel Framework.
I am mainly a back-end web developer, specializing in PHP and the Laravel Framework.
Besides that, I also do front-end work, usually focusing on creating simplistic
user interfaces with pure Javascript (no frameworks or jQuery) and Sass/CSS. I believe
that refraining from javascript frameworks results in cleaner, more optimized and more controllable code.
@ -92,20 +91,24 @@
</p>
</div>
<div class="content" id="blogs">
<h1>Blogs</h1>
<div class="content" id="websites">
<h1>Websites & Blogs</h1>
<p>
I'm momentarily working on two blogs:
I currently host the following websites:
</p>
<p>
- <a href="https://comfitu.re">Comfiture</a>:
my personal website, the one you're reading now.
<a href="https://vcs.subcon.town/fristi/comfitu.re">Source</a><br/>
- <a href="https://something.comfitu.re/">Something Comfy</a>:
a blog featuring my random thoughts on various things<br />
a blog featuring my random thoughts on various things.
<a href="https://vcs.subcon.town/fristi/something-fresh">Source</a><br />
- <a href="https://paperbin.comfitu.re/">The Paperbin</a>:
a blog where I rant about the things that annoy me
</p>
<p>
These blogs are currently offline pending some work that needs to be
done on them, so check back later!
a blog where I rant about the things that annoy me.
<a href="https://vcs.subcon.town/fristi/paperbin">Source</a><br/>
- <a href="https://subcon.town/">Subcon Town</a>:
the main website of my personal server.
<a href="https://vcs.subcon.town/fristi/subcon.town">Source</a>
</p>
</div>
@ -118,30 +121,15 @@
<h2>Software</h2>
<p>
- <a href="https://git.subcon.town/fristi/console-writer">Console Writer</a>:
- <a href="https://vcs.subcon.town/fristi/console-writer">Console Writer</a>:
a small symfony/laravel package with improved console input/output handling.<br/>
- A few other things I need to make available on my git repositories, check back later!
</p>
<h2>Websites</h2>
<p>
- <a href="https://comfitu.re">Comfiture</a>:
my personal website, the one you're reading now. <a href="https://git.subcon.town/fristi/comfitu.re">Source</a><br/>
- <a href="https://something.comfitu.re/">Something Comfy</a>:
my blog where I post my random thoughts on various things. No source yet (still busy!)
- <a href="https://paperbin.comfitu.re/">The Paperbin</a>:
my personal blog, filled with rants. <a href="https://git.subcon.town/fristi/jigsaw-puzzle">Source</a><br/>
- A few others that require cleaning up, check back later!
</p>
<h2>Services</h2>
<p>
- <a href="https://kartoffel.cafe/">Kartoffel Cafe</a>:
a federated microblogging instance powered by <a href="https://pleroma.social/">Pleroma</a>.<br/>
- <a href="https://cloud.subcon.town/">Subcon Cloud</a>:
a cloud based file hosting solution powered by <a href="https://nextcloud.com/">Nextcloud</a>.<br/>
- <a href="https://git.subcon.town/">SubGit</a>:
a git hosting solution powered by <a href="https://gitea.io/">Gitea</a>.<br/>
For a list of services that I currently host,
please view the <a href="https://subcon.town">Subcon Town</a> website.
</p>
</div>
@ -152,23 +140,25 @@
</p>
<p>
Email: <a href="mailto:fristi@subcon.town">fristi@subcon.town</a><br/>
Fediverse: <a target="_blank" href="https://kartoffel.cafe/fristi">@fristi@kartoffel.cafe</a>
Fediverse: <a target="_blank" href="https://mk.toast.cafe/@fristi">@fristi@mk.toast.cafe</a>
</p>
</div>
<div class="content" id="copyright">
<h1>Copyright notice</h1>
<p>
Unless otherwise specified, the Creative Commons Zero (CC0)
clause applies to this website, including its content
and source code. Please see the <a target="_blank" href="LICENSE.md">CC0 clause</a>
and <a target="_blank" href="https://git.subcon.town/fristi/comfitu.re">source code</a>.
Unless otherwise specified below, the content and source code of this website are
licensed under the Blue Oak Model License 1.0.0.
A copy of this license may be viewed <a target="_blank" href="LICENSE">here</a>.
Additionally, the website source code can be viewed
<a target="_blank" href="https://vcs.subcon.town/fristi/comfitu.re">here</a>.
</p>
<h2>Exceptions regarding media content</h2>
<p>
The CC0 clause does not apply to the images, videos, audio and fonts used on
this website. The respective copyright licenses for these works apply.
The media used on this website, including images, videos, audio and fonts, fall
under their own respective copyright licenses, and are thus not subject to the
above mentioned Blue Oak Model License.
</p>
<h2>Complaints</h2>
@ -181,6 +171,14 @@
<div class="content" id="changelog">
<h1>Changelog</h1>
<p>
1.3.0 Minor update:<br/>
- Updated site texts<br/>
- Fixed git links to now direct to vcs.subcon.town<br/>
- Updated personal contact info<br/>
- Fixed css issue causing scrollbars to appear when not needed<br/>
- Added more backgrounds
</p>
<p>
1.2.2 Patch:<br/>
- Cleaned up javascript code<br/>
@ -208,7 +206,7 @@
<footer>
<br/>
<div style="text-align: right"><a href="#copyright">CC0</a> 2021 Comfitu.re. No rights reserved.</div>
<div style="text-align: right"><a href="#copyright">BOML</a> 2021 Comfitu.re.</div>
</footer>
</div>

View file

@ -5,8 +5,11 @@
var wallpapers = [
'1.gif', '2.gif', '3.gif', '4.gif',
'5.gif', '6.gif', '7.gif', '8.gif',
'9.gif',
'1.png', '2.png', '3.png', '4.png',
'9.gif', '10.gif', '11.gif', '12.gif',
'13.gif', '14.gif', '15.gif', '16.gif',
'17.gif', '18.gif', '19.gif', '20.gif',
'21.gif', '22.gif', '23.gif',
'1.png', '2.png', '3.png',
'5.png', '6.png', '7.png', '8.png',
'9.png',
];

View file

@ -147,3 +147,7 @@ pre {
padding:0;
font-family: IBMVGA8, monospace;
}
.content p:last-child {
margin:0;
}