chris/chris-website
chris/chris-website
1
0
Fork 0
Code Issues 9 Pull requests Releases Wiki Activity

Compare commits

base: chris:master
Branches Tags
chris:master
chris:feature/indieweb
chris:release
..
compare: chris:release
Branches Tags
chris:master
chris:feature/indieweb
chris:release

No commits in common. "master" and "release" have entirely different histories.
master ... release

37 changed files with 1809 additions and 1448 deletions
Show stats Expand all files Collapse all files

7
.gitignore vendored
View file

@ -13,7 +13,6 @@ mijnblog-test-*
*.o *.o
*.obj *.obj
*.lst *.lst
/articles/ articles/
/pages/ pages/
/projects/ projects/
/result

660
LICENSE.md
View file

@ -1,660 +0,0 @@
### GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc.
<https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
### Preamble
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains
free software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing
under this license.
The precise terms and conditions for copying, distribution and
modification follow.
### TERMS AND CONDITIONS
#### 0. Definitions.
"This License" refers to version 3 of the GNU Affero General Public
License.
"Copyright" also means copyright-like laws that apply to other kinds
of works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of
an exact copy. The resulting work is called a "modified version" of
the earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user
through a computer network, with no transfer of a copy, is not
conveying.
An interactive user interface displays "Appropriate Legal Notices" to
the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
#### 1. Source Code.
The "source code" for a work means the preferred form of the work for
making modifications to it. "Object code" means any non-source form of
a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users can
regenerate automatically from other parts of the Corresponding Source.
The Corresponding Source for a work in source code form is that same
work.
#### 2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not convey,
without conditions so long as your license otherwise remains in force.
You may convey covered works to others for the sole purpose of having
them make modifications exclusively for you, or provide you with
facilities for running those works, provided that you comply with the
terms of this License in conveying all material for which you do not
control copyright. Those thus making or running the covered works for
you must do so exclusively on your behalf, under your direction and
control, on terms that prohibit them from making any copies of your
copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under the
conditions stated below. Sublicensing is not allowed; section 10 makes
it unnecessary.
#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such
circumvention is effected by exercising rights under this License with
respect to the covered work, and you disclaim any intention to limit
operation or modification of the work as a means of enforcing, against
the work's users, your or third parties' legal rights to forbid
circumvention of technological measures.
#### 4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
#### 5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these
conditions:
- a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
- b) The work must carry prominent notices stating that it is
released under this License and any conditions added under
section 7. This requirement modifies the requirement in section 4
to "keep intact all notices".
- c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
- d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
#### 6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms of
sections 4 and 5, provided that you also convey the machine-readable
Corresponding Source under the terms of this License, in one of these
ways:
- a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
- b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the Corresponding
Source from a network server at no charge.
- c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
- d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
- e) Convey the object code using peer-to-peer transmission,
provided you inform other peers where the object code and
Corresponding Source of the work are being offered to the general
public at no charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal,
family, or household purposes, or (2) anything designed or sold for
incorporation into a dwelling. In determining whether a product is a
consumer product, doubtful cases shall be resolved in favor of
coverage. For a particular product received by a particular user,
"normally used" refers to a typical or common use of that class of
product, regardless of the status of the particular user or of the way
in which the particular user actually uses, or expects or is expected
to use, the product. A product is a consumer product regardless of
whether the product has substantial commercial, industrial or
non-consumer uses, unless such uses represent the only significant
mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to
install and execute modified versions of a covered work in that User
Product from a modified version of its Corresponding Source. The
information must suffice to ensure that the continued functioning of
the modified object code is in no case prevented or interfered with
solely because modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or
updates for a work that has been modified or installed by the
recipient, or for the User Product in which it has been modified or
installed. Access to a network may be denied when the modification
itself materially and adversely affects the operation of the network
or violates the rules and protocols for communication across the
network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
#### 7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders
of that material) supplement the terms of this License with terms:
- a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
- b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
- c) Prohibiting misrepresentation of the origin of that material,
or requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
- d) Limiting the use for publicity purposes of names of licensors
or authors of the material; or
- e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
- f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions
of it) with contractual assumptions of liability to the recipient,
for any liability that these contractual assumptions directly
impose on those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions; the
above requirements apply either way.
#### 8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your license
from a particular copyright holder is reinstated (a) provisionally,
unless and until the copyright holder explicitly and finally
terminates your license, and (b) permanently, if the copyright holder
fails to notify you of the violation by some reasonable means prior to
60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
#### 9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or run
a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
#### 10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
#### 11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims owned
or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within the
scope of its coverage, prohibits the exercise of, or is conditioned on
the non-exercise of one or more of the rights that are specifically
granted under this License. You may not convey a covered work if you
are a party to an arrangement with a third party that is in the
business of distributing software, under which you make payment to the
third party based on the extent of your activity of conveying the
work, and under which the third party grants, to any of the parties
who would receive the covered work from you, a discriminatory patent
license (a) in connection with copies of the covered work conveyed by
you (or copies made from those copies), or (b) primarily for and in
connection with specific products or compilations that contain the
covered work, unless you entered into that arrangement, or that patent
license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
#### 12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under
this License and any other pertinent obligations, then as a
consequence you may not convey it at all. For example, if you agree to
terms that obligate you to collect a royalty for further conveying
from those to whom you convey the Program, the only way you could
satisfy both those terms and this License would be to refrain entirely
from conveying the Program.
#### 13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your
version supports such interaction) an opportunity to receive the
Corresponding Source of your version by providing access to the
Corresponding Source from a network server at no charge, through some
standard or customary means of facilitating copying of software. This
Corresponding Source shall include the Corresponding Source for any
work covered by version 3 of the GNU General Public License that is
incorporated pursuant to the following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
#### 14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Affero General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever
published by the Free Software Foundation.
If the Program specifies that a proxy can decide which future versions
of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
#### 15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
CORRECTION.
#### 16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
#### 17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
### How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these
terms.
To do so, attach the following notices to the program. It is safest to
attach them to the start of each source file to most effectively state
the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper
mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for
the specific requirements.
You should also get your employer (if you work as a programmer) or
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. For more information on this, and how to apply and follow
the GNU AGPL, see <https://www.gnu.org/licenses/>.

27
defaultClasses.lua
View file

@ -1,27 +0,0 @@
local default_code_classes = {}
function add_default_code_class(el)
el.classes[#el.classes+1] = 'numberSource'
if #(el.classes) == 1 then
el.classes = default_code_classes
end
return el
end
function get_default_code_class(meta)
if meta['default-code-class'] then
default_code_classes = {pandoc.utils.stringify(meta['default-code-class'])}
end
end
function make_image_url_absolute (img)
if img.src:sub(1,1) == '/' then
img.src = os.getenv 'WEBROOT' .. img.src
end
return img
end
return {{Meta = get_default_code_class},
{Code = add_default_code_class},
{CodeBlock = add_default_code_class},
{Image = make_image_url_absolute}}

6
dub.json
View file

@ -5,12 +5,10 @@
"copyright": "Copyright © 2019, Chris Josten", "copyright": "Copyright © 2019, Chris Josten",
"dependencies": { "dependencies": {
"dyaml": "~>0.8.0", "dyaml": "~>0.8.0",
"vibe-d": "~>0.9.0" "vibe-d": "~>0.8.6"
}, },
"description": "A blog based on Markdown and JSON", "description": "A blog based on Markdown and JSON",
"license": "AGPLv3", "license": "AGPLv3",
"name": "mijnblog", "name": "mijnblog",
"targetType": "executable", "stringImportPaths": ["views", "translations"]
"stringImportPaths": ["views", "translations"],
"versions": ["DeimosOpenSSL_3_0"]
} }

22
dub.selections.json
View file

@ -1,23 +1,21 @@
{ {
"fileVersion": 1, "fileVersion": 1,
"versions": { "versions": {
"botan": "1.12.19", "botan": "1.12.10",
"botan-math": "1.0.3", "botan-math": "1.0.3",
"diet-ng": "1.8.1", "diet-ng": "1.6.0",
"dyaml": "0.8.6", "dyaml": "0.8.0",
"eventcore": "0.9.26", "eventcore": "0.8.48",
"fswatch": "0.5.0", "fswatch": "0.5.0",
"libasync": "0.8.6", "libasync": "0.8.4",
"libevent": "2.0.2+2.0.16", "libevent": "2.0.2+2.0.16",
"memutils": "1.0.9", "memutils": "0.4.13",
"mir-linux-kernel": "1.0.1", "mir-linux-kernel": "1.0.1",
"openssl": "3.3.3", "openssl": "1.1.6+1.0.1g",
"openssl-static": "1.0.2+3.0.8",
"stdx-allocator": "2.77.5", "stdx-allocator": "2.77.5",
"taggedalgebraic": "0.11.22", "taggedalgebraic": "0.11.7",
"tinyendian": "0.2.0", "tinyendian": "0.2.0",
"vibe-container": "1.0.1", "vibe-core": "1.7.0",
"vibe-core": "2.5.1", "vibe-d": "0.8.6"
"vibe-d": "0.9.7"
} }
} }

122
dub.selections.nix
View file

@ -1,4 +1,4 @@
# This file was generated by https://github.com/lionello/dub2nix v0.2.4 # This file was generated by https://github.com/lionello/dub2nix v0.2.1
[ { [ {
fetch = { fetch = {
type = "git"; type = "git";
@ -51,61 +51,49 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/etcimon/memutils.git"; url = "https://github.com/etcimon/memutils.git";
rev = "v1.0.9"; rev = "v0.4.13";
sha256 = "08j9grn3l6gr275m392l0dfsx5ma6hs08gjfhh48hpy3v0bvb0ny"; sha256 = "12mssymhimfsw6flkchqg0ql3qrs91dlh88xjdw5il8rb4h4ddfz";
fetchSubmodules = false; fetchSubmodules = false;
date = "2023-03-02T15:19:28-05:00"; date = "2018-10-09T11:51:45-04:00";
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
path = "/nix/store/glnf0ljd84mv6gzc9wgs1qq0vqqxvmzh-memutils"; path = "/nix/store/hszwaxwm26bqp3h761j3kq1hsbs3hpra-memutils";
}; };
} { } {
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/s-ludwig/taggedalgebraic.git"; url = "https://github.com/s-ludwig/taggedalgebraic.git";
rev = "v0.11.22"; rev = "v0.11.7";
sha256 = "02iy90nwy0zzy25hwdqbcgd0w0lwzramcvi3pgyljhq0w0vl5hkq"; sha256 = "1q8pg3r1zw72114y76kgr73iylp77m4wrl180r6d632vc0x8r58f";
fetchSubmodules = false; fetchSubmodules = false;
date = "2021-05-20T21:00:02+02:00"; date = "2019-11-01T09:00:47+01:00";
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
path = "/nix/store/p8id0qb13j8pjdczflj2x35w6v63q4cx-taggedalgebraic"; path = "/nix/store/x1qwbzxp7nx0fpwvr4v30j0nnwf6pjcx-taggedalgebraic";
};
} {
fetch = {
type = "git";
url = "https://github.com/vibe-d/vibe-container.git";
rev = "v1.0.1";
sha256 = "0miynjmfzz340z3qw9mclaj6cyirzrpk528idr5yfmvl3jsi6wh8";
fetchSubmodules = false;
date = "2023-11-27T09:12:47+01:00";
deepClone = false;
leaveDotGit = false;
path = "/nix/store/2vnn20q8k335h5k078yk4lrxkp4y63pd-vibe-container";
};
} {
fetch = {
type = "git";
url = "https://github.com/vibe-d/vibe.d.git";
rev = "v0.9.7";
sha256 = "1q4yvcaf36lmf29izg01x888v40snpwiph310nrlpr4gyhd834av";
fetchSubmodules = false;
date = "2023-08-29T13:24:09+02:00";
deepClone = false;
leaveDotGit = false;
path = "/nix/store/7fq089i7zib7m9hxyl75mlfy264d9gnx-vibe.d";
}; };
} { } {
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/vibe-d/vibe-core.git"; url = "https://github.com/vibe-d/vibe-core.git";
rev = "v2.5.1"; rev = "v1.7.0";
sha256 = "1g66vyn9hivy8rmsdl1xg1vz41csq5k91c04yvp4wqbil9cwgqdr"; sha256 = "0mp8daspzn0ww9jr6nf0zwdj6ff6j7l4j5h6h450z18zn7kjkd8x";
fetchSubmodules = false; fetchSubmodules = false;
date = "2023-11-24T17:25:20+01:00"; date = "2019-09-17T23:40:53+02:00";
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
path = "/nix/store/iddq1amvzic8fn4xa2317ykmkrkdr51y-vibe-core"; path = "/nix/store/g46p3lfzkcsrdcvxv25a2g2vhcfghdgr-vibe-core";
};
} {
fetch = {
type = "git";
url = "https://github.com/vibe-d/vibe.d.git";
rev = "v0.8.6";
sha256 = "1zqan3rsjmkxnq8wxnzrj4vw912lnnp2fphzfz1sriyysj59b28f";
fetchSubmodules = false;
date = "2019-10-03T17:14:48+02:00";
deepClone = false;
leaveDotGit = false;
path = "/nix/store/wsskmj5cs3p6nlkfc80z8bm90nxxvy0n-vibe.d";
}; };
} { } {
fetch = { fetch = {
@ -123,25 +111,25 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/etcimon/botan.git"; url = "https://github.com/etcimon/botan.git";
rev = "v1.12.19"; rev = "v1.12.10";
sha256 = "16s9lzmj2m1yb77nlyl99p9rvaiddn2afz4r9liajiygdmqakfiz"; sha256 = "02zrq9wcb1hhsl9psgkvi65g6c7g990yy9d75gjgbz4b1wb61nwf";
fetchSubmodules = false; fetchSubmodules = false;
date = "2020-08-19T13:56:38-04:00"; date = "2018-06-22T15:33:04-04:00";
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
path = "/nix/store/0s6757ghz3qlh3z2nk4jbixmdqfn23s8-botan"; path = "/nix/store/a1431sfkpz8dk0jlix5zn90g19av1lnc-botan";
}; };
} { } {
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/rejectedsoftware/diet-ng.git"; url = "https://github.com/rejectedsoftware/diet-ng.git";
rev = "v1.8.1"; rev = "v1.6.0";
sha256 = "11hrbvsxhipvcz9m1qlq92iaw0h35pzdy5rf7z8c4vx3hwjrnhni"; sha256 = "02pj2rf2qfi0acnw496nr480hj47ggy4isfhsvdajd6al4h03a6x";
fetchSubmodules = false; fetchSubmodules = false;
date = "2022-04-22T11:38:43+02:00"; date = "2019-08-16T19:55:02+02:00";
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
path = "/nix/store/xziliy9ah3s3ah8mslnxsw47n4w6wkca-diet-ng"; path = "/nix/store/jld9bk9vr9k2pfb3li1zcvhilka8gdzl-diet-ng";
}; };
} { } {
fetch = { fetch = {
@ -159,60 +147,48 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/D-Programming-Deimos/openssl.git"; url = "https://github.com/D-Programming-Deimos/openssl.git";
rev = "v3.3.3"; rev = "v1.1.6+1.0.1g";
sha256 = "1634j4psp3qwgwhk2sa3jj6gvwv3i96hpg2wrdy9ihjhabnszn0f"; sha256 = "0ramqjyq4v7xpqwf4nf4ddmsg6yk2fbzn2d1yj4b6dla3q5lv9i3";
fetchSubmodules = false; fetchSubmodules = false;
date = "2023-09-14T12:05:32+00:00"; date = "2017-11-05T20:15:26+01:00";
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
path = "/nix/store/i3pgh154r80xvh4vsnl6srg6khmk5dg7-openssl"; path = "/nix/store/jbfb5in6gzqs2byn1hdc1625yh8sx6j2-openssl";
}; };
} { } {
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/vibe-d/eventcore.git"; url = "https://github.com/vibe-d/eventcore.git";
rev = "v0.9.26"; rev = "v0.8.48";
sha256 = "13bjs5v5l1387vi2ss4gvqlslhq33v9sn4pg7nis4r0wdw0zmlk1"; sha256 = "1ifx4sr04x7mvw1w9g3n72szy83q487ya0yi212czys4bgwdvkiz";
fetchSubmodules = false; fetchSubmodules = false;
date = "2023-09-16T09:46:45+02:00"; date = "2019-10-25T22:46:08+02:00";
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
path = "/nix/store/zy7ydasg4fwnim2m1mi4gzdg9l087wpb-eventcore"; path = "/nix/store/65g2z4y29z49cfjvan2dz01nyd4x5mdp-eventcore";
}; };
} { } {
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/kiith-sa/D-YAML.git"; url = "https://github.com/kiith-sa/D-YAML.git";
rev = "v0.8.6"; rev = "v0.8.0";
sha256 = "1bvidcxp1n65r4wmiqakyl8vjvhqh3gln9wbsmbxrx9mf6k0zv8h"; sha256 = "1my9yck316q0kqalxkhfpffgvrfskin4qw3171md4iz3qbhwb799";
fetchSubmodules = false; fetchSubmodules = false;
date = "2022-05-15T16:18:02-03:00"; date = "2019-05-26T20:26:26+02:00";
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
path = "/nix/store/zd0yayd1j11809j95sjs4gdqcngvkhbg-D-YAML"; path = "/nix/store/v30av8a9fqrvhqz09qqiljbcr88dbx0z-D-YAML";
}; };
} { } {
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/etcimon/libasync.git"; url = "https://github.com/etcimon/libasync.git";
rev = "v0.8.6"; rev = "v0.8.4";
sha256 = "1pbvlfxbp3p0ld0552dzdl4ng5939f84drjbcj8a7g199p1ih045"; sha256 = "13v3dg0838j9h377cs9bq2nk71nrchx6kix9mwiy0fhw7sf7nxb4";
fetchSubmodules = false; fetchSubmodules = false;
date = "2020-02-22T09:07:54-05:00"; date = "2019-02-28T10:02:56-05:00";
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
path = "/nix/store/6l82qf5nav5pkbvnrhcs5v9vwj5xycq3-libasync"; path = "/nix/store/6b552a8zdl8z99gc11xgj95k52vwvlcw-libasync";
};
} {
fetch = {
type = "git";
url = "https://github.com/bildhuus/deimos-openssl-static.git";
rev = "v1.0.2+3.0.8";
sha256 = "00wllmfrjpq5ln3zs9qcqf4kq2i6bqbjxwj0jnxwwz125kfm55sy";
fetchSubmodules = false;
date = "2023-02-24T13:23:37+01:00";
deepClone = false;
leaveDotGit = false;
path = "/nix/store/g9shdkm450yg8c15rvqms8v09vql8z0l-deimos-openssl-static";
}; };
} ] } ]

6
mijnblog.nix
View file

@ -6,11 +6,7 @@ mkDubDerivation {
src = ./.; src = ./.;
dubJSON = ./dub.json; dubJSON = ./dub.json;
selections = ./dub.selections.nix; selections = ./dub.selections.nix;
version = "0.0.3"; version = "0.0.1";
buildInputs = [ pkgs.openssl ]; buildInputs = [ pkgs.openssl ];
propagatedBuildInputs = [ pkgs.nix-prefetch-git ]; propagatedBuildInputs = [ pkgs.nix-prefetch-git ];
extraDubFlags = "--override-config openssl/library-manual-version";
preBuild = ''
export DC=${pkgs.dmd}/bin/dmd
'';
} }

33
mkDub.nix
View file

@ -1,9 +1,7 @@
{ pkgs ? import <nixpkgs> {}, { pkgs ? import <nixpkgs> {},
stdenv ? pkgs.stdenv, stdenv ? pkgs.stdenv,
lib ? pkgs.lib, rdmd ? pkgs.rdmd,
dtools ? pkgs.dtools or pkgs.rdmd,
dmd ? pkgs.dmd, dmd ? pkgs.dmd,
dcompiler ? dmd,
dub ? pkgs.dub }: dub ? pkgs.dub }:
with stdenv; with stdenv;
@ -22,7 +20,7 @@ let
fromDub = dubDep: mkDerivation rec { fromDub = dubDep: mkDerivation rec {
name = "${src.name}-${version}"; name = "${src.name}-${version}";
version = rev-to-version dubDep.fetch.rev; version = rev-to-version dubDep.fetch.rev;
nativeBuildInputs = [ dcompiler dtools dub ]; nativeBuildInputs = [ rdmd dmd dub ];
src = dep2src dubDep; src = dep2src dubDep;
buildPhase = '' buildPhase = ''
@ -48,18 +46,10 @@ let
targetOf = package: "${package.targetPath or "."}/${package.targetName or package.name}"; targetOf = package: "${package.targetPath or "."}/${package.targetName or package.name}";
# Remove reference to build tools and library sources # Remove reference to build tools and library sources
disallowedReferences = deps: [ dcompiler dtools dub ] ++ builtins.map dep2src deps; disallowedReferences = deps: [ dmd rdmd dub ] ++ builtins.map dep2src deps;
removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
# Like split, but only keep the matches
matches = regex: str: builtins.filter lib.isList (builtins.split regex str);
# Very primitive parsing of SDL files, but suffices for name, description, homepage, etc.
importSDL = path: builtins.foldl' (a: l: a // {"${lib.elemAt l 1}"=lib.elemAt l 2;}) {} (matches "(^|\n)([a-z]+) \"([^\"]+)\"" (builtins.readFile path));
importPackage = sdl: json: if builtins.pathExists sdl then importSDL sdl else lib.importJSON json;
in { in {
inherit fromDub; inherit fromDub;
@ -67,23 +57,20 @@ in {
src, src,
nativeBuildInputs ? [], nativeBuildInputs ? [],
dubJSON ? src + "/dub.json", dubJSON ? src + "/dub.json",
dubSDL ? src + "/dub.sdl",
buildType ? "release",
extraDubFlags ? "",
selections ? src + "/dub.selections.nix", selections ? src + "/dub.selections.nix",
deps ? import selections, deps ? import selections,
package ? importPackage dubSDL dubJSON,
passthru ? {}, passthru ? {},
package ? lib.importJSON dubJSON,
... ...
} @ attrs: stdenv.mkDerivation ((removeAttrs attrs ["package" "deps" "selections" "dubJSON" "dubSDL"]) // { } @ attrs: stdenv.mkDerivation (attrs // {
pname = package.name; pname = package.name;
nativeBuildInputs = [ dcompiler dtools dub pkgs.removeReferencesTo ] ++ nativeBuildInputs; nativeBuildInputs = [ rdmd dmd dub pkgs.removeReferencesTo ] ++ nativeBuildInputs;
disallowedReferences = disallowedReferences deps; disallowedReferences = disallowedReferences deps;
passthru = passthru // { passthru = passthru // {
inherit dub dcompiler dtools pkgs; inherit dub dmd rdmd pkgs;
}; };
src = lib.cleanSourceWith { src = lib.cleanSourceWith {
@ -100,7 +87,7 @@ in {
export HOME=$PWD export HOME=$PWD
${lib.concatMapStringsSep "\n" dub-add-local deps} ${lib.concatMapStringsSep "\n" dub-add-local deps}
dub build -b ${buildType} --combined --skip-registry=all ${extraDubFlags} dub build -b release --combined --skip-registry=all
runHook postBuild runHook postBuild
''; '';
@ -110,7 +97,7 @@ in {
export HOME=$PWD export HOME=$PWD
${lib.concatMapStringsSep "\n" dub-add-local deps} ${lib.concatMapStringsSep "\n" dub-add-local deps}
dub test --combined --skip-registry=all ${extraDubFlags} dub test --combined --skip-registry=all
runHook postCheck runHook postCheck
''; '';
@ -126,8 +113,6 @@ in {
meta = lib.optionalAttrs (package ? description) { meta = lib.optionalAttrs (package ? description) {
description = package.description; description = package.description;
} // lib.optionalAttrs (package ? homepage) {
homepage = package.homepage;
} // attrs.meta or {}; } // attrs.meta or {};
} // lib.optionalAttrs (!(attrs ? version)) { } // lib.optionalAttrs (!(attrs ? version)) {
# Use name from dub.json, unless pname and version are specified # Use name from dub.json, unless pname and version are specified

1238
public/static/script/prism.js Normal file
View file

File diff suppressed because it is too large Load diff

161
public/static/style/base.css
View file

@ -1,9 +1,36 @@
@media (max-width: 850px) {
body {
flex-wrap: wrap;
}
body > main {
box-sizing: border-box;
min-width: 100%;
}
body > section.header-navigation, body > footer {
width: 100%;
flex-grow: 1 !important;
}
.hide-small {
display: none;
}
.hide-big {
display: block !important;
}
}
.hide-big {
display: none;
}
:root { :root {
font-family: "sans-serif"; font-family: "sans-serif";
--colour-bg: #f0f0f0; --colour-bg: #f0f0f0;
--colour-bg-main: #ddd; --colour-bg-main: #ddd;
--colour-bg-code: #ccc; --colour-bg-code: #ccc;
--colour-bg-highlight: #f9f890;
--colour-fg: #000000; --colour-fg: #000000;
--colour-fg-highlight: #7f0602; --colour-fg-highlight: #7f0602;
--colour-fg-lineno: #111; --colour-fg-lineno: #111;
@ -18,7 +45,6 @@
--colour-bg: #101010; --colour-bg: #101010;
--colour-bg-main: #333; --colour-bg-main: #333;
--colour-bg-code: #222; --colour-bg-code: #222;
--colour-bg-highlight: #727000;
--colour-fg: #ffffff; --colour-fg: #ffffff;
--colour-fg-highlight: #fc918d; --colour-fg-highlight: #fc918d;
--colour-fg-lineno: #ccc; --colour-fg-lineno: #ccc;
@ -33,54 +59,43 @@ body {
background-color: #f0f0f0; background-color: #f0f0f0;
background-color: var(--colour-bg); background-color: var(--colour-bg);
margin: 0; margin: 0;
display: grid; display: flex;
grid-template-columns: 2em 200px 600px min-content;
grid-column-gap: 2em;
grid-template-rows: 2em min-content min-content 1fr;
grid-template-areas:
". . main . "
". header main sidebar"
". menu main sidebar"
". footer main sidebar";
justify-content: center; justify-content: center;
min-height: 100vh; min-height: 100vh;
color: #000000; color: #000000;
color: var(--colour-fg); color: var(--colour-fg);
} }
body > nav { body > section.header-navigation {
grid-area: menu; flex: 0 0 200px;
padding: 2em;
} }
body > footer { body > footer {
grid-area: footer; flex: 0 0 200px;
margin-top: 0; padding: 2em;
border: none;
} }
body > header { body > section.header-navigation > header {
grid-area: header;
text-align: center; text-align: center;
margin-bottom: 0;
} }
body > header > img {
body > section.header-navigation > header > img {
width: 100%; width: 100%;
max-width: 160px; max-width: 160px;
} }
body > section.main-sidebar {
grid-area: sidebar;
}
body > main { body > main {
grid-area: main; flex: 1 1;
padding: 2em; padding: 2em;
/* width: 600px; */ /* width: 600px; */
border-left: #7f0602 dotted 1px; border-left: #7f0602 dotted 1px;
border-right: #7f0602 dotted 1px; border-right: #7f0602 dotted 1px;
border-left: var(--colour-fg-highlight) dotted 1px; border-left: var(--colour-fg-highlight) dotted 1px;
border-right: var(--colour-fg-highlight) dotted 1px; border-right: var(--colour-fg-highlight) dotted 1px;
max-width: calc(600px); max-width: 600px;
background-color: #ddd; background-color: #ddd;
background-color: var(--colour-bg-main); background-color: var(--colour-bg-main);
} }
@ -161,10 +176,6 @@ dl.project-platforms-technologies {
border-bottom: 1px dotted var(--colour-fg); border-bottom: 1px dotted var(--colour-fg);
} }
dt + dd.tag {
margin-left: 40px;
}
.tag { .tag {
display: inline-block; display: inline-block;
background-color: #ccc; background-color: #ccc;
@ -251,97 +262,7 @@ a {
text-decoration: underline dotted; text-decoration: underline dotted;
} }
a:hover, a:focus { a:hover {
color: var(--colour-fg); color: var(--colour-fg);
text-decoration: underline solid; text-decoration: underline solid;
} }
@media (max-width: calc(800px + 8em)) {
body {
grid-template-columns: 100%;
grid-column-gap: 2em;
grid-template-rows: repeat(4, min-content);
grid-template-areas:
"header"
"menu"
"main"
"footer";
}
body > .main-sidebar {
display: none;
}
body > main {
box-sizing: border-box;
min-width: 100%;
border: none;
border-top: #7f0602 dotted 1px;
border-bottom: #7f0602 dotted 1px;
border-top: var(--colour-fg-highlight) dotted 1px;
border-bottom: var(--colour-fg-highlight) dotted 1px;
}
body > nav, body > footer {
width: calc(100% - 4em);
padding: 2em;
}
}
@media (pointer: coarse) {
body > nav li a {
display: inline-block;
padding: 1em 2em;
width: calc(100% - 4em);
}
body > nav > ul {
width: 100%;
}
body > nav li:not(:last-child) {
border-bottom: 1px dotted #000000;
border-bottom: 1px dotted var(--colour-fg);
}
body > nav {
padding: 1em 0em;
width: 100%;
}
}
@media print {
body {
background-color: initial;
flex-direction: column;
}
body > section.header-navigation {
display: none;
}
body > main {
max-width: 100%;
background-color: initial;
border: none;
}
div.sourceCode, .screenshots, figure {
background-color: initial;
}
.hide-big {
display: block !important;
}
.hide-small {
display: none !important;
}
a:after {
content: ' (' attr(href) ')';
}
.numberSource a:after {
content: ''
}
}

1
public/static/style/highlight.css
View file

@ -60,4 +60,3 @@ code span.st { color: var(--colour-fg-code-string); } /* String */
code span.va { color: #19177c; } /* Variable */ code span.va { color: #19177c; } /* Variable */
code span.vs { color: #4070a0; } /* VerbatimString */ code span.vs { color: #4070a0; } /* VerbatimString */
code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
code span:target { background-color: var(--colour-bg-highlight); }

3
public/static/style/mobile.css Normal file
View file

@ -0,0 +1,3 @@
body {
background: red;
}

35
public/static/style/old.css
View file

@ -2,37 +2,14 @@ body {
background-image: url(old/chip.jpg); background-image: url(old/chip.jpg);
cursor: url(old/cursor.gif), auto; cursor: url(old/cursor.gif), auto;
justify-content: flex-start; justify-content: flex-start;
grid-column-gap: 0em;
grid-template-columns: 200px 600px;
grid-template-rows: min-content min-content 1fr;
grid-template-areas:
"header main"
"menu main"
"footer main";
}
.main-sidebar {
display: none;
}
header {
border-bottom: solid 40px;
border-image: url(old/flames.gif) 0 0 200 0 round round;
}
footer {
border-top: solid 40px;
border-image: url(old/flames.gif) 200 0 0 round round;
} }
a:hover { a:hover {
cursor: url(old/cursor-over.gif), auto; cursor: url(old/cursor-over.gif), auto;
color: red;
} }
body > nav, body > header, body > footer { body > nav {
background-color: cyan; background-color: yellow;
color: black;
} }
body > nav ul { body > nav ul {
@ -40,8 +17,8 @@ body > nav ul {
list-style-image: url(old/bullet.gif); list-style-image: url(old/bullet.gif);
} }
body main { body > main {
background-color: green; background-color: black;
color: white; color: white;
border-image: url(old/skull-border.gif) 33% / 2em round; border-image: url(old/skull-border.gif) 33% / 2em round;
/*border-left-width: 10px !important; /*border-left-width: 10px !important;
@ -50,7 +27,7 @@ body main {
.title { .title {
width: 100%; width: 100%;
color: orange; background-color: green;
} }
pre { pre {
@ -58,7 +35,7 @@ pre {
} }
blockquote, .screenshots, code{ blockquote, .screenshots, code{
background: darkgreen; background: #0000ff;
border-left: #0000cc 6px solid; border-left: #0000cc 6px solid;
} }

BIN
public/static/style/old/flames.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 173 KiB

195
public/static/style/prism.css Normal file
View file

@ -0,0 +1,195 @@
/* PrismJS 1.17.1
https://prismjs.com/download.html#themes=prism-solarizedlight&languages=markup+css+clike+javascript+c+cpp+d+java+json&plugins=line-numbers */
/*
Solarized Color Schemes originally by Ethan Schoonover
http://ethanschoonover.com/solarized
Ported for PrismJS by Hector Matos
Website: https://krakendev.io
Twitter Handle: https://twitter.com/allonsykraken)
*/
/*
SOLARIZED HEX
--------- -------
base03 #002b36
base02 #073642
base01 #586e75
base00 #657b83
base0 #839496
base1 #93a1a1
base2 #eee8d5
base3 #fdf6e3
yellow #b58900
orange #cb4b16
red #dc322f
magenta #d33682
violet #6c71c4
blue #268bd2
cyan #2aa198
green #859900
*/
code[class*="language-"],
pre[class*="language-"] {
color: #657b83; /* base00 */
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
font-size: 1em;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 1.5;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
background: #073642; /* base02 */
}
pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
code[class*="language-"]::selection, code[class*="language-"] ::selection {
background: #073642; /* base02 */
}
/* Code blocks */
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
border-radius: 0.3em;
}
:not(pre) > code[class*="language-"],
pre[class*="language-"] {
background-color: #fdf6e3; /* base3 */
}
/* Inline code */
:not(pre) > code[class*="language-"] {
padding: .1em;
border-radius: .3em;
}
.token.comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: #93a1a1; /* base1 */
}
.token.punctuation {
color: #586e75; /* base01 */
}
.namespace {
opacity: .7;
}
.token.property,
.token.tag,
.token.boolean,
.token.number,
.token.constant,
.token.symbol,
.token.deleted {
color: #268bd2; /* blue */
}
.token.selector,
.token.attr-name,
.token.string,
.token.char,
.token.builtin,
.token.url,
.token.inserted {
color: #2aa198; /* cyan */
}
.token.entity {
color: #657b83; /* base00 */
background: #eee8d5; /* base2 */
}
.token.atrule,
.token.attr-value,
.token.keyword {
color: #859900; /* green */
}
.token.function,
.token.class-name {
color: #b58900; /* yellow */
}
.token.regex,
.token.important,
.token.variable {
color: #cb4b16; /* orange */
}
.token.important,
.token.bold {
font-weight: bold;
}
.token.italic {
font-style: italic;
}
.token.entity {
cursor: help;
}
pre[class*="language-"].line-numbers {
position: relative;
padding-left: 3.8em;
counter-reset: linenumber;
}
pre[class*="language-"].line-numbers > code {
position: relative;
white-space: inherit;
}
.line-numbers .line-numbers-rows {
position: absolute;
pointer-events: none;
top: 0;
font-size: 100%;
left: -3.8em;
width: 3em; /* works for line-numbers below 1000 lines */
letter-spacing: -1px;
border-right: 1px solid #999;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.line-numbers-rows > span {
pointer-events: none;
display: block;
counter-increment: linenumber;
}
.line-numbers-rows > span:before {
content: counter(linenumber);
color: #999;
display: block;
padding-right: 0.8em;
text-align: right;
}

174
source/nl/netsoj/chris/blog/interfaces/http.d → source/app.d
View file

@ -1,14 +1,35 @@
import std.algorithm : map, maxElement; import std.experimental.logger;
import std.format : format; import std.range;
import std.string: join; import std.string;
import std.stdio;
import std.typecons;
import vibe.d; import vibe.d;
import cache;
import constants;
import article; import article;
import page; import page;
import project; import project;
import watcher;
/**
* Internal list of articles, pages and projects by slug.
*/
Article[string] articles;
Page[string] pages;
Project[string] projects;
/**
* Default ordering and list with pointers to ordered articles.
* (Note: this is code which will actually be compiled and passed on!)
*/
immutable string articleSortPred = "a.firstPublished > b.firstPublished";
Article*[] articleList;
immutable string pageSortPred = "a.title < b.title";
Page*[] pageList;
immutable string projectSortPred = "a.title < b.title";
Project*[] projectList;
/** /**
* Output types for the content. * Output types for the content.
@ -54,53 +75,48 @@ void addCachingHeader(bool publicCache = true)(ref HTTPServerResponse res) {
res.headers["Cache-Control"] = header; res.headers["Cache-Control"] = header;
} }
struct TranslateContext {
import std.typetuple;
alias languages = TypeTuple!("en_GB", "nl_NL");
mixin translationModule!"mijnblog";
static string determineLanguage(scope HTTPServerRequest req) {
if ("lang" !in req.query) return req.determineLanguageByHeader(languages); // default behaviour using "Accept-Language" header
return determineLanguageByHeader(req.query.get("lang", "en_GB"), languages);
}
}
/** /**
* Generates boilerplate code for a single response. * Template method for fetching a single page for a subclass of page.
* params: * Params:
* arrayName = The name of the associative array to take the items from. * T = the data structure/class to be passed as template parameter. Must have a slug parameter.
* templateName = The name of the template to render. * templ = The template to use when rendering.
* array = An associative array where the keys are slugs for parameters and the values the template parameter.
* req = The server request to consume. Assumes there is an slug parameter.
* res = The server response to write to.
*
*/ */
string singleResponseMixin(string arrayName, string templateName) { void getSingle(T, string templ)(ref T[string] array, HTTPServerRequest req, HTTPServerResponse res) {
return `string slug = req.params["slug"]; string slug = req.params["slug"];
OutputType outputType = getOutputType(slug); OutputType outputType = getOutputType(slug);
enforceHTTP(slug in ` ~ arrayName ~ `, HTTPStatus.notFound, "Page not found"); enforceHTTP(slug in array, HTTPStatus.notFound, "Page not found");
auto content = ` ~ arrayName ~ `[slug]; T content = array[slug];
switch(outputType) with (OutputType) { switch(outputType) with (OutputType) {
case MARKDOWN: case MARKDOWN:
res.writeBody(content.contentSource, MIME_MARKDOWN); res.writeBody(content.contentSource, MIME_MARKDOWN);
break; break;
default: default:
case HTML: case HTML:
res.render!("` ~ templateName ~ `", content); res.render!(templ, content);
break; break;
}`;
} }
}
@translationContext!TranslateContext struct TranslationContext {
import std.typetuple;
enum enforceExistingKeys = true;
alias languages = TypeTuple!("en_GB", "nl_NL");
mixin translationModule!"mijnblog";
}
@translationContext!TranslationContext
class MijnBlog { class MijnBlog {
public:
/** /**
* Generates response for /posts/:slug and /palen/:slug. * Generates response for /posts/:slug and /palen/:slug.
*/ */
@path("/posts/:slug") @path("/posts/:slug")
void getArticleSingle(string _slug, HTTPServerRequest req, HTTPServerResponse res) { void getArticleSingle(string _slug, HTTPServerRequest req, HTTPServerResponse res) {
//getSingle!(Article, "pages/article.dt")(articles, req, res); getSingle!(Article, "pages/article.dt")(articles, req, res);
mixin(singleResponseMixin("articles", "pages/article.dt"));
} }
/** /**
@ -109,8 +125,7 @@ public:
@path("/posts/") @path("/posts/")
void getArticleOverview(HTTPServerRequest req, HTTPServerResponse res) { void getArticleOverview(HTTPServerRequest req, HTTPServerResponse res) {
addCachingHeader(res); addCachingHeader(res);
Article[] articleList = articles.sortedList; render!("pages/article-list.dt", articleList)(res);
render!("pages/article-list.dt", articleList);
} }
/** /**
@ -119,17 +134,18 @@ public:
@path("/projects/") @path("/projects/")
void getProjectOverview(HTTPServerRequest req, HTTPServerResponse res) { void getProjectOverview(HTTPServerRequest req, HTTPServerResponse res) {
addCachingHeader(res); addCachingHeader(res);
Project[] projectList = projects.sortedList; render!("pages/project-list.dt", projectList)(res);
render!("pages/project-list.dt", projectList);
} }
/** /**
* Generate response for a project page * Generate response for a project page
*/ */
@path("/projects/:slug") @path("/projects/:slug")
void getProject(HTTPServerRequest req, HTTPServerResponse res) { void getProject(HTTPServerRequest req, HTTPServerResponse res) {
res.headers["Cache-Control"] = "public"; res.headers["Cache-Control"] = "public";
mixin(singleResponseMixin("projects", "pages/project.dt")); getSingle!(Project, "pages/project.dt")(projects, req, res);
} }
/** /**
* Generate response for a page * Generate response for a page
@ -137,7 +153,7 @@ public:
@path("/:slug") @path("/:slug")
void getPage(HTTPServerRequest req, HTTPServerResponse res) { void getPage(HTTPServerRequest req, HTTPServerResponse res) {
addCachingHeader(res); addCachingHeader(res);
mixin(singleResponseMixin("pages", "pages/page.dt")); getSingle!(Page, "pages/page.dt")(pages, req, res);
} }
@path("/") @path("/")
@ -145,61 +161,7 @@ public:
addCachingHeader(res); addCachingHeader(res);
// If no slug is supplied, it will be adjusted to "index" // If no slug is supplied, it will be adjusted to "index"
req.params.addField("slug", "index"); req.params.addField("slug", "index");
mixin(singleResponseMixin("pages", "pages/page.dt")); getSingle!(Page, "pages/page.dt")(pages, req, res);
}
@path("/feeds/posts.atom")
void getPostFeed(HTTPServerRequest req, HTTPServerResponse res) {
Article[] articleList = articles.sortedList;
DateTime lastUpdated = articleList.length > 0
? articleList.map!"a.firstPublished()".maxElement
: DateTime(2019, 06, 30);
string response = q"EOS
<?xml version="1.0" encoding="utf-8" ?>
<feed xmlns="http://www.w3.org/2005/Atom">
<updated>%s</updated>
<title>%s</title>
<icon>%s</icon>
<link href="%s/feeds/posts.atom" rel="self" />
<link href="%s" />
<id>urn:uuid:036f1087-7fcd-466d-866d-78a0c60038cd</id>
<author><name>%s</name></author>
%s
</feed>
EOS"
.format(
lastUpdated.toISOExtString() ~ "Z",
trWeb("template.feed.title").format(trWeb("template.feed.posts.title")),
Constants.SITE_URL ~ "/static/img/logo.png",
Constants.SITE_URL,
Constants.SITE_URL,
Constants.SITE_AUTHOR,
articleList.map!((article) {
return q"EOS
<entry>
<title>%s</title>
<link href="%s" />
<id>%s</id>
<published>%s</published>
<updated>%s</updated>
<summary>%s</summary>
<content type="html">%s</content>
</entry>
EOS"
.format(article.title,
Constants.SITE_URL ~ "/posts/" ~ article.slug,
"tag:" ~ Constants.SITE_HOST ~ ",2024:blog:posts:" ~ article.slug,
article.firstPublished().toISOExtString() ~ "Z",
article.updated().toISOExtString() ~ "Z",
article.excerpt(),
htmlEscape(article.content())
);
}).join()
);
res.writeBody(response, "application/atom+xml");
} }
} }
@ -211,8 +173,7 @@ void errorPage(HTTPServerRequest req, HTTPServerResponse res, HTTPServerErrorInf
render!("pages/error.dt", error)(res); render!("pages/error.dt", error)(res);
} }
@trusted void main() {
void startHTTPServer() {
HTTPServerSettings settings = new HTTPServerSettings; HTTPServerSettings settings = new HTTPServerSettings;
settings.bindAddresses = ["0.0.0.0"]; settings.bindAddresses = ["0.0.0.0"];
settings.port = 3465; settings.port = 3465;
@ -228,6 +189,27 @@ void startHTTPServer() {
URLRouter router = new URLRouter; URLRouter router = new URLRouter;
router.get("/static/*", serveStaticFiles("./public/", fSettings)); router.get("/static/*", serveStaticFiles("./public/", fSettings));
router.registerWebInterface(new MijnBlog); router.registerWebInterface(new MijnBlog);
/*router.get("/posts/:slug", &articleGetSingle);
router.get("/palen/:slug", &articleGetSingle);
router.get("/posts/", &articleGetOverview);
router.get("/palen/", &articleGetOverview);
router.get("/projects/", &projectGetOverview);
router.get("/projects/:slug", &projectGet);
router.get("/projecten/:slug", &projectGet);
router.get("/:slug", &pageGet);
router.get("/", &pageGet);*/
listenHTTP(settings, router); listenHTTP(settings, router);
// Start indexing pages.
runTask({
initPages!(Page, pageSortPred)(pages, pageList, "pages");
});
runTask({
initPages!(Article, articleSortPred)(articles, articleList, "articles");
});
runTask({
initPages!(Project, projectSortPred)(projects, projectList, "projects");
});
runApplication();
} }

5
source/nl/netsoj/chris/blog/model/article.d → source/article.d
View file

@ -10,7 +10,6 @@ import vibe.d;
import page; import page;
import utils; import utils;
@safe:
/** /**
* Represents an article on the blog * Represents an article on the blog
@ -35,9 +34,9 @@ class Article : Page {
// Find the first header and mark everything up to that as // Find the first header and mark everything up to that as
if (m_excerpt is null) { if (m_excerpt is null) {
// an excerpt, used in search results. // an excerpt, used in search results.
const long seperatorIndex = cast(long) lastIndexOf(m_contentSource, "---\n"); const long seperatorIndex = indexOf(m_contentSource, "---\n");
this.m_excerpt = this.m_contentSource[seperatorIndex + 4..$]; this.m_excerpt = this.m_contentSource[seperatorIndex + 4..$];
const long firstHeaderIndex = indexOf(this.m_excerpt, '#'); long firstHeaderIndex = indexOf(this.m_excerpt, '#');
if (firstHeaderIndex >= 0) { if (firstHeaderIndex >= 0) {
this.m_excerpt = this.m_excerpt[0..firstHeaderIndex]; this.m_excerpt = this.m_excerpt[0..firstHeaderIndex];
} }

4
source/nl/netsoj/chris/blog/constants.d → source/constants.d
View file

@ -1,10 +1,8 @@
/** /**
* Constants which are passed to templates while rendering. * Constants which are passed to templates while rendering.
*/ */
struct Constants { class Constants {
public static immutable string SITE_NAME = "Chris Josten's site"; public static immutable string SITE_NAME = "Chris Josten's site";
public static immutable string SITE_HOST = "chris.netsoj.nl";
public static immutable string SITE_URL = "https://chris.netsoj.nl"; public static immutable string SITE_URL = "https://chris.netsoj.nl";
public static immutable string SITE_AUTHOR = "Chris Josten";
public static immutable string COPYRIGHT = "&copy; Chris Josten, 2020"; public static immutable string COPYRIGHT = "&copy; Chris Josten, 2020";
} }

92
source/nl/netsoj/chris/blog/cache.d
View file

@ -1,92 +0,0 @@
import std.experimental.logger;
import std.traits;
import article;
import page;
import project;
@safe:
/**
* Default ordering and list with pointers to ordered articles.
* (Note: this is code which will actually be compiled and passed on!)
*/
GenericCache!(Article, "a.firstPublished > b.firstPublished") articles;
GenericCache!(Page, "a.title < b.title") pages;
GenericCache!(Project, "a.title < b.title") projects;
/**
* In memory cache of T (where T is like a page). Right now it simply holds everything in memory.
*
* At a later date, this cache might start unloading lesser-accessed items, and load them later
* again if needed.
*/
struct GenericCache(T, string sortOrder)
if (isImplicitlyConvertible!(T, Page)) {
public:
void addItem(T item) {
logf("Added %s '%s'", T.stringof, item.slug);
m_map[item.slug] = item;
sortItems();
}
void removeItem(T item) {
logf("Removed %s '%s'", T.stringof, item.slug);
m_map.remove(item.slug);
sortItems();
}
void removeItemByName(string name) {
foreach(item; m_map.byValue) {
if (item.name == name) removeItem(item);
}
}
void changeItem(T item) {
import std.algorithm;
import std.range;
auto r = m_map.byValue.find!((a,b) => a.name == b.name)(item);
if (r.empty()) {
warningf("Could not find old %s with name %s", T.stringof, item.name);
return;
}
T oldItem = r.front;
if (oldItem.slug != item.slug) {
logf("Slug of %s '%s' changed to '%s'", T.stringof, oldItem.slug, item.slug);
m_map.remove(oldItem.slug);
}
m_map[item.slug] = item;
sortItems();
}
/**
* Overload []-operator to redirect to our internal map.
*/
T opIndex(string key) {
return m_map[key];
}
T* opBinaryRight(string op)(const scope string key) {
static if (op == "in") {
return key in m_map;
} else static assert(false, "Operation " ~ op ~ "is not supported on this class");
}
T[] sortedList() {
return m_publicItems;
}
private:
T[string] m_map;
T[] m_publicItems;
void sortItems() {
import std.algorithm;
import std.array;
m_publicItems = sort!sortOrder(m_map.values)
.filter!(x => !x.isHidden)
.array;
}
}

37
source/nl/netsoj/chris/blog/main.d
View file

@ -1,37 +0,0 @@
import std.experimental.logger;
import vibe.d;
import article;
import page;
import project;
import cache;
import http;
import watcher;
void watchTask(T, C)(C *cache, string directory) @safe nothrow {
do {
try {
initPages!T(cache, directory);
} catch(Exception e) {
logWarn("Error while watching pages: " ~ e.msg);
}
} while(Task.getThis().running);
}
void main() {
startHTTPServer();
// Start indexing pages.
runTask({
watchTask!Page(&pages, "pages");
});
runTask({
watchTask!Article(&articles, "articles");
});
runTask({
watchTask!Project(&projects, "projects");
});
runApplication();
}

100
source/nl/netsoj/chris/blog/watcher.d
View file

@ -1,100 +0,0 @@
import std.array;
import std.algorithm;
//import std.experimental.logger;
import std.file;
import std.stdio;
import std.traits;
import vibe.d;
import cache;
import page;
/**
* Loads pages into memory and sets up a "watcher" to watch a directory for file changes.
*/
void initPages(T, C)(C *cache, const string directory) @trusted
if (isImplicitlyConvertible!(T, Page)) {
NativePath watchingDir;
try {
watchingDir = getWorkingDirectory() ~ directory;
} catch(PathValidationException) {
logError("Cannot watch path " ~ directory);
return;
}
bool addPage(string path) {
try {
T newPage = new T(path);
logInfo("Added %s", newPage.slug);
cache.addItem(newPage);
return true;
} catch (page.ArticleParseException e) {
logWarn("Could not parse %s: %s", path, e);
return false;
} catch (Exception e) {
logWarn("Other exception while parsing %s: %s", path, e);
return false;
}
}
// Initial scan
void scan(NativePath path, int level = 0) {
logInfo("Scanning %s", path.toString());
foreach(file; iterateDirectory(path)) {
if (file.isDirectory) {
scan(path ~ file.name, level + 1);
} else {
addPage((path ~ file.name).toString());
}
}
}
if (!existsFile(watchingDir)) {
createDirectory(watchingDir);
}
scan(watchingDir);
DirectoryWatcher watcher = watchDirectory(watchingDir, true);
bool shouldStop = false;
while (!shouldStop) {
// Try to reduce changes to only one DirectoryChangeType per change
DirectoryChange[] changes;
shouldStop = !watcher.readChanges(changes);
foreach(change; changes) {
logInfo("=======[New changes]======");
string[] changeTypes = ["added", "removed", "modified"];
logInfo("Path: %s, type: %s", change.path.toString(), changeTypes[change.type]);
if (endsWith(change.path.toString(), ".kate-swp")) continue;
switch (change.type) with (DirectoryChangeType){
case added:
try {
addPage(change.path.toString());
} catch(Exception e) {
logWarn("Error while updating %s: %s", change.path.toString(), e.msg);
}
break;
case modified:
T newPage;
try {
newPage = new T(change.path.toString());
cache.changeItem(newPage);
} catch(page.ArticleParseException e) {
logWarn("Could not parse %s", change.path.toString());
} catch (Exception e) {
logWarn("Error while updating %s: %s", change.path.toString(), e.msg);
}
break;
case removed:
try {
cache.removeItemByName(change.path.toString());
} catch(Exception e) {
logInfo("Error while trying to remove %s: %s", T.stringof, e.msg);
}
break;
default: break;
}
}
}
}

17
source/nl/netsoj/chris/blog/model/page.d → source/page.d
View file

@ -7,10 +7,8 @@ import std.stdio;
import dyaml; import dyaml;
import vibe.vibe; import vibe.vibe;
import constants;
import utils; import utils;
@safe:
/** /**
* Exception thrown when a page has syntax errors e.g. * Exception thrown when a page has syntax errors e.g.
@ -53,13 +51,12 @@ class Page {
/** /**
* Creates a page from a file. This will read from the file and parse it. * Creates a page from a file. This will read from the file and parse it.
*/ */
this(string file) @safe { this(string file) {
this.m_name = file; this.m_name = file;
this.m_contentSource = readText(file); this.m_contentSource = readText(file);
// Find the seperator and split the string in two // Find the seperator and split the string in two
const long seperatorIndex = lastIndexOf(m_contentSource, "\n---\n"); const long seperatorIndex = indexOf(m_contentSource, "---\n");
enforce!ArticleParseException(seperatorIndex >= 0); enforce!ArticleParseException(seperatorIndex >= 0);
string header = m_contentSource[0..seperatorIndex]; string header = m_contentSource[0..seperatorIndex];
Node node = Loader.fromString(header).load(); Node node = Loader.fromString(header).load();
@ -91,7 +88,6 @@ class Page {
this.m_slug = this.m_title; this.m_slug = this.m_title;
infof("%s does not have a slug. Using %s", this.m_name, this.m_slug); infof("%s does not have a slug. Using %s", this.m_name, this.m_slug);
} }
this.m_language = headerNode.getOr!string("language", "unknown");
hasCalledSuper = true; hasCalledSuper = true;
} }
@ -106,14 +102,11 @@ class Page {
public static string parseMarkdown(string source, int shiftHeader = 0) { public static string parseMarkdown(string source, int shiftHeader = 0) {
string[] args = ["pandoc", string[] args = ["pandoc",
"-f", "markdown", "-f", "markdown",
"-t", "html", "-t", "html"];
"--lua-filter", "defaultClasses.lua"];
string[string] env;
env["WEBROOT"] = Constants.SITE_URL;
if (shiftHeader != 0) args ~= "--shift-heading-level-by=" ~ to!string(shiftHeader); if (shiftHeader != 0) args ~= "--shift-heading-level-by=" ~ to!string(shiftHeader);
ProcessPipes pandoc = pipeProcess(args, Redirect.all, env); ProcessPipes pandoc = pipeProcess(args);
pandoc.stdin.write(source); pandoc.stdin.write(source);
pandoc.stdin.writeln(); pandoc.stdin.writeln();
pandoc.stdin.flush(); pandoc.stdin.flush();
@ -124,7 +117,7 @@ class Page {
while ((line = pandoc.stdout.readln()) !is null) { while ((line = pandoc.stdout.readln()) !is null) {
result ~= line; result ~= line;
debug { debug {
//logf("Pandoc stdout: %s", line); logf("Pandoc stdout: %s", line);
} }
} }

18
source/nl/netsoj/chris/blog/model/project.d → source/project.d
View file

@ -1,21 +1,17 @@
import std.array; import std.array;
import std.algorithm; import std.algorithm;
import std.typecons;
import dyaml; import dyaml;
import vibe.vibe; import vibe.vibe;
import page; import page;
import utils;
import staticpaths; import staticpaths;
import utils;
@safe:
/** /**
* Represents a project, like an unfinished application * Represents a project, like an unfinished application
*/ */
class Project : Page { class Project : Page {
alias Link= Tuple!(string, "name", string, "url");
protected immutable string PROJECT_ICON_DIR = IMG_DIR ~ "projects/icons/"; protected immutable string PROJECT_ICON_DIR = IMG_DIR ~ "projects/icons/";
protected immutable string PROJECT_IMAGE_DIR = IMG_DIR ~ "projects/images/"; protected immutable string PROJECT_IMAGE_DIR = IMG_DIR ~ "projects/images/";
protected string m_state; protected string m_state;
@ -24,7 +20,7 @@ class Project : Page {
protected string m_icon; protected string m_icon;
protected string[] m_images; protected string[] m_images;
protected string m_description; protected string m_description;
protected Link[] m_sourceCode = []; protected string m_sourceCode;
/** /**
* Creates a project from a file * Creates a project from a file
@ -43,13 +39,7 @@ class Project : Page {
this.m_images = headerNode.getArray!string("images", []) this.m_images = headerNode.getArray!string("images", [])
.map!(x => PROJECT_IMAGE_DIR ~ x).array; .map!(x => PROJECT_IMAGE_DIR ~ x).array;
this.m_description = headerNode.getOr!string("description", "<no description>"); this.m_description = headerNode.getOr!string("description", "<no description>");
if ("sourceCode" in headerNode) { this.m_sourceCode = headerNode.getOr!string("sourceCode", null);
m_sourceCode.reserve(headerNode.length);
foreach(Node node; headerNode["sourceCode"]) {
m_sourceCode ~= tuple!("name", "url")(node.getOr!string("name", "link"),
node.getOr!string("url", "#"));
}
}
} }
@property string state() { return m_state; } @property string state() { return m_state; }
@ -58,6 +48,6 @@ class Project : Page {
@property string icon() { return m_icon; } @property string icon() { return m_icon; }
@property string[] images() { return m_images; } @property string[] images() { return m_images; }
@property string description() { return m_description; } @property string description() { return m_description; }
@property Link[] sourceCode() { return m_sourceCode; } @property string sourceCode() { return m_sourceCode; }
} }

0
source/nl/netsoj/chris/blog/staticpaths.d → source/staticpaths.d
View file

0
source/nl/netsoj/chris/blog/utils.d → source/utils.d
View file

116
source/watcher.d Normal file
View file

@ -0,0 +1,116 @@
import std.array;
import std.algorithm;
import std.experimental.logger;
import std.file;
import std.stdio;
import vibe.d;
import app;
import page;
void initPages(T, string sortPred)(ref T[string] array, ref T*[] sortedRange, const string directory) {
bool addPage(string path) {
try {
T newPage = new T(path);
logf("Added %s", newPage.slug);
array[newPage.slug] = newPage;
return true;
} catch (page.ArticleParseException e) {
logf("Could not parse %s", path);
return false;
}
}
// Initial scan
void scan(NativePath path, int level = 0) {
logf("Scanning %s", path.toString());
foreach(file; iterateDirectory(path)) {
if (file.isDirectory) {
scan(path ~ file.name, level + 1);
} else {
addPage((path ~ file.name).toString());
}
}
}
void sortThings() {
sortedRange = sort!(sortPred)(array.values)
.filter!(x => !x.isHidden)
.map!"&a".array;
logf("sorted: %s", sortedRange);
}
if (!existsFile(getWorkingDirectory() ~ directory)) {
createDirectory(getWorkingDirectory() ~ directory);
}
scan(getWorkingDirectory() ~ directory);
sortThings();
DirectoryWatcher watcher = watchDirectory(getWorkingDirectory() ~ directory, true);
//auto watcher = FileWatch((getWorkingDirectory() ~ directory).toString(), true);
bool shouldStop = false;
while (!shouldStop) {
// Try to reduce changes to only one DirectoryChangeType per change
DirectoryChange[] changes;
shouldStop = !watcher.readChanges(changes);
foreach(change; changes) {
logf("=======[New changes]======");
string[] changeTypes = ["added", "removed", "modified"];
logf("Path: %s, type: %s", change.path.toString(), changeTypes[change.type]);
if (endsWith(change.path.toString(), ".kate-swp")) continue;
switch (change.type) with (DirectoryChangeType){
case added:
try {
addPage(change.path.toString());
} catch(Exception e) {
warningf("Error while updating %s: %s", change.path.toString(), e.msg);
}
break;
case modified:
T newPage;
try {
newPage = new T(change.path.toString());
log(newPage.slug);
if (newPage.slug in array) {
log("Slug not changed");
array[newPage.slug] = newPage;
} else {
log("Slug changed");
foreach(item; array) {
if (item.name == change.path.toString()) {
logf("Removed %s, which is the old slug of %s", newPage.slug, item.slug);
array.remove(item.slug);
}
}
}
logf("Modified %s", newPage.slug);
array[newPage.slug] = newPage;
} catch(page.ArticleParseException e) {
warningf("Could not parse %s", change.path.toString());
}
break;
case removed:
try {
foreach(item; array.byValue) {
logf(" - %s", item.name);
if (item.name == change.path.toString()) {
logf("Removed %s", item.slug);
array.remove(item.slug);
}
}
} catch(Exception e) {}
break;
default: break;
}
log("Current state:");
//sortedRange = sort!("a."~sortProp~" < b."~sortProp)(array.values);
sortThings();
foreach (item; array) {
logf("%s - %s", item.name, item.slug);
}
}
}
}

28
translations/mijnblog.en_GB.po
View file

@ -1,28 +1,2 @@
msgid "template.page.name" msgid "page.header-bottom-text"
msgstr "Chris's website" msgstr "Chris's website"
msgid "template.page.html_language"
msgstr "en-GB"
msgid "template.menu.home"
msgstr "Home"
msgid "template.menu.posts"
msgstr "Posts"
msgid "template.menu.projects"
msgstr "Projects"
msgid "template.menu.contact"
msgstr "Contact"
msgid "template.page.copyright"
msgstr "&copy; Chris Josten, 2024. If not specified otherwise, all content on this "
"website is <a rel=\"license\" href=\"https://creativecommons.org/licenses/by/4.0/\">"
"licensed under the CC-BY 4.0</a>"
msgid "template.feed.title"
msgstr "%s | Chris's website"
msgid "template.feed.posts.title"
msgstr "Posts"

27
translations/mijnblog.nl_NL.po
View file

@ -11,30 +11,5 @@ msgstr ""
"Language: nl\n" "Language: nl\n"
"X-Generator: Poedit 2.3.1\n" "X-Generator: Poedit 2.3.1\n"
msgid "template.menu.home" msgid "Chris's website"
msgstr "Thuis"
msgid "template.menu.posts"
msgstr "Berichten"
msgid "template.menu.projects"
msgstr "Projecten"
msgid "template.page.name"
msgstr "Chris z'n webstekkie" msgstr "Chris z'n webstekkie"
msgid "template.page.html_language"
msgstr "nl-NL"
msgid "template.menu.contact"
msgstr "Contact"
msgid "template.page.copyright"
msgstr "&copy; Chris Josten, 2024. Tenzij anders vermeld staat, valt alle inhoud op deze webstek "
"<a rel=\"license\" href=\"https://creativecommons.org/licenses/by/4.0/\"> onder de CC-BY 4.0</a>"
msgid "template.feed.title"
msgstr "%s | Chris z'n webstekkie"
msgid "template.feed.posts.title"
msgstr "Berichten"

30
translations/mijnblog.pot
View file

@ -1,28 +1,2 @@
msgid "template.page.name" msgid "page.header-bottom-text"
msgstr "Chris's website" msgstr ""
msgid "template.page.html_language"
msgstr "en-GB"
msgid "template.menu.home"
msgstr "Home"
msgid "template.menu.posts"
msgstr "Posts"
msgid "template.menu.projects"
msgstr "Projects"
msgid "template.menu.contact"
msgstr "Contact"
msgid "template.page.copyright"
msgstr "&copy; Chris Josten, 2024. If not specified otherwise, all content on this "
"website is <a rel=\"license\" href=\"https://creativecommons.org/licenses/by/4.0/\">"
"licensed under the CC-BY 4.0</a>"
msgid "template.feed.title"
msgstr "%s | Chris's website"
msgid "template.feed.posts.title"
msgstr "Posts"

2
views/pages/article-list.dt
View file

@ -1,4 +1,4 @@
extends parts/page extends /parts/page.dt
block header block header
title Posts - Netsoj.nl title Posts - Netsoj.nl

4
views/pages/article.dt
View file

@ -1,4 +1,4 @@
extends parts/page extends /parts/page
block meta_data block meta_data
- page_type = "article"; - page_type = "article";
@ -13,7 +13,7 @@ block extra_meta_data
meta(name="og:article:modified_time", content=content.updated.toISOExtString) meta(name="og:article:modified_time", content=content.updated.toISOExtString)
block content block content
article(itemscope, itemtype="https://schema.org/BlogPosting", lang="#{content.language}") article(itemscope, itemtype="https://schema.org/BlogPosting")
- import utils; - import utils;
header header
h1.title(itemprop="headline") #{content.title} h1.title(itemprop="headline") #{content.title}

2
views/pages/error.dt
View file

@ -1,4 +1,4 @@
extends parts/page extends /parts/page.dt
block header block header
title #{error.message} - Netsoj.nl title #{error.message} - Netsoj.nl

4
views/pages/page.dt
View file

@ -1,4 +1,4 @@
extends parts/page extends /parts/page.dt
block meta_data block meta_data
- page_title = content.title; - page_title = content.title;
@ -12,4 +12,4 @@ block sidebar
block content block content
header header
h1.title #{content.title} h1.title #{content.title}
section(lang="#{content.language}") !{content.content} section !{content.content}

2
views/pages/project-list.dt
View file

@ -1,4 +1,4 @@
extends parts/page extends /parts/page.dt
block header block header
title Projects - Chris Netsoj.nl title Projects - Chris Netsoj.nl

11
views/pages/project.dt
View file

@ -1,4 +1,4 @@
extends parts/page extends /parts/page
block meta_data block meta_data
- page_title = content.title; - page_title = content.title;
- page_url = "/project/" ~ content.slug; - page_url = "/project/" ~ content.slug;
@ -8,7 +8,7 @@ block meta_data
block sidebar block sidebar
block content block content
section(lang="#{content.language}") section
header.project-header header.project-header
img.project-icon(src="#{content.icon}", alt="Icon of #{content.title}") img.project-icon(src="#{content.icon}", alt="Icon of #{content.title}")
div div
@ -26,16 +26,9 @@ block content
i This project has no images. i This project has no images.
dl.project-platforms-technologies dl.project-platforms-technologies
dt Platforms dt Platforms
- if (content.platforms.length > 0)
- foreach(platform; content.platforms) - foreach(platform; content.platforms)
dd.tag #{platform} dd.tag #{platform}
- if (content.technologies.length > 0)
dt Technologies dt Technologies
- foreach(technology; content.technologies) - foreach(technology; content.technologies)
dd.tag #{technology} dd.tag #{technology}
- if (content.sourceCode.length > 0)
dt Source code
- foreach(sourceCodeLink; content.sourceCode)
dd
a(href="#{sourceCodeLink.url}", rel="external") #{sourceCodeLink.name}
| !{content.content} | !{content.content}

5
views/parts/footer.dt
View file

@ -1,2 +1,5 @@
p p
small !{trWeb("template.page.copyright")} small
| &copy; Chris Josten, 2020. If not specified otherwise, all content on this
| website is <a rel="license" href="https://creativecommons.org/licenses/by/4.0/">
| licensed under the CC-BY 4.0</a>.

29
views/parts/page.dt
View file

@ -1,12 +1,10 @@
doctype html doctype html
html(prefix="og: http://ogp.me/ns#") html(prefix="og: http://ogp.me/ns#")
- import constants; - import constants;
- import vibe.d;
head head
//- Kick off loading the css as fast as possible //- Kick off loading the css as fast as possible
meta(name="viewport", content="width=device-width; initial-scale=1") meta(name="viewport", content="width=device-width; initial-scale=1")
link(rel="stylesheet", href="/static/style/base.css") link(rel="stylesheet", href="/static/style/base.css")
link(rel="alternate", href="/feeds/posts.atom", type="application/atom+xml", title=trWeb("template.feed.title").format(trWeb("template.feed.posts.title")))
- string page_image = "/static/img/logo.png"; - string page_image = "/static/img/logo.png";
- string page_title; - string page_title;
@ -42,27 +40,24 @@ html(prefix="og: http://ogp.me/ns#")
body body
- void menuItem(string text, string link) - void menuItem(string text, string link)
li li
a(href="#{link}") #{trWeb(text)} a(href="#{link}") #{text}
section.header-navigation
header header
img.logo(src="/static/img/logo.png", alt="The logo of the website: the letter C drawn in an unprofessional manner with wobbly eyes on put on top") img.logo(src="/static/img/logo.png", alt="The logo of the website: the letter C drawn in an unprofessional manner with wobbly eyes on put on top")
p #{trWeb("template.page.name")} p& Chris's website
section.main-sidebar
block sidebar
nav nav
ul ul
- menuItem("template.menu.home", "/"); - menuItem("home", "/");
- menuItem("template.menu.posts", "/posts/"); - menuItem("posts", "/posts/");
- menuItem("template.menu.projects", "/projects/"); - menuItem("projects", "/projects/");
- menuItem("template.menu.contact", "/contact"); block sidebar
footer.hide-small
block footer
include /parts/footer.dt
main main
block content block content
footer footer.hide-big
block footer block footer
include parts/footer include /parts/footer.dt