diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..a0d7bf9 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +ko_fi: solareon \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..2f03fdd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,35 @@ +--- +name: Bug Report +about: Create a bug report to help solve an issue +title: 'Bug: TITLE' +labels: New Issue +assignees: '' +--- + +**Describe the issue** + +A clear and concise description of what the bug is. + +**Expected behavior** + +A clear and concise description of what you expected to happen. + +**To Reproduce** + +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + + +**Media** + +If applicable, add a screenshot or a video to help explain your problem. + +**Needed information (please complete the following information):** +- **Client Version:**: [e.g. Canary or Release] +- **Release Version:**: [e.g 1.0] + +**Additional context** +Add any other context about the issue here. diff --git a/.github/actions/bump-manifest-version.js b/.github/actions/bump-manifest-version.js new file mode 100644 index 0000000..5296000 --- /dev/null +++ b/.github/actions/bump-manifest-version.js @@ -0,0 +1,13 @@ +const fs = require("fs"); + +const version = process.env.TGT_RELEASE_VERSION; +const newVersion = version.replace("v", ""); + +const manifestFile = fs.readFileSync("fxmanifest.lua", { encoding: "utf8" }); + +const newFileContent = manifestFile.replace( + /\bversion\s+(.*)$/gm, + `version '${newVersion}'` +); + +fs.writeFileSync("fxmanifest.lua", newFileContent); \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..8002554 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,70 @@ +name: Release + +on: + push: + tags: + - "v*.*.*" + +jobs: + create-release: + name: Build and Create Tagged release + runs-on: ubuntu-latest + + steps: + - name: Install archive tools + run: sudo apt install zip + + - name: Checkout source code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.repository.default_branch }} + + - name: Get variables + id: get_vars + run: | + echo '::set-output name=SHORT_SHA::$(git rev-parse --short HEAD)' + echo '::set-output name=DATE::$(date +'%D')' + + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: 18.x + + - name: Bump manifest version + run: node .github/actions/bump-manifest-version.js + env: + TGT_RELEASE_VERSION: ${{ github.ref_name }} + + - name: Push manifest change + uses: EndBug/add-and-commit@v8 + with: + add: fxmanifest.lua + push: true + author_name: Manifest Bumper + author_email: 41898282+github-actions[bot]@users.noreply.github.com + message: "chore: bump manifest version to ${{ github.ref_name }}" + + - name: Update tag ref + uses: EndBug/latest-tag@latest + with: + tag-name: ${{ github.ref_name }} + + - name: Bundle files + run: | + mkdir -p ./temp/slrn_groups + cp ./{README.md,LICENSE,fxmanifest.lua} ./temp/slrn_groups + cp -r ./{client,ui,server} ./temp/slrn_groups + cd ./temp && zip -r ../slrn_groups.zip ./slrn_groups + + - name: Create Release + uses: "marvinpinto/action-automatic-releases@v1.2.1" + id: auto_release + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + title: "${{ env.RELEASE_VERSION }}" + prerelease: false + files: slrn_groups.zip + + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..b0242a7 --- /dev/null +++ b/LICENSE @@ -0,0 +1,658 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU 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. + + Ox Inventory + Copyright © 2023 Overextended (https://github.com/overextended) + Linden (https://github.com/thelindat) + Luke (https://github.com/LukeWasTakenn) + Dunak (https://github.com/dunak-debug) + + 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 . + + 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 +. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..b1ed08a --- /dev/null +++ b/README.md @@ -0,0 +1,66 @@ +# slrn_groups +A qb-phone compatible group app for [lb-phone](https://lbphone.com/) + +**QB/QBOX supported with bridge** + +## Installation +Download the [release version](https://github.com/solareon/slrn_groups/release) and copy to your server. + +# Support +- [Discord](https://discord.gg/TZFBBHvG6E) + +# Credits +- [RijayJH](https://github.com/RijayJH/rj_groups-for-lb_phone) for original code +- [overextended](https://github.com/overextended) for ox_lib + +# Dependencies +- [ox_lib](https://github.com/overextended/ox_lib) + +# Exports (server side only) + +```lua +exports['qb-phone']:NotifyGroup(groupID, msg, type) + +exports['qb-phone']:pNotifyGroup(groupID, header, msg) + +exports['qb-phone']:CreateBlipForGroup(groupID, name, data) + +exports['qb-phone']:RemoveBlipForGroup(groupID, name) + +exports['qb-phone']:GetGroupByMembers(src) + +exports['qb-phone']:getGroupMembers(groupID) + +exports['qb-phone']:getGroupSize(groupID) + +exports['qb-phone']:GetGroupLeader(groupID) + +exports['qb-phone']:DestroyGroup(groupID) + +exports['qb-phone']:isGroupLeader(src, groupID) + +-------------------------------------------------- + +exports['qb-phone']:setJobStatus(groupID, status, stages) + +exports['qb-phone']:getJobStatus(groupID) + +exports['qb-phone']:resetJobStatus(groupID) + +-------------------------------------------------- + +exports['qb-phone']:isGroupTemp(groupID) + +exports['qb-phone']:CreateGroup(src, name, password) + +``` + +# Copyright + +Copyright © 2024 Solareon + +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 . \ No newline at end of file diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 0000000..f67c3bb --- /dev/null +++ b/client/main.lua @@ -0,0 +1,222 @@ +---@diagnostic disable: lowercase-global + +local identifier = 'slrn_groups' +local groupStage -- Stores group stage +local finishedNotify -- store answer to leave group + +-- Bridge +if GetResourceState('qbx_core') == 'started' then + function getPlayerData() + return QBX.PlayerData + end +else + local QBCore = exports['qb-core']:GetCoreObject() + + function getPlayerData() + return QBCore.Functions.GetPlayerData() + end +end + +CreateThread(function() + while GetResourceState('lb-phone') ~= 'started' do + Wait(500) + end + + local function AddApp() + local added, errorMessage = exports['lb-phone']:AddCustomApp({ + identifier = identifier, + name = 'Groups', + description = 'Group app to do stuff together', + developer = 'solareon', + defaultapp = true, + ui = 'slrn_groups/ui/index.html', + icon = 'https://cfx-nui-slrn_groups/ui/assets/icon.png' + }) + if not added then + print('Could not add app:', errorMessage) + end + end + + AddApp() + + AddEventHandler('onResourceStart', function(resource) + if resource == 'lb-phone' or resource == GetCurrentResourceName() then + AddApp() + end + end) +end) + +local inJob = false +local GroupBlips = {} + +local function FindBlipByName(name) + for i = 1, #GroupBlips do + if GroupBlips[i] and GroupBlips[i].name == name then + return i + end + end +end + +RegisterNetEvent('groups:removeBlip', function(name) + local i = FindBlipByName(name) + if i then + local blip = GroupBlips[i]['blip'] + SetBlipRoute(blip, false) + RemoveBlip(blip) + GroupBlips[i] = nil + end +end) + +local function PhoneNotification(title, description, accept, deny) + exports['lb-phone']:SendCustomAppMessage(identifier, { + action = 'PhoneNotification', + PhoneNotify = { + title = title, + text = description, + accept = accept, + deny = deny, + }, + }) + finishedNotify = nil + local timeout = 500 + while not finishedNotify and timeout > 0 do + Wait(100) + timeout -= 1 + end + if not finishedNotify then return false end + return finishedNotify == 'success' or false +end + +RegisterNetEvent('groups:createBlip', function(name, data) + if not data then return print('Invalid Data was passed to the create blip event') end + + if FindBlipByName(name) then + TriggerEvent('groups:removeBlip', name) + end + + local blip + if data.entity then + blip = AddBlipForEntity(data.entity) + elseif data.netId then + blip = AddBlipForEntity(NetworkGetEntityFromNetworkId(data.netId)) + elseif data.radius then + blip = AddBlipForRadius(data.coords.x, data.coords.y, data.coords.z, data.radius) + else + blip = AddBlipForCoord(data.coords.x, data.coords.y, data.coords.z) + end + + if not data.color then data.color = 1 end + if not data.alpha then data.alpha = 255 end + + if not data.radius then + if not data.sprite then data.sprite = 1 end + if not data.scale then data.scale = 0.7 end + if not data.label then data.label = 'NO LABEL FOUND' end + + SetBlipSprite(blip, data.sprite) + SetBlipScale(blip, data.scale) + BeginTextCommandSetBlipName('STRING') + AddTextComponentSubstringPlayerName(data.label) + EndTextCommandSetBlipName(blip) + end + + SetBlipColour(blip, data.color) + SetBlipAlpha(blip, data.alpha) + + if data.route then + SetBlipRoute(blip, true) + SetBlipRouteColour(blip, data.routeColor) + end + GroupBlips[#GroupBlips + 1] = { name = name, blip = blip } +end) + +RegisterNUICallback('GetGroupsApp', function(_, cb) + lib.callback('slrn_groups:server:getAllGroups', false, function(getGroups) + cb(getGroups) + end) +end) + +RegisterNetEvent('slrn_groups:client:RefreshGroupsApp', function(Groups, finish) + if finish then inJob = false end + if inJob then return end + exports['lb-phone']:SendCustomAppMessage(identifier, { + action = 'refreshApp', + data = Groups, + }) +end) + +RegisterNetEvent('slrn_groups:client:AddGroupStage', function(status, stage) + inJob = true + groupStage = stage + exports['lb-phone']:SendCustomAppMessage(identifier, { + action = 'addGroupStage', + status = stage + }) +end) + +RegisterNUICallback('jobcenter_CreateJobGroup', function(data, cb) + TriggerServerEvent('slrn_groups:server:jobcenter_CreateJobGroup', data) + cb('ok') +end) + +RegisterNUICallback('AnsweredNotify', function(data, cb) + finishedNotify = data.type + cb('ok') +end) + +RegisterNUICallback('onStartup', function(data, cb) + exports['lb-phone']:SendCustomAppMessage(identifier, { + action = 'LoadPhoneData', + PlayerData = getPlayerData(), + }) + if not inJob then + exports['lb-phone']:SendCustomAppMessage(identifier, { + action = 'LoadJobCenterApp', + }) + else + exports['lb-phone']:SendCustomAppMessage(identifier, { + action = 'addGroupStage', + status = groupStage + }) + end + cb('ok') +end) + +RegisterNUICallback('jobcenter_JoinTheGroup', function(data, cb) + TriggerServerEvent('slrn_groups:server:jobcenter_JoinTheGroup', data) + cb('ok') +end) + +RegisterNetEvent('slrn_groups:client:CustomNotification', function(header, msg) + exports['lb-phone']:SendNotification({ + app = identifier, + title = header, + content = msg, + }) +end) + +RegisterNUICallback('jobcenter_leave_grouped', function(data, cb) + if not data then return end + local success = PhoneNotification('Job Center', 'Are you sure you want to leave the group?', 'Accept', 'Deny') + if success then + TriggerServerEvent('slrn_groups:server:jobcenter_leave_grouped', data) + end + cb('ok') +end) + +RegisterNUICallback('jobcenter_DeleteGroup', function(data, cb) + TriggerServerEvent('slrn_groups:server:jobcenter_DeleteGroup', data) + cb('ok') +end) + +RegisterNUICallback('jobcenter_CheckPlayerNames', function(data, cb) + lib.callback('slrn_groups:server:jobcenter_CheckPlayerNames', false, function(HasName) + cb(HasName) + end, data.id) +end) + +RegisterCommand('testpass', function() + exports['lb-phone']:SendCustomAppMessage(identifier, { + action = 'testPassword' + }) +end, false) diff --git a/fxmanifest.lua b/fxmanifest.lua new file mode 100644 index 0000000..5f72ee1 --- /dev/null +++ b/fxmanifest.lua @@ -0,0 +1,25 @@ +fx_version 'cerulean' +game 'gta5' +lua54 'yes' +use_fxv2_oal 'yes' + +title 'slrn_groups' +description 'A Groups app made for LB-Phone' +author 'solareon.' +version '0.0.0' +repository 'https://github.com/solareon/slrn_groups' + +client_scripts { + 'client/**/*', + '@qbx_core/modules/playerdata.lua' -- remove if using qb-core but you really should switch to qbox +} +server_script 'server/**/*' +shared_script '@ox_lib/init.lua' + +files { + 'ui/**/*' +} + +ui_page 'ui/index.html' + +dependency '/assetpacks' \ No newline at end of file diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 0000000..e3cb2b5 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,361 @@ +---@diagnostic disable: lowercase-global +if not lib then return end + +lib.versionCheck('solareon/slrn_groups') + +if GetCurrentResourceName() ~= 'slrn_groups' then + lib.print.error('The resource needs to be named ^slrn_groups^7.') + return +end + +local playerData = {} +local playerGroup = {} + +local function exportHandler(exportName, func) + AddEventHandler(('__cfx_export_qb-phone_%s'):format(exportName), function(setCB) + setCB(func) + end) +end + +-- Bridge +if GetResourceState('qbx_core') == 'started' then + + function getPlayer(id) + return exports.qbx_core:GetPlayer(id) + end + + function doNotification(src, text, nType) + exports.qbx_core:Notify(src, text, nType) + end +else -- Switch to QBox and save your sanity + local QBCore = exports['qb-core']:GetCoreObject() + + function getPlayer(id) + return QBCore.Functions.GetPlayer(id) + end + + function doNotification(src, text, nType) + TriggerClientEvent('QBCore:Notify', src, text, nType) + end +end + +-- Utility functions +local function GetPlayerCharName(src) + local player = getPlayer(src) + return player.PlayerData.charinfo.firstname..' '..player.PlayerData.charinfo.lastname +end + +local function NotifyGroup(group, msg, type) + if not group or not playerGroup[group] then return lib.print.error('Group not found...') end + for _, v in pairs(playerGroup[group].members) do + doNotification(v.Player, msg, type) + end +end +exportHandler('NotifyGroup', NotifyGroup) + +local function pNotifyGroup(group, header, msg) + if not group or not playerGroup[group] then return lib.print.error('Group not found...') end + for _, v in pairs(playerGroup[group].members) do + TriggerClientEvent('slrn_groups:client:CustomNotification', v.Player, + header or 'NO HEADER', + msg or 'NO MSG' + ) + end +end +exportHandler('pNotifyGroup', pNotifyGroup) + +local function CreateBlipForGroup(groupID, name, data) + if not groupID then return lib.print.error('CreateBlipForGroup was sent an invalid groupID :'..groupID) end + + for i=1, #playerGroup[groupID].members do + TriggerClientEvent('groups:createBlip', playerGroup[groupID].members[i].Player, name, data) + end +end +exportHandler('CreateBlipForGroup', CreateBlipForGroup) + +local function RemoveBlipForGroup(groupID, name) + if not groupID then return lib.print.error('CreateBlipForGroup was sent an invalid groupID :'..groupID) end + + for i=1, #playerGroup[groupID].members do + TriggerClientEvent('groups:removeBlip', playerGroup[groupID].members[i].Player, name) + end +end +exportHandler('RemoveBlipForGroup', RemoveBlipForGroup) + + +-- All group functions to get members leaders and size. +local function GetGroupByMembers(src) + if not playerData[src] then return nil end + for group, _ in pairs(playerGroup) do + for _, v in pairs (playerGroup[group].members) do + if v.Player == src then + return group + end + end + end +end +exportHandler('GetGroupByMembers', GetGroupByMembers) + +local function getGroupMembers(groupID) + if not groupID then return lib.print.error('getGroupMembers was sent an invalid groupID :'..groupID) end + local temp = {} + for _,v in pairs(playerGroup[groupID].members) do + temp[#temp+1] = v.Player + end + return temp +end +exportHandler('getGroupMembers', getGroupMembers) + +local function getGroupSize(groupID) + if not groupID then return lib.print.error('getGroupSize was sent an invalid groupID :'..groupID) end + if not playerGroup[groupID] then return lib.print.error('getGroupSize was sent an invalid groupID :'..groupID) end + return #playerGroup[groupID].members +end +exportHandler('getGroupSize', getGroupSize) + +local function GetGroupLeader(groupID) + if not groupID then return lib.print.error('GetGroupLeader was sent an invalid groupID :'..groupID) end + return playerGroup[groupID].leader +end +exportHandler('GetGroupLeader', GetGroupLeader) + +local function DestroyGroup(groupID) + if not playerGroup[groupID] then return lib.print.error('DestroyGroup was sent an invalid groupID :'..groupID) end + local members = getGroupMembers(groupID) + if members and #members > 0 then + for i = 1, #members do + if members[i] then + playerData[members[i]] = false + end + end + end + + exports['qb-phone']:resetJobStatus(groupID) + TriggerEvent('slrn_groups:server:GroupDeleted', groupID, members) + + playerGroup[groupID] = nil + TriggerClientEvent('slrn_groups:client:RefreshGroupsApp', -1, playerGroup) + +end +exportHandler('DestroyGroup', DestroyGroup) + +local function RemovePlayerFromGroup(src, groupID, disconnected) + if not playerData[src] or not playerGroup[groupID] then return lib.print.error('RemovePlayerFromGroup was sent an invalid groupID :'..groupID) end + local g = playerGroup[groupID].members + for k,v in pairs(g) do + if v.Player == src then + table.remove(playerGroup[groupID].members, k) + playerGroup[groupID].Users -= 1 + playerData[src] = false + pNotifyGroup(groupID, 'Job Center', v.name..' Has left the group', 'fas fa-users', '#FFBF00', 7500) + TriggerClientEvent('slrn_groups:client:RefreshGroupsApp', -1, playerGroup) + if not disconnected then doNotification(src, 'You have left the group', 'primary') end + + if playerGroup[groupID].Users <= 0 then + DestroyGroup(groupID) + end + + return + end + end +end + +local function ChangeGroupLeader(groupID) + local m = playerGroup[groupID].members + local l = GetGroupLeader(groupID) + if #m > 1 then + for i=1, #m do + if m[i].Player ~= l then + playerGroup[groupID].leader = m[i].Player + return true + end + end + end + return false +end + +local function isGroupLeader(src, groupID) + if not groupID then return end + local grouplead = GetGroupLeader(groupID) + return grouplead == src or false +end +exportHandler('isGroupLeader', isGroupLeader) + +---- All the job functions for the groups + +local function setJobStatus(groupID, status, stages) + if not groupID then return lib.print.error('setJobStatus was sent an invalid groupID :'..groupID) end + playerGroup[groupID].status = status + playerGroup[groupID].stage = stages + local m = getGroupMembers(groupID) + if not m then return end + for i=1, #m do + if m[i] then + TriggerClientEvent('slrn_groups:client:AddGroupStage', m[i], status, stages) + end + end +end +exportHandler('setJobStatus', setJobStatus) + +local function getJobStatus(groupID) + if not groupID then return lib.print.error('getJobStatus was sent an invalid groupID :'..groupID) end + return playerGroup[groupID].status +end +exportHandler('getJobStatus', getJobStatus) + +local function resetJobStatus(groupID) + if not groupID then return lib.print.error('setJobStatus was sent an invalid groupID :'..groupID) end + playerGroup[groupID].status = 'WAITING' + playerGroup[groupID].stage = {} + local m = getGroupMembers(groupID) + if not m then return end + for i=1, #m do + if m[i] then + TriggerClientEvent('slrn_groups:client:AddGroupStage', m[i], playerGroup[groupID].status, playerGroup[groupID].stage) + TriggerClientEvent('slrn_groups:client:RefreshGroupsApp', m[i], playerGroup, true) + end + end +end +exportHandler('resetJobStatus', resetJobStatus) + +AddEventHandler('playerDropped', function() + local src = source + local groupID = GetGroupByMembers(src) + if groupID then + if isGroupLeader(src, groupID) then + if ChangeGroupLeader(groupID) then + RemovePlayerFromGroup(src, groupID, true) + else + DestroyGroup(groupID) + end + else + RemovePlayerFromGroup(src, groupID, true) + end + end +end) + +RegisterNetEvent('slrn_groups:server:jobcenter_CreateJobGroup', function(data) + local src = source + assert(src ~= nil, 'invalid source') + + local player = getPlayer(src) + if playerData[src] then doNotification(src, 'You have already created a group', 'error') return end + if not data or not data.pass or not data.name then return end + playerData[src] = true + local ID = #playerGroup+1 + playerGroup[ID] = { + id = ID, + status = 'WAITING', + GName = data.name, + GPass = data.pass, + Users = 1, + leader = src, + members = { + {name = GetPlayerCharName(src), CID = player.PlayerData.citizenid, Player = src} + }, + stage = {}, + } + + TriggerClientEvent('slrn_groups:client:RefreshGroupsApp', -1, playerGroup) +end) + +RegisterNetEvent('TestGroups', function() + local src = source + local TestTable = { + {name = 'Pick Up Truck', isDone = true, id = 1}, + {name = 'Pick up garbage', isDone = false , id = 2}, + {name = 'Drop off garbage', isDone = false , id = 3}, + } + + setJobStatus((GetGroupByMembers(src)), 'garbage', TestTable) +end) + +RegisterNetEvent('slrn_groups:server:jobcenter_DeleteGroup', function(data) + local src = source + if not playerData[src] then return lib.print.error('You are not in a group?!?') end + if GetGroupLeader(data.delete) == src then + DestroyGroup(data.delete) + else + RemovePlayerFromGroup(src, data.delete) + end +end) + +lib.callback.register('slrn_groups:server:GetGroupsApp', function(_) + return playerGroup +end) + +RegisterNetEvent('slrn_groups:server:jobcenter_JoinTheGroup', function(data) + local src = source + assert(src ~= nil, 'invalid source') + + local player = getPlayer(src) + if playerData[src] then return doNotification(src, 'You are already a part of a group!', 'success') end + + local name = GetPlayerCharName(src) + pNotifyGroup(data.id, 'Job Center', name..' Has joined the group', 'fas fa-users', '#FFBF00', 7500) + playerGroup[data.id].members[#playerGroup[data.id].members+1] = {name = name, CID = player.PlayerData.citizenid, Player = src} + playerGroup[data.id].Users += 1 + playerData[src] = true + doNotification(src, 'You joined the group', 'success') + TriggerClientEvent('slrn_groups:client:RefreshGroupsApp', -1, playerGroup) +end) + +local function GetGroupStages(groupID) + if not groupID then return lib.print.error('GetGroupStages was sent an invalid groupID :'..groupID) end + return playerGroup[groupID].stage +end +exportHandler('GetGroupStages', GetGroupStages) + +lib.callback.register('slrn_groups:server:getAllGroups', function(source) + if playerData[source] then + return playerGroup, true, getJobStatus(GetGroupByMembers(source)), GetGroupStages(GetGroupByMembers(source)) + else + return playerGroup, false + end +end) + +lib.callback.register('slrn_groups:server:jobcenter_CheckPlayerNames', function(_, csn) + local Names = {} + for _, v in pairs(playerGroup[csn].members) do + Names[#Names+1] = v.name + end + return Names +end) + + +RegisterNetEvent('slrn_groups:server:jobcenter_leave_grouped', function(data) + local src = source + if not playerData[src] then return end + RemovePlayerFromGroup(src, data.id) +end) + +local function isGroupTemp(groupID) + if not groupID or not playerGroup[groupID] then return lib.print.error('isGroupTemp was sent an invalid groupID :'..groupID) end + return playerGroup[groupID].ScriptCreated or false +end +exportHandler('isGroupTemp', isGroupTemp) + + +local function CreateGroup(src, name, password) + if not src or not name then return end + local Player = getPlayer(src) + playerData[src] = true + local id = #playerGroup+1 + playerGroup[id] = { + id = id, + status = 'WAITING', + GName = name, + GPass = password or lib.string.random('1111111'), + Users = 1, + leader = src, + members = { + {name = GetPlayerCharName(src), CID = Player.PlayerData.citizenid, Player = src} + }, + stage = {}, + ScriptCreated = true, + } + + TriggerClientEvent('slrn_groups:client:RefreshGroupsApp', -1, playerGroup) + return id +end +exportHandler('CreateGroup', CreateGroup) diff --git a/ui/assets/icon.png b/ui/assets/icon.png new file mode 100644 index 0000000..b29d093 Binary files /dev/null and b/ui/assets/icon.png differ diff --git a/ui/colors.css b/ui/colors.css new file mode 100644 index 0000000..bcfb5e0 --- /dev/null +++ b/ui/colors.css @@ -0,0 +1,15 @@ +:root { + --background-primary: #f5f5f5; + --background-highlight: rgb(220, 220, 220); + + --text-primary: #000000; + --text-secondary: #8e8e93; +} + +[data-theme='dark'] { + --background-primary: #000000; + --background-highlight: rgb(20, 20, 20); + + --text-primary: #f2f2f7; + --text-secondary: #6f6f6f; +} diff --git a/ui/dev.js b/ui/dev.js new file mode 100644 index 0000000..613ea96 --- /dev/null +++ b/ui/dev.js @@ -0,0 +1,19 @@ +// You can ignore this file. All it does is make the UI work on your browser. + +window.addEventListener("load", () => { + if (window.invokeNative) { + const phoneWrapper = document.getElementById("phone-wrapper"); + const app = phoneWrapper.querySelector(".app"); + + phoneWrapper.parentNode.insertBefore(app, phoneWrapper); + phoneWrapper.parentNode.removeChild(phoneWrapper); + return; + } + + document.getElementById("phone-wrapper").style.display = "block"; + document.body.style.visibility = "visible"; + + const center = () => document.getElementById("phone-wrapper").style.scale = window.innerWidth / 1920; + center(); + window.addEventListener("resize", center); +}); diff --git a/ui/index.html b/ui/index.html new file mode 100644 index 0000000..0b0c48d --- /dev/null +++ b/ui/index.html @@ -0,0 +1,76 @@ + + + + + Groups + + + + + + + + + + + + + + + +
+
+
+
+
+ Group Name + Group Password + Confirm Password +

+
Cancel
+
Create
+
+
+ +
+
+ Enter Password +

+
Cancel
+
Join
+
+
+ +
+
+
Members
+
+
RETURN
+
+
+
+
Join a group or browse groups currently busy
+
+
+
CREATE GROUP
+
+
+
+
+
+
+
+
+ + + + + diff --git a/ui/jquery.timeago.js b/ui/jquery.timeago.js new file mode 100644 index 0000000..ec80c32 --- /dev/null +++ b/ui/jquery.timeago.js @@ -0,0 +1,232 @@ +/** + * Timeago is a jQuery plugin that makes it easy to support automatically + * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). + * + * @name timeago + * @version 1.6.7 + * @requires jQuery >=1.5.0 <4.0 + * @author Ryan McGeary + * @license MIT License - http://www.opensource.org/licenses/mit-license.php + * + * For usage and examples, visit: + * http://timeago.yarp.com/ + * + * Copyright (c) 2008-2019, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) + */ + +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery'], factory); + } else if (typeof module === 'object' && typeof module.exports === 'object') { + factory(require('jquery')); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + $.timeago = function(timestamp) { + if (timestamp instanceof Date) { + return inWords(timestamp); + } else if (typeof timestamp === "string") { + return inWords($.timeago.parse(timestamp)); + } else if (typeof timestamp === "number") { + return inWords(new Date(timestamp)); + } else { + return inWords($.timeago.datetime(timestamp)); + } + }; + var $t = $.timeago; + + $.extend($.timeago, { + settings: { + refreshMillis: 60000, + allowPast: true, + allowFuture: false, + localeTitle: false, + cutoff: 0, + autoDispose: true, + strings: { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "ago", + suffixFromNow: "from now", + inPast: "any moment now", + seconds: "less than a minute", + minute: "about a minute", + minutes: "%d minutes", + hour: "about an hour", + hours: "about %d hours", + day: "a day", + days: "%d days", + month: "about a month", + months: "%d months", + year: "about a year", + years: "%d years", + wordSeparator: " ", + numbers: [] + } + }, + + inWords: function(distanceMillis) { + if (!this.settings.allowPast && ! this.settings.allowFuture) { + throw 'timeago allowPast and allowFuture settings can not both be set to false.'; + } + + var $l = this.settings.strings; + var prefix = $l.prefixAgo; + var suffix = $l.suffixAgo; + if (this.settings.allowFuture) { + if (distanceMillis < 0) { + prefix = $l.prefixFromNow; + suffix = $l.suffixFromNow; + } + } + + if (!this.settings.allowPast && distanceMillis >= 0) { + return this.settings.strings.inPast; + } + + var seconds = Math.abs(distanceMillis) / 1000; + var minutes = seconds / 60; + var hours = minutes / 60; + var days = hours / 24; + var years = days / 365; + + function substitute(stringOrFunction, number) { + var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; + var value = ($l.numbers && $l.numbers[number]) || number; + return string.replace(/%d/i, value); + } + + var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || + seconds < 90 && substitute($l.minute, 1) || + minutes < 45 && substitute($l.minutes, Math.round(minutes)) || + minutes < 90 && substitute($l.hour, 1) || + hours < 24 && substitute($l.hours, Math.round(hours)) || + hours < 42 && substitute($l.day, 1) || + days < 30 && substitute($l.days, Math.round(days)) || + days < 45 && substitute($l.month, 1) || + days < 365 && substitute($l.months, Math.round(days / 30)) || + years < 1.5 && substitute($l.year, 1) || + substitute($l.years, Math.round(years)); + + var separator = $l.wordSeparator || ""; + if ($l.wordSeparator === undefined) { separator = " "; } + return $.trim([prefix, words, suffix].join(separator)); + }, + + parse: function(iso8601) { + var s = $.trim(iso8601); + s = s.replace(/\.\d+/,""); // remove milliseconds + s = s.replace(/-/,"/").replace(/-/,"/"); + s = s.replace(/T/," ").replace(/Z/," UTC"); + s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 + s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900 + return new Date(s); + }, + datetime: function(elem) { + var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); + return $t.parse(iso8601); + }, + isTime: function(elem) { + // jQuery's `is()` doesn't play well with HTML5 in IE + return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); + } + }); + + // functions that can be called via $(el).timeago('action') + // init is default when no action is given + // functions are called with context of a single element + var functions = { + init: function() { + functions.dispose.call(this); + var refresh_el = $.proxy(refresh, this); + refresh_el(); + var $s = $t.settings; + if ($s.refreshMillis > 0) { + this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis); + } + }, + update: function(timestamp) { + var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp); + $(this).data('timeago', { datetime: date }); + if ($t.settings.localeTitle) { + $(this).attr("title", date.toLocaleString()); + } + refresh.apply(this); + }, + updateFromDOM: function() { + $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); + refresh.apply(this); + }, + dispose: function () { + if (this._timeagoInterval) { + window.clearInterval(this._timeagoInterval); + this._timeagoInterval = null; + } + } + }; + + $.fn.timeago = function(action, options) { + var fn = action ? functions[action] : functions.init; + if (!fn) { + throw new Error("Unknown function name '"+ action +"' for timeago"); + } + // each over objects here and call the requested function + this.each(function() { + fn.call(this, options); + }); + return this; + }; + + function refresh() { + var $s = $t.settings; + + //check if it's still visible + if ($s.autoDispose && !$.contains(document.documentElement,this)) { + //stop if it has been removed + $(this).timeago("dispose"); + return this; + } + + var data = prepareData(this); + + if (!isNaN(data.datetime)) { + if ( $s.cutoff === 0 || Math.abs(distance(data.datetime)) < $s.cutoff) { + $(this).text(inWords(data.datetime)); + } else { + if ($(this).attr('title').length > 0) { + $(this).text($(this).attr('title')); + } + } + } + return this; + } + + function prepareData(element) { + element = $(element); + if (!element.data("timeago")) { + element.data("timeago", { datetime: $t.datetime(element) }); + var text = $.trim(element.text()); + if ($t.settings.localeTitle) { + element.attr("title", element.data('timeago').datetime.toLocaleString()); + } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { + element.attr("title", text); + } + } + return element.data("timeago"); + } + + function inWords(date) { + return $t.inWords(distance(date)); + } + + function distance(date) { + return (new Date().getTime() - date.getTime()); + } + + // fix for IE6 suckage + document.createElement("abbr"); + document.createElement("time"); +})); diff --git a/ui/script.js b/ui/script.js new file mode 100644 index 0000000..c95e4a5 --- /dev/null +++ b/ui/script.js @@ -0,0 +1,315 @@ +QB = {} +QB.Phone = {} +QB.Phone.Data = { + PlayerData: {}, +} +QB.Phone.Functions = {} + +QB.Phone.Functions.LoadPhoneData = function(data) { + QB.Phone.Data.PlayerData = data.PlayerData; +} + +var JoinPass = null; +var JoinID = null; + +function ClearInputNew(){ + $(".phone-new-input-class").val(""); +} + +function LoadJobCenterApp(){ + $.post('https://slrn_groups/GetGroupsApp', JSON.stringify({}), function(data){ + AddDIV(data) + }); +} + +$(document).ready(function(){ + window.addEventListener('message', function(event) { + switch(event.data.action) { + case "LoadPhoneData": + QB.Phone.Functions.LoadPhoneData(event.data); + break; + case "LoadJobCenterApp": + LoadJobCenterApp() + break; + case 'testPassword': + $('#jobcenter-box-new-join').fadeIn(350); + break; + case 'PhoneNotification': + setPopUp({ + title: event.data.PhoneNotify.title, + description: event.data.PhoneNotify.text, + buttons: [ + { + title: event.data.PhoneNotify.deny, + color: 'red', + cb: () => { + $.post('https://slrn_groups/AnsweredNotify', JSON.stringify({ + type: 'failure', + })); + } + }, + { + title: event.data.PhoneNotify.accept, + color: 'blue', + cb: () => { + $.post('https://slrn_groups/AnsweredNotify', JSON.stringify({ + type: 'success', + })); + } + } + ] + }); + break; + case 'SendNotify': + sendNotification({ title: event.data.msg }); + break; + + } + }) +}); + + +$(document).on('click', '.jobcenter-btn-create-group', function(e){ + e.preventDefault(); + ClearInputNew() + $('#jobcenter-box-new-dashboard').fadeIn(350); +}); + +$(document).on('click', '#box-new-cancel', function(e){ + e.preventDefault(); + ClearInputNew() + $('.phone-menu-body').fadeOut(350); + //$('.phone-new-box-body').fadeOut(350); +}); + +$(document).on('click', '#jobcenter-submit-create-group', function(e){ + e.preventDefault(); + var Name = $(".jobcenter-input-group-name").val(); + var pass = $(".jobcenter-input-password").val(); + var pass2 = $(".jobcenter-input-password2").val(); + if (Name != "" && pass != "" && pass2 != ""){ + if(pass == pass2){ + $.post('https://slrn_groups/jobcenter_CreateJobGroup', JSON.stringify({ + name: Name, + pass: pass, + })); + + + + + $('#jobcenter-box-new-dashboard').fadeOut(350); + }else{ + sendNotification({ title: 'The password entered is incorrect' }); + } + }else{ + sendNotification({ title: 'Fields are incorrect' }); + } +}); + +$(document).ready(function(){ + window.addEventListener('message', function(event) { + switch(event.data.action) { + case "refreshApp": + $(".jobcenter-list").css({"display": "inline"}); + $(".jobcenter-btn-create-group").css({"display": "inline"}); + $(".title").css({"display": "block"}); + $(".jobcenter-Groupjob").css({"margin-top": "47%"}); + AddDIV(event.data.data) + break; + case "addGroupStage": + AddGroupJobs(event.data.status) + break; + } + }) +}); + +$(document).ready(function(){ + window.addEventListener('message', function(event) { + switch(event.data.action) { + case "GroupAddDIV": + if(event.data.showPage && event.data.job != "WAITING"){ + AddGroupJobs(event.data.stage) + } else { + AddDIV(event.data.data) + } + break; + } + }) +}); + +function AddDIV(data){ + var AddOption; + var CSN = QB.Phone.Data.PlayerData.source; + $(".jobcenter-list").html(""); + if(data) { + Object.keys(data).map(function(element,index){ + if(data[element].leader == CSN) { + AddOption = ` +
+
+ +
+ ${data[element].GName} +
+ + + ${data[element].Users}
+ ` + } else { + AddOption = ` +
+
+
+
${data[element].GName}
+ ${data[element].Users} +
+ ` + Object.keys(data[element].members).map(function(element2, _){ + if(data[element].members[element2].Player == CSN) { + AddOption = ` +
+
+ +
+ ${data[element].GName} + +
+ + ${data[element].Users}
+ ` + } + }) + } + $('.jobcenter-list').append(AddOption); + }) + } else { + $(".jobcenter-list").html(""); + var AddOption = '
No Group
' + $('.jobcenter-list').append(AddOption); + } +} + +function AddGroupJobs(data){ + var AddOption; + $(".jobcenter-Groupjob").html(""); + $(".jobcenter-Groupjob").css({"margin-top": "23%"}); + $(".jobcenter-list").html(""); + $(".jobcenter-list").css({"display": "none"}); + $(".jobcenter-btn-create-group").css({"display": "none"}); + $(".title").css({"display": "none"}); + $(".jobcenter-groupjob-timer").css({"display": "block"}); + if(data) { + + + for (const [k, v] of Object.entries(data)) { + if (v.isDone) { + AddOption = + ` +
+

1 / 1

+ ${v.name} +
+ ` + } else { + AddOption = + ` +
+

0 / 1

+ ${v.name} +
+ ` + } + $('.jobcenter-Groupjob').append(AddOption); + } + } else { + $(".jobcenter-list").css({"display": "block"}); + $(".jobcenter-btn-create-group").css({"display": "block"}); + $(".title").css({"display": "block"}); + } +} + +$(document).on('click', '#jobcenter-delete-group', function(e){ + e.preventDefault(); + var Delete = $(this).data('delete') + $.post('https://slrn_groups/jobcenter_DeleteGroup', JSON.stringify({ + delete: Delete, + })); +}); + +$(document).on('click', '#jobcenter-join-grouped', function(e){ + e.preventDefault(); + JoinPass = $(this).data('pass') + JoinID = $(this).data('id') + ClearInputNew() + $('#jobcenter-box-new-join').fadeIn(350); +}); + +$(document).on('click', '#jobcenter-submit-join-group', function(e){ + e.preventDefault(); + var EnterPass = $(".jobcenter-input-join-password").val(); + if(EnterPass == JoinPass){ + var CSN = QB.Phone.Data.PlayerData.citizenid; + $.post('https://slrn_groups/jobcenter_JoinTheGroup', JSON.stringify({ + PCSN: CSN, + id: JoinID, + })); + ClearInputNew() + $('#jobcenter-box-new-join').fadeOut(350); + } +}); + +$(document).on('click', '#jobcenter-list-group', function(e){ + e.preventDefault(); + var id = $(this).data('id') + $.post('https://slrn_groups/jobcenter_CheckPlayerNames', JSON.stringify({ + id: id, + }), function(Data){ + ClearInputNew() + $('#jobcenter-box-new-player-name').fadeIn(350); + $("#phone-new-box-main-playername").html(""); + for (const [k, v] of Object.entries(Data)) { + var AddOption = `
${v}
` + + $('#phone-new-box-main-playername').append(AddOption); + } + + var AddOption2 = '

' + + $('#phone-new-box-main-playername').append(AddOption2); + }); +}); + +$(document).on('click', '#jobcenter-leave-grouped', function(e){ + e.preventDefault(); + var CSN = QB.Phone.Data.PlayerData.citizenid; + var id = $(this).data('id') + $.post('https://slrn_groups/jobcenter_leave_grouped', JSON.stringify({ + id: id, + csn: CSN, + })); +}); + +var buttonStart = document.getElementById('button-start'); +var buttonStop = document.getElementById('button-stop'); +var buttonReset = document.getElementById('button-reset'); + +onSettingsChange((settings) => { + let theme = settings.display.theme; + document.getElementsByClassName('app')[0].dataset.theme = theme; +}); + +getSettings().then((settings) => { + let theme = settings.display.theme; + document.getElementsByClassName('app')[0].dataset.theme = theme; +}); + + +$.post('https://slrn_groups/onStartup'); diff --git a/ui/styles.css b/ui/styles.css new file mode 100644 index 0000000..43557ee --- /dev/null +++ b/ui/styles.css @@ -0,0 +1,443 @@ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@200&display=swap'); + + +@font-face { + font-family: 'password'; + font-style: normal; + src: url(https://jsbin-user-assets.s3.amazonaws.com/rafaelcastrocouto/password.ttf); +} + +input.jobcenter-input-password, input.jobcenter-input-password2 { + font-family: 'password'; +} + +#phone-menu-icon{ + position: relative; + top: 0.2vh; + right: 26.2vh; + font-size: 1.4vh; + color: white; +} + +html, +body { + margin: 0; + padding: 0; + + box-sizing: border-box; + visibility: hidden; + + font-family: 'Poppins', sans-serif; +} + +.app { + width: 100%; + height: 100%; + + display: flex; + align-items: center; + justify-content: center; + flex-wrap: wrap; + + background-color: var(--background-primary); +} + +.app-wrapper { + width: 100%; + height: 100%; + + display: flex; + flex-direction: column; + align-items: start; + justify-content: center; + gap: 3rem; +} + +.header { + position: absolute; + width: 90%; + height: 10%; + /* top: 8%; */ + top: 8%; + left: 6%; + right: 0; + color: white; + /* font-family: 'Poppins', sans-serif; */ + font-size: 1.3vh; + /* margin: 0 auto; */ +} + +.jobcenter-header { + position: absolute; + width: 90%; + height: 10%; + /* top: 8%; */ + top: 19%; + left: 6%; + right: 0; + color: white; + /* font-family: 'Poppins', sans-serif; */ + font-size: 2.0vh; + /* margin: 0 auto; */ +} + +.jobcenter-btn-create-group{ + display: inline; + background: #8ee074; + padding: 2% 4%; + transition: 0.2s; + border-radius: 4px; + color: black; + cursor: pointer; +} +.jobcenter-btn-create-group:hover{ + background: #6cac59; +} + +.button-wrapper { + display: flex; + flex-direction: column; + text-align: center; + gap: 0.2rem; +} + +.button-wrapper { + gap: 1rem; +} + +.title { + font-size: 20px; + font-weight: 700; + color: var(--text-primary); +} + +/* Do not edit, this allows you to view changes easily in your browser */ +#phone-wrapper { + display: none; + + position: absolute; + bottom: 0; + top: 0; + left: 0; + right: 0; + + margin: auto; + + width: 29rem; + height: 58.5rem; +} + +.phone-menu-text{ + position: relative; + margin-left: 10%; + margin-bottom: -10%; + width: 80%; + border: none; + background: none; + outline: none; + text-indent: 3vh; + text-align: left; + line-height: 3.0vh; + font-size: 1.75vh; + overflow: hidden; + color: white; + border-bottom: .1vh solid #fff; + transition: 0.25s; +} + +.phone-menu-main{ + position: absolute; + transform: translate(-50%, -50%); + top: 50%; + left: 50%; + padding-top: 10%; + padding-bottom: 5%; + width: 73%; + background-color: rgb(59, 59, 59); +} + +.phone-menu-title{ + position: relative; + left: 3.3vh; + font-size: 1.2vh; + color: white; +} + +.phone-menu-body{ + display: none; + position: absolute; + transform: translate(-50%, -50%); + top: 50%; + left: 50%; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.624); + z-index: 700; +} + +.phone-menu-button{ + display: inline; + transition: 0.25s; + padding: 2%; + border-radius: 5px; + color: black; + font-family: 'Roboto', sans-serif; + font-size: 1.4vh; + margin-bottom: 4%; +} + +.phone-menu-accept{ + background:#90e278; + margin-left: 25%; + padding: 4.0%; + cursor: pointer; +} +.phone-menu-accept:hover{ + background: #6cac59; +} + +.phone-menu-cancel{ + background:#f6a167; + margin-left: 15%; + padding: 4.0%; + cursor: pointer; +} +.phone-menu-cancel:hover{ + background: #c27e47; +} + +.phone-new-box-main input::-webkit-inner-spin-button { + -webkit-appearance: none; +} + +#phone-new-box-main-playername { + width: 86.3%; + margin-left: 6.5%; +} + +.jobcenter-playerlist { + width: 100%; + height: 100%; + background-color: #242833; + bottom: 0%; + position: absolute; + overflow: hidden; +} + +.casino-text-clear{ + text-align: center; + color: whitesmoke; +} + +.jobcenter-playerlist2 { + width: 100%; + height: 60.5%; + background-color: #242833; + bottom: 0; + position: relative; +} + +.jobcenter-div-active-stagee { + width: 100%; + padding: 10px; + display: flex; + align-items: center; + gap: 10px; + color: white; + font-size: 1.5vh; + position: relative; + height: auto; + word-break: break-word; + } + +.jobcenter-playerlist-list { + height: 4vh; + font-size: 2vh; + border-bottom: 1px white solid; + background: #3D6285; +} + +.jobcenter-playerlist-name { + color: white; + /* background-color: black; */ + height: 100%; + font-size: 1.55vh; + text-align: left; + position: absolute; + left: 27%; + margin-top: 5px; +} + +.jobcenter-playerlist-header { + color: white; + margin-left: 6%; + margin-top: 14%; + font-size: 1.7vh; + margin-bottom: 5%; +} + +.jobcenter-playerlist-leave { + background: #95EF77; + margin-left: 36.5%; + padding: 2.8% 5%; + /* font-weight: 700; */ + bottom: 7.5%; + position: absolute; + cursor: pointer; + /* top: 0; */ +} + +.jobcenter-playerlist-leave:hover { + background: #629e4e; +} + +.isDone { + text-decoration: line-through; + background: #2c465f !important; + position: relative; + } + + .isDone::after { + height: 30px; + background: #008685 !important; + } + +.jobcenter-div-active-stagee::after { + content: ''; + height: 12px; + background: #4155C0; + left: -23px; + top: -3px; + width: 12px; + position: absolute; + border-radius: 100%; + } + + .jobcenter-div-active-stagee::before { + content: ''; + height: 90%; + background: white; + left: -18px; + top: 15px; + width: 2px; + position: absolute; + } + +.jobcenter-div-job-group{ + /* display: inline; */ + width: 98%; + margin-left: 1%; + margin-bottom: 2%; + padding-left: 5%; + background-color: #2c465f; + transition: 0.2s; + color: whitesmoke; + border-bottom: 2px solid #f5f5f5ad; + border-radius: 2px; +} + +.jobcenter-div-active-stage{ + width: 100%; + padding: 10px; + display: flex; + align-items: center; + gap: 10px; + color: white; + font-size: 1.5vh; + position: relative; + height: auto; + font: -webkit-control; +} + +.jobcenter-Groupjob { + margin-top: 16%; + width: 99%; + display: flex; + flex-direction: column; + gap: 23px; + padding-left: 9%; + margin-top: 47%; + border-top: 2px solid #7d7d7d; + width: 87%; + display: flex; + padding-top: 10px; + align-content: center; + align-items: center; + margin-left: 6%; + height: 70%; + overflow: auto; +} + +.jobcenter-groupjob-timer { + display: none; + width: 100%; + font-size: 25px; + top: 0px; + position: absolute; + color: white; + margin-top: 30px; + margin-left: 190px; +} + +.jobcenter-Groupjob::-webkit-scrollbar { + display: none; +} + +.jobcenter-Groupjob-background { + background: black; + width: 100%; + height: 100%; +} + +.jobcenter-div-job-group:hover{ + background-color: #2e4d6a; +} + +.jobcenter-div-job-group-image{ + font-size: 250%; + display: inline-block; +} + +.jobcenter-option-class-body{ + text-align: right; +} + +.jobcenter-div-job-group-body-main{ + display: inline-block; + position: absolute; + /* background: black; */ + width: 70%; + max-width: 70%; + margin-top: 4%; + margin-left: 4%; +} + +#jobcenter-list-group:hover{ + color: #8ee074; +} + +#jobcenter-delete-group:hover{ + color: #dc3333; +} + +.jobcenter-list { + position: absolute; + width: 88.8%; + margin: 0 auto; + left: -1%; + right: 0; + border-radius: .5vh; + overflow-y: scroll; + bottom: 0%; + height: 76%; +} + +.jobcenter-list::-webkit-scrollbar { + display: none; +} \ No newline at end of file