Compare commits
17 commits
Author | SHA1 | Date | |
---|---|---|---|
9c7c922103 | |||
812499af2f | |||
d2cda76646 | |||
4793f6f5af | |||
1482ef01b3 | |||
9261893874 | |||
1b3b82c7c9 | |||
97dc6eb088 | |||
9d1da3e947 | |||
41064e7bac | |||
99448b83e2 | |||
83be44cd9a | |||
f6ccb19b9c | |||
4211ee07f4 | |||
97266a122b | |||
2ea0a75be9 | |||
7759df5a07 |
1
.gitignore
vendored
|
@ -12,3 +12,4 @@ profiles.clj
|
||||||
/log
|
/log
|
||||||
/data
|
/data
|
||||||
/yenu_dev.db
|
/yenu_dev.db
|
||||||
|
/dist
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
FROM openjdk:8
|
FROM openjdk:8
|
||||||
MAINTAINER Aaron Fischer <mail@aaron-fischer.net>
|
MAINTAINER Aaron Fischer <mail@aaron-fischer.net>
|
||||||
|
|
||||||
ADD yenu.jar /yenu/app.jar
|
ADD target/uberjar/yenu.jar /yenu/app.jar
|
||||||
|
|
||||||
EXPOSE 3000
|
EXPOSE 80
|
||||||
|
|
||||||
WORKDIR "/yenu"
|
WORKDIR "/yenu"
|
||||||
CMD ["java", "-jar", "app.jar"]
|
CMD ["java", "-jar", "app.jar"]
|
||||||
|
|
674
LICENSE
Normal file
|
@ -0,0 +1,674 @@
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 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 General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is 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. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
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 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. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
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 Affero 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 special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU 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 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 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 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 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 General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU 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 the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
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 GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
71
README
|
@ -1,71 +0,0 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
oooo ooo .ooooo. ooo. .oo. oooo oooo
|
|
||||||
`88. .8' d88' `88b `888P"Y88b `888 `888
|
|
||||||
`88..8' 888ooo888 888 888 888 888
|
|
||||||
`888' 888 .o 888 888 888 888
|
|
||||||
.8' `Y8bod8P' o888o o888o `V88V"V8P'
|
|
||||||
.o..P'
|
|
||||||
`Y8P' the image sharing tool for friends.
|
|
||||||
|
|
||||||
|
|
||||||
yenu is a simple tool to share images among a trusted group of people. No
|
|
||||||
complicated setup, no fancy features nobody really uses, no role management,
|
|
||||||
no cloud, no bullshit. Just sharing images to people you like and store
|
|
||||||
your data where you want it to be.
|
|
||||||
|
|
||||||
--{ INSTALL }------------------------------------------------------------------
|
|
||||||
Create the database schema and all needed folders. You need to execute
|
|
||||||
this only once for initial setup. IF you upgrade the yenu version (replace
|
|
||||||
the yenu.jar file), it is sometimes needed to run the migrate step again.
|
|
||||||
|
|
||||||
$ java -jar yenu.jar migrate
|
|
||||||
|
|
||||||
Start the application with the following command in a screen session or
|
|
||||||
write a systemd init file for that.
|
|
||||||
$ java -jar yenu.jar
|
|
||||||
|
|
||||||
If you like docker, you can use docker-compose to boot up the application
|
|
||||||
and send it to the background.
|
|
||||||
$ docker-compose up -d
|
|
||||||
|
|
||||||
|
|
||||||
--{ CONFIGURATION }------------------------------------------------------------
|
|
||||||
The application is configured with the yenu.properties file. Open the file
|
|
||||||
in your preferred editor and change the variables as you like. You can change
|
|
||||||
the basepath, port and other stuff like the user password and the creator
|
|
||||||
password.
|
|
||||||
|
|
||||||
|
|
||||||
--{ WHERE IS MY DATA? }--------------------------------------------------------
|
|
||||||
All your images are placed in the data/gallery/ directory, next to the
|
|
||||||
yenu.jar. When uploading a image, the raw file is placed into the raw/ folder,
|
|
||||||
if you need the original later (pull out some metadata like GPS coordinates,
|
|
||||||
scale it into other formats, print it etc.) In the normal/ folder there are
|
|
||||||
the scaled down images for the details page. The thumbnails/ folder contains
|
|
||||||
the quare images for the thumbnail preview.
|
|
||||||
|
|
||||||
The database used is a SQLite3 database, stored in the yenu.db file. You
|
|
||||||
can open the database at any time with your favourite sqlite3 client.
|
|
||||||
|
|
||||||
$ sqlite3 yenu.db
|
|
||||||
> .tables
|
|
||||||
> SELECT * FROM images;
|
|
||||||
> ...
|
|
||||||
|
|
||||||
|
|
||||||
--{ WHERE CAN IS RUN THIS THING? }---------------------------------------------
|
|
||||||
Quick answer: Wherever you want. You can boot up a Amazon S3 node and deploy
|
|
||||||
it there or you put it on your RaspberryPi and host it yourself from your
|
|
||||||
own internet connection from home (preferred way!). You can also rent a
|
|
||||||
vServer and deploy it there. All you need is a Java RE and a internet
|
|
||||||
connection.
|
|
||||||
|
|
||||||
|
|
||||||
--{ LICENSE, RIGHTS AND AUTHOR }-----------------------------------------------
|
|
||||||
This tool is written by Aaron Fischer (aaron-fischer.net). It is free to use
|
|
||||||
and is placed under the GPL v.3. The images, comments and other metadata
|
|
||||||
belongs to you. Make sure, you store the data on a place you trust and make
|
|
||||||
backups.
|
|
||||||
|
|
12
README.md
|
@ -55,9 +55,19 @@ own internet connection from home (preferred way!). You can also rent a
|
||||||
vServer and deploy it there. All you need is a Java RE and a internet
|
vServer and deploy it there. All you need is a Java RE and a internet
|
||||||
connection.
|
connection.
|
||||||
|
|
||||||
|
# Build it yourself
|
||||||
|
You need the Clojure Toolchain and Leiningen. After that, just run the
|
||||||
|
following command in the root dir. The resulting jar file is located in
|
||||||
|
target/uberjar.
|
||||||
|
|
||||||
|
$ lein uberjar
|
||||||
|
|
||||||
|
# Hack it
|
||||||
|
|
||||||
|
> cider-jack-in
|
||||||
|
|
||||||
# License, Copyrights and Author
|
# License, Copyrights and Author
|
||||||
This tool is written by Aaron Fischer (aaron-fischer.net). It is free to use
|
This tool is written by Aaron Fischer (aaron-fischer.net). It is free to use
|
||||||
and is placed under the GPL v.3. The images, comments and other metadata
|
and is placed under the GPL v.3. The images, comments and other metadata
|
||||||
belongs to you. Make sure, you store the data on a place you trust and make
|
belongs to you. Make sure, you store the data on a place you trust and make
|
||||||
backups.
|
backups.
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ cp target/uberjar/yenu.jar dist/
|
||||||
cp yenu.properties dist/
|
cp yenu.properties dist/
|
||||||
cp Dockerfile dist/
|
cp Dockerfile dist/
|
||||||
cp docker-compose.yml dist/
|
cp docker-compose.yml dist/
|
||||||
cp README dist/
|
cp README.md dist/
|
||||||
|
|
||||||
tar czf yenu-release.tar.gz dist/*
|
tar czf yenu-release.tar.gz dist/*
|
||||||
|
sha256sum yenu-release.tar.gz
|
||||||
|
|
|
@ -3,8 +3,8 @@ app:
|
||||||
environment:
|
environment:
|
||||||
TZ: "Europe/Berlin"
|
TZ: "Europe/Berlin"
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:80:3000"
|
- "127.0.0.1:80:80"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/yenu/data
|
- ./data:/yenu/data
|
||||||
- ./yenu.properties:/yenu/yenu.properties
|
- ./yenu.properties:/yenu/yenu.properties:ro
|
||||||
- ./yenu.db:/yenu/yenu.db
|
- ./yenu.db:/yenu/yenu.db
|
||||||
|
|
5
env/dev/resources/config.edn
vendored
|
@ -1,5 +1,6 @@
|
||||||
{:dev true
|
{:dev true
|
||||||
:port 3000
|
:port 80
|
||||||
|
:host "0.0.0.0"
|
||||||
:creator-password "creator"
|
:creator-password "creator"
|
||||||
:user-password "user"
|
:user-password "user"
|
||||||
;; when :nrepl-port is set the application starts the nREPL server on load
|
;; when :nrepl-port is set the application starts the nREPL server on load
|
||||||
|
@ -10,5 +11,5 @@
|
||||||
:basepath "http://localhost"
|
:basepath "http://localhost"
|
||||||
:authors ["Aaron Fischer"]
|
:authors ["Aaron Fischer"]
|
||||||
|
|
||||||
:images_per_page 25
|
:images-per-page 25
|
||||||
}
|
}
|
||||||
|
|
5
env/prod/resources/config.edn
vendored
|
@ -1,12 +1,13 @@
|
||||||
{:production true
|
{:production true
|
||||||
:creator-password "xxx"
|
:creator-password "xxx"
|
||||||
:user-password "yyy"
|
:user-password "yyy"
|
||||||
:port 3000
|
:port 80
|
||||||
|
:host "0.0.0.0"
|
||||||
|
|
||||||
:database-url "jdbc:sqlite:yenu.db"
|
:database-url "jdbc:sqlite:yenu.db"
|
||||||
|
|
||||||
:basepath "http://localhost"
|
:basepath "http://localhost"
|
||||||
:authors ["Aaron Fischer"]
|
:authors ["Aaron Fischer"]
|
||||||
|
|
||||||
:images_per_page 25
|
:images-per-page 25
|
||||||
}
|
}
|
||||||
|
|
72
project.clj
|
@ -1,39 +1,45 @@
|
||||||
|
;;; We need to allow http connections because some dependencies are fetched
|
||||||
|
;;; over http instead of https. See here for more detail:
|
||||||
|
;;; https://github.com/technomancy/leiningen/blob/master/doc/FAQ.md
|
||||||
|
(require 'cemerick.pomegranate.aether)
|
||||||
|
(cemerick.pomegranate.aether/register-wagon-factory!
|
||||||
|
"http" #(org.apache.maven.wagon.providers.http.HttpWagon.))
|
||||||
|
|
||||||
(defproject yenu "1.0.1"
|
(defproject yenu "1.0.1"
|
||||||
:description "yenu -- The image sharing tool for friends"
|
:description "yenu -- The image sharing tool for friends"
|
||||||
:url "https://yenu.de/"
|
:url "https://yenu.gridbag.net/"
|
||||||
|
|
||||||
:dependencies [[bouncer "1.0.1"]
|
:dependencies [[bouncer "1.0.1"]
|
||||||
[compojure "1.5.2"]
|
[compojure "1.6.2"]
|
||||||
[conman "0.6.3"]
|
[conman "0.9.1"]
|
||||||
[cprop "0.1.10"]
|
[cprop "0.1.18"]
|
||||||
[luminus-immutant "0.2.3"]
|
[luminus-immutant "0.2.5"]
|
||||||
[luminus-migrations "0.2.9"]
|
[luminus-migrations "0.7.1"]
|
||||||
[luminus-nrepl "0.1.4"]
|
[luminus-nrepl "0.1.7"]
|
||||||
[metosin/ring-http-response "0.8.1"]
|
[metosin/ring-http-response "0.9.2"]
|
||||||
[mount "0.1.11"]
|
[mount "0.1.16"]
|
||||||
[org.clojure/clojure "1.8.0"]
|
[clojure.java-time "0.3.2"]
|
||||||
[org.clojure/tools.cli "0.3.5"]
|
[org.clojure/clojure "1.10.3"]
|
||||||
[org.clojure/tools.logging "0.3.1"]
|
[org.clojure/tools.cli "1.0.206"]
|
||||||
[org.webjars.bower/tether "1.4.0"]
|
[org.clojure/tools.logging "1.1.0"]
|
||||||
[org.webjars/jquery "3.2.0"]
|
[org.webjars/jquery "3.6.0"]
|
||||||
[org.webjars/bootstrap "4.0.0-alpha.6-1"]
|
[org.webjars/bootstrap "5.0.1"]
|
||||||
[org.webjars/font-awesome "4.7.0"]
|
|
||||||
[org.webjars/webjars-locator-jboss-vfs "0.1.0"]
|
[org.webjars/webjars-locator-jboss-vfs "0.1.0"]
|
||||||
[org.xerial/sqlite-jdbc "3.16.1"]
|
[org.webjars.bower/tether "1.4.7"]
|
||||||
[ring-webjars "0.1.1"]
|
[org.webjars.bower/font-awesome "4.7.0"]
|
||||||
[ring-middleware-format "0.7.2"]
|
[org.xerial/sqlite-jdbc "3.36.0"]
|
||||||
[ring/ring-core "1.5.1"]
|
[ring-webjars "0.2.0"]
|
||||||
[ring/ring-defaults "0.2.3"]
|
[ring-middleware-format "0.7.4"]
|
||||||
[selmer "1.10.6"]
|
[ring/ring-core "1.9.3"]
|
||||||
|
[ring/ring-defaults "0.3.3"]
|
||||||
|
[selmer "1.12.44"]
|
||||||
[hiccup "1.0.5"]
|
[hiccup "1.0.5"]
|
||||||
[image-resizer "0.1.9"]
|
[image-resizer "0.1.10"]
|
||||||
[me.raynes/fs "1.4.6"]
|
[me.raynes/fs "1.4.6"] ;; R.I.P. Anthony!
|
||||||
[digest "1.4.5"]
|
[digest "1.4.10"]
|
||||||
[markdown-clj "0.9.98"]
|
[markdown-clj "1.10.5"]
|
||||||
[clj-exif-orientation "0.2.1"]
|
[clj-exif-orientation "0.2.1"]
|
||||||
[markdown-clj "0.9.98"]
|
[buddy/buddy-auth "3.0.1"]]
|
||||||
[clj-time "0.8.0"]
|
|
||||||
[buddy/buddy-auth "1.4.1"]]
|
|
||||||
|
|
||||||
:min-lein-version "2.0.0"
|
:min-lein-version "2.0.0"
|
||||||
|
|
||||||
|
@ -44,11 +50,11 @@
|
||||||
:main yenu.core
|
:main yenu.core
|
||||||
:migratus {:store :database :db ~(get (System/getenv) "DATABASE_URL")}
|
:migratus {:store :database :db ~(get (System/getenv) "DATABASE_URL")}
|
||||||
|
|
||||||
:plugins [[lein-cprop "1.0.1"]
|
:plugins [[lein-cprop "1.0.3"]
|
||||||
[migratus-lein "0.4.3"]
|
[migratus-lein "0.7.3"]
|
||||||
[lein-immutant "2.1.0"]
|
[lein-immutant "2.1.0"]
|
||||||
[lein-sassc "0.10.4"]
|
[lein-sassc "0.10.5"]
|
||||||
[lein-auto "0.1.2"]]
|
[lein-auto "0.1.3"]]
|
||||||
:sassc
|
:sassc
|
||||||
[{:src "resources/scss/screen.scss"
|
[{:src "resources/scss/screen.scss"
|
||||||
:output-to "resources/public/css/screen.css"
|
:output-to "resources/public/css/screen.css"
|
||||||
|
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 1.9 KiB |
BIN
resources/public/img/logo_big.png
Normal file
After Width: | Height: | Size: 35 KiB |
|
@ -2,51 +2,49 @@
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% if image %}
|
{% if image %}
|
||||||
<h1>Bild editieren</h1>
|
<h1>Edit image</h1>
|
||||||
<p>Hier kann ein bestehendes Bild bearbeitet werden. Das Bild selbst kann nicht
|
<p>Edit an image metadata. To change the image itself, you need to delete and add a new one.</p>
|
||||||
verändert werden (hierzu muss das Bild gelöscht und neu angelegt werden)</p>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<h1>Bild hochladen</h1>
|
<h1>Upload image</h1>
|
||||||
<p>Hier kann ein neues Bild der Gallerie hinzugefügt werden. Dabei sind alle
|
<p>Here you can add a new image to the gallery. You can use all common image types. The uploaded
|
||||||
gängigen Bildformate und Auflösungen möglich. Das hochgeladene Bild wird
|
image will be cropped (Thumbnail) and resized (detail image).</p>
|
||||||
zugeschnitten (Thumbnail) und skaliert (Detailseite).</p>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<form action="{% if image %}/edit/{{ image.id }}{% else %}/upload{% endif %}" enctype="multipart/form-data" method="POST" class="form-horizontal">
|
<form action="{% if image %}/edit/{{ image.id }}{% else %}/upload{% endif %}" enctype="multipart/form-data" method="POST" class="form-horizontal">
|
||||||
{% csrf-field %}
|
{% csrf-field %}
|
||||||
|
|
||||||
{% if not image %}
|
{% if not image %}
|
||||||
<div class="form-group">
|
<div class="mb-3">
|
||||||
<label for="file" class="sr-only">Bild</label>
|
<label for="file" class="form-label sr-only">Image</label>
|
||||||
<input id="file" class="form-control" name="file" type="file" />
|
<input id="file" class="form-control" name="file" type="file" />
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="mb-3">
|
||||||
<label for="title">Bildüberschrift</label>
|
<label for="title" class="form-label">Image title</label>
|
||||||
<input type="text" name="title" class="form-control"
|
<input type="text" name="title" class="form-control"
|
||||||
value="{{ image.title }}"
|
value="{{ image.title }}"
|
||||||
placeholder="Leer lassen für Dateiname">
|
placeholder="Leave empty for filename">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="mb-3">
|
||||||
<label for="description">Beschreibung (optional)</label>
|
<label for="description" clas="form-label">Description (optional)</label>
|
||||||
<textarea name="description" class="form-control" rows="4">{{image.description }}</textarea>
|
<textarea name="description" class="form-control" rows="4">{{image.description }}</textarea>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="mb-3">
|
||||||
<label for="tags">Tags</label>
|
<label for="tags" class="form-label">Tags</label>
|
||||||
<input type="text" id="tags" name="tags" class="form-control"
|
<input type="text" id="tags" name="tags" class="form-control"
|
||||||
value="{% if tags %}{% for tag in tags %}{{ tag.tagname }} {% endfor %}{% endif %}"
|
value="{% if tags %}{% for tag in tags %}{{ tag.tagname }} {% endfor %}{% endif %}"
|
||||||
placeholder="Trennen mit Leerzeichen oder Kommas">
|
placeholder="Separate with space or comma">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button type="submit" class="btn btn-success">
|
<button type="submit" class="btn btn-success">
|
||||||
<span class="fa fa-floppy-o"></span>
|
<span class="fa fa-floppy-o"></span>
|
||||||
{% if image %}
|
{% if image %}
|
||||||
Bild bearbeiten
|
Edit image
|
||||||
{% else %}
|
{% else %}
|
||||||
Bild hochladen
|
Upload image
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
@ -1,17 +1,19 @@
|
||||||
{% extends "layout.html" %}
|
{% extends "layout.html" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>Kommentarstream</h1>
|
<h1>Comments</h1>
|
||||||
|
|
||||||
<ul class="list-unlisted">
|
|
||||||
|
<div class="container">
|
||||||
{% for comment in comments %}
|
{% for comment in comments %}
|
||||||
<hr/>
|
<hr/>
|
||||||
<li class="media mb-3">
|
<div class="row">
|
||||||
|
<div class="col-1">
|
||||||
<img src="https://robohash.org/{{ comment.author }}?size=40x40" class="d-flex mr-3"/>
|
<img src="https://robohash.org/{{ comment.author }}?size=40x40" class="d-flex mr-3"/>
|
||||||
<div class="media-body">
|
</div>
|
||||||
|
<div class="col-11">
|
||||||
<i>{{ comment.created_at|parse-date|date:"dd-MM-yyyy HH:mm" }} Uhr</i>
|
<i>{{ comment.created_at|parse-date|date:"dd-MM-yyyy HH:mm" }}</i>
|
||||||
von <strong>{{ comment.author }}</strong>
|
from <strong>{{ comment.author }}</strong>
|
||||||
<br/>
|
<br/>
|
||||||
<small><a href="/show/{{ comment.image_id }}#{{ comment.id }}">
|
<small><a href="/show/{{ comment.image_id }}#{{ comment.id }}">
|
||||||
{% if comment.title %}
|
{% if comment.title %}
|
||||||
|
@ -25,8 +27,8 @@
|
||||||
{{ comment.comment|markdown-to-html|safe }}
|
{{ comment.comment|markdown-to-html|safe }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</div>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
<a class="btn btn-secondary disabled" href="#">
|
<a class="btn btn-secondary disabled" href="#">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<span class="fa fa-arrow-left"></span> Neuer
|
<span class="fa fa-arrow-left"></span> Newer
|
||||||
|
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a class="btn btn-secondary" href="/">
|
<a class="btn btn-secondary" href="/">
|
||||||
<span class="fa fa-home"></span>
|
<span class="fa fa-home"></span>
|
||||||
Gallerie
|
Gallery
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
{% if prev-image %}
|
{% if prev-image %}
|
||||||
|
@ -24,11 +24,11 @@
|
||||||
<a class="btn btn-secondary disabled" href="#">
|
<a class="btn btn-secondary disabled" href="#">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
Älter <span class="fa fa-arrow-right"></span>
|
Older <span class="fa fa-arrow-right"></span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="pull-left clearfix">
|
<div class="float-left clearfix">
|
||||||
<h1>{{ image.title }}</h1>
|
<h1>{{ image.title }}</h1>
|
||||||
<div id="image-tags">
|
<div id="image-tags">
|
||||||
{% for tag in tags %}
|
{% for tag in tags %}
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
<div class="detail-image mb-3">
|
<div class="detail-image mb-3">
|
||||||
<a href="/images/raw/{{ image.hash }}">
|
<a href="/images/raw/{{ image.hash }}">
|
||||||
<img class="card-img-top" src="/images/normal/{{ image.hash }}" alt="{{ image.title }}"/>
|
<img class="" src="/images/normal/{{ image.hash }}" alt="{{ image.title }}"/>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -50,57 +50,60 @@
|
||||||
<div class="btn-group pull-right clearfix" role="group">
|
<div class="btn-group pull-right clearfix" role="group">
|
||||||
<a class="btn btn-primary btn-sm" href="/edit/{{ image.id }}">
|
<a class="btn btn-primary btn-sm" href="/edit/{{ image.id }}">
|
||||||
<span class="fa fa-pencil"></span>
|
<span class="fa fa-pencil"></span>
|
||||||
Bearbeiten
|
Edit
|
||||||
</a>
|
</a>
|
||||||
<a class="btn btn-danger btn-sm" href="/delete/{{ image.id }}">
|
<a class="btn btn-danger btn-sm" href="/delete/{{ image.id }}">
|
||||||
<span class="fa fa-trash"></span>
|
<span class="fa fa-trash"></span>
|
||||||
Löschen
|
Delete
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
|
|
||||||
<p>{{ image.created_at|parse-date|date:"dd.MM.yyyy, HH:mm" }} Uhr</p>
|
<p>{{ image.created_at|parse-date|date:"dd.MM.yyyy, HH:mm" }}</p>
|
||||||
{% if image.description|length > 0 %}
|
{% if image.description|length > 0 %}
|
||||||
<div class="col-md7">
|
<div class="col-md7">
|
||||||
<p>{{ image.description|markdown-to-html|safe }}</p>
|
<p>{{ image.description|markdown-to-html|safe }}</p>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<ul class="list-unlisted">
|
<div class="container">
|
||||||
{% for comment in comments %}
|
{% for comment in comments %}
|
||||||
<li class="media mb-3">
|
|
||||||
<a name="{{ comment.id }}"></a>
|
<a name="{{ comment.id }}"></a>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-1">
|
||||||
<img src="https://robohash.org/{{ comment.author }}?size=50x50" class="d-flex mr-3"/>
|
<img src="https://robohash.org/{{ comment.author }}?size=50x50" class="d-flex mr-3"/>
|
||||||
<div class="media-body">
|
</div>
|
||||||
|
<div class="col-11">
|
||||||
<h5 class="mt-0 mb-1">{{ comment.author }}</h5>
|
<h5 class="mt-0 mb-1">{{ comment.author }}</h5>
|
||||||
{% ifequal identity ":creator" %}
|
{% ifequal identity ":creator" %}
|
||||||
<a class="btn btn-sm btn-danger" href="/delete-comment/{{ comment.id}}">Löschen</a>
|
<a class="btn btn-sm btn-danger" href="/delete-comment/{{ comment.id}}">Delete</a>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
|
|
||||||
{{ comment.comment|markdown-to-html|safe }}
|
{{ comment.comment|markdown-to-html|safe }}
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</div>
|
||||||
|
|
||||||
<form action="/add-comment/{{ image.id }}" method="POST" class="form-horizontal">
|
<form action="/add-comment/{{ image.id }}" method="POST" class="form-horizontal">
|
||||||
{% csrf-field %}
|
{% csrf-field %}
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="mb-3">
|
||||||
<label for="author">Name</label>
|
<label for="author" class="form-label">Name</label>
|
||||||
<input type="text" name="author" class="form-control"
|
<input type="text" name="author" class="form-control"
|
||||||
value="{{ saved-author }}"
|
value="{{ saved-author }}"
|
||||||
placeholder="Bitte einen Namen wählen (wird beim nächsten Mal gespeichert)">
|
placeholder="Bitte einen Namen wählen (wird beim nächsten Mal gespeichert)">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="mb-3">
|
||||||
<label for="comment">Kommentar</label>
|
<label for="comment" class="form-label">Comment</label>
|
||||||
<textarea name="comment" class="form-control" rows="3"
|
<textarea name="comment" class="form-control" rows="3"
|
||||||
placeholder="Es kann auch Markdown-Syntax verwendet werden"></textarea>
|
placeholder="Es kann auch Markdown-Syntax verwendet werden"></textarea>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button type="submit" class="btn btn-success">
|
<button type="submit" class="btn btn-success">
|
||||||
<span class="fa fa-floppy-o"></span>
|
<span class="fa fa-floppy-o"></span>
|
||||||
Kommentar hinzufügen
|
Add Comment
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{% extends "layout.html" %}
|
{% extends "layout.html" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1><span class="text-danger">Fehler: {{status}}</span></h1>
|
<h1><span class="text-danger">Error: {{status}}</span></h1>
|
||||||
<hr>
|
<hr>
|
||||||
{% if title %}
|
{% if title %}
|
||||||
<h2 class="without-margin">{{title}}</h2>
|
<h2 class="without-margin">{{title}}</h2>
|
||||||
|
|
|
@ -9,12 +9,16 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<nav class="navbar navbar-toggleable-md bg-inverse navbar-inverse">
|
|
||||||
|
<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
|
||||||
|
<div class="container-fluid">
|
||||||
|
|
||||||
{% if identity %}
|
{% if identity %}
|
||||||
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
<span class="navbar-toggler-icon"></span>
|
<span class="navbar-toggler-icon"></span>
|
||||||
</button>
|
</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<a class="navbar-brand" href="/">
|
<a class="navbar-brand" href="/">
|
||||||
<img src="/img/logo.png">
|
<img src="/img/logo.png">
|
||||||
yenu
|
yenu
|
||||||
|
@ -27,20 +31,20 @@
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" href="/upload">
|
<a class="nav-link" href="/upload">
|
||||||
<span class="fa fa-upload"></span>
|
<span class="fa fa-upload"></span>
|
||||||
Hochladen
|
Upload
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" href="/comments">
|
<a class="nav-link" href="/comments">
|
||||||
<span class="fa fa-comments"></span>
|
<span class="fa fa-comments"></span>
|
||||||
Kommentarstream
|
Comments
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<!--
|
<!--
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" href="/statistics">
|
<a class="nav-link" href="/statistics">
|
||||||
<span class="fa fa-bar-chart"></span>
|
<span class="fa fa-bar-chart"></span>
|
||||||
Statistik
|
Statistics
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
-->
|
-->
|
||||||
|
@ -55,14 +59,16 @@
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" href="/logout">
|
<a class="nav-link" href="/logout">
|
||||||
<span class="fa fa-sign-out"></span>
|
<span class="fa fa-sign-out"></span>
|
||||||
Ausloggen
|
Logout
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<div id="content" class="col-md-12">
|
<div id="content" class="container col-md-12">
|
||||||
{% if flash.message %}
|
{% if flash.message %}
|
||||||
<div class="alert alert-{{ flash.type }}" role="alert">
|
<div class="alert alert-{{ flash.type }}" role="alert">
|
||||||
{{ flash.message }}
|
{{ flash.message }}
|
||||||
|
@ -73,10 +79,12 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-12 text-right mt-4 mb-1 text-muted">
|
<div class="col-md-12mt-4 mb-1">
|
||||||
<hr>
|
<hr>
|
||||||
|
<div class="container text-muted text-end">
|
||||||
<p>{{ footer }}</p>
|
<p>{{ footer }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{% style "/assets/bootstrap/css/bootstrap.min.css" %}
|
{% style "/assets/bootstrap/css/bootstrap.min.css" %}
|
||||||
{% style "/assets/font-awesome/css/font-awesome.min.css" %}
|
{% style "/assets/font-awesome/css/font-awesome.min.css" %}
|
||||||
|
|
|
@ -4,13 +4,15 @@
|
||||||
<div class="container mt-5">
|
<div class="container mt-5">
|
||||||
<div class="row justify-content-md-center">
|
<div class="row justify-content-md-center">
|
||||||
<div class="col-lg-5 col-sm-12">
|
<div class="col-lg-5 col-sm-12">
|
||||||
<p>Um die Seite anzusehen oder die Aktion auszuführen wird ein Passwort benötigt.</p>
|
<img src="/img/logo_big.png">
|
||||||
|
|
||||||
|
<p>To access this area, you need a password.</p>
|
||||||
|
|
||||||
<form method="POST" class="form-horizontal">
|
<form method="POST" class="form-horizontal">
|
||||||
{% csrf-field %}
|
{% csrf-field %}
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="mb-3">
|
||||||
<label for="title">Passwort</label>
|
<label for="title" class="form-label">Password</label>
|
||||||
<input type="password" name="password" class="form-control" autofocus>
|
<input type="password" name="password" class="form-control" autofocus>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{% extends "layout.html" %}
|
{% extends "layout.html" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>Statistiken</h1>
|
<h1>Stats</h1>
|
||||||
<img src="/img/warning_clojure.png">
|
<img src="/img/warning_clojure.png">
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -4,16 +4,11 @@
|
||||||
[luminus.http-server :as http]
|
[luminus.http-server :as http]
|
||||||
[luminus-migrations.core :as migrations]
|
[luminus-migrations.core :as migrations]
|
||||||
[yenu.config :refer [env]]
|
[yenu.config :refer [env]]
|
||||||
[clojure.tools.cli :refer [parse-opts]]
|
|
||||||
[clojure.tools.logging :as log]
|
[clojure.tools.logging :as log]
|
||||||
[yenu.helpers.images :as image]
|
[yenu.helpers.images :as image]
|
||||||
[mount.core :as mount])
|
[mount.core :as mount])
|
||||||
(:gen-class))
|
(:gen-class))
|
||||||
|
|
||||||
(def cli-options
|
|
||||||
[["-p" "--port PORT" "Port number"
|
|
||||||
:parse-fn #(Integer/parseInt %)]])
|
|
||||||
|
|
||||||
(mount/defstate ^{:on-reload :noop}
|
(mount/defstate ^{:on-reload :noop}
|
||||||
http-server
|
http-server
|
||||||
:start
|
:start
|
||||||
|
@ -41,20 +36,16 @@
|
||||||
|
|
||||||
(defn start-app [args]
|
(defn start-app [args]
|
||||||
(doseq [component (-> args
|
(doseq [component (-> args
|
||||||
(parse-opts cli-options)
|
|
||||||
mount/start-with-args
|
mount/start-with-args
|
||||||
:started)]
|
:started)]
|
||||||
(log/info component "started"))
|
(log/info component "started"))
|
||||||
(.addShutdownHook (Runtime/getRuntime) (Thread. stop-app)))
|
(.addShutdownHook (Runtime/getRuntime) (Thread. stop-app)))
|
||||||
|
|
||||||
(defn -main [& args]
|
(defn setup-prerequisites []
|
||||||
(cond
|
|
||||||
(some #{"migrate" "rollback"} args)
|
|
||||||
(do
|
|
||||||
(mount/start #'yenu.config/env)
|
|
||||||
(image/create-needed-folders)
|
(image/create-needed-folders)
|
||||||
(migrations/migrate args (select-keys env [:database-url]))
|
(migrations/migrate ["migrate"] (select-keys env [:database-url])))
|
||||||
(System/exit 0))
|
|
||||||
:else
|
|
||||||
(start-app args)))
|
|
||||||
|
|
||||||
|
(defn -main [& args]
|
||||||
|
(mount/start #'yenu.config/env)
|
||||||
|
(setup-prerequisites)
|
||||||
|
(start-app args))
|
||||||
|
|
|
@ -10,3 +10,4 @@
|
||||||
|
|
||||||
(conman/bind-connection *db* "sql/queries.sql")
|
(conman/bind-connection *db* "sql/queries.sql")
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,10 @@
|
||||||
[ring.util.anti-forgery :refer [anti-forgery-field]]
|
[ring.util.anti-forgery :refer [anti-forgery-field]]
|
||||||
[yenu.helpers.images :as image-helper]
|
[yenu.helpers.images :as image-helper]
|
||||||
[ring.middleware.anti-forgery :refer [*anti-forgery-token*]]
|
[ring.middleware.anti-forgery :refer [*anti-forgery-token*]]
|
||||||
[clj-time.format :as time-format]
|
|
||||||
[yenu.config :refer [env]]
|
[yenu.config :refer [env]]
|
||||||
[yenu.db.core :as db]
|
[yenu.db.core :as db]
|
||||||
[digest :as digest]
|
[digest :as digest]
|
||||||
[clj-time.core :as time])
|
[java-time :refer [local-date-time]])
|
||||||
(:use [markdown.core]))
|
(:use [markdown.core]))
|
||||||
|
|
||||||
(declare ^:dynamic *identity*)
|
(declare ^:dynamic *identity*)
|
||||||
|
@ -19,15 +18,15 @@
|
||||||
(filter/add-filter! :inc inc)
|
(filter/add-filter! :inc inc)
|
||||||
(filter/add-filter! :dec dec)
|
(filter/add-filter! :dec dec)
|
||||||
(filter/add-filter! :markdown-to-html md-to-html-string)
|
(filter/add-filter! :markdown-to-html md-to-html-string)
|
||||||
(filter/add-filter! :parse-date #(time/to-time-zone (time-format/parse %) (time/default-time-zone)))
|
(filter/add-filter! :parse-date #(local-date-time "yyyy-MM-dd HH:mm:ss" %))
|
||||||
|
|
||||||
(defn footer []
|
(defn footer []
|
||||||
(if (= (:count (db/get-image-count) 0))
|
(if (= (:count (db/get-image-count)) 0)
|
||||||
(clojure.string/join ", " (:authors env))
|
(clojure.string/join ", " (:authors env))
|
||||||
(let [first-year (subs (:created_at (db/get-first-year)) 0 4)
|
(let [first-year (subs (:created_at (db/get-first-year)) 0 4)
|
||||||
recent-year (subs (:created_at (db/get-recent-year)) 0 4)
|
recent-year (subs (:created_at (db/get-recent-year)) 0 4)
|
||||||
copy (if (= first-year recent-year) first-year (str first-year " - " recent-year))]
|
copy (if (= first-year recent-year) first-year (str first-year " - " recent-year))]
|
||||||
(str "© " copy " " (clojure.string/join ", " (:authors env))))))
|
(str "© " copy " " (:authors env)))))
|
||||||
|
|
||||||
(defn render-file [template & [params]]
|
(defn render-file [template & [params]]
|
||||||
(content-type
|
(content-type
|
||||||
|
|
|
@ -74,20 +74,20 @@
|
||||||
(do
|
(do
|
||||||
(add-image-to-database imghash title description tags)
|
(add-image-to-database imghash title description tags)
|
||||||
(-> (redirect "/upload")
|
(-> (redirect "/upload")
|
||||||
(assoc :flash {:message "Upload erfolgreich." :type "success"})))
|
(assoc :flash {:message "Upload successfull" :type "success"})))
|
||||||
(-> (redirect "/upload")
|
(-> (redirect "/upload")
|
||||||
(assoc :flash {:message "Fehler beim Upload." :type "danger"})))))
|
(assoc :flash {:message "Upload failed" :type "danger"})))))
|
||||||
|
|
||||||
(GET "/delete/:id" [id :as request]
|
(GET "/delete/:id" [id :as request]
|
||||||
(delete-image! id request)
|
(delete-image! id request)
|
||||||
(-> (redirect "/page/1")
|
(-> (redirect "/page/1")
|
||||||
(assoc :flash {:message "Bild wurde gelöscht" :type "danger"})))
|
(assoc :flash {:message "Image deleted" :type "danger"})))
|
||||||
|
|
||||||
(GET "/delete-comment/:id" [id]
|
(GET "/delete-comment/:id" [id]
|
||||||
(let [image-id (image-id-from-comment id)]
|
(let [image-id (image-id-from-comment id)]
|
||||||
(db/delete-comment! {:id id})
|
(db/delete-comment! {:id id})
|
||||||
(-> (redirect (str "/show/" image-id))
|
(-> (redirect (str "/show/" image-id))
|
||||||
(assoc :flash {:message "Kommentar wurde gelöscht" :type "danger"}))))
|
(assoc :flash {:message "Comment deleted" :type "danger"}))))
|
||||||
|
|
||||||
(GET "/edit/:id" [id :as request]
|
(GET "/edit/:id" [id :as request]
|
||||||
(edit-image-form id request))
|
(edit-image-form id request))
|
||||||
|
@ -95,7 +95,7 @@
|
||||||
(POST "/edit/:id" [id title description tags :as request]
|
(POST "/edit/:id" [id title description tags :as request]
|
||||||
(edit-image! id title description tags request)
|
(edit-image! id title description tags request)
|
||||||
(-> (redirect (str "/show/" id))
|
(-> (redirect (str "/show/" id))
|
||||||
(assoc :flash {:message "Bild wurde bearbeitet" :type "success"})))
|
(assoc :flash {:message "Image edited" :type "success"})))
|
||||||
|
|
||||||
(GET "/statistics" []
|
(GET "/statistics" []
|
||||||
(layout/render-file "statistics.html"))
|
(layout/render-file "statistics.html"))
|
||||||
|
|
|
@ -17,15 +17,15 @@
|
||||||
(if user-identity
|
(if user-identity
|
||||||
(let [updated-session (assoc session :identity user-identity)]
|
(let [updated-session (assoc session :identity user-identity)]
|
||||||
(-> (redirect next-url)
|
(-> (redirect next-url)
|
||||||
(assoc :flash {:message "Erfolgreich eingeloggt." :type "success"})
|
(assoc :flash {:message "Login successfull" :type "success"})
|
||||||
(assoc :session updated-session)))
|
(assoc :session updated-session)))
|
||||||
(-> (redirect (format "/login?next=%s" next-url))
|
(-> (redirect (format "/login?next=%s" next-url))
|
||||||
(assoc :flash {:message "Falsches Passwort." :type "danger"})))))
|
(assoc :flash {:message "Wrong password" :type "danger"})))))
|
||||||
|
|
||||||
(defn logout! [request]
|
(defn logout! [request]
|
||||||
(-> (redirect "/login")
|
(-> (redirect "/login")
|
||||||
(assoc :session {})
|
(assoc :session {})
|
||||||
(assoc :flash {:message "Erfolgreich ausgeloggt." :type "success"})))
|
(assoc :flash {:message "Logout successfull" :type "success"})))
|
||||||
|
|
||||||
(defroutes auth-routes
|
(defroutes auth-routes
|
||||||
(GET "/login" [:as request]
|
(GET "/login" [:as request]
|
||||||
|
|
|
@ -31,30 +31,30 @@
|
||||||
""
|
""
|
||||||
(h/html
|
(h/html
|
||||||
[:nav.pull-right.clearfix {:aria-label "Page navigation"}
|
[:nav.pull-right.clearfix {:aria-label "Page navigation"}
|
||||||
[:ul.pagination.hidden-sm-down
|
[:ul.pagination.d-none.d-sm-none.d-xs-none.d-md-flex
|
||||||
(page (dec current) (= current 1) "disabled" (h/html [:span.fa.fa-arrow-left] " Zurück"))
|
(page (dec current) (= current 1) "disabled" (h/html [:span.fa.fa-arrow-left] " Prev"))
|
||||||
(cond
|
(cond
|
||||||
(< num 13) (pagelist 1 num current)
|
(< num 13) (pagelist 1 num current)
|
||||||
(<= current 7) (h/html (pagelist 1 10 current) (dots) (pagelist (- num 1) num current))
|
(<= current 7) (h/html (pagelist 1 10 current) (dots) (pagelist (- num 1) num current))
|
||||||
(>= current (- num 6)) (h/html (pagelist 1 2 current) (dots) (pagelist (- num 9) num current))
|
(>= current (- num 6)) (h/html (pagelist 1 2 current) (dots) (pagelist (- num 9) num current))
|
||||||
:else (h/html (pagelist 1 2 current) (dots) (pagelist (- current 3) (+ current 3) current) (dots) (pagelist (- num 1) num current)))
|
:else (h/html (pagelist 1 2 current) (dots) (pagelist (- current 3) (+ current 3) current) (dots) (pagelist (- num 1) num current)))
|
||||||
(page (inc current) (= current num) "disabled" (h/html "Weiter " [:span.fa.fa-arrow-right]))]]
|
(page (inc current) (= current num) "disabled" (h/html "Next " [:span.fa.fa-arrow-right]))]]
|
||||||
[:div.clearfix])))
|
[:div.clearfix])))
|
||||||
|
|
||||||
(defn pagination-mobile [num current]
|
(defn pagination-mobile [num current]
|
||||||
(if (< num 2)
|
(if (< num 2)
|
||||||
""
|
""
|
||||||
(h/html
|
(h/html
|
||||||
[:ul.pagination.justify-content-end.hidden-md-up
|
[:ul.pagination.justify-content-end.d-md-none
|
||||||
(page (dec current) (= current 1) "disabled" (h/html [:span.fa.fa-arrow-left] " Zurück"))
|
(page (dec current) (= current 1) "disabled" (h/html [:span.fa.fa-arrow-left] " Prev"))
|
||||||
[:form.form-inline
|
[:form.form-inline
|
||||||
[:select#page-switcher.form-control
|
[:select#page-switcher.form-control
|
||||||
(for [p (range 1 (inc num))]
|
(for [p (range 1 (inc num))]
|
||||||
[:option (cond-> {:value p} (= p current) (assoc :selected "selected")) p])]]
|
[:option (cond-> {:value p} (= p current) (assoc :selected "selected")) p])]]
|
||||||
(page (inc current) (= current num) "disabled" (h/html "Weiter " [:span.fa.fa-arrow-right]))])))
|
(page (inc current) (= current num) "disabled" (h/html "Next " [:span.fa.fa-arrow-right]))])))
|
||||||
|
|
||||||
(defn index-page [current request]
|
(defn index-page [current request]
|
||||||
(let [image-count (:images_per_page env)
|
(let [image-count (:images-per-page env)
|
||||||
offset (* (dec current) image-count)
|
offset (* (dec current) image-count)
|
||||||
pages (number-of-pages image-count)
|
pages (number-of-pages image-count)
|
||||||
images (db/get-all-images {:offset offset :count image-count})]
|
images (db/get-all-images {:offset offset :count image-count})]
|
||||||
|
@ -69,6 +69,7 @@
|
||||||
next-img (db/get-next-image {:image-date (:created_at image)})
|
next-img (db/get-next-image {:image-date (:created_at image)})
|
||||||
prev-img (db/get-prev-image {:image-date (:created_at image)})
|
prev-img (db/get-prev-image {:image-date (:created_at image)})
|
||||||
saved-author (get-in request [:cookies "author" :value])]
|
saved-author (get-in request [:cookies "author" :value])]
|
||||||
|
(if (not (nil? image))
|
||||||
(layout/render-file "detail.html"
|
(layout/render-file "detail.html"
|
||||||
{:image image
|
{:image image
|
||||||
:flash (:flash request)
|
:flash (:flash request)
|
||||||
|
@ -76,7 +77,9 @@
|
||||||
:prev-image prev-img
|
:prev-image prev-img
|
||||||
:tags (db/get-tags-for-image {:id (:id image)})
|
:tags (db/get-tags-for-image {:id (:id image)})
|
||||||
:saved-author saved-author
|
:saved-author saved-author
|
||||||
:comments (db/get-comments-for-image {:image_id (:id image)})})))
|
:comments (db/get-comments-for-image {:image_id (:id image)})})
|
||||||
|
(layout/error-page {:status 404
|
||||||
|
:title "page not found"}))))
|
||||||
|
|
||||||
(defn add-comment! [image-id request]
|
(defn add-comment! [image-id request]
|
||||||
(let [author (:author (:params request))
|
(let [author (:author (:params request))
|
||||||
|
@ -87,8 +90,8 @@
|
||||||
:comment comment}))
|
:comment comment}))
|
||||||
(-> (redirect (str "/show/" image-id))
|
(-> (redirect (str "/show/" image-id))
|
||||||
(assoc :flash (if (not= comment "")
|
(assoc :flash (if (not= comment "")
|
||||||
{:message "Danke für deinen Kommentar" :type "success"}
|
{:message "Thank you for your comment." :type "success"}
|
||||||
{:message "Der kommentar war leider leer." :type "danger"}))
|
{:message "The comment was empty." :type "danger"}))
|
||||||
(assoc-in [:cookies "author"]
|
(assoc-in [:cookies "author"]
|
||||||
{:value author
|
{:value author
|
||||||
:path "/"
|
:path "/"
|
||||||
|
|
BIN
website/images/details.png
Normal file
After Width: | Height: | Size: 1.2 MiB |
BIN
website/images/details_small.png
Normal file
After Width: | Height: | Size: 93 KiB |
BIN
website/images/main.png
Normal file
After Width: | Height: | Size: 1.6 MiB |
BIN
website/images/main_small.png
Normal file
After Width: | Height: | Size: 109 KiB |
BIN
website/images/upload.png
Normal file
After Width: | Height: | Size: 48 KiB |
BIN
website/images/upload_small.png
Normal file
After Width: | Height: | Size: 17 KiB |
74
website/index.html
Normal file
|
@ -0,0 +1,74 @@
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300" rel="stylesheet">
|
||||||
|
<link rel="stylesheet" media="all" href="./styles.css" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<img src="logo.png">
|
||||||
|
|
||||||
|
<p class="header">yenu is a simple tool to <strong>share images among a trusted group of people</strong>. No
|
||||||
|
complicated setup, no fancy features nobody really uses, no role management,
|
||||||
|
no cloud, no bullshit. Just sharing images to people you like and store
|
||||||
|
your data where you want it to be.</p>
|
||||||
|
|
||||||
|
<h2>Another social platform?</h2>
|
||||||
|
<p>Yes and no. This is not Facebook, Instagram or a WhatsApp-Group. This is a
|
||||||
|
software package you have to host yourself. <strong>You are in charge of
|
||||||
|
your data</strong>. This sounds scary, but it is the right way to build and
|
||||||
|
maintain a <a href="http://www.wired.co.uk/magazine/archive/2014/03">decentralized internet</a>.
|
||||||
|
No worry about the setup, it is easier than you think.</p>
|
||||||
|
|
||||||
|
<div class="img">
|
||||||
|
<a href="images/main.png"><img src="images/main_small.png"></a>
|
||||||
|
<a href="images/details.png"><img src="images/details_small.png"></a>
|
||||||
|
<a href="images/upload.png"><img src="images/upload_small.png"></a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h2>Where can I run this thing?</h2>
|
||||||
|
<p>Quick answer: Wherever you want. You can boot up an Amazon EC2 instance and deploy
|
||||||
|
it there or you can put it on your RaspberryPi and host it yourself from your
|
||||||
|
own internet connection from home (preferred way!). You can also rent a
|
||||||
|
vServer and deploy it there. All you need is a Java RE and a internet
|
||||||
|
connection.</p>
|
||||||
|
|
||||||
|
<h2>Installation and configuration</h2>
|
||||||
|
<p>First, <a href="yenu.jar">download the latest version</a> and run the jar-file
|
||||||
|
with the following command.</p>
|
||||||
|
|
||||||
|
<pre class="code">$ java -jar yenu.jar</pre>
|
||||||
|
|
||||||
|
<p>If you like docker, you can use docker-compose to boot up the application
|
||||||
|
and send it to the background. Download the <a href="https://git.okoyono.de/f/yenu">sourcecode</a>
|
||||||
|
and run the following commands</p>
|
||||||
|
|
||||||
|
<pre class="code">$ docker-compose build
|
||||||
|
$ docker-compose up -d</pre>
|
||||||
|
|
||||||
|
<h2>Where is my data?</h2>
|
||||||
|
<p>All your images are placed in the <em>data/gallery/</em> directory, next to the
|
||||||
|
yenu.jar. When uploading a image, the raw file is placed into the raw/ folder,
|
||||||
|
if you need the original later (pull out some metadata like GPS coordinates,
|
||||||
|
scale it into other formats, print it etc.). The scaled down images for the
|
||||||
|
details page are stored in the <em>normal/</em> folder. The <em>thumbnails/</em> folder contains
|
||||||
|
the square images for the thumbnail preview.
|
||||||
|
|
||||||
|
The database used is a SQLite3 database, stored in the yenu.db file. You
|
||||||
|
can open the database at any time with your favourite SQLite3 client.</p>
|
||||||
|
|
||||||
|
<h2>I want to migrate my images from X to yenu</h2>
|
||||||
|
There is no migrate or import script, because this application should be as simple
|
||||||
|
as possible and do one thing well: Share images. If you know a little Clojure and
|
||||||
|
can hack a together a little script, you can easily migrate your data from any other
|
||||||
|
system to yenu: Just create the database entries, and copy the images to the right
|
||||||
|
place.
|
||||||
|
|
||||||
|
<h2>License, copyrights and author</h2>
|
||||||
|
<p>This tool is written in <a href="https://clojure.org/">Clojure</a> by <a href="https://aaron-fischer.net/">Aaron Fischer</a>. It is free to use
|
||||||
|
and is placed under
|
||||||
|
the <a href="https://www.gnu.org/licenses/gpl-3.0.en.html">GPL v.3</a>. You
|
||||||
|
can inspect and download the sourcecode <a href="https://git.okoyono.de/f/yenu">here</a>. The images,
|
||||||
|
comments and other metadata belongs to you. Make sure, you store the data on
|
||||||
|
a place you trust and make backups.</p>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
BIN
website/logo.png
Normal file
After Width: | Height: | Size: 139 KiB |
42
website/styles.css
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
body {
|
||||||
|
background-color: #141414;
|
||||||
|
margin: auto;
|
||||||
|
margin-top: 75px;
|
||||||
|
width: 60%;
|
||||||
|
|
||||||
|
color: white;
|
||||||
|
font-family: 'Open Sans', sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
body > img {
|
||||||
|
max-width: 125%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
font-size: 1.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: #b2a74c;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:hover {
|
||||||
|
color: #e8d326;
|
||||||
|
}
|
||||||
|
|
||||||
|
.code {
|
||||||
|
background-color: black;
|
||||||
|
font-family: Courier New;
|
||||||
|
margin: 0;
|
||||||
|
padding: 15px;
|
||||||
|
font-size: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.img {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
.img img {
|
||||||
|
padding: 2px;
|
||||||
|
margin: 2px;
|
||||||
|
border: 1px solid #b2a74c;
|
||||||
|
}
|
BIN
website/tree.xcf
Normal file
|
@ -1,10 +1,11 @@
|
||||||
basepath=http://localhost
|
basepath=http://127.0.0.1
|
||||||
port=3000
|
host=0.0.0.0
|
||||||
|
port=80
|
||||||
|
|
||||||
# Passwords
|
# Passwords
|
||||||
user-password=user
|
user-password=user
|
||||||
creator-password=creator
|
creator-password=creator
|
||||||
|
|
||||||
# Content stuff
|
# Content stuff
|
||||||
images_per_page=25
|
images-per-page=3
|
||||||
authors=Aaron Fischer,Beatrice Fischer
|
authors=Aaron Fischer
|
||||||
|
|