Update 'app/Http/Controllers/LocationController.php'

Minor spelling and grammar changes, updated the case for headings as well.

LICENSE

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

README.md

@@ -1,9 +1,7 @@
 # The Bad Space
 
-A searcable catalog of the worst places on the web.
+A searchable catalog of the worst places on the web.
 
 More features incoming
 
-An Hi Project =)
-
 

app/Http/Controllers/AppealController.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Mail\LocationAppeal;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Mail;
-use Ramsey\Uuid\Uuid;
-use App\Models\Appeal;
-
-class AppealController extends Controller
-{
-    /**
-     * Send appeal request
-     */
-    public function sendAppeal(Request $request)
-    {
-        //$order = Order::findOrFail($request->order_id);
-        $token = csrf_token();
-
-        if ($request->h1 != '' || $request->question != 2) {
-            return back()->withErrors([
-                'error' => 'Invalid Request',
-            ]);
-        } else {
-            $check = Appeal::where("location", $request->location)->first();
-
-            if ($check) {
-                return back()->withErrors([
-                    'error' => 'Appeal already in process for Location',
-                ]);
-            } else {
-                $clean = $request->validate([
-                    'location'           => ['required'],
-                    'local_admin'        => ['required'],
-                    'local_sponsor'      => ['required'],
-                    'appeal_description' => ['required'],
-                ]);
-
-                $new = Appeal::create([
-                    'uuid'           => Uuid::uuid4(),
-                    'location'       => $request->location,
-                    'location_admin' => $request->location_admin,
-                    'sponsor'        => $request->sponsor,
-                    'description'    => $request->appeal_description,
-                    'approved'       => false,
-                    'reviewed'       => false,
-                ]);
-                Mail::to(env('TBS_ADMIN_EMAIL'))->send(new LocationAppeal($request->location, $request->sponsor));
-            }
-            //return redirect('/appeals');
-            return back()->with('message', "Appeal Filed");
-        };
-    }
-}

app/Http/Controllers/DenController.php

@@ -4,33 +4,16 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use App\Repositories\LocationRepository;
-use App\Repositories\SourceRepository;
-use App\Services\PaginationService;
 
 class DenController extends Controller
 {
-    protected $pagination;
-    protected $source;
-
-    public function __construct(
-        PaginationService $paginationService,
-        SourceRepository $sourceRepository,
-        LocationRepository $locationRepository
-    ) {
-        $this->pagination = $paginationService;
-        $this->source     = $sourceRepository;
-        $this->location   = $locationRepository;
-    }
-
     //
     public function start(Request $request)
     {
         $member = Auth::user();
         return view('back.start', [
             'handle' => $member->handle,
-            'title'  => "This is The Den",
-            'role'   => $member->role
+            'title'  => "This is The Den"
         ]);
     }
 
@@ -42,47 +25,12 @@ class DenController extends Controller
             'title'  => "Manage Members"]);
     }
 
-    public function locations(Request $request)
+    public function location(Request $request, string $action = "index")
     {
         $member = Auth::user();
-        return view('back.locations', [
-            'handle' => $member->handle,
-            'title'  => "Manage Locations"]);
-    }
-
-    public function listings(Request $request, $pageNum = 1)
-    {
-        $member = Auth::user();
-        $page   = $this->pagination->getPage($pageNum);
         return view('back.locations', [
             'handle' => $member->handle,
             'title'  => "Manage Locations",
-            'sources'    => count($this->source->getActive()),
-            "totalPages" => $page['pageCount'],
-            "prev"       => $page['prev'],
-            "next"       => $page['next'],
-            'pageNum'    => $pageNum,
-            'locations'  => $page['locations']
-        ]);
-    }
-
-    public function locationEdit(Request $request, $uuid = 0)
-    {
-        $location = $this->location->getLocation($uuid);
-        $sources  = $this->source->getActive();
-        $name     = "NO LOCATION FOUND";
-        if ($location) {
-            $name = $location->name;
-        }
-        $links = explode(",", $location->archive_links);
-        return view('back.location', [
-            'title'         => str_replace(".", " ", $name),
-            'location'      => $location,
-            'actions'       => $location->block_count + $location->silence_count,
-            'sources_count' => count($sources),
-            'images'        => json_decode($location->images),
-            'archive_links' => $links,
-            'updated'       => $location->updated_at->format('Y M d'),
-        ]);
+            "action" => $action]);
     }
 }

app/Http/Controllers/ExportController.php

@@ -2,86 +2,34 @@
 
 namespace App\Http\Controllers;
 
-use App\Repositories\LocationRepository;
-use App\Models\Source;
-
 class ExportController extends Controller
 {
-    protected $locationRepository;
-
-    public function __construct(LocationRepository $locationRepository)
-    {
-        $this->locationRepository = $locationRepository;
-    }
-
-    public function exportIndex()
-    {
-        $heatArray = [90, 80, 70, 60, 50, 40, 30, 20];
-        $sources   = Source::where("active", true)->get();
-        $locations = $this->locationRepository->getActiveLocations();
-        $list      = [];
-        foreach ($heatArray as $rating) {
-            $count = 0;
-            foreach ($locations as $location) {
-                $rate = $location->actions_count / count($sources);
-                if ($rate * 100 >= $rating) {
-                    $count++;
-                }
-            }
-            array_push($list, ["heatRating" => $rating, "ratingCount" => $count]);
-        }
-        return view('front.exports', [
-            'title' => "Exports",
-            'list'  => $list
-        ]);
-    }
-
     //
-    public function exportCSV($type, $percent)
+    public function exportCSV()
     {
-        $columns = [];
-        $list    = [];
-
-        $locations = $this->locationRepository->getActiveLocations();
-        $sources   = Source::where("active", true)->get();
-        if ($type == 'mastodon') {
+        /*
         $columns = [
-                '#domain',
-                '#severity',
-                '#public_comment',
-                '#reject_media',
-                '#reject_reports',
-                '#obfuscate',
+            'id',
+            'product_name',
+            'product_url',
+            'price',
+            'category'
         ];
-        };
 
-        foreach ($locations as $location) {
-            $rate = $location->actions_count / count($sources);
-            if ($rate * 100 >= $percent) {
-                if ($type == 'mastodon') {
-                    //comman break teh CSV so just take them out
-                    $comments = str_replace(",", ";", $location->description);
-
-                    //remove extra white space
-                    $comments = str_replace(["\n\r", "\n", "\r"], " ", $comments);
-                    $comments = str_replace(['"', "'"], "", $comments);
-                    if ($location->rating == 'defederate') {
-                        $rating = 'suspend';
-                    } else {
-                        $rating = $location->rating;
-                    }
-                    //add to the export list
-                    array_push($list, [$location->url, $rating, $comments, "FALSE", "FALSE", "FALSE"]);
-                }
-            }
-        }
+        $products = [
+            [1, 'product 1', 'https://example.com/product-1', '9.99', 'category 1'],
+            [2, 'product 2', 'https://example.com/product-2', '19.99', 'category 2'],
+            [3, 'product 3', 'https://example.com/product-3', '29.99', 'category 3'],
+            [4, 'product 4', 'https://example.com/product-4', '39.99', 'category 4'],
+        ];
 
         header('Content-Type: text/csv');
-        header('Content-Disposition: attachment; filename=' . $type . "-" . $percent);
+        header('Content-Disposition: attachment; filename="products.csv"');
 
         echo implode(',', $columns) . PHP_EOL;
-        foreach ($list as $item) {
-            echo implode(',', $item) . PHP_EOL;
-        }
+        foreach ($products as $product) {
+            echo implode(',', $product) . PHP_EOL;
+        }
+        */
     }
 }

app/Http/Controllers/FrontIndexController.php

@@ -3,105 +3,103 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use App\Repositories\LocationRepository;
-use App\Repositories\SourceRepository;
-use App\Services\PaginationService;
+use Illuminate\Support\Facades\DB;
+use App\Models\Location;
+use App\Models\Source;
 
 class FrontIndexController extends Controller
 {
-    protected $location;
-    protected $source;
-    protected $pagination;
-
-    public function __construct(
-        LocationRepository $locationRepository,
-        SourceRepository $sourceRepository,
-        PaginationService $paginationService
-    ) {
-        $this->location   = $locationRepository;
-        $this->source     = $sourceRepository;
-        $this->pagination = $paginationService;
-    }
+    private $limit = 15;
 
     public function start()
     {
+        $locations = Location::where("active", true)->get();
+        $count     = count($locations);
+        $recent    = Location::where("active", true)
+            ->where('block_count', '>', 2)
+            ->limit(10)->orderByDesc('updated_at')->get();
+
+        //$result = DB::select("SELECT * FROM searchlocations('$terms')");
+
         return view('front.index', [
-            'count'       => count($this->location->getActiveLocations()),
-            'sources'     => count($this->source->getActive()),
-            'recent'      => $this->location->getRecent(),
-            'latest_date' => $this->location->getRecent()[0]->updated_at->format('Y M d'),
+            'count'  => $count,
+            'recent' => $recent,
             'title'  => "The Bad Space"
         ]);
     }
 
     public function indexSearch(Request $request)
     {
+        $terms     = $request->index_search;
+        $rawSearch = $terms;
+        $terms     = str_replace(",", "", $terms);
+        $terms     = str_replace(" ", "|", $terms);
+        $results   = DB::select("SELECT * FROM searchlocations('$terms')");
+
+        $locations = Location::where("active", true)->get();
+        $count     = count($locations);
+        $recent    = Location::where("active", true)
+            ->where('block_count', '>', 2)
+            ->limit(10)->orderByDesc('updated_at')->get();
+
         return view('front.index', [
-            'count'       => count($this->location->getActiveLocations()),
-            'sources'     => count($this->source->getActive()),
-            'recent'      => $this->location->getRecent(),
-            'results'     => $this->location->search($request),
-            'terms'       => $request->index_search,
-            'latest_date' => $this->location->getRecent()[0]->updated_at->format('Y M d'),
-            'title'       => "Search Results",
+            'count'   => $count,
+            'recent'  => $recent,
+            'title'   => "The Bad Space",
+            'results' => $results
         ]);
     }
 
     public function about()
     {
-        $sources = $this->source->getActive();
+        $sources = Source::where("active", true)->get();
         return view('front.about', [
             'title'   => "ABOUT",
             'sources' => $sources
         ]);
     }
 
-    public function appeals()
-    {
-        return view('front.appeals', [
-            'title' => "LOCATION APPEALS",
-        ]);
-    }
-
     public function location(string $uuid = "1")
     {
-        $location = $this->location->getLocation($uuid);
-        $sources  = $this->source->getActive();
+        $location = Location::where("uuid", $uuid)->first();
         $name     = "NO LOCATION FOUND";
-        $member   = Auth::user();
-        $edit     = false;
         if ($location) {
             $name = $location->name;
         }
-
-        if (isset($member->role)) {
-            ($member->role == 1 || $member->role == 2) ? $edit = true : $edit = false;
-        }
-
         return view('front.location', [
             'title'    => str_replace(".", " ", $name),
             'location' => $location,
-            'actions'       => $location->block_count + $location->silence_count,
-            'sources_count' => count($sources),
             'images'   => json_decode($location->images),
             'updated'  => $location->updated_at->format('Y M d'),
-            'edit'          => $edit
         ]);
     }
 
     public function listings(int $pageNum = 1)
     {
-        $page = $this->pagination->getPage($pageNum);
+        $range     = $pageNum * $this->limit - $this->limit;
+        $active    = Location::where("active", true)->where('block_count', '>', 2)->get();
+        $locations = Location::where("active", true)->where('block_count', '>', 2)
+            ->limit($this->limit)->offset($range)->orderByDesc('id')->get();
+        $pageCount = ceil(count($active) / $this->limit);
+
+        $next = $pageNum + 1;
+        if ($next > $pageCount) {
+            $next = 1;
+        }
+
+        $prev = $pageNum - 1;
+
+        if ($prev <= 0) {
+            $prev = $pageCount;
+        }
 
         return view('front.listing', [
             'title'      => "Listings",
-            'sources'    => count($this->source->getActive()),
-            "totalPages" => $page['pageCount'],
-            "prev"       => $page['prev'],
-            "next"       => $page['next'],
+            "totalPages" => $pageCount,
+            "prev"       => $prev,
+            "next"       => $next,
             'pageNum'    => $pageNum,
-            'locations'  => $page['locations']
+            'locations'  => $locations
         ]);
     }
 }

app/Http/Controllers/LocationController.php

@@ -3,49 +3,178 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Services\UpdateService;
-use App\Repositories\LocationRepository;
+use App\Models\Location;
+use Ramsey\Uuid\Uuid;
+use Illuminate\Support\Facades\Auth;
+use League\Csv\Reader;
+use App\Models\Source;
 
 class LocationController extends Controller
 {
-    protected $update;
+    //url to oli's unified tier 3 list
+    private $three = 'https://codeberg.org/oliphant/blocklists/raw/branch/main/blocklists/_unified_tier3_blocklist.csv';
 
-    public function __construct(
-        UpdateService $updateService,
-        LocationRepository $locationRepository
-    ) {
-        $this->update   = $updateService;
-        $this->location = $locationRepository;
+    //url to oli's domain audit containin block counts per domain
+    private $defed = 'https://codeberg.org/oliphant/blocklists/raw/branch/main/blocklists/other/domain_audit_file.csv';
+
+    public function addLocation(Request $request)
+    {
+        $fields = $request->validate([
+            'name'        => ['required'],
+            'url'         => ['required'],
+            'description' => ['required'],
+            'tags'        => ['required'],
+        ]);
+
+        if ($fields) {
+            $examples = [];
+            $files    = $request->files->get("loc_examples");
+            if ($request->hasfile('loc_examples')) {
+                foreach ($request->file('loc_examples') as $file) {
+                    $path = $file->store('reference');
+                    array_push($examples, ["path" => $path]);
+                }
+            }
+            $request->merge(['active' => true]);
+            $request->merge(['uuid' => Uuid::uuid4()]);
+            $request->merge(['images' => json_encode($examples)]);
+            $request->merge(['added_by' => Auth::user()->id]);
+            //NOTE: Laravel gets funky if sequencing isn't explicitly set
+            $new = Location::create($request->all());
+            if ($new) {
+                return back()->with('message', 'New Location Added. Take a break!');
+            } else {
+                return back()->withErrors([
+                    'error' => 'Uh oh. There was an issue.',
+                ]);
+            }
+        } else {
+            return back()->withErrors([
+                'error' => 'All fields are required.',
+            ]);
+        }
     }
 
     public function updateLocations()
     {
-        $result = $this->update->data();
+        //$fresh = file($this->three);
+        //$deny  = Reader::createFromPath($fresh, "r");
+        //$deny->setHeaderOffset(0);
+        //$list        = $deny->getRecords();
+        //$recordCount = count($fresh);
+        $duplicates = 0;
+        $fresh      = 0;
+        // ['url' => "rage.love"],
+        //['url' => "indiepocalypse.social"],
 
-        return back()->with(
-            'message',
-            $result
-        );
-    }
-
-    public function compileLocations()
-    {
-        $result = $this->update->list();
-
-        return back()->with(
-            'message',
-            $result
-        );
-    }
-
-    public function editLocation(Request $request)
-    {
-        $token    = csrf_token();
-        $response = $this->location->editLocation($request);
-        if ($response['status']) {
-            return back()->with('message', $response['message']);
+        $unified = [];
+        //$denycount  = array_map('str_getcsv', file($this->defed));
+        //$denylist   = array_map('str_getcsv', file($this->three));
+        $sources = Source::where("active", true)->get();
+        foreach ($sources as $source) {
+            //parsing for mastodon
+            if ($source->type == 'mastodon') {
+                $result = [];
+                if ($source->token == null) {
+                    $result = \Mastodon::domain('https://' . $source->url)
+                        ->get('/instance/domain_blocks');
                 } else {
-            return back()->withErrors('message', $response['message']);
+                    $result = \Mastodon::domain('https://' . $source->url)
+                        ->token($source->token)
+                        ->get('/instance/domain_blocks');
+                }
+
+                foreach ($result as $item) {
+                    $index = array_search($item['domain'], array_column($unified, 'url'));
+                    if ($index) {
+                        //if there is a match, update the count
+                        ++$unified[$index]['count'];
+                    } else {
+                        array_push($unified, [
+                            'name'    => $item['domain'],
+                            'url'     => $item['domain'],
+                            'rating'  => $item['severity'],
+                            'comment' => $item['comment'],
+                            'count'   => 1,
+                        ]);
                     }
                 }
             }
+            //parsing for custom csv
+            if ($source->type == 'custom' && $source->format == 'csv') {
+                $denylist = array_map('str_getcsv', file($source->url));
+                foreach ($denylist as $item) {
+                    $index = array_search($item[0], array_column($unified, 'url'));
+                    if ($index) {
+                        //if there is a match, update the count
+                        ++$unified[$index]['count'];
+                    } else {
+                        array_push($unified, [
+                            'name'    => $item[0],
+                            'url'     => $item[0],
+                            'rating'  => $item[1],
+                            'comment' => $item[2],
+                            'count'   => 1,
+                        ]);
+                    }
+                }
+            }
+        }
+
+        //once the unified list is created, update current entries or create fresh ones
+
+        foreach ($unified as $item) {
+            $location = Location::where("url", $item['url'])->first();
+            if ($location) {
+                ++$duplicates;
+                //update block count for existing item
+
+                $location->block_count = $item['count'];
+
+                //replace null with empty array
+                if ($location->images == null) {
+                    $location->images = [];
+                };
+                $location->save();
+            } else {
+                // make new entries for instances not present
+                ++$fresh;
+                $images = [];
+
+                $new = Location::create([
+                    'uuid'        => Uuid::uuid4(),
+                    'name'        => $item['url'],
+                    'url'         => $item['url'],
+                    'description' => ($item['comment'] != null) ? $item['comment'] : "No description provided.",
+                    'active'      => true,
+                    'rating'      => $item['rating'],
+                    'added_by'    => 1,
+                    'tags'        => 'poor moderation, hate speech',
+                    'images'      => json_encode($images),
+                    'block_count' => $item['count'],
+                ]);
+            }
+        }
+
+        //$lookfor = '0sint.social';
+        //$index   = array_search($lookfor, array_column($unified, 'url'));
+        //return back()->with('message', 'TOTAL: ' . count($unified) . " - " . $unified[$index]['count'] . " COUNT");
+        return back()->with('message', $duplicates . ' UPDATED - ' . $fresh . ' CREATED');
+
+        //$domain = $csv[1000][0];
+        //$record = null;
+
+        /*
+        foreach ($blockcount as $line) {
+            if ($line[0] == $domain) {
+                $record = $line;
+            }
+        }
+        if ($record != null) {
+            return back()->with('message', $domain . ' has ' . $record[1] . ' blocks.');
+        } else {
+            return back()->with('message', 'NO MATCHES');
+        }
+        */
+    }
+}

app/Http/Resources/LocationCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class LocationCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @return array<int|string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        //return parent::toArray($request);
-
-        return [
-            'listingCount' => count($this->collection),
-            'locations'    => LocationResource::collection($this->collection),
-        ];
-    }
-}

app/Http/Resources/LocationResource.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class LocationResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'url'         => $this->url,
-            'name'        => $this->name,
-            'description' => $this->description,
-            'rating'      => $this->rating,
-            'count'       => $this->block_count,
-            'link'        => "/location/" . $this->uuid,
-        ];
-    }
-}

app/Mail/LocationAppeal.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Queue\SerializesModels;
-
-class LocationAppeal extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * Create a new message instance.
-     */
-    public function __construct(public $location, public $sponsor)
-    {
-    }
-
-    /**
-     * Get the message envelope.
-     */
-    public function envelope(): Envelope
-    {
-        return new Envelope(
-            from: new Address(env('TBS_FROM_ADDRESS'), 'TBS Appeal Request'),
-            subject: 'Location Appeal',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     */
-    public function content(): Content
-    {
-        return new Content(
-            view: 'email.appeal',
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
-     */
-    public function attachments(): array
-    {
-        return [];
-    }
-}

app/Models/Appeal.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class Appeal extends Model
-{
-    use HasFactory;
-    use SoftDeletes;
-
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $table = "appeal";
-
-    protected $primaryKey = 'id';
-    public $incrementing  = true;
-    protected $fillable   = [
-        "uuid",
-        "location",
-        "location_admin",
-        "sponsor",
-        "description",
-        "approved",
-        "reviewed",
-        "created_at",
-        "updated_at"
-    ];
-}

app/Models/Location.php

@@ -4,12 +4,10 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Location extends Model
 {
     use HasFactory;
-    use SoftDeletes;
 
     /**
      * The table associated with the model.
@@ -31,10 +29,7 @@ class Location extends Model
         "added_by",
         "tags",
         "block_count",
-        "silence_count",
         "created_at",
-        "updated_at",
-        "actions_count",
-        "archive_links"
+        "updated_at"
     ];
 }

app/Models/Source.php

@@ -11,5 +11,5 @@ class Source extends Model
 
     protected $table    = "source";
     public $timestamps  = false;
-    protected $fillable = ["url", "type", "active", "format", "token", "list_data", "last_updated"];
+    protected $fillable = ["url", "type", "active", "format", "token"];
 }

app/Providers/AppServiceProvider.php

@@ -3,12 +3,6 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use App\Repositories\LocationRepository;
-use App\Repositories\SourceRepository;
-use App\Services\UpdateService;
-use App\Services\MaintenanceService;
-use App\Models\Location;
-use App\Models\Source;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -17,28 +11,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        $this->app->bind(LocationRepository::class, function ($app) {
-            return new LocationRepository(new Location());
-        });
-
-        $this->app->bind(SourceRepository::class, function ($app) {
-            return new SourceRepository(new Source());
-        });
-
-        $this->app->bind(UpdateService::class, function ($app) {
-            return new UpdateService(
-                new LocationRepository(new Location()),
-                new SourceRepository(new Source())
-            );
-        });
-
-        $this->app->bind(MaintenanceService::class, function ($app) {
-            return new MaintenanceService(new Location());
-        });
-
-        $this->app->bind(PaginationService::class, function ($app) {
-            return new PaginationService(new Location());
-        });
+        //
     }
 
     /**

app/Repositories/LocationRepository.php

@@ -1,119 +0,0 @@
-<?php
-
-namespace App\Repositories;
-
-use App\Models\Location;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Auth;
-
-class LocationRepository
-{
-    protected $model;
-
-    public function __construct(Location $model)
-    {
-        $this->model = $model;
-    }
-
-    public function search($request)
-    {
-        // this grabs the search results from the db
-        $terms     = $request->index_search;
-        $rawSearch = $terms;
-        $terms     = str_replace(",", "", $terms);
-        $terms     = str_replace(" ", "|", $terms);
-        $raw       = DB::select("SELECT * FROM searchlocations(?)", [$terms]);
-        $results   = [];
-        foreach ($raw as $item) {
-            if (($item->block_count + $item->silence_count) >= 2) {
-                array_push($results, $item);
-            }
-        }
-
-        return $results;
-    }
-
-    public function getLocation($type)
-    {
-        if (!is_string($type) || (preg_match('/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/', $type) !== 1)) {
-            return $this->model::where("url", $type)->first();
-        } else {
-            return $this->model::where("uuid", $type)->first();
-        }
-    }
-
-    public function getActiveLocations()
-    {
-        return $this->model::where("active", true)->where('actions_count', '>=', 2)->get();
-    }
-
-    public function getRecent()
-    {
-        return $locations = $this->model::where("active", true)->where('actions_count', '>=', 2)
-            ->orderByDesc('updated_at')->limit(10)->get();
-    }
-
-    public function editLocation($request)
-    {
-        $location = $this->getLocation($request->id);
-        $images   = [];
-        if ($request->hasfile("references")) {
-            foreach ($request->references as $file) {
-                $path = $file->store('reference');
-                array_push($images, ["path" => $path]);
-            }
-        }
-        $request->merge(['images' => json_encode($images)]);
-        $location->name          = $request->name;
-        $location->description   = $request->description;
-        $location->archive_links = $request->archive_links;
-        $location->images        = json_encode($images);
-
-        $result = [];
-
-        if ($location->save()) {
-            return ['status' => true, 'message' => "Location Editited -IMG- " . $request->hasfile("references")];
-        } else {
-            return ['status' => false, 'message' => "Location Not Editited"];
-        }
-    }
-
-    public function addLocation(Request $request)
-    {
-        $fields = $request->validate([
-            'name'        => ['required'],
-            'url'         => ['required'],
-            'description' => ['required'],
-            'tags'        => ['required'],
-        ]);
-
-        if ($fields) {
-            $examples = [];
-            $files    = $request->files->get("loc_examples");
-            if ($request->hasfile('loc_examples')) {
-                foreach ($request->file('loc_examples') as $file) {
-                    $path = $file->store('reference');
-                    array_push($examples, ["path" => $path]);
-                }
-            }
-            $request->merge(['active' => true]);
-            $request->merge(['uuid' => Uuid::uuid4()]);
-            $request->merge(['images' => json_encode($examples)]);
-            $request->merge(['added_by' => Auth::user()->id]);
-            //NOTE: Laravel gets funky if sequencing isn't explicitly set
-            $new = Location::create($request->all());
-            if ($new) {
-                return back()->with('message', 'New Location Added. Take a break!');
-            } else {
-                return back()->withErrors([
-                    'error' => 'Uh oh. There was an inssue',
-                ]);
-            }
-        } else {
-            return back()->withErrors([
-                'error' => 'All fields are required',
-            ]);
-        }
-    }
-}

app/Repositories/SourceRepository.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace App\Repositories;
-
-use App\Models\Source;
-use Carbon\Carbon;
-use GuzzleHttp\Exception\ConnectException;
-
-class SourceRepository
-{
-    protected $source;
-
-    public function __construct(Source $source)
-    {
-        $this->source = $source;
-    }
-
-    public function getActive()
-    {
-        return $this->source::where("active", true)->get();
-    }
-
-    public function updateSourceData()
-    {
-        $sources = $this->getActive();
-        $missing = [];
-        $checked = [];
-        //checks all the sources to refresh data
-        foreach ($sources as $source) {
-            $result = [];
-            if ($source['type'] == 'mastodon') {
-                if ($source['token'] == null) {
-                    try {
-                        $result = \Mastodon::domain('https://' . $source['url'])
-                            ->get('/instance/domain_blocks');
-                        array_push($checked, ['source' => $source->url]);
-                    } catch (ConnectException $e) {
-                        array_push($missing, ['source' => $source->url]);
-                    }
-                } else {
-                    try {
-                        $result = \Mastodon::domain('https://' . $source['url'])
-                            ->token($source['token'])
-                            ->get('/instance/domain_blocks');
-                        array_push($checked, ['source' => $source->url]);
-                    } catch (ConnectException $e) {
-                    }
-                }
-            } elseif ($source['type'] == 'custom' && $source['format'] == 'csv') {
-                try {
-                    $denylist = array_map('str_getcsv', file('https://' . $source['url']));
-                    foreach ($denylist as $item) {
-                        array_push($result, [
-                            'domain'   => $item[0],
-                            'severity' => $item[1],
-                            'comment'  => $item[2]]);
-                    }
-                    array_push($checked, ['source' => $source->url]);
-                } catch (Exception $e) {
-                    array_push($missing, ['source' => $source->url]);
-                }
-            }
-
-            $source->list_data    = json_encode($result);
-            $source->last_updated = Carbon::now();
-            $source->save();
-        }
-        return ['checked' => $checked, 'notchecked' => $missing];
-    }
-}

app/Services/MaintenanceService.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Models\Location;
-
-class MaintenanceService
-{
-    //TODO: maintenance script to set locations to inactive if they haven't been updated
-    // over 90 days
-
-    //$diff=date_diff($location->updated_at, new DateTime());
-    //$days = $diff->format("%R%a days")
-
-    //$interval = $location->updated_at->diff(new DateTime());
-    //$days = $interval->format("%a");
-
-    //get all locations and sort which are present in unified or not
-    /*
-    $sorted    = [];
-    $listed    = 0;
-    $notlisted = 0;
-    foreach (Location::all() as $location) {
-        if (array_search($location->url, array_column($unified, 'url'))) {
-            ++$listed;
-            // locations present in unfied, so updated
-            array_push($sorted, [
-                'location' => $location,
-                'listed'   => true
-            ]);
-        } else {
-            ++$notlisted;
-            //locations not present
-            array_push($sorted, [
-                'location' => $location,
-                'listed'   => false
-            ]);
-        }
-    };
-    */
-}

app/Services/PaginationService.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Models\Location;
-
-class PaginationService
-{
-    protected $location;
-    protected $limit = 15;
-
-    public function __construct(
-        Location $location,
-    ) {
-        $this->location = $location;
-    }
-
-    public function getPage($pageNum)
-    {
-        $range     = $pageNum * $this->limit - $this->limit;
-        $active    = $this->location::where("active", true)->where('actions_count', '>=', 2)->get();
-        $locations = $this->location::where("active", true)->where('actions_count', '>=', 2)
-            ->limit($this->limit)->offset($range)->orderBy('id', 'asc')->get();
-        $pageCount = ceil(count($active) / $this->limit);
-
-        $next = $pageNum + 1;
-        if ($next > $pageCount) {
-            $next = 1;
-        }
-
-        $prev = $pageNum - 1;
-
-        if ($prev <= 0) {
-            $prev = $pageCount;
-        }
-
-        return $result = [
-            'locations' => $locations,
-            'pageCount' => $pageCount,
-            'prev'      => $prev,
-            'next'      => $next];
-    }
-}

app/Services/UpdateService.php

@@ -1,135 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Models\Location;
-use App\Repositories\LocationRepository;
-use App\Repositories\SourceRepository;
-use Ramsey\Uuid\Uuid;
-
-class UpdateService
-{
-    protected $location;
-    protected $source;
-
-    public function __construct(
-        LocationRepository $locationRepository,
-        SourceRepository $sourceRepository
-    ) {
-        $this->location = $locationRepository;
-        $this->source   = $sourceRepository;
-    }
-
-    public function data()
-    {
-        $response = $this->source->updateSourceData();
-        return count($response['checked']) . ' SOURCES UPDATED - ' .
-            count($response['notchecked']) . ' SOURCES NOT CHECKED';
-    }
-
-    public function list()
-    {
-        $duplicates = 0;
-        $fresh      = 0;
-        $unified    = [];
-
-        $sources = $this->source->getActive();
-
-        foreach ($sources as $source) {
-            //$listData = json_decode();
-            foreach (json_decode($source->list_data) as $item) {
-                $index = array_search($item->domain, array_column($unified, 'url'));
-                if ($index) {
-                    //if there is a match, update the count
-                    if ($item->severity == "suspend" || $item->severity == "defederate") {
-                        ++$unified[$index]['block_count'];
-                        array_push($unified[$index]['block_vote'], $source->url);
-                    } else {
-                        ++$unified[$index]['silence_count'];
-                        array_push($unified[$index]['silence_vote'], $source->url);
-                    }
-                } else {
-                    $silence      = 0;
-                    $suspend      = 0;
-                    $block_vote   = [];
-                    $silence_vote = [];
-                    if ($item->severity == "suspend" || $item->severity == "defederate") {
-                        ++$suspend;
-                        array_push($block_vote, $source->url);
-                    } else {
-                        ++$silence;
-                        array_push($silence_vote, $source->url);
-                    }
-                    array_push($unified, [
-                        'name'          => $item->domain,
-                        'url'           => $item->domain,
-                        'rating'        => $item->severity,
-                        'comment'       => $item->comment,
-                        'block_count'   => $suspend,
-                        'silence_count' => $silence,
-                        'block_vote'    => $block_vote,
-                        'silence_vote'  => $silence_vote,
-                    ]);
-                }
-            }
-        }
-
-        foreach ($unified as $item) {
-            $location = $this->location->getLocation($item['url']);
-            if ($location) {
-                ++$duplicates;
-                //update block count for existing item
-
-                $location->block_count   = $item['block_count'];
-                $location->block_vote    = [];
-                $location->block_vote    = $item['block_vote'];
-                $location->silence_count = $item['silence_count'];
-                $location->silence_vote  = [];
-                $location->silence_vote  = $item['silence_vote'];
-
-                $location->actions_count = $item['block_count'] + $item['silence_count'];
-
-                if (($item['block_count'] + $item['silence_count']) < 2) {
-                    $location->active = false;
-                } else {
-                    $location->active = true;
-                }
-
-                //replace null with empty array
-                if ($location->images == null) {
-                    $location->images = [];
-                };
-                $location->save();
-            } else {
-                // make new entries for instances not present
-                ++$fresh;
-                $images = [];
-                $rating = ($item['rating'] == 'defederate') ? 'suspend' : $item['rating'];
-
-                $status = true;
-                if (($item['block_count'] + $item['silence_count']) < 2) {
-                    $status = false;
-                }
-
-                $new = Location::create([
-                    'uuid'          => Uuid::uuid4(),
-                    'name'          => $item['url'],
-                    'url'           => $item['url'],
-                    'description'   => ($item['comment'] != null) ? $item['comment'] : "no description",
-                    'active'        => $status,
-                    'rating'        => $rating,
-                    'added_by'      => 1,
-                    'tags'          => 'poor moderation, hate speech',
-                    'images'        => json_encode($images),
-                    'block_count'   => $item['block_count'],
-                    'block_vote'    => $item['block_vote'],
-                    'silence_count' => $item['silence_count'],
-                    'silence_vote'  => $item['silence_vote'],
-                    'actions_cont'  => $item['block_count'] + $item['silence_count']
-                ]);
-            }
-        }
-        //TODO: Send update post to TBS social account
-        return $duplicates . ' LOCATIONS UPDATED | ' . $fresh . ' NEW LOCATIONS CREATED';
-    }
-}

composer.json

@@ -5,10 +5,10 @@
     "keywords": ["laravel", "framework"],
     "license": "MIT",
     "require": {
-        "php": "^8.2",
+        "php": "^8.1",
         "guzzlehttp/guzzle": "^7.2",
-        "laravel/framework": "^11.0",
-        "laravel/sanctum": "^4.0",
+        "laravel/framework": "^10.10",
+        "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.8",
         "revolution/laravel-mastodon-api": "^3.0"
     },
@@ -17,7 +17,7 @@
         "laravel/pint": "^1.0",
         "laravel/sail": "^1.18",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^8.1",
+        "nunomaduro/collision": "^7.0",
         "phpunit/phpunit": "^10.1",
         "spatie/laravel-ignition": "^2.0"
     },

public/assets/css/back/locations.css

@@ -1,12 +1,25 @@
-section.edit-location > article > form.location-edit > label {
+section[role="loc-index"] {
+  width: 100%;
+  max-width: 600px;
+  padding: 10px;
+  margin: 0 auto;
+}
+
+section[role="loc-index"] img {
+  width: 150px;
+  vertical-align: top;
+  border-radius: 3px;
+}
+
+section[role="loc-index"] label {
   color: var(--white);
 }
 
-section.edit-location > article > form.location-edit > input {
+section[role="loc-index"] input {
   width: 290px;
 }
 
-section.edit-location > article > form.location-edit > textarea {
+section[role="loc-index"] textarea {
   width: 290px;
   padding: 5px;
   height: 100px;

public/assets/css/front/index.css

@@ -32,18 +32,6 @@ form.index-search-form > button {
   right: 0;
 }
 
-form.index-search-form > button > img#search-icon {
-  float: none;
-}
-
-form.index-search-form > button > label {
-  font-weight: 500;
-  top: 15px;
-  position: relative;
-  font-size: 1.5em;
-  display: none;
-}
-
 ::placeholder {
   /* Chrome, Firefox, Opera, Safari 10.1+ */
   color: var(--highlight);
@@ -53,23 +41,6 @@ section.index-meta article {
   margin-top: 20px;
 }
 
-div.index-meta {
-  display: grid;
-  grid-template-columns: 50% 50%;
-  gap: 10px;
-  width: 98%;
-  font-weight: 500;
-  color: var(--secondary);
-}
-
-div.index-meta > label:nth-child(2),
-div.index-meta > label:nth-child(4),
-div.index-meta > label:nth-child(6) {
-  color: var(--white);
-  width: 100%;
-  text-align: right;
-}
-
 @media only screen and (max-width: 800px) {
   form.index-search-form > input[type="text"] {
     width: 85%;
@@ -77,32 +48,3 @@ div.index-meta > label:nth-child(6) {
     font: 34px var(--base-type);
   }
 }
-
-@media only screen and (max-width: 650px) {
-  form.index-search-form > input[type="text"] {
-    width: 80%;
-    height: 50px;
-    font: 34px var(--base-type);
-  }
-}
-
-@media only screen and (max-width: 480px) {
-  form.index-search-form > input[type="text"] {
-    width: 99%;
-    height: 50px;
-    font: 27px var(--base-type);
-  }
-
-  form.index-search-form > button {
-    width: 99%;
-    top: 15px;
-  }
-
-  form.index-search-form > button > label {
-    display: inline;
-  }
-
-  form.index-search-form > button > img#search-icon {
-    float: right;
-  }
-}

public/assets/css/front/listing.css

@@ -37,119 +37,7 @@ section[role="listings"] div[role="paginate"] span {
 
 a.list-link {
   display: grid;
-  grid-template-columns: 70px 1fr 80px 80px;
-  gap: 10px;
-  height: auto;
-  padding-bottom: 20px;
-  cursor: pointer;
-}
-
-a.list-link > .item-rating {
-  background: var(--secondary);
-  border-radius: 3px;
-  color: var(--white);
-  font-weight: 500;
-  padding: 10px;
-  position: relative;
-}
-
-a.list-link > .item-name {
-  background: var(--white);
-  border-radius: 3px;
-  color: var(--black);
-  font-weight: 400;
-  padding: 9px 5px;
-  cursor: pointer;
-  position: relative;
-}
-
-a.list-link > .item-silence {
-  background: var(--silence);
-  border-radius: 3px;
-  color: var(--black);
-  font-weight: 500;
-  padding: 10px;
-  position: relative;
-}
-
-a.list-link > .item-block {
-  background: var(--suspend);
-  border-radius: 3px;
-  color: var(--black);
-  font-weight: 500;
-  padding: 10px;
-  position: relative;
-}
-
-a.list-link > .item-silence > .item-icon,
-a.list-link > .item-block > .item-icon {
-  width: 30px;
-  vertical-align: top;
-}
-
-/*
-    responsive
- */
-
-@media only screen and (max-width: 800px) {
-  a.list-link {
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-    grid-template-rows: 100% 100px 30px 30px;
-    gap: 5px;
-    height: auto;
-    padding-bottom: 20px;
-    cursor: pointer;
-  }
-
-  a.list-link > .item-rating {
-    grid-row: 3;
-    grid-column: 1/4;
-    height: 100%;
-  }
-
-  a.list-link > .item-name {
-    grid-row: 2/3;
-    grid-column: 1/6;
-  }
-
-  a.list-link > .item-silence {
-    grid-row: 3/4;
-    height: 100%;
-  }
-
-  a.list-link > .item-block {
-    grid-row: 3/4;
-    height: 100%;
-  }
-}
-
-@media only screen and (max-width: 480px) {
-  a.list-link {
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-    grid-template-rows: auto auto 30px 30px;
-    gap: 5px;
-    height: auto;
-    padding-bottom: 20px;
-    cursor: pointer;
-  }
-
-  a.list-link > .item-rating {
-    grid-row: 3;
-    grid-column: 1/2;
-    height: 100%;
-  }
-
-  a.list-link > .item-silence {
-    grid-row: 3/4;
-    grid-column: 2/4;
-    height: 100%;
-  }
-
-  a.list-link > .item-block {
-    grid-row: 3/4;
-    height: 100%;
-    grid-column: 4/6;
-  }
+  grid-template-columns: 30px 50px 300px;
+  width: 80%;
+  height: 45px;
 }

public/assets/css/front/location.css

@@ -14,71 +14,8 @@ section[role="location"] img {
   vertical-align: top;
 }
 
-div.location-rating {
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
-  gap: 10px;
-  width: 98%;
-  font-weight: 500;
-  font-size: 0.8em;
-  color: var(--secondary);
-}
-
-div.location-rating > div {
-  border-radius: 3px;
-  color: var(--primary);
-  padding: 5px 5px 0;
-}
-
-div.location-rating > div:nth-child(1) {
-  background: var(--secondary);
-}
-
-div.location-rating > div:nth-child(2) {
-  background: var(--silence);
-}
-
-div.location-rating > div:nth-child(3) {
-  background: var(--suspend);
-}
-
-div.location-rating > div > span {
-  position: relative;
-  top: 6px;
-  float: right;
-  width: 80%;
-  text-align: center;
-}
-
 .rating-icon {
-  width: 35px;
+  width: 45px;
+  top: 10px;
   position: relative;
 }
-
-@media only screen and (max-width: 800px) {
-  div.location-rating {
-    font-size: 0.65em;
-  }
-
-  div.location-rating > div > span {
-    width: 75%;
-  }
-}
-
-@media only screen and (max-width: 670px) {
-  div.location-rating {
-    grid-template-columns: 1fr 1fr;
-    font-size: 0.7em;
-  }
-}
-
-@media only screen and (max-width: 480px) {
-  div.location-rating {
-    grid-template-columns: 1fr;
-    font-size: 0.8em;
-  }
-
-  div.location-rating > div > span {
-    width: 85%;
-  }
-}

public/assets/css/global/colors.css

@@ -1,13 +1,13 @@
 :root {
   /* BASE COLORS */
-  --primary: #0c1119;
-  --secondary: #c3639e;
-  --highlight: #4d7555;
-  --white: #efded5;
+  --primary: #140c08;
+  --secondary: #d66365;
+  --highlight: #69b04f;
+  --white: #efebe3;
   --grey: #abb7b7;
   --black: #32302f;
   --error: #b62520;
-  --silence: #d2896b;
-  --suspend: #d94959;
+  --silence: #ea6010;
+  --suspend: #fb263a;
   --primary-rgb: 20 13 13;
 }

public/assets/css/global/forms.css

@@ -9,7 +9,6 @@ input[type="text"] {
   background: var(--white);
   color: var(--primary);
   transition: all 0.2s linear;
-  height: 30px;
 }
 
 input[type="text"]:focus,
@@ -35,7 +34,6 @@ input[type="submit"] {
   cursor: pointer;
   border: 0;
   transition: all 0.3s linear;
-  height: 35px;
 }
 
 select {

public/assets/css/global/frame.css

@@ -2,7 +2,7 @@ html {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  font: 400 1.4em/1.4em var(--base-type);
+  font: 400 1.6em/1.3em var(--base-type);
 }
 
 html body {
@@ -20,7 +20,6 @@ a {
   color: var(--highlight);
   text-decoration: none;
   transition: all 0.2s linear;
-
   /*
   border-bottom: 1px solid var(--white);
 
@@ -31,11 +30,6 @@ strong {
   color: var(--secondary);
 }
 
-hr {
-  border-width: 0.5px;
-  border-color: var(--white);
-}
-
 header {
   width: 100%;
   color: var(--primary);
@@ -103,11 +97,6 @@ main > section > article {
   min-height: 400px;
 }
 
-textarea[name="appeal_description"] {
-  width: 300px;
-  height: 200px;
-}
-
 /* NAV */
 
 #main-nav {
@@ -192,32 +181,32 @@ sup {
 }
 
 footer {
+  width: 100%;
   color: var(--primary);
   background: var(--secondary);
+  height: 200px;
+}
+
+footer > div:nth-child(1) {
   display: grid;
-  grid-template-columns: 50% 48%;
+  grid-template-columns: 50% 50%;
   padding: 10px;
   gap: 10px;
-  height: auto;
+  height: 200px;
   width: 80%;
-  margin: 20px auto;
+  margin: 0 auto;
   max-width: 1000px;
   position: relative;
 }
 
-footer a {
-  color: var(--white);
-}
-
-footer > div:nth-child(2) {
-  text-align: right;
-}
-
 /*
     responsive
  */
 
 @media only screen and (max-width: 960px) {
+  header > div:nth-child(1) {
+  }
+
   header > div nav {
     bottom: 17px;
   }
@@ -234,29 +223,5 @@ footer > div:nth-child(2) {
   }
 }
 
-@media only screen and (max-width: 650px) {
-  header > div:nth-child(1) {
-    grid-template-columns: 150px 65% 1fr;
-    grid-template-rows: 75% 1fr;
-    height: auto;
-    gap: 15px;
-  }
-
-  header > div > div.header-left {
-    grid-row: 1/2;
-    position: relative;
-    width: 100px;
-  }
-
-  header > div > div.header-center {
-    grid-row: 2/3;
-    grid-column: 1/4;
-    position: relative;
-  }
-}
-
-@media only screen and (max-width: 440px) {
-  header > div:nth-child(1) {
-    grid-template-columns: 150px 40% 1fr;
-  }
+@media only screen and (max-width: 800px) {
 }

public/assets/css/global/typography.css

@@ -63,26 +63,6 @@ h2 {
 }
 
 h3 {
-  font-size: 1em;
-  font-weight: 500;
-}
-
-@media only screen and (max-width: 800px) {
-  h1 {
-    font-size: 2em;
-  }
-}
-
-@media only screen and (max-width: 650px) {
-  h1 {
   font-size: 1.5em;
-    letter-spacing: -3px;
-    width: 100%;
-    position: relative;
-  }
-}
-
-@media only screen and (max-width: 480px) {
-  font-size: 1.5em;
-  letter-spacing: -3px;
+  font-weight: 300;
 }

public/assets/images/global/heat.svg

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Pixelmator Pro 3.4.3 -->
-<svg width="500" height="500" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
-    <path id="Ellipse" fill="#efebe3" stroke="none" d="M 250 500 C 111.928947 500 0 388.071045 0 250 C 0 111.928955 111.928947 0 250 0 C 388.071045 0 500 111.928955 500 250 C 500 388.071045 388.071045 500 250 500 Z M 249.5 425.849609 C 334.610199 425.849609 403 351.977203 403 264.537109 C 403 244.390259 393.74881 215.814362 379.837891 187.855469 C 365.721375 159.485382 345.643799 129.607941 321.933594 106.994141 C 316.519958 101.854614 308.159698 101.854797 302.746094 106.925781 C 293.494965 115.697205 284.928558 126.45636 277.390625 136.324219 C 260.807159 115.62915 243.057907 96.510132 224.144531 78.761719 C 218.799438 73.759277 210.509155 73.690887 205.164063 78.693359 C 173.230606 108.296906 146.230286 141.942657 127.111328 174.21875 C 108.197952 206.015137 96 238.15448 96 264.46875 C 96 351.908844 163.43045 425.849609 249.5 425.849609 Z M 250.664063 360.0625 C 207.423721 360.0625 172.750168 332.241577 172.681641 285.300781 C 172.681641 264.674225 184.33017 246.309418 207.492188 217.185547 C 211.877914 211.7034 220.102753 211.771759 224.419922 217.253906 C 235.932419 231.850098 256.14621 257.546875 267.453125 271.9375 C 271.701782 277.351105 279.858093 277.489319 284.380859 272.28125 L 301.648438 252.203125 C 306.102661 246.995087 313.98465 247.404846 317.068359 253.572266 C 334.405609 285.231598 326.660309 325.525024 297.810547 345.671875 C 283.35141 355.265625 268.001312 360.0625 250.664063 360.0625 Z"/>
-</svg>

public/assets/images/global/status-silence.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Pixelmator Pro 3.4.3 -->
+<!-- Generated by Pixelmator Pro 3.3.8 -->
 <svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path id="path2292" fill="#efebe3" stroke="none" d="M 11.931641 1.986328 C 6.851659 2.0299 2.1895 6.012724 2.005859 11.675781 L 2 12 L 2.00586 12.324219 C 2.161932 17.140404 5.551549 20.72867 9.675782 21.730469 C 9.588913 21.443272 9.558197 21.13777 9.597657 20.835938 C 9.47312 18.918024 9.545824 16.97234 10.00586 15.101562 C 8.788254 14.549991 8.926215 13.552958 10.486329 13.134766 C 10.688758 12.435676 11.011918 11.808259 11.775392 11.5625 C 12.475244 11.321042 13.30658 11.50242 13.822267 12.039062 C 14.182369 12.380361 14.347692 12.851138 14.367189 13.318359 C 15.557706 13.858945 15.447286 14.835346 13.984376 15.267578 C 13.876838 15.708144 13.794972 16.040434 13.751954 16.230469 C 14.035457 16.215448 14.343313 16.25919 14.525392 16.310549 C 15.273297 15.605935 16.559305 15.683684 17.234377 16.451174 C 18.030642 17.245865 17.777361 18.485273 17.160156 19.302736 C 16.834358 19.841322 16.59597 20.440948 16.324219 21.01758 C 16.59798 20.884926 16.870295 20.73892 17.138672 20.578127 C 23.68045 16.658728 23.604391 7.153141 17 3.339844 C 15.364385 2.395456 13.624967 1.971804 11.931641 1.986328 Z M 7.978516 7.474609 C 8.504453 7.484797 9.026345 7.633665 9.589844 7.914063 C 9.807306 8.022272 9.962496 8.065799 10.025391 8.089844 C 10.30621 8.197204 10.600216 8.074305 10.783203 8.117188 C 11.423864 8.267323 11.413255 9.201465 10.703123 9.310547 C 10.368721 9.361912 9.987375 9.327701 9.675781 9.240234 C 10.263738 9.753045 10.07576 10.87933 9.126953 10.992188 L 9 11 L 8.882813 10.992188 C 7.706968 10.852325 7.706968 9.147676 8.882813 9.007813 L 9.060547 9 C 8.389929 8.673583 7.954104 8.424998 6.910156 8.925781 C 6.097967 9.296431 5.682192 8.17984 6.337891 7.869141 C 6.921612 7.592548 7.452579 7.464422 7.978516 7.474609 Z M 16.025391 7.476559 C 16.551327 7.466373 17.082294 7.596451 17.666016 7.873043 C 18.321714 8.183743 17.905939 9.298381 17.09375 8.927732 C 16.049803 8.426949 15.612026 8.677486 14.941406 9.003903 L 15.119141 9.009764 C 16.294985 9.149627 16.294985 10.856229 15.119141 10.996092 L 15.003906 11.003892 L 14.876953 10.996092 C 13.928146 10.883233 13.738215 9.756949 14.326172 9.244139 C 14.014578 9.331604 13.635186 9.365818 13.300781 9.31445 C 12.590652 9.205368 12.578091 8.269274 13.218751 8.119138 C 13.401738 8.076256 13.697696 8.199155 13.978517 8.091794 C 14.041407 8.067749 14.196601 8.024221 14.414063 7.916012 C 14.977562 7.635616 15.499455 7.486746 16.025393 7.476559 Z"/>
-    <path id="path1819" fill="#efebe3" stroke="none" d="M 11.711456 13.193301 L 10.960155 16.263454 L 10.723999 18.598185 L 10.817269 21.317106 C 10.888359 21.702995 11.090498 21.968763 11.535805 22.011623 C 12.458734 22.051924 13.518139 21.943733 14.323691 21.738602 C 14.589794 21.658991 14.723038 21.499723 14.821309 21.311239 L 16.050283 18.831099 L 16.454288 18.104069 C 16.90646 17.320887 15.688282 16.454172 15.087541 17.494686 L 14.908501 17.80386 C 13.974688 16.986099 12.358489 17.746168 12.358489 17.746168 L 12.426389 16.614141 L 13.161877 13.597538 C 13.372696 12.60058 11.976026 12.279035 11.711465 13.193299 Z"/>
+    <path id="Path" fill="none" stroke="none" d="M 0 0 L 24 0 L 24 24 L 0 24 Z"/>
+    <path id="path1" fill="#ea6010" stroke="none" d="M 17 3.34 C 21.1674 5.746208 23.030024 10.779379 21.433001 15.318825 C 19.835976 19.858273 15.232252 22.616514 10.476249 21.883377 C 5.720245 21.15024 2.160861 17.133654 2.005 12.324 L 2 12 L 2.005 11.676 C 2.118919 8.162982 4.068822 4.967705 7.140892 3.259882 C 10.212963 1.552061 13.95609 1.582479 17 3.34 Z M 15 14 L 9 14 L 8.883 14.007 C 8.37995 14.066836 8.001114 14.493402 8.001114 15 C 8.001114 15.506598 8.37995 15.933164 8.883 15.993 L 9 16 L 15 16 L 15.117 15.993 C 15.62005 15.933164 15.998886 15.506598 15.998886 15 C 15.998886 14.493402 15.62005 14.066836 15.117 14.007 L 15 14 Z M 9.01 9 L 8.883 9.007 C 8.37995 9.066836 8.001114 9.493402 8.001114 10 C 8.001114 10.506598 8.37995 10.933164 8.883 10.993 L 9 11 L 9.127 10.993 C 9.630051 10.933164 10.008885 10.506598 10.008885 10 C 10.008885 9.493402 9.630051 9.066836 9.127 9.007 L 9.01 9 Z M 15.01 9 L 14.883 9.007 C 14.37995 9.066836 14.001114 9.493402 14.001114 10 C 14.001114 10.506598 14.37995 10.933164 14.883 10.993 L 15 11 L 15.127 10.993 C 15.630051 10.933164 16.008886 10.506598 16.008886 10 C 16.008886 9.493402 15.630051 9.066836 15.127 9.007 L 15.01 9 Z"/>
 </svg>

public/assets/images/global/status-suspend.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Pixelmator Pro 3.4.3 -->
+<!-- Generated by Pixelmator Pro 3.3.8 -->
 <svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path id="path1" fill="#efebe3" stroke="none" d="M 14.865711 21.562855 C 13.484051 21.973886 11.977767 22.11401 10.475826 21.882484 C 5.720059 21.149376 2.160853 17.13295 2.005 12.323484 L 2 11.999497 L 2.005 11.67551 C 2.118913 8.162631 4.068719 4.96748 7.140635 3.259726 C 10.212553 1.551971 13.955494 1.582388 16.999252 3.33984 C 20.471048 5.344435 22.335369 9.211392 21.941496 13.063743 C 21.638853 12.282332 20.494862 12.311415 20.494862 12.311415 C 20.33622 10.935238 17.531656 10.99734 17.395786 12.263875 C 17.394386 12.277055 17.356598 12.320015 17.356598 12.320015 C 16.094175 12.350565 15.655445 13.278266 15.569292 13.501472 L 15.569296 13.50147 C 13.25033 13.340255 10.939906 13.917868 8.969625 15.151405 C 8.50131 15.444105 8.358945 16.061031 8.651641 16.529352 C 8.944338 16.997669 9.561259 17.140038 10.029573 16.847338 C 11.734911 15.86276 13.531968 15.365489 15.429303 15.497391 C 15.421703 15.655235 15.402763 15.934267 15.402763 15.934267 C 13.722934 15.730796 12.71482 17.372704 13.250748 18.700893 Z M 10.408088 8.316023 L 7.034182 7.900524 C 6.303076 7.827415 6.131269 8.98021 6.91 9.092553 C 7.125181 9.123596 8.310906 9.275673 8.310906 9.275673 C 8.11896 9.458725 8.000814 9.716671 8.000814 9.999577 C 8.000814 10.506154 8.379631 10.932703 8.882656 10.992537 L 8.99965 10.999537 L 9.126644 10.992537 C 9.62967 10.932697 10.008486 10.506154 10.008486 9.999577 C 10.008486 9.805412 9.997353 9.657336 9.855869 9.468498 C 9.855869 9.468498 9.999368 9.481016 10.294614 9.510522 C 10.994176 9.502202 11.148743 8.475587 10.408088 8.316023 Z M 13.556226 8.327742 C 12.888803 8.452742 12.975172 9.494161 13.694857 9.506617 C 13.804587 9.508516 14.176233 9.453409 14.176233 9.453409 C 14.079473 9.607802 14.000515 9.805637 14.000515 9.999578 C 14.000515 10.506154 14.379333 10.932703 14.882357 10.992537 L 14.999352 10.999537 L 15.126345 10.992537 C 15.629371 10.932697 16.008186 10.506154 16.008186 9.999578 C 16.008186 9.720305 15.873525 9.445825 15.685923 9.263232 C 15.685923 9.263232 16.734871 9.135027 17.114626 9.084742 C 17.836151 8.928703 17.728067 7.867409 16.94478 7.904829 Z"/>
-    <path id="path1034" fill="#efebe3" stroke="none" d="M 21.293535 15.272347 C 21.293535 14.230235 22.856705 14.230235 22.856705 15.272347 L 22.856705 19.701324 C 22.856705 21.427954 21.456995 22.827662 19.730368 22.827662 L 18.688253 22.827662 L 18.796635 22.827662 C 17.7449 22.827839 16.763556 22.299183 16.185101 21.420811 C 16.150921 21.36879 16.11688 21.316687 16.082973 21.264494 C 15.920404 21.014908 15.349847 20.02021 14.370783 18.279884 C 14.163248 17.911001 14.287053 17.443947 14.650069 17.226309 C 15.03267 16.99674 15.522393 17.056881 15.838077 17.372204 L 16.616611 18.138157 L 16.604033 14.230235 C 16.597332 13.188145 18.1672 13.188123 18.1672 14.230235 L 18.1672 15.923668 L 18.1672 13.188123 C 18.1672 12.146011 19.73037 12.146011 19.73037 13.188123 L 19.73037 14.222953 C 19.73037 13.188123 21.293537 13.188123 21.293537 14.230253 L 21.293537 15.27504"/>
+    <path id="Path" fill="none" stroke="none" d="M 0 0 L 24 0 L 24 24 L 0 24 Z"/>
+    <path id="path1" fill="#fb263a" stroke="none" d="M 17 3.34 C 21.1674 5.746208 23.030024 10.779379 21.433001 15.318825 C 19.835976 19.858273 15.232252 22.616514 10.476249 21.883377 C 5.720245 21.15024 2.160861 17.133654 2.005 12.324 L 2 12 L 2.005 11.676 C 2.118919 8.162982 4.068822 4.967705 7.140892 3.259882 C 10.212963 1.552061 13.95609 1.582479 17 3.34 Z M 15.57 13.502 C 13.250918 13.340779 10.940379 13.918414 8.97 15.152 C 8.501662 15.444711 8.359289 16.061663 8.652 16.530001 C 8.944711 16.998337 9.561663 17.140711 10.03 16.848 C 11.642129 15.838702 13.53257 15.366092 15.43 15.498 C 15.98118 15.53666 16.459339 15.121181 16.497999 14.57 C 16.536659 14.01882 16.12118 13.54066 15.57 13.502 Z M 9.01 9 L 8.883 9.007 C 8.37995 9.066836 8.001114 9.493402 8.001114 10 C 8.001114 10.506598 8.37995 10.933164 8.883 10.993 L 9 11 L 9.127 10.993 C 9.630051 10.933164 10.008885 10.506598 10.008885 10 C 10.008885 9.493402 9.630051 9.066836 9.127 9.007 L 9.01 9 Z M 15.01 9 L 14.883 9.007 C 14.37995 9.066836 14.001114 9.493402 14.001114 10 C 14.001114 10.506598 14.37995 10.933164 14.883 10.993 L 15 11 L 15.127 10.993 C 15.630051 10.933164 16.008886 10.506598 16.008886 10 C 16.008886 9.493402 15.630051 9.066836 15.127 9.007 L 15.01 9 Z"/>
 </svg>

public/reference

@@ -1 +1 @@
-/Users/ro/Herd/TBS/storage/app/reference
+/Users/ro/Projects/TheBadSpace/first/storage/app/reference

resources/views/back/listings.php

@@ -1,37 +0,0 @@
-@extends('frame') 
-
-@section('title', 'Den | Location Admin')
-
-  @section('main-content')
-    @parent
-    <section>
-      <article>
-        <h2>Page {{$pageNum}}</h2>
-        <a href="/listings/{{$prev}}">PREV</a>
-        {{$pageNum}} of {{$totalPages}}
-        <a href="/listings/{{$next}}">NEXT</a><br /><br />
-        @foreach($locations as $location)
-          @php
-              $action = $location->block_count + $location->silence_count;
-              $rating = ($action / $sources)*100;
-          @endphp
-          <a class="list-link" role="listitem" href="/den/location/edit/{{$location->uuid}}">
-            <span class="item-rating">{{$rating}}%</span>
-            <label class="item-name">{{$location->name}}</label>
-            <div class="item-silence">
-              <img class="item-icon" src="/assets/images/global/status-silence.svg" title="silenced" />
-              {{$location->silence_count}}
-            </div>
-            <div class="item-block">
-              <img class="item-icon" src="/assets/images/global/status-suspend.svg" title="suspended" />
-              {{$location->block_count}}
-            </div>
-          </a>
-        @endforeach
-        <br />
-        <a href="/listings/{{$prev}}">PREV</a>
-        {{$pageNum}} of {{$totalPages}}
-        <a href="/listings/{{$next}}">NEXT</a>
-      </article>
-    </section>
-  @endsection

resources/views/back/location.blade.php

@@ -1,46 +0,0 @@
-@extends('frame',['front' => false]) 
-
-@section('title', 'The Bad Space | Edit '.$title)
-
-  @section('main-content')
-    @parent
-    <section class="edit-location">
-      <article>
-        <h2>Editing {{$title}}</h2>
-        <form class="location-edit" action="/den/locations/edit" method="post" enctype="multipart/form-data">
-          @csrf
-          <label>Edit Location Name</label><br>
-          <input type="text" name="name" value="{{$location->name}}" /><br>
-          <label>Edit Location Comments</label><br>
-          <textarea name="description">{{$location->description}}</textarea><br>
-          <label>Edit Reference Links (comma seperated)</label><br>
-          <textarea name="archive_links">{{$location->archive_links}}</textarea><br>
-          <label>Edit Reference Images</label><br>
-          <input type="file" name="references[]" accept="image/png, image/jpeg, image/gif" / multiple><br />
-          <input type="hidden" name="id" value={{$location->uuid}} />
-          <input type="submit" value="Edit {{$location->name}}" name="submit_button">
-        </form>
-        <h2>References</h2>
-        <h3>Images</h3>
-        @if($images != null)
-          @foreach($images as $image)
-            <a href="/{{$image->path}}" class="location-image" style="background: url(/{{$image->path}}) no-repeat center center / cover #fc6399" />
-            </a>
-          @endforeach
-        @endif
-        @php
-          $action = $location->block_count + $location->silence_count;
-          $rating = ($action / $sources_count)*100;
-        @endphp
-        <h3>Links</h3>
-        @foreach($archive_links as $link)
-          @php
-            $link = trim($link);
-          @endphp
-          <a href="https://{{$link}}" target="_blank">{{$link}}</a><br />
-        @endforeach
-
-        <br />LAST UPDATED : {{$updated}}
-      </article>
-    </section>
-  @endsection

resources/views/back/locations.blade.php

@@ -6,11 +6,16 @@
     @parent
     <section>
       <article>
-        <h2>Manage Locations</h2>
-        <h3>Update Location Data</h3>
-        <a href="/den/admin/update">Update Current Sources Data</a><br />
-        <a href="/den/admin/compile">Update Locations Data</a>
-        <h3>View Location Listings</h3>
+        <h2>Location Listings</h2>
+        @if($action === "add")
+          @include('forms.add-location') 
+        @elseif($action === "edit") 
+          EDIT LOCATION
+        @elseif($action === "bulk-add") 
+          ADD MANY LOCATIONS
+        @else
+          START
+        @endif
       </article>
     </section>
   @endsection

resources/views/back/member.blade.php

@@ -6,8 +6,7 @@
     <section>
       <article>
         <h2>Member Listing </h2>
-        <a href="/den/admin/update">UPDATE LOCATIONS</a><br />
-        <a href="/den/admin/compile">COMPILE LOCATIONS</a>
+        <a href="/den/admin/update">UPDATE LOCATIONS</a>
       </article>
     </section>
   @endsection

resources/views/back/start.blade.php

@@ -7,11 +7,8 @@
     <section>
       <article>
         <h2>Hey {{$handle}} </h2>
-        <a href="/den/you">Edit Your Account</a><br />
-        <a href="/den/locations">Manage Locations</a><br />
-        @if($role==1)
-          <a href="/den/member">Manage Members</a><br />
-        @endif
+        <a href="/den/member">Manage Member</a><br />
+        <a href="/den/locations">Manage Location</a>
       </article>
     </section>
   @endsection

resources/views/email/appeal.blade.php

@@ -1,3 +0,0 @@
-<div>
-  Appeal filed for: {{$location}}<br />
-</div>

resources/views/frame.blade.php

@@ -8,18 +8,11 @@
   <title>
     @yield('title') 
   </title>
-  @if(isset($front) && $front == false)
-    <link rel="stylesheet" type="text/css" href="/assets/css/back/start.css?=sdfsdf">
-  @elseif(!isset($front) || $front == true) 
   <link rel="stylesheet" type="text/css" href="/assets/css/front/start.css?=sdfsdf">
-  @endif
-
 </head>
 
 <body>
-  <script>
-  0
-  </script>
+
   <header>
     <div>
       <div class="header-left">
@@ -49,12 +42,6 @@
             <a href="/listings/1" title="instance listing" class="nav-links">
               Listings
             </a><br />
-            <a href="/exports" title="list exports" class="nav-links">
-              Exports
-            </a><br />
-            <a href="/appeals" title="location appeals" class="nav-links">
-              Appeals
-            </a><br />
             @if(Auth::check())
               <a href="/den" title="den-start" class="nav-links">
                 Den
@@ -90,11 +77,7 @@
   </main>
   <footer>
     <div>
-      The Bad Space © 2024<br />
-      an <a href="https://h-i.works">h.i.</a> project
-    </div>
-    <div>
-      a0.6
+      <p>The Bad Space © 2023</p>
     </div>
   </footer>
 </body>

resources/views/front/about.blade.php

@@ -4,72 +4,61 @@
     @parent
     <section>
       <article>
-        <h2 id="what">What is The Bad Space?</h2>
-        <p>The Bad Space arose from a need to identify instances that house bad actors, are poorly moderated, and/or contain inappropriate/offensive content (CSAM, hate speech, fascist ideology, etc.) that puts marginalized communities at risk.
+        <h2 id="what">What Is The Bad Space?</h2>
+        <p>The Bad Space project was born from a need to effectively identify instances that house bad actors and are poorly moderated, which puts marginalized communities at risk.
         </p>
         <p>
           It is an extension of the
           <strong>#fediblock</strong>
-          hashtag - orginally created by
-          <a href="https://www.artistmarciax.com/">Artist Marcia X</a>
+          hashtag created by
+          <a href="https://www.artistmarciax.com/" target="_new">Artist Marcia X</a>,
           with additional support from
-          <a href="https://digital.rooting.garden">Ginger</a>
+          <a href="https://digital.rooting.garden" target="_new">Ginger</a>,
           to provide a catalog of instances that seek to cause harm and reduce the quality of experience in the fediverse.
         </p>
         <p>
-          The searchable online catalog is built and maintained by
-          <a href="https://roiskinda.cool/profile.html">Ro</a>. The repo can be found <a href="https://koodu.h-i.works/projects/thebadspace">here</a>.
+          Technical support provided by
+          <a href="https://roiskinda.cool/profile.html" target="_new">Ro</a>.
         </p>
-        <p>Custom silence and suspend icons graciously provided by <a href="https://rage.love/@puf">puf</a>.</p>
-        <h2 id="how">How does it work?</h2>
-        <p>The Bad Space is a collaboration of communities, referred to as Current Sources, committed to actively moderating against racism, sexism, heterosexism, transphobia, ableism, casteism, or religion.</p>
+        <h2 id="how">How Does It Work?</h2>
+        <p>The Bad Space is a collaboration of instances committed to actively moderating against racism, sexism, heterosexism, transphobia, ableism, casteism, and religion.</p>
 
-        <p>These communities have permitted The Bad Space to ingest their respective blocklists detailing their silences and suspension to create a composite directory of sites that engage in the behavior(s) listed in the section above. For each behavior, the directory of locations can be searched and, through The Bad Space's public API, integrated into external services.</p>
-
-        <h2>Adding Locations</h2>
-        <p>
-          Current Sources continually review the #fediblock hashtag and update their silences and suspensions when warranted. If an instance meets the criteria of a Current Source to be suspended or silenced, The Bad Space will automatically be updated according to said Current Sources' curated data.
-
-          For an instance to be listed on The Bad Space, at least two (2) Current Sources must have that location silenced and/or suspended. Instances will not display in the directory until two (2) Current Sources have taken moderation action against them.
-        </p>
-        <h2>Removing Locations</h2>
-        Locations that are displayed in The Bad Space may petition to be removed from the catalog by sending an appeal request to The Bad Space. The appeal process is outlined <a href="/appeals">here</a>.
+        <p>These instances have permitted The Bad Space to read their respective blocklists to create a composite directory of sites tagged for the behavior above that can be searched and, through a public API, can be integrated into external services.</p>
 
         <p><strong>Current Sources:</strong></p>
-        Maston:<br />
+        Mastodon:<br />
         @foreach($sources as $source)
           @if($source->format == 'json')
             <a href="https://{{$source->url}}">{{$source->url}}</a><br />
           @endif
-        @endforeach
-        Custom CSV<br />
+        @endforeach<br />
+        Custom CSV:<br />
         @foreach($sources as $source)
           @if($source->format == 'csv')
             <a href="{{$source->url}}">{{$source->url}}</a><br />
           @endif
         @endforeach
 
-        <h2>How do I use it?</h2>
+        <h2>How Do I Use It?</h2>
         <p>
           The Bad Space is meant to be a resource for anyone looking to improve the quality of their online experience by creating a tool that catalogs sources for harassment and abuse. There are several options for how it can be used.
         <h3>Search</h3>
-        To see if a site is listed in the database, use the
+        To see if an instance is listed in the database, use the
         <a href="/">search feature</a>
-        to search for that URL. If it is in the database, information for that instance will be returned and associated instances if applicable.
+        to search for its URL. If it is in the database, information for that instance will be returned and include associated instances, if applicable.
         <h3>CSV Exports</h3>
-        For a list of the current locations being tracked, click on one of the links below to download a dynamically generated CSV file that can be consumed as a blocklist. More formats will be added over time.
-        <br />
+        For a list of the current instances being tracked, click on one of the links below to download a dynamically generated CSV file that can be consumed as a blocklist. More formats will be added over time.
+        <br /><br />
         <a href="/exports/mastodon">For Mastodon</a>
         <h3>API</h3>
-        The Bad Space has a public api that can be used to search the database programatically and return results in the JSON format. The API can be accsess at<br />
+        The Bad Space has a public API that can be used to search the database programatically and return results in the JSON format. The API can be accessed at<br />
         <code>https://thebad.space/api/v1/search</code>
         by posting a JSON object with the following format:
-        <code>{"url":"search.url"}</code><br />
-        Data from API request will be returned in the follow format:<br />
+        <code>{"url":"search.url"}</code><br /><br />
+        Data from API requests will be returned in the following format:<br />
 
         <pre>
         <code>{
-            data:{
         "listingCount":1,
           "locations":
           [
@@ -80,7 +69,6 @@
               "link":"bad-space-instance-link"
             }
           ]
-            }
         }</code>
         </pre>
         </p>

resources/views/front/appeals.blade.php

@@ -1,62 +0,0 @@
-@extends('frame') 
-@section('title', 'The Bad Space|Appeals')
-  @section('main-content')
-    @parent
-    <section>
-      <article>
-        <h2>Appeals</h2>
-
-        Locations listed in The Bad Space have the right to appeal their inclusion if they feel they have been added unfairly.
-
-        <h3>Starting the Appeals Process</h3>
-
-        <p>This process can be initiated by sending an Official Appeal to The Bad Space using the Appeal Form (found below) stating why they should not be included. All appeal requests must be sponsored by at least one Current Source, and their name(s) must be included in the submission.</p>
-
-        <p>The Bad Space will validate the appeal request by contacting a moderator or administrator of the respective instance. If no moderator or administrator is detailed in the appeal request, it will be immediately disqualified.</p>
-
-        <p>If the Appeal contains any threats, hate speech, microaggressions, taunts, or slurs, the Appeal will be automatically disqualified.</p>
-
-        An Appeal can only be made once every three (3) months.
-
-        <h3>Process Description</h3>
-
-        <p>After an appeal request is validated, it will be reviewed by all Current Sources. Each Current Source will vote on whether to approve the requesting instance's appeal request.</p>
-
-        <p>80% of Current Sources must vote in favor of the request to proceed to the next step. Appeals that do not meet this threshold will be rejected, and the administrator or moderator who petitioned for the appeal will be notified.
-        </p>
-
-        <p>If an appeal is approved to proceed, a chat room will be created on the h.i. cloud community for the petitioner to be interviewed by Current Sources. Here, they will explain why they feel their instance should be removed from the database.</p>
-
-        The petitioner must include the following:
-        <ul>
-          <li>Verification of problematic content and members have been removed.</li>
-          <li>A public explanation of steps to recognize and remove problematic content and members.</li>
-          <li>A working plan to keep said location as free as possible from problematic members and content finding a home there.</li>
-        </ul>
-
-        <p>The petitioner also must be available to answer any questions from a member of Current Sources concerning the information provided.</p>
-
-        <p>Failure to provide any of this information or refusing to be interviewed by Current Sources will result in an automatic disqualification.</p>
-
-        <p>Upon completing the interview process, each Current Source will choose to remove or maintain their current block or silence action. The result of each choice will be reflected in the database itself, which can be publicly reviewed at any time.</p>
-
-        <h2>Appeals Form</h2>
-
-        <form action="/appeal" method="post" enctype="multipart/form-data">
-          @csrf
-          <label>Appeal Location</label><br />
-          <input type="text" name="location" value="" /><br />
-          <label>Appeal Location Admin</label><br />
-          <input type="text" name="location_admin" value="" /><br />
-          <label>Appeal Sponsor</label><br />
-          <input type="text" name="sponsor" value="" /><br />
-          <label>What is 1+1?</label><br />
-          <input type="text" name="question" value="" /><br />
-          <label>Appeal Summary</label><br />
-          <textarea name="appeal_description">Appeal Summary</textarea>
-          <input type="hidden" name="h1" value="" /><br />
-          <input type="submit" value="File Appeal" name="submit_button">
-        </form>
-      </article>
-    </section>
-  @endsection

resources/views/front/exports.blade.php

@@ -1,23 +0,0 @@
-@extends('frame') 
-@section('title', 'The Bad Space|Exports')
-  @section('main-content')
-    @parent
-    <section>
-      <article>
-        <h2>CSV Exports</h2>
-        Heat Rating is the percentage of Current Sources that have taken action against an instance. The higher the number of Sources that have silenced and/or suspended an instance, the higher the Heat Rating.*
-        <h3>For Mastodon</h3>
-
-        @foreach($list as $item)
-
-          <a href="/exports/mastodon/{{$item['heatRating']}}">Heat Rating: {{$item['heatRating']}}% - Location Count: {{$item['ratingCount']}}</a><br />
-
-        @endforeach
-        <br />
-        <i>* Heating Ratings are still a work in progress so please review list before using.</i>
-        <br /><br />
-
-
-      </article>
-    </section>
-  @endsection

resources/views/front/index.blade.php

@@ -6,8 +6,7 @@
       <form class="index-search-form" action="/search" method="post" enctype="multipart/form-data">
         <input type="text" name="index_search" value="" placeholder="Hi! This is where you search." />
         <button aria-label="search-button">
-          <label id="search-label">LOOK FOR IT</label>
-          <img id="search-icon" class="button-icon" src="assets/images/global/icon-search.svg" />
+          <img class="button-icon" src="assets/images/global/icon-search.svg" />
         </button>
         @csrf
       </form>
@@ -15,56 +14,32 @@
     @isset($results)
       <section>
         <article>
-          <h2>Found {{count($results)}} results for {{$terms}}</h2>
-          @foreach($results as $item)
-            @php
-              $rating = floor(($item->actions_count / $sources)*100);
-            @endphp
-            <a class="list-link" role="listitem" href="/location/{{$item->uuid}}">
-              <span class="item-rating">{{$rating}}%</span>
-              <label class="item-name">{{$item->name}}</label>
-              <div class="item-silence">
-                <img class="item-icon" src="/assets/images/global/status-silence.svg" title="silenced" />
-                {{$item->silence_count}}
-              </div>
-              <div class="item-block">
-                <img class="item-icon" src="/assets/images/global/status-suspend.svg" title="suspended" />
-                {{$item->block_count}}
-              </div>
-            </a>
+          <strong>
+            Found {{count($results)}} results:
+          </strong><br>
+          @foreach($results as $location)
+            <a role="listitem" href="/location/{{$location->uuid}}">{{$location->name}}</a></a><br />
           @endforeach
         </article>
       </section>
     @endisset
     <section class="index-meta">
       <article>
+        <h2>Bad Space Stats</h2>
+        <strong>{{$count}}</strong><br />
+        Instances being tracked.
         <h2>Recent Updates</h2>
-        @foreach($recent as $item)
-          <a class="list-link" role="listitem" href="/location/{{$item->uuid}}">
-            @php
-              $rating = floor(($item->actions_count / $sources)*100);
-            @endphp
-            <span class="item-rating">{{$rating}}%</span>
-            <label class="item-name">{{$item->name}}</label>
-            <div class="item-silence">
-              <img class="item-icon" src="/assets/images/global/status-silence.svg" title="silenced" />
-              {{$item->silence_count}}
-            </div>
-            <div class="item-block">
-              <img class="item-icon" src="/assets/images/global/status-suspend.svg" title="suspended" />
-              {{$item->block_count}}
-            </div>
+        @foreach($recent as $location)
+          <a class="list-link" role="listitem" href="/location/{{$location->uuid}}">
+            <span>{{$location->block_count}}</span>
+            @if($location->rating == 'silence')
+              <img class="menu-icon" src="/assets/images/global/status-silence.svg" title="silenced" />
+            @else
+              <img class="menu-icon" src="/assets/images/global/status-suspend.svg" title="suspended" />
+            @endif
+            <label>{{$location->name}}</label>
           </a>
         @endforeach
-        <h2>Info</h2>
-        <div class="index-meta">
-          <label>Locations Tracked</label>
-          <label>{{$count}}</label>
-          <label>Total Sources</label>
-          <label>{{$sources}}</label>
-          <label>Latest Update</label>
-          <label>{{$latest_date}}</label>
-        </div>
       </article>
     </section>
   @endsection

resources/views/front/listing.blade.php

@@ -9,21 +9,15 @@
         {{$pageNum}} of {{$totalPages}}
         <a href="/listings/{{$next}}">NEXT</a><br /><br />
         @foreach($locations as $location)
-          @php
-              $action = $location->block_count + $location->silence_count;
-              $rating = floor(($action / $sources)*100);
-          @endphp
           <a class="list-link" role="listitem" href="/location/{{$location->uuid}}">
-            <span class="item-rating">{{$rating}}%</span>
-            <label class="item-name">{{$location->name}}</label>
-            <div class="item-silence">
-              <img class="item-icon" src="/assets/images/global/status-silence.svg" title="silenced" />
-              {{$location->silence_count}}
-            </div>
-            <div class="item-block">
-              <img class="item-icon" src="/assets/images/global/status-suspend.svg" title="suspended" />
-              {{$location->block_count}}
-            </div>
+            @if($location->rating == 'silence')
+              <span>{{$location->block_count}}</span>
+              <img class="menu-icon" src="/assets/images/global/status-silence.svg" title="silenced" />
+            @else
+              <span>{{$location->block_count}}</span>
+              <img class="menu-icon" src="/assets/images/global/status-suspend.svg" title="suspended" />
+            @endif
+            <label>{{$location->name}}</label>
           </a>
         @endforeach
         <br />

resources/views/front/location.blade.php

@@ -6,49 +6,29 @@
     @parent
     <section>
       <article>
+        <h1 class="location-title">{{$title}}</h1>
         <h2>Description</h2>
         {{$location->description}}<br />
-        <h2>References</h2>
-        <h3>Images</h3>
+        <h2>Screens</h2>
         @if($images != null)
           @foreach($images as $image)
             <a href="/{{$image->path}}" class="location-image" style="background: url(/{{$image->path}}) no-repeat center center / cover #fc6399" />
             </a>
           @endforeach
         @endif
-        @php
-          $action = $location->block_count + $location->silence_count;
-          $rating = floor(($action / $sources_count)*100);
-        @endphp
-        <h3>Links</h3>
-        <div class="location-rating">
-          <div>
-            <img class="rating-icon" src="/assets/images/global/heat.svg" title="heat-rating" />
-            <span>RATING: {{$rating}}%</span>
-          </div>
-          <div>
-            <img class="rating-icon" src="/assets/images/global/status-silence.svg" title="silenced" />
-            <span>SILENCED: {{$location->silence_count}}</span>
-          </div>
-          <div>
-            <img class="rating-icon" src="/assets/images/global/status-suspend.svg" title="suspended" />
-            <span>SUSPENDED: {{$location->block_count}}</span>
-          </div>
-        </div>
-
-
-        @if($edit)
-          <hr />
-          <a href="/den/location/edit/{{$location->uuid}}">Edit {{$location->name}}</a>
-          <hr />
-        @endif
-
-
-
         <br />
-        Heat Rating is the percentage of <a href="/about#how">Current Sources</a> that have taken action against an instance. The higher the number of Sources that have silenced and/or suspended an instance, the higher the Heat Rating.
+        @if($location->rating == 'silence')
+          <img class="rating-icon" src="/assets/images/global/status-silence.svg" title="silenced" />
+          <strong>Silenced Count: {{$location->block_count}}</strong>
+        @else
+          <img class="rating-icon" src="/assets/images/global/status-suspend.svg" title="suspended" />
+          <strong>Suspended Count: {{$location->block_count}}</strong>
 
-        <br />UPDATED : {{$updated}}
+        @endif
+        <br /><br />
+        This count reflects the number of times this instance has been suspended or silenced by two or more <a href="/about#how">Current Sources</a>.
+
+        <br /><br />UPDATED: {{$updated}}
       </article>
     </section>
   @endsection

routes/api.php

@@ -2,8 +2,6 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\DB;
-use App\Http\Resources\LocationCollection;
 
 /*
 |--------------------------------------------------------------------------
@@ -19,13 +17,3 @@ use App\Http\Resources\LocationCollection;
 Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
     return $request->user();
 });
-
-// public search API
-Route::post("/v1/search", function (Request $request) {
-    $data    = json_decode($request->getContent());
-    $search  = $data->url;
-    $search  = str_replace(",", "", $search);
-    $search  = str_replace(" ", "|", $search);
-    $results = DB::select("SELECT * FROM searchlocations('$search')");
-    return new LocationCollection($results);
-});

routes/web.php

@@ -6,7 +6,6 @@ use App\Http\Controllers\AuthController;
 use App\Http\Controllers\DenController;
 use App\Http\Controllers\LocationController;
 use App\Http\Controllers\ExportController;
-use App\Http\Controllers\AppealController;
 
 /*
 |--------------------------------------------------------------------------
@@ -24,13 +23,10 @@ Route::get("/", [FrontIndexController::class, 'start']);
 Route::get("/listings/{pageNum}", [FrontIndexController::class, 'listings']);
 Route::get("/about", [FrontIndexController::class, 'about']);
 Route::get("/location/{uuid}", [FrontIndexController::class, 'location']);
-Route::get("/appeals", [FrontIndexController::class, 'appeals']);
 Route::post("/search", [FrontIndexController::class, 'indexSearch']);
-Route::post("/appeal", [AppealController::class, 'sendAppeal']);
 
 //exports
-Route::get("/exports", [ExportController::class, 'exportIndex']);
-Route::get("/exports/{type}/{rate}", [ExportController::class, 'exportCSV']);
+Route::get("/exports/test", [ExportController::class, 'exportCSV']);
 
 //auth
 Route::get("/login", [AuthController::class, 'showLogin']);
@@ -41,11 +37,8 @@ Route::get("/logout", [AuthController::class, 'leave']);
 Route::group(['prefix' => 'den', 'middleware' => 'member.check'], function () {
     Route::get("/", [DenController::class, 'start']);
     Route::get("/member", [DenController::class, 'member']);
-    Route::get("/listings/{pageNum}", [DenController::class, 'location']);
-    Route::get("/location/edit/{uuid}", [DenController::class, 'locationEdit']);
-    Route::get("/locations", [DenController::class, 'locations']);
+    Route::get("/locations/{action?}", [DenController::class, 'location']);
+    Route::post("/locations/add", [LocationController::class, 'addLocation']);
     //admin actions
-    Route::post("/locations/edit", [LocationController::class, 'editLocation']);
     Route::get("/admin/update", [LocationController::class, 'updateLocations']);
-    Route::get("/admin/compile", [LocationController::class, 'compileLocations']);
 });