diff --git a/.gitignore b/.gitignore index 6635cf5..7933ff9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,2 @@ -.DS_Store -node_modules -/build -/.svelte-kit -/package -.env -.env.* -!.env.example -vite.config.js.timestamp-* -vite.config.ts.timestamp-* +api/server +api/data.db diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..0ad25db --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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 +. diff --git a/README.md b/README.md index 7323a7e..9511366 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,91 @@ -# [ngn13.fun](https://ngn13.fun) | my (old) personal website -My old website (it was hosted at ngn13.fun), I will be updating this repository or I will create a new repository for -my new website (hosted at ngn.tf) when im done with it +# website | my personal website +![Version](https://img.shields.io/github/package-json/v/ngn13/ngn13.fun?color=blue) +![Website Status](https://img.shields.io/website?up_color=green&down_color=red&url=https%3A%2F%2Fngn.tf&label=Website%20Status) +![API Status](https://img.shields.io/website?up_color=green&down_color=red&url=https%3A%2F%2Fapi.ngn.tf&label=API%20Status) + +This repo contains all the source code for my personal website, [ngn.tf](https://ngn.tf) +All code is licensed under AGPL version 3 (see [LICENSE.txt](LICENSE.txt)) + +> **Note** +> I do not accept PRs as this is just my personal project. + +**Current Version**: 4.0 + +## Directory structure +### `app` +Contains frontend application, written with SvelteKit. It supports full SSR. +Contains modified CSS from [github-markdown-css](https://github.com/sindresorhus/github-markdown-css) +and fonts from [NerdFonts](https://www.nerdfonts.com/) + +### `api` +Contains the API server, written in Go. It uses the [Fiber](https://github.com/gofiber/fiber) web +framework which offers an [Express](https://expressjs.com/) like experience. I choose Fiber since I've used worked with express a lot in the past. However previously the I was using +[Gin](https://github.com/gin-gonic/gin) (see history section). + +API stores all the data in a local sqlite(3) database. Go doesn't support sqlite3 out of the box so +I'm using [mattn's sqlite3 driver](https://github.com/mattn/go-sqlite3). + +### `admin` +The frontend application does not contain an admin interface, I do the administration stuff (such as +adding posts, adding services etc.) using the python script in this directory. This script can be +installed on to the PATH by running the `install.sh` script. After installation it can be used +by running `admin_script`. + +## Deployment +Easiest way to deploy is to use docker. I have created a `compose.yaml` file so the API and the +frontend application can be deployed easily with just the `docker compose up` command: +```yaml +services: + app: + build: ./app + ports: + - "127.0.0.1:7002:7002" + depends_on: + - api + enviroment: + - VITE_API_URL_DEV="https://api.ngn.tf" + + api: + build: ./api + ports: + - "127.0.0.1:7001:7001" + volumes: + - ./api/api.db:/api.db + enviroment: + - PASS=securepassword +``` + +## History +Some nostalgic history/changelog stuff (just for the major version numbers): + +- **v0.1 (late 2020 - early 2021)**: First ever version of my website, it was just a simple HTML/CSS page, +I never published any of the source code and I wiped the local copy on my USB drive in early 2022. + +- **v1.0 (early 2021 - late 2022)**: This version was actualy hosted on my github.io page, and all the source code was (and still is) avaliable, it was just a simple static site, [here is a screenshot](assets/githubio.png). + +- **vLOST (late 2022 - early 2023)**: As I learned more JS, I decided to rewrite (and rework) +my website with one of the fancy JS frameworks. I decided to go with Svelte. Not the kit version, +at the time svelte did not support SSR. I do not remember writting an API for it so I guess I just +updated it everytime I wanted to add content? It was pretty much like a static website and was hosted +on `ngn13.fun` as at this point I had my own hosting. The source code for this website was in a +deleted github repository of mine, I looked for a local copy on my old hard drive but I wasn't able +to find it. I also do not remember how it looked like, sooo this version is pretty much lost :( + +- **v2.0 (early 2022 - late 2023)**: After I discovered what SSR is, I decided to rewrite and rework +my website one more time in NuxtJS. I had really "fun time" using vue stuff. As NuxtJS supported +server-side code, this website had its own built in API. This website was also hosted on `ngn13.fun` + +- **v3.0 (2023 august - 2023 november)**: In agust of 2023, I decided to rewrite and rework my website +again, this time I was going with SvelteKit as I haven't had the greatest experience with NuxtJS. +SvelteKit was really fun to work with and I got my new website done pretty quickly. (I don't wanna +brag or something but I really imporeved the CSS/styling stuff ya know). I also wrote a new API +with Go and Gin. I did not publish the source code for the API, its still on my local gitea +server tho. This website was hosted on `ngn13.fun` as well. + +- **v4.0 (2023 november -)** The current major version of my website. The frontend is still +similar to 3.0, the big changes are in the API. I rewrote the API with Fiber. This version is +hosted on `ngn.tf` which is my new domain name btw. + +## Screenshots +![](assets/4.0_index.png) +![](assets/4.0_blog.png) diff --git a/admin/admin.py b/admin/admin.py new file mode 100644 index 0000000..26b29a0 --- /dev/null +++ b/admin/admin.py @@ -0,0 +1,176 @@ +#!/bin/python3 + +""" +Administration script for my website (ngn.tf) +############################################# +I really enjoy doing stuff from the terminal, +so I wrote this simple python script that interacts +with the API and lets me add/remove new posts/services +from the terminal +""" + +from os import remove, getenv +from getpass import getpass +import requests as req +from sys import argv + +URL = "" + +def join(pth: str) -> str: + if URL == None: + return "" + + if URL.endswith("/"): + return URL+pth + return URL+"/"+pth + +def get_token() -> str: + try: + f = open("/tmp/wa", "r") + token = f.read() + f.close() + return token + except: + print("[-] You are not authenticated") + exit(1) + +def login() -> None: + pwd = getpass("[>] Enter your password: ") + res = req.get(join("admin/login")+f"?pass={pwd}").json() + if res["error"] != "": + print(f"[-] Error logging in: {res['error']}") + return + + token = res["token"] + f = open("/tmp/wa", "w") + f.write(token) + f.close() + +def logout() -> None: + token = get_token() + res = req.get(join("admin/logout"), headers={ + "Authorization": token + }).json() + if res["error"] != "": + print(f"[-] Error logging out: {res['error']}") + return + + remove("/tmp/wa") + print("[+] Logged out") + +def add_post() -> None: + token = get_token() + title = input("[>] Post title: ") + author = input("[>] Post author: ") + content_file = input("[>] Post content file: ") + public = input("[>] Should post be public? (y/n): ") + + try: + f = open(content_file, "r") + content = f.read() + f.close() + except: + print("[-] Content file not found") + return + + res = req.put(join("admin/blog/add"), json={ + "title": title, + "author": author, + "content": content, + "public": 1 if public == "y" else 0 + }, headers={ + "Authorization": token + }).json() + + if res["error"] != "": + print(f"[-] Error adding post: {res['error']}") + return + + print("[+] Post has been added") + +def remove_post() -> None: + token = get_token() + id = input("[>] Post ID: ") + res = req.delete(join("admin/blog/del")+f"?id={id}", headers={ + "Authorization": token + }).json() + + if res["error"] != "": + print(f"[-] Error removing post: {res['error']}") + return + + print("[-] Post has been deleted") + +def add_service() -> None: + token = get_token() + name = input("[>] Serivce name: ") + desc = input("[>] Serivce desc: ") + link = input("[>] Serivce URL: ") + + res = req.put(join("admin/service/add"), json={ + "name": name, + "desc": desc, + "url": link + }, headers={ + "Authorization": token + }).json() + + if res["error"] != "": + print(f"[-] Error adding service: {res['error']}") + return + + print("[+] Service has been added") + +def remove_service() -> None: + token = get_token() + name = input("[>] Service name: ") + res = req.delete(join("admin/service/remove")+f"?name={name}", headers={ + "Authorization": token + }).json() + + if res["error"] != "": + print(f"[-] Error removing service: {res['error']}") + return + + print("[+] Serivce has been added") + +cmds = { + "login": login, + "logout": logout, + "add_post": add_post, + "remove_post": remove_post, + "add_service": add_service, + "remove_service": remove_service, +} + +def main(): + global URL + URL = getenv("API") + if URL == None or URL == "": + print("[-] API enviroment variable not set") + exit(1) + + if len(argv) != 2: + print(f"[-] Usage: admin_script ") + print(f"[+] Run \"admin_script help\" to get all commands") + exit(1) + + if argv[1] == "help": + print("Avaliable commands:") + for k in cmds.keys(): + print(f" {k}") + exit() + + for k in cmds.keys(): + if k != argv[1]: + continue + try: + cmds[k]() + except KeyboardInterrupt: + pass + exit() + + print("[-] Command not found") + +if __name__ == "__main__": + main() diff --git a/admin/install.sh b/admin/install.sh new file mode 100755 index 0000000..350cd87 --- /dev/null +++ b/admin/install.sh @@ -0,0 +1,8 @@ +#!/bin/bash +echo -n "Enter API URL: " +read url +cat > /usr/bin/admin_script << EOF +#!/bin/sh +API=$url python3 $(pwd)/admin.py \$1 +EOF +chmod +x /usr/bin/admin_script diff --git a/api/.gitignore b/api/.gitignore new file mode 100644 index 0000000..6272dcf --- /dev/null +++ b/api/.gitignore @@ -0,0 +1,2 @@ +server +api.db diff --git a/api/Dockerfile b/api/Dockerfile new file mode 100644 index 0000000..2179a5a --- /dev/null +++ b/api/Dockerfile @@ -0,0 +1,13 @@ +FROM golang:1.21.3 + +WORKDIR /app + +COPY *.go ./ +COPY *.mod ./ +COPY *.sum ./ +COPY Makefile ./ +COPY routes ./routes +COPY util ./util + +RUN make +ENTRYPOINT ["/app/server"] diff --git a/api/Makefile b/api/Makefile new file mode 100644 index 0000000..f3cf4aa --- /dev/null +++ b/api/Makefile @@ -0,0 +1,7 @@ +server: *.go routes/* util/* + go build -o server . + +test: + PASSWORD=test ./server + +.PHONY: test diff --git a/api/go.mod b/api/go.mod new file mode 100644 index 0000000..8f5f688 --- /dev/null +++ b/api/go.mod @@ -0,0 +1,19 @@ +module github.com/ngn13/website/api + +go 1.21.3 + +require ( + github.com/andybalholm/brotli v1.0.5 // indirect + github.com/gofiber/fiber/v2 v2.50.0 // indirect + github.com/google/uuid v1.3.1 // indirect + github.com/klauspost/compress v1.16.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mattn/go-sqlite3 v1.14.18 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.50.0 // indirect + github.com/valyala/tcplisten v1.0.0 // indirect + golang.org/x/sys v0.13.0 // indirect +) diff --git a/api/go.sum b/api/go.sum new file mode 100644 index 0000000..d60e097 --- /dev/null +++ b/api/go.sum @@ -0,0 +1,29 @@ +github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/gofiber/fiber/v2 v2.50.0 h1:ia0JaB+uw3GpNSCR5nvC5dsaxXjRU5OEu36aytx+zGw= +github.com/gofiber/fiber/v2 v2.50.0/go.mod h1:21eytvay9Is7S6z+OgPi7c7n4++tnClWmhpimVHMimw= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI= +github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= +github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/api/main.go b/api/main.go new file mode 100644 index 0000000..2f1a4f8 --- /dev/null +++ b/api/main.go @@ -0,0 +1,39 @@ +package main + +import ( + "database/sql" + "log" + + "github.com/gofiber/fiber/v2" + "github.com/ngn13/website/api/routes" +) + +func CorsMiddleware(c *fiber.Ctx) error { + c.Set("Access-Control-Allow-Origin", "*") + c.Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Set("Access-Control-Allow-Methods", "PUT, DELETE, GET") + return c.Next() +} + +func main() { + app := fiber.New() + app.Use(CorsMiddleware) + + db, err := sql.Open("sqlite3", "data.db") + if err != nil { + log.Fatal("Cannot connect to the database: "+err.Error()) + } + + log.Println("Creating tables") + routes.BlogDb(db) + routes.ServicesDb(db) + routes.Setup(app, db) + + log.Println("Starting web server at port 7001") + err = app.Listen("127.0.0.1:7001") + if err != nil { + log.Printf("Error starting the webserver: %s", err.Error()) + } + + defer db.Close() +} diff --git a/api/routes/admin.go b/api/routes/admin.go new file mode 100644 index 0000000..e250f8e --- /dev/null +++ b/api/routes/admin.go @@ -0,0 +1,141 @@ +package routes + +import ( + "log" + "net/http" + "os" + "strings" + "time" + + "github.com/gofiber/fiber/v2" + "github.com/mattn/go-sqlite3" + "github.com/ngn13/website/api/util" +) + +var Token string = util.CreateToken() + +func AuthMiddleware(c *fiber.Ctx) error { + if c.Path() == "/admin/login" { + return c.Next() + } + + if c.Get("Authorization") != Token { + return util.ErrAuth(c) + } + + return c.Next() +} + +func Login(c *fiber.Ctx) error{ + if c.Query("pass") != os.Getenv("PASSWORD") { + return c.Status(http.StatusUnauthorized).JSON(fiber.Map{ + "error": "Authentication failed", + }) + } + + return c.Status(http.StatusOK).JSON(fiber.Map{ + "error": "", + "token": Token, + }) +} + +func Logout(c *fiber.Ctx) error{ + Token = util.CreateToken() + return c.Status(http.StatusOK).JSON(fiber.Map{ + "error": "", + }) +} + +func RemoveService(c *fiber.Ctx) error { + name := c.Query("name") + if name == "" { + util.ErrBadData(c) + } + + _, err := DB.Exec("DELETE FROM services WHERE name = ?", name) + if util.ErrorCheck(err, c){ + return util.ErrServer(c) + } + + return util.NoError(c) +} + +func AddService(c *fiber.Ctx) error { + var service Service + if c.BodyParser(&service) != nil { + return util.ErrBadJSON(c) + } + + if service.Name == "" || service.Desc == "" || service.Url == "" { + return util.ErrBadData(c) + } + + rows, err := DB.Query("SELECT * FROM services WHERE name = ?", service.Name) + if util.ErrorCheck(err, c){ + return util.ErrServer(c) + } + + if rows.Next() { + rows.Close() + return util.ErrExists(c) + } + + rows.Close() + + _, err = DB.Exec( + "INSERT INTO services(name, desc, url) values(?, ?, ?)", + service.Name, service.Desc, service.Url, + ) + + if util.ErrorCheck(err, c){ + return util.ErrServer(c) + } + + return util.NoError(c) +} + +func RemovePost(c *fiber.Ctx) error{ + var id = c.Query("id") + if id == "" { + return util.ErrBadData(c) + } + + _, err := DB.Exec("DELETE FROM posts WHERE id = ?", id) + if util.ErrorCheck(err, c){ + return util.ErrServer(c) + } + + return util.NoError(c) +} + +func AddPost(c *fiber.Ctx) error{ + var post Post + post.Public = 1 + + if c.BodyParser(&post) != nil { + return util.ErrBadJSON(c) + } + + if post.Title == "" || post.Author == "" || post.Content == "" { + return util.ErrBadData(c) + } + + post.Date = time.Now().Format("02/01/06") + log.Println(post.Date) + post.ID = TitleToID(post.Title) + + _, err := DB.Exec( + "INSERT INTO posts(id, title, author, date, content, public, vote) values(?, ?, ?, ?, ?, ?, ?)", + post.ID, post.Title, post.Author, post.Date, post.Content, post.Public, post.Vote, + ) + + if err != nil && strings.Contains(err.Error(), sqlite3.ErrConstraintUnique.Error()) { + return util.ErrExists(c) + } + + if util.ErrorCheck(err, c){ + return util.ErrExists(c) + } + + return util.NoError(c) +} diff --git a/api/routes/blog.go b/api/routes/blog.go new file mode 100644 index 0000000..f834a56 --- /dev/null +++ b/api/routes/blog.go @@ -0,0 +1,162 @@ +package routes + +import ( + "database/sql" + "log" + "net/http" + + "github.com/gofiber/fiber/v2" + "github.com/ngn13/website/api/util" +) + +func BlogDb(db *sql.DB) { + _, err := db.Exec(` + CREATE TABLE IF NOT EXISTS posts( + id TEXT NOT NULL UNIQUE, + title TEXT NOT NULL, + author TEXT NOT NULL, + date TEXT NOT NULL, + content TEXT NOT NULL, + public INTEGER NOT NULL, + vote INTEGER NOT NULL + ); + `) + DB = db + if err != nil { + log.Fatal("Error creating table: "+err.Error()) + } +} + +func GetIP(c *fiber.Ctx) string { + if c.Get("X-Real-IP") != "" { + return c.Get("X-Real-IP") + } + + return c.IP() +} + +func VoteStat(c *fiber.Ctx) error{ + var id = c.Query("id") + if id == "" { + return util.ErrBadData(c) + } + + for i := 0; i < len(votelist); i++ { + if votelist[i].Client == GetIP(c) && votelist[i].Post == id { + return c.JSON(fiber.Map { + "error": "", + "result": votelist[i].Status, + }) + } + } + + return c.Status(http.StatusNotFound).JSON(util.ErrorJSON("Client never voted")) +} + +func VoteSet(c *fiber.Ctx) error{ + var id = c.Query("id") + var to = c.Query("to") + voted := false + + if id == "" || (to != "upvote" && to != "downvote") { + return util.ErrBadData(c) + } + + for i := 0; i < len(votelist); i++ { + if votelist[i].Client == GetIP(c) && votelist[i].Post == id && votelist[i].Status == to { + return c.Status(http.StatusForbidden).JSON(util.ErrorJSON("Client already voted")) + } + + if votelist[i].Client == GetIP(c) && votelist[i].Post == id && votelist[i].Status != to { + voted = true + } + } + + post, msg := GetPostByID(id) + if msg != ""{ + return c.Status(http.StatusNotFound).JSON(util.ErrorJSON(msg)) + } + + vote := post.Vote+1 + + if to == "downvote" { + vote = post.Vote-1 + } + + if to == "downvote" && voted { + vote = vote-1 + } + + if to == "upvote" && voted { + vote = vote+1 + } + + _, err := DB.Exec("UPDATE posts SET vote = ? WHERE title = ?", vote, post.Title) + if util.ErrorCheck(err, c){ + return util.ErrServer(c) + } + + for i := 0; i < len(votelist); i++ { + if votelist[i].Client == GetIP(c) && votelist[i].Post == id && votelist[i].Status != to { + votelist[i].Status = to + return util.NoError(c) + } + } + + var entry = Vote{} + entry.Client = GetIP(c) + entry.Status = to + entry.Post = id + votelist = append(votelist, entry) + return util.NoError(c) +} + +func GetPost(c *fiber.Ctx) error{ + var id = c.Query("id") + if id == "" { + return util.ErrBadData(c) + } + + post, msg := GetPostByID(id) + if msg != ""{ + return c.Status(http.StatusNotFound).JSON(util.ErrorJSON(msg)) + } + + return c.JSON(fiber.Map { + "error": "", + "result": post, + }) +} + +func SumPost(c *fiber.Ctx) error{ + var posts []Post = []Post{} + rows, err := DB.Query("SELECT * FROM posts") + if util.ErrorCheck(err, c) { + return util.ErrServer(c) + } + + for rows.Next() { + var post Post + err := PostFromRow(&post, rows) + + if util.ErrorCheck(err, c) { + return util.ErrServer(c) + } + + if post.Public == 0 { + continue + } + + if len(post.Content) > 255{ + post.Content = post.Content[0:250] + } + + posts = append(posts, post) + } + rows.Close() + + return c.JSON(fiber.Map { + "error": "", + "result": posts, + }) +} diff --git a/api/routes/global.go b/api/routes/global.go new file mode 100644 index 0000000..f33264e --- /dev/null +++ b/api/routes/global.go @@ -0,0 +1,74 @@ +package routes + +import ( + "database/sql" + "strings" +) + +// ############### BLOG ############### +type Post struct { + ID string `json:"id"` + Title string `json:"title"` + Author string `json:"author"` + Date string `json:"date"` + Content string `json:"content"` + Public int `json:"public"` + Vote int `json:"vote"` +} + +var votelist = []Vote{} +type Vote struct { + Post string + Client string + Status string +} + +func PostFromRow(post *Post, rows *sql.Rows) error{ + err := rows.Scan(&post.ID, &post.Title, &post.Author, &post.Date, &post.Content, &post.Public, &post.Vote) + if err != nil { + return err + } + + return nil +} + +func GetPostByID(id string) (Post, string) { + var post Post = Post{} + post.Title = "NONE" + + rows, err := DB.Query("SELECT * FROM posts WHERE id = ?", id) + + if err != nil{ + return post, "Server error" + } + + success := rows.Next() + if !success { + rows.Close() + return post, "Post not found" + } + + err = PostFromRow(&post, rows) + if err != nil { + rows.Close() + return post, "Server error" + } + rows.Close() + + if post.Title == "NONE" { + return post, "Post not found" + } + + return post, "" +} + +func TitleToID(name string) string{ + return strings.ToLower(strings.ReplaceAll(name, " ", "")) +} + +// ############### SERVICES ############### +type Service struct { + Name string `json:"name"` + Desc string `json:"desc"` + Url string `json:"url"` +} diff --git a/api/routes/routes.go b/api/routes/routes.go new file mode 100644 index 0000000..b14e961 --- /dev/null +++ b/api/routes/routes.go @@ -0,0 +1,45 @@ +package routes + +import ( + "database/sql" + "net/http" + + "github.com/gofiber/fiber/v2" +) + +var DB *sql.DB + +func Setup(app *fiber.App, db *sql.DB){ + // database init + DB = db + + // index route + app.Get("/", func(c *fiber.Ctx) error { + return c.Send([]byte("o/")) + }) + + // blog routes + app.Get("/blog/sum", SumPost) + app.Get("/blog/get", GetPost) + app.Get("/blog/vote/set", VoteSet) + app.Get("/blog/vote/status", VoteStat) + + // service routes + app.Get("/services/all", GetServices) + + // admin routes + app.Use("/admin*", AuthMiddleware) + app.Get("/admin/login", Login) + app.Get("/admin/logout", Logout) + app.Put("/admin/service/add", AddService) + app.Delete("/admin/service/remove", RemoveService) + app.Put("/admin/blog/add", AddPost) + app.Delete("/admin/blog/remove", RemovePost) + + // 404 page + app.All("*", func(c *fiber.Ctx) error { + return c.Status(http.StatusNotFound).JSON(fiber.Map { + "error": "Requested endpoint not found", + }) + }) +} diff --git a/api/routes/services.go b/api/routes/services.go new file mode 100644 index 0000000..eb5cc25 --- /dev/null +++ b/api/routes/services.go @@ -0,0 +1,48 @@ +package routes + +import ( + "database/sql" + "log" + + "github.com/gofiber/fiber/v2" + "github.com/ngn13/website/api/util" +) + +func ServicesDb(db *sql.DB) { + _, err := db.Exec(` + CREATE TABLE IF NOT EXISTS services( + name TEXT NOT NULL UNIQUE, + desc TEXT NOT NULL, + url TEXT NOT NULL + ); + `) + + if err != nil { + log.Fatal("Error creating table: "+err.Error()) + } +} + +func GetServices(c *fiber.Ctx) error { + var services []Service = []Service{} + + rows, err := DB.Query("SELECT * FROM services") + if util.ErrorCheck(err, c) { + return util.ErrServer(c) + } + + for rows.Next() { + var service Service + err := rows.Scan(&service.Name, &service.Desc, &service.Url) + if err != nil { + log.Println("Error scaning services row: "+err.Error()) + continue + } + services = append(services, service) + } + rows.Close() + + return c.JSON(fiber.Map { + "error": "", + "result": services, + }) +} diff --git a/api/util/utils.go b/api/util/utils.go new file mode 100644 index 0000000..334f5e1 --- /dev/null +++ b/api/util/utils.go @@ -0,0 +1,60 @@ +package util + +import ( + "log" + "math/rand" + "net/http" + + "github.com/gofiber/fiber/v2" +) + +var charlist []rune = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") + +func CreateToken() string { + b := make([]rune, 20) + for i := range b { + b[i] = charlist[rand.Intn(len(charlist))] + } + + return string(b) +} + +func ErrorCheck(err error, c *fiber.Ctx) bool{ + if err != nil { + log.Printf("Server error: '%s' on %s\n", err, c.Path()) + return true + } + + return false +} + +func ErrorJSON(error string) fiber.Map{ + return fiber.Map { + "error": error, + } +} + +func ErrServer(c *fiber.Ctx) error { + return c.Status(http.StatusInternalServerError).JSON(ErrorJSON("Server error")) +} + +func ErrExists(c *fiber.Ctx) error { + return c.Status(http.StatusConflict).JSON(ErrorJSON("Entry already exists")) +} + +func ErrBadData(c *fiber.Ctx) error { + return c.Status(http.StatusBadRequest).JSON(ErrorJSON("Provided data is invalid")) +} + +func ErrBadJSON(c *fiber.Ctx) error { + return c.Status(http.StatusBadRequest).JSON(ErrorJSON("Bad JSON data")) +} + +func ErrAuth(c *fiber.Ctx) error { + return c.Status(http.StatusUnauthorized).JSON(ErrorJSON("Authentication failed")) +} + +func NoError(c *fiber.Ctx) error { + return c.Status(http.StatusOK).JSON(ErrorJSON("")) +} + diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..6635cf5 --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,10 @@ +.DS_Store +node_modules +/build +/.svelte-kit +/package +.env +.env.* +!.env.example +vite.config.js.timestamp-* +vite.config.ts.timestamp-* diff --git a/.npmrc b/app/.npmrc similarity index 100% rename from .npmrc rename to app/.npmrc diff --git a/app/Dockerfile b/app/Dockerfile new file mode 100644 index 0000000..aa5b0a0 --- /dev/null +++ b/app/Dockerfile @@ -0,0 +1,10 @@ +FROM node:20-alpine3.17 as build + +RUN apk update && apk upgrade && adduser -D svelte +USER svelte + +WORKDIR /app +COPY --chown=svelteuser:svelte . /app + +RUN npm install && npm run build +CMD ["npm", "run", "preview"] diff --git a/app/README.md b/app/README.md new file mode 100644 index 0000000..f315440 --- /dev/null +++ b/app/README.md @@ -0,0 +1,20 @@ +# [ngn13.fun](https://ngn13.fun) | my personal website +This is the frontend application for my personal website, it's written in SvelteKit and vanilla CSS + +## development setup +```bash +git clone https://github.com/ngn13/ngn13.fun && cd ngn13.fun +npm i +npm run dev +``` + +## build setup +```bash +git clone https://github.com/ngn13/ngn13.fun && cd ngn13.fun +npm i +npm run build +``` + +## license +you cannot publish my website or parts of it on any server/domain without my permission +if you want to do this (for some reason) [contact me](mailto:ngn13proton@proton.me) diff --git a/package-lock.json b/app/package-lock.json similarity index 91% rename from package-lock.json rename to app/package-lock.json index 186f9a7..f29a6e9 100644 --- a/package-lock.json +++ b/app/package-lock.json @@ -384,6 +384,15 @@ "node": ">=12" } }, + "node_modules/@fastify/busboy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz", + "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==", + "dev": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -457,24 +466,25 @@ } }, "node_modules/@sveltejs/kit": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.22.4.tgz", - "integrity": "sha512-Opkqw1QXk4Cc25b/heJP2D7mX+OUBFAq4MXKfET58svTTxdeiHFKzmnuRsSF3nmxESqrLjqPAgHpib+knNGzRw==", + "version": "1.27.4", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.27.4.tgz", + "integrity": "sha512-Vxl8Jf0C1+/8i/slsxFOnwJntCBDLueO/O6GJ0390KUnyW3Zs+4ZiIinD+cEcYnJPQQ9CRzVSr9Bn6DbmTn4Dw==", "dev": true, "hasInstallScript": true, "dependencies": { - "@sveltejs/vite-plugin-svelte": "^2.4.1", + "@sveltejs/vite-plugin-svelte": "^2.5.0", "@types/cookie": "^0.5.1", "cookie": "^0.5.0", "devalue": "^4.3.1", "esm-env": "^1.0.0", "kleur": "^4.1.5", "magic-string": "^0.30.0", - "mime": "^3.0.0", + "mrmime": "^1.0.1", "sade": "^1.8.1", "set-cookie-parser": "^2.6.0", "sirv": "^2.0.2", - "undici": "~5.22.0" + "tiny-glob": "^0.2.9", + "undici": "~5.26.2" }, "bin": { "svelte-kit": "svelte-kit.js" @@ -483,36 +493,36 @@ "node": "^16.14 || >=18" }, "peerDependencies": { - "svelte": "^3.54.0 || ^4.0.0-next.0", + "svelte": "^3.54.0 || ^4.0.0-next.0 || ^5.0.0-next.0", "vite": "^4.0.0" } }, "node_modules/@sveltejs/vite-plugin-svelte": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.4.3.tgz", - "integrity": "sha512-NY2h+B54KHZO3kDURTdARqthn6D4YSIebtfW75NvZ/fwyk4G+AJw3V/i0OBjyN4406Ht9yZcnNWMuRUFnDNNiA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.5.1.tgz", + "integrity": "sha512-ZD9MibRc1dZVxLwDKCdsv9SW1bTBSi+7cyqGWisT9qEOO076Ojw2DYhIF3UTa8iUchbOwvexjme0P4kvKR//7g==", "dev": true, "dependencies": { - "@sveltejs/vite-plugin-svelte-inspector": "^1.0.3", + "@sveltejs/vite-plugin-svelte-inspector": "^1.0.4", "debug": "^4.3.4", "deepmerge": "^4.3.1", "kleur": "^4.1.5", - "magic-string": "^0.30.1", - "svelte-hmr": "^0.15.2", + "magic-string": "^0.30.3", + "svelte-hmr": "^0.15.3", "vitefu": "^0.2.4" }, "engines": { "node": "^14.18.0 || >= 16" }, "peerDependencies": { - "svelte": "^3.54.0 || ^4.0.0", + "svelte": "^3.54.0 || ^4.0.0 || ^5.0.0-next.0", "vite": "^4.0.0" } }, "node_modules/@sveltejs/vite-plugin-svelte-inspector": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.3.tgz", - "integrity": "sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.4.tgz", + "integrity": "sha512-zjiuZ3yydBtwpF3bj0kQNV0YXe+iKE545QGZVTaylW3eAzFr+pJ/cwK8lZEaRp4JtaJXhD5DyWAV4AxLh6DgaQ==", "dev": true, "dependencies": { "debug": "^4.3.4" @@ -581,18 +591,6 @@ "dequal": "^2.0.3" } }, - "node_modules/busboy": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", - "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", - "dev": true, - "dependencies": { - "streamsearch": "^1.1.0" - }, - "engines": { - "node": ">=10.16.0" - } - }, "node_modules/code-red": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.3.tgz", @@ -740,6 +738,18 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/globalyzer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", + "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", + "dev": true + }, + "node_modules/globrex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", + "dev": true + }, "node_modules/import-meta-resolve": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz", @@ -775,9 +785,9 @@ "dev": true }, "node_modules/magic-string": { - "version": "0.30.2", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.2.tgz", - "integrity": "sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==", + "version": "0.30.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", + "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -803,18 +813,6 @@ "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", "dev": true }, - "node_modules/mime": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", - "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", - "dev": true, - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/mri": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", @@ -875,9 +873,9 @@ "dev": true }, "node_modules/postcss": { - "version": "8.4.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz", - "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -959,15 +957,6 @@ "node": ">=0.10.0" } }, - "node_modules/streamsearch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", - "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", - "dev": true, - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/svelte": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.1.2.tgz", @@ -1004,6 +993,16 @@ "svelte": "^3.19.0 || ^4.0.0" } }, + "node_modules/tiny-glob": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", + "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", + "dev": true, + "dependencies": { + "globalyzer": "0.1.0", + "globrex": "^0.1.2" + } + }, "node_modules/totalist": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", @@ -1014,12 +1013,12 @@ } }, "node_modules/undici": { - "version": "5.22.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz", - "integrity": "sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==", + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz", + "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==", "dev": true, "dependencies": { - "busboy": "^1.6.0" + "@fastify/busboy": "^2.0.0" }, "engines": { "node": ">=14.0" @@ -1081,12 +1080,12 @@ } }, "node_modules/vitefu": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.4.tgz", - "integrity": "sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.5.tgz", + "integrity": "sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==", "dev": true, "peerDependencies": { - "vite": "^3.0.0 || ^4.0.0" + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0" }, "peerDependenciesMeta": { "vite": { @@ -1260,6 +1259,12 @@ "dev": true, "optional": true }, + "@fastify/busboy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz", + "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==", + "dev": true + }, "@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -1323,44 +1328,45 @@ } }, "@sveltejs/kit": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.22.4.tgz", - "integrity": "sha512-Opkqw1QXk4Cc25b/heJP2D7mX+OUBFAq4MXKfET58svTTxdeiHFKzmnuRsSF3nmxESqrLjqPAgHpib+knNGzRw==", + "version": "1.27.4", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.27.4.tgz", + "integrity": "sha512-Vxl8Jf0C1+/8i/slsxFOnwJntCBDLueO/O6GJ0390KUnyW3Zs+4ZiIinD+cEcYnJPQQ9CRzVSr9Bn6DbmTn4Dw==", "dev": true, "requires": { - "@sveltejs/vite-plugin-svelte": "^2.4.1", + "@sveltejs/vite-plugin-svelte": "^2.5.0", "@types/cookie": "^0.5.1", "cookie": "^0.5.0", "devalue": "^4.3.1", "esm-env": "^1.0.0", "kleur": "^4.1.5", "magic-string": "^0.30.0", - "mime": "^3.0.0", + "mrmime": "^1.0.1", "sade": "^1.8.1", "set-cookie-parser": "^2.6.0", "sirv": "^2.0.2", - "undici": "~5.22.0" + "tiny-glob": "^0.2.9", + "undici": "~5.26.2" } }, "@sveltejs/vite-plugin-svelte": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.4.3.tgz", - "integrity": "sha512-NY2h+B54KHZO3kDURTdARqthn6D4YSIebtfW75NvZ/fwyk4G+AJw3V/i0OBjyN4406Ht9yZcnNWMuRUFnDNNiA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.5.1.tgz", + "integrity": "sha512-ZD9MibRc1dZVxLwDKCdsv9SW1bTBSi+7cyqGWisT9qEOO076Ojw2DYhIF3UTa8iUchbOwvexjme0P4kvKR//7g==", "dev": true, "requires": { - "@sveltejs/vite-plugin-svelte-inspector": "^1.0.3", + "@sveltejs/vite-plugin-svelte-inspector": "^1.0.4", "debug": "^4.3.4", "deepmerge": "^4.3.1", "kleur": "^4.1.5", - "magic-string": "^0.30.1", - "svelte-hmr": "^0.15.2", + "magic-string": "^0.30.3", + "svelte-hmr": "^0.15.3", "vitefu": "^0.2.4" } }, "@sveltejs/vite-plugin-svelte-inspector": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.3.tgz", - "integrity": "sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.4.tgz", + "integrity": "sha512-zjiuZ3yydBtwpF3bj0kQNV0YXe+iKE545QGZVTaylW3eAzFr+pJ/cwK8lZEaRp4JtaJXhD5DyWAV4AxLh6DgaQ==", "dev": true, "requires": { "debug": "^4.3.4" @@ -1415,15 +1421,6 @@ "dequal": "^2.0.3" } }, - "busboy": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", - "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", - "dev": true, - "requires": { - "streamsearch": "^1.1.0" - } - }, "code-red": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.3.tgz", @@ -1537,6 +1534,18 @@ "dev": true, "optional": true }, + "globalyzer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", + "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", + "dev": true + }, + "globrex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", + "dev": true + }, "import-meta-resolve": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz", @@ -1565,9 +1574,9 @@ "dev": true }, "magic-string": { - "version": "0.30.2", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.2.tgz", - "integrity": "sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==", + "version": "0.30.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", + "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", "dev": true, "requires": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -1584,12 +1593,6 @@ "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", "dev": true }, - "mime": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", - "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", - "dev": true - }, "mri": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", @@ -1632,9 +1635,9 @@ "dev": true }, "postcss": { - "version": "8.4.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz", - "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "requires": { "nanoid": "^3.3.6", @@ -1683,12 +1686,6 @@ "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true }, - "streamsearch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", - "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", - "dev": true - }, "svelte": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.1.2.tgz", @@ -1717,6 +1714,16 @@ "dev": true, "requires": {} }, + "tiny-glob": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", + "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", + "dev": true, + "requires": { + "globalyzer": "0.1.0", + "globrex": "^0.1.2" + } + }, "totalist": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", @@ -1724,12 +1731,12 @@ "dev": true }, "undici": { - "version": "5.22.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz", - "integrity": "sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==", + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz", + "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==", "dev": true, "requires": { - "busboy": "^1.6.0" + "@fastify/busboy": "^2.0.0" } }, "vite": { @@ -1745,9 +1752,9 @@ } }, "vitefu": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.4.tgz", - "integrity": "sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.5.tgz", + "integrity": "sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==", "dev": true, "requires": {} } diff --git a/package.json b/app/package.json similarity index 94% rename from package.json rename to app/package.json index 5c59c6f..1c852dc 100644 --- a/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "website", - "version": "0.0.1", + "version": "4.0.0", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/app.html b/app/src/app.html similarity index 100% rename from src/app.html rename to app/src/app.html diff --git a/src/lib/card.svelte b/app/src/lib/card.svelte similarity index 100% rename from src/lib/card.svelte rename to app/src/lib/card.svelte diff --git a/src/lib/card_link.svelte b/app/src/lib/card_link.svelte similarity index 92% rename from src/lib/card_link.svelte rename to app/src/lib/card_link.svelte index e994092..d2c083a 100644 --- a/src/lib/card_link.svelte +++ b/app/src/lib/card_link.svelte @@ -37,17 +37,19 @@ a { flex-direction: column; width: 100%; background: var(--dark-three); + box-shadow: var(--box-shadow); border-radius: 7px; cursor: pointer; transition: .4s; text-decoration: none; } -a:hover { - box-shadow: var(--box-shadow); +a:hover > .title { + text-shadow: var(--text-shadow); } .title { + border: solid 1px var(--dark-two); background: var(--dark-two); padding: 30px; border-radius: 7px 7px 0px 0px; diff --git a/src/lib/header.svelte b/app/src/lib/header.svelte similarity index 89% rename from src/lib/header.svelte rename to app/src/lib/header.svelte index e215e01..0337a2e 100644 --- a/src/lib/header.svelte +++ b/app/src/lib/header.svelte @@ -10,7 +10,7 @@ header { background: linear-gradient(rgba(11, 11, 11, 0.808), rgba(1, 1, 1, 0.96)), - url("https://files.ngn13.fun/banner.png"); + url("https://files.ngn.tf/banner.png"); background-size: 50%; width: 100%; height: 100%; diff --git a/src/lib/navbar.svelte b/app/src/lib/navbar.svelte similarity index 85% rename from src/lib/navbar.svelte rename to app/src/lib/navbar.svelte index b1d1b4e..ae8e82c 100644 --- a/src/lib/navbar.svelte +++ b/app/src/lib/navbar.svelte @@ -9,9 +9,9 @@
home - projects + services blog - source +
diff --git a/src/lib/navbar_link.svelte b/app/src/lib/navbar_link.svelte similarity index 57% rename from src/lib/navbar_link.svelte rename to app/src/lib/navbar_link.svelte index d3940a5..507ffcc 100644 --- a/src/lib/navbar_link.svelte +++ b/app/src/lib/navbar_link.svelte @@ -1,6 +1,7 @@ + +
+ +
+

+

{desc}

+
+
+ {icon} + +
+
+ + diff --git a/src/routes/+error.svelte b/app/src/routes/+error.svelte similarity index 100% rename from src/routes/+error.svelte rename to app/src/routes/+error.svelte diff --git a/src/routes/+layout.svelte b/app/src/routes/+layout.svelte similarity index 100% rename from src/routes/+layout.svelte rename to app/src/routes/+layout.svelte diff --git a/src/routes/+page.svelte b/app/src/routes/+page.svelte similarity index 54% rename from src/routes/+page.svelte rename to app/src/routes/+page.svelte index 5d08263..25e1080 100644 --- a/src/routes/+page.svelte +++ b/app/src/routes/+page.svelte @@ -24,8 +24,7 @@
  • 🇹🇷 I'm a high school student from Turkey
  • 🖥️ I'm interested in cyber security, programming and electronics
  • ❤️ I love and support Free/Libre and Open Source Software (FLOSS)
    • -
  • 🐧 My GNU/Linux distribution of choice is Artix
    • -
  • 😋 In my free time, I like playing Minecraft
    • +
  • 🐧 My GNU/Linux distribution of choice is Artix, however I am currently running Arch
    • @@ -34,9 +33,9 @@ techinal details you may want to know:
    • I built the frontend app using SvelteKit
      • -
    • I deploy my app to vercel using Github integration
      • -
    • 󰒋 Backend server is written in Go and it's hosted on my server
      • -
    • And yup, I also have other services hosted on the same server
      • +
    • 󰒋 Backend API is written in Go and it's hosted on my server
      • +
    • All assets (images, fonts etc.) are hosted on my server as well
      • +
    • No cloudflare, no CAPTCHAs, no CDNs, this website is %100 privacy friendly
    @@ -45,30 +44,42 @@ I usually spend my time...
      -
    • building random projects
      • -
    • 󰓂 contributing stuff that I like
      • -
    • 󰈻 solving CTFs
      • -
    • 󰌢 customizing my desktop
      • -
    • 󱀉 posting random stuff on my blog, which you should definitely check out (it's very active)
      • +
    • ⌨️ building random projects
      • +
    • 👥 contributing stuff that I like
      • +
    • 🚩 solving CTFs
      • +
    • 🖥️ customizing my desktop
      • +
    • 📑 posting random stuff on my blog, you should definitely check it out btw (it's very active)
     - If you want to have a chat, you can find me on the following platforms: + Here are some of my socials: - Or add me on XMPP, which is the platform that I use most actively: -
    - ngn@chat.ngn13.fun + If you want to contact me directly, send me an email: + + Or you can add me on XMPP: ngn@chat.ngn13.fun     + + If you want to do something stupid with your mone- +
    + I mean if you want to support me and my silly little work, here is my monero wallet address: +
    +
    + + 46q7G7u7cmASvJm7AmrhmNg6ctS77mYMmDAy1QxpDn5w57xV3GUY5za4ZPZHAjqaXdfS5YRWm4AVj5UArLDA1retRkJp47F + +
    -

    v3.0

    +

    v4.0

    diff --git a/src/routes/blog/[id]/+page.server.js b/app/src/routes/blog/[id]/+page.server.js similarity index 100% rename from src/routes/blog/[id]/+page.server.js rename to app/src/routes/blog/[id]/+page.server.js diff --git a/src/routes/blog/[id]/+page.svelte b/app/src/routes/blog/[id]/+page.svelte similarity index 98% rename from src/routes/blog/[id]/+page.svelte rename to app/src/routes/blog/[id]/+page.svelte index 518098b..5208eed 100644 --- a/src/routes/blog/[id]/+page.svelte +++ b/app/src/routes/blog/[id]/+page.svelte @@ -128,10 +128,12 @@ main { display: flex; flex-direction: row; gap: 20px; + justify-content: center; } .content { - padding: 30px; + max-width: 80%; + padding: 40px; background: var(--dark-two); box-shadow: var(--box-shadow); border-radius: 7px; diff --git a/src/routes/projects/+page.js b/app/src/routes/services/+page.js similarity index 56% rename from src/routes/projects/+page.js rename to app/src/routes/services/+page.js index 088c8cb..88df7ea 100644 --- a/src/routes/projects/+page.js +++ b/app/src/routes/services/+page.js @@ -1,6 +1,6 @@ export async function load({ fetch }) { const api = import.meta.env.VITE_API_URL_DEV - const res = await fetch(api+"/projects/get") + const res = await fetch(api+"/services/all") const data = await res.json() if (data["error"] != ""){ @@ -9,27 +9,33 @@ export async function load({ fetch }) { } } + // Some really bad code to convert + // [service1, service2, service3...] + // to + // [[service1, service2, service3], [service4, service5...]...] + // so i can render it in the UI easily + let all = data["result"] let counter = 0 - let currentlist = [] - let projects = [] + let currentlist = [] + let services = [] for (let i = 0; i < all.length; i++){ currentlist.push(all[i]) counter += 1 if(i == all.length-1 && counter != 3){ - projects.push(currentlist) + services.push(currentlist) } if (counter == 3) { - projects.push(currentlist) + services.push(currentlist) currentlist = [] counter = 0 } } return { - projects + services } } diff --git a/app/src/routes/services/+page.svelte b/app/src/routes/services/+page.svelte new file mode 100644 index 0000000..987b575 --- /dev/null +++ b/app/src/routes/services/+page.svelte @@ -0,0 +1,76 @@ + + + + [ngn] | services + + + + + +
    ls -l services
    +
    +
    +

    +

    + These are free to use FOSS services that I host on my server. + If you want an account on any of these services, or if you are having issues with them, + please send an email to services@ngn.tf +

    +
    + {#each data.services as services_list} +
    + {#each services_list as service} + {service.name} + {/each} +
    + {/each} +
    + + diff --git a/static/click.wav b/app/static/click.wav similarity index 100% rename from static/click.wav rename to app/static/click.wav diff --git a/static/font.css b/app/static/font.css similarity index 100% rename from static/font.css rename to app/static/font.css diff --git a/static/fonts/UbuntuNerdFont-Bold.ttf b/app/static/fonts/UbuntuNerdFont-Bold.ttf similarity index 100% rename from static/fonts/UbuntuNerdFont-Bold.ttf rename to app/static/fonts/UbuntuNerdFont-Bold.ttf diff --git a/static/fonts/UbuntuNerdFont-BoldItalic.ttf b/app/static/fonts/UbuntuNerdFont-BoldItalic.ttf similarity index 100% rename from static/fonts/UbuntuNerdFont-BoldItalic.ttf rename to app/static/fonts/UbuntuNerdFont-BoldItalic.ttf diff --git a/static/fonts/UbuntuNerdFont-Condensed.ttf b/app/static/fonts/UbuntuNerdFont-Condensed.ttf similarity index 100% rename from static/fonts/UbuntuNerdFont-Condensed.ttf rename to app/static/fonts/UbuntuNerdFont-Condensed.ttf diff --git a/static/fonts/UbuntuNerdFont-Italic.ttf b/app/static/fonts/UbuntuNerdFont-Italic.ttf similarity index 100% rename from static/fonts/UbuntuNerdFont-Italic.ttf rename to app/static/fonts/UbuntuNerdFont-Italic.ttf diff --git a/static/fonts/UbuntuNerdFont-Light.ttf b/app/static/fonts/UbuntuNerdFont-Light.ttf similarity index 100% rename from static/fonts/UbuntuNerdFont-Light.ttf rename to app/static/fonts/UbuntuNerdFont-Light.ttf diff --git a/static/fonts/UbuntuNerdFont-LightItalic.ttf b/app/static/fonts/UbuntuNerdFont-LightItalic.ttf similarity index 100% rename from static/fonts/UbuntuNerdFont-LightItalic.ttf rename to app/static/fonts/UbuntuNerdFont-LightItalic.ttf diff --git a/static/fonts/UbuntuNerdFont-Medium.ttf b/app/static/fonts/UbuntuNerdFont-Medium.ttf similarity index 100% rename from static/fonts/UbuntuNerdFont-Medium.ttf rename to app/static/fonts/UbuntuNerdFont-Medium.ttf diff --git a/static/fonts/UbuntuNerdFont-MediumItalic.ttf b/app/static/fonts/UbuntuNerdFont-MediumItalic.ttf similarity index 100% rename from static/fonts/UbuntuNerdFont-MediumItalic.ttf rename to app/static/fonts/UbuntuNerdFont-MediumItalic.ttf diff --git a/static/fonts/UbuntuNerdFont-Regular.ttf b/app/static/fonts/UbuntuNerdFont-Regular.ttf similarity index 100% rename from static/fonts/UbuntuNerdFont-Regular.ttf rename to app/static/fonts/UbuntuNerdFont-Regular.ttf diff --git a/static/fonts/UbuntuNerdFontPropo-Bold.ttf b/app/static/fonts/UbuntuNerdFontPropo-Bold.ttf similarity index 100% rename from static/fonts/UbuntuNerdFontPropo-Bold.ttf rename to app/static/fonts/UbuntuNerdFontPropo-Bold.ttf diff --git a/static/fonts/UbuntuNerdFontPropo-BoldItalic.ttf b/app/static/fonts/UbuntuNerdFontPropo-BoldItalic.ttf similarity index 100% rename from static/fonts/UbuntuNerdFontPropo-BoldItalic.ttf rename to app/static/fonts/UbuntuNerdFontPropo-BoldItalic.ttf diff --git a/static/fonts/UbuntuNerdFontPropo-Condensed.ttf b/app/static/fonts/UbuntuNerdFontPropo-Condensed.ttf similarity index 100% rename from static/fonts/UbuntuNerdFontPropo-Condensed.ttf rename to app/static/fonts/UbuntuNerdFontPropo-Condensed.ttf diff --git a/static/fonts/UbuntuNerdFontPropo-Italic.ttf b/app/static/fonts/UbuntuNerdFontPropo-Italic.ttf similarity index 100% rename from static/fonts/UbuntuNerdFontPropo-Italic.ttf rename to app/static/fonts/UbuntuNerdFontPropo-Italic.ttf diff --git a/static/fonts/UbuntuNerdFontPropo-Light.ttf b/app/static/fonts/UbuntuNerdFontPropo-Light.ttf similarity index 100% rename from static/fonts/UbuntuNerdFontPropo-Light.ttf rename to app/static/fonts/UbuntuNerdFontPropo-Light.ttf diff --git a/static/fonts/UbuntuNerdFontPropo-LightItalic.ttf b/app/static/fonts/UbuntuNerdFontPropo-LightItalic.ttf similarity index 100% rename from static/fonts/UbuntuNerdFontPropo-LightItalic.ttf rename to app/static/fonts/UbuntuNerdFontPropo-LightItalic.ttf diff --git a/static/fonts/UbuntuNerdFontPropo-Medium.ttf b/app/static/fonts/UbuntuNerdFontPropo-Medium.ttf similarity index 100% rename from static/fonts/UbuntuNerdFontPropo-Medium.ttf rename to app/static/fonts/UbuntuNerdFontPropo-Medium.ttf diff --git a/static/fonts/UbuntuNerdFontPropo-MediumItalic.ttf b/app/static/fonts/UbuntuNerdFontPropo-MediumItalic.ttf similarity index 100% rename from static/fonts/UbuntuNerdFontPropo-MediumItalic.ttf rename to app/static/fonts/UbuntuNerdFontPropo-MediumItalic.ttf diff --git a/static/fonts/UbuntuNerdFontPropo-Regular.ttf b/app/static/fonts/UbuntuNerdFontPropo-Regular.ttf similarity index 100% rename from static/fonts/UbuntuNerdFontPropo-Regular.ttf rename to app/static/fonts/UbuntuNerdFontPropo-Regular.ttf diff --git a/static/github.css b/app/static/github.css similarity index 98% rename from static/github.css rename to app/static/github.css index 8d779dc..64dbbf1 100644 --- a/static/github.css +++ b/app/static/github.css @@ -17,6 +17,19 @@ vertical-align: text-bottom; } +.markdown-body h1, +.markdown-body h2, +.markdown-body h3, +.markdown-body h4, +.markdown-body h5, +.markdown-body h6 { + text-shadow: var(--text-shadow); +} + +.markdown-body p { + font-size: 18px; +} + .markdown-body h1:hover .anchor .octicon-link:before, .markdown-body h2:hover .anchor .octicon-link:before, .markdown-body h3:hover .anchor .octicon-link:before, @@ -678,7 +691,7 @@ https://github.com/ngn13/ngn13.fun/raw/main/static/fonts/latin.woff2 } .markdown-body span.float-right>span { - display: block; + displaydebian: block; margin: 13px auto 0; overflow: hidden; text-align: right; @@ -690,7 +703,7 @@ https://github.com/ngn13/ngn13.fun/raw/main/static/fonts/latin.woff2 margin: 0; font-size: 85%; white-space: break-spaces; - background-color: rgba(110,118,129,0.4); + background-color: var(--dark-three); border-radius: 6px; } @@ -735,7 +748,7 @@ https://github.com/ngn13/ngn13.fun/raw/main/static/fonts/latin.woff2 overflow: auto; font-size: 85%; line-height: 1.45; - background-color: #161b22; + background-color: var(--dark-three); border-radius: 6px; } diff --git a/static/global.css b/app/static/global.css similarity index 99% rename from static/global.css rename to app/static/global.css index 870b997..7011791 100644 --- a/static/global.css +++ b/app/static/global.css @@ -31,7 +31,8 @@ body { } ::selection { - background: rgba(0, 0, 0, 0.7); + background: rgba(100, 100, 100, 0.5); + text-decoration: underline; } ::-webkit-scrollbar { diff --git a/svelte.config.js b/app/svelte.config.js similarity index 100% rename from svelte.config.js rename to app/svelte.config.js diff --git a/vite.config.js b/app/vite.config.js similarity index 100% rename from vite.config.js rename to app/vite.config.js diff --git a/assets/4.0_blog.png b/assets/4.0_blog.png new file mode 100644 index 0000000..f592121 Binary files /dev/null and b/assets/4.0_blog.png differ diff --git a/assets/4.0_index.png b/assets/4.0_index.png new file mode 100644 index 0000000..dbbd907 Binary files /dev/null and b/assets/4.0_index.png differ diff --git a/assets/githubio.png b/assets/githubio.png new file mode 100644 index 0000000..1b525f2 Binary files /dev/null and b/assets/githubio.png differ diff --git a/src/lib/project.svelte b/src/lib/project.svelte deleted file mode 100644 index 6e7064d..0000000 --- a/src/lib/project.svelte +++ /dev/null @@ -1,57 +0,0 @@ - - -
    - -

    -
    -

    -

    {desc}

    -
    -
    - - diff --git a/src/routes/projects/+page.svelte b/src/routes/projects/+page.svelte deleted file mode 100644 index 555029c..0000000 --- a/src/routes/projects/+page.svelte +++ /dev/null @@ -1,50 +0,0 @@ - - - - [ngn] | projects - - - - - -
    ls -l projects
    -
    - {#each data.projects as projectlist} -
    - {#each projectlist as project} - {project.name} - {/each} -
    - {/each} -
    - -