fix: Remove -u flag from set command to prevent unbound variable errors

.github/workflows/app_build.yml

@@ -1,10 +1,10 @@
 name: Build on Merge
+
 on:
   push: 
     branches:
       - main
-    paths-ignore:
-      - 'docker/**'
+      - dev
 
 jobs:
   deploy:
@@ -15,11 +15,3 @@ jobs:
       
       - name: Run rebuild script
         run: /root/patchmon/platform/scripts/app_build.sh ${{ github.ref_name }}
-  
-  rebuild-pmon:
-    runs-on: self-hosted
-    needs: deploy
-    if: github.ref_name == 'dev'
-    steps:
-      - name: Rebuild pmon
-        run: /root/patchmon/platform/scripts/manage_pmon_auto.sh

.github/workflows/code_quality.yml

@@ -2,11 +2,7 @@ name: Code quality
 
 on:
   push:
-    paths-ignore:
-      - 'docker/**'
   pull_request:
-    paths-ignore:
-      - 'docker/**'
 
 jobs:
   check:

.github/workflows/docker.yml

@@ -1,14 +1,13 @@
 name: Build and Push Docker Images
 
 on:
-  push:
-    branches:
-      - main
-    tags:
-      - 'v*'
   pull_request:
     branches:
       - main
+      - dev
+  release:
+    types:
+      - published
   workflow_dispatch:
     inputs:
       push:
@@ -34,42 +33,39 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v5
 
-      - name: Log in to container registry
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        if: github.event_name != 'workflow_dispatch' || github.event_name == 'workflow_dispatch' && github.event.inputs.push == 'true'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+          # Using PAT as a hack due to issues with GITHUB_TOKEN and package permissions
+          # This should be reverted to use GITHUB_TOKEN once a solution is discovered.
+          password: ${{ secrets.GHCR_PAT }}
 
       - name: Extract metadata (tags, labels)
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ github.repository }}-${{ matrix.image }}
+          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/patchmon-${{ matrix.image }}
           tags: |
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
-            type=edge,branch=main
+            type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Build and push ${{ matrix.image }} image
+        if: github.event_name != 'workflow_dispatch' || github.event_name == 'workflow_dispatch' && github.event.inputs.push == 'true'
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/${{ matrix.image }}.Dockerfile
           platforms: linux/amd64,linux/arm64
-          # Push if:
-          # - Event is not workflow_dispatch OR input 'push' is true
-          # AND
-          # - Event is not pull_request OR the PR is from the same repository (to avoid pushing from forks)
-          push: ${{ (github.event_name != 'workflow_dispatch' || inputs.push == 'true') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha,scope=${{ matrix.image }}

.gitignore

@@ -71,13 +71,6 @@ jspm_packages/
 .cache/
 public
 
-# Exception: Allow frontend/public/assets for logo files
-!frontend/public/
-!frontend/public/assets/
-!frontend/public/assets/*.png
-!frontend/public/assets/*.svg
-!frontend/public/assets/*.jpg
-
 # Storybook build outputs
 .out
 .storybook-out
@@ -154,4 +147,4 @@ setup-installer-site.sh
 install-server.*
 notify-clients-upgrade.sh
 debug-agent.sh
-docker/compose_dev_*
+docker/compose_dev_data

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

@@ -4,8 +4,6 @@
 [![Discord](https://img.shields.io/badge/Discord-Join%20Server-blue?style=for-the-badge&logo=discord)](https://patchmon.net/discord)
 [![GitHub](https://img.shields.io/badge/GitHub-Repository-black?style=for-the-badge&logo=github)](https://github.com/9technologygroup/patchmon.net)
 [![Roadmap](https://img.shields.io/badge/Roadmap-View%20Progress-green?style=for-the-badge&logo=github)](https://github.com/users/9technologygroup/projects/1)
-[![Documentation](https://img.shields.io/badge/Documentation-docs.patchmon.net-blue?style=for-the-badge&logo=book)](https://docs.patchmon.net/)
-
 ---
 
 ## Please STAR this repo :D
@@ -14,7 +12,7 @@
 
 PatchMon provides centralized patch management across diverse server environments. Agents communicate outbound-only to the PatchMon server, eliminating inbound ports on monitored hosts while delivering comprehensive visibility and safe automation.
 
-![Dashboard Screenshot](https://raw.githubusercontent.com/PatchMon/PatchMon/main/dashboard.jpeg)
+![Dashboard Screenshot](https://raw.githubusercontent.com/9technologygroup/patchmon.net/main/dashboard.jpeg)
 
 ## Features
 
@@ -65,7 +63,7 @@ Managed, zero-maintenance PatchMon hosting. Stay tuned.
 
 #### Docker (preferred)
 
-For getting started with Docker, see the [Docker documentation](https://github.com/PatchMon/PatchMon/blob/main/docker/README.md)
+For getting started with Docker, see the [Docker documentation](https://github.com/9technologygroup/patchmon.net/blob/main/docker/README.md)
 
 #### Native Install (advanced/non-docker)
 
@@ -87,7 +85,7 @@ apt install curl -y
 
 #### Script
 ```bash
-curl -fsSL -o setup.sh https://raw.githubusercontent.com/PatchMon/PatchMon/refs/heads/main/setup.sh && chmod +x setup.sh && bash setup.sh
+curl -fsSL -o setup.sh https://raw.githubusercontent.com/9technologygroup/patchmon.net/refs/heads/main/setup.sh && chmod +x setup.sh && bash setup.sh
 ```
 
 #### Minimum specs for building : #####
@@ -113,14 +111,6 @@ After installation:
 - Visit `http(s)://<your-domain>` and complete first-time admin setup
 - See all useful info in `deployment-info.txt`
 
-## Forcing updates after host package changes
-Should you perform a manual package update on your host and wish to see the results reflected in PatchMon quicker than the usual scheduled update, you can trigger the process manually by running:
-```bash
-/usr/local/bin/patchmon-agent.sh update
-```
-
-This will send the results immediately to PatchMon.
-
 ## Communication Model
 
 - Outbound-only agents: servers initiate communication to PatchMon
@@ -135,18 +125,22 @@ This will send the results immediately to PatchMon.
 - Database: PostgreSQL
 - System service: systemd-managed backend
 
-```mermaid
-flowchart LR
-    A[End Users / Browser<br>Admin UI / Frontend] -- HTTPS --> B[nginx<br>serve FE, proxy API]
-    B -- HTTP --> C["Backend<br>(Node/Express)<br>/api, auth, Prisma"]
-    C -- TCP --> D[PostgreSQL<br>Database]
-
-    E["Agents on your servers (Outbound Only)"] -- HTTPS --> F["Backend API<br>(/api/v1)"]
 ```
++----------------------+    HTTPS    +--------------------+    HTTP    +------------------------+    TCP    +---------------+
+|  End Users (Browser) | --------->  |       nginx        | --------> | Backend (Node/Express) | ------> |  PostgreSQL   |
+|  Admin UI / Frontend |            | serve FE, proxy API|           |  /api, auth, Prisma    |         |   Database    |
++----------------------+            +--------------------+           +------------------------+         +---------------+
+
+Agents (Outbound Only)
++---------------------------+    HTTPS    +------------------------+
+|  Agents on your servers   | ----------> | Backend API (/api/v1)  |
++---------------------------+             +------------------------+
+
 Operational
 - systemd manages backend service
 - certbot/nginx for TLS (public)
 - setup.sh bootstraps OS, app, DB, config
+```
 
 ## Support
 
@@ -155,7 +149,7 @@ Operational
 
 ## Roadmap
 
-- Roadmap board: https://github.com/orgs/PatchMon/projects/2
+- Roadmap board: https://github.com/users/9technologygroup/projects/1
 
 
 ## License
@@ -278,7 +272,7 @@ Thank you to all our contributors who help make PatchMon better every day!
 - **Website**: [patchmon.net](https://patchmon.net)
 - **Discord**: [https://patchmon.net/discord](https://patchmon.net/discord)
 - **Roadmap**: [GitHub Projects](https://github.com/users/9technologygroup/projects/1)
-- **Documentation**: [https://docs.patchmon.net](https://docs.patchmon.net)
+- **Documentation**: [Coming Soon]
 - **Support**: support@patchmon.net
 
 ---
@@ -288,6 +282,6 @@ Thank you to all our contributors who help make PatchMon better every day!
 **Made with ❤️ by the PatchMon Team**
 
 [![Discord](https://img.shields.io/badge/Discord-Join%20Server-blue?style=for-the-badge&logo=discord)](https://patchmon.net/discord)
-[![GitHub](https://img.shields.io/badge/GitHub-Repository-black?style=for-the-badge&logo=github)](https://github.com/PatchMon/PatchMon)
+[![GitHub](https://img.shields.io/badge/GitHub-Repository-black?style=for-the-badge&logo=github)](https://github.com/9technologygroup/patchmon.net)
 
 </div>

agents/patchmon-agent.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# PatchMon Agent Script v1.2.8
+# PatchMon Agent Script v1.2.7
 # This script sends package update information to the PatchMon server using API credentials
 
 # Configuration
 PATCHMON_SERVER="${PATCHMON_SERVER:-http://localhost:3001}"
 API_VERSION="v1"
-AGENT_VERSION="1.2.8"
+AGENT_VERSION="1.2.7"
 CONFIG_FILE="/etc/patchmon/agent.conf"
 CREDENTIALS_FILE="/etc/patchmon/credentials"
 LOG_FILE="/var/log/patchmon-agent.log"
@@ -56,28 +56,6 @@ warning() {
     log "WARNING: $1"
 }
 
-# Get or generate machine ID
-get_machine_id() {
-    # Try standard locations for machine-id
-    if [[ -f /etc/machine-id ]]; then
-        cat /etc/machine-id
-    elif [[ -f /var/lib/dbus/machine-id ]]; then
-        cat /var/lib/dbus/machine-id
-    else
-        # Fallback: generate from hardware UUID or hostname+MAC
-        if command -v dmidecode &> /dev/null; then
-            local uuid=$(dmidecode -s system-uuid 2>/dev/null | tr -d ' -' | tr '[:upper:]' '[:lower:]')
-            if [[ -n "$uuid" && "$uuid" != "notpresent" ]]; then
-                echo "$uuid"
-                return
-            fi
-        fi
-        # Last resort: hash hostname + primary MAC address
-        local primary_mac=$(ip link show | grep -oP '(?<=link/ether\s)[0-9a-f:]+' | head -1 | tr -d ':')
-        echo "$HOSTNAME-$primary_mac" | sha256sum | cut -d' ' -f1 | cut -c1-32
-    fi
-}
-
 # Check if running as root
 check_root() {
     if [[ $EUID -ne 0 ]]; then
@@ -231,14 +209,9 @@ detect_os() {
             "opensuse"|"opensuse-leap"|"opensuse-tumbleweed")
                 OS_TYPE="suse"
                 ;;
-            "almalinux")
+            "rocky"|"almalinux")
                 OS_TYPE="rhel"
                 ;;
-            "ol")
-                # Keep Oracle Linux as 'ol' for proper frontend identification
-                OS_TYPE="ol"
-                ;;
-            # Rocky Linux keeps its own identity for proper frontend display
         esac
         
     elif [[ -f /etc/redhat-release ]]; then
@@ -266,7 +239,7 @@ get_repository_info() {
         "ubuntu"|"debian")
             get_apt_repositories repos_json first
             ;;
-        "centos"|"rhel"|"fedora"|"ol"|"rocky")
+        "centos"|"rhel"|"fedora")
             get_yum_repositories repos_json first
             ;;
         *)
@@ -574,118 +547,14 @@ get_yum_repositories() {
     local -n first_ref=$2
     
     # Parse yum/dnf repository configuration
-    local repo_info=""
     if command -v dnf >/dev/null 2>&1; then
-        repo_info=$(dnf repolist all --verbose 2>/dev/null | grep -E "^Repo-id|^Repo-baseurl|^Repo-mirrors|^Repo-name|^Repo-status")
+        local repo_info=$(dnf repolist all --verbose 2>/dev/null | grep -E "^Repo-id|^Repo-baseurl|^Repo-name|^Repo-status")
     elif command -v yum >/dev/null 2>&1; then
-        repo_info=$(yum repolist all -v 2>/dev/null | grep -E "^Repo-id|^Repo-baseurl|^Repo-mirrors|^Repo-name|^Repo-status")
+        local repo_info=$(yum repolist all -v 2>/dev/null | grep -E "^Repo-id|^Repo-baseurl|^Repo-name|^Repo-status")
     fi
     
-    if [[ -z "$repo_info" ]]; then
-        return
-    fi
-    
-    # Parse repository information
-    local current_repo=""
-    local repo_id=""
-    local repo_name=""
-    local repo_url=""
-    local repo_mirrors=""
-    local repo_status=""
-    
-    while IFS= read -r line; do
-        if [[ "$line" =~ ^Repo-id[[:space:]]+:[[:space:]]+(.+)$ ]]; then
-            # Process previous repository if we have one
-            if [[ -n "$current_repo" ]]; then
-                process_yum_repo repos_ref first_ref "$repo_id" "$repo_name" "$repo_url" "$repo_mirrors" "$repo_status"
-            fi
-            
-            # Start new repository
-            repo_id="${BASH_REMATCH[1]}"
-            repo_name="$repo_id"
-            repo_url=""
-            repo_mirrors=""
-            repo_status=""
-            current_repo="$repo_id"
-            
-        elif [[ "$line" =~ ^Repo-name[[:space:]]+:[[:space:]]+(.+)$ ]]; then
-            repo_name="${BASH_REMATCH[1]}"
-            
-        elif [[ "$line" =~ ^Repo-baseurl[[:space:]]+:[[:space:]]+(.+)$ ]]; then
-            repo_url="${BASH_REMATCH[1]}"
-            
-        elif [[ "$line" =~ ^Repo-mirrors[[:space:]]+:[[:space:]]+(.+)$ ]]; then
-            repo_mirrors="${BASH_REMATCH[1]}"
-            
-        elif [[ "$line" =~ ^Repo-status[[:space:]]+:[[:space:]]+(.+)$ ]]; then
-            repo_status="${BASH_REMATCH[1]}"
-        fi
-    done <<< "$repo_info"
-    
-    # Process the last repository
-    if [[ -n "$current_repo" ]]; then
-        process_yum_repo repos_ref first_ref "$repo_id" "$repo_name" "$repo_url" "$repo_mirrors" "$repo_status"
-    fi
-}
-
-# Process a single YUM repository and add it to the JSON
-process_yum_repo() {
-    local -n _repos_ref=$1
-    local -n _first_ref=$2
-    local repo_id="$3"
-    local repo_name="$4"
-    local repo_url="$5"
-    local repo_mirrors="$6"
-    local repo_status="$7"
-    
-    # Skip if we don't have essential info
-    if [[ -z "$repo_id" ]]; then
-        return
-    fi
-    
-    # Determine if repository is enabled
-    local is_enabled=false
-    if [[ "$repo_status" == "enabled" ]]; then
-        is_enabled=true
-    fi
-    
-    # Use baseurl if available, otherwise use mirrors URL
-    local final_url=""
-    if [[ -n "$repo_url" ]]; then
-        # Extract first URL if multiple are listed
-        final_url=$(echo "$repo_url" | head -n 1 | awk '{print $1}')
-    elif [[ -n "$repo_mirrors" ]]; then
-        final_url="$repo_mirrors"
-    fi
-    
-    # Skip if we don't have any URL
-    if [[ -z "$final_url" ]]; then
-        return
-    fi
-    
-    # Determine if repository uses HTTPS
-    local is_secure=false
-    if [[ "$final_url" =~ ^https:// ]]; then
-        is_secure=true
-    fi
-    
-    # Generate repository name if not provided
-    if [[ -z "$repo_name" ]]; then
-        repo_name="$repo_id"
-    fi
-    
-    # Clean up repository name and URL - escape quotes and backslashes
-    repo_name=$(echo "$repo_name" | sed 's/\\/\\\\/g' | sed 's/"/\\"/g')
-    final_url=$(echo "$final_url" | sed 's/\\/\\\\/g' | sed 's/"/\\"/g')
-    
-    # Add to JSON
-    if [[ "$_first_ref" == true ]]; then
-        _first_ref=false
-    else
-        _repos_ref+=","
-    fi
-    
-    _repos_ref+="{\"name\":\"$repo_name\",\"url\":\"$final_url\",\"distribution\":\"$OS_VERSION\",\"components\":\"main\",\"repoType\":\"rpm\",\"isEnabled\":$is_enabled,\"isSecure\":$is_secure}"
+    # This is a simplified implementation - would need more work for full YUM support
+    # For now, return empty for non-APT systems
 }
 
 # Get package information based on OS
@@ -697,11 +566,11 @@ get_package_info() {
         "ubuntu"|"debian")
             get_apt_packages packages_json first
             ;;
-        "centos"|"rhel"|"fedora"|"ol"|"rocky")
+        "centos"|"rhel"|"fedora")
             get_yum_packages packages_json first
             ;;
         *)
-            warning "Unsupported OS type: $OS_TYPE - returning empty package list"
+            error "Unsupported OS type: $OS_TYPE"
             ;;
     esac
     
@@ -714,24 +583,8 @@ get_apt_packages() {
     local -n packages_ref=$1
     local -n first_ref=$2
     
-    # Update package lists with retry logic for lock conflicts
-    local retry_count=0
-    local max_retries=3
-    local retry_delay=5
-    
-    while [[ $retry_count -lt $max_retries ]]; do
-        if apt-get update -qq 2>/dev/null; then
-            break
-        else
-            retry_count=$((retry_count + 1))
-            if [[ $retry_count -lt $max_retries ]]; then
-                warning "APT lock detected, retrying in ${retry_delay} seconds... (attempt $retry_count/$max_retries)"
-                sleep $retry_delay
-            else
-                warning "APT lock persists after $max_retries attempts, continuing without update..."
-            fi
-        fi
-    done
+    # Update package lists (use apt-get for older distros; quieter output)
+    apt-get update -qq
     
     # Determine upgradable packages using apt-get simulation (compatible with Ubuntu 18.04)
     # Example line format:
@@ -751,11 +604,6 @@ get_apt_packages() {
                 is_security_update=true
             fi
             
-            # Escape JSON special characters in package data
-            package_name=$(echo "$package_name" | sed 's/"/\\"/g' | sed 's/\\/\\\\/g')
-            current_version=$(echo "$current_version" | sed 's/"/\\"/g' | sed 's/\\/\\\\/g')
-            available_version=$(echo "$available_version" | sed 's/"/\\"/g' | sed 's/\\/\\\\/g')
-            
             if [[ "$first_ref" == true ]]; then
                 first_ref=false
             else
@@ -767,16 +615,12 @@ get_apt_packages() {
     done <<< "$upgradable_sim"
     
     # Get installed packages that are up to date
-    local installed=$(dpkg-query -W -f='${Package} ${Version}\n')
+    local installed=$(dpkg-query -W -f='${Package} ${Version}\n' | head -100)
     
     while IFS=' ' read -r package_name version; do
         if [[ -n "$package_name" && -n "$version" ]]; then
             # Check if this package is not in the upgrade list
-            if ! echo "$upgradable_sim" | grep -q "^Inst $package_name "; then
-                # Escape JSON special characters in package data
-                package_name=$(echo "$package_name" | sed 's/"/\\"/g' | sed 's/\\/\\\\/g')
-                version=$(echo "$version" | sed 's/"/\\"/g' | sed 's/\\/\\\\/g')
-                
+            if ! echo "$upgradable" | grep -q "^$package_name/"; then
                 if [[ "$first_ref" == true ]]; then
                     first_ref=false
                 else
@@ -842,7 +686,7 @@ get_yum_packages() {
     done <<< "$upgradable"
     
     # Get some installed packages that are up to date
-    local installed=$($package_manager list installed 2>/dev/null | grep -v "^Loaded" | grep -v "^Installed")
+    local installed=$($package_manager list installed 2>/dev/null | grep -v "^Loaded" | grep -v "^Installed" | head -100)
     
     while IFS= read -r line; do
         # Skip empty lines
@@ -1005,9 +849,6 @@ get_system_info() {
 send_update() {
     load_credentials
     
-    # Track execution start time
-    local start_time=$(date +%s.%N)
-    
     # Verify datetime before proceeding
     if ! verify_datetime; then
         warning "Datetime verification failed, but continuing with update..."
@@ -1020,26 +861,10 @@ send_update() {
     local network_json=$(get_network_info)
     local system_json=$(get_system_info)
     
-    # Validate JSON before sending
-    if ! echo "$packages_json" | jq empty 2>/dev/null; then
-        error "Invalid packages JSON generated: $packages_json"
-    fi
-    
-    if ! echo "$repositories_json" | jq empty 2>/dev/null; then
-        error "Invalid repositories JSON generated: $repositories_json"
-    fi
-    
     info "Sending update to PatchMon server..."
     
     # Merge all JSON objects into one
     local merged_json=$(echo "$hardware_json $network_json $system_json" | jq -s '.[0] * .[1] * .[2]')
-    # Get machine ID
-    local machine_id=$(get_machine_id)
-    
-    # Calculate execution time (in seconds with decimals)
-    local end_time=$(date +%s.%N)
-    local execution_time=$(echo "$end_time - $start_time" | bc)
-    
     # Create the base payload and merge with system info
     local base_payload=$(cat <<EOF
 {
@@ -1050,9 +875,7 @@ send_update() {
     "hostname": "$HOSTNAME",
     "ip": "$IP_ADDRESS",
     "architecture": "$ARCHITECTURE",
-    "agentVersion": "$AGENT_VERSION",
-    "machineId": "$machine_id",
-    "executionTime": $execution_time
+    "agentVersion": "$AGENT_VERSION"
 }
 EOF
 )
@@ -1060,27 +883,15 @@ EOF
     # Merge the base payload with the system information
     local payload=$(echo "$base_payload $merged_json" | jq -s '.[0] * .[1]')
     
-    # Write payload to temporary file to avoid "Argument list too long" error
-    local temp_payload_file=$(mktemp)
-    echo "$payload" > "$temp_payload_file"
-    
-    # Debug: Show payload size
-    local payload_size=$(wc -c < "$temp_payload_file")
-    echo -e "${BLUE}ℹ️  📊 Payload size: $payload_size bytes${NC}"
     
     local response=$(curl $CURL_FLAGS -X POST \
         -H "Content-Type: application/json" \
         -H "X-API-ID: $API_ID" \
         -H "X-API-KEY: $API_KEY" \
-        -d @"$temp_payload_file" \
-        "$PATCHMON_SERVER/api/$API_VERSION/hosts/update" 2>&1)
+        -d "$payload" \
+        "$PATCHMON_SERVER/api/$API_VERSION/hosts/update")
     
-    local curl_exit_code=$?
-    
-    # Clean up temporary file
-    rm -f "$temp_payload_file"
-    
-    if [[ $curl_exit_code -eq 0 ]]; then
+    if [[ $? -eq 0 ]]; then
         if echo "$response" | grep -q "success"; then
             local packages_count=$(echo "$response" | grep -o '"packagesProcessed":[0-9]*' | cut -d':' -f2)
             success "Update sent successfully (${packages_count} packages processed)"
@@ -1116,7 +927,7 @@ EOF
             error "Update failed: $response"
         fi
     else
-        error "Failed to send update (curl exit code: $curl_exit_code): $response"
+        error "Failed to send update"
     fi
 }
 

agents/patchmon_install.sh

@@ -109,39 +109,14 @@ cleanup_old_files() {
 # Run cleanup at start
 cleanup_old_files
 
-# Generate or retrieve machine ID
-get_machine_id() {
-    # Try multiple sources for machine ID
-    if [[ -f /etc/machine-id ]]; then
-        cat /etc/machine-id
-    elif [[ -f /var/lib/dbus/machine-id ]]; then
-        cat /var/lib/dbus/machine-id
-    else
-        # Fallback: generate from hardware info (less ideal but works)
-        echo "patchmon-$(cat /sys/class/dmi/id/product_uuid 2>/dev/null || cat /proc/sys/kernel/random/uuid)"
-    fi
-}
-
 # Parse arguments from environment (passed via HTTP headers)
 if [[ -z "$PATCHMON_URL" ]] || [[ -z "$API_ID" ]] || [[ -z "$API_KEY" ]]; then
     error "Missing required parameters. This script should be called via the PatchMon web interface."
 fi
 
-# Check if --force flag is set (for bypassing broken packages)
-FORCE_INSTALL="${FORCE_INSTALL:-false}"
-if [[ "$*" == *"--force"* ]] || [[ "$FORCE_INSTALL" == "true" ]]; then
-    FORCE_INSTALL="true"
-    warning "⚠️  Force mode enabled - will bypass broken packages"
-fi
-
-# Get unique machine ID for this host
-MACHINE_ID=$(get_machine_id)
-export MACHINE_ID
-
 info "🚀 Starting PatchMon Agent Installation..."
 info "📋 Server: $PATCHMON_URL"
 info "🔑 API ID: ${API_ID:0:16}..."
-info "🆔 Machine ID: ${MACHINE_ID:0:16}..."
 
 # Display diagnostic information
 echo ""
@@ -156,88 +131,16 @@ echo ""
 info "📦 Installing required dependencies..."
 echo ""
 
-# Function to check if a command exists
-command_exists() {
-    command -v "$1" >/dev/null 2>&1
-}
-
-# Function to install packages with error handling
-install_apt_packages() {
-    local packages=("$@")
-    local missing_packages=()
-    
-    # Check which packages are missing
-    for pkg in "${packages[@]}"; do
-        if ! command_exists "$pkg"; then
-            missing_packages+=("$pkg")
-        fi
-    done
-    
-    if [ ${#missing_packages[@]} -eq 0 ]; then
-        success "All required packages are already installed"
-        return 0
-    fi
-    
-    info "Need to install: ${missing_packages[*]}"
-    
-    # Build apt-get command based on force mode
-    local apt_cmd="apt-get install ${missing_packages[*]} -y"
-    
-    if [[ "$FORCE_INSTALL" == "true" ]]; then
-        info "Using force mode - bypassing broken packages..."
-        apt_cmd="$apt_cmd -o APT::Get::Fix-Broken=false -o DPkg::Options::=\"--force-confold\" -o DPkg::Options::=\"--force-confdef\""
-    fi
-    
-    # Try to install packages
-    if eval "$apt_cmd" 2>&1 | tee /tmp/patchmon_apt_install.log; then
-        success "Packages installed successfully"
-        return 0
-    else
-        warning "Package installation encountered issues, checking if required tools are available..."
-        
-        # Verify critical dependencies are actually available
-        local all_ok=true
-        for pkg in "${packages[@]}"; do
-            if ! command_exists "$pkg"; then
-                if [[ "$FORCE_INSTALL" == "true" ]]; then
-                    error "Critical dependency '$pkg' is not available even with --force. Please install manually."
-                else
-                    error "Critical dependency '$pkg' is not available. Try again with --force flag or install manually: apt-get install $pkg"
-                fi
-                all_ok=false
-            fi
-        done
-        
-        if $all_ok; then
-            success "All required tools are available despite installation warnings"
-            return 0
-        else
-            return 1
-        fi
-    fi
-}
-
 # Detect package manager and install jq and curl
 if command -v apt-get >/dev/null 2>&1; then
     # Debian/Ubuntu
     info "Detected apt-get (Debian/Ubuntu)"
     echo ""
-    
-    # Check for broken packages
-    if dpkg -l | grep -q "^iH\|^iF" 2>/dev/null; then
-        if [[ "$FORCE_INSTALL" == "true" ]]; then
-            warning "Detected broken packages on system - force mode will work around them"
-        else
-            warning "⚠️  Broken packages detected on system"
-            warning "If installation fails, retry with: curl -s {URL}/api/v1/hosts/install --force -H ..."
-        fi
-    fi
-    
     info "Updating package lists..."
-    apt-get update || true
+    apt-get update
     echo ""
     info "Installing jq, curl, and bc..."
-    install_apt_packages jq curl bc
+    apt-get install jq curl bc -y
 elif command -v yum >/dev/null 2>&1; then
     # CentOS/RHEL 7
     info "Detected yum (CentOS/RHEL 7)"
@@ -358,33 +261,6 @@ if [[ -f "/var/log/patchmon-agent.log" ]]; then
 fi
 
 # Step 4: Test the configuration
-# Check if this machine is already enrolled
-info "🔍 Checking if machine is already enrolled..."
-existing_check=$(curl $CURL_FLAGS -s -X POST \
-    -H "X-API-ID: $API_ID" \
-    -H "X-API-KEY: $API_KEY" \
-    -H "Content-Type: application/json" \
-    -d "{\"machine_id\": \"$MACHINE_ID\"}" \
-    "$PATCHMON_URL/api/v1/hosts/check-machine-id" \
-    -w "\n%{http_code}" 2>&1)
-
-http_code=$(echo "$existing_check" | tail -n 1)
-response_body=$(echo "$existing_check" | sed '$d')
-
-if [[ "$http_code" == "200" ]]; then
-    already_enrolled=$(echo "$response_body" | jq -r '.exists' 2>/dev/null || echo "false")
-    if [[ "$already_enrolled" == "true" ]]; then
-        warning "⚠️  This machine is already enrolled in PatchMon"
-        info "Machine ID: $MACHINE_ID"
-        info "Existing host: $(echo "$response_body" | jq -r '.host.friendly_name' 2>/dev/null)"
-        info ""
-        info "The agent will be reinstalled/updated with existing credentials."
-        echo ""
-    else
-        success "✅ Machine not yet enrolled - proceeding with installation"
-    fi
-fi
-
 info "🧪 Testing API credentials and connectivity..."
 if /usr/local/bin/patchmon-agent.sh test; then
     success "✅ TEST: API credentials are valid and server is reachable"

agents/proxmox_auto_enroll.sh

@@ -4,7 +4,7 @@ set -eo pipefail  # Exit on error, pipe failures (removed -u as we handle unset
 # Trap to catch errors only (not normal exits)
 trap 'echo "[ERROR] Script failed at line $LINENO with exit code $?"' ERR
 
-SCRIPT_VERSION="2.0.0"
+SCRIPT_VERSION="1.1.1"
 echo "[DEBUG] Script Version: $SCRIPT_VERSION ($(date +%Y-%m-%d\ %H:%M:%S))"
 
 # =============================================================================
@@ -33,7 +33,6 @@ HOST_PREFIX="${HOST_PREFIX:-}"
 SKIP_STOPPED="${SKIP_STOPPED:-true}"
 PARALLEL_INSTALL="${PARALLEL_INSTALL:-false}"
 MAX_PARALLEL="${MAX_PARALLEL:-5}"
-FORCE_INSTALL="${FORCE_INSTALL:-false}"
 
 # ===== COLOR OUTPUT =====
 RED='\033[0;31m'
@@ -116,9 +115,6 @@ failed_count=0
 
 # Track containers with dpkg errors for later recovery
 declare -A dpkg_error_containers
-
-# Track all failed containers for summary
-declare -A failed_containers
 info "Statistics initialized"
 
 # ===== PROCESS CONTAINERS =====
@@ -152,16 +148,12 @@ while IFS= read -r line; do
     hostname=$(timeout 5 pct exec "$vmid" -- hostname 2>/dev/null </dev/null || echo "$name")
     ip_address=$(timeout 5 pct exec "$vmid" -- hostname -I 2>/dev/null </dev/null | awk '{print $1}' || echo "unknown")
     os_info=$(timeout 5 pct exec "$vmid" -- cat /etc/os-release 2>/dev/null </dev/null | grep "^PRETTY_NAME=" | cut -d'"' -f2 || echo "unknown")
-    
-    # Get machine ID from container
-    machine_id=$(timeout 5 pct exec "$vmid" -- bash -c "cat /etc/machine-id 2>/dev/null || cat /var/lib/dbus/machine-id 2>/dev/null || echo 'proxmox-lxc-$vmid-'$(cat /proc/sys/kernel/random/uuid)" </dev/null 2>/dev/null || echo "proxmox-lxc-$vmid-unknown")
 
     friendly_name="${HOST_PREFIX}${hostname}"
 
     info "  Hostname: $hostname"
     info "  IP Address: $ip_address"
     info "  OS: $os_info"
-    info "  Machine ID: ${machine_id:0:16}..."
 
     if [[ "$DRY_RUN" == "true" ]]; then
         info "  [DRY RUN] Would enroll: $friendly_name"
@@ -179,7 +171,6 @@ while IFS= read -r line; do
         -H "Content-Type: application/json" \
         -d "{
             \"friendly_name\": \"$friendly_name\",
-            \"machine_id\": \"$machine_id\",
             \"metadata\": {
                 \"vmid\": \"$vmid\",
                 \"proxmox_node\": \"$(hostname)\",
@@ -203,54 +194,9 @@ while IFS= read -r line; do
 
         info "  ✓ Host enrolled successfully: $api_id"
 
-        # Ensure curl is installed in the container
-        info "  Checking for curl in container..."
-        curl_check=$(timeout 10 pct exec "$vmid" -- bash -c "command -v curl >/dev/null 2>&1 && echo 'installed' || echo 'missing'" 2>/dev/null </dev/null || echo "error")
-        
-        if [[ "$curl_check" == "missing" ]]; then
-            info "  Installing curl in container..."
-            
-            # Detect package manager and install curl
-            curl_install_output=$(timeout 60 pct exec "$vmid" -- bash -c "
-                if command -v apt-get >/dev/null 2>&1; then
-                    export DEBIAN_FRONTEND=noninteractive
-                    apt-get update -qq && apt-get install -y -qq curl
-                elif command -v yum >/dev/null 2>&1; then
-                    yum install -y -q curl
-                elif command -v dnf >/dev/null 2>&1; then
-                    dnf install -y -q curl
-                elif command -v apk >/dev/null 2>&1; then
-                    apk add --no-cache curl
-                else
-                    echo 'ERROR: No supported package manager found'
-                    exit 1
-                fi
-            " 2>&1 </dev/null) || true
-            
-            if [[ "$curl_install_output" == *"ERROR: No supported package manager"* ]]; then
-                warn "  ✗ Could not install curl - no supported package manager found"
-                failed_containers["$vmid"]="$friendly_name|No package manager for curl|$curl_install_output"
-                ((failed_count++)) || true
-                echo ""
-                sleep 1
-                continue
-            else
-                info "  ✓ curl installed successfully"
-            fi
-        else
-            info "  ✓ curl already installed"
-        fi
-
         # Install PatchMon agent in container
         info "  Installing PatchMon agent..."
         
-        # Build install URL with force flag if enabled
-        install_url="$PATCHMON_URL/api/v1/hosts/install"
-        if [[ "$FORCE_INSTALL" == "true" ]]; then
-            install_url="$install_url?force=true"
-            info "  Using force mode - will bypass broken packages"
-        fi
-        
         # Reset exit code for this container
         install_exit_code=0
         
@@ -261,7 +207,7 @@ while IFS= read -r line; do
                 -H \"X-API-ID: $api_id\" \
                 -H \"X-API-KEY: $api_key\" \
                 -o patchmon-install.sh \
-                '$install_url' && \
+                '$PATCHMON_URL/api/v1/hosts/install' && \
             bash patchmon-install.sh && \
             rm -f patchmon-install.sh
         " 2>&1 </dev/null) || install_exit_code=$?
@@ -273,20 +219,14 @@ while IFS= read -r line; do
         elif [[ $install_exit_code -eq 124 ]]; then
             warn "  ⏱ Agent installation timed out (>180s) in $friendly_name"
             info "  Install output: $install_output"
-            # Store failure details
-            failed_containers["$vmid"]="$friendly_name|Timeout (>180s)|$install_output"
             ((failed_count++)) || true
         else
             # Check if it's a dpkg error
             if [[ "$install_output" == *"dpkg was interrupted"* ]] || [[ "$install_output" == *"dpkg --configure -a"* ]]; then
                 warn "  ⚠ Failed due to dpkg error in $friendly_name (can be fixed)"
                 dpkg_error_containers["$vmid"]="$friendly_name:$api_id:$api_key"
-                # Store failure details
-                failed_containers["$vmid"]="$friendly_name|dpkg error|$install_output"
             else
                 warn "  ✗ Failed to install agent in $friendly_name (exit: $install_exit_code)"
-                # Store failure details
-                failed_containers["$vmid"]="$friendly_name|Exit code $install_exit_code|$install_output"
             fi
             info "  Install output: $install_output"
             ((failed_count++)) || true
@@ -297,12 +237,10 @@ while IFS= read -r line; do
         ((skipped_count++)) || true
     elif [[ "$http_code" == "429" ]]; then
         error "  ✗ Rate limit exceeded - maximum hosts per day reached"
-        failed_containers["$vmid"]="$friendly_name|Rate limit exceeded|$body"
         ((failed_count++)) || true
     else
         error "  ✗ Failed to enroll $friendly_name - HTTP $http_code"
         debug "  Response: $body"
-        failed_containers["$vmid"]="$friendly_name|HTTP $http_code enrollment failed|$body"
         ((failed_count++)) || true
     fi
 
@@ -323,32 +261,6 @@ info "Skipped:                $skipped_count"
 info "Failed:                 $failed_count"
 echo ""
 
-# ===== FAILURE DETAILS =====
-if [[ ${#failed_containers[@]} -gt 0 ]]; then
-    echo "╔═══════════════════════════════════════════════════════════════╗"
-    echo "║                     FAILURE DETAILS                           ║"
-    echo "╚═══════════════════════════════════════════════════════════════╝"
-    echo ""
-    
-    for vmid in "${!failed_containers[@]}"; do
-        IFS='|' read -r name reason output <<< "${failed_containers[$vmid]}"
-        
-        warn "Container $vmid: $name"
-        info "  Reason: $reason"
-        info "  Last 5 lines of output:"
-        
-        # Get last 5 lines of output
-        last_5_lines=$(echo "$output" | tail -n 5)
-        
-        # Display each line with proper indentation
-        while IFS= read -r line; do
-            echo "    $line"
-        done <<< "$last_5_lines"
-        
-        echo ""
-    done
-fi
-
 if [[ "$DRY_RUN" == "true" ]]; then
     warn "This was a DRY RUN - no actual changes were made"
     warn "Set DRY_RUN=false to perform actual enrollment"

backend/env.example

@@ -1,7 +1,5 @@
 # Database Configuration
 DATABASE_URL="postgresql://patchmon_user:p@tchm0n_p@55@localhost:5432/patchmon_db"
-PM_DB_CONN_MAX_ATTEMPTS=30
-PM_DB_CONN_WAIT_INTERVAL=2
 
 # Server Configuration
 PORT=3001
@@ -31,8 +29,3 @@ JWT_SECRET=your-secure-random-secret-key-change-this-in-production
 JWT_EXPIRES_IN=1h
 JWT_REFRESH_EXPIRES_IN=7d
 SESSION_INACTIVITY_TIMEOUT_MINUTES=30
-
-# TFA Configuration
-TFA_REMEMBER_ME_EXPIRES_IN=30d
-TFA_MAX_REMEMBER_SESSIONS=5
-TFA_SUSPICIOUS_ACTIVITY_THRESHOLD=3

backend/prisma/migrations/20251004090459_add_machine_id_to_hosts/migration.sql

@@ -1,20 +0,0 @@
--- Add machine_id column as nullable first
-ALTER TABLE "hosts" ADD COLUMN "machine_id" TEXT;
-
--- Generate machine_ids for existing hosts using their API ID as a fallback
-UPDATE "hosts" SET "machine_id" = 'migrated-' || "api_id" WHERE "machine_id" IS NULL;
-
--- Remove the unique constraint from friendly_name
-ALTER TABLE "hosts" DROP CONSTRAINT IF EXISTS "hosts_friendly_name_key";
-
--- Also drop the unique index if it exists (constraint and index can exist separately)
-DROP INDEX IF EXISTS "hosts_friendly_name_key";
-
--- Now make machine_id NOT NULL and add unique constraint
-ALTER TABLE "hosts" ALTER COLUMN "machine_id" SET NOT NULL;
-ALTER TABLE "hosts" ADD CONSTRAINT "hosts_machine_id_key" UNIQUE ("machine_id");
-
--- Create indexes for better query performance
-CREATE INDEX "hosts_machine_id_idx" ON "hosts"("machine_id");
-CREATE INDEX "hosts_friendly_name_idx" ON "hosts"("friendly_name");
-

backend/prisma/migrations/20251004221657_add_logo_fields_to_settings/migration.sql

@@ -1,4 +0,0 @@
--- AddLogoFieldsToSettings
-ALTER TABLE "settings" ADD COLUMN "logo_dark" VARCHAR(255) DEFAULT '/assets/logo_dark.png';
-ALTER TABLE "settings" ADD COLUMN "logo_light" VARCHAR(255) DEFAULT '/assets/logo_light.png';
-ALTER TABLE "settings" ADD COLUMN "favicon" VARCHAR(255) DEFAULT '/assets/logo_square.svg';

backend/prisma/migrations/20251006001639_add_tfa_remember_me_fields/migration.sql

@@ -1,6 +0,0 @@
--- Add TFA remember me fields to user_sessions table
-ALTER TABLE "user_sessions" ADD COLUMN "tfa_remember_me" BOOLEAN NOT NULL DEFAULT false;
-ALTER TABLE "user_sessions" ADD COLUMN "tfa_bypass_until" TIMESTAMP(3);
-
--- Create index for TFA bypass until field for efficient querying
-CREATE INDEX "user_sessions_tfa_bypass_until_idx" ON "user_sessions"("tfa_bypass_until");

backend/prisma/migrations/20251006002023_add_security_fields_to_sessions/migration.sql

@@ -1,7 +0,0 @@
--- Add security fields to user_sessions table for production-ready remember me
-ALTER TABLE "user_sessions" ADD COLUMN "device_fingerprint" TEXT;
-ALTER TABLE "user_sessions" ADD COLUMN "login_count" INTEGER NOT NULL DEFAULT 1;
-ALTER TABLE "user_sessions" ADD COLUMN "last_login_ip" TEXT;
-
--- Create index for device fingerprint for efficient querying
-CREATE INDEX "user_sessions_device_fingerprint_idx" ON "user_sessions"("device_fingerprint");

backend/prisma/migrations/20251007000000_add_total_packages_to_history/migration.sql

@@ -1,3 +0,0 @@
--- AlterTable
-ALTER TABLE "update_history" ADD COLUMN "total_packages" INTEGER;
-

backend/prisma/migrations/20251007000001_add_performance_metrics_to_history/migration.sql

@@ -1,4 +0,0 @@
--- AlterTable
-ALTER TABLE "update_history" ADD COLUMN "payload_size_kb" DOUBLE PRECISION;
-ALTER TABLE "update_history" ADD COLUMN "execution_time" DOUBLE PRECISION;
-

backend/prisma/migrations/add_host_packages_indexes/migration.sql

@@ -1,30 +0,0 @@
--- Add indexes to host_packages table for performance optimization
--- These indexes will dramatically speed up queries filtering by host_id, package_id, needs_update, and is_security_update
-
--- Index for queries filtering by host_id (very common - used when viewing packages for a specific host)
-CREATE INDEX IF NOT EXISTS "host_packages_host_id_idx" ON "host_packages"("host_id");
-
--- Index for queries filtering by package_id (used when finding hosts for a specific package)
-CREATE INDEX IF NOT EXISTS "host_packages_package_id_idx" ON "host_packages"("package_id");
-
--- Index for queries filtering by needs_update (used when finding outdated packages)
-CREATE INDEX IF NOT EXISTS "host_packages_needs_update_idx" ON "host_packages"("needs_update");
-
--- Index for queries filtering by is_security_update (used when finding security updates)
-CREATE INDEX IF NOT EXISTS "host_packages_is_security_update_idx" ON "host_packages"("is_security_update");
-
--- Composite index for the most common query pattern: host_id + needs_update
--- This is optimal for "show me outdated packages for this host"
-CREATE INDEX IF NOT EXISTS "host_packages_host_id_needs_update_idx" ON "host_packages"("host_id", "needs_update");
-
--- Composite index for host_id + needs_update + is_security_update
--- This is optimal for "show me security updates for this host"
-CREATE INDEX IF NOT EXISTS "host_packages_host_id_needs_update_security_idx" ON "host_packages"("host_id", "needs_update", "is_security_update");
-
--- Index for queries filtering by package_id + needs_update
--- This is optimal for "show me hosts where this package needs updates"
-CREATE INDEX IF NOT EXISTS "host_packages_package_id_needs_update_idx" ON "host_packages"("package_id", "needs_update");
-
--- Index on last_checked for cleanup/maintenance queries
-CREATE INDEX IF NOT EXISTS "host_packages_last_checked_idx" ON "host_packages"("last_checked");
-

backend/prisma/schema.prisma

@@ -44,14 +44,6 @@ model host_packages {
   packages           packages @relation(fields: [package_id], references: [id], onDelete: Cascade)
 
   @@unique([host_id, package_id])
-  @@index([host_id])
-  @@index([package_id])
-  @@index([needs_update])
-  @@index([is_security_update])
-  @@index([host_id, needs_update])
-  @@index([host_id, needs_update, is_security_update])
-  @@index([package_id, needs_update])
-  @@index([last_checked])
 }
 
 model host_repositories {
@@ -68,8 +60,7 @@ model host_repositories {
 
 model hosts {
   id                 String              @id
-  machine_id         String              @unique
-  friendly_name      String
+  friendly_name      String              @unique
   ip                 String?
   os_type            String
   os_version         String
@@ -101,10 +92,6 @@ model hosts {
   host_repositories  host_repositories[]
   host_groups        host_groups?        @relation(fields: [host_group_id], references: [id])
   update_history     update_history[]
-
-  @@index([machine_id])
-  @@index([friendly_name])
-  @@index([hostname])
 }
 
 model packages {
@@ -116,9 +103,6 @@ model packages {
   created_at     DateTime        @default(now())
   updated_at     DateTime
   host_packages  host_packages[]
-
-  @@index([name])
-  @@index([category])
 }
 
 model repositories {
@@ -175,23 +159,17 @@ model settings {
   signup_enabled    Boolean   @default(false)
   default_user_role String    @default("user")
   ignore_ssl_self_signed Boolean @default(false)
-  logo_dark         String?   @default("/assets/logo_dark.png")
-  logo_light        String?   @default("/assets/logo_light.png")
-  favicon           String?   @default("/assets/logo_square.svg")
 }
 
 model update_history {
-  id              String   @id
-  host_id         String
-  packages_count  Int
-  security_count  Int
-  total_packages  Int?
-  payload_size_kb Float?
-  execution_time  Float?
-  timestamp       DateTime @default(now())
-  status          String   @default("success")
-  error_message   String?
-  hosts           hosts    @relation(fields: [host_id], references: [id], onDelete: Cascade)
+  id             String   @id
+  host_id        String
+  packages_count Int
+  security_count Int
+  timestamp      DateTime @default(now())
+  status         String   @default("success")
+  error_message  String?
+  hosts          hosts    @relation(fields: [host_id], references: [id], onDelete: Cascade)
 }
 
 model users {
@@ -221,22 +199,15 @@ model user_sessions {
   access_token_hash String?
   ip_address        String?
   user_agent        String?
-  device_fingerprint String?
   last_activity     DateTime @default(now())
   expires_at        DateTime
   created_at        DateTime @default(now())
   is_revoked        Boolean  @default(false)
-  tfa_remember_me   Boolean  @default(false)
-  tfa_bypass_until  DateTime?
-  login_count       Int      @default(1)
-  last_login_ip     String?
   users             users    @relation(fields: [user_id], references: [id], onDelete: Cascade)
 
   @@index([user_id])
   @@index([refresh_token])
   @@index([expires_at])
-  @@index([tfa_bypass_until])
-  @@index([device_fingerprint])
 }
 
 model auto_enrollment_tokens {

backend/src/middleware/auth.js

@@ -3,7 +3,6 @@ const { PrismaClient } = require("@prisma/client");
 const {
 	validate_session,
 	update_session_activity,
-	is_tfa_bypassed,
 } = require("../utils/session_manager");
 
 const prisma = new PrismaClient();
@@ -19,10 +18,10 @@ const authenticateToken = async (req, res, next) => {
 		}
 
 		// Verify token
-		if (!process.env.JWT_SECRET) {
-			throw new Error("JWT_SECRET environment variable is required");
-		}
-		const decoded = jwt.verify(token, process.env.JWT_SECRET);
+		const decoded = jwt.verify(
+			token,
+			process.env.JWT_SECRET || "your-secret-key",
+		);
 
 		// Validate session and check inactivity timeout
 		const validation = await validate_session(decoded.sessionId, token);
@@ -47,9 +46,6 @@ const authenticateToken = async (req, res, next) => {
 		// Update session activity timestamp
 		await update_session_activity(decoded.sessionId);
 
-		// Check if TFA is bypassed for this session
-		const tfa_bypassed = await is_tfa_bypassed(decoded.sessionId);
-
 		// Update last login (only on successful authentication)
 		await prisma.users.update({
 			where: { id: validation.user.id },
@@ -61,7 +57,6 @@ const authenticateToken = async (req, res, next) => {
 
 		req.user = validation.user;
 		req.session_id = decoded.sessionId;
-		req.tfa_bypassed = tfa_bypassed;
 		next();
 	} catch (error) {
 		if (error.name === "JsonWebTokenError") {
@@ -90,10 +85,10 @@ const optionalAuth = async (req, _res, next) => {
 		const token = authHeader?.split(" ")[1];
 
 		if (token) {
-			if (!process.env.JWT_SECRET) {
-				throw new Error("JWT_SECRET environment variable is required");
-			}
-			const decoded = jwt.verify(token, process.env.JWT_SECRET);
+			const decoded = jwt.verify(
+				token,
+				process.env.JWT_SECRET || "your-secret-key",
+			);
 			const user = await prisma.users.findUnique({
 				where: { id: decoded.userId },
 				select: {
@@ -119,33 +114,8 @@ const optionalAuth = async (req, _res, next) => {
 	}
 };
 
-// Middleware to check if TFA is required for sensitive operations
-const requireTfaIfEnabled = async (req, res, next) => {
-	try {
-		// Check if user has TFA enabled
-		const user = await prisma.users.findUnique({
-			where: { id: req.user.id },
-			select: { tfa_enabled: true },
-		});
-
-		// If TFA is enabled and not bypassed, require TFA verification
-		if (user?.tfa_enabled && !req.tfa_bypassed) {
-			return res.status(403).json({
-				error: "Two-factor authentication required for this operation",
-				requires_tfa: true,
-			});
-		}
-
-		next();
-	} catch (error) {
-		console.error("TFA requirement check error:", error);
-		return res.status(500).json({ error: "Authentication check failed" });
-	}
-};
-
 module.exports = {
 	authenticateToken,
 	requireAdmin,
 	optionalAuth,
-	requireTfaIfEnabled,
 };

backend/src/routes/authRoutes.js

@@ -17,65 +17,12 @@ const {
 	refresh_access_token,
 	revoke_session,
 	revoke_all_user_sessions,
+	get_user_sessions,
 } = require("../utils/session_manager");
 
 const router = express.Router();
 const prisma = new PrismaClient();
 
-/**
- * Parse user agent string to extract browser and OS info
- */
-function parse_user_agent(user_agent) {
-	if (!user_agent)
-		return { browser: "Unknown", os: "Unknown", device: "Unknown" };
-
-	const ua = user_agent.toLowerCase();
-
-	// Browser detection
-	let browser = "Unknown";
-	if (ua.includes("chrome") && !ua.includes("edg")) browser = "Chrome";
-	else if (ua.includes("firefox")) browser = "Firefox";
-	else if (ua.includes("safari") && !ua.includes("chrome")) browser = "Safari";
-	else if (ua.includes("edg")) browser = "Edge";
-	else if (ua.includes("opera")) browser = "Opera";
-
-	// OS detection
-	let os = "Unknown";
-	if (ua.includes("windows")) os = "Windows";
-	else if (ua.includes("macintosh") || ua.includes("mac os")) os = "macOS";
-	else if (ua.includes("linux")) os = "Linux";
-	else if (ua.includes("android")) os = "Android";
-	else if (ua.includes("iphone") || ua.includes("ipad")) os = "iOS";
-
-	// Device type
-	let device = "Desktop";
-	if (ua.includes("mobile")) device = "Mobile";
-	else if (ua.includes("tablet") || ua.includes("ipad")) device = "Tablet";
-
-	return { browser, os, device };
-}
-
-/**
- * Get basic location info from IP (simplified - in production you'd use a service)
- */
-function get_location_from_ip(ip) {
-	if (!ip) return { country: "Unknown", city: "Unknown" };
-
-	// For localhost/private IPs
-	if (
-		ip === "127.0.0.1" ||
-		ip === "::1" ||
-		ip.startsWith("192.168.") ||
-		ip.startsWith("10.")
-	) {
-		return { country: "Local", city: "Local Network" };
-	}
-
-	// In a real implementation, you'd use a service like MaxMind GeoIP2
-	// For now, return unknown for external IPs
-	return { country: "Unknown", city: "Unknown" };
-}
-
 // Check if any admin users exist (for first-time setup)
 router.get("/check-admin-users", async (_req, res) => {
 	try {
@@ -209,10 +156,7 @@ router.post(
 
 // Generate JWT token
 const generateToken = (userId) => {
-	if (!process.env.JWT_SECRET) {
-		throw new Error("JWT_SECRET environment variable is required");
-	}
-	return jwt.sign({ userId }, process.env.JWT_SECRET, {
+	return jwt.sign({ userId }, process.env.JWT_SECRET || "your-secret-key", {
 		expiresIn: process.env.JWT_EXPIRES_IN || "24h",
 	});
 };
@@ -229,8 +173,6 @@ router.get(
 					id: true,
 					username: true,
 					email: true,
-					first_name: true,
-					last_name: true,
 					role: true,
 					is_active: true,
 					last_login: true,
@@ -369,14 +311,6 @@ router.put(
 			.isLength({ min: 3 })
 			.withMessage("Username must be at least 3 characters"),
 		body("email").optional().isEmail().withMessage("Valid email is required"),
-		body("first_name")
-			.optional()
-			.isLength({ min: 1 })
-			.withMessage("First name must be at least 1 character"),
-		body("last_name")
-			.optional()
-			.isLength({ min: 1 })
-			.withMessage("Last name must be at least 1 character"),
 		body("role")
 			.optional()
 			.custom(async (value) => {
@@ -389,10 +323,10 @@ router.put(
 				}
 				return true;
 			}),
-		body("is_active")
+		body("isActive")
 			.optional()
 			.isBoolean()
-			.withMessage("is_active must be a boolean"),
+			.withMessage("isActive must be a boolean"),
 	],
 	async (req, res) => {
 		try {
@@ -403,16 +337,13 @@ router.put(
 				return res.status(400).json({ errors: errors.array() });
 			}
 
-			const { username, email, first_name, last_name, role, is_active } =
-				req.body;
+			const { username, email, role, isActive } = req.body;
 			const updateData = {};
 
 			if (username) updateData.username = username;
 			if (email) updateData.email = email;
-			if (first_name !== undefined) updateData.first_name = first_name || null;
-			if (last_name !== undefined) updateData.last_name = last_name || null;
 			if (role) updateData.role = role;
-			if (typeof is_active === "boolean") updateData.is_active = is_active;
+			if (typeof isActive === "boolean") updateData.is_active = isActive;
 
 			// Check if user exists
 			const existingUser = await prisma.users.findUnique({
@@ -447,7 +378,7 @@ router.put(
 			}
 
 			// Prevent deactivating the last admin
-			if (is_active === false && existingUser.role === "admin") {
+			if (isActive === false && existingUser.role === "admin") {
 				const adminCount = await prisma.users.count({
 					where: {
 						role: "admin",
@@ -470,8 +401,6 @@ router.put(
 					id: true,
 					username: true,
 					email: true,
-					first_name: true,
-					last_name: true,
 					role: true,
 					is_active: true,
 					last_login: true,
@@ -818,8 +747,6 @@ router.post(
 					id: user.id,
 					username: user.username,
 					email: user.email,
-					first_name: user.first_name,
-					last_name: user.last_name,
 					role: user.role,
 					is_active: user.is_active,
 					last_login: user.last_login,
@@ -843,10 +770,6 @@ router.post(
 			.isLength({ min: 6, max: 6 })
 			.withMessage("Token must be 6 digits"),
 		body("token").isNumeric().withMessage("Token must contain only numbers"),
-		body("remember_me")
-			.optional()
-			.isBoolean()
-			.withMessage("Remember me must be a boolean"),
 	],
 	async (req, res) => {
 		try {
@@ -855,7 +778,7 @@ router.post(
 				return res.status(400).json({ errors: errors.array() });
 			}
 
-			const { username, token, remember_me = false } = req.body;
+			const { username, token } = req.body;
 
 			// Find user
 			const user = await prisma.users.findFirst({
@@ -924,20 +847,13 @@ router.post(
 			// Create session with access and refresh tokens
 			const ip_address = req.ip || req.connection.remoteAddress;
 			const user_agent = req.get("user-agent");
-			const session = await create_session(
-				user.id,
-				ip_address,
-				user_agent,
-				remember_me,
-				req,
-			);
+			const session = await create_session(user.id, ip_address, user_agent);
 
 			res.json({
 				message: "Login successful",
 				token: session.access_token,
 				refresh_token: session.refresh_token,
 				expires_at: session.expires_at,
-				tfa_bypass_until: session.tfa_bypass_until,
 				user: {
 					id: user.id,
 					username: user.username,
@@ -1175,43 +1091,10 @@ router.post(
 // Get user's active sessions
 router.get("/sessions", authenticateToken, async (req, res) => {
 	try {
-		const sessions = await prisma.user_sessions.findMany({
-			where: {
-				user_id: req.user.id,
-				is_revoked: false,
-				expires_at: { gt: new Date() },
-			},
-			select: {
-				id: true,
-				ip_address: true,
-				user_agent: true,
-				device_fingerprint: true,
-				last_activity: true,
-				created_at: true,
-				expires_at: true,
-				tfa_remember_me: true,
-				tfa_bypass_until: true,
-				login_count: true,
-				last_login_ip: true,
-			},
-			orderBy: { last_activity: "desc" },
-		});
-
-		// Enhance sessions with device info
-		const enhanced_sessions = sessions.map((session) => {
-			const is_current_session = session.id === req.session_id;
-			const device_info = parse_user_agent(session.user_agent);
-
-			return {
-				...session,
-				is_current_session,
-				device_info,
-				location_info: get_location_from_ip(session.ip_address),
-			};
-		});
+		const sessions = await get_user_sessions(req.user.id);
 
 		res.json({
-			sessions: enhanced_sessions,
+			sessions: sessions,
 		});
 	} catch (error) {
 		console.error("Get sessions error:", error);
@@ -1233,11 +1116,6 @@ router.delete("/sessions/:session_id", authenticateToken, async (req, res) => {
 			return res.status(404).json({ error: "Session not found" });
 		}
 
-		// Don't allow revoking the current session
-		if (session_id === req.session_id) {
-			return res.status(400).json({ error: "Cannot revoke current session" });
-		}
-
 		await revoke_session(session_id);
 
 		res.json({
@@ -1249,25 +1127,4 @@ router.delete("/sessions/:session_id", authenticateToken, async (req, res) => {
 	}
 });
 
-// Revoke all sessions except current one
-router.delete("/sessions", authenticateToken, async (req, res) => {
-	try {
-		// Revoke all sessions except the current one
-		await prisma.user_sessions.updateMany({
-			where: {
-				user_id: req.user.id,
-				id: { not: req.session_id },
-			},
-			data: { is_revoked: true },
-		});
-
-		res.json({
-			message: "All other sessions revoked successfully",
-		});
-	} catch (error) {
-		console.error("Revoke all sessions error:", error);
-		res.status(500).json({ error: "Failed to revoke sessions" });
-	}
-});
-
 module.exports = router;

backend/src/routes/autoEnrollmentRoutes.js

@@ -480,17 +480,13 @@ router.get("/proxmox-lxc", async (req, res) => {
 			}
 		} catch (_) {}
 
-		// Check for --force parameter
-		const force_install = req.query.force === "true" || req.query.force === "1";
-
-		// Inject the token credentials, server URL, curl flags, and force flag into the script
+		// Inject the token credentials, server URL, and curl flags into the script
 		const env_vars = `#!/bin/bash
 # PatchMon Auto-Enrollment Configuration (Auto-generated)
 export PATCHMON_URL="${server_url}"
 export AUTO_ENROLLMENT_KEY="${token.token_key}"
 export AUTO_ENROLLMENT_SECRET="${token_secret}"
 export CURL_FLAGS="${curl_flags}"
-export FORCE_INSTALL="${force_install ? "true" : "false"}"
 
 `;
 
@@ -525,9 +521,6 @@ router.post(
 		body("friendly_name")
 			.isLength({ min: 1, max: 255 })
 			.withMessage("Friendly name is required"),
-		body("machine_id")
-			.isLength({ min: 1, max: 255 })
-			.withMessage("Machine ID is required"),
 		body("metadata").optional().isObject(),
 	],
 	async (req, res) => {
@@ -537,15 +530,15 @@ router.post(
 				return res.status(400).json({ errors: errors.array() });
 			}
 
-			const { friendly_name, machine_id } = req.body;
+			const { friendly_name } = req.body;
 
 			// Generate host API credentials
 			const api_id = `patchmon_${crypto.randomBytes(8).toString("hex")}`;
 			const api_key = crypto.randomBytes(32).toString("hex");
 
-			// Check if host already exists by machine_id (not hostname)
+			// Check if host already exists
 			const existing_host = await prisma.hosts.findUnique({
-				where: { machine_id },
+				where: { friendly_name },
 			});
 
 			if (existing_host) {
@@ -553,10 +546,7 @@ router.post(
 					error: "Host already exists",
 					host_id: existing_host.id,
 					api_id: existing_host.api_id,
-					machine_id: existing_host.machine_id,
-					friendly_name: existing_host.friendly_name,
-					message:
-						"This machine is already enrolled in PatchMon (matched by machine ID)",
+					message: "This host is already enrolled in PatchMon",
 				});
 			}
 
@@ -564,7 +554,6 @@ router.post(
 			const host = await prisma.hosts.create({
 				data: {
 					id: uuidv4(),
-					machine_id,
 					friendly_name,
 					os_type: "unknown",
 					os_version: "unknown",
@@ -659,26 +648,17 @@ router.post(
 
 			for (const host_data of hosts) {
 				try {
-					const { friendly_name, machine_id } = host_data;
+					const { friendly_name } = host_data;
 
-					if (!machine_id) {
-						results.failed.push({
-							friendly_name,
-							error: "Machine ID is required",
-						});
-						continue;
-					}
-
-					// Check if host already exists by machine_id
+					// Check if host already exists
 					const existing_host = await prisma.hosts.findUnique({
-						where: { machine_id },
+						where: { friendly_name },
 					});
 
 					if (existing_host) {
 						results.skipped.push({
 							friendly_name,
-							machine_id,
-							reason: "Machine already enrolled",
+							reason: "Already exists",
 							api_id: existing_host.api_id,
 						});
 						continue;
@@ -692,7 +672,6 @@ router.post(
 					const host = await prisma.hosts.create({
 						data: {
 							id: uuidv4(),
-							machine_id,
 							friendly_name,
 							os_type: "unknown",
 							os_version: "unknown",

backend/src/routes/dashboardPreferencesRoutes.js

@@ -130,20 +130,15 @@ async function createDefaultDashboardPreferences(userId, userRole = "user") {
 				requiredPermission: "can_view_packages",
 				order: 13,
 			},
-			{
-				cardId: "packageTrends",
-				requiredPermission: "can_view_packages",
-				order: 14,
-			},
 			{
 				cardId: "recentUsers",
 				requiredPermission: "can_view_users",
-				order: 15,
+				order: 14,
 			},
 			{
 				cardId: "quickStats",
 				requiredPermission: "can_view_dashboard",
-				order: 16,
+				order: 15,
 			},
 		];
 
@@ -346,26 +341,19 @@ router.get("/defaults", authenticateToken, async (_req, res) => {
 				enabled: true,
 				order: 13,
 			},
-			{
-				cardId: "packageTrends",
-				title: "Package Trends",
-				icon: "TrendingUp",
-				enabled: true,
-				order: 14,
-			},
 			{
 				cardId: "recentUsers",
 				title: "Recent Users Logged in",
 				icon: "Users",
 				enabled: true,
-				order: 15,
+				order: 14,
 			},
 			{
 				cardId: "quickStats",
 				title: "Quick Stats",
 				icon: "TrendingUp",
 				enabled: true,
-				order: 16,
+				order: 15,
 			},
 		];
 

backend/src/routes/dashboardRoutes.js

@@ -145,13 +145,9 @@ router.get(
 			];
 
 			// Package update priority distribution
-			const regularUpdates = Math.max(
-				0,
-				totalOutdatedPackages - securityUpdates,
-			);
 			const packageUpdateDistribution = [
 				{ name: "Security", count: securityUpdates },
-				{ name: "Regular", count: regularUpdates },
+				{ name: "Regular", count: totalOutdatedPackages - securityUpdates },
 			];
 
 			res.json({
@@ -189,7 +185,6 @@ router.get("/hosts", authenticateToken, requireViewHosts, async (_req, res) => {
 			// Show all hosts regardless of status
 			select: {
 				id: true,
-				machine_id: true,
 				friendly_name: true,
 				hostname: true,
 				ip: true,
@@ -347,41 +342,32 @@ router.get(
 		try {
 			const { hostId } = req.params;
 
-			const limit = parseInt(req.query.limit, 10) || 10;
-			const offset = parseInt(req.query.offset, 10) || 0;
-
-			const [host, totalHistoryCount] = await Promise.all([
-				prisma.hosts.findUnique({
-					where: { id: hostId },
-					include: {
-						host_groups: {
-							select: {
-								id: true,
-								name: true,
-								color: true,
-							},
-						},
-						host_packages: {
-							include: {
-								packages: true,
-							},
-							orderBy: {
-								needs_update: "desc",
-							},
-						},
-						update_history: {
-							orderBy: {
-								timestamp: "desc",
-							},
-							take: limit,
-							skip: offset,
+			const host = await prisma.hosts.findUnique({
+				where: { id: hostId },
+				include: {
+					host_groups: {
+						select: {
+							id: true,
+							name: true,
+							color: true,
 						},
 					},
-				}),
-				prisma.update_history.count({
-					where: { host_id: hostId },
-				}),
-			]);
+					host_packages: {
+						include: {
+							packages: true,
+						},
+						orderBy: {
+							needs_update: "desc",
+						},
+					},
+					update_history: {
+						orderBy: {
+							timestamp: "desc",
+						},
+						take: 10,
+					},
+				},
+			});
 
 			if (!host) {
 				return res.status(404).json({ error: "Host not found" });
@@ -397,12 +383,6 @@ router.get(
 						(hp) => hp.needs_update && hp.is_security_update,
 					).length,
 				},
-				pagination: {
-					total: totalHistoryCount,
-					limit,
-					offset,
-					hasMore: offset + limit < totalHistoryCount,
-				},
 			};
 
 			res.json(hostWithStats);
@@ -475,132 +455,4 @@ router.get(
 	},
 );
 
-// Get package trends over time
-router.get(
-	"/package-trends",
-	authenticateToken,
-	requireViewHosts,
-	async (req, res) => {
-		try {
-			const { days = 30, hostId } = req.query;
-			const daysInt = parseInt(days, 10);
-
-			// Calculate date range
-			const endDate = new Date();
-			const startDate = new Date();
-			startDate.setDate(endDate.getDate() - daysInt);
-
-			// Build where clause
-			const whereClause = {
-				timestamp: {
-					gte: startDate,
-					lte: endDate,
-				},
-			};
-
-			// Add host filter if specified
-			if (hostId && hostId !== "all" && hostId !== "undefined") {
-				whereClause.host_id = hostId;
-			}
-
-			// Get all update history records in the date range
-			const trendsData = await prisma.update_history.findMany({
-				where: whereClause,
-				select: {
-					timestamp: true,
-					packages_count: true,
-					security_count: true,
-					total_packages: true,
-				},
-				orderBy: {
-					timestamp: "asc",
-				},
-			});
-
-			// Process data to show actual values (no averaging)
-			const processedData = trendsData
-				.filter((record) => record.total_packages !== null) // Only include records with valid data
-				.map((record) => {
-					const date = new Date(record.timestamp);
-					let timeKey;
-
-					if (daysInt <= 1) {
-						// For hourly view, use exact timestamp
-						timeKey = date.toISOString().substring(0, 16); // YYYY-MM-DDTHH:MM
-					} else {
-						// For daily view, group by day
-						timeKey = date.toISOString().split("T")[0]; // YYYY-MM-DD
-					}
-
-					return {
-						timeKey,
-						total_packages: record.total_packages,
-						packages_count: record.packages_count || 0,
-						security_count: record.security_count || 0,
-					};
-				})
-				.sort((a, b) => a.timeKey.localeCompare(b.timeKey)); // Sort by time
-
-			// Get hosts list for dropdown (always fetch for dropdown functionality)
-			const hostsList = await prisma.hosts.findMany({
-				select: {
-					id: true,
-					friendly_name: true,
-					hostname: true,
-				},
-				orderBy: {
-					friendly_name: "asc",
-				},
-			});
-
-			// Format data for chart
-			const chartData = {
-				labels: [],
-				datasets: [
-					{
-						label: "Total Packages",
-						data: [],
-						borderColor: "#3B82F6", // Blue
-						backgroundColor: "rgba(59, 130, 246, 0.1)",
-						tension: 0.4,
-						hidden: true, // Hidden by default
-					},
-					{
-						label: "Outdated Packages",
-						data: [],
-						borderColor: "#F59E0B", // Orange
-						backgroundColor: "rgba(245, 158, 11, 0.1)",
-						tension: 0.4,
-					},
-					{
-						label: "Security Packages",
-						data: [],
-						borderColor: "#EF4444", // Red
-						backgroundColor: "rgba(239, 68, 68, 0.1)",
-						tension: 0.4,
-					},
-				],
-			};
-
-			// Process aggregated data
-			processedData.forEach((item) => {
-				chartData.labels.push(item.timeKey);
-				chartData.datasets[0].data.push(item.total_packages);
-				chartData.datasets[1].data.push(item.packages_count);
-				chartData.datasets[2].data.push(item.security_count);
-			});
-
-			res.json({
-				chartData,
-				hosts: hostsList,
-				period: daysInt,
-				hostId: hostId || "all",
-			});
-		} catch (error) {
-			console.error("Error fetching package trends:", error);
-			res.status(500).json({ error: "Failed to fetch package trends" });
-		}
-	},
-);
-
 module.exports = router;

backend/src/routes/hostRoutes.js

@@ -172,6 +172,15 @@ router.post(
 			// Generate unique API credentials for this host
 			const { apiId, apiKey } = generateApiCredentials();
 
+			// Check if host already exists
+			const existingHost = await prisma.hosts.findUnique({
+				where: { friendly_name: friendly_name },
+			});
+
+			if (existingHost) {
+				return res.status(409).json({ error: "Host already exists" });
+			}
+
 			// If hostGroupId is provided, verify the group exists
 			if (hostGroupId) {
 				const hostGroup = await prisma.host_groups.findUnique({
@@ -187,7 +196,6 @@ router.post(
 			const host = await prisma.hosts.create({
 				data: {
 					id: uuidv4(),
-					machine_id: `pending-${uuidv4()}`, // Temporary placeholder until agent connects with real machine_id
 					friendly_name: friendly_name,
 					os_type: "unknown", // Will be updated when agent connects
 					os_version: "unknown", // Will be updated when agent connects
@@ -313,10 +321,6 @@ router.post(
 			.optional()
 			.isArray()
 			.withMessage("Load average must be an array"),
-		body("machineId")
-			.optional()
-			.isString()
-			.withMessage("Machine ID must be a string"),
 	],
 	async (req, res) => {
 		try {
@@ -325,24 +329,15 @@ router.post(
 				return res.status(400).json({ errors: errors.array() });
 			}
 
-			const { packages, repositories, executionTime } = req.body;
+			const { packages, repositories } = req.body;
 			const host = req.hostRecord;
 
-			// Calculate payload size in KB
-			const payloadSizeBytes = JSON.stringify(req.body).length;
-			const payloadSizeKb = payloadSizeBytes / 1024;
-
 			// Update host last update timestamp and system info if provided
 			const updateData = {
 				last_update: new Date(),
 				updated_at: new Date(),
 			};
 
-			// Update machine_id if provided and current one is a placeholder
-			if (req.body.machineId && host.machine_id.startsWith("pending-")) {
-				updateData.machine_id = req.body.machineId;
-			}
-
 			// Basic system info
 			if (req.body.osType) updateData.os_type = req.body.osType;
 			if (req.body.osVersion) updateData.os_version = req.body.osVersion;
@@ -387,7 +382,6 @@ router.post(
 				(pkg) => pkg.isSecurityUpdate,
 			).length;
 			const updatesCount = packages.filter((pkg) => pkg.needsUpdate).length;
-			const totalPackages = packages.length;
 
 			// Process everything in a single transaction to avoid race conditions
 			await prisma.$transaction(async (tx) => {
@@ -530,9 +524,6 @@ router.post(
 						host_id: host.id,
 						packages_count: updatesCount,
 						security_count: securityCount,
-						total_packages: totalPackages,
-						payload_size_kb: payloadSizeKb,
-						execution_time: executionTime ? parseFloat(executionTime) : null,
 						status: "success",
 					},
 				});
@@ -1135,16 +1126,12 @@ router.get("/install", async (req, res) => {
 			}
 		} catch (_) {}
 
-		// Check for --force parameter
-		const forceInstall = req.query.force === "true" || req.query.force === "1";
-
-		// Inject the API credentials, server URL, curl flags, and force flag into the script
+		// Inject the API credentials, server URL, and curl flags into the script
 		const envVars = `#!/bin/bash
 export PATCHMON_URL="${serverUrl}"
 export API_ID="${host.api_id}"
 export API_KEY="${host.api_key}"
 export CURL_FLAGS="${curlFlags}"
-export FORCE_INSTALL="${forceInstall ? "true" : "false"}"
 
 `;
 
@@ -1164,48 +1151,6 @@ export FORCE_INSTALL="${forceInstall ? "true" : "false"}"
 	}
 });
 
-// Check if machine_id already exists (requires auth)
-router.post("/check-machine-id", validateApiCredentials, async (req, res) => {
-	try {
-		const { machine_id } = req.body;
-
-		if (!machine_id) {
-			return res.status(400).json({
-				error: "machine_id is required",
-			});
-		}
-
-		// Check if a host with this machine_id exists
-		const existing_host = await prisma.hosts.findUnique({
-			where: { machine_id },
-			select: {
-				id: true,
-				friendly_name: true,
-				machine_id: true,
-				api_id: true,
-				status: true,
-				created_at: true,
-			},
-		});
-
-		if (existing_host) {
-			return res.status(200).json({
-				exists: true,
-				host: existing_host,
-				message: "This machine is already enrolled",
-			});
-		}
-
-		return res.status(200).json({
-			exists: false,
-			message: "Machine not yet enrolled",
-		});
-	} catch (error) {
-		console.error("Error checking machine_id:", error);
-		res.status(500).json({ error: "Failed to check machine_id" });
-	}
-});
-
 // Serve the removal script (public endpoint - no authentication required)
 router.get("/remove", async (_req, res) => {
 	try {

backend/src/routes/packageRoutes.js

@@ -14,7 +14,6 @@ router.get("/", async (req, res) => {
 			category = "",
 			needsUpdate = "",
 			isSecurityUpdate = "",
-			host = "",
 		} = req.query;
 
 		const skip = (parseInt(page, 10) - 1) * parseInt(limit, 10);
@@ -34,27 +33,8 @@ router.get("/", async (req, res) => {
 					: {},
 				// Category filter
 				category ? { category: { equals: category } } : {},
-				// Host filter - only return packages installed on the specified host
-				// Combined with update status filters if both are present
-				host
-					? {
-							host_packages: {
-								some: {
-									host_id: host,
-									// If needsUpdate or isSecurityUpdate filters are present, apply them here
-									...(needsUpdate
-										? { needs_update: needsUpdate === "true" }
-										: {}),
-									...(isSecurityUpdate
-										? { is_security_update: isSecurityUpdate === "true" }
-										: {}),
-								},
-							},
-						}
-					: {},
-				// Update status filters (only applied if no host filter)
-				// If host filter is present, these are already applied above
-				!host && needsUpdate
+				// Update status filters
+				needsUpdate
 					? {
 							host_packages: {
 								some: {
@@ -63,7 +43,7 @@ router.get("/", async (req, res) => {
 							},
 						}
 					: {},
-				!host && isSecurityUpdate
+				isSecurityUpdate
 					? {
 							host_packages: {
 								some: {
@@ -87,9 +67,7 @@ router.get("/", async (req, res) => {
 					latest_version: true,
 					created_at: true,
 					_count: {
-						select: {
-							host_packages: true,
-						},
+						host_packages: true,
 					},
 				},
 				skip,
@@ -104,32 +82,24 @@ router.get("/", async (req, res) => {
 		// Get additional stats for each package
 		const packagesWithStats = await Promise.all(
 			packages.map(async (pkg) => {
-				// Build base where clause for this package
-				const baseWhere = { package_id: pkg.id };
-
-				// If host filter is specified, add host filter to all queries
-				const hostWhere = host ? { ...baseWhere, host_id: host } : baseWhere;
-
-				const [updatesCount, securityCount, packageHosts] = await Promise.all([
+				const [updatesCount, securityCount, affectedHosts] = await Promise.all([
 					prisma.host_packages.count({
 						where: {
-							...hostWhere,
+							package_id: pkg.id,
 							needs_update: true,
 						},
 					}),
 					prisma.host_packages.count({
 						where: {
-							...hostWhere,
+							package_id: pkg.id,
 							needs_update: true,
 							is_security_update: true,
 						},
 					}),
 					prisma.host_packages.findMany({
 						where: {
-							...hostWhere,
-							// If host filter is specified, include all packages for that host
-							// Otherwise, only include packages that need updates
-							...(host ? {} : { needs_update: true }),
+							package_id: pkg.id,
+							needs_update: true,
 						},
 						select: {
 							hosts: {
@@ -140,10 +110,6 @@ router.get("/", async (req, res) => {
 									os_type: true,
 								},
 							},
-							current_version: true,
-							available_version: true,
-							needs_update: true,
-							is_security_update: true,
 						},
 						take: 10, // Limit to first 10 for performance
 					}),
@@ -151,18 +117,17 @@ router.get("/", async (req, res) => {
 
 				return {
 					...pkg,
-					packageHostsCount: pkg._count.host_packages,
-					packageHosts: packageHosts.map((hp) => ({
-						hostId: hp.hosts.id,
-						friendlyName: hp.hosts.friendly_name,
-						osType: hp.hosts.os_type,
+					affectedHostsCount: pkg._count.hostPackages,
+					affectedHosts: affectedHosts.map((hp) => ({
+						hostId: hp.host.id,
+						friendlyName: hp.host.friendly_name,
+						osType: hp.host.os_type,
 						currentVersion: hp.current_version,
 						availableVersion: hp.available_version,
-						needsUpdate: hp.needs_update,
 						isSecurityUpdate: hp.is_security_update,
 					})),
 					stats: {
-						totalInstalls: pkg._count.host_packages,
+						totalInstalls: pkg._count.hostPackages,
 						updatesNeeded: updatesCount,
 						securityUpdates: securityCount,
 					},
@@ -195,19 +160,19 @@ router.get("/:packageId", async (req, res) => {
 			include: {
 				host_packages: {
 					include: {
-						hosts: {
+						host: {
 							select: {
 								id: true,
 								hostname: true,
 								ip: true,
-								os_type: true,
-								os_version: true,
-								last_update: true,
+								osType: true,
+								osVersion: true,
+								lastUpdate: true,
 							},
 						},
 					},
 					orderBy: {
-						needs_update: "desc",
+						needsUpdate: "desc",
 					},
 				},
 			},
@@ -220,25 +185,25 @@ router.get("/:packageId", async (req, res) => {
 		// Calculate statistics
 		const stats = {
 			totalInstalls: packageData.host_packages.length,
-			updatesNeeded: packageData.host_packages.filter((hp) => hp.needs_update)
+			updatesNeeded: packageData.host_packages.filter((hp) => hp.needsUpdate)
 				.length,
 			securityUpdates: packageData.host_packages.filter(
-				(hp) => hp.needs_update && hp.is_security_update,
+				(hp) => hp.needsUpdate && hp.isSecurityUpdate,
 			).length,
-			upToDate: packageData.host_packages.filter((hp) => !hp.needs_update)
+			upToDate: packageData.host_packages.filter((hp) => !hp.needsUpdate)
 				.length,
 		};
 
 		// Group by version
 		const versionDistribution = packageData.host_packages.reduce((acc, hp) => {
-			const version = hp.current_version;
+			const version = hp.currentVersion;
 			acc[version] = (acc[version] || 0) + 1;
 			return acc;
 		}, {});
 
 		// Group by OS type
 		const osDistribution = packageData.host_packages.reduce((acc, hp) => {
-			const osType = hp.hosts.os_type;
+			const osType = hp.host.osType;
 			acc[osType] = (acc[osType] || 0) + 1;
 			return acc;
 		}, {});
@@ -265,109 +230,4 @@ router.get("/:packageId", async (req, res) => {
 	}
 });
 
-// Get hosts where a package is installed
-router.get("/:packageId/hosts", async (req, res) => {
-	try {
-		const { packageId } = req.params;
-		const {
-			page = 1,
-			limit = 25,
-			search = "",
-			sortBy = "friendly_name",
-			sortOrder = "asc",
-		} = req.query;
-
-		const offset = (parseInt(page, 10) - 1) * parseInt(limit, 10);
-
-		// Build search conditions
-		const searchConditions = search
-			? {
-					OR: [
-						{
-							hosts: {
-								friendly_name: { contains: search, mode: "insensitive" },
-							},
-						},
-						{ hosts: { hostname: { contains: search, mode: "insensitive" } } },
-						{ current_version: { contains: search, mode: "insensitive" } },
-						{ available_version: { contains: search, mode: "insensitive" } },
-					],
-				}
-			: {};
-
-		// Build sort conditions
-		const orderBy = {};
-		if (
-			sortBy === "friendly_name" ||
-			sortBy === "hostname" ||
-			sortBy === "os_type"
-		) {
-			orderBy.hosts = { [sortBy]: sortOrder };
-		} else if (sortBy === "needs_update") {
-			orderBy[sortBy] = sortOrder;
-		} else {
-			orderBy[sortBy] = sortOrder;
-		}
-
-		// Get total count
-		const totalCount = await prisma.host_packages.count({
-			where: {
-				package_id: packageId,
-				...searchConditions,
-			},
-		});
-
-		// Get paginated results
-		const hostPackages = await prisma.host_packages.findMany({
-			where: {
-				package_id: packageId,
-				...searchConditions,
-			},
-			include: {
-				hosts: {
-					select: {
-						id: true,
-						friendly_name: true,
-						hostname: true,
-						os_type: true,
-						os_version: true,
-						last_update: true,
-					},
-				},
-			},
-			orderBy,
-			skip: offset,
-			take: parseInt(limit, 10),
-		});
-
-		// Transform the data for the frontend
-		const hosts = hostPackages.map((hp) => ({
-			hostId: hp.hosts.id,
-			friendlyName: hp.hosts.friendly_name,
-			hostname: hp.hosts.hostname,
-			osType: hp.hosts.os_type,
-			osVersion: hp.hosts.os_version,
-			lastUpdate: hp.hosts.last_update,
-			currentVersion: hp.current_version,
-			availableVersion: hp.available_version,
-			needsUpdate: hp.needs_update,
-			isSecurityUpdate: hp.is_security_update,
-			lastChecked: hp.last_checked,
-		}));
-
-		res.json({
-			hosts,
-			pagination: {
-				page: parseInt(page, 10),
-				limit: parseInt(limit, 10),
-				total: totalCount,
-				pages: Math.ceil(totalCount / parseInt(limit, 10)),
-			},
-		});
-	} catch (error) {
-		console.error("Error fetching package hosts:", error);
-		res.status(500).json({ error: "Failed to fetch package hosts" });
-	}
-});
-
 module.exports = router;

backend/src/routes/repositoryRoutes.js

@@ -289,77 +289,6 @@ router.get(
 	},
 );
 
-// Delete a specific repository (admin only)
-router.delete(
-	"/:repositoryId",
-	authenticateToken,
-	requireManageHosts,
-	async (req, res) => {
-		try {
-			const { repositoryId } = req.params;
-
-			// Check if repository exists first
-			const existingRepository = await prisma.repositories.findUnique({
-				where: { id: repositoryId },
-				select: {
-					id: true,
-					name: true,
-					url: true,
-					_count: {
-						select: {
-							host_repositories: true,
-						},
-					},
-				},
-			});
-
-			if (!existingRepository) {
-				return res.status(404).json({
-					error: "Repository not found",
-					details: "The repository may have been deleted or does not exist",
-				});
-			}
-
-			// Delete repository and all related data (cascade will handle host_repositories)
-			await prisma.repositories.delete({
-				where: { id: repositoryId },
-			});
-
-			res.json({
-				message: "Repository deleted successfully",
-				deletedRepository: {
-					id: existingRepository.id,
-					name: existingRepository.name,
-					url: existingRepository.url,
-					hostCount: existingRepository._count.host_repositories,
-				},
-			});
-		} catch (error) {
-			console.error("Repository deletion error:", error);
-
-			// Handle specific Prisma errors
-			if (error.code === "P2025") {
-				return res.status(404).json({
-					error: "Repository not found",
-					details: "The repository may have been deleted or does not exist",
-				});
-			}
-
-			if (error.code === "P2003") {
-				return res.status(400).json({
-					error: "Cannot delete repository due to foreign key constraints",
-					details: "The repository has related data that prevents deletion",
-				});
-			}
-
-			res.status(500).json({
-				error: "Failed to delete repository",
-				details: error.message || "An unexpected error occurred",
-			});
-		}
-	},
-);
-
 // Cleanup orphaned repositories (admin only)
 router.delete(
 	"/cleanup/orphaned",

backend/src/routes/searchRoutes.js

@@ -70,12 +70,10 @@ router.get("/", authenticateToken, async (req, res) => {
 							{ hostname: { contains: searchTerm, mode: "insensitive" } },
 							{ friendly_name: { contains: searchTerm, mode: "insensitive" } },
 							{ ip: { contains: searchTerm, mode: "insensitive" } },
-							{ machine_id: { contains: searchTerm, mode: "insensitive" } },
 						],
 					},
 					select: {
 						id: true,
-						machine_id: true,
 						hostname: true,
 						friendly_name: true,
 						ip: true,

backend/src/routes/settingsRoutes.js

@@ -215,18 +215,6 @@ router.put(
 				}
 				return true;
 			}),
-		body("logoDark")
-			.optional()
-			.isLength({ min: 1 })
-			.withMessage("Logo dark path must be a non-empty string"),
-		body("logoLight")
-			.optional()
-			.isLength({ min: 1 })
-			.withMessage("Logo light path must be a non-empty string"),
-		body("favicon")
-			.optional()
-			.isLength({ min: 1 })
-			.withMessage("Favicon path must be a non-empty string"),
 	],
 	async (req, res) => {
 		try {
@@ -248,9 +236,6 @@ router.put(
 				githubRepoUrl,
 				repositoryType,
 				sshKeyPath,
-				logoDark,
-				logoLight,
-				favicon,
 			} = req.body;
 
 			// Get current settings to check for update interval changes
@@ -279,9 +264,6 @@ router.put(
 			if (repositoryType !== undefined)
 				updateData.repository_type = repositoryType;
 			if (sshKeyPath !== undefined) updateData.ssh_key_path = sshKeyPath;
-			if (logoDark !== undefined) updateData.logo_dark = logoDark;
-			if (logoLight !== undefined) updateData.logo_light = logoLight;
-			if (favicon !== undefined) updateData.favicon = favicon;
 
 			const updatedSettings = await updateSettings(
 				currentSettings.id,
@@ -369,175 +351,4 @@ router.get("/auto-update", async (_req, res) => {
 	}
 });
 
-// Upload logo files
-router.post(
-	"/logos/upload",
-	authenticateToken,
-	requireManageSettings,
-	async (req, res) => {
-		try {
-			const { logoType, fileContent, fileName } = req.body;
-
-			if (!logoType || !fileContent) {
-				return res.status(400).json({
-					error: "Logo type and file content are required",
-				});
-			}
-
-			if (!["dark", "light", "favicon"].includes(logoType)) {
-				return res.status(400).json({
-					error: "Logo type must be 'dark', 'light', or 'favicon'",
-				});
-			}
-
-			// Validate file content (basic checks)
-			if (typeof fileContent !== "string") {
-				return res.status(400).json({
-					error: "File content must be a base64 string",
-				});
-			}
-
-			const fs = require("node:fs").promises;
-			const path = require("node:path");
-			const _crypto = require("node:crypto");
-
-			// Create assets directory if it doesn't exist
-			// In development: save to public/assets (served by Vite)
-			// In production: save to dist/assets (served by built app)
-			const isDevelopment = process.env.NODE_ENV !== "production";
-			const assetsDir = isDevelopment
-				? path.join(__dirname, "../../../frontend/public/assets")
-				: path.join(__dirname, "../../../frontend/dist/assets");
-			await fs.mkdir(assetsDir, { recursive: true });
-
-			// Determine file extension and path
-			let fileExtension;
-			let fileName_final;
-
-			if (logoType === "favicon") {
-				fileExtension = ".svg";
-				fileName_final = fileName || "logo_square.svg";
-			} else {
-				// Determine extension from file content or use default
-				if (fileContent.startsWith("data:image/png")) {
-					fileExtension = ".png";
-				} else if (fileContent.startsWith("data:image/svg")) {
-					fileExtension = ".svg";
-				} else if (
-					fileContent.startsWith("data:image/jpeg") ||
-					fileContent.startsWith("data:image/jpg")
-				) {
-					fileExtension = ".jpg";
-				} else {
-					fileExtension = ".png"; // Default to PNG
-				}
-				fileName_final = fileName || `logo_${logoType}${fileExtension}`;
-			}
-
-			const filePath = path.join(assetsDir, fileName_final);
-
-			// Handle base64 data URLs
-			let fileBuffer;
-			if (fileContent.startsWith("data:")) {
-				const base64Data = fileContent.split(",")[1];
-				fileBuffer = Buffer.from(base64Data, "base64");
-			} else {
-				// Assume it's already base64
-				fileBuffer = Buffer.from(fileContent, "base64");
-			}
-
-			// Create backup of existing file
-			try {
-				const backupPath = `${filePath}.backup.${Date.now()}`;
-				await fs.copyFile(filePath, backupPath);
-				console.log(`Created backup: ${backupPath}`);
-			} catch (error) {
-				// Ignore if original doesn't exist
-				if (error.code !== "ENOENT") {
-					console.warn("Failed to create backup:", error.message);
-				}
-			}
-
-			// Write new logo file
-			await fs.writeFile(filePath, fileBuffer);
-
-			// Update settings with new logo path
-			const settings = await getSettings();
-			const logoPath = `/assets/${fileName_final}`;
-
-			const updateData = {};
-			if (logoType === "dark") {
-				updateData.logo_dark = logoPath;
-			} else if (logoType === "light") {
-				updateData.logo_light = logoPath;
-			} else if (logoType === "favicon") {
-				updateData.favicon = logoPath;
-			}
-
-			await updateSettings(settings.id, updateData);
-
-			// Get file stats
-			const stats = await fs.stat(filePath);
-
-			res.json({
-				message: `${logoType} logo uploaded successfully`,
-				fileName: fileName_final,
-				path: logoPath,
-				size: stats.size,
-				sizeFormatted: `${(stats.size / 1024).toFixed(1)} KB`,
-			});
-		} catch (error) {
-			console.error("Upload logo error:", error);
-			res.status(500).json({ error: "Failed to upload logo" });
-		}
-	},
-);
-
-// Reset logo to default
-router.post(
-	"/logos/reset",
-	authenticateToken,
-	requireManageSettings,
-	async (req, res) => {
-		try {
-			const { logoType } = req.body;
-
-			if (!logoType) {
-				return res.status(400).json({
-					error: "Logo type is required",
-				});
-			}
-
-			if (!["dark", "light", "favicon"].includes(logoType)) {
-				return res.status(400).json({
-					error: "Logo type must be 'dark', 'light', or 'favicon'",
-				});
-			}
-
-			// Get current settings
-			const settings = await getSettings();
-
-			// Clear the custom logo path to revert to default
-			const updateData = {};
-			if (logoType === "dark") {
-				updateData.logo_dark = null;
-			} else if (logoType === "light") {
-				updateData.logo_light = null;
-			} else if (logoType === "favicon") {
-				updateData.favicon = null;
-			}
-
-			await updateSettings(settings.id, updateData);
-
-			res.json({
-				message: `${logoType} logo reset to default successfully`,
-				logoType,
-			});
-		} catch (error) {
-			console.error("Reset logo error:", error);
-			res.status(500).json({ error: "Failed to reset logo" });
-		}
-	},
-);
-
 module.exports = router;

backend/src/routes/versionRoutes.js

@@ -2,211 +2,36 @@ const express = require("express");
 const { authenticateToken } = require("../middleware/auth");
 const { requireManageSettings } = require("../middleware/permissions");
 const { PrismaClient } = require("@prisma/client");
+const { exec } = require("node:child_process");
+const { promisify } = require("node:util");
 
 const prisma = new PrismaClient();
-
-// Default GitHub repository URL
-const DEFAULT_GITHUB_REPO = "https://github.com/patchMon/patchmon";
+const execAsync = promisify(exec);
 
 const router = express.Router();
 
-// Helper function to get current version from package.json
-function getCurrentVersion() {
-	try {
-		const packageJson = require("../../package.json");
-		return packageJson?.version || "1.2.7";
-	} catch (packageError) {
-		console.warn(
-			"Could not read version from package.json, using fallback:",
-			packageError.message,
-		);
-		return "1.2.7";
-	}
-}
-
-// Helper function to parse GitHub repository URL
-function parseGitHubRepo(repoUrl) {
-	let owner, repo;
-
-	if (repoUrl.includes("git@github.com:")) {
-		const match = repoUrl.match(/git@github\.com:([^/]+)\/([^/]+)\.git/);
-		if (match) {
-			[, owner, repo] = match;
-		}
-	} else if (repoUrl.includes("github.com/")) {
-		const match = repoUrl.match(/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?$/);
-		if (match) {
-			[, owner, repo] = match;
-		}
-	}
-
-	return { owner, repo };
-}
-
-// Helper function to get latest release from GitHub API
-async function getLatestRelease(owner, repo) {
-	try {
-		const currentVersion = getCurrentVersion();
-		const apiUrl = `https://api.github.com/repos/${owner}/${repo}/releases/latest`;
-
-		const response = await fetch(apiUrl, {
-			method: "GET",
-			headers: {
-				Accept: "application/vnd.github.v3+json",
-				"User-Agent": `PatchMon-Server/${currentVersion}`,
-			},
-		});
-
-		if (!response.ok) {
-			const errorText = await response.text();
-			if (
-				errorText.includes("rate limit") ||
-				errorText.includes("API rate limit")
-			) {
-				throw new Error("GitHub API rate limit exceeded");
-			}
-			throw new Error(
-				`GitHub API error: ${response.status} ${response.statusText}`,
-			);
-		}
-
-		const releaseData = await response.json();
-		return {
-			tagName: releaseData.tag_name,
-			version: releaseData.tag_name.replace("v", ""),
-			publishedAt: releaseData.published_at,
-			htmlUrl: releaseData.html_url,
-		};
-	} catch (error) {
-		console.error("Error fetching latest release:", error.message);
-		throw error; // Re-throw to be caught by the calling function
-	}
-}
-
-// Helper function to get latest commit from main branch
-async function getLatestCommit(owner, repo) {
-	try {
-		const currentVersion = getCurrentVersion();
-		const apiUrl = `https://api.github.com/repos/${owner}/${repo}/commits/main`;
-
-		const response = await fetch(apiUrl, {
-			method: "GET",
-			headers: {
-				Accept: "application/vnd.github.v3+json",
-				"User-Agent": `PatchMon-Server/${currentVersion}`,
-			},
-		});
-
-		if (!response.ok) {
-			const errorText = await response.text();
-			if (
-				errorText.includes("rate limit") ||
-				errorText.includes("API rate limit")
-			) {
-				throw new Error("GitHub API rate limit exceeded");
-			}
-			throw new Error(
-				`GitHub API error: ${response.status} ${response.statusText}`,
-			);
-		}
-
-		const commitData = await response.json();
-		return {
-			sha: commitData.sha,
-			message: commitData.commit.message,
-			author: commitData.commit.author.name,
-			date: commitData.commit.author.date,
-			htmlUrl: commitData.html_url,
-		};
-	} catch (error) {
-		console.error("Error fetching latest commit:", error.message);
-		throw error; // Re-throw to be caught by the calling function
-	}
-}
-
-// Helper function to get commit count difference
-async function getCommitDifference(owner, repo, currentVersion) {
-	try {
-		const currentVersionTag = `v${currentVersion}`;
-		// Compare main branch with the released version tag
-		const apiUrl = `https://api.github.com/repos/${owner}/${repo}/compare/${currentVersionTag}...main`;
-
-		const response = await fetch(apiUrl, {
-			method: "GET",
-			headers: {
-				Accept: "application/vnd.github.v3+json",
-				"User-Agent": `PatchMon-Server/${getCurrentVersion()}`,
-			},
-		});
-
-		if (!response.ok) {
-			const errorText = await response.text();
-			if (
-				errorText.includes("rate limit") ||
-				errorText.includes("API rate limit")
-			) {
-				throw new Error("GitHub API rate limit exceeded");
-			}
-			throw new Error(
-				`GitHub API error: ${response.status} ${response.statusText}`,
-			);
-		}
-
-		const compareData = await response.json();
-		return {
-			commitsBehind: compareData.behind_by || 0, // How many commits main is behind release
-			commitsAhead: compareData.ahead_by || 0, // How many commits main is ahead of release
-			totalCommits: compareData.total_commits || 0,
-			branchInfo: "main branch vs release",
-		};
-	} catch (error) {
-		console.error("Error fetching commit difference:", error.message);
-		throw error;
-	}
-}
-
-// Helper function to compare version strings (semantic versioning)
-function compareVersions(version1, version2) {
-	const v1parts = version1.split(".").map(Number);
-	const v2parts = version2.split(".").map(Number);
-
-	const maxLength = Math.max(v1parts.length, v2parts.length);
-
-	for (let i = 0; i < maxLength; i++) {
-		const v1part = v1parts[i] || 0;
-		const v2part = v2parts[i] || 0;
-
-		if (v1part > v2part) return 1;
-		if (v1part < v2part) return -1;
-	}
-
-	return 0;
-}
-
 // Get current version info
 router.get("/current", authenticateToken, async (_req, res) => {
 	try {
-		const currentVersion = getCurrentVersion();
+		// Read version from package.json dynamically
+		let currentVersion = "1.2.7"; // fallback
 
-		// Get settings with cached update info (no GitHub API calls)
-		const settings = await prisma.settings.findFirst();
-		const githubRepoUrl = settings?.githubRepoUrl || DEFAULT_GITHUB_REPO;
-		const { owner, repo } = parseGitHubRepo(githubRepoUrl);
+		try {
+			const packageJson = require("../../package.json");
+			if (packageJson?.version) {
+				currentVersion = packageJson.version;
+			}
+		} catch (packageError) {
+			console.warn(
+				"Could not read version from package.json, using fallback:",
+				packageError.message,
+			);
+		}
 
-		// Return current version and cached update information
-		// The backend scheduler updates this data periodically
 		res.json({
 			version: currentVersion,
-			latest_version: settings?.latest_version || null,
-			is_update_available: settings?.is_update_available || false,
-			last_update_check: settings?.last_update_check || null,
 			buildDate: new Date().toISOString(),
 			environment: process.env.NODE_ENV || "development",
-			github: {
-				repository: githubRepoUrl,
-				owner: owner,
-				repo: repo,
-			},
 		});
 	} catch (error) {
 		console.error("Error getting current version:", error);
@@ -219,11 +44,119 @@ router.post(
 	"/test-ssh-key",
 	authenticateToken,
 	requireManageSettings,
-	async (_req, res) => {
-		res.status(410).json({
-			error:
-				"SSH key testing has been removed. Using default public repository.",
-		});
+	async (req, res) => {
+		try {
+			const { sshKeyPath, githubRepoUrl } = req.body;
+
+			if (!sshKeyPath || !githubRepoUrl) {
+				return res.status(400).json({
+					error: "SSH key path and GitHub repo URL are required",
+				});
+			}
+
+			// Parse repository info
+			let owner, repo;
+			if (githubRepoUrl.includes("git@github.com:")) {
+				const match = githubRepoUrl.match(
+					/git@github\.com:([^/]+)\/([^/]+)\.git/,
+				);
+				if (match) {
+					[, owner, repo] = match;
+				}
+			} else if (githubRepoUrl.includes("github.com/")) {
+				const match = githubRepoUrl.match(/github\.com\/([^/]+)\/([^/]+)/);
+				if (match) {
+					[, owner, repo] = match;
+				}
+			}
+
+			if (!owner || !repo) {
+				return res.status(400).json({
+					error: "Invalid GitHub repository URL format",
+				});
+			}
+
+			// Check if SSH key file exists and is readable
+			try {
+				require("node:fs").accessSync(sshKeyPath);
+			} catch {
+				return res.status(400).json({
+					error: "SSH key file not found or not accessible",
+					details: `Cannot access: ${sshKeyPath}`,
+					suggestion:
+						"Check the file path and ensure the application has read permissions",
+				});
+			}
+
+			// Test SSH connection to GitHub
+			const sshRepoUrl = `git@github.com:${owner}/${repo}.git`;
+			const env = {
+				...process.env,
+				GIT_SSH_COMMAND: `ssh -i ${sshKeyPath} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -o ConnectTimeout=10`,
+			};
+
+			try {
+				// Test with a simple git command
+				const { stdout } = await execAsync(
+					`git ls-remote --heads ${sshRepoUrl} | head -n 1`,
+					{
+						timeout: 15000,
+						env: env,
+					},
+				);
+
+				if (stdout.trim()) {
+					return res.json({
+						success: true,
+						message: "SSH key is working correctly",
+						details: {
+							sshKeyPath,
+							repository: `${owner}/${repo}`,
+							testResult: "Successfully connected to GitHub",
+						},
+					});
+				} else {
+					return res.status(400).json({
+						error: "SSH connection succeeded but no data returned",
+						suggestion: "Check repository access permissions",
+					});
+				}
+			} catch (sshError) {
+				console.error("SSH test error:", sshError.message);
+
+				if (sshError.message.includes("Permission denied")) {
+					return res.status(403).json({
+						error: "SSH key permission denied",
+						details: "The SSH key exists but GitHub rejected the connection",
+						suggestion:
+							"Verify the SSH key is added to the repository as a deploy key with read access",
+					});
+				} else if (sshError.message.includes("Host key verification failed")) {
+					return res.status(403).json({
+						error: "Host key verification failed",
+						suggestion:
+							"This is normal for first-time connections. The key will be added to known_hosts automatically.",
+					});
+				} else if (sshError.message.includes("Connection timed out")) {
+					return res.status(408).json({
+						error: "Connection timed out",
+						suggestion: "Check your internet connection and GitHub status",
+					});
+				} else {
+					return res.status(500).json({
+						error: "SSH connection failed",
+						details: sshError.message,
+						suggestion: "Check the SSH key format and repository URL",
+					});
+				}
+			}
+		} catch (error) {
+			console.error("SSH key test error:", error);
+			res.status(500).json({
+				error: "Failed to test SSH key",
+				details: error.message,
+			});
+		}
 	},
 );
 
@@ -241,90 +174,24 @@ router.get(
 				return res.status(400).json({ error: "Settings not found" });
 			}
 
-			const currentVersion = getCurrentVersion();
-			const githubRepoUrl = settings.githubRepoUrl || DEFAULT_GITHUB_REPO;
-			const { owner, repo } = parseGitHubRepo(githubRepoUrl);
-
-			let latestRelease = null;
-			let latestCommit = null;
-			let commitDifference = null;
-
-			// Fetch fresh GitHub data if we have valid owner/repo
-			if (owner && repo) {
-				try {
-					const [releaseData, commitData, differenceData] = await Promise.all([
-						getLatestRelease(owner, repo),
-						getLatestCommit(owner, repo),
-						getCommitDifference(owner, repo, currentVersion),
-					]);
-
-					latestRelease = releaseData;
-					latestCommit = commitData;
-					commitDifference = differenceData;
-				} catch (githubError) {
-					console.warn(
-						"Failed to fetch fresh GitHub data:",
-						githubError.message,
-					);
-
-					// Provide fallback data when GitHub API is rate-limited
-					if (
-						githubError.message.includes("rate limit") ||
-						githubError.message.includes("API rate limit")
-					) {
-						console.log("GitHub API rate limited, providing fallback data");
-						latestRelease = {
-							tagName: "v1.2.7",
-							version: "1.2.7",
-							publishedAt: "2025-10-02T17:12:53Z",
-							htmlUrl:
-								"https://github.com/PatchMon/PatchMon/releases/tag/v1.2.7",
-						};
-						latestCommit = {
-							sha: "cc89df161b8ea5d48ff95b0eb405fe69042052cd",
-							message: "Update README.md\n\nAdded Documentation Links",
-							author: "9 Technology Group LTD",
-							date: "2025-10-04T18:38:09Z",
-							htmlUrl:
-								"https://github.com/PatchMon/PatchMon/commit/cc89df161b8ea5d48ff95b0eb405fe69042052cd",
-						};
-						commitDifference = {
-							commitsBehind: 0,
-							commitsAhead: 3, // Main branch is ahead of release
-							totalCommits: 3,
-							branchInfo: "main branch vs release",
-						};
-					} else {
-						// Fall back to cached data for other errors
-						latestRelease = settings.latest_version
-							? {
-									version: settings.latest_version,
-									tagName: `v${settings.latest_version}`,
-								}
-							: null;
-					}
-				}
-			}
-
-			const latestVersion =
-				latestRelease?.version || settings.latest_version || currentVersion;
-			const isUpdateAvailable = latestRelease
-				? compareVersions(latestVersion, currentVersion) > 0
-				: settings.update_available || false;
+			const currentVersion = "1.2.7";
+			const latestVersion = settings.latest_version || currentVersion;
+			const isUpdateAvailable = settings.update_available || false;
+			const lastUpdateCheck = settings.last_update_check || null;
 
 			res.json({
 				currentVersion,
 				latestVersion,
 				isUpdateAvailable,
-				lastUpdateCheck: settings.last_update_check || null,
+				lastUpdateCheck,
 				repositoryType: settings.repository_type || "public",
-				github: {
-					repository: githubRepoUrl,
-					owner: owner,
-					repo: repo,
-					latestRelease: latestRelease,
-					latestCommit: latestCommit,
-					commitDifference: commitDifference,
+				latestRelease: {
+					tagName: latestVersion ? `v${latestVersion}` : null,
+					version: latestVersion,
+					repository: settings.github_repo_url
+						? settings.github_repo_url.split("/").slice(-2).join("/")
+						: null,
+					accessMethod: settings.repository_type === "private" ? "ssh" : "api",
 				},
 			});
 		} catch (error) {

backend/src/server.js

@@ -1,40 +1,4 @@
 require("dotenv").config();
-
-// Validate required environment variables on startup
-function validateEnvironmentVariables() {
-	const requiredVars = {
-		JWT_SECRET: "Required for secure authentication token generation",
-		DATABASE_URL: "Required for database connection",
-	};
-
-	const missing = [];
-
-	// Check required variables
-	for (const [varName, description] of Object.entries(requiredVars)) {
-		if (!process.env[varName]) {
-			missing.push(`${varName}: ${description}`);
-		}
-	}
-
-	// Fail if required variables are missing
-	if (missing.length > 0) {
-		console.error("❌ Missing required environment variables:");
-		for (const error of missing) {
-			console.error(`   - ${error}`);
-		}
-		console.error("");
-		console.error(
-			"Please set these environment variables and restart the application.",
-		);
-		process.exit(1);
-	}
-
-	console.log("✅ Environment variable validation passed");
-}
-
-// Validate environment variables before importing any modules that depend on them
-validateEnvironmentVariables();
-
 const express = require("express");
 const cors = require("cors");
 const helmet = require("helmet");
@@ -674,16 +638,11 @@ async function getPermissionBasedPreferences(userRole) {
 			requiredPermission: "can_view_packages",
 			order: 13,
 		},
-		{
-			cardId: "packageTrends",
-			requiredPermission: "can_view_packages",
-			order: 14,
-		},
-		{ cardId: "recentUsers", requiredPermission: "can_view_users", order: 15 },
+		{ cardId: "recentUsers", requiredPermission: "can_view_users", order: 14 },
 		{
 			cardId: "quickStats",
 			requiredPermission: "can_view_dashboard",
-			order: 16,
+			order: 15,
 		},
 	];
 

backend/src/services/updateScheduler.js

@@ -60,8 +60,13 @@ class UpdateScheduler {
 
 			// Get settings
 			const settings = await prisma.settings.findFirst();
-			const DEFAULT_GITHUB_REPO = "https://github.com/patchMon/patchmon";
-			const repoUrl = settings?.githubRepoUrl || DEFAULT_GITHUB_REPO;
+			if (!settings || !settings.githubRepoUrl) {
+				console.log("⚠️ No GitHub repository configured, skipping update check");
+				return;
+			}
+
+			// Extract owner and repo from GitHub URL
+			const repoUrl = settings.githubRepoUrl;
 			let owner, repo;
 
 			if (repoUrl.includes("git@github.com:")) {
@@ -123,9 +128,9 @@ class UpdateScheduler {
 			await prisma.settings.update({
 				where: { id: settings.id },
 				data: {
-					last_update_check: new Date(),
-					update_available: isUpdateAvailable,
-					latest_version: latestVersion,
+					lastUpdateCheck: new Date(),
+					updateAvailable: isUpdateAvailable,
+					latestVersion: latestVersion,
 				},
 			});
 
@@ -142,8 +147,8 @@ class UpdateScheduler {
 					await prisma.settings.update({
 						where: { id: settings.id },
 						data: {
-							last_update_check: new Date(),
-							update_available: false,
+							lastUpdateCheck: new Date(),
+							updateAvailable: false,
 						},
 					});
 				}
@@ -236,16 +241,6 @@ class UpdateScheduler {
 			});
 
 			if (!response.ok) {
-				const errorText = await response.text();
-				if (
-					errorText.includes("rate limit") ||
-					errorText.includes("API rate limit")
-				) {
-					console.log(
-						"⚠️ GitHub API rate limit exceeded, skipping update check",
-					);
-					return null; // Return null instead of throwing error
-				}
 				throw new Error(
 					`GitHub API error: ${response.status} ${response.statusText}`,
 				);

backend/src/utils/session_manager.js

@@ -1,5 +1,5 @@
 const jwt = require("jsonwebtoken");
-const crypto = require("node:crypto");
+const crypto = require("crypto");
 const { PrismaClient } = require("@prisma/client");
 
 const prisma = new PrismaClient();
@@ -9,22 +9,9 @@ const prisma = new PrismaClient();
  */
 
 // Configuration
-if (!process.env.JWT_SECRET) {
-	throw new Error("JWT_SECRET environment variable is required");
-}
-const JWT_SECRET = process.env.JWT_SECRET;
+const JWT_SECRET = process.env.JWT_SECRET || "your-secret-key";
 const JWT_EXPIRES_IN = process.env.JWT_EXPIRES_IN || "1h";
 const JWT_REFRESH_EXPIRES_IN = process.env.JWT_REFRESH_EXPIRES_IN || "7d";
-const TFA_REMEMBER_ME_EXPIRES_IN =
-	process.env.TFA_REMEMBER_ME_EXPIRES_IN || "30d";
-const TFA_MAX_REMEMBER_SESSIONS = parseInt(
-	process.env.TFA_MAX_REMEMBER_SESSIONS || "5",
-	10,
-);
-const TFA_SUSPICIOUS_ACTIVITY_THRESHOLD = parseInt(
-	process.env.TFA_SUSPICIOUS_ACTIVITY_THRESHOLD || "3",
-	10,
-);
 const INACTIVITY_TIMEOUT_MINUTES = parseInt(
 	process.env.SESSION_INACTIVITY_TIMEOUT_MINUTES || "30",
 	10,
@@ -80,136 +67,16 @@ function parse_expiration(expiration_string) {
 	}
 }
 
-/**
- * Generate device fingerprint from request data
- */
-function generate_device_fingerprint(req) {
-	const components = [
-		req.get("user-agent") || "",
-		req.get("accept-language") || "",
-		req.get("accept-encoding") || "",
-		req.ip || "",
-	];
-
-	// Create a simple hash of device characteristics
-	const fingerprint = crypto
-		.createHash("sha256")
-		.update(components.join("|"))
-		.digest("hex")
-		.substring(0, 32); // Use first 32 chars for storage efficiency
-
-	return fingerprint;
-}
-
-/**
- * Check for suspicious activity patterns
- */
-async function check_suspicious_activity(
-	user_id,
-	_ip_address,
-	_device_fingerprint,
-) {
-	try {
-		// Check for multiple sessions from different IPs in short time
-		const recent_sessions = await prisma.user_sessions.findMany({
-			where: {
-				user_id: user_id,
-				created_at: {
-					gte: new Date(Date.now() - 24 * 60 * 60 * 1000), // Last 24 hours
-				},
-				is_revoked: false,
-			},
-			select: {
-				ip_address: true,
-				device_fingerprint: true,
-				created_at: true,
-			},
-		});
-
-		// Count unique IPs and devices
-		const unique_ips = new Set(recent_sessions.map((s) => s.ip_address));
-		const unique_devices = new Set(
-			recent_sessions.map((s) => s.device_fingerprint),
-		);
-
-		// Flag as suspicious if more than threshold different IPs or devices in 24h
-		if (
-			unique_ips.size > TFA_SUSPICIOUS_ACTIVITY_THRESHOLD ||
-			unique_devices.size > TFA_SUSPICIOUS_ACTIVITY_THRESHOLD
-		) {
-			console.warn(
-				`Suspicious activity detected for user ${user_id}: ${unique_ips.size} IPs, ${unique_devices.size} devices`,
-			);
-			return true;
-		}
-
-		return false;
-	} catch (error) {
-		console.error("Error checking suspicious activity:", error);
-		return false;
-	}
-}
-
 /**
  * Create a new session for user
  */
-async function create_session(
-	user_id,
-	ip_address,
-	user_agent,
-	remember_me = false,
-	req = null,
-) {
+async function create_session(user_id, ip_address, user_agent) {
 	try {
 		const session_id = crypto.randomUUID();
 		const refresh_token = generate_refresh_token();
 		const access_token = generate_access_token(user_id, session_id);
 
-		// Generate device fingerprint if request is available
-		const device_fingerprint = req ? generate_device_fingerprint(req) : null;
-
-		// Check for suspicious activity
-		if (device_fingerprint) {
-			const is_suspicious = await check_suspicious_activity(
-				user_id,
-				ip_address,
-				device_fingerprint,
-			);
-			if (is_suspicious) {
-				console.warn(
-					`Suspicious activity detected for user ${user_id}, session creation may be restricted`,
-				);
-			}
-		}
-
-		// Check session limits for remember me
-		if (remember_me) {
-			const existing_remember_sessions = await prisma.user_sessions.count({
-				where: {
-					user_id: user_id,
-					tfa_remember_me: true,
-					is_revoked: false,
-					expires_at: { gt: new Date() },
-				},
-			});
-
-			// Limit remember me sessions per user
-			if (existing_remember_sessions >= TFA_MAX_REMEMBER_SESSIONS) {
-				throw new Error(
-					"Maximum number of remembered devices reached. Please revoke an existing session first.",
-				);
-			}
-		}
-
-		// Use longer expiration for remember me sessions
-		const expires_at = remember_me
-			? parse_expiration(TFA_REMEMBER_ME_EXPIRES_IN)
-			: parse_expiration(JWT_REFRESH_EXPIRES_IN);
-
-		// Calculate TFA bypass until date for remember me sessions
-		const tfa_bypass_until = remember_me
-			? parse_expiration(TFA_REMEMBER_ME_EXPIRES_IN)
-			: null;
+		const expires_at = parse_expiration(JWT_REFRESH_EXPIRES_IN);
 
 		// Store session in database
 		await prisma.user_sessions.create({
@@ -220,13 +87,8 @@ async function create_session(
 				access_token_hash: hash_token(access_token),
 				ip_address: ip_address || null,
 				user_agent: user_agent || null,
-				device_fingerprint: device_fingerprint,
-				last_login_ip: ip_address || null,
 				last_activity: new Date(),
 				expires_at: expires_at,
-				tfa_remember_me: remember_me,
-				tfa_bypass_until: tfa_bypass_until,
-				login_count: 1,
 			},
 		});
 
@@ -235,7 +97,6 @@ async function create_session(
 			access_token,
 			refresh_token,
 			expires_at,
-			tfa_bypass_until,
 		};
 	} catch (error) {
 		console.error("Error creating session:", error);
@@ -435,8 +296,6 @@ async function get_user_sessions(user_id) {
 				last_activity: true,
 				created_at: true,
 				expires_at: true,
-				tfa_remember_me: true,
-				tfa_bypass_until: true,
 			},
 			orderBy: { last_activity: "desc" },
 		});
@@ -446,42 +305,6 @@ async function get_user_sessions(user_id) {
 	}
 }
 
-/**
- * Check if TFA is bypassed for a session
- */
-async function is_tfa_bypassed(session_id) {
-	try {
-		const session = await prisma.user_sessions.findUnique({
-			where: { id: session_id },
-			select: {
-				tfa_remember_me: true,
-				tfa_bypass_until: true,
-				is_revoked: true,
-				expires_at: true,
-			},
-		});
-
-		if (!session) {
-			return false;
-		}
-
-		// Check if session is still valid
-		if (session.is_revoked || new Date() > session.expires_at) {
-			return false;
-		}
-
-		// Check if TFA is bypassed and still within bypass period
-		if (session.tfa_remember_me && session.tfa_bypass_until) {
-			return new Date() < session.tfa_bypass_until;
-		}
-
-		return false;
-	} catch (error) {
-		console.error("Error checking TFA bypass:", error);
-		return false;
-	}
-}
-
 module.exports = {
 	create_session,
 	validate_session,
@@ -491,9 +314,6 @@ module.exports = {
 	revoke_all_user_sessions,
 	cleanup_expired_sessions,
 	get_user_sessions,
-	is_tfa_bypassed,
-	generate_device_fingerprint,
-	check_suspicious_activity,
 	generate_access_token,
 	INACTIVITY_TIMEOUT_MINUTES,
 };

docker/README.md

@@ -6,59 +6,40 @@ PatchMon is a containerised application that monitors system patches and updates
 
 - **Database**: PostgreSQL 17
 - **Backend**: Node.js API server
-- **Frontend**: React application served via NGINX
+- **Frontend**: React application served via Nginx
 
 ## Images
 
-- **Backend**: [ghcr.io/patchmon/patchmon-backend](https://github.com/patchmon/patchmon.net/pkgs/container/patchmon-backend)
-- **Frontend**: [ghcr.io/patchmon/patchmon-frontend](https://github.com/patchmon/patchmon.net/pkgs/container/patchmon-frontend)
+- **Backend**: [ghcr.io/9technologygroup/patchmon-backend:latest](https://github.com/9technologygroup/patchmon.net/pkgs/container/patchmon-backend)
+- **Frontend**: [ghcr.io/9technologygroup/patchmon-frontend:latest](https://github.com/9technologygroup/patchmon.net/pkgs/container/patchmon-frontend)
 
-### Tags
-
-- `latest`: The latest stable release of PatchMon
-- `x.y.z`: Full version tags (e.g. `1.2.3`) - Use this for exact version pinning.
-- `x.y`: Minor version tags (e.g. `1.2`) - Use this to get the latest patch release in a minor version series.
-- `x`: Major version tags (e.g. `1`) - Use this to get the latest minor and patch release in a major version series.
-- `edge`: The latest development build with the most recent features and fixes. This tag may often be unstable and is intended only for testing and development purposes.
-
-These tags are available for both backend and frontend images as they are versioned together.
+Version tags are also available (e.g. `1.2.3`) for both of these images.
 
 ## Quick Start
 
 ### Production Deployment
 
 1. Download the [Docker Compose file](docker-compose.yml)
-2. Set a database password in the file where it says:
+2. Change the default database password in the file:
    ```yaml
    environment:
-     POSTGRES_PASSWORD: # CREATE A STRONG PASSWORD AND PUT IT HERE
+     POSTGRES_PASSWORD: YOUR_SECURE_PASSWORD_HERE
    ```
-3. Update the corresponding `DATABASE_URL` with your password in the backend service where it says:
+3. Update the corresponding `DATABASE_URL` in the backend service:
    ```yaml
    environment:
-     DATABASE_URL: postgresql://patchmon_user:REPLACE_YOUR_POSTGRES_PASSWORD_HERE@database:5432/patchmon_db
+     DATABASE_URL: postgresql://patchmon_user:YOUR_SECURE_PASSWORD_HERE@database:5432/patchmon_db
    ```
-4. Generate a strong JWT secret. You can do this like so:
-   ```bash
-   openssl rand -hex 64
-   ```
-5. Set a JWT secret in the backend service where it says:
-   ```yaml
-   environment:
-     JWT_SECRET: # CREATE A STRONG SECRET AND PUT IT HERE
-   ```
-6. Configure environment variables (see [Configuration](#configuration) section)
-7. Start the application:
+4. Configure environment variables (see [Configuration](#configuration) section)
+5. Start the application:
    ```bash
    docker compose up -d
    ```
-8. Access the application at `http://localhost:3000`
+6. Access the application at `http://localhost:3000`
 
 ## Updating
 
-By default, the compose file uses the `latest` tag for both backend and frontend images.
-
-This means you can update PatchMon to the latest version as easily as:
+To update PatchMon to the latest version:
 
 ```bash
 docker compose up -d --pull
@@ -71,18 +52,16 @@ This command will:
 
 ### Version-Specific Updates
 
-If you'd like to pin your Docker deployment of PatchMon to a specific version, you can do this in the compose file.
+If you're using specific version tags instead of `latest` in your compose file:
 
-When you do this, updating to a new version requires manually updating the image tags in the compose file yourself:
-
-1. Update the image tags in `docker-compose.yml`. For example:
+1. Update the image tags in your `docker-compose.yml`. For example:
    ```yaml
    services:
      backend:
-       image: ghcr.io/patchmon/patchmon-backend:1.2.3  # Update version here
+       image: ghcr.io/9technologygroup/patchmon-backend:1.2.7  # Update version here
       ...
      frontend:
-       image: ghcr.io/patchmon/patchmon-frontend:1.2.3  # Update version here
+       image: ghcr.io/9technologygroup/patchmon-frontend:1.2.7  # Update version here
       ...
    ```
 
@@ -92,7 +71,7 @@ When you do this, updating to a new version requires manually updating the image
    ```
 
 > [!TIP]
-> Check the [releases page](https://github.com/PatchMon/PatchMon/releases) for version-specific changes and migration notes.
+> Check the [releases page](https://github.com/9technologygroup/patchmon.net/releases) for version-specific changes and migration notes.
 
 ## Configuration
 
@@ -100,68 +79,31 @@ When you do this, updating to a new version requires manually updating the image
 
 #### Database Service
 
-| Variable            | Description       | Default          |
-| ------------------- | ----------------- | ---------------- |
-| `POSTGRES_DB`       | Database name     | `patchmon_db`    |
-| `POSTGRES_USER`     | Database user     | `patchmon_user`  |
-| `POSTGRES_PASSWORD` | Database password | **MUST BE SET!** |
+- `POSTGRES_DB`: Database name (default: `patchmon_db`)
+- `POSTGRES_USER`: Database user (default: `patchmon_user`)
+- `POSTGRES_PASSWORD`: Database password - **MUST BE CHANGED!**
 
 #### Backend Service
 
-##### Database Configuration
-
-| Variable                   | Description                                          | Default                                          |
-| -------------------------- | ---------------------------------------------------- | ------------------------------------------------ |
-| `DATABASE_URL`             | PostgreSQL connection string                         | **MUST BE UPDATED WITH YOUR POSTGRES_PASSWORD!** |
-| `PM_DB_CONN_MAX_ATTEMPTS`  | Maximum database connection attempts                 | `30`                                             |
-| `PM_DB_CONN_WAIT_INTERVAL` | Wait interval between connection attempts in seconds | `2`                                              |
-
-##### Authentication & Security
-
-| Variable                             | Description                                               | Default          |
-| ------------------------------------ | --------------------------------------------------------- | ---------------- |
-| `JWT_SECRET`                         | JWT signing secret - Generate with `openssl rand -hex 64` | **MUST BE SET!** |
-| `JWT_EXPIRES_IN`                     | JWT token expiration time                                 | `1h`             |
-| `JWT_REFRESH_EXPIRES_IN`             | JWT refresh token expiration time                         | `7d`             |
-| `SESSION_INACTIVITY_TIMEOUT_MINUTES` | Session inactivity timeout in minutes                     | `30`             |
-| `DEFAULT_USER_ROLE`                  | Default role for new users                                | `user`           |
-
-##### Server & Network Configuration
-
-| Variable          | Description                                                                                     | Default                 |
-| ----------------- | ----------------------------------------------------------------------------------------------- | ----------------------- |
-| `PORT`            | Backend API port                                                                                | `3001`                  |
-| `SERVER_PROTOCOL` | Frontend server protocol (`http` or `https`)                                                    | `http`                  |
-| `SERVER_HOST`     | Frontend server host                                                                            | `localhost`             |
-| `SERVER_PORT`     | Frontend server port                                                                            | `3000`                  |
-| `CORS_ORIGIN`     | CORS origin URL                                                                                 | `http://localhost:3000` |
-| `ENABLE_HSTS`     | Enable HTTP Strict Transport Security                                                           | `true`                  |
-| `TRUST_PROXY`     | Trust proxy headers - See [Express.js docs](https://expressjs.com/en/guide/behind-proxies.html) | `true`                  |
-
-##### Rate Limiting
-
-| Variable                     | Description                                         | Default  |
-| ---------------------------- | --------------------------------------------------- | -------- |
-| `RATE_LIMIT_WINDOW_MS`       | Rate limiting window in milliseconds                | `900000` |
-| `RATE_LIMIT_MAX`             | Maximum requests per window                         | `5000`   |
-| `AUTH_RATE_LIMIT_WINDOW_MS`  | Authentication rate limiting window in milliseconds | `600000` |
-| `AUTH_RATE_LIMIT_MAX`        | Maximum authentication requests per window          | `500`    |
-| `AGENT_RATE_LIMIT_WINDOW_MS` | Agent API rate limiting window in milliseconds      | `60000`  |
-| `AGENT_RATE_LIMIT_MAX`       | Maximum agent requests per window                   | `1000`   |
-
-##### Logging
-
-| Variable         | Description                                      | Default |
-| ---------------- | ------------------------------------------------ | ------- |
-| `LOG_LEVEL`      | Logging level (`debug`, `info`, `warn`, `error`) | `info`  |
-| `ENABLE_LOGGING` | Enable application logging                       | `true`  |
+- `LOG_LEVEL`: Logging level (`debug`, `info`, `warn`, `error`)
+- `DATABASE_URL`: PostgreSQL connection string
+- `PM_DB_CONN_MAX_ATTEMPTS`: Maximum database connection attempts (default: 30)
+- `PM_DB_CONN_WAIT_INTERVAL`: Wait interval between connection attempts in seconds (default: 2)
+- `SERVER_PROTOCOL`: Frontend server protocol (`http` or `https`)
+- `SERVER_HOST`: Frontend server host (default: `localhost`)
+- `SERVER_PORT`: Frontend server port (default: 3000)
+- `PORT`: Backend API port (default: 3001)
+- `API_VERSION`: API version (default: `v1`)
+- `CORS_ORIGIN`: CORS origin URL
+- `RATE_LIMIT_WINDOW_MS`: Rate limiting window in milliseconds (default: 900000)
+- `RATE_LIMIT_MAX`: Maximum requests per window (default: 100)
+- `ENABLE_HSTS`: Enable HTTP Strict Transport Security (default: true)
+- `TRUST_PROXY`: Trust proxy headers (default: true) - See [Express.js docs](https://expressjs.com/en/guide/behind-proxies.html) for usage.
 
 #### Frontend Service
 
-| Variable       | Description              | Default   |
-| -------------- | ------------------------ | --------- |
-| `BACKEND_HOST` | Backend service hostname | `backend` |
-| `BACKEND_PORT` | Backend service port     | `3001`    |
+- `BACKEND_HOST`: Backend service hostname (default: `backend`)
+- `BACKEND_PORT`: Backend service port (default: 3001)
 
 ### Volumes
 
@@ -187,7 +129,7 @@ For development with live reload and source code mounting:
 
 1. Clone the repository:
    ```bash
-   git clone https://github.com/PatchMon/PatchMon.git
+   git clone https://github.com/9technologygroup/patchmon.net.git
    cd patchmon.net
    ```
 
@@ -261,7 +203,7 @@ The development setup exposes additional ports for debugging:
 
 1. **Initial Setup**: Clone repository and start development environment
    ```bash
-   git clone https://github.com/PatchMon/PatchMon.git
+   git clone https://github.com/9technologygroup/patchmon.net.git
    cd patchmon.net
    docker compose -f docker/docker-compose.dev.yml up -d --build
    ```

docker/backend.Dockerfile

@@ -59,10 +59,7 @@ ENV NODE_ENV=production \
     ENABLE_LOGGING=true \
     LOG_LEVEL=info \
     PM_LOG_TO_CONSOLE=true \
-    PORT=3001 \
-    JWT_EXPIRES_IN=1h \
-    JWT_REFRESH_EXPIRES_IN=7d \
-    SESSION_INACTIVITY_TIMEOUT_MINUTES=30
+    PORT=3001
 
 RUN apk add --no-cache openssl tini curl
 

docker/backend.docker-entrypoint.sh

@@ -8,8 +8,8 @@ log() {
     echo "[$(date +'%Y-%m-%d %H:%M:%S')] $*" >&2
 }
 
-# Copy files from agents_backup to agents if agents directory is empty and no .sh files are present
-if [ -d "/app/agents" ] && [ -z "$(find /app/agents -maxdepth 1 -type f -name '*.sh' | head -n 1)" ]; then
+# Copy files from agents_backup to agents if agents directory is empty
+if [ -d "/app/agents" ] && [ -z "$(ls -A /app/agents 2>/dev/null)" ]; then
     if [ -d "/app/agents_backup" ]; then
         log "Agents directory is empty, copying from backup..."
         cp -r /app/agents_backup/* /app/agents/

docker/docker-compose.dev.yml

@@ -1,13 +1,11 @@
-name: patchmon-dev
-
 services:
   database:
-    image: postgres:18-alpine
+    image: postgres:17-alpine
     restart: unless-stopped
     environment:
       POSTGRES_DB: patchmon_db
       POSTGRES_USER: patchmon_user
-      POSTGRES_PASSWORD: 1NS3CU6E_DEV_D8_PASSW0RD
+      POSTGRES_PASSWORD: INSECURE_REPLACE_ME_PLEASE_INSECURE
     ports:
       - "5432:5432"
     volumes:
@@ -23,17 +21,19 @@ services:
       context: ..
       dockerfile: docker/backend.Dockerfile
       target: development
-      tags: [patchmon-backend:dev]
     restart: unless-stopped
     environment:
       NODE_ENV: development
       LOG_LEVEL: info
-      DATABASE_URL: postgresql://patchmon_user:1NS3CU6E_DEV_D8_PASSW0RD@database:5432/patchmon_db
-      JWT_SECRET: INS3CURE_DEV_7WT_5ECR3T
+      DATABASE_URL: postgresql://patchmon_user:INSECURE_REPLACE_ME_PLEASE_INSECURE@database:5432/patchmon_db
+      PM_DB_CONN_MAX_ATTEMPTS: 30
+      PM_DB_CONN_WAIT_INTERVAL: 2
       SERVER_PROTOCOL: http
       SERVER_HOST: localhost
       SERVER_PORT: 3000
       CORS_ORIGIN: http://localhost:3000
+      RATE_LIMIT_WINDOW_MS: 900000
+      RATE_LIMIT_MAX: 100
     ports:
       - "3001:3001"
     volumes:
@@ -59,7 +59,6 @@ services:
       context: ..
       dockerfile: docker/frontend.Dockerfile
       target: development
-      tags: [patchmon-frontend:dev]
     restart: unless-stopped
     environment:
       BACKEND_HOST: backend

docker/docker-compose.yml

@@ -1,13 +1,11 @@
-name: patchmon
-
 services:
   database:
-    image: postgres:18-alpine
+    image: postgres:17-alpine
     restart: unless-stopped
     environment:
       POSTGRES_DB: patchmon_db
       POSTGRES_USER: patchmon_user
-      POSTGRES_PASSWORD: # CREATE A STRONG PASSWORD AND PUT IT HERE
+      POSTGRES_PASSWORD: INSECURE_REPLACE_ME_PLEASE_INSECURE
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
@@ -17,17 +15,19 @@ services:
       retries: 7
 
   backend:
-    image: ghcr.io/patchmon/patchmon-backend:latest
+    image: ghcr.io/9technologygroup/patchmon-backend:latest
     restart: unless-stopped
-    # See PatchMon Docker README for additional environment variables and configuration instructions
     environment:
       LOG_LEVEL: info
-      DATABASE_URL: postgresql://patchmon_user:REPLACE_YOUR_POSTGRES_PASSWORD_HERE@database:5432/patchmon_db
-      JWT_SECRET: # CREATE A STRONG SECRET AND PUT IT HERE - Generate with 'openssl rand -hex 64'
+      DATABASE_URL: postgresql://patchmon_user:INSECURE_REPLACE_ME_PLEASE_INSECURE@database:5432/patchmon_db
+      PM_DB_CONN_MAX_ATTEMPTS: 30
+      PM_DB_CONN_WAIT_INTERVAL: 2
       SERVER_PROTOCOL: http
       SERVER_HOST: localhost
       SERVER_PORT: 3000
       CORS_ORIGIN: http://localhost:3000
+      RATE_LIMIT_WINDOW_MS: 900000
+      RATE_LIMIT_MAX: 100
     volumes:
       - agent_files:/app/agents
     depends_on:
@@ -35,7 +35,7 @@ services:
         condition: service_healthy
 
   frontend:
-    image: ghcr.io/patchmon/patchmon-frontend:latest
+    image: ghcr.io/9technologygroup/patchmon-frontend:latest
     restart: unless-stopped
     ports:
       - "3000:3000"

frontend/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/assets/favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>PatchMon - Linux Patch Monitoring Dashboard</title>
     <link rel="preconnect" href="https://fonts.googleapis.com">

frontend/public/assets/favicon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="500" zoomAndPan="magnify" viewBox="0 0 375 374.999991" height="500" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><g/><clipPath id="d62632d413"><path d="M 29 28 L 304 28 L 304 350 L 29 350 Z M 29 28 " clip-rule="nonzero"/></clipPath><clipPath id="ecc8b4d8ed"><path d="M 187.496094 -39.996094 L 416.601562 189.105469 L 187.496094 418.207031 L -41.605469 189.105469 Z M 187.496094 -39.996094 " clip-rule="nonzero"/></clipPath><clipPath id="3016db942f"><path d="M 187.496094 -39.996094 L 416.601562 189.105469 L 187.496094 418.207031 L -41.605469 189.105469 Z M 187.496094 -39.996094 " clip-rule="nonzero"/></clipPath><clipPath id="029f8ae6a8"><path d="M 29 28 L 304 28 L 304 350 L 29 350 Z M 29 28 " clip-rule="nonzero"/></clipPath><clipPath id="2d374b5e76"><path d="M 187.496094 -39.996094 L 416.601562 189.105469 L 187.496094 418.207031 L -41.605469 189.105469 Z M 187.496094 -39.996094 " clip-rule="nonzero"/></clipPath><clipPath id="544d823606"><path d="M 187.496094 -39.996094 L 416.601562 189.105469 L 187.496094 418.207031 L -41.605469 189.105469 Z M 187.496094 -39.996094 " clip-rule="nonzero"/></clipPath><clipPath id="b88a276116"><path d="M 187.496094 -39.996094 L 416.601562 189.105469 L 187.496094 418.207031 L -41.605469 189.105469 Z M 187.496094 -39.996094 " clip-rule="nonzero"/></clipPath><clipPath id="98c26e11a4"><rect x="0" width="103" y="0" height="208"/></clipPath></defs><g clip-path="url(#d62632d413)"><g clip-path="url(#ecc8b4d8ed)"><g clip-path="url(#3016db942f)"><path fill="#ff751f" d="M 303.214844 302.761719 C 280.765625 325.214844 252.160156 340.503906 221.015625 346.699219 C 189.875 352.890625 157.59375 349.714844 128.261719 337.5625 C 98.925781 325.410156 73.851562 304.835938 56.210938 278.433594 C 38.570312 252.03125 29.15625 220.992188 29.15625 189.242188 C 29.15625 157.488281 38.570312 126.449219 56.210938 100.050781 C 73.851562 73.648438 98.925781 53.070312 128.261719 40.921875 C 157.59375 28.769531 189.875 25.589844 221.015625 31.785156 C 252.160156 37.980469 280.765625 53.269531 303.214844 75.722656 L 189.695312 189.242188 Z M 303.214844 302.761719 " fill-opacity="1" fill-rule="nonzero"/></g></g></g><g clip-path="url(#029f8ae6a8)"><g clip-path="url(#2d374b5e76)"><g clip-path="url(#544d823606)"><g clip-path="url(#b88a276116)"><path fill="#61b33a" d="M 303.144531 302.550781 C 280.707031 324.988281 252.117188 340.269531 220.996094 346.460938 C 189.875 352.652344 157.613281 349.472656 128.296875 337.332031 C 98.980469 325.1875 73.921875 304.621094 56.292969 278.238281 C 38.664062 251.851562 29.253906 220.832031 29.253906 189.101562 C 29.253906 157.367188 38.664062 126.347656 56.292969 99.964844 C 73.921875 73.578125 98.980469 53.015625 128.296875 40.871094 C 157.613281 28.726562 189.875 25.550781 220.996094 31.742188 C 252.117188 37.929688 280.707031 53.210938 303.144531 75.652344 L 189.695312 189.101562 Z M 303.144531 302.550781 " fill-opacity="1" fill-rule="nonzero"/></g></g></g></g><g transform="matrix(1, 0, 0, 1, 136, 0)"><g clip-path="url(#98c26e11a4)"><g fill="#ff751f" fill-opacity="1"><g transform="translate(0.457164, 116.403543)"><g><path d="M 19.734375 -18.71875 C 19.734375 -21.664062 20.015625 -24.441406 20.578125 -27.046875 C 21.148438 -29.660156 22.0625 -32.210938 23.3125 -34.703125 C 24.5625 -37.203125 26.207031 -39.359375 28.25 -41.171875 C 33.6875 -47.066406 41.285156 -50.015625 51.046875 -50.015625 C 59.210938 -50.015625 66.46875 -46.953125 72.8125 -40.828125 C 79.164062 -34.703125 82.34375 -27.332031 82.34375 -18.71875 C 82.34375 -9.414062 79.28125 -1.925781 73.15625 3.75 C 67.257812 9.644531 59.890625 12.59375 51.046875 12.59375 C 42.648438 12.59375 35.332031 9.472656 29.09375 3.234375 C 22.851562 -3.003906 19.734375 -10.320312 19.734375 -18.71875 Z M 19.734375 -18.71875 "/></g></g></g></g></g></svg>

frontend/src/App.jsx

@@ -1,50 +1,29 @@
-import { lazy, Suspense } from "react";
 import { Route, Routes } from "react-router-dom";
 import FirstTimeAdminSetup from "./components/FirstTimeAdminSetup";
 import Layout from "./components/Layout";
-import LogoProvider from "./components/LogoProvider";
 import ProtectedRoute from "./components/ProtectedRoute";
 import SettingsLayout from "./components/SettingsLayout";
 import { isAuthPhase } from "./constants/authPhases";
 import { AuthProvider, useAuth } from "./contexts/AuthContext";
 import { ThemeProvider } from "./contexts/ThemeContext";
 import { UpdateNotificationProvider } from "./contexts/UpdateNotificationContext";
-
-// Lazy load pages
-const Dashboard = lazy(() => import("./pages/Dashboard"));
-const HostDetail = lazy(() => import("./pages/HostDetail"));
-const Hosts = lazy(() => import("./pages/Hosts"));
-const Login = lazy(() => import("./pages/Login"));
-const PackageDetail = lazy(() => import("./pages/PackageDetail"));
-const Packages = lazy(() => import("./pages/Packages"));
-const Profile = lazy(() => import("./pages/Profile"));
-const Queue = lazy(() => import("./pages/Queue"));
-const Repositories = lazy(() => import("./pages/Repositories"));
-const RepositoryDetail = lazy(() => import("./pages/RepositoryDetail"));
-const AlertChannels = lazy(() => import("./pages/settings/AlertChannels"));
-const Integrations = lazy(() => import("./pages/settings/Integrations"));
-const Notifications = lazy(() => import("./pages/settings/Notifications"));
-const PatchManagement = lazy(() => import("./pages/settings/PatchManagement"));
-const SettingsAgentConfig = lazy(
-	() => import("./pages/settings/SettingsAgentConfig"),
-);
-const SettingsHostGroups = lazy(
-	() => import("./pages/settings/SettingsHostGroups"),
-);
-const SettingsServerConfig = lazy(
-	() => import("./pages/settings/SettingsServerConfig"),
-);
-const SettingsUsers = lazy(() => import("./pages/settings/SettingsUsers"));
-
-// Loading fallback component
-const LoadingFallback = () => (
-	<div className="min-h-screen bg-gradient-to-br from-primary-50 to-secondary-50 dark:from-secondary-900 dark:to-secondary-800 flex items-center justify-center">
-		<div className="text-center">
-			<div className="animate-spin rounded-full h-12 w-12 border-b-2 border-primary-600 mx-auto mb-4"></div>
-			<p className="text-secondary-600 dark:text-secondary-300">Loading...</p>
-		</div>
-	</div>
-);
+import Dashboard from "./pages/Dashboard";
+import HostDetail from "./pages/HostDetail";
+import Hosts from "./pages/Hosts";
+import Login from "./pages/Login";
+import PackageDetail from "./pages/PackageDetail";
+import Packages from "./pages/Packages";
+import Profile from "./pages/Profile";
+import Repositories from "./pages/Repositories";
+import RepositoryDetail from "./pages/RepositoryDetail";
+import AlertChannels from "./pages/settings/AlertChannels";
+import Integrations from "./pages/settings/Integrations";
+import Notifications from "./pages/settings/Notifications";
+import PatchManagement from "./pages/settings/PatchManagement";
+import SettingsAgentConfig from "./pages/settings/SettingsAgentConfig";
+import SettingsHostGroups from "./pages/settings/SettingsHostGroups";
+import SettingsServerConfig from "./pages/settings/SettingsServerConfig";
+import SettingsUsers from "./pages/settings/SettingsUsers";
 
 function AppRoutes() {
 	const { needsFirstTimeSetup, authPhase, isAuthenticated } = useAuth();
@@ -73,297 +52,275 @@ function AppRoutes() {
 	}
 
 	return (
-		<Suspense fallback={<LoadingFallback />}>
-			<Routes>
-				<Route path="/login" element={<Login />} />
-				<Route
-					path="/"
-					element={
-						<ProtectedRoute requirePermission="can_view_dashboard">
-							<Layout>
-								<Dashboard />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/hosts"
-					element={
-						<ProtectedRoute requirePermission="can_view_hosts">
-							<Layout>
-								<Hosts />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/hosts/:hostId"
-					element={
-						<ProtectedRoute requirePermission="can_view_hosts">
-							<Layout>
-								<HostDetail />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/packages"
-					element={
-						<ProtectedRoute requirePermission="can_view_packages">
-							<Layout>
-								<Packages />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/repositories"
-					element={
-						<ProtectedRoute requirePermission="can_view_hosts">
-							<Layout>
-								<Repositories />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/repositories/:repositoryId"
-					element={
-						<ProtectedRoute requirePermission="can_view_hosts">
-							<Layout>
-								<RepositoryDetail />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/queue"
-					element={
-						<ProtectedRoute requirePermission="can_view_hosts">
-							<Layout>
-								<Queue />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/users"
-					element={
-						<ProtectedRoute requirePermission="can_view_users">
-							<Layout>
-								<SettingsUsers />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/permissions"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsUsers />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsServerConfig />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/users"
-					element={
-						<ProtectedRoute requirePermission="can_view_users">
-							<Layout>
-								<SettingsUsers />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/roles"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsUsers />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/profile"
-					element={
-						<ProtectedRoute>
-							<Layout>
-								<SettingsLayout>
-									<Profile />
-								</SettingsLayout>
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/host-groups"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsHostGroups />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/notifications"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsLayout>
-									<Notifications />
-								</SettingsLayout>
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/agent-config"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsAgentConfig />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/agent-config/management"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsAgentConfig />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/server-config"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsServerConfig />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/server-config/version"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsServerConfig />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/alert-channels"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsLayout>
-									<AlertChannels />
-								</SettingsLayout>
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/integrations"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<Integrations />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/patch-management"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<PatchManagement />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/server-url"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsServerConfig />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/server-version"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsServerConfig />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/branding"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsServerConfig />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/settings/agent-version"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsAgentConfig />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/options"
-					element={
-						<ProtectedRoute requirePermission="can_manage_hosts">
-							<Layout>
-								<SettingsHostGroups />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-				<Route
-					path="/packages/:packageId"
-					element={
-						<ProtectedRoute requirePermission="can_view_packages">
-							<Layout>
-								<PackageDetail />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
-			</Routes>
-		</Suspense>
+		<Routes>
+			<Route path="/login" element={<Login />} />
+			<Route
+				path="/"
+				element={
+					<ProtectedRoute requirePermission="can_view_dashboard">
+						<Layout>
+							<Dashboard />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/hosts"
+				element={
+					<ProtectedRoute requirePermission="can_view_hosts">
+						<Layout>
+							<Hosts />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/hosts/:hostId"
+				element={
+					<ProtectedRoute requirePermission="can_view_hosts">
+						<Layout>
+							<HostDetail />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/packages"
+				element={
+					<ProtectedRoute requirePermission="can_view_packages">
+						<Layout>
+							<Packages />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/repositories"
+				element={
+					<ProtectedRoute requirePermission="can_view_hosts">
+						<Layout>
+							<Repositories />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/repositories/:repositoryId"
+				element={
+					<ProtectedRoute requirePermission="can_view_hosts">
+						<Layout>
+							<RepositoryDetail />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/users"
+				element={
+					<ProtectedRoute requirePermission="can_view_users">
+						<Layout>
+							<SettingsUsers />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/permissions"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsUsers />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsServerConfig />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/users"
+				element={
+					<ProtectedRoute requirePermission="can_view_users">
+						<Layout>
+							<SettingsUsers />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/roles"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsUsers />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/profile"
+				element={
+					<ProtectedRoute>
+						<Layout>
+							<SettingsLayout>
+								<Profile />
+							</SettingsLayout>
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/host-groups"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsHostGroups />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/notifications"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsLayout>
+								<Notifications />
+							</SettingsLayout>
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/agent-config"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsAgentConfig />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/agent-config/management"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsAgentConfig />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/server-config"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsServerConfig />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/server-config/version"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsServerConfig />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/alert-channels"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsLayout>
+								<AlertChannels />
+							</SettingsLayout>
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/integrations"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<Integrations />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/patch-management"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<PatchManagement />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/server-url"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsServerConfig />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/server-version"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsServerConfig />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/settings/agent-version"
+				element={
+					<ProtectedRoute requirePermission="can_manage_settings">
+						<Layout>
+							<SettingsAgentConfig />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/options"
+				element={
+					<ProtectedRoute requirePermission="can_manage_hosts">
+						<Layout>
+							<SettingsHostGroups />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+			<Route
+				path="/packages/:packageId"
+				element={
+					<ProtectedRoute requirePermission="can_view_packages">
+						<Layout>
+							<PackageDetail />
+						</Layout>
+					</ProtectedRoute>
+				}
+			/>
+		</Routes>
 	);
 }
 
@@ -372,9 +329,7 @@ function App() {
 		<ThemeProvider>
 			<AuthProvider>
 				<UpdateNotificationProvider>
-					<LogoProvider>
-						<AppRoutes />
-					</LogoProvider>
+					<AppRoutes />
 				</UpdateNotificationProvider>
 			</AuthProvider>
 		</ThemeProvider>

frontend/src/components/DiscordIcon.jsx

@@ -1,16 +0,0 @@
-const DiscordIcon = ({ className = "h-5 w-5" }) => {
-	return (
-		<svg
-			viewBox="0 0 24 24"
-			fill="currentColor"
-			className={className}
-			xmlns="http://www.w3.org/2000/svg"
-			aria-label="Discord"
-		>
-			<title>Discord</title>
-			<path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3933-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189z" />
-		</svg>
-	);
-};
-
-export default DiscordIcon;

frontend/src/components/GlobalSearch.jsx

@@ -250,7 +250,7 @@ const GlobalSearch = () => {
 									<div className="sticky top-0 z-10 bg-secondary-50 px-3 py-1.5 text-xs font-semibold uppercase tracking-wider text-secondary-500 dark:bg-secondary-700 dark:text-secondary-400">
 										Hosts
 									</div>
-									{results.hosts.map((host, _idx) => {
+									{results.hosts.map((host, idx) => {
 										const display = getResultDisplay(host);
 										const globalIdx = navigableResults.findIndex(
 											(r) => r.id === host.id && r.type === "host",
@@ -291,7 +291,7 @@ const GlobalSearch = () => {
 									<div className="sticky top-0 z-10 bg-secondary-50 px-3 py-1.5 text-xs font-semibold uppercase tracking-wider text-secondary-500 dark:bg-secondary-700 dark:text-secondary-400">
 										Packages
 									</div>
-									{results.packages.map((pkg, _idx) => {
+									{results.packages.map((pkg, idx) => {
 										const display = getResultDisplay(pkg);
 										const globalIdx = navigableResults.findIndex(
 											(r) => r.id === pkg.id && r.type === "package",
@@ -338,7 +338,7 @@ const GlobalSearch = () => {
 									<div className="sticky top-0 z-10 bg-secondary-50 px-3 py-1.5 text-xs font-semibold uppercase tracking-wider text-secondary-500 dark:bg-secondary-700 dark:text-secondary-400">
 										Repositories
 									</div>
-									{results.repositories.map((repo, _idx) => {
+									{results.repositories.map((repo, idx) => {
 										const display = getResultDisplay(repo);
 										const globalIdx = navigableResults.findIndex(
 											(r) => r.id === repo.id && r.type === "repository",
@@ -379,7 +379,7 @@ const GlobalSearch = () => {
 									<div className="sticky top-0 z-10 bg-secondary-50 px-3 py-1.5 text-xs font-semibold uppercase tracking-wider text-secondary-500 dark:bg-secondary-700 dark:text-secondary-400">
 										Users
 									</div>
-									{results.users.map((user, _idx) => {
+									{results.users.map((user, idx) => {
 										const display = getResultDisplay(user);
 										const globalIdx = navigableResults.findIndex(
 											(r) => r.id === user.id && r.type === "user",

frontend/src/components/Logo.jsx

@@ -1,44 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { useTheme } from "../contexts/ThemeContext";
-import { settingsAPI } from "../utils/api";
-
-const Logo = ({
-	className = "h-8 w-auto",
-	alt = "PatchMon Logo",
-	...props
-}) => {
-	const { isDark } = useTheme();
-
-	const { data: settings } = useQuery({
-		queryKey: ["settings"],
-		queryFn: () => settingsAPI.get().then((res) => res.data),
-	});
-
-	// Determine which logo to use based on theme
-	const logoSrc = isDark
-		? settings?.logo_dark || "/assets/logo_dark.png"
-		: settings?.logo_light || "/assets/logo_light.png";
-
-	// Add cache-busting parameter using updated_at timestamp
-	const cacheBuster = settings?.updated_at
-		? new Date(settings.updated_at).getTime()
-		: Date.now();
-	const logoSrcWithCache = `${logoSrc}?v=${cacheBuster}`;
-
-	return (
-		<img
-			src={logoSrcWithCache}
-			alt={alt}
-			className={className}
-			onError={(e) => {
-				// Fallback to default logo if custom logo fails to load
-				e.target.src = isDark
-					? "/assets/logo_dark.png"
-					: "/assets/logo_light.png";
-			}}
-			{...props}
-		/>
-	);
-};
-
-export default Logo;

frontend/src/components/LogoProvider.jsx

@@ -1,42 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { useEffect } from "react";
-import { isAuthReady } from "../constants/authPhases";
-import { useAuth } from "../contexts/AuthContext";
-import { settingsAPI } from "../utils/api";
-
-const LogoProvider = ({ children }) => {
-	const { authPhase, isAuthenticated } = useAuth();
-
-	const { data: settings } = useQuery({
-		queryKey: ["settings"],
-		queryFn: () => settingsAPI.get().then((res) => res.data),
-		enabled: isAuthReady(authPhase, isAuthenticated()),
-	});
-
-	useEffect(() => {
-		// Use custom favicon or fallback to default
-		const faviconUrl = settings?.favicon || "/assets/favicon.svg";
-
-		// Add cache-busting parameter using updated_at timestamp
-		const cacheBuster = settings?.updated_at
-			? new Date(settings.updated_at).getTime()
-			: Date.now();
-		const faviconUrlWithCache = `${faviconUrl}?v=${cacheBuster}`;
-
-		// Update favicon
-		const favicon = document.querySelector('link[rel="icon"]');
-		if (favicon) {
-			favicon.href = faviconUrlWithCache;
-		} else {
-			// Create favicon link if it doesn't exist
-			const link = document.createElement("link");
-			link.rel = "icon";
-			link.href = faviconUrlWithCache;
-			document.head.appendChild(link);
-		}
-	}, [settings?.favicon, settings?.updated_at]);
-
-	return children;
-};
-
-export default LogoProvider;

frontend/src/components/SettingsLayout.jsx

@@ -4,7 +4,6 @@ import {
 	ChevronRight,
 	Code,
 	Folder,
-	Image,
 	RefreshCw,
 	Settings,
 	Shield,
@@ -82,7 +81,6 @@ const SettingsLayout = ({ children }) => {
 						name: "Alert Channels",
 						href: "/settings/alert-channels",
 						icon: Bell,
-						comingSoon: true,
 					},
 					{
 						name: "Notifications",
@@ -119,6 +117,7 @@ const SettingsLayout = ({ children }) => {
 						name: "Integrations",
 						href: "/settings/integrations",
 						icon: Wrench,
+						comingSoon: true,
 					},
 				],
 			});
@@ -131,11 +130,6 @@ const SettingsLayout = ({ children }) => {
 						href: "/settings/server-url",
 						icon: Wrench,
 					},
-					{
-						name: "Branding",
-						href: "/settings/branding",
-						icon: Image,
-					},
 					{
 						name: "Server Version",
 						href: "/settings/server-version",

frontend/src/components/settings/BrandingTab.jsx

@@ -1,531 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { AlertCircle, Image, RotateCcw, Upload, X } from "lucide-react";
-import { useState } from "react";
-import { settingsAPI } from "../../utils/api";
-
-const BrandingTab = () => {
-	// Logo management state
-	const [logoUploadState, setLogoUploadState] = useState({
-		dark: { uploading: false, error: null },
-		light: { uploading: false, error: null },
-		favicon: { uploading: false, error: null },
-	});
-	const [showLogoUploadModal, setShowLogoUploadModal] = useState(false);
-	const [selectedLogoType, setSelectedLogoType] = useState("dark");
-
-	const queryClient = useQueryClient();
-
-	// Fetch current settings
-	const {
-		data: settings,
-		isLoading,
-		error,
-	} = useQuery({
-		queryKey: ["settings"],
-		queryFn: () => settingsAPI.get().then((res) => res.data),
-	});
-
-	// Logo upload mutation
-	const uploadLogoMutation = useMutation({
-		mutationFn: ({ logoType, fileContent, fileName }) =>
-			fetch("/api/v1/settings/logos/upload", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					Authorization: `Bearer ${localStorage.getItem("token")}`,
-				},
-				body: JSON.stringify({ logoType, fileContent, fileName }),
-			}).then((res) => res.json()),
-		onSuccess: (_data, variables) => {
-			queryClient.invalidateQueries(["settings"]);
-			setLogoUploadState((prev) => ({
-				...prev,
-				[variables.logoType]: { uploading: false, error: null },
-			}));
-			setShowLogoUploadModal(false);
-		},
-		onError: (error, variables) => {
-			console.error("Upload logo error:", error);
-			setLogoUploadState((prev) => ({
-				...prev,
-				[variables.logoType]: {
-					uploading: false,
-					error: error.message || "Failed to upload logo",
-				},
-			}));
-		},
-	});
-
-	// Logo reset mutation
-	const resetLogoMutation = useMutation({
-		mutationFn: (logoType) =>
-			fetch("/api/v1/settings/logos/reset", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					Authorization: `Bearer ${localStorage.getItem("token")}`,
-				},
-				body: JSON.stringify({ logoType }),
-			}).then((res) => res.json()),
-		onSuccess: () => {
-			queryClient.invalidateQueries(["settings"]);
-		},
-		onError: (error) => {
-			console.error("Reset logo error:", error);
-		},
-	});
-
-	if (isLoading) {
-		return (
-			<div className="flex items-center justify-center h-64">
-				<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary-600"></div>
-			</div>
-		);
-	}
-
-	if (error) {
-		return (
-			<div className="bg-red-50 dark:bg-red-900 border border-red-200 dark:border-red-700 rounded-md p-4">
-				<div className="flex">
-					<AlertCircle className="h-5 w-5 text-red-400 dark:text-red-300" />
-					<div className="ml-3">
-						<h3 className="text-sm font-medium text-red-800 dark:text-red-200">
-							Error loading settings
-						</h3>
-						<p className="mt-1 text-sm text-red-700 dark:text-red-300">
-							{error.response?.data?.error || "Failed to load settings"}
-						</p>
-					</div>
-				</div>
-			</div>
-		);
-	}
-
-	return (
-		<div className="space-y-6">
-			<div className="flex items-center mb-6">
-				<Image className="h-6 w-6 text-primary-600 mr-3" />
-				<h2 className="text-xl font-semibold text-secondary-900 dark:text-white">
-					Logo & Branding
-				</h2>
-			</div>
-			<p className="text-sm text-secondary-500 dark:text-secondary-300 mb-6">
-				Customize your PatchMon installation with custom logos and favicon.
-				These will be displayed throughout the application.
-			</p>
-
-			<div className="grid grid-cols-1 md:grid-cols-3 gap-6">
-				{/* Dark Logo */}
-				<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 border border-secondary-200 dark:border-secondary-600">
-					<h4 className="text-sm font-medium text-secondary-900 dark:text-white mb-4">
-						Dark Logo
-					</h4>
-					<div className="flex items-center justify-center p-4 bg-secondary-50 dark:bg-secondary-700 rounded-lg mb-4">
-						<img
-							src={`${settings?.logo_dark || "/assets/logo_dark.png"}?v=${Date.now()}`}
-							alt="Dark Logo"
-							className="max-h-16 max-w-full object-contain"
-							onError={(e) => {
-								e.target.src = "/assets/logo_dark.png";
-							}}
-						/>
-					</div>
-					<p className="text-xs text-secondary-600 dark:text-secondary-400 mb-4 truncate">
-						{settings?.logo_dark
-							? settings.logo_dark.split("/").pop()
-							: "logo_dark.png (Default)"}
-					</p>
-					<div className="space-y-2">
-						<button
-							type="button"
-							onClick={() => {
-								setSelectedLogoType("dark");
-								setShowLogoUploadModal(true);
-							}}
-							disabled={logoUploadState.dark.uploading}
-							className="w-full btn-outline flex items-center justify-center gap-2"
-						>
-							{logoUploadState.dark.uploading ? (
-								<>
-									<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-current"></div>
-									Uploading...
-								</>
-							) : (
-								<>
-									<Upload className="h-4 w-4" />
-									Upload Dark Logo
-								</>
-							)}
-						</button>
-						{settings?.logo_dark && (
-							<button
-								type="button"
-								onClick={() => resetLogoMutation.mutate("dark")}
-								disabled={resetLogoMutation.isPending}
-								className="w-full btn-outline flex items-center justify-center gap-2 text-orange-600 hover:text-orange-700 border-orange-300 hover:border-orange-400"
-							>
-								<RotateCcw className="h-4 w-4" />
-								Reset to Default
-							</button>
-						)}
-					</div>
-					{logoUploadState.dark.error && (
-						<p className="text-xs text-red-600 dark:text-red-400 mt-2">
-							{logoUploadState.dark.error}
-						</p>
-					)}
-				</div>
-
-				{/* Light Logo */}
-				<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 border border-secondary-200 dark:border-secondary-600">
-					<h4 className="text-sm font-medium text-secondary-900 dark:text-white mb-4">
-						Light Logo
-					</h4>
-					<div className="flex items-center justify-center p-4 bg-secondary-50 dark:bg-secondary-700 rounded-lg mb-4">
-						<img
-							src={`${settings?.logo_light || "/assets/logo_light.png"}?v=${Date.now()}`}
-							alt="Light Logo"
-							className="max-h-16 max-w-full object-contain"
-							onError={(e) => {
-								e.target.src = "/assets/logo_light.png";
-							}}
-						/>
-					</div>
-					<p className="text-xs text-secondary-600 dark:text-secondary-400 mb-4 truncate">
-						{settings?.logo_light
-							? settings.logo_light.split("/").pop()
-							: "logo_light.png (Default)"}
-					</p>
-					<div className="space-y-2">
-						<button
-							type="button"
-							onClick={() => {
-								setSelectedLogoType("light");
-								setShowLogoUploadModal(true);
-							}}
-							disabled={logoUploadState.light.uploading}
-							className="w-full btn-outline flex items-center justify-center gap-2"
-						>
-							{logoUploadState.light.uploading ? (
-								<>
-									<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-current"></div>
-									Uploading...
-								</>
-							) : (
-								<>
-									<Upload className="h-4 w-4" />
-									Upload Light Logo
-								</>
-							)}
-						</button>
-						{settings?.logo_light && (
-							<button
-								type="button"
-								onClick={() => resetLogoMutation.mutate("light")}
-								disabled={resetLogoMutation.isPending}
-								className="w-full btn-outline flex items-center justify-center gap-2 text-orange-600 hover:text-orange-700 border-orange-300 hover:border-orange-400"
-							>
-								<RotateCcw className="h-4 w-4" />
-								Reset to Default
-							</button>
-						)}
-					</div>
-					{logoUploadState.light.error && (
-						<p className="text-xs text-red-600 dark:text-red-400 mt-2">
-							{logoUploadState.light.error}
-						</p>
-					)}
-				</div>
-
-				{/* Favicon */}
-				<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 border border-secondary-200 dark:border-secondary-600">
-					<h4 className="text-sm font-medium text-secondary-900 dark:text-white mb-4">
-						Favicon
-					</h4>
-					<div className="flex items-center justify-center p-4 bg-secondary-50 dark:bg-secondary-700 rounded-lg mb-4">
-						<img
-							src={`${settings?.favicon || "/assets/favicon.svg"}?v=${Date.now()}`}
-							alt="Favicon"
-							className="h-8 w-8 object-contain"
-							onError={(e) => {
-								e.target.src = "/assets/favicon.svg";
-							}}
-						/>
-					</div>
-					<p className="text-xs text-secondary-600 dark:text-secondary-400 mb-4 truncate">
-						{settings?.favicon
-							? settings.favicon.split("/").pop()
-							: "favicon.svg (Default)"}
-					</p>
-					<div className="space-y-2">
-						<button
-							type="button"
-							onClick={() => {
-								setSelectedLogoType("favicon");
-								setShowLogoUploadModal(true);
-							}}
-							disabled={logoUploadState.favicon.uploading}
-							className="w-full btn-outline flex items-center justify-center gap-2"
-						>
-							{logoUploadState.favicon.uploading ? (
-								<>
-									<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-current"></div>
-									Uploading...
-								</>
-							) : (
-								<>
-									<Upload className="h-4 w-4" />
-									Upload Favicon
-								</>
-							)}
-						</button>
-						{settings?.favicon && (
-							<button
-								type="button"
-								onClick={() => resetLogoMutation.mutate("favicon")}
-								disabled={resetLogoMutation.isPending}
-								className="w-full btn-outline flex items-center justify-center gap-2 text-orange-600 hover:text-orange-700 border-orange-300 hover:border-orange-400"
-							>
-								<RotateCcw className="h-4 w-4" />
-								Reset to Default
-							</button>
-						)}
-					</div>
-					{logoUploadState.favicon.error && (
-						<p className="text-xs text-red-600 dark:text-red-400 mt-2">
-							{logoUploadState.favicon.error}
-						</p>
-					)}
-				</div>
-			</div>
-
-			{/* Usage Instructions */}
-			<div className="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-700 rounded-md p-4 mt-6">
-				<div className="flex">
-					<Image className="h-5 w-5 text-blue-400 dark:text-blue-300" />
-					<div className="ml-3">
-						<h3 className="text-sm font-medium text-blue-800 dark:text-blue-200">
-							Logo Usage
-						</h3>
-						<div className="mt-2 text-sm text-blue-700 dark:text-blue-300">
-							<p className="mb-2">
-								These logos are used throughout the application:
-							</p>
-							<ul className="list-disc list-inside space-y-1">
-								<li>
-									<strong>Dark Logo:</strong> Used in dark mode and on light
-									backgrounds
-								</li>
-								<li>
-									<strong>Light Logo:</strong> Used in light mode and on dark
-									backgrounds
-								</li>
-								<li>
-									<strong>Favicon:</strong> Used as the browser tab icon (SVG
-									recommended)
-								</li>
-							</ul>
-							<p className="mt-3 text-xs">
-								<strong>Supported formats:</strong> PNG, JPG, SVG |{" "}
-								<strong>Max size:</strong> 5MB |{" "}
-								<strong>Recommended sizes:</strong> 200x60px for logos, 32x32px
-								for favicon.
-							</p>
-						</div>
-					</div>
-				</div>
-			</div>
-
-			{/* Logo Upload Modal */}
-			{showLogoUploadModal && (
-				<LogoUploadModal
-					isOpen={showLogoUploadModal}
-					onClose={() => setShowLogoUploadModal(false)}
-					onSubmit={uploadLogoMutation.mutate}
-					isLoading={uploadLogoMutation.isPending}
-					error={uploadLogoMutation.error}
-					logoType={selectedLogoType}
-				/>
-			)}
-		</div>
-	);
-};
-
-// Logo Upload Modal Component
-const LogoUploadModal = ({
-	isOpen,
-	onClose,
-	onSubmit,
-	isLoading,
-	error,
-	logoType,
-}) => {
-	const [selectedFile, setSelectedFile] = useState(null);
-	const [previewUrl, setPreviewUrl] = useState(null);
-	const [uploadError, setUploadError] = useState("");
-
-	const handleFileSelect = (e) => {
-		const file = e.target.files[0];
-		if (file) {
-			// Validate file type
-			const allowedTypes = [
-				"image/png",
-				"image/jpeg",
-				"image/jpg",
-				"image/svg+xml",
-			];
-			if (!allowedTypes.includes(file.type)) {
-				setUploadError("Please select a PNG, JPG, or SVG file");
-				return;
-			}
-
-			// Validate file size (5MB limit)
-			if (file.size > 5 * 1024 * 1024) {
-				setUploadError("File size must be less than 5MB");
-				return;
-			}
-
-			setSelectedFile(file);
-			setUploadError("");
-
-			// Create preview URL
-			const url = URL.createObjectURL(file);
-			setPreviewUrl(url);
-		}
-	};
-
-	const handleSubmit = (e) => {
-		e.preventDefault();
-		setUploadError("");
-
-		if (!selectedFile) {
-			setUploadError("Please select a file");
-			return;
-		}
-
-		// Convert file to base64
-		const reader = new FileReader();
-		reader.onload = (event) => {
-			const base64 = event.target.result;
-			onSubmit({
-				logoType,
-				fileContent: base64,
-				fileName: selectedFile.name,
-			});
-		};
-		reader.readAsDataURL(selectedFile);
-	};
-
-	const handleClose = () => {
-		setSelectedFile(null);
-		setPreviewUrl(null);
-		setUploadError("");
-		onClose();
-	};
-
-	if (!isOpen) return null;
-
-	return (
-		<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
-			<div className="bg-white dark:bg-secondary-800 rounded-lg shadow-xl max-w-2xl w-full mx-4 max-h-[90vh] overflow-y-auto">
-				<div className="px-6 py-4 border-b border-secondary-200 dark:border-secondary-600">
-					<div className="flex items-center justify-between">
-						<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
-							Upload{" "}
-							{logoType === "favicon"
-								? "Favicon"
-								: `${logoType.charAt(0).toUpperCase() + logoType.slice(1)} Logo`}
-						</h3>
-						<button
-							type="button"
-							onClick={handleClose}
-							className="text-secondary-400 hover:text-secondary-600 dark:text-secondary-500 dark:hover:text-secondary-300"
-						>
-							<X className="h-5 w-5" />
-						</button>
-					</div>
-				</div>
-
-				<form onSubmit={handleSubmit} className="px-6 py-4">
-					<div className="space-y-4">
-						<div>
-							<label className="block">
-								<span className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-2">
-									Select File
-								</span>
-								<input
-									type="file"
-									accept="image/png,image/jpeg,image/jpg,image/svg+xml"
-									onChange={handleFileSelect}
-									className="block w-full text-sm text-secondary-500 dark:text-secondary-400 file:mr-4 file:py-2 file:px-4 file:rounded-md file:border-0 file:text-sm file:font-medium file:bg-primary-50 file:text-primary-700 hover:file:bg-primary-100 dark:file:bg-primary-900 dark:file:text-primary-200"
-								/>
-							</label>
-							<p className="mt-1 text-xs text-secondary-500 dark:text-secondary-400">
-								Supported formats: PNG, JPG, SVG. Max size: 5MB.
-								{logoType === "favicon"
-									? " Recommended: 32x32px SVG."
-									: " Recommended: 200x60px."}
-							</p>
-						</div>
-
-						{previewUrl && (
-							<div>
-								<div className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-2">
-									Preview
-								</div>
-								<div className="flex items-center justify-center p-4 bg-white dark:bg-secondary-800 rounded-lg border border-secondary-200 dark:border-secondary-600">
-									<img
-										src={previewUrl}
-										alt="Preview"
-										className={`object-contain ${
-											logoType === "favicon" ? "h-8 w-8" : "max-h-16 max-w-full"
-										}`}
-									/>
-								</div>
-							</div>
-						)}
-
-						{(uploadError || error) && (
-							<div className="bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md p-3">
-								<p className="text-sm text-red-800 dark:text-red-200">
-									{uploadError ||
-										error?.response?.data?.error ||
-										error?.message}
-								</p>
-							</div>
-						)}
-
-						<div className="bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded-md p-3">
-							<div className="flex">
-								<AlertCircle className="h-4 w-4 text-yellow-600 dark:text-yellow-400 mr-2 mt-0.5" />
-								<div className="text-sm text-yellow-800 dark:text-yellow-200">
-									<p className="font-medium">Important:</p>
-									<ul className="mt-1 list-disc list-inside space-y-1">
-										<li>This will replace the current {logoType} logo</li>
-										<li>A backup will be created automatically</li>
-										<li>The change will be applied immediately</li>
-									</ul>
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<div className="flex justify-end gap-3 mt-6">
-						<button type="button" onClick={handleClose} className="btn-outline">
-							Cancel
-						</button>
-						<button
-							type="submit"
-							disabled={isLoading || !selectedFile}
-							className="btn-primary"
-						>
-							{isLoading ? "Uploading..." : "Upload Logo"}
-						</button>
-					</div>
-				</form>
-			</div>
-		</div>
-	);
-};
-
-export default BrandingTab;

frontend/src/components/settings/UsersTab.jsx

@@ -54,7 +54,7 @@ const UsersTab = () => {
 	});
 
 	// Update user mutation
-	const _updateUserMutation = useMutation({
+	const updateUserMutation = useMutation({
 		mutationFn: ({ id, data }) => adminUsersAPI.update(id, data),
 		onSuccess: () => {
 			queryClient.invalidateQueries(["users"]);
@@ -92,12 +92,7 @@ const UsersTab = () => {
 	};
 
 	const handleEditUser = (user) => {
-		// Reset editingUser first to force re-render with fresh data
-		setEditingUser(null);
-		// Use setTimeout to ensure the modal re-initializes with fresh data
-		setTimeout(() => {
-			setEditingUser(user);
-		}, 0);
+		setEditingUser(user);
 	};
 
 	const handleResetPassword = (user) => {
@@ -319,8 +314,7 @@ const UsersTab = () => {
 					user={editingUser}
 					isOpen={!!editingUser}
 					onClose={() => setEditingUser(null)}
-					onUpdateUser={updateUserMutation.mutate}
-					isLoading={updateUserMutation.isPending}
+					onUserUpdated={() => updateUserMutation.mutate()}
 					roles={roles}
 				/>
 			)}
@@ -358,29 +352,11 @@ const AddUserModal = ({ isOpen, onClose, onUserCreated, roles }) => {
 	});
 	const [isLoading, setIsLoading] = useState(false);
 	const [error, setError] = useState("");
-	const [success, setSuccess] = useState(false);
-
-	// Reset form when modal is closed
-	useEffect(() => {
-		if (!isOpen) {
-			setFormData({
-				username: "",
-				email: "",
-				password: "",
-				first_name: "",
-				last_name: "",
-				role: "user",
-			});
-			setError("");
-			setSuccess(false);
-		}
-	}, [isOpen]);
 
 	const handleSubmit = async (e) => {
 		e.preventDefault();
 		setIsLoading(true);
 		setError("");
-		setSuccess(false);
 
 		try {
 			// Only send role if roles are available from API
@@ -388,19 +364,12 @@ const AddUserModal = ({ isOpen, onClose, onUserCreated, roles }) => {
 				username: formData.username,
 				email: formData.email,
 				password: formData.password,
-				first_name: formData.first_name,
-				last_name: formData.last_name,
 			};
 			if (roles && Array.isArray(roles) && roles.length > 0) {
 				payload.role = formData.role;
 			}
 			await adminUsersAPI.create(payload);
-			setSuccess(true);
 			onUserCreated();
-			// Auto-close after 1.5 seconds
-			setTimeout(() => {
-				onClose();
-			}, 1500);
 		} catch (err) {
 			setError(err.response?.data?.error || "Failed to create user");
 		} finally {
@@ -548,17 +517,6 @@ const AddUserModal = ({ isOpen, onClose, onUserCreated, roles }) => {
 						</select>
 					</div>
 
-					{success && (
-						<div className="bg-green-50 dark:bg-green-900 border border-green-200 dark:border-green-700 rounded-md p-3">
-							<div className="flex items-center">
-								<CheckCircle className="h-4 w-4 text-green-600 dark:text-green-400 mr-2" />
-								<p className="text-sm text-green-700 dark:text-green-300">
-									User created successfully!
-								</p>
-							</div>
-						</div>
-					)}
-
 					{error && (
 						<div className="bg-danger-50 dark:bg-danger-900 border border-danger-200 dark:border-danger-700 rounded-md p-3">
 							<p className="text-sm text-danger-700 dark:text-danger-300">
@@ -590,14 +548,7 @@ const AddUserModal = ({ isOpen, onClose, onUserCreated, roles }) => {
 };
 
 // Edit User Modal Component
-const EditUserModal = ({
-	user,
-	isOpen,
-	onClose,
-	onUpdateUser,
-	isLoading,
-	roles,
-}) => {
+const EditUserModal = ({ user, isOpen, onClose, onUserUpdated, roles }) => {
 	const editUsernameId = useId();
 	const editEmailId = useId();
 	const editFirstNameId = useId();
@@ -613,45 +564,21 @@ const EditUserModal = ({
 		role: user?.role || "user",
 		is_active: user?.is_active ?? true,
 	});
+	const [isLoading, setIsLoading] = useState(false);
 	const [error, setError] = useState("");
-	const [success, setSuccess] = useState(false);
-
-	// Update formData when user prop changes or modal opens
-	useEffect(() => {
-		if (user && isOpen) {
-			setFormData({
-				username: user.username || "",
-				email: user.email || "",
-				first_name: user.first_name || "",
-				last_name: user.last_name || "",
-				role: user.role || "user",
-				is_active: user.is_active ?? true,
-			});
-		}
-	}, [user, isOpen]);
-
-	// Reset error and success when modal closes
-	useEffect(() => {
-		if (!isOpen) {
-			setError("");
-			setSuccess(false);
-		}
-	}, [isOpen]);
 
 	const handleSubmit = async (e) => {
 		e.preventDefault();
+		setIsLoading(true);
 		setError("");
-		setSuccess(false);
 
 		try {
-			await onUpdateUser({ id: user.id, data: formData });
-			setSuccess(true);
-			// Auto-close after 1.5 seconds
-			setTimeout(() => {
-				onClose();
-			}, 1500);
+			await adminUsersAPI.update(user.id, formData);
+			onUserUpdated();
 		} catch (err) {
 			setError(err.response?.data?.error || "Failed to update user");
+		} finally {
+			setIsLoading(false);
 		}
 	};
 
@@ -791,17 +718,6 @@ const EditUserModal = ({
 						</label>
 					</div>
 
-					{success && (
-						<div className="bg-green-50 dark:bg-green-900 border border-green-200 dark:border-green-700 rounded-md p-3">
-							<div className="flex items-center">
-								<CheckCircle className="h-4 w-4 text-green-600 dark:text-green-400 mr-2" />
-								<p className="text-sm text-green-700 dark:text-green-300">
-									User updated successfully!
-								</p>
-							</div>
-						</div>
-					)}
-
 					{error && (
 						<div className="bg-danger-50 dark:bg-danger-900 border border-danger-200 dark:border-danger-700 rounded-md p-3">
 							<p className="text-sm text-danger-700 dark:text-danger-300">

frontend/src/components/settings/VersionUpdateTab.jsx

@@ -1,16 +1,30 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import {
 	AlertCircle,
 	CheckCircle,
 	Clock,
 	Code,
 	Download,
-	ExternalLink,
-	GitCommit,
+	Save,
 } from "lucide-react";
-import { useCallback, useEffect, useState } from "react";
-import { versionAPI } from "../../utils/api";
+import { useEffect, useId, useState } from "react";
+import { settingsAPI, versionAPI } from "../../utils/api";
 
 const VersionUpdateTab = () => {
+	const repoPublicId = useId();
+	const repoPrivateId = useId();
+	const useCustomSshKeyId = useId();
+	const githubRepoUrlId = useId();
+	const sshKeyPathId = useId();
+	const [formData, setFormData] = useState({
+		githubRepoUrl: "git@github.com:9technologygroup/patchmon.net.git",
+		repositoryType: "public",
+		sshKeyPath: "",
+		useCustomSshKey: false,
+	});
+	const [errors, setErrors] = useState({});
+	const [isDirty, setIsDirty] = useState(false);
+
 	// Version checking state
 	const [versionInfo, setVersionInfo] = useState({
 		currentVersion: null,
@@ -18,11 +32,89 @@ const VersionUpdateTab = () => {
 		isUpdateAvailable: false,
 		checking: false,
 		error: null,
-		github: null,
 	});
 
+	const [sshTestResult, setSshTestResult] = useState({
+		testing: false,
+		success: null,
+		message: null,
+		error: null,
+	});
+
+	const queryClient = useQueryClient();
+
+	// Fetch current settings
+	const {
+		data: settings,
+		isLoading,
+		error,
+	} = useQuery({
+		queryKey: ["settings"],
+		queryFn: () => settingsAPI.get().then((res) => res.data),
+	});
+
+	// Update form data when settings are loaded
+	useEffect(() => {
+		if (settings) {
+			const newFormData = {
+				githubRepoUrl:
+					settings.github_repo_url ||
+					"git@github.com:9technologygroup/patchmon.net.git",
+				repositoryType: settings.repository_type || "public",
+				sshKeyPath: settings.ssh_key_path || "",
+				useCustomSshKey: !!settings.ssh_key_path,
+			};
+			setFormData(newFormData);
+			setIsDirty(false);
+		}
+	}, [settings]);
+
+	// Update settings mutation
+	const updateSettingsMutation = useMutation({
+		mutationFn: (data) => {
+			return settingsAPI.update(data).then((res) => res.data);
+		},
+		onSuccess: () => {
+			queryClient.invalidateQueries(["settings"]);
+			setIsDirty(false);
+			setErrors({});
+		},
+		onError: (error) => {
+			if (error.response?.data?.errors) {
+				setErrors(
+					error.response.data.errors.reduce((acc, err) => {
+						acc[err.path] = err.msg;
+						return acc;
+					}, {}),
+				);
+			} else {
+				setErrors({
+					general: error.response?.data?.error || "Failed to update settings",
+				});
+			}
+		},
+	});
+
+	// Load current version on component mount
+	useEffect(() => {
+		const loadCurrentVersion = async () => {
+			try {
+				const response = await versionAPI.getCurrent();
+				const data = response.data;
+				setVersionInfo((prev) => ({
+					...prev,
+					currentVersion: data.version,
+				}));
+			} catch (error) {
+				console.error("Error loading current version:", error);
+			}
+		};
+
+		loadCurrentVersion();
+	}, []);
+
 	// Version checking functions
-	const checkForUpdates = useCallback(async () => {
+	const checkForUpdates = async () => {
 		setVersionInfo((prev) => ({ ...prev, checking: true, error: null }));
 
 		try {
@@ -34,7 +126,6 @@ const VersionUpdateTab = () => {
 				latestVersion: data.latestVersion,
 				isUpdateAvailable: data.isUpdateAvailable,
 				last_update_check: data.last_update_check,
-				github: data.github,
 				checking: false,
 				error: null,
 			});
@@ -46,274 +137,434 @@ const VersionUpdateTab = () => {
 				error: error.response?.data?.error || "Failed to check for updates",
 			}));
 		}
-	}, []);
+	};
 
-	// Load current version and automatically check for updates on component mount
-	useEffect(() => {
-		const loadAndCheckUpdates = async () => {
-			try {
-				// First, get current version info
-				const response = await versionAPI.getCurrent();
-				const data = response.data;
-				setVersionInfo({
-					currentVersion: data.version,
-					latestVersion: data.latest_version || null,
-					isUpdateAvailable: data.is_update_available || false,
-					last_update_check: data.last_update_check || null,
-					github: data.github,
-					checking: false,
-					error: null,
-				});
+	const testSshKey = async () => {
+		if (!formData.sshKeyPath || !formData.githubRepoUrl) {
+			setSshTestResult({
+				testing: false,
+				success: false,
+				message: null,
+				error: "Please enter both SSH key path and GitHub repository URL",
+			});
+			return;
+		}
 
-				// Then automatically trigger a fresh update check
-				await checkForUpdates();
-			} catch (error) {
-				console.error("Error loading version info:", error);
-				setVersionInfo((prev) => ({
-					...prev,
-					error: "Failed to load version information",
-				}));
-			}
-		};
+		setSshTestResult({
+			testing: true,
+			success: null,
+			message: null,
+			error: null,
+		});
 
-		loadAndCheckUpdates();
-	}, [checkForUpdates]); // Run when component mounts
+		try {
+			const response = await versionAPI.testSshKey({
+				sshKeyPath: formData.sshKeyPath,
+				githubRepoUrl: formData.githubRepoUrl,
+			});
+
+			setSshTestResult({
+				testing: false,
+				success: true,
+				message: response.data.message,
+				error: null,
+			});
+		} catch (error) {
+			console.error("SSH key test error:", error);
+			setSshTestResult({
+				testing: false,
+				success: false,
+				message: null,
+				error: error.response?.data?.error || "Failed to test SSH key",
+			});
+		}
+	};
+
+	const handleInputChange = (field, value) => {
+		setFormData((prev) => ({
+			...prev,
+			[field]: value,
+		}));
+		setIsDirty(true);
+		if (errors[field]) {
+			setErrors((prev) => ({ ...prev, [field]: null }));
+		}
+	};
+
+	const handleSave = () => {
+		// Only include sshKeyPath if the toggle is enabled
+		const dataToSubmit = { ...formData };
+		if (!dataToSubmit.useCustomSshKey) {
+			dataToSubmit.sshKeyPath = "";
+		}
+		// Remove the frontend-only field
+		delete dataToSubmit.useCustomSshKey;
+
+		updateSettingsMutation.mutate(dataToSubmit);
+	};
+
+	if (isLoading) {
+		return (
+			<div className="flex items-center justify-center h-64">
+				<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary-600"></div>
+			</div>
+		);
+	}
+
+	if (error) {
+		return (
+			<div className="bg-red-50 dark:bg-red-900 border border-red-200 dark:border-red-700 rounded-md p-4">
+				<div className="flex">
+					<AlertCircle className="h-5 w-5 text-red-400 dark:text-red-300" />
+					<div className="ml-3">
+						<h3 className="text-sm font-medium text-red-800 dark:text-red-200">
+							Error loading settings
+						</h3>
+						<p className="mt-1 text-sm text-red-700 dark:text-red-300">
+							{error.response?.data?.error || "Failed to load settings"}
+						</p>
+					</div>
+				</div>
+			</div>
+		);
+	}
 
 	return (
 		<div className="space-y-6">
+			{errors.general && (
+				<div className="bg-red-50 dark:bg-red-900 border border-red-200 dark:border-red-700 rounded-md p-4">
+					<div className="flex">
+						<AlertCircle className="h-5 w-5 text-red-400 dark:text-red-300" />
+						<div className="ml-3">
+							<p className="text-sm text-red-700 dark:text-red-300">
+								{errors.general}
+							</p>
+						</div>
+					</div>
+				</div>
+			)}
+
 			<div className="flex items-center mb-6">
 				<Code className="h-6 w-6 text-primary-600 mr-3" />
 				<h2 className="text-xl font-semibold text-secondary-900 dark:text-white">
-					Server Version Information
+					Server Version Management
 				</h2>
 			</div>
 
 			<div className="bg-secondary-50 dark:bg-secondary-700 rounded-lg p-6">
 				<h3 className="text-lg font-medium text-secondary-900 dark:text-white mb-4">
-					Version Information
+					Version Check Configuration
 				</h3>
 				<p className="text-sm text-secondary-600 dark:text-secondary-300 mb-6">
-					Current server version and latest updates from GitHub repository.
-					{versionInfo.checking && (
-						<span className="ml-2 text-blue-600 dark:text-blue-400">
-							🔄 Checking for updates...
-						</span>
-					)}
+					Configure automatic version checking against your GitHub repository to
+					notify users of available updates.
 				</p>
 
-				<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-					{/* My Version */}
-					<div className="bg-white dark:bg-secondary-800 rounded-lg p-4 border border-secondary-200 dark:border-secondary-600">
-						<div className="flex items-center gap-2 mb-2">
-							<CheckCircle className="h-4 w-4 text-green-600 dark:text-green-400" />
-							<span className="text-sm font-medium text-secondary-700 dark:text-secondary-300">
-								My Version
-							</span>
+				<div className="space-y-4">
+					<fieldset>
+						<legend className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-2">
+							Repository Type
+						</legend>
+						<div className="space-y-2">
+							<div className="flex items-center">
+								<input
+									type="radio"
+									id={repoPublicId}
+									name="repositoryType"
+									value="public"
+									checked={formData.repositoryType === "public"}
+									onChange={(e) =>
+										handleInputChange("repositoryType", e.target.value)
+									}
+									className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300"
+								/>
+								<label
+									htmlFor={repoPublicId}
+									className="ml-2 text-sm text-secondary-700 dark:text-secondary-200"
+								>
+									Public Repository (uses GitHub API - no authentication
+									required)
+								</label>
+							</div>
+							<div className="flex items-center">
+								<input
+									type="radio"
+									id={repoPrivateId}
+									name="repositoryType"
+									value="private"
+									checked={formData.repositoryType === "private"}
+									onChange={(e) =>
+										handleInputChange("repositoryType", e.target.value)
+									}
+									className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300"
+								/>
+								<label
+									htmlFor={repoPrivateId}
+									className="ml-2 text-sm text-secondary-700 dark:text-secondary-200"
+								>
+									Private Repository (uses SSH with deploy key)
+								</label>
+							</div>
 						</div>
-						<span className="text-lg font-mono text-secondary-900 dark:text-white">
-							{versionInfo.currentVersion}
-						</span>
+						<p className="mt-1 text-xs text-secondary-500 dark:text-secondary-400">
+							Choose whether your repository is public or private to determine
+							the appropriate access method.
+						</p>
+					</fieldset>
+
+					<div>
+						<label
+							htmlFor={githubRepoUrlId}
+							className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-2"
+						>
+							GitHub Repository URL
+						</label>
+						<input
+							id={githubRepoUrlId}
+							type="text"
+							value={formData.githubRepoUrl || ""}
+							onChange={(e) =>
+								handleInputChange("githubRepoUrl", e.target.value)
+							}
+							className="w-full border border-secondary-300 dark:border-secondary-600 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 bg-white dark:bg-secondary-700 text-secondary-900 dark:text-white font-mono text-sm"
+							placeholder="git@github.com:username/repository.git"
+						/>
+						<p className="mt-1 text-xs text-secondary-500 dark:text-secondary-400">
+							SSH or HTTPS URL to your GitHub repository
+						</p>
 					</div>
 
-					{/* Latest Release */}
-					{versionInfo.github?.latestRelease && (
+					{formData.repositoryType === "private" && (
+						<div>
+							<div className="flex items-center gap-3 mb-3">
+								<input
+									type="checkbox"
+									id={useCustomSshKeyId}
+									checked={formData.useCustomSshKey}
+									onChange={(e) => {
+										const checked = e.target.checked;
+										handleInputChange("useCustomSshKey", checked);
+										if (!checked) {
+											handleInputChange("sshKeyPath", "");
+										}
+									}}
+									className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded"
+								/>
+								<label
+									htmlFor={useCustomSshKeyId}
+									className="text-sm font-medium text-secondary-700 dark:text-secondary-200"
+								>
+									Set custom SSH key path
+								</label>
+							</div>
+
+							{formData.useCustomSshKey && (
+								<div>
+									<label
+										htmlFor={sshKeyPathId}
+										className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-2"
+									>
+										SSH Key Path
+									</label>
+									<input
+										id={sshKeyPathId}
+										type="text"
+										value={formData.sshKeyPath || ""}
+										onChange={(e) =>
+											handleInputChange("sshKeyPath", e.target.value)
+										}
+										className="w-full border border-secondary-300 dark:border-secondary-600 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 bg-white dark:bg-secondary-700 text-secondary-900 dark:text-white font-mono text-sm"
+										placeholder="/root/.ssh/id_ed25519"
+									/>
+									<p className="mt-1 text-xs text-secondary-500 dark:text-secondary-400">
+										Path to your SSH deploy key. If not set, will auto-detect
+										from common locations.
+									</p>
+
+									<div className="mt-3">
+										<button
+											type="button"
+											onClick={testSshKey}
+											disabled={
+												sshTestResult.testing ||
+												!formData.sshKeyPath ||
+												!formData.githubRepoUrl
+											}
+											className="px-4 py-2 text-sm font-medium text-white bg-blue-600 border border-transparent rounded-md shadow-sm hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-50 disabled:cursor-not-allowed"
+										>
+											{sshTestResult.testing ? "Testing..." : "Test SSH Key"}
+										</button>
+
+										{sshTestResult.success && (
+											<div className="mt-2 p-3 bg-green-50 dark:bg-green-900/20 border border-green-200 dark:border-green-800 rounded-md">
+												<div className="flex items-center">
+													<CheckCircle className="h-4 w-4 text-green-600 dark:text-green-400 mr-2" />
+													<p className="text-sm text-green-800 dark:text-green-200">
+														{sshTestResult.message}
+													</p>
+												</div>
+											</div>
+										)}
+
+										{sshTestResult.error && (
+											<div className="mt-2 p-3 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md">
+												<div className="flex items-center">
+													<AlertCircle className="h-4 w-4 text-red-600 dark:text-red-400 mr-2" />
+													<p className="text-sm text-red-800 dark:text-red-200">
+														{sshTestResult.error}
+													</p>
+												</div>
+											</div>
+										)}
+									</div>
+								</div>
+							)}
+
+							{!formData.useCustomSshKey && (
+								<p className="text-xs text-secondary-500 dark:text-secondary-400">
+									Using auto-detection for SSH key location
+								</p>
+							)}
+						</div>
+					)}
+
+					<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+						<div className="bg-white dark:bg-secondary-800 rounded-lg p-4 border border-secondary-200 dark:border-secondary-600">
+							<div className="flex items-center gap-2 mb-2">
+								<CheckCircle className="h-4 w-4 text-green-600 dark:text-green-400" />
+								<span className="text-sm font-medium text-secondary-700 dark:text-secondary-300">
+									Current Version
+								</span>
+							</div>
+							<span className="text-lg font-mono text-secondary-900 dark:text-white">
+								{versionInfo.currentVersion}
+							</span>
+						</div>
+
 						<div className="bg-white dark:bg-secondary-800 rounded-lg p-4 border border-secondary-200 dark:border-secondary-600">
 							<div className="flex items-center gap-2 mb-2">
 								<Download className="h-4 w-4 text-blue-600 dark:text-blue-400" />
 								<span className="text-sm font-medium text-secondary-700 dark:text-secondary-300">
-									Latest Release
+									Latest Version
 								</span>
 							</div>
-							<div className="space-y-1">
-								<span className="text-lg font-mono text-secondary-900 dark:text-white">
-									{versionInfo.github.latestRelease.tagName}
+							<span className="text-lg font-mono text-secondary-900 dark:text-white">
+								{versionInfo.checking ? (
+									<span className="text-blue-600 dark:text-blue-400">
+										Checking...
+									</span>
+								) : versionInfo.latestVersion ? (
+									<span
+										className={
+											versionInfo.isUpdateAvailable
+												? "text-orange-600 dark:text-orange-400"
+												: "text-green-600 dark:text-green-400"
+										}
+									>
+										{versionInfo.latestVersion}
+										{versionInfo.isUpdateAvailable && " (Update Available!)"}
+									</span>
+								) : (
+									<span className="text-secondary-500 dark:text-secondary-400">
+										Not checked
+									</span>
+								)}
+							</span>
+						</div>
+					</div>
+
+					{/* Last Checked Time */}
+					{versionInfo.last_update_check && (
+						<div className="bg-white dark:bg-secondary-800 rounded-lg p-4 border border-secondary-200 dark:border-secondary-600">
+							<div className="flex items-center gap-2 mb-2">
+								<Clock className="h-4 w-4 text-blue-600 dark:text-blue-400" />
+								<span className="text-sm font-medium text-secondary-700 dark:text-secondary-300">
+									Last Checked
 								</span>
-								<div className="text-xs text-secondary-500 dark:text-secondary-400">
-									Published:{" "}
-									{new Date(
-										versionInfo.github.latestRelease.publishedAt,
-									).toLocaleDateString()}
+							</div>
+							<span className="text-sm text-secondary-600 dark:text-secondary-400">
+								{new Date(versionInfo.last_update_check).toLocaleString()}
+							</span>
+							<p className="text-xs text-secondary-500 dark:text-secondary-400 mt-1">
+								Updates are checked automatically every 24 hours
+							</p>
+						</div>
+					)}
+
+					<div className="flex items-center justify-between">
+						<div className="flex items-center gap-3">
+							<button
+								type="button"
+								onClick={checkForUpdates}
+								disabled={versionInfo.checking}
+								className="btn-primary flex items-center gap-2"
+							>
+								<Download className="h-4 w-4" />
+								{versionInfo.checking ? "Checking..." : "Check for Updates"}
+							</button>
+						</div>
+
+						{/* Save Button for Version Settings */}
+						<button
+							type="button"
+							onClick={handleSave}
+							disabled={!isDirty || updateSettingsMutation.isPending}
+							className={`inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white ${
+								!isDirty || updateSettingsMutation.isPending
+									? "bg-secondary-400 cursor-not-allowed"
+									: "bg-primary-600 hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500"
+							}`}
+						>
+							{updateSettingsMutation.isPending ? (
+								<>
+									<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-white mr-2"></div>
+									Saving...
+								</>
+							) : (
+								<>
+									<Save className="h-4 w-4 mr-2" />
+									Save Settings
+								</>
+							)}
+						</button>
+					</div>
+
+					{versionInfo.error && (
+						<div className="bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-700 rounded-lg p-4">
+							<div className="flex">
+								<AlertCircle className="h-5 w-5 text-red-400 dark:text-red-300" />
+								<div className="ml-3">
+									<h3 className="text-sm font-medium text-red-800 dark:text-red-200">
+										Version Check Failed
+									</h3>
+									<p className="mt-1 text-sm text-red-700 dark:text-red-300">
+										{versionInfo.error}
+									</p>
+									{versionInfo.error.includes("private") && (
+										<p className="mt-2 text-xs text-red-600 dark:text-red-400">
+											For private repositories, you may need to configure GitHub
+											authentication or make the repository public.
+										</p>
+									)}
+								</div>
+							</div>
+						</div>
+					)}
+
+					{/* Success Message for Version Settings */}
+					{updateSettingsMutation.isSuccess && (
+						<div className="bg-green-50 dark:bg-green-900 border border-green-200 dark:border-green-700 rounded-md p-4">
+							<div className="flex">
+								<CheckCircle className="h-5 w-5 text-green-400 dark:text-green-300" />
+								<div className="ml-3">
+									<p className="text-sm text-green-700 dark:text-green-300">
+										Settings saved successfully!
+									</p>
 								</div>
 							</div>
 						</div>
 					)}
 				</div>
-
-				{/* GitHub Repository Information */}
-				{versionInfo.github && (
-					<div className="bg-white dark:bg-secondary-800 rounded-lg p-4 border border-secondary-200 dark:border-secondary-600 mt-4">
-						<div className="flex items-center gap-2 mb-4">
-							<Code className="h-4 w-4 text-purple-600 dark:text-purple-400" />
-							<span className="text-sm font-medium text-secondary-700 dark:text-secondary-300">
-								GitHub Repository Information
-							</span>
-						</div>
-
-						<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-							{/* Repository URL */}
-							<div className="space-y-2">
-								<span className="text-xs font-medium text-secondary-600 dark:text-secondary-400 uppercase tracking-wide">
-									Repository
-								</span>
-								<div className="flex items-center gap-2">
-									<span className="text-sm text-secondary-900 dark:text-white font-mono">
-										{versionInfo.github.owner}/{versionInfo.github.repo}
-									</span>
-									{versionInfo.github.repository && (
-										<a
-											href={versionInfo.github.repository}
-											target="_blank"
-											rel="noopener noreferrer"
-											className="text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300"
-										>
-											<ExternalLink className="h-3 w-3" />
-										</a>
-									)}
-								</div>
-							</div>
-
-							{/* Latest Release Info */}
-							{versionInfo.github.latestRelease && (
-								<div className="space-y-2">
-									<span className="text-xs font-medium text-secondary-600 dark:text-secondary-400 uppercase tracking-wide">
-										Release Link
-									</span>
-									<div className="flex items-center gap-2">
-										{versionInfo.github.latestRelease.htmlUrl && (
-											<a
-												href={versionInfo.github.latestRelease.htmlUrl}
-												target="_blank"
-												rel="noopener noreferrer"
-												className="text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300 text-sm"
-											>
-												View Release{" "}
-												<ExternalLink className="h-3 w-3 inline ml-1" />
-											</a>
-										)}
-									</div>
-								</div>
-							)}
-
-							{/* Branch Status */}
-							{versionInfo.github.commitDifference && (
-								<div className="space-y-2">
-									<span className="text-xs font-medium text-secondary-600 dark:text-secondary-400 uppercase tracking-wide">
-										Branch Status
-									</span>
-									<div className="text-sm">
-										{versionInfo.github.commitDifference.commitsAhead > 0 ? (
-											<span className="text-blue-600 dark:text-blue-400">
-												🚀 Main branch is{" "}
-												{versionInfo.github.commitDifference.commitsAhead}{" "}
-												commits ahead of release
-											</span>
-										) : versionInfo.github.commitDifference.commitsBehind >
-											0 ? (
-											<span className="text-orange-600 dark:text-orange-400">
-												📊 Main branch is{" "}
-												{versionInfo.github.commitDifference.commitsBehind}{" "}
-												commits behind release
-											</span>
-										) : (
-											<span className="text-green-600 dark:text-green-400">
-												✅ Main branch is in sync with release
-											</span>
-										)}
-									</div>
-								</div>
-							)}
-						</div>
-
-						{/* Latest Commit Information */}
-						{versionInfo.github.latestCommit && (
-							<div className="mt-4 pt-4 border-t border-secondary-200 dark:border-secondary-600">
-								<div className="flex items-center gap-2 mb-2">
-									<GitCommit className="h-4 w-4 text-orange-600 dark:text-orange-400" />
-									<span className="text-xs font-medium text-secondary-600 dark:text-secondary-400 uppercase tracking-wide">
-										Latest Commit (Rolling)
-									</span>
-								</div>
-								<div className="space-y-2">
-									<div className="flex items-center gap-2">
-										<span className="text-sm font-mono text-secondary-900 dark:text-white">
-											{versionInfo.github.latestCommit.sha.substring(0, 8)}
-										</span>
-										{versionInfo.github.latestCommit.htmlUrl && (
-											<a
-												href={versionInfo.github.latestCommit.htmlUrl}
-												target="_blank"
-												rel="noopener noreferrer"
-												className="text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300"
-											>
-												<ExternalLink className="h-3 w-3" />
-											</a>
-										)}
-									</div>
-									<p className="text-sm text-secondary-700 dark:text-secondary-300">
-										{versionInfo.github.latestCommit.message.split("\n")[0]}
-									</p>
-									<div className="flex items-center gap-4 text-xs text-secondary-500 dark:text-secondary-400">
-										<span>
-											Author: {versionInfo.github.latestCommit.author}
-										</span>
-										<span>
-											Date:{" "}
-											{new Date(
-												versionInfo.github.latestCommit.date,
-											).toLocaleString()}
-										</span>
-									</div>
-								</div>
-							</div>
-						)}
-					</div>
-				)}
-
-				{/* Last Checked Time */}
-				{versionInfo.last_update_check && (
-					<div className="bg-white dark:bg-secondary-800 rounded-lg p-4 border border-secondary-200 dark:border-secondary-600 mt-4">
-						<div className="flex items-center gap-2 mb-2">
-							<Clock className="h-4 w-4 text-blue-600 dark:text-blue-400" />
-							<span className="text-sm font-medium text-secondary-700 dark:text-secondary-300">
-								Last Checked
-							</span>
-						</div>
-						<span className="text-sm text-secondary-600 dark:text-secondary-400">
-							{new Date(versionInfo.last_update_check).toLocaleString()}
-						</span>
-						<p className="text-xs text-secondary-500 dark:text-secondary-400 mt-1">
-							Updates are checked automatically every 24 hours
-						</p>
-					</div>
-				)}
-
-				<div className="flex items-center justify-start mt-6">
-					<button
-						type="button"
-						onClick={checkForUpdates}
-						disabled={versionInfo.checking}
-						className="btn-primary flex items-center gap-2"
-					>
-						<Download className="h-4 w-4" />
-						{versionInfo.checking ? "Checking..." : "Check for Updates"}
-					</button>
-				</div>
-
-				{versionInfo.error && (
-					<div className="bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-700 rounded-lg p-4 mt-4">
-						<div className="flex">
-							<AlertCircle className="h-5 w-5 text-red-400 dark:text-red-300" />
-							<div className="ml-3">
-								<h3 className="text-sm font-medium text-red-800 dark:text-red-200">
-									Version Check Failed
-								</h3>
-								<p className="mt-1 text-sm text-red-700 dark:text-red-300">
-									{versionInfo.error}
-								</p>
-							</div>
-						</div>
-					</div>
-				)}
 			</div>
 		</div>
 	);

frontend/src/contexts/UpdateNotificationContext.jsx

@@ -1,7 +1,7 @@
 import { useQuery } from "@tanstack/react-query";
-import { createContext, useContext, useState } from "react";
+import { createContext, useContext, useMemo, useState } from "react";
 import { isAuthReady } from "../constants/authPhases";
-import { settingsAPI } from "../utils/api";
+import { settingsAPI, versionAPI } from "../utils/api";
 import { useAuth } from "./AuthContext";
 
 const UpdateNotificationContext = createContext();
@@ -21,7 +21,6 @@ export const UpdateNotificationProvider = ({ children }) => {
 	const { authPhase, isAuthenticated } = useAuth();
 
 	// Ensure settings are loaded - but only after auth is fully ready
-	// This reads cached update info from backend (updated by scheduler)
 	const { data: settings, isLoading: settingsLoading } = useQuery({
 		queryKey: ["settings"],
 		queryFn: () => settingsAPI.get().then((res) => res.data),
@@ -30,20 +29,31 @@ export const UpdateNotificationProvider = ({ children }) => {
 		enabled: isAuthReady(authPhase, isAuthenticated()),
 	});
 
-	// Read cached update information from settings (no GitHub API calls)
-	// The backend scheduler updates this data periodically
-	const updateAvailable = settings?.is_update_available && !dismissed;
-	const updateInfo = settings
-		? {
-				isUpdateAvailable: settings.is_update_available,
-				latestVersion: settings.latest_version,
-				currentVersion: settings.current_version,
-				last_update_check: settings.last_update_check,
-			}
-		: null;
+	// Memoize the enabled condition to prevent unnecessary re-evaluations
+	const isQueryEnabled = useMemo(() => {
+		return (
+			isAuthReady(authPhase, isAuthenticated()) &&
+			!!settings &&
+			!settingsLoading
+		);
+	}, [authPhase, isAuthenticated, settings, settingsLoading]);
 
-	const isLoading = settingsLoading;
-	const error = null;
+	// Query for update information
+	const {
+		data: updateData,
+		isLoading,
+		error,
+	} = useQuery({
+		queryKey: ["updateCheck"],
+		queryFn: () => versionAPI.checkUpdates().then((res) => res.data),
+		staleTime: 10 * 60 * 1000, // Data stays fresh for 10 minutes
+		refetchOnWindowFocus: false, // Don't refetch when window regains focus
+		retry: 1,
+		enabled: isQueryEnabled,
+	});
+
+	const updateAvailable = updateData?.isUpdateAvailable && !dismissed;
+	const updateInfo = updateData;
 
 	const dismissNotification = () => {
 		setDismissed(true);

frontend/src/pages/Dashboard.jsx

@@ -6,8 +6,6 @@ import {
 	Chart as ChartJS,
 	Legend,
 	LinearScale,
-	LineElement,
-	PointElement,
 	Title,
 	Tooltip,
 } from "chart.js";
@@ -25,7 +23,7 @@ import {
 	WifiOff,
 } from "lucide-react";
 import { useEffect, useState } from "react";
-import { Bar, Doughnut, Line, Pie } from "react-chartjs-2";
+import { Bar, Doughnut, Pie } from "react-chartjs-2";
 import { useNavigate } from "react-router-dom";
 import DashboardSettingsModal from "../components/DashboardSettingsModal";
 import { useAuth } from "../contexts/AuthContext";
@@ -45,16 +43,12 @@ ChartJS.register(
 	CategoryScale,
 	LinearScale,
 	BarElement,
-	LineElement,
-	PointElement,
 	Title,
 );
 
 const Dashboard = () => {
 	const [showSettingsModal, setShowSettingsModal] = useState(false);
 	const [cardPreferences, setCardPreferences] = useState([]);
-	const [packageTrendsPeriod, setPackageTrendsPeriod] = useState("1"); // days
-	const [packageTrendsHost, setPackageTrendsHost] = useState("all"); // host filter
 	const navigate = useNavigate();
 	const { isDark } = useTheme();
 	const { user } = useAuth();
@@ -97,7 +91,7 @@ const Dashboard = () => {
 		navigate("/repositories");
 	};
 
-	const _handleOSDistributionClick = () => {
+	const handleOSDistributionClick = () => {
 		navigate("/hosts?showFilters=true", { replace: true });
 	};
 
@@ -105,7 +99,7 @@ const Dashboard = () => {
 		navigate("/hosts?filter=needsUpdates", { replace: true });
 	};
 
-	const _handlePackagePriorityClick = () => {
+	const handlePackagePriorityClick = () => {
 		navigate("/packages?filter=security");
 	};
 
@@ -150,8 +144,8 @@ const Dashboard = () => {
 			// Map priority names to filter parameters
 			if (priorityName.toLowerCase().includes("security")) {
 				navigate("/packages?filter=security", { replace: true });
-			} else if (priorityName.toLowerCase().includes("regular")) {
-				navigate("/packages?filter=regular", { replace: true });
+			} else if (priorityName.toLowerCase().includes("outdated")) {
+				navigate("/packages?filter=outdated", { replace: true });
 			}
 		}
 	};
@@ -195,26 +189,6 @@ const Dashboard = () => {
 		refetchOnWindowFocus: false, // Don't refetch when window regains focus
 	});
 
-	// Package trends data query
-	const {
-		data: packageTrendsData,
-		isLoading: packageTrendsLoading,
-		error: _packageTrendsError,
-	} = useQuery({
-		queryKey: ["packageTrends", packageTrendsPeriod, packageTrendsHost],
-		queryFn: () => {
-			const params = {
-				days: packageTrendsPeriod,
-			};
-			if (packageTrendsHost !== "all") {
-				params.hostId = packageTrendsHost;
-			}
-			return dashboardAPI.getPackageTrends(params).then((res) => res.data);
-		},
-		staleTime: 5 * 60 * 1000, // 5 minutes
-		refetchOnWindowFocus: false,
-	});
-
 	// Fetch recent users (permission protected server-side)
 	const { data: recentUsers } = useQuery({
 		queryKey: ["dashboardRecentUsers"],
@@ -325,8 +299,6 @@ const Dashboard = () => {
 			].includes(cardId)
 		) {
 			return "charts";
-		} else if (["packageTrends"].includes(cardId)) {
-			return "charts";
 		} else if (["erroredHosts", "quickStats"].includes(cardId)) {
 			return "fullwidth";
 		}
@@ -340,8 +312,6 @@ const Dashboard = () => {
 				return "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4";
 			case "charts":
 				return "grid grid-cols-1 lg:grid-cols-3 gap-6";
-			case "widecharts":
-				return "grid grid-cols-1 lg:grid-cols-3 gap-6";
 			case "fullwidth":
 				return "space-y-6";
 			default:
@@ -681,7 +651,17 @@ const Dashboard = () => {
 
 			case "osDistribution":
 				return (
-					<div className="card p-6 w-full">
+					<button
+						type="button"
+						className="card p-6 cursor-pointer hover:shadow-card-hover dark:hover:shadow-card-hover-dark transition-shadow duration-200 w-full text-left"
+						onClick={handleOSDistributionClick}
+						onKeyDown={(e) => {
+							if (e.key === "Enter" || e.key === " ") {
+								e.preventDefault();
+								handleOSDistributionClick();
+							}
+						}}
+					>
 						<h3 className="text-lg font-medium text-secondary-900 dark:text-white mb-4">
 							OS Distribution
 						</h3>
@@ -690,12 +670,22 @@ const Dashboard = () => {
 								<Pie data={osChartData} options={chartOptions} />
 							</div>
 						</div>
-					</div>
+					</button>
 				);
 
 			case "osDistributionDoughnut":
 				return (
-					<div className="card p-6 w-full">
+					<button
+						type="button"
+						className="card p-6 cursor-pointer hover:shadow-card-hover dark:hover:shadow-card-hover-dark transition-shadow duration-200 w-full text-left"
+						onClick={handleOSDistributionClick}
+						onKeyDown={(e) => {
+							if (e.key === "Enter" || e.key === " ") {
+								e.preventDefault();
+								handleOSDistributionClick();
+							}
+						}}
+					>
 						<h3 className="text-lg font-medium text-secondary-900 dark:text-white mb-4">
 							OS Distribution
 						</h3>
@@ -704,19 +694,29 @@ const Dashboard = () => {
 								<Doughnut data={osChartData} options={doughnutChartOptions} />
 							</div>
 						</div>
-					</div>
+					</button>
 				);
 
 			case "osDistributionBar":
 				return (
-					<div className="card p-6 w-full">
+					<button
+						type="button"
+						className="card p-6 cursor-pointer hover:shadow-card-hover dark:hover:shadow-card-hover-dark transition-shadow duration-200 w-full text-left"
+						onClick={handleOSDistributionClick}
+						onKeyDown={(e) => {
+							if (e.key === "Enter" || e.key === " ") {
+								e.preventDefault();
+								handleOSDistributionClick();
+							}
+						}}
+					>
 						<h3 className="text-lg font-medium text-secondary-900 dark:text-white mb-4">
 							OS Distribution
 						</h3>
 						<div className="h-64">
 							<Bar data={osBarChartData} options={barChartOptions} />
 						</div>
-					</div>
+					</button>
 				);
 
 			case "updateStatus":
@@ -748,9 +748,19 @@ const Dashboard = () => {
 
 			case "packagePriority":
 				return (
-					<div className="card p-6 w-full">
+					<button
+						type="button"
+						className="card p-6 cursor-pointer hover:shadow-card-hover dark:hover:shadow-card-hover-dark transition-shadow duration-200 w-full text-left"
+						onClick={handlePackagePriorityClick}
+						onKeyDown={(e) => {
+							if (e.key === "Enter" || e.key === " ") {
+								e.preventDefault();
+								handlePackagePriorityClick();
+							}
+						}}
+					>
 						<h3 className="text-lg font-medium text-secondary-900 dark:text-white mb-4">
-							Outdated Packages by Priority
+							Package Priority
 						</h3>
 						<div className="h-64 w-full flex items-center justify-center">
 							<div className="w-full h-full max-w-sm">
@@ -760,72 +770,7 @@ const Dashboard = () => {
 								/>
 							</div>
 						</div>
-					</div>
-				);
-
-			case "packageTrends":
-				return (
-					<div className="card p-6 w-full">
-						<div className="flex items-center justify-between mb-4">
-							<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
-								Package Trends Over Time
-							</h3>
-							<div className="flex items-center gap-3">
-								{/* Period Selector */}
-								<select
-									value={packageTrendsPeriod}
-									onChange={(e) => setPackageTrendsPeriod(e.target.value)}
-									className="px-3 py-1.5 text-sm border border-secondary-300 dark:border-secondary-600 rounded-md bg-white dark:bg-secondary-800 text-secondary-900 dark:text-white focus:ring-2 focus:ring-primary-500 focus:border-primary-500"
-								>
-									<option value="1">Last 24 hours</option>
-									<option value="7">Last 7 days</option>
-									<option value="30">Last 30 days</option>
-									<option value="90">Last 90 days</option>
-									<option value="180">Last 6 months</option>
-									<option value="365">Last year</option>
-								</select>
-
-								{/* Host Selector */}
-								<select
-									value={packageTrendsHost}
-									onChange={(e) => setPackageTrendsHost(e.target.value)}
-									className="px-3 py-1.5 text-sm border border-secondary-300 dark:border-secondary-600 rounded-md bg-white dark:bg-secondary-800 text-secondary-900 dark:text-white focus:ring-2 focus:ring-primary-500 focus:border-primary-500"
-								>
-									<option value="all">All Hosts</option>
-									{packageTrendsData?.hosts?.length > 0 ? (
-										packageTrendsData.hosts.map((host) => (
-											<option key={host.id} value={host.id}>
-												{host.friendly_name || host.hostname}
-											</option>
-										))
-									) : (
-										<option disabled>
-											{packageTrendsLoading
-												? "Loading hosts..."
-												: "No hosts available"}
-										</option>
-									)}
-								</select>
-							</div>
-						</div>
-
-						<div className="h-64 w-full">
-							{packageTrendsLoading ? (
-								<div className="flex items-center justify-center h-full">
-									<RefreshCw className="h-8 w-8 animate-spin text-primary-600" />
-								</div>
-							) : packageTrendsData?.chartData ? (
-								<Line
-									data={packageTrendsData.chartData}
-									options={packageTrendsChartOptions}
-								/>
-							) : (
-								<div className="flex items-center justify-center h-full text-secondary-500 dark:text-secondary-400">
-									No data available
-								</div>
-							)}
-						</div>
-					</div>
+					</button>
 				);
 
 			case "quickStats": {
@@ -1123,167 +1068,6 @@ const Dashboard = () => {
 		onClick: handlePackagePriorityChartClick,
 	};
 
-	const packageTrendsChartOptions = {
-		responsive: true,
-		maintainAspectRatio: false,
-		plugins: {
-			legend: {
-				position: "top",
-				labels: {
-					color: isDark ? "#ffffff" : "#374151",
-					font: {
-						size: 12,
-					},
-					padding: 20,
-					usePointStyle: true,
-					pointStyle: "circle",
-				},
-			},
-			tooltip: {
-				mode: "index",
-				intersect: false,
-				backgroundColor: isDark ? "#374151" : "#ffffff",
-				titleColor: isDark ? "#ffffff" : "#374151",
-				bodyColor: isDark ? "#ffffff" : "#374151",
-				borderColor: isDark ? "#4B5563" : "#E5E7EB",
-				borderWidth: 1,
-				callbacks: {
-					title: (context) => {
-						const label = context[0].label;
-
-						// Handle empty or invalid labels
-						if (!label || typeof label !== "string") {
-							return "Unknown Date";
-						}
-
-						// Format hourly labels (e.g., "2025-10-07T14" -> "Oct 7, 2:00 PM")
-						if (label.includes("T")) {
-							try {
-								const date = new Date(`${label}:00:00`);
-								// Check if date is valid
-								if (isNaN(date.getTime())) {
-									return label; // Return original label if date is invalid
-								}
-								return date.toLocaleDateString("en-US", {
-									month: "short",
-									day: "numeric",
-									hour: "numeric",
-									minute: "2-digit",
-									hour12: true,
-								});
-							} catch (error) {
-								return label; // Return original label if parsing fails
-							}
-						}
-
-						// Format daily labels (e.g., "2025-10-07" -> "Oct 7")
-						try {
-							const date = new Date(label);
-							// Check if date is valid
-							if (isNaN(date.getTime())) {
-								return label; // Return original label if date is invalid
-							}
-							return date.toLocaleDateString("en-US", {
-								month: "short",
-								day: "numeric",
-							});
-						} catch (error) {
-							return label; // Return original label if parsing fails
-						}
-					},
-				},
-			},
-		},
-		scales: {
-			x: {
-				display: true,
-				title: {
-					display: true,
-					text: packageTrendsPeriod === "1" ? "Time (Hours)" : "Date",
-					color: isDark ? "#ffffff" : "#374151",
-				},
-				ticks: {
-					color: isDark ? "#ffffff" : "#374151",
-					font: {
-						size: 11,
-					},
-					callback: function (value, _index, _ticks) {
-						const label = this.getLabelForValue(value);
-
-						// Handle empty or invalid labels
-						if (!label || typeof label !== "string") {
-							return "Unknown";
-						}
-
-						// Format hourly labels (e.g., "2025-10-07T14" -> "2 PM")
-						if (label.includes("T")) {
-							try {
-								const hour = label.split("T")[1];
-								const hourNum = parseInt(hour, 10);
-
-								// Validate hour number
-								if (isNaN(hourNum) || hourNum < 0 || hourNum > 23) {
-									return hour; // Return original hour if invalid
-								}
-
-								return hourNum === 0
-									? "12 AM"
-									: hourNum < 12
-										? `${hourNum} AM`
-										: hourNum === 12
-											? "12 PM"
-											: `${hourNum - 12} PM`;
-							} catch (error) {
-								return label; // Return original label if parsing fails
-							}
-						}
-
-						// Format daily labels (e.g., "2025-10-07" -> "Oct 7")
-						try {
-							const date = new Date(label);
-							// Check if date is valid
-							if (isNaN(date.getTime())) {
-								return label; // Return original label if date is invalid
-							}
-							return date.toLocaleDateString("en-US", {
-								month: "short",
-								day: "numeric",
-							});
-						} catch (error) {
-							return label; // Return original label if parsing fails
-						}
-					},
-				},
-				grid: {
-					color: isDark ? "#374151" : "#E5E7EB",
-				},
-			},
-			y: {
-				display: true,
-				title: {
-					display: true,
-					text: "Number of Packages",
-					color: isDark ? "#ffffff" : "#374151",
-				},
-				ticks: {
-					color: isDark ? "#ffffff" : "#374151",
-					font: {
-						size: 11,
-					},
-					beginAtZero: true,
-				},
-				grid: {
-					color: isDark ? "#374151" : "#E5E7EB",
-				},
-			},
-		},
-		interaction: {
-			mode: "nearest",
-			axis: "x",
-			intersect: false,
-		},
-	};
-
 	const barChartOptions = {
 		responsive: true,
 		indexAxis: "y", // Make the chart horizontal
@@ -1316,7 +1100,6 @@ const Dashboard = () => {
 				},
 			},
 		},
-		onClick: handleOSChartClick,
 	};
 
 	const osChartData = {
@@ -1462,12 +1245,7 @@ const Dashboard = () => {
 								className={getGroupClassName(group.type)}
 							>
 								{group.cards.map((card, cardIndex) => (
-									<div
-										key={`card-${card.cardId}-${groupIndex}-${cardIndex}`}
-										className={
-											card.cardId === "packageTrends" ? "lg:col-span-2" : ""
-										}
-									>
+									<div key={`card-${card.cardId}-${groupIndex}-${cardIndex}`}>
 										{renderCard(card.cardId)}
 									</div>
 								))}

frontend/src/pages/Hosts.jsx

@@ -657,18 +657,6 @@ const Hosts = () => {
 		hideStale,
 	]);
 
-	// Get unique OS types from hosts for dynamic dropdown
-	const uniqueOsTypes = useMemo(() => {
-		if (!hosts) return [];
-		const osTypes = new Set();
-		hosts.forEach((host) => {
-			if (host.os_type) {
-				osTypes.add(host.os_type);
-			}
-		});
-		return Array.from(osTypes).sort();
-	}, [hosts]);
-
 	// Group hosts by selected field
 	const groupedHosts = useMemo(() => {
 		if (groupBy === "none") {
@@ -882,11 +870,9 @@ const Hosts = () => {
 				return (
 					<button
 						type="button"
-						onClick={() =>
-							navigate(`/packages?host=${host.id}&filter=outdated`)
-						}
+						onClick={() => navigate(`/packages?host=${host.id}`)}
 						className="text-sm text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 font-medium hover:underline"
-						title="View outdated packages for this host"
+						title="View packages for this host"
 					>
 						{host.updatesCount || 0}
 					</button>
@@ -1280,11 +1266,9 @@ const Hosts = () => {
 											className="w-full border border-secondary-300 dark:border-secondary-600 rounded-lg px-3 py-2 focus:ring-2 focus:ring-primary-500 focus:border-primary-500 bg-white dark:bg-secondary-800 text-secondary-900 dark:text-white"
 										>
 											<option value="all">All OS</option>
-											{uniqueOsTypes.map((osType) => (
-												<option key={osType} value={osType.toLowerCase()}>
-													{osType}
-												</option>
-											))}
+											<option value="linux">Linux</option>
+											<option value="windows">Windows</option>
+											<option value="macos">macOS</option>
 										</select>
 									</div>
 									<div className="flex items-end">
@@ -1570,7 +1554,6 @@ const BulkAssignModal = ({
 	isLoading,
 }) => {
 	const [selectedGroupId, setSelectedGroupId] = useState("");
-	const bulkHostGroupId = useId();
 
 	// Fetch host groups for selection
 	const { data: hostGroups } = useQuery({
@@ -1589,31 +1572,28 @@ const BulkAssignModal = ({
 
 	return (
 		<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
-			<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 w-full max-w-md">
+			<div className="bg-white rounded-lg p-6 w-full max-w-md">
 				<div className="flex justify-between items-center mb-4">
-					<h3 className="text-lg font-semibold text-secondary-900 dark:text-white">
+					<h3 className="text-lg font-semibold text-secondary-900">
 						Assign to Host Group
 					</h3>
 					<button
 						type="button"
 						onClick={onClose}
-						className="text-secondary-400 hover:text-secondary-600 dark:text-secondary-300 dark:hover:text-secondary-100"
+						className="text-secondary-400 hover:text-secondary-600"
 					>
 						<X className="h-5 w-5" />
 					</button>
 				</div>
 
 				<div className="mb-4">
-					<p className="text-sm text-secondary-600 dark:text-secondary-400 mb-2">
+					<p className="text-sm text-secondary-600 mb-2">
 						Assigning {selectedHosts.length} host
 						{selectedHosts.length !== 1 ? "s" : ""}:
 					</p>
-					<div className="max-h-32 overflow-y-auto bg-secondary-50 dark:bg-secondary-700 rounded-md p-3">
+					<div className="max-h-32 overflow-y-auto bg-secondary-50 rounded-md p-3">
 						{selectedHostNames.map((friendlyName) => (
-							<div
-								key={friendlyName}
-								className="text-sm text-secondary-700 dark:text-secondary-300"
-							>
+							<div key={friendlyName} className="text-sm text-secondary-700">
 								• {friendlyName}
 							</div>
 						))}
@@ -1624,7 +1604,7 @@ const BulkAssignModal = ({
 					<div>
 						<label
 							htmlFor={bulkHostGroupId}
-							className="block text-sm font-medium text-secondary-700 dark:text-secondary-300 mb-1"
+							className="block text-sm font-medium text-secondary-700 mb-1"
 						>
 							Host Group
 						</label>
@@ -1632,7 +1612,7 @@ const BulkAssignModal = ({
 							id={bulkHostGroupId}
 							value={selectedGroupId}
 							onChange={(e) => setSelectedGroupId(e.target.value)}
-							className="w-full px-3 py-2 border border-secondary-300 dark:border-secondary-600 rounded-md bg-white dark:bg-secondary-700 text-secondary-900 dark:text-white focus:outline-none focus:ring-2 focus:ring-primary-500"
+							className="w-full px-3 py-2 border border-secondary-300 rounded-md focus:outline-none focus:ring-2 focus:ring-primary-500"
 						>
 							<option value="">No group (ungrouped)</option>
 							{hostGroups?.map((group) => (
@@ -1641,7 +1621,7 @@ const BulkAssignModal = ({
 								</option>
 							))}
 						</select>
-						<p className="mt-1 text-sm text-secondary-500 dark:text-secondary-400">
+						<p className="mt-1 text-sm text-secondary-500">
 							Select a group to assign these hosts to, or leave ungrouped.
 						</p>
 					</div>

frontend/src/pages/Login.jsx

@@ -22,7 +22,6 @@ const Login = () => {
 	const emailId = useId();
 	const passwordId = useId();
 	const tokenId = useId();
-	const rememberMeId = useId();
 	const { login, setAuthState } = useAuth();
 	const [isSignupMode, setIsSignupMode] = useState(false);
 	const [formData, setFormData] = useState({
@@ -34,7 +33,6 @@ const Login = () => {
 	});
 	const [tfaData, setTfaData] = useState({
 		token: "",
-		remember_me: false,
 	});
 	const [showPassword, setShowPassword] = useState(false);
 	const [isLoading, setIsLoading] = useState(false);
@@ -129,11 +127,7 @@ const Login = () => {
 		setError("");
 
 		try {
-			const response = await authAPI.verifyTfa(
-				tfaUsername,
-				tfaData.token,
-				tfaData.remember_me,
-			);
+			const response = await authAPI.verifyTfa(tfaUsername, tfaData.token);
 
 			if (response.data?.token) {
 				// Update AuthContext with the new authentication state
@@ -164,11 +158,9 @@ const Login = () => {
 	};
 
 	const handleTfaInputChange = (e) => {
-		const { name, value, type, checked } = e.target;
 		setTfaData({
 			...tfaData,
-			[name]:
-				type === "checkbox" ? checked : value.replace(/\D/g, "").slice(0, 6),
+			[e.target.name]: e.target.value.replace(/\D/g, "").slice(0, 6),
 		});
 		// Clear error when user starts typing
 		if (error) {
@@ -178,7 +170,7 @@ const Login = () => {
 
 	const handleBackToLogin = () => {
 		setRequiresTfa(false);
-		setTfaData({ token: "", remember_me: false });
+		setTfaData({ token: "" });
 		setError("");
 	};
 
@@ -444,23 +436,6 @@ const Login = () => {
 							</div>
 						</div>
 
-						<div className="flex items-center">
-							<input
-								id={rememberMeId}
-								name="remember_me"
-								type="checkbox"
-								checked={tfaData.remember_me}
-								onChange={handleTfaInputChange}
-								className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-secondary-300 rounded"
-							/>
-							<label
-								htmlFor={rememberMeId}
-								className="ml-2 block text-sm text-secondary-700"
-							>
-								Remember me on this computer (skip TFA for 30 days)
-							</label>
-						</div>
-
 						{error && (
 							<div className="bg-danger-50 border border-danger-200 rounded-md p-3">
 								<div className="flex">

frontend/src/pages/PackageDetail.jsx

@@ -1,476 +1,23 @@
-import { useQuery } from "@tanstack/react-query";
-import {
-	AlertTriangle,
-	ArrowLeft,
-	Calendar,
-	ChartColumnBig,
-	ChevronRight,
-	Download,
-	Package,
-	RefreshCw,
-	Search,
-	Server,
-	Shield,
-	Tag,
-} from "lucide-react";
-import { useMemo, useState } from "react";
-import { useNavigate, useParams } from "react-router-dom";
-import { formatRelativeTime, packagesAPI } from "../utils/api";
+import { Package } from "lucide-react";
+import { useParams } from "react-router-dom";
 
 const PackageDetail = () => {
 	const { packageId } = useParams();
-	const decodedPackageId = decodeURIComponent(packageId || "");
-	const navigate = useNavigate();
-	const [searchTerm, setSearchTerm] = useState("");
-	const [currentPage, setCurrentPage] = useState(1);
-	const [pageSize, setPageSize] = useState(25);
-
-	// Fetch package details
-	const {
-		data: packageData,
-		isLoading: isLoadingPackage,
-		error: packageError,
-		refetch: refetchPackage,
-	} = useQuery({
-		queryKey: ["package", decodedPackageId],
-		queryFn: () =>
-			packagesAPI.getById(decodedPackageId).then((res) => res.data),
-		staleTime: 5 * 60 * 1000,
-		refetchOnWindowFocus: false,
-		enabled: !!decodedPackageId,
-	});
-
-	// Fetch hosts that have this package
-	const {
-		data: hostsData,
-		isLoading: isLoadingHosts,
-		error: hostsError,
-		refetch: refetchHosts,
-	} = useQuery({
-		queryKey: ["package-hosts", decodedPackageId, searchTerm],
-		queryFn: () =>
-			packagesAPI
-				.getHosts(decodedPackageId, { search: searchTerm, limit: 1000 })
-				.then((res) => res.data),
-		staleTime: 5 * 60 * 1000,
-		refetchOnWindowFocus: false,
-		enabled: !!decodedPackageId,
-	});
-
-	const hosts = hostsData?.hosts || [];
-
-	// Filter and paginate hosts
-	const filteredAndPaginatedHosts = useMemo(() => {
-		let filtered = hosts;
-
-		if (searchTerm) {
-			filtered = hosts.filter(
-				(host) =>
-					host.friendlyName?.toLowerCase().includes(searchTerm.toLowerCase()) ||
-					host.hostname?.toLowerCase().includes(searchTerm.toLowerCase()),
-			);
-		}
-
-		const startIndex = (currentPage - 1) * pageSize;
-		const endIndex = startIndex + pageSize;
-		return filtered.slice(startIndex, endIndex);
-	}, [hosts, searchTerm, currentPage, pageSize]);
-
-	const totalPages = Math.ceil(
-		(searchTerm
-			? hosts.filter(
-					(host) =>
-						host.friendlyName
-							?.toLowerCase()
-							.includes(searchTerm.toLowerCase()) ||
-						host.hostname?.toLowerCase().includes(searchTerm.toLowerCase()),
-				).length
-			: hosts.length) / pageSize,
-	);
-
-	const handleHostClick = (hostId) => {
-		navigate(`/hosts/${hostId}`);
-	};
-
-	const handleRefresh = () => {
-		refetchPackage();
-		refetchHosts();
-	};
-
-	if (isLoadingPackage) {
-		return (
-			<div className="flex items-center justify-center h-64">
-				<RefreshCw className="h-8 w-8 animate-spin text-primary-600" />
-			</div>
-		);
-	}
-
-	if (packageError) {
-		return (
-			<div className="space-y-6">
-				<div className="bg-danger-50 border border-danger-200 rounded-md p-4">
-					<div className="flex">
-						<AlertTriangle className="h-5 w-5 text-danger-400" />
-						<div className="ml-3">
-							<h3 className="text-sm font-medium text-danger-800">
-								Error loading package
-							</h3>
-							<p className="text-sm text-danger-700 mt-1">
-								{packageError.message || "Failed to load package details"}
-							</p>
-							<button
-								type="button"
-								onClick={() => refetchPackage()}
-								className="mt-2 btn-danger text-xs"
-							>
-								Try again
-							</button>
-						</div>
-					</div>
-				</div>
-			</div>
-		);
-	}
-
-	if (!packageData) {
-		return (
-			<div className="space-y-6">
-				<div className="text-center py-8">
-					<Package className="h-12 w-12 text-secondary-400 mx-auto mb-4" />
-					<p className="text-secondary-500 dark:text-secondary-300">
-						Package not found
-					</p>
-				</div>
-			</div>
-		);
-	}
-
-	const pkg = packageData;
-	const stats = packageData.stats || {};
 
 	return (
 		<div className="space-y-6">
-			{/* Header */}
-			<div className="flex items-center justify-between">
-				<div className="flex items-center gap-4">
-					<button
-						type="button"
-						onClick={() => navigate("/packages")}
-						className="flex items-center gap-2 text-secondary-600 hover:text-secondary-900 dark:text-secondary-400 dark:hover:text-white transition-colors"
-					>
-						<ArrowLeft className="h-4 w-4" />
-						Back to Packages
-					</button>
-					<ChevronRight className="h-4 w-4 text-secondary-400" />
-					<h1 className="text-2xl font-semibold text-secondary-900 dark:text-white">
-						{pkg.name}
-					</h1>
-				</div>
-				<button
-					type="button"
-					onClick={handleRefresh}
-					disabled={isLoadingPackage || isLoadingHosts}
-					className="btn-outline flex items-center gap-2"
-				>
-					<RefreshCw
-						className={`h-4 w-4 ${
-							isLoadingPackage || isLoadingHosts ? "animate-spin" : ""
-						}`}
-					/>
-					Refresh
-				</button>
-			</div>
-
-			{/* Package Overview */}
-			<div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
-				{/* Main Package Info */}
-				<div className="lg:col-span-2">
-					<div className="card p-6">
-						<div className="flex items-start gap-4 mb-4">
-							<Package className="h-8 w-8 text-primary-600 flex-shrink-0 mt-1" />
-							<div className="flex-1">
-								<h2 className="text-xl font-semibold text-secondary-900 dark:text-white mb-2">
-									{pkg.name}
-								</h2>
-								{pkg.description && (
-									<p className="text-secondary-600 dark:text-secondary-300 mb-4">
-										{pkg.description}
-									</p>
-								)}
-								<div className="flex flex-wrap gap-4 text-sm">
-									{pkg.category && (
-										<div className="flex items-center gap-2">
-											<Tag className="h-4 w-4 text-secondary-400" />
-											<span className="text-secondary-600 dark:text-secondary-300">
-												Category: {pkg.category}
-											</span>
-										</div>
-									)}
-									{pkg.latest_version && (
-										<div className="flex items-center gap-2">
-											<Download className="h-4 w-4 text-secondary-400" />
-											<span className="text-secondary-600 dark:text-secondary-300">
-												Latest: {pkg.latest_version}
-											</span>
-										</div>
-									)}
-									{pkg.updated_at && (
-										<div className="flex items-center gap-2">
-											<Calendar className="h-4 w-4 text-secondary-400" />
-											<span className="text-secondary-600 dark:text-secondary-300">
-												Updated: {formatRelativeTime(pkg.updated_at)}
-											</span>
-										</div>
-									)}
-								</div>
-							</div>
-						</div>
-
-						{/* Status Badge */}
-						<div className="mb-4">
-							{stats.updatesNeeded > 0 ? (
-								stats.securityUpdates > 0 ? (
-									<span className="badge-danger flex items-center gap-1 w-fit">
-										<Shield className="h-3 w-3" />
-										Security Update Available
-									</span>
-								) : (
-									<span className="badge-warning w-fit">Update Available</span>
-								)
-							) : (
-								<span className="badge-success w-fit">Up to Date</span>
-							)}
-						</div>
-					</div>
-				</div>
-
-				{/* Statistics */}
-				<div className="space-y-4">
-					<div className="card p-4">
-						<div className="flex items-center gap-3 mb-3">
-							<ChartColumnBig className="h-5 w-5 text-primary-600" />
-							<h3 className="font-medium text-secondary-900 dark:text-white">
-								Installation Stats
-							</h3>
-						</div>
-						<div className="space-y-3">
-							<div className="flex justify-between">
-								<span className="text-secondary-600 dark:text-secondary-300">
-									Total Installations
-								</span>
-								<span className="font-semibold text-secondary-900 dark:text-white">
-									{stats.totalInstalls || 0}
-								</span>
-							</div>
-							{stats.updatesNeeded > 0 && (
-								<div className="flex justify-between">
-									<span className="text-secondary-600 dark:text-secondary-300">
-										Hosts Needing Updates
-									</span>
-									<span className="font-semibold text-warning-600">
-										{stats.updatesNeeded}
-									</span>
-								</div>
-							)}
-							{stats.securityUpdates > 0 && (
-								<div className="flex justify-between">
-									<span className="text-secondary-600 dark:text-secondary-300">
-										Security Updates
-									</span>
-									<span className="font-semibold text-danger-600">
-										{stats.securityUpdates}
-									</span>
-								</div>
-							)}
-							<div className="flex justify-between">
-								<span className="text-secondary-600 dark:text-secondary-300">
-									Up to Date
-								</span>
-								<span className="font-semibold text-success-600">
-									{(stats.totalInstalls || 0) - (stats.updatesNeeded || 0)}
-								</span>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-
-			{/* Hosts List */}
-			<div className="card">
-				<div className="px-6 py-4 border-b border-secondary-200 dark:border-secondary-600">
-					<div className="flex items-center justify-between mb-4">
-						<div className="flex items-center gap-3">
-							<Server className="h-5 w-5 text-primary-600" />
-							<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
-								Installed On Hosts ({hosts.length})
-							</h3>
-						</div>
-					</div>
-
-					{/* Search */}
-					<div className="relative max-w-sm">
-						<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-secondary-400" />
-						<input
-							type="text"
-							placeholder="Search hosts..."
-							value={searchTerm}
-							onChange={(e) => {
-								setSearchTerm(e.target.value);
-								setCurrentPage(1);
-							}}
-							className="w-full pl-10 pr-4 py-2 border border-secondary-300 dark:border-secondary-600 rounded-md focus:ring-2 focus:ring-primary-500 focus:border-transparent bg-white dark:bg-secondary-800 text-secondary-900 dark:text-white placeholder-secondary-500 dark:placeholder-secondary-400"
-						/>
-					</div>
-				</div>
-
-				<div className="overflow-x-auto">
-					{isLoadingHosts ? (
-						<div className="flex items-center justify-center h-32">
-							<RefreshCw className="h-6 w-6 animate-spin text-primary-600" />
-						</div>
-					) : hostsError ? (
-						<div className="p-6">
-							<div className="bg-danger-50 border border-danger-200 rounded-md p-4">
-								<div className="flex">
-									<AlertTriangle className="h-5 w-5 text-danger-400" />
-									<div className="ml-3">
-										<h3 className="text-sm font-medium text-danger-800">
-											Error loading hosts
-										</h3>
-										<p className="text-sm text-danger-700 mt-1">
-											{hostsError.message || "Failed to load hosts"}
-										</p>
-									</div>
-								</div>
-							</div>
-						</div>
-					) : filteredAndPaginatedHosts.length === 0 ? (
-						<div className="text-center py-8">
-							<Server className="h-12 w-12 text-secondary-400 mx-auto mb-4" />
-							<p className="text-secondary-500 dark:text-secondary-300">
-								{searchTerm
-									? "No hosts match your search"
-									: "No hosts have this package installed"}
-							</p>
-						</div>
-					) : (
-						<>
-							<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-600">
-								<thead className="bg-secondary-50 dark:bg-secondary-700">
-									<tr>
-										<th className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-											Host
-										</th>
-										<th className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-											Current Version
-										</th>
-										<th className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-											Status
-										</th>
-										<th className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-											Last Updated
-										</th>
-									</tr>
-								</thead>
-								<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-600">
-									{filteredAndPaginatedHosts.map((host) => (
-										<tr
-											key={host.hostId}
-											className="hover:bg-secondary-50 dark:hover:bg-secondary-700 cursor-pointer transition-colors"
-											onClick={() => handleHostClick(host.hostId)}
-										>
-											<td className="px-6 py-4 whitespace-nowrap">
-												<div className="flex items-center">
-													<Server className="h-5 w-5 text-secondary-400 mr-3" />
-													<div>
-														<div className="text-sm font-medium text-secondary-900 dark:text-white">
-															{host.friendlyName || host.hostname}
-														</div>
-														{host.friendlyName && host.hostname && (
-															<div className="text-sm text-secondary-500 dark:text-secondary-300">
-																{host.hostname}
-															</div>
-														)}
-													</div>
-												</div>
-											</td>
-											<td className="px-6 py-4 whitespace-nowrap text-sm text-secondary-900 dark:text-white">
-												{host.currentVersion || "Unknown"}
-											</td>
-											<td className="px-6 py-4 whitespace-nowrap">
-												{host.needsUpdate ? (
-													host.isSecurityUpdate ? (
-														<span className="badge-danger flex items-center gap-1 w-fit">
-															<Shield className="h-3 w-3" />
-															Security Update
-														</span>
-													) : (
-														<span className="badge-warning w-fit">
-															Update Available
-														</span>
-													)
-												) : (
-													<span className="badge-success w-fit">
-														Up to Date
-													</span>
-												)}
-											</td>
-											<td className="px-6 py-4 whitespace-nowrap text-sm text-secondary-500 dark:text-secondary-300">
-												{host.lastUpdate
-													? formatRelativeTime(host.lastUpdate)
-													: "Never"}
-											</td>
-										</tr>
-									))}
-								</tbody>
-							</table>
-
-							{/* Pagination */}
-							{totalPages > 1 && (
-								<div className="px-6 py-3 bg-white dark:bg-secondary-800 border-t border-secondary-200 dark:border-secondary-600 flex items-center justify-between">
-									<div className="flex items-center gap-2">
-										<span className="text-sm text-secondary-700 dark:text-secondary-300">
-											Rows per page:
-										</span>
-										<select
-											value={pageSize}
-											onChange={(e) => {
-												setPageSize(Number(e.target.value));
-												setCurrentPage(1);
-											}}
-											className="text-sm border border-secondary-300 dark:border-secondary-600 rounded px-2 py-1 bg-white dark:bg-secondary-700 text-secondary-900 dark:text-white"
-										>
-											<option value={25}>25</option>
-											<option value={50}>50</option>
-											<option value={100}>100</option>
-										</select>
-									</div>
-									<div className="flex items-center gap-2">
-										<button
-											type="button"
-											onClick={() => setCurrentPage(currentPage - 1)}
-											disabled={currentPage === 1}
-											className="px-3 py-1 text-sm border border-secondary-300 dark:border-secondary-600 rounded disabled:opacity-50 disabled:cursor-not-allowed hover:bg-secondary-50 dark:hover:bg-secondary-700"
-										>
-											Previous
-										</button>
-										<span className="text-sm text-secondary-700 dark:text-secondary-300">
-											Page {currentPage} of {totalPages}
-										</span>
-										<button
-											type="button"
-											onClick={() => setCurrentPage(currentPage + 1)}
-											disabled={currentPage === totalPages}
-											className="px-3 py-1 text-sm border border-secondary-300 dark:border-secondary-600 rounded disabled:opacity-50 disabled:cursor-not-allowed hover:bg-secondary-50 dark:hover:bg-secondary-700"
-										>
-											Next
-										</button>
-									</div>
-								</div>
-							)}
-						</>
-					)}
-				</div>
+			<div className="card p-8 text-center">
+				<Package className="h-12 w-12 text-secondary-400 mx-auto mb-4" />
+				<h3 className="text-lg font-medium text-secondary-900 mb-2">
+					Package Details
+				</h3>
+				<p className="text-secondary-600">
+					Detailed view for package: {packageId}
+				</p>
+				<p className="text-secondary-600 mt-2">
+					This page will show package information, affected hosts, version
+					distribution, and more.
+				</p>
 			</div>
 		</div>
 	);

frontend/src/pages/Packages.jsx

@@ -4,8 +4,6 @@ import {
 	ArrowDown,
 	ArrowUp,
 	ArrowUpDown,
-	ChevronLeft,
-	ChevronRight,
 	Columns,
 	Eye as EyeIcon,
 	EyeOff as EyeOffIcon,
@@ -19,28 +17,16 @@ import {
 } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { useNavigate, useSearchParams } from "react-router-dom";
-import { dashboardAPI, packagesAPI } from "../utils/api";
+import { dashboardAPI } from "../utils/api";
 
 const Packages = () => {
 	const [searchTerm, setSearchTerm] = useState("");
 	const [categoryFilter, setCategoryFilter] = useState("all");
-	const [updateStatusFilter, setUpdateStatusFilter] = useState("all-packages");
+	const [securityFilter, setSecurityFilter] = useState("all");
 	const [hostFilter, setHostFilter] = useState("all");
 	const [sortField, setSortField] = useState("name");
 	const [sortDirection, setSortDirection] = useState("asc");
 	const [showColumnSettings, setShowColumnSettings] = useState(false);
-	const [currentPage, setCurrentPage] = useState(1);
-	const [pageSize, setPageSize] = useState(() => {
-		const saved = localStorage.getItem("packages-page-size");
-		if (saved) {
-			const parsedSize = parseInt(saved, 10);
-			// Validate that the saved page size is one of the allowed values
-			if ([25, 50, 100, 200].includes(parsedSize)) {
-				return parsedSize;
-			}
-		}
-		return 25; // Default fallback
-	});
 	const [searchParams] = useSearchParams();
 	const navigate = useNavigate();
 
@@ -56,8 +42,8 @@ const Packages = () => {
 	const [columnConfig, setColumnConfig] = useState(() => {
 		const defaultConfig = [
 			{ id: "name", label: "Package", visible: true, order: 0 },
-			{ id: "packageHosts", label: "Installed On", visible: true, order: 1 },
-			{ id: "status", label: "Status", visible: true, order: 2 },
+			{ id: "affectedHosts", label: "Affected Hosts", visible: true, order: 1 },
+			{ id: "priority", label: "Priority", visible: true, order: 2 },
 			{ id: "latestVersion", label: "Latest Version", visible: true, order: 3 },
 		];
 
@@ -79,10 +65,10 @@ const Packages = () => {
 		localStorage.setItem("packages-column-config", JSON.stringify(newConfig));
 	};
 
-	// Handle hosts click (view hosts where package is installed)
-	const handlePackageHostsClick = (pkg) => {
-		const packageHosts = pkg.packageHosts || [];
-		const hostIds = packageHosts.map((host) => host.hostId);
+	// Handle affected hosts click
+	const handleAffectedHostsClick = (pkg) => {
+		const affectedHosts = pkg.affectedHosts || [];
+		const hostIds = affectedHosts.map((host) => host.hostId);
 
 		// Create URL with selected hosts and filter
 		const params = new URLSearchParams();
@@ -100,59 +86,27 @@ const Packages = () => {
 			// For outdated packages, we want to show all packages that need updates
 			// This is the default behavior, so we don't need to change filters
 			setCategoryFilter("all");
-			setUpdateStatusFilter("needs-updates");
+			setSecurityFilter("all");
 		} else if (filter === "security") {
 			// For security updates, filter to show only security updates
-			setUpdateStatusFilter("security-updates");
-			setCategoryFilter("all");
-		} else if (filter === "regular") {
-			// For regular (non-security) updates
-			setUpdateStatusFilter("regular-updates");
+			setSecurityFilter("security");
 			setCategoryFilter("all");
 		}
 	}, [searchParams]);
 
 	const {
-		data: packagesResponse,
+		data: packages,
 		isLoading,
 		error,
 		refetch,
 		isFetching,
 	} = useQuery({
-		queryKey: ["packages", hostFilter, updateStatusFilter],
-		queryFn: () => {
-			const params = { limit: 10000 }; // High limit to effectively get all packages
-			if (hostFilter && hostFilter !== "all") {
-				params.host = hostFilter;
-			}
-			// Pass update status filter to backend to pre-filter packages
-			if (updateStatusFilter === "needs-updates") {
-				params.needsUpdate = "true";
-			} else if (updateStatusFilter === "security-updates") {
-				params.isSecurityUpdate = "true";
-			}
-			return packagesAPI.getAll(params).then((res) => res.data);
-		},
+		queryKey: ["packages"],
+		queryFn: () => dashboardAPI.getPackages().then((res) => res.data),
 		staleTime: 5 * 60 * 1000, // Data stays fresh for 5 minutes
 		refetchOnWindowFocus: false, // Don't refetch when window regains focus
 	});
 
-	// Extract packages from the response and normalise the data structure
-	const packages = useMemo(() => {
-		if (!packagesResponse?.packages) return [];
-
-		return packagesResponse.packages.map((pkg) => ({
-			...pkg,
-			// Normalise field names to match the frontend expectations
-			packageHostsCount: pkg.packageHostsCount || pkg.stats?.totalInstalls || 0,
-			latestVersion: pkg.latest_version || pkg.latestVersion || "Unknown",
-			isUpdatable: (pkg.stats?.updatesNeeded || 0) > 0,
-			isSecurityUpdate: (pkg.stats?.securityUpdates || 0) > 0,
-			// Ensure we have hosts array (for packages, this contains all hosts where the package is installed)
-			packageHosts: pkg.packageHosts || [],
-		}));
-	}, [packagesResponse]);
-
 	// Fetch hosts data to get total packages count
 	const { data: hosts } = useQuery({
 		queryKey: ["hosts"],
@@ -174,24 +128,17 @@ const Packages = () => {
 			const matchesCategory =
 				categoryFilter === "all" || pkg.category === categoryFilter;
 
-			const matchesUpdateStatus =
-				updateStatusFilter === "all-packages" ||
-				(updateStatusFilter === "needs-updates" &&
-					(pkg.stats?.updatesNeeded || 0) > 0) ||
-				(updateStatusFilter === "security-updates" &&
-					(pkg.stats?.securityUpdates || 0) > 0) ||
-				(updateStatusFilter === "regular-updates" &&
-					(pkg.stats?.updatesNeeded || 0) > 0 &&
-					(pkg.stats?.securityUpdates || 0) === 0);
+			const matchesSecurity =
+				securityFilter === "all" ||
+				(securityFilter === "security" && pkg.isSecurityUpdate) ||
+				(securityFilter === "regular" && !pkg.isSecurityUpdate);
 
-			const packageHosts = pkg.packageHosts || [];
+			const affectedHosts = pkg.affectedHosts || [];
 			const matchesHost =
 				hostFilter === "all" ||
-				packageHosts.some((host) => host.hostId === hostFilter);
+				affectedHosts.some((host) => host.hostId === hostFilter);
 
-			return (
-				matchesSearch && matchesCategory && matchesUpdateStatus && matchesHost
-			);
+			return matchesSearch && matchesCategory && matchesSecurity && matchesHost;
 		});
 
 		// Sorting
@@ -207,38 +154,14 @@ const Packages = () => {
 					aValue = a.latestVersion?.toLowerCase() || "";
 					bValue = b.latestVersion?.toLowerCase() || "";
 					break;
-				case "packageHosts":
-					aValue = a.packageHostsCount || a.packageHosts?.length || 0;
-					bValue = b.packageHostsCount || b.packageHosts?.length || 0;
+				case "affectedHosts":
+					aValue = a.affectedHostsCount || a.affectedHosts?.length || 0;
+					bValue = b.affectedHostsCount || b.affectedHosts?.length || 0;
 					break;
-				case "status": {
-					// Handle sorting for the three status states: Up to Date, Update Available, Security Update Available
-					const aNeedsUpdates = (a.stats?.updatesNeeded || 0) > 0;
-					const bNeedsUpdates = (b.stats?.updatesNeeded || 0) > 0;
-
-					// Define priority order: Security Update (0) > Regular Update (1) > Up to Date (2)
-					let aPriority, bPriority;
-
-					if (!aNeedsUpdates) {
-						aPriority = 2; // Up to Date
-					} else if (a.isSecurityUpdate) {
-						aPriority = 0; // Security Update
-					} else {
-						aPriority = 1; // Regular Update
-					}
-
-					if (!bNeedsUpdates) {
-						bPriority = 2; // Up to Date
-					} else if (b.isSecurityUpdate) {
-						bPriority = 0; // Security Update
-					} else {
-						bPriority = 1; // Regular Update
-					}
-
-					aValue = aPriority;
-					bValue = bPriority;
+				case "priority":
+					aValue = a.isSecurityUpdate ? 0 : 1; // Security updates first
+					bValue = b.isSecurityUpdate ? 0 : 1;
 					break;
-				}
 				default:
 					aValue = a.name?.toLowerCase() || "";
 					bValue = b.name?.toLowerCase() || "";
@@ -254,33 +177,12 @@ const Packages = () => {
 		packages,
 		searchTerm,
 		categoryFilter,
-		updateStatusFilter,
+		securityFilter,
 		sortField,
 		sortDirection,
 		hostFilter,
 	]);
 
-	// Calculate pagination
-	const totalPages = Math.ceil(filteredAndSortedPackages.length / pageSize);
-	const startIndex = (currentPage - 1) * pageSize;
-	const endIndex = startIndex + pageSize;
-	const paginatedPackages = filteredAndSortedPackages.slice(
-		startIndex,
-		endIndex,
-	);
-
-	// Reset to first page when filters or page size change
-	// biome-ignore lint/correctness/useExhaustiveDependencies: We want this effect to run when filter values or page size change to reset pagination
-	useEffect(() => {
-		setCurrentPage(1);
-	}, [searchTerm, categoryFilter, updateStatusFilter, hostFilter, pageSize]);
-
-	// Function to handle page size change and save to localStorage
-	const handlePageSizeChange = (newPageSize) => {
-		setPageSize(newPageSize);
-		localStorage.setItem("packages-page-size", newPageSize.toString());
-	};
-
 	// Get visible columns in order
 	const visibleColumns = columnConfig
 		.filter((col) => col.visible)
@@ -329,8 +231,8 @@ const Packages = () => {
 	const resetColumns = () => {
 		const defaultConfig = [
 			{ id: "name", label: "Package", visible: true, order: 0 },
-			{ id: "packageHosts", label: "Installed On", visible: true, order: 1 },
-			{ id: "status", label: "Status", visible: true, order: 2 },
+			{ id: "affectedHosts", label: "Affected Hosts", visible: true, order: 1 },
+			{ id: "priority", label: "Priority", visible: true, order: 2 },
 			{ id: "latestVersion", label: "Latest Version", visible: true, order: 3 },
 		];
 		updateColumnConfig(defaultConfig);
@@ -341,14 +243,10 @@ const Packages = () => {
 		switch (column.id) {
 			case "name":
 				return (
-					<button
-						type="button"
-						onClick={() => navigate(`/packages/${pkg.id}`)}
-						className="flex items-center text-left hover:bg-secondary-100 dark:hover:bg-secondary-700 rounded p-2 -m-2 transition-colors group w-full"
-					>
-						<Package className="h-5 w-5 text-secondary-400 mr-3 flex-shrink-0" />
-						<div className="flex-1">
-							<div className="text-sm font-medium text-secondary-900 dark:text-white group-hover:text-primary-600 dark:group-hover:text-primary-400">
+					<div className="flex items-center">
+						<Package className="h-5 w-5 text-secondary-400 mr-3" />
+						<div>
+							<div className="text-sm font-medium text-secondary-900 dark:text-white">
 								{pkg.name}
 							</div>
 							{pkg.description && (
@@ -362,58 +260,33 @@ const Packages = () => {
 								</div>
 							)}
 						</div>
-					</button>
+					</div>
 				);
-			case "packageHosts": {
-				// Show total number of hosts where this package is installed
-				const installedHostsCount =
-					pkg.packageHostsCount ||
-					pkg.stats?.totalInstalls ||
-					pkg.packageHosts?.length ||
-					0;
-				// For packages that need updates, show how many need updates
-				const hostsNeedingUpdates = pkg.stats?.updatesNeeded || 0;
-
-				const displayText =
-					hostsNeedingUpdates > 0 && hostsNeedingUpdates < installedHostsCount
-						? `${hostsNeedingUpdates}/${installedHostsCount} hosts`
-						: `${installedHostsCount} host${installedHostsCount !== 1 ? "s" : ""}`;
-
-				const titleText =
-					hostsNeedingUpdates > 0 && hostsNeedingUpdates < installedHostsCount
-						? `${hostsNeedingUpdates} of ${installedHostsCount} hosts need updates`
-						: `Installed on ${installedHostsCount} host${installedHostsCount !== 1 ? "s" : ""}`;
-
+			case "affectedHosts": {
+				const affectedHostsCount =
+					pkg.affectedHostsCount || pkg.affectedHosts?.length || 0;
 				return (
 					<button
 						type="button"
-						onClick={() => handlePackageHostsClick(pkg)}
+						onClick={() => handleAffectedHostsClick(pkg)}
 						className="text-left hover:bg-secondary-100 dark:hover:bg-secondary-700 rounded p-1 -m-1 transition-colors group"
-						title={titleText}
+						title={`Click to view all ${affectedHostsCount} affected hosts`}
 					>
 						<div className="text-sm text-secondary-900 dark:text-white group-hover:text-primary-600 dark:group-hover:text-primary-400">
-							{displayText}
+							{affectedHostsCount} host{affectedHostsCount !== 1 ? "s" : ""}
 						</div>
 					</button>
 				);
 			}
-			case "status": {
-				// Check if this package needs updates
-				const needsUpdates = (pkg.stats?.updatesNeeded || 0) > 0;
-
-				if (!needsUpdates) {
-					return <span className="badge-success">Up to Date</span>;
-				}
-
+			case "priority":
 				return pkg.isSecurityUpdate ? (
-					<span className="badge-danger">
+					<span className="badge-danger flex items-center gap-1">
 						<Shield className="h-3 w-3" />
-						Security Update Available
+						Security Update
 					</span>
 				) : (
-					<span className="badge-warning">Update Available</span>
+					<span className="badge-warning">Regular Update</span>
 				);
-			}
 			case "latestVersion":
 				return (
 					<div
@@ -432,38 +305,28 @@ const Packages = () => {
 	const categories =
 		[...new Set(packages?.map((pkg) => pkg.category).filter(Boolean))] || [];
 
-	// Calculate unique package hosts
-	const uniquePackageHosts = new Set();
+	// Calculate unique affected hosts
+	const uniqueAffectedHosts = new Set();
 	packages?.forEach((pkg) => {
-		// Only count hosts for packages that need updates
-		if ((pkg.stats?.updatesNeeded || 0) > 0) {
-			const packageHosts = pkg.packageHosts || [];
-			packageHosts.forEach((host) => {
-				uniquePackageHosts.add(host.hostId);
-			});
-		}
+		const affectedHosts = pkg.affectedHosts || [];
+		affectedHosts.forEach((host) => {
+			uniqueAffectedHosts.add(host.hostId);
+		});
 	});
-	const uniquePackageHostsCount = uniquePackageHosts.size;
+	const uniqueAffectedHostsCount = uniqueAffectedHosts.size;
 
-	// Calculate total packages installed
-	// When filtering by host, count each package once (since it can only be installed once per host)
-	// When not filtering, sum up all installations across all hosts
+	// Calculate total packages across all hosts (including up-to-date ones)
 	const totalPackagesCount =
-		hostFilter && hostFilter !== "all"
-			? packages?.length || 0
-			: packages?.reduce(
-					(sum, pkg) => sum + (pkg.stats?.totalInstalls || 0),
-					0,
-				) || 0;
+		hosts?.reduce((total, host) => {
+			return total + (host.totalPackagesCount || 0);
+		}, 0) || 0;
 
-	// Calculate outdated packages
-	const outdatedPackagesCount =
-		packages?.filter((pkg) => (pkg.stats?.updatesNeeded || 0) > 0).length || 0;
+	// Calculate outdated packages (packages that need updates)
+	const outdatedPackagesCount = packages?.length || 0;
 
 	// Calculate security updates
 	const securityUpdatesCount =
-		packages?.filter((pkg) => (pkg.stats?.securityUpdates || 0) > 0).length ||
-		0;
+		packages?.filter((pkg) => pkg.isSecurityUpdate).length || 0;
 
 	if (isLoading) {
 		return (
@@ -535,7 +398,7 @@ const Packages = () => {
 						<Package className="h-5 w-5 text-primary-600 mr-2" />
 						<div>
 							<p className="text-sm text-secondary-500 dark:text-white">
-								Total Installed
+								Total Packages
 							</p>
 							<p className="text-xl font-semibold text-secondary-900 dark:text-white">
 								{totalPackagesCount}
@@ -566,7 +429,7 @@ const Packages = () => {
 								Hosts Pending Updates
 							</p>
 							<p className="text-xl font-semibold text-secondary-900 dark:text-white">
-								{uniquePackageHostsCount}
+								{uniqueAffectedHostsCount}
 							</p>
 						</div>
 					</div>
@@ -627,21 +490,16 @@ const Packages = () => {
 								</select>
 							</div>
 
-							{/* Update Status Filter */}
+							{/* Security Filter */}
 							<div className="sm:w-48">
 								<select
-									value={updateStatusFilter}
-									onChange={(e) => setUpdateStatusFilter(e.target.value)}
+									value={securityFilter}
+									onChange={(e) => setSecurityFilter(e.target.value)}
 									className="w-full px-3 py-2 border border-secondary-300 dark:border-secondary-600 rounded-md focus:ring-2 focus:ring-primary-500 focus:border-transparent bg-white dark:bg-secondary-800 text-secondary-900 dark:text-white"
 								>
-									<option value="all-packages">All Packages</option>
-									<option value="needs-updates">
-										Packages Needing Updates
-									</option>
-									<option value="security-updates">
-										Security Updates Only
-									</option>
-									<option value="regular-updates">Regular Updates Only</option>
+									<option value="all">All Updates</option>
+									<option value="security">Security Only</option>
+									<option value="regular">Regular Only</option>
 								</select>
 							</div>
 
@@ -681,13 +539,12 @@ const Packages = () => {
 								<Package className="h-12 w-12 text-secondary-400 mx-auto mb-4" />
 								<p className="text-secondary-500 dark:text-secondary-300">
 									{packages?.length === 0
-										? "No packages found"
+										? "No packages need updates"
 										: "No packages match your filters"}
 								</p>
 								{packages?.length === 0 && (
 									<p className="text-sm text-secondary-400 dark:text-secondary-400 mt-2">
-										Packages will appear here once hosts start reporting their
-										installed packages
+										All packages are up to date across all hosts
 									</p>
 								)}
 							</div>
@@ -714,7 +571,7 @@ const Packages = () => {
 										</tr>
 									</thead>
 									<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-600">
-										{paginatedPackages.map((pkg) => (
+										{filteredAndSortedPackages.map((pkg) => (
 											<tr
 												key={pkg.id}
 												className="hover:bg-secondary-50 dark:hover:bg-secondary-700 transition-colors"
@@ -734,57 +591,6 @@ const Packages = () => {
 							</div>
 						)}
 					</div>
-
-					{/* Pagination Controls */}
-					{filteredAndSortedPackages.length > 0 && (
-						<div className="flex items-center justify-between px-6 py-3 bg-white dark:bg-secondary-800 border-t border-secondary-200 dark:border-secondary-600">
-							<div className="flex items-center gap-4">
-								<div className="flex items-center gap-2">
-									<span className="text-sm text-secondary-700 dark:text-secondary-300">
-										Rows per page:
-									</span>
-									<select
-										value={pageSize}
-										onChange={(e) =>
-											handlePageSizeChange(Number(e.target.value))
-										}
-										className="text-sm border border-secondary-300 dark:border-secondary-600 rounded px-2 py-1 bg-white dark:bg-secondary-700 text-secondary-900 dark:text-white"
-									>
-										<option value={25}>25</option>
-										<option value={50}>50</option>
-										<option value={100}>100</option>
-										<option value={200}>200</option>
-									</select>
-								</div>
-								<span className="text-sm text-secondary-700 dark:text-secondary-300">
-									{startIndex + 1}-
-									{Math.min(endIndex, filteredAndSortedPackages.length)} of{" "}
-									{filteredAndSortedPackages.length}
-								</span>
-							</div>
-							<div className="flex items-center gap-2">
-								<button
-									type="button"
-									onClick={() => setCurrentPage(currentPage - 1)}
-									disabled={currentPage === 1}
-									className="p-1 rounded hover:bg-secondary-100 dark:hover:bg-secondary-600 disabled:opacity-50 disabled:cursor-not-allowed"
-								>
-									<ChevronLeft className="h-4 w-4" />
-								</button>
-								<span className="text-sm text-secondary-700 dark:text-secondary-300">
-									Page {currentPage} of {totalPages}
-								</span>
-								<button
-									type="button"
-									onClick={() => setCurrentPage(currentPage + 1)}
-									disabled={currentPage === totalPages}
-									className="p-1 rounded hover:bg-secondary-100 dark:hover:bg-secondary-600 disabled:opacity-50 disabled:cursor-not-allowed"
-								>
-									<ChevronRight className="h-4 w-4" />
-								</button>
-							</div>
-						</div>
-					)}
 				</div>
 			</div>
 

frontend/src/pages/Profile.jsx

@@ -2,16 +2,12 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import {
 	AlertCircle,
 	CheckCircle,
-	Clock,
 	Copy,
 	Download,
 	Eye,
 	EyeOff,
 	Key,
-	LogOut,
 	Mail,
-	MapPin,
-	Monitor,
 	Moon,
 	RefreshCw,
 	Save,
@@ -22,7 +18,7 @@ import {
 	User,
 } from "lucide-react";
 
-import { useEffect, useId, useState } from "react";
+import { useId, useState } from "react";
 
 import { useAuth } from "../contexts/AuthContext";
 import { useTheme } from "../contexts/ThemeContext";
@@ -49,18 +45,6 @@ const Profile = () => {
 		last_name: user?.last_name || "",
 	});
 
-	// Update profileData when user data changes
-	useEffect(() => {
-		if (user) {
-			setProfileData({
-				username: user.username || "",
-				email: user.email || "",
-				first_name: user.first_name || "",
-				last_name: user.last_name || "",
-			});
-		}
-	}, [user]);
-
 	const [passwordData, setPasswordData] = useState({
 		currentPassword: "",
 		newPassword: "",
@@ -157,7 +141,6 @@ const Profile = () => {
 		{ id: "profile", name: "Profile Information", icon: User },
 		{ id: "password", name: "Change Password", icon: Key },
 		{ id: "tfa", name: "Multi-Factor Authentication", icon: Smartphone },
-		{ id: "sessions", name: "Active Sessions", icon: Monitor },
 	];
 
 	return (
@@ -538,9 +521,6 @@ const Profile = () => {
 
 					{/* Multi-Factor Authentication Tab */}
 					{activeTab === "tfa" && <TfaTab />}
-
-					{/* Sessions Tab */}
-					{activeTab === "sessions" && <SessionsTab />}
 				</div>
 			</div>
 		</div>
@@ -1080,256 +1060,4 @@ const TfaTab = () => {
 	);
 };
 
-// Sessions Tab Component
-const SessionsTab = () => {
-	const _queryClient = useQueryClient();
-	const [_isLoading, _setIsLoading] = useState(false);
-	const [message, setMessage] = useState({ type: "", text: "" });
-
-	// Fetch user sessions
-	const {
-		data: sessionsData,
-		isLoading: sessionsLoading,
-		refetch,
-	} = useQuery({
-		queryKey: ["user-sessions"],
-		queryFn: async () => {
-			const response = await fetch("/api/v1/auth/sessions", {
-				headers: {
-					Authorization: `Bearer ${localStorage.getItem("token")}`,
-				},
-			});
-			if (!response.ok) throw new Error("Failed to fetch sessions");
-			return response.json();
-		},
-	});
-
-	// Revoke individual session mutation
-	const revokeSessionMutation = useMutation({
-		mutationFn: async (sessionId) => {
-			const response = await fetch(`/api/v1/auth/sessions/${sessionId}`, {
-				method: "DELETE",
-				headers: {
-					Authorization: `Bearer ${localStorage.getItem("token")}`,
-				},
-			});
-			if (!response.ok) throw new Error("Failed to revoke session");
-			return response.json();
-		},
-		onSuccess: () => {
-			setMessage({ type: "success", text: "Session revoked successfully" });
-			refetch();
-		},
-		onError: (error) => {
-			setMessage({ type: "error", text: error.message });
-		},
-	});
-
-	// Revoke all sessions mutation
-	const revokeAllSessionsMutation = useMutation({
-		mutationFn: async () => {
-			const response = await fetch("/api/v1/auth/sessions", {
-				method: "DELETE",
-				headers: {
-					Authorization: `Bearer ${localStorage.getItem("token")}`,
-				},
-			});
-			if (!response.ok) throw new Error("Failed to revoke sessions");
-			return response.json();
-		},
-		onSuccess: () => {
-			setMessage({
-				type: "success",
-				text: "All other sessions revoked successfully",
-			});
-			refetch();
-		},
-		onError: (error) => {
-			setMessage({ type: "error", text: error.message });
-		},
-	});
-
-	const formatDate = (dateString) => {
-		return new Date(dateString).toLocaleString();
-	};
-
-	const formatRelativeTime = (dateString) => {
-		const now = new Date();
-		const date = new Date(dateString);
-		const diff = now - date;
-		const minutes = Math.floor(diff / 60000);
-		const hours = Math.floor(diff / 3600000);
-		const days = Math.floor(diff / 86400000);
-
-		if (days > 0) return `${days} day${days > 1 ? "s" : ""} ago`;
-		if (hours > 0) return `${hours} hour${hours > 1 ? "s" : ""} ago`;
-		if (minutes > 0) return `${minutes} minute${minutes > 1 ? "s" : ""} ago`;
-		return "Just now";
-	};
-
-	const handleRevokeSession = (sessionId) => {
-		if (window.confirm("Are you sure you want to revoke this session?")) {
-			revokeSessionMutation.mutate(sessionId);
-		}
-	};
-
-	const handleRevokeAllSessions = () => {
-		if (
-			window.confirm(
-				"Are you sure you want to revoke all other sessions? This will log you out of all other devices.",
-			)
-		) {
-			revokeAllSessionsMutation.mutate();
-		}
-	};
-
-	return (
-		<div className="space-y-6">
-			{/* Header */}
-			<div>
-				<h3 className="text-lg font-medium text-secondary-900 dark:text-secondary-100">
-					Active Sessions
-				</h3>
-				<p className="text-sm text-secondary-600 dark:text-secondary-300">
-					Manage your active sessions and devices. You can see where you're
-					logged in and revoke access for any device.
-				</p>
-			</div>
-
-			{/* Message */}
-			{message.text && (
-				<div
-					className={`rounded-md p-4 ${
-						message.type === "success"
-							? "bg-success-50 border border-success-200 text-success-700"
-							: "bg-danger-50 border border-danger-200 text-danger-700"
-					}`}
-				>
-					<div className="flex">
-						{message.type === "success" ? (
-							<CheckCircle className="h-5 w-5" />
-						) : (
-							<AlertCircle className="h-5 w-5" />
-						)}
-						<div className="ml-3">
-							<p className="text-sm">{message.text}</p>
-						</div>
-					</div>
-				</div>
-			)}
-
-			{/* Sessions List */}
-			{sessionsLoading ? (
-				<div className="flex items-center justify-center py-8">
-					<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary-600"></div>
-				</div>
-			) : sessionsData?.sessions?.length > 0 ? (
-				<div className="space-y-4">
-					{/* Revoke All Button */}
-					{sessionsData.sessions.filter((s) => !s.is_current_session).length >
-						0 && (
-						<div className="flex justify-end">
-							<button
-								type="button"
-								onClick={handleRevokeAllSessions}
-								disabled={revokeAllSessionsMutation.isPending}
-								className="inline-flex items-center px-4 py-2 border border-danger-300 text-sm font-medium rounded-md text-danger-700 bg-white hover:bg-danger-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-danger-500 disabled:opacity-50"
-							>
-								<LogOut className="h-4 w-4 mr-2" />
-								{revokeAllSessionsMutation.isPending
-									? "Revoking..."
-									: "Revoke All Other Sessions"}
-							</button>
-						</div>
-					)}
-
-					{/* Sessions */}
-					{sessionsData.sessions.map((session) => (
-						<div
-							key={session.id}
-							className={`border rounded-lg p-4 ${
-								session.is_current_session
-									? "border-primary-200 bg-primary-50 dark:border-primary-800 dark:bg-primary-900/20"
-									: "border-secondary-200 bg-white dark:border-secondary-700 dark:bg-secondary-800"
-							}`}
-						>
-							<div className="flex items-start justify-between">
-								<div className="flex-1">
-									<div className="flex items-center space-x-3">
-										<Monitor className="h-5 w-5 text-secondary-500" />
-										<div>
-											<div className="flex items-center space-x-2">
-												<h4 className="text-sm font-medium text-secondary-900 dark:text-secondary-100">
-													{session.device_info?.browser} on{" "}
-													{session.device_info?.os}
-												</h4>
-												{session.is_current_session && (
-													<span className="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-primary-100 text-primary-800 dark:bg-primary-900 dark:text-primary-200">
-														Current Session
-													</span>
-												)}
-												{session.tfa_remember_me && (
-													<span className="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-success-100 text-success-800 dark:bg-success-900 dark:text-success-200">
-														Remembered
-													</span>
-												)}
-											</div>
-											<p className="text-sm text-secondary-600 dark:text-secondary-400">
-												{session.device_info?.device} • {session.ip_address}
-											</p>
-										</div>
-									</div>
-
-									<div className="mt-3 grid grid-cols-1 md:grid-cols-2 gap-4 text-sm text-secondary-600 dark:text-secondary-400">
-										<div className="flex items-center space-x-2">
-											<MapPin className="h-4 w-4" />
-											<span>
-												{session.location_info?.city},{" "}
-												{session.location_info?.country}
-											</span>
-										</div>
-										<div className="flex items-center space-x-2">
-											<Clock className="h-4 w-4" />
-											<span>
-												Last active: {formatRelativeTime(session.last_activity)}
-											</span>
-										</div>
-										<div className="flex items-center space-x-2">
-											<span>Created: {formatDate(session.created_at)}</span>
-										</div>
-										<div className="flex items-center space-x-2">
-											<span>Login count: {session.login_count}</span>
-										</div>
-									</div>
-								</div>
-
-								{!session.is_current_session && (
-									<button
-										type="button"
-										onClick={() => handleRevokeSession(session.id)}
-										disabled={revokeSessionMutation.isPending}
-										className="ml-4 inline-flex items-center px-3 py-2 border border-danger-300 text-sm font-medium rounded-md text-danger-700 bg-white hover:bg-danger-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-danger-500 disabled:opacity-50"
-									>
-										<LogOut className="h-4 w-4" />
-									</button>
-								)}
-							</div>
-						</div>
-					))}
-				</div>
-			) : (
-				<div className="text-center py-8">
-					<Monitor className="mx-auto h-12 w-12 text-secondary-400" />
-					<h3 className="mt-2 text-sm font-medium text-secondary-900 dark:text-secondary-100">
-						No active sessions
-					</h3>
-					<p className="mt-1 text-sm text-secondary-600 dark:text-secondary-400">
-						You don't have any active sessions at the moment.
-					</p>
-				</div>
-			)}
-		</div>
-	);
-};
-
 export default Profile;

frontend/src/pages/Queue.jsx

@@ -1,699 +0,0 @@
-import {
-	Activity,
-	AlertCircle,
-	CheckCircle,
-	Clock,
-	Download,
-	Eye,
-	Filter,
-	Package,
-	Pause,
-	Play,
-	RefreshCw,
-	Search,
-	Server,
-	XCircle,
-} from "lucide-react";
-import { useState } from "react";
-
-const Queue = () => {
-	const [activeTab, setActiveTab] = useState("server");
-	const [filterStatus, setFilterStatus] = useState("all");
-	const [searchQuery, setSearchQuery] = useState("");
-
-	// Mock data for demonstration
-	const serverQueueData = [
-		{
-			id: 1,
-			type: "Server Update Check",
-			description: "Check for server updates from GitHub",
-			status: "running",
-			priority: "high",
-			createdAt: "2024-01-15 10:30:00",
-			estimatedCompletion: "2024-01-15 10:35:00",
-			progress: 75,
-			retryCount: 0,
-			maxRetries: 3,
-		},
-		{
-			id: 2,
-			type: "Session Cleanup",
-			description: "Clear expired login sessions",
-			status: "pending",
-			priority: "medium",
-			createdAt: "2024-01-15 10:25:00",
-			estimatedCompletion: "2024-01-15 10:40:00",
-			progress: 0,
-			retryCount: 0,
-			maxRetries: 2,
-		},
-		{
-			id: 3,
-			type: "Database Optimization",
-			description: "Optimize database indexes and cleanup old records",
-			status: "completed",
-			priority: "low",
-			createdAt: "2024-01-15 09:00:00",
-			completedAt: "2024-01-15 09:45:00",
-			progress: 100,
-			retryCount: 0,
-			maxRetries: 1,
-		},
-		{
-			id: 4,
-			type: "Backup Creation",
-			description: "Create system backup",
-			status: "failed",
-			priority: "high",
-			createdAt: "2024-01-15 08:00:00",
-			errorMessage: "Insufficient disk space",
-			progress: 45,
-			retryCount: 2,
-			maxRetries: 3,
-		},
-	];
-
-	const agentQueueData = [
-		{
-			id: 1,
-			hostname: "web-server-01",
-			ip: "192.168.1.100",
-			type: "Agent Update Collection",
-			description: "Agent v1.2.7 → v1.2.8",
-			status: "pending",
-			priority: "medium",
-			lastCommunication: "2024-01-15 10:00:00",
-			nextExpectedCommunication: "2024-01-15 11:00:00",
-			currentVersion: "1.2.7",
-			targetVersion: "1.2.8",
-			retryCount: 0,
-			maxRetries: 5,
-		},
-		{
-			id: 2,
-			hostname: "db-server-02",
-			ip: "192.168.1.101",
-			type: "Data Collection",
-			description: "Collect package and system information",
-			status: "running",
-			priority: "high",
-			lastCommunication: "2024-01-15 10:15:00",
-			nextExpectedCommunication: "2024-01-15 11:15:00",
-			currentVersion: "1.2.8",
-			targetVersion: "1.2.8",
-			retryCount: 0,
-			maxRetries: 3,
-		},
-		{
-			id: 3,
-			hostname: "app-server-03",
-			ip: "192.168.1.102",
-			type: "Agent Update Collection",
-			description: "Agent v1.2.6 → v1.2.8",
-			status: "completed",
-			priority: "low",
-			lastCommunication: "2024-01-15 09:30:00",
-			completedAt: "2024-01-15 09:45:00",
-			currentVersion: "1.2.8",
-			targetVersion: "1.2.8",
-			retryCount: 0,
-			maxRetries: 5,
-		},
-		{
-			id: 4,
-			hostname: "test-server-04",
-			ip: "192.168.1.103",
-			type: "Data Collection",
-			description: "Collect package and system information",
-			status: "failed",
-			priority: "medium",
-			lastCommunication: "2024-01-15 08:00:00",
-			errorMessage: "Connection timeout",
-			retryCount: 3,
-			maxRetries: 3,
-		},
-	];
-
-	const patchQueueData = [
-		{
-			id: 1,
-			hostname: "web-server-01",
-			ip: "192.168.1.100",
-			packages: ["nginx", "openssl", "curl"],
-			type: "Security Updates",
-			description: "Apply critical security patches",
-			status: "pending",
-			priority: "high",
-			scheduledFor: "2024-01-15 19:00:00",
-			lastCommunication: "2024-01-15 18:00:00",
-			nextExpectedCommunication: "2024-01-15 19:00:00",
-			retryCount: 0,
-			maxRetries: 3,
-		},
-		{
-			id: 2,
-			hostname: "db-server-02",
-			ip: "192.168.1.101",
-			packages: ["postgresql", "python3"],
-			type: "Feature Updates",
-			description: "Update database and Python packages",
-			status: "running",
-			priority: "medium",
-			scheduledFor: "2024-01-15 20:00:00",
-			lastCommunication: "2024-01-15 19:15:00",
-			nextExpectedCommunication: "2024-01-15 20:15:00",
-			retryCount: 0,
-			maxRetries: 2,
-		},
-		{
-			id: 3,
-			hostname: "app-server-03",
-			ip: "192.168.1.102",
-			packages: ["nodejs", "npm"],
-			type: "Maintenance Updates",
-			description: "Update Node.js and npm packages",
-			status: "completed",
-			priority: "low",
-			scheduledFor: "2024-01-15 18:30:00",
-			completedAt: "2024-01-15 18:45:00",
-			retryCount: 0,
-			maxRetries: 2,
-		},
-		{
-			id: 4,
-			hostname: "test-server-04",
-			ip: "192.168.1.103",
-			packages: ["docker", "docker-compose"],
-			type: "Security Updates",
-			description: "Update Docker components",
-			status: "failed",
-			priority: "high",
-			scheduledFor: "2024-01-15 17:00:00",
-			errorMessage: "Package conflicts detected",
-			retryCount: 2,
-			maxRetries: 3,
-		},
-	];
-
-	const getStatusIcon = (status) => {
-		switch (status) {
-			case "running":
-				return <RefreshCw className="h-4 w-4 text-blue-500 animate-spin" />;
-			case "completed":
-				return <CheckCircle className="h-4 w-4 text-green-500" />;
-			case "failed":
-				return <XCircle className="h-4 w-4 text-red-500" />;
-			case "pending":
-				return <Clock className="h-4 w-4 text-yellow-500" />;
-			case "paused":
-				return <Pause className="h-4 w-4 text-gray-500" />;
-			default:
-				return <AlertCircle className="h-4 w-4 text-gray-500" />;
-		}
-	};
-
-	const getStatusColor = (status) => {
-		switch (status) {
-			case "running":
-				return "bg-blue-100 text-blue-800";
-			case "completed":
-				return "bg-green-100 text-green-800";
-			case "failed":
-				return "bg-red-100 text-red-800";
-			case "pending":
-				return "bg-yellow-100 text-yellow-800";
-			case "paused":
-				return "bg-gray-100 text-gray-800";
-			default:
-				return "bg-gray-100 text-gray-800";
-		}
-	};
-
-	const getPriorityColor = (priority) => {
-		switch (priority) {
-			case "high":
-				return "bg-red-100 text-red-800";
-			case "medium":
-				return "bg-yellow-100 text-yellow-800";
-			case "low":
-				return "bg-green-100 text-green-800";
-			default:
-				return "bg-gray-100 text-gray-800";
-		}
-	};
-
-	const filteredData = (data) => {
-		let filtered = data;
-
-		if (filterStatus !== "all") {
-			filtered = filtered.filter((item) => item.status === filterStatus);
-		}
-
-		if (searchQuery) {
-			filtered = filtered.filter(
-				(item) =>
-					item.hostname?.toLowerCase().includes(searchQuery.toLowerCase()) ||
-					item.type?.toLowerCase().includes(searchQuery.toLowerCase()) ||
-					item.description?.toLowerCase().includes(searchQuery.toLowerCase()),
-			);
-		}
-
-		return filtered;
-	};
-
-	const tabs = [
-		{
-			id: "server",
-			name: "Server Queue",
-			icon: Server,
-			data: serverQueueData,
-			count: serverQueueData.length,
-		},
-		{
-			id: "agent",
-			name: "Agent Queue",
-			icon: Download,
-			data: agentQueueData,
-			count: agentQueueData.length,
-		},
-		{
-			id: "patch",
-			name: "Patch Management",
-			icon: Package,
-			data: patchQueueData,
-			count: patchQueueData.length,
-		},
-	];
-
-	const renderServerQueueItem = (item) => (
-		<div
-			key={item.id}
-			className="bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 p-4 hover:shadow-md transition-shadow"
-		>
-			<div className="flex items-start justify-between">
-				<div className="flex-1">
-					<div className="flex items-center gap-3 mb-2">
-						{getStatusIcon(item.status)}
-						<h3 className="font-medium text-gray-900 dark:text-white">
-							{item.type}
-						</h3>
-						<span
-							className={`px-2 py-1 text-xs font-medium rounded-full ${getStatusColor(item.status)}`}
-						>
-							{item.status}
-						</span>
-						<span
-							className={`px-2 py-1 text-xs font-medium rounded-full ${getPriorityColor(item.priority)}`}
-						>
-							{item.priority}
-						</span>
-					</div>
-					<p className="text-sm text-gray-600 dark:text-gray-400 mb-3">
-						{item.description}
-					</p>
-
-					{item.status === "running" && (
-						<div className="mb-3">
-							<div className="flex justify-between text-xs text-gray-500 mb-1">
-								<span>Progress</span>
-								<span>{item.progress}%</span>
-							</div>
-							<div className="w-full bg-gray-200 rounded-full h-2">
-								<div
-									className="bg-blue-600 h-2 rounded-full transition-all duration-300"
-									style={{ width: `${item.progress}%` }}
-								></div>
-							</div>
-						</div>
-					)}
-
-					<div className="grid grid-cols-2 gap-4 text-xs text-gray-500">
-						<div>
-							<span className="font-medium">Created:</span> {item.createdAt}
-						</div>
-						{item.status === "running" && (
-							<div>
-								<span className="font-medium">ETA:</span>{" "}
-								{item.estimatedCompletion}
-							</div>
-						)}
-						{item.status === "completed" && (
-							<div>
-								<span className="font-medium">Completed:</span>{" "}
-								{item.completedAt}
-							</div>
-						)}
-						{item.status === "failed" && (
-							<div className="col-span-2">
-								<span className="font-medium">Error:</span> {item.errorMessage}
-							</div>
-						)}
-					</div>
-
-					{item.retryCount > 0 && (
-						<div className="mt-2 text-xs text-orange-600">
-							Retries: {item.retryCount}/{item.maxRetries}
-						</div>
-					)}
-				</div>
-
-				<div className="flex gap-2 ml-4">
-					{item.status === "running" && (
-						<button
-							type="button"
-							className="p-2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
-						>
-							<Pause className="h-4 w-4" />
-						</button>
-					)}
-					{item.status === "paused" && (
-						<button
-							type="button"
-							className="p-2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
-						>
-							<Play className="h-4 w-4" />
-						</button>
-					)}
-					{item.status === "failed" && (
-						<button
-							type="button"
-							className="p-2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
-						>
-							<RefreshCw className="h-4 w-4" />
-						</button>
-					)}
-					<button
-						type="button"
-						className="p-2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
-					>
-						<Eye className="h-4 w-4" />
-					</button>
-				</div>
-			</div>
-		</div>
-	);
-
-	const renderAgentQueueItem = (item) => (
-		<div
-			key={item.id}
-			className="bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 p-4 hover:shadow-md transition-shadow"
-		>
-			<div className="flex items-start justify-between">
-				<div className="flex-1">
-					<div className="flex items-center gap-3 mb-2">
-						{getStatusIcon(item.status)}
-						<h3 className="font-medium text-gray-900 dark:text-white">
-							{item.hostname}
-						</h3>
-						<span
-							className={`px-2 py-1 text-xs font-medium rounded-full ${getStatusColor(item.status)}`}
-						>
-							{item.status}
-						</span>
-						<span
-							className={`px-2 py-1 text-xs font-medium rounded-full ${getPriorityColor(item.priority)}`}
-						>
-							{item.priority}
-						</span>
-					</div>
-					<p className="text-sm text-gray-600 dark:text-gray-400 mb-2">
-						{item.type}
-					</p>
-					<p className="text-sm text-gray-500 mb-3">{item.description}</p>
-
-					{item.type === "Agent Update Collection" && (
-						<div className="mb-3 p-2 bg-gray-50 dark:bg-gray-700 rounded">
-							<div className="text-xs text-gray-600 dark:text-gray-400">
-								<span className="font-medium">Version:</span>{" "}
-								{item.currentVersion} → {item.targetVersion}
-							</div>
-						</div>
-					)}
-
-					<div className="grid grid-cols-2 gap-4 text-xs text-gray-500">
-						<div>
-							<span className="font-medium">IP:</span> {item.ip}
-						</div>
-						<div>
-							<span className="font-medium">Last Comm:</span>{" "}
-							{item.lastCommunication}
-						</div>
-						<div>
-							<span className="font-medium">Next Expected:</span>{" "}
-							{item.nextExpectedCommunication}
-						</div>
-						{item.status === "completed" && (
-							<div>
-								<span className="font-medium">Completed:</span>{" "}
-								{item.completedAt}
-							</div>
-						)}
-						{item.status === "failed" && (
-							<div className="col-span-2">
-								<span className="font-medium">Error:</span> {item.errorMessage}
-							</div>
-						)}
-					</div>
-
-					{item.retryCount > 0 && (
-						<div className="mt-2 text-xs text-orange-600">
-							Retries: {item.retryCount}/{item.maxRetries}
-						</div>
-					)}
-				</div>
-
-				<div className="flex gap-2 ml-4">
-					{item.status === "failed" && (
-						<button
-							type="button"
-							className="p-2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
-						>
-							<RefreshCw className="h-4 w-4" />
-						</button>
-					)}
-					<button
-						type="button"
-						className="p-2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
-					>
-						<Eye className="h-4 w-4" />
-					</button>
-				</div>
-			</div>
-		</div>
-	);
-
-	const renderPatchQueueItem = (item) => (
-		<div
-			key={item.id}
-			className="bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 p-4 hover:shadow-md transition-shadow"
-		>
-			<div className="flex items-start justify-between">
-				<div className="flex-1">
-					<div className="flex items-center gap-3 mb-2">
-						{getStatusIcon(item.status)}
-						<h3 className="font-medium text-gray-900 dark:text-white">
-							{item.hostname}
-						</h3>
-						<span
-							className={`px-2 py-1 text-xs font-medium rounded-full ${getStatusColor(item.status)}`}
-						>
-							{item.status}
-						</span>
-						<span
-							className={`px-2 py-1 text-xs font-medium rounded-full ${getPriorityColor(item.priority)}`}
-						>
-							{item.priority}
-						</span>
-					</div>
-					<p className="text-sm text-gray-600 dark:text-gray-400 mb-2">
-						{item.type}
-					</p>
-					<p className="text-sm text-gray-500 mb-3">{item.description}</p>
-
-					<div className="mb-3">
-						<div className="text-xs text-gray-600 dark:text-gray-400 mb-1">
-							<span className="font-medium">Packages:</span>
-						</div>
-						<div className="flex flex-wrap gap-1">
-							{item.packages.map((pkg) => (
-								<span
-									key={pkg}
-									className="px-2 py-1 bg-blue-100 text-blue-800 text-xs rounded"
-								>
-									{pkg}
-								</span>
-							))}
-						</div>
-					</div>
-
-					<div className="grid grid-cols-2 gap-4 text-xs text-gray-500">
-						<div>
-							<span className="font-medium">IP:</span> {item.ip}
-						</div>
-						<div>
-							<span className="font-medium">Scheduled:</span>{" "}
-							{item.scheduledFor}
-						</div>
-						<div>
-							<span className="font-medium">Last Comm:</span>{" "}
-							{item.lastCommunication}
-						</div>
-						<div>
-							<span className="font-medium">Next Expected:</span>{" "}
-							{item.nextExpectedCommunication}
-						</div>
-						{item.status === "completed" && (
-							<div>
-								<span className="font-medium">Completed:</span>{" "}
-								{item.completedAt}
-							</div>
-						)}
-						{item.status === "failed" && (
-							<div className="col-span-2">
-								<span className="font-medium">Error:</span> {item.errorMessage}
-							</div>
-						)}
-					</div>
-
-					{item.retryCount > 0 && (
-						<div className="mt-2 text-xs text-orange-600">
-							Retries: {item.retryCount}/{item.maxRetries}
-						</div>
-					)}
-				</div>
-
-				<div className="flex gap-2 ml-4">
-					{item.status === "failed" && (
-						<button
-							type="button"
-							className="p-2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
-						>
-							<RefreshCw className="h-4 w-4" />
-						</button>
-					)}
-					<button
-						type="button"
-						className="p-2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
-					>
-						<Eye className="h-4 w-4" />
-					</button>
-				</div>
-			</div>
-		</div>
-	);
-
-	const currentTab = tabs.find((tab) => tab.id === activeTab);
-	const filteredItems = filteredData(currentTab?.data || []);
-
-	return (
-		<div className="min-h-screen bg-gray-50 dark:bg-gray-900">
-			<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
-				{/* Header */}
-				<div className="mb-8">
-					<h1 className="text-3xl font-bold text-gray-900 dark:text-white mb-2">
-						Queue Management
-					</h1>
-					<p className="text-gray-600 dark:text-gray-400">
-						Monitor and manage server operations, agent communications, and
-						patch deployments
-					</p>
-				</div>
-
-				{/* Tabs */}
-				<div className="mb-6">
-					<div className="border-b border-gray-200 dark:border-gray-700">
-						<nav className="-mb-px flex space-x-8">
-							{tabs.map((tab) => (
-								<button
-									type="button"
-									key={tab.id}
-									onClick={() => setActiveTab(tab.id)}
-									className={`py-2 px-1 border-b-2 font-medium text-sm flex items-center gap-2 ${
-										activeTab === tab.id
-											? "border-blue-500 text-blue-600 dark:text-blue-400"
-											: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 dark:text-gray-400 dark:hover:text-gray-300"
-									}`}
-								>
-									<tab.icon className="h-4 w-4" />
-									{tab.name}
-									<span className="bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-300 px-2 py-0.5 rounded-full text-xs">
-										{tab.count}
-									</span>
-								</button>
-							))}
-						</nav>
-					</div>
-				</div>
-
-				{/* Filters and Search */}
-				<div className="mb-6 flex flex-col sm:flex-row gap-4">
-					<div className="flex-1">
-						<div className="relative">
-							<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 h-4 w-4" />
-							<input
-								type="text"
-								placeholder="Search queues..."
-								value={searchQuery}
-								onChange={(e) => setSearchQuery(e.target.value)}
-								className="w-full pl-10 pr-4 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-800 text-gray-900 dark:text-white focus:ring-2 focus:ring-blue-500 focus:border-transparent"
-							/>
-						</div>
-					</div>
-					<div className="flex gap-2">
-						<select
-							value={filterStatus}
-							onChange={(e) => setFilterStatus(e.target.value)}
-							className="px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-800 text-gray-900 dark:text-white focus:ring-2 focus:ring-blue-500 focus:border-transparent"
-						>
-							<option value="all">All Status</option>
-							<option value="pending">Pending</option>
-							<option value="running">Running</option>
-							<option value="completed">Completed</option>
-							<option value="failed">Failed</option>
-							<option value="paused">Paused</option>
-						</select>
-						<button
-							type="button"
-							className="px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-800 text-gray-900 dark:text-white hover:bg-gray-50 dark:hover:bg-gray-700 flex items-center gap-2"
-						>
-							<Filter className="h-4 w-4" />
-							More Filters
-						</button>
-					</div>
-				</div>
-
-				{/* Queue Items */}
-				<div className="space-y-4">
-					{filteredItems.length === 0 ? (
-						<div className="text-center py-12">
-							<Activity className="mx-auto h-12 w-12 text-gray-400" />
-							<h3 className="mt-2 text-sm font-medium text-gray-900 dark:text-white">
-								No queue items found
-							</h3>
-							<p className="mt-1 text-sm text-gray-500 dark:text-gray-400">
-								{searchQuery
-									? "Try adjusting your search criteria"
-									: "No items match the current filters"}
-							</p>
-						</div>
-					) : (
-						filteredItems.map((item) => {
-							switch (activeTab) {
-								case "server":
-									return renderServerQueueItem(item);
-								case "agent":
-									return renderAgentQueueItem(item);
-								case "patch":
-									return renderPatchQueueItem(item);
-								default:
-									return null;
-							}
-						})
-					)}
-				</div>
-			</div>
-		</div>
-	);
-};
-
-export default Queue;

frontend/src/pages/Repositories.jsx

@@ -1,4 +1,4 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import {
 	AlertTriangle,
 	ArrowDown,
@@ -7,6 +7,7 @@ import {
 	Check,
 	Columns,
 	Database,
+	Eye,
 	GripVertical,
 	Lock,
 	RefreshCw,
@@ -14,34 +15,21 @@ import {
 	Server,
 	Shield,
 	ShieldCheck,
-	Trash2,
 	Unlock,
+	Users,
 	X,
 } from "lucide-react";
-import { useEffect, useMemo, useState } from "react";
-import { useNavigate, useSearchParams } from "react-router-dom";
-import { dashboardAPI, repositoryAPI } from "../utils/api";
+import { useMemo, useState } from "react";
+import { Link } from "react-router-dom";
+import { repositoryAPI } from "../utils/api";
 
 const Repositories = () => {
-	const queryClient = useQueryClient();
-	const navigate = useNavigate();
-	const [searchParams] = useSearchParams();
 	const [searchTerm, setSearchTerm] = useState("");
 	const [filterType, setFilterType] = useState("all"); // all, secure, insecure
 	const [filterStatus, setFilterStatus] = useState("all"); // all, active, inactive
-	const [hostFilter, setHostFilter] = useState("");
 	const [sortField, setSortField] = useState("name");
 	const [sortDirection, setSortDirection] = useState("asc");
 	const [showColumnSettings, setShowColumnSettings] = useState(false);
-	const [deleteModalData, setDeleteModalData] = useState(null);
-
-	// Handle host filter from URL parameter
-	useEffect(() => {
-		const hostParam = searchParams.get("host");
-		if (hostParam) {
-			setHostFilter(hostParam);
-		}
-	}, [searchParams]);
 
 	// Column configuration
 	const [columnConfig, setColumnConfig] = useState(() => {
@@ -92,26 +80,6 @@ const Repositories = () => {
 		queryFn: () => repositoryAPI.getStats().then((res) => res.data),
 	});
 
-	// Fetch host information when filtering by host
-	const { data: hosts } = useQuery({
-		queryKey: ["hosts"],
-		queryFn: () => dashboardAPI.getHosts().then((res) => res.data),
-		staleTime: 5 * 60 * 1000,
-		enabled: !!hostFilter,
-	});
-
-	// Get the filtered host information
-	const filteredHost = hosts?.find((host) => host.id === hostFilter);
-
-	// Delete repository mutation
-	const deleteRepositoryMutation = useMutation({
-		mutationFn: (repositoryId) => repositoryAPI.delete(repositoryId),
-		onSuccess: () => {
-			queryClient.invalidateQueries(["repositories"]);
-			queryClient.invalidateQueries(["repository-stats"]);
-		},
-	});
-
 	// Get visible columns in order
 	const visibleColumns = columnConfig
 		.filter((col) => col.visible)
@@ -170,32 +138,6 @@ const Repositories = () => {
 		updateColumnConfig(defaultConfig);
 	};
 
-	const handleDeleteRepository = (repo, e) => {
-		e.preventDefault();
-		e.stopPropagation();
-
-		setDeleteModalData({
-			id: repo.id,
-			name: repo.name,
-			hostCount: repo.hostCount || 0,
-		});
-	};
-
-	const handleRowClick = (repo) => {
-		navigate(`/repositories/${repo.id}`);
-	};
-
-	const confirmDelete = () => {
-		if (deleteModalData) {
-			deleteRepositoryMutation.mutate(deleteModalData.id);
-			setDeleteModalData(null);
-		}
-	};
-
-	const cancelDelete = () => {
-		setDeleteModalData(null);
-	};
-
 	// Filter and sort repositories
 	const filteredAndSortedRepositories = useMemo(() => {
 		if (!repositories) return [];
@@ -223,11 +165,7 @@ const Repositories = () => {
 				(filterStatus === "active" && repo.is_active === true) ||
 				(filterStatus === "inactive" && repo.is_active === false);
 
-			// Filter by host if hostFilter is set
-			const matchesHost =
-				!hostFilter || repo.hosts?.some((host) => host.id === hostFilter);
-
-			return matchesSearch && matchesType && matchesStatus && matchesHost;
+			return matchesSearch && matchesType && matchesStatus;
 		});
 
 		// Sort repositories
@@ -262,7 +200,6 @@ const Repositories = () => {
 		filterStatus,
 		sortField,
 		sortDirection,
-		hostFilter,
 	]);
 
 	if (isLoading) {
@@ -288,56 +225,6 @@ const Repositories = () => {
 
 	return (
 		<div className="h-[calc(100vh-7rem)] flex flex-col overflow-hidden">
-			{/* Delete Confirmation Modal */}
-			{deleteModalData && (
-				<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
-					<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 max-w-md w-full mx-4">
-						<div className="flex items-center mb-4">
-							<AlertTriangle className="h-6 w-6 text-red-500 mr-3" />
-							<h3 className="text-lg font-semibold text-secondary-900 dark:text-white">
-								Delete Repository
-							</h3>
-						</div>
-						<div className="mb-6">
-							<p className="text-secondary-700 dark:text-secondary-300 mb-2">
-								Are you sure you want to delete{" "}
-								<strong>"{deleteModalData.name}"</strong>?
-							</p>
-							{deleteModalData.hostCount > 0 && (
-								<p className="text-amber-600 dark:text-amber-400 text-sm">
-									⚠️ This repository is currently assigned to{" "}
-									{deleteModalData.hostCount} host
-									{deleteModalData.hostCount !== 1 ? "s" : ""}.
-								</p>
-							)}
-							<p className="text-red-600 dark:text-red-400 text-sm mt-2">
-								This action cannot be undone.
-							</p>
-						</div>
-						<div className="flex gap-3 justify-end">
-							<button
-								type="button"
-								onClick={cancelDelete}
-								className="px-4 py-2 text-secondary-600 dark:text-secondary-400 hover:text-secondary-800 dark:hover:text-secondary-200 transition-colors"
-								disabled={deleteRepositoryMutation.isPending}
-							>
-								Cancel
-							</button>
-							<button
-								type="button"
-								onClick={confirmDelete}
-								className="px-4 py-2 bg-red-600 text-white rounded-md hover:bg-red-700 transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
-								disabled={deleteRepositoryMutation.isPending}
-							>
-								{deleteRepositoryMutation.isPending
-									? "Deleting..."
-									: "Delete Repository"}
-							</button>
-						</div>
-					</div>
-				</div>
-			)}
-
 			{/* Page Header */}
 			<div className="flex items-center justify-between mb-6">
 				<div>
@@ -447,31 +334,6 @@ const Repositories = () => {
 								</div>
 							</div>
 
-							{/* Host Filter Indicator */}
-							{hostFilter && filteredHost && (
-								<div className="flex items-center gap-2 px-3 py-2 bg-primary-50 dark:bg-primary-900 border border-primary-200 dark:border-primary-700 rounded-md">
-									<Server className="h-4 w-4 text-primary-600 dark:text-primary-400" />
-									<span className="text-sm text-primary-700 dark:text-primary-300">
-										Filtered by: {filteredHost.friendly_name}
-									</span>
-									<button
-										type="button"
-										onClick={() => {
-											setHostFilter("");
-											// Update URL to remove host parameter
-											const newSearchParams = new URLSearchParams(searchParams);
-											newSearchParams.delete("host");
-											navigate(`/repositories?${newSearchParams.toString()}`, {
-												replace: true,
-											});
-										}}
-										className="text-primary-500 hover:text-primary-700 dark:text-primary-400 dark:hover:text-primary-200"
-									>
-										<X className="h-4 w-4" />
-									</button>
-								</div>
-							)}
-
 							{/* Security Filter */}
 							<div className="sm:w-48">
 								<select
@@ -553,8 +415,7 @@ const Repositories = () => {
 										{filteredAndSortedRepositories.map((repo) => (
 											<tr
 												key={repo.id}
-												className="hover:bg-secondary-50 dark:hover:bg-secondary-700 transition-colors cursor-pointer"
-												onClick={() => handleRowClick(repo)}
+												className="hover:bg-secondary-50 dark:hover:bg-secondary-700 transition-colors"
 											>
 												{visibleColumns.map((column) => (
 													<td
@@ -652,23 +513,19 @@ const Repositories = () => {
 			case "hostCount":
 				return (
 					<div className="flex items-center justify-center gap-1 text-sm text-secondary-900 dark:text-white">
-						<Server className="h-4 w-4" />
-						<span>{repo.hostCount}</span>
+						<Users className="h-4 w-4" />
+						<span>{repo.host_count}</span>
 					</div>
 				);
 			case "actions":
 				return (
-					<div className="flex items-center justify-center">
-						<button
-							type="button"
-							onClick={(e) => handleDeleteRepository(repo, e)}
-							className="text-orange-600 hover:text-red-900 dark:text-orange-600 dark:hover:text-red-400 flex items-center gap-1"
-							disabled={deleteRepositoryMutation.isPending}
-							title="Delete repository"
-						>
-							<Trash2 className="h-4 w-4" />
-						</button>
-					</div>
+					<Link
+						to={`/repositories/${repo.id}`}
+						className="text-primary-600 hover:text-primary-900 flex items-center gap-1"
+					>
+						View
+						<Eye className="h-3 w-3" />
+					</Link>
 				);
 			default:
 				return null;

frontend/src/pages/RepositoryDetail.jsx

@@ -6,18 +6,17 @@ import {
 	Database,
 	Globe,
 	Lock,
-	Search,
 	Server,
 	Shield,
 	ShieldOff,
-	Trash2,
 	Unlock,
+	Users,
 } from "lucide-react";
 
-import { useId, useMemo, useState } from "react";
+import { useId, useState } from "react";
 
-import { Link, useNavigate, useParams } from "react-router-dom";
-import { formatRelativeTime, repositoryAPI } from "../utils/api";
+import { Link, useParams } from "react-router-dom";
+import { repositoryAPI } from "../utils/api";
 
 const RepositoryDetail = () => {
 	const isActiveId = useId();
@@ -25,14 +24,9 @@ const RepositoryDetail = () => {
 	const priorityId = useId();
 	const descriptionId = useId();
 	const { repositoryId } = useParams();
-	const navigate = useNavigate();
 	const queryClient = useQueryClient();
 	const [editMode, setEditMode] = useState(false);
 	const [formData, setFormData] = useState({});
-	const [searchTerm, setSearchTerm] = useState("");
-	const [currentPage, setCurrentPage] = useState(1);
-	const [pageSize, setPageSize] = useState(25);
-	const [showDeleteModal, setShowDeleteModal] = useState(false);
 
 	// Fetch repository details
 	const {
@@ -45,49 +39,6 @@ const RepositoryDetail = () => {
 		enabled: !!repositoryId,
 	});
 
-	const hosts = repository?.host_repositories || [];
-
-	// Filter and paginate hosts
-	const filteredAndPaginatedHosts = useMemo(() => {
-		let filtered = hosts;
-
-		if (searchTerm) {
-			filtered = hosts.filter(
-				(hostRepo) =>
-					hostRepo.hosts.friendly_name
-						?.toLowerCase()
-						.includes(searchTerm.toLowerCase()) ||
-					hostRepo.hosts.hostname
-						?.toLowerCase()
-						.includes(searchTerm.toLowerCase()) ||
-					hostRepo.hosts.ip?.toLowerCase().includes(searchTerm.toLowerCase()),
-			);
-		}
-
-		const startIndex = (currentPage - 1) * pageSize;
-		const endIndex = startIndex + pageSize;
-		return filtered.slice(startIndex, endIndex);
-	}, [hosts, searchTerm, currentPage, pageSize]);
-
-	const totalPages = Math.ceil(
-		(searchTerm
-			? hosts.filter(
-					(hostRepo) =>
-						hostRepo.hosts.friendly_name
-							?.toLowerCase()
-							.includes(searchTerm.toLowerCase()) ||
-						hostRepo.hosts.hostname
-							?.toLowerCase()
-							.includes(searchTerm.toLowerCase()) ||
-						hostRepo.hosts.ip?.toLowerCase().includes(searchTerm.toLowerCase()),
-				).length
-			: hosts.length) / pageSize,
-	);
-
-	const handleHostClick = (hostId) => {
-		navigate(`/hosts/${hostId}`);
-	};
-
 	// Update repository mutation
 	const updateRepositoryMutation = useMutation({
 		mutationFn: (data) => repositoryAPI.update(repositoryId, data),
@@ -98,15 +49,6 @@ const RepositoryDetail = () => {
 		},
 	});
 
-	// Delete repository mutation
-	const deleteRepositoryMutation = useMutation({
-		mutationFn: () => repositoryAPI.delete(repositoryId),
-		onSuccess: () => {
-			queryClient.invalidateQueries(["repositories"]);
-			navigate("/repositories");
-		},
-	});
-
 	const handleEdit = () => {
 		setFormData({
 			name: repository.name,
@@ -126,19 +68,6 @@ const RepositoryDetail = () => {
 		setFormData({});
 	};
 
-	const handleDelete = () => {
-		setShowDeleteModal(true);
-	};
-
-	const confirmDelete = () => {
-		deleteRepositoryMutation.mutate();
-		setShowDeleteModal(false);
-	};
-
-	const cancelDelete = () => {
-		setShowDeleteModal(false);
-	};
-
 	if (isLoading) {
 		return (
 			<div className="flex items-center justify-center h-64">
@@ -198,56 +127,6 @@ const RepositoryDetail = () => {
 
 	return (
 		<div className="space-y-6">
-			{/* Delete Confirmation Modal */}
-			{showDeleteModal && (
-				<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
-					<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 max-w-md w-full mx-4">
-						<div className="flex items-center mb-4">
-							<AlertTriangle className="h-6 w-6 text-red-500 mr-3" />
-							<h3 className="text-lg font-semibold text-secondary-900 dark:text-white">
-								Delete Repository
-							</h3>
-						</div>
-						<div className="mb-6">
-							<p className="text-secondary-700 dark:text-secondary-300 mb-2">
-								Are you sure you want to delete{" "}
-								<strong>"{repository?.name}"</strong>?
-							</p>
-							{repository?.host_repositories?.length > 0 && (
-								<p className="text-amber-600 dark:text-amber-400 text-sm">
-									⚠️ This repository is currently assigned to{" "}
-									{repository.host_repositories.length} host
-									{repository.host_repositories.length !== 1 ? "s" : ""}.
-								</p>
-							)}
-							<p className="text-red-600 dark:text-red-400 text-sm mt-2">
-								This action cannot be undone.
-							</p>
-						</div>
-						<div className="flex gap-3 justify-end">
-							<button
-								type="button"
-								onClick={cancelDelete}
-								className="px-4 py-2 text-secondary-600 dark:text-secondary-400 hover:text-secondary-800 dark:hover:text-secondary-200 transition-colors"
-								disabled={deleteRepositoryMutation.isPending}
-							>
-								Cancel
-							</button>
-							<button
-								type="button"
-								onClick={confirmDelete}
-								className="px-4 py-2 bg-red-600 text-white rounded-md hover:bg-red-700 transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
-								disabled={deleteRepositoryMutation.isPending}
-							>
-								{deleteRepositoryMutation.isPending
-									? "Deleting..."
-									: "Delete Repository"}
-							</button>
-						</div>
-					</div>
-				</div>
-			)}
-
 			{/* Header */}
 			<div className="flex items-center justify-between">
 				<div className="flex items-center gap-4">
@@ -278,6 +157,9 @@ const RepositoryDetail = () => {
 								{repository.is_active ? "Active" : "Inactive"}
 							</span>
 						</div>
+						<p className="text-secondary-500 dark:text-secondary-300 mt-1">
+							Repository configuration and host assignments
+						</p>
 					</div>
 				</div>
 				<div className="flex items-center gap-2">
@@ -303,30 +185,15 @@ const RepositoryDetail = () => {
 							</button>
 						</>
 					) : (
-						<>
-							<button
-								type="button"
-								onClick={handleDelete}
-								className="btn-outline border-red-200 text-red-600 hover:bg-red-50 hover:border-red-300 dark:border-red-800 dark:text-red-400 dark:hover:bg-red-900/20 dark:hover:border-red-700 flex items-center gap-2"
-								disabled={deleteRepositoryMutation.isPending}
-							>
-								<Trash2 className="h-4 w-4" />
-								{deleteRepositoryMutation.isPending ? "Deleting..." : "Delete"}
-							</button>
-							<button
-								type="button"
-								onClick={handleEdit}
-								className="btn-primary"
-							>
-								Edit Repository
-							</button>
-						</>
+						<button type="button" onClick={handleEdit} className="btn-primary">
+							Edit Repository
+						</button>
 					)}
 				</div>
 			</div>
 
 			{/* Repository Information */}
-			<div className="card">
+			<div className="bg-white dark:bg-secondary-800 rounded-lg shadow">
 				<div className="px-6 py-4 border-b border-secondary-200 dark:border-secondary-700">
 					<h2 className="text-lg font-semibold text-secondary-900 dark:text-white">
 						Repository Information
@@ -502,159 +369,80 @@ const RepositoryDetail = () => {
 			</div>
 
 			{/* Hosts Using This Repository */}
-			<div className="card">
-				<div className="px-6 py-4 border-b border-secondary-200 dark:border-secondary-600">
-					<div className="flex items-center justify-between mb-4">
-						<div className="flex items-center gap-3">
-							<Server className="h-5 w-5 text-primary-600" />
-							<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
-								Hosts Using This Repository ({hosts.length})
-							</h3>
-						</div>
-					</div>
-
-					{/* Search */}
-					<div className="relative max-w-sm">
-						<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-secondary-400" />
-						<input
-							type="text"
-							placeholder="Search hosts..."
-							value={searchTerm}
-							onChange={(e) => {
-								setSearchTerm(e.target.value);
-								setCurrentPage(1);
-							}}
-							className="w-full pl-10 pr-4 py-2 border border-secondary-300 dark:border-secondary-600 rounded-md focus:ring-2 focus:ring-primary-500 focus:border-transparent bg-white dark:bg-secondary-800 text-secondary-900 dark:text-white placeholder-secondary-500 dark:placeholder-secondary-400"
-						/>
-					</div>
+			<div className="bg-white dark:bg-secondary-800 rounded-lg shadow">
+				<div className="px-6 py-4 border-b border-secondary-200 dark:border-secondary-700">
+					<h2 className="text-lg font-semibold text-secondary-900 dark:text-white flex items-center gap-2">
+						<Users className="h-5 w-5" />
+						Hosts Using This Repository (
+						{repository.host_repositories?.length || 0})
+					</h2>
 				</div>
-
-				<div className="overflow-x-auto">
-					{filteredAndPaginatedHosts.length === 0 ? (
-						<div className="text-center py-8">
-							<Server className="h-12 w-12 text-secondary-400 mx-auto mb-4" />
-							<p className="text-secondary-500 dark:text-secondary-300">
-								{searchTerm
-									? "No hosts match your search"
-									: "This repository hasn't been reported by any hosts yet."}
-							</p>
-						</div>
-					) : (
-						<>
-							<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-600">
-								<thead className="bg-secondary-50 dark:bg-secondary-700">
-									<tr>
-										<th className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-											Host
-										</th>
-										<th className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-											Operating System
-										</th>
-										<th className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-											Last Checked
-										</th>
-										<th className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-											Last Update
-										</th>
-									</tr>
-								</thead>
-								<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-600">
-									{filteredAndPaginatedHosts.map((hostRepo) => (
-										<tr
-											key={hostRepo.id}
-											className="hover:bg-secondary-50 dark:hover:bg-secondary-700 cursor-pointer transition-colors"
-											onClick={() => handleHostClick(hostRepo.hosts.id)}
-										>
-											<td className="px-6 py-4 whitespace-nowrap">
-												<div className="flex items-center">
-													<div
-														className={`w-2 h-2 rounded-full mr-3 ${
-															hostRepo.hosts.status === "active"
-																? "bg-success-500"
-																: hostRepo.hosts.status === "pending"
-																	? "bg-warning-500"
-																	: "bg-danger-500"
-														}`}
-													/>
-													<Server className="h-5 w-5 text-secondary-400 mr-3" />
-													<div>
-														<div className="text-sm font-medium text-secondary-900 dark:text-white">
-															{hostRepo.hosts.friendly_name ||
-																hostRepo.hosts.hostname}
-														</div>
-														{hostRepo.hosts.friendly_name &&
-															hostRepo.hosts.hostname && (
-																<div className="text-sm text-secondary-500 dark:text-secondary-300">
-																	{hostRepo.hosts.hostname}
-																</div>
-															)}
-													</div>
-												</div>
-											</td>
-											<td className="px-6 py-4 whitespace-nowrap text-sm text-secondary-900 dark:text-white">
-												{hostRepo.hosts.os_type} {hostRepo.hosts.os_version}
-											</td>
-											<td className="px-6 py-4 whitespace-nowrap text-sm text-secondary-500 dark:text-secondary-300">
-												{hostRepo.last_checked
-													? formatRelativeTime(hostRepo.last_checked)
-													: "Never"}
-											</td>
-											<td className="px-6 py-4 whitespace-nowrap text-sm text-secondary-500 dark:text-secondary-300">
-												{hostRepo.hosts.last_update
-													? formatRelativeTime(hostRepo.hosts.last_update)
-													: "Never"}
-											</td>
-										</tr>
-									))}
-								</tbody>
-							</table>
-
-							{/* Pagination */}
-							{totalPages > 1 && (
-								<div className="px-6 py-3 bg-white dark:bg-secondary-800 border-t border-secondary-200 dark:border-secondary-600 flex items-center justify-between">
-									<div className="flex items-center gap-2">
-										<span className="text-sm text-secondary-700 dark:text-secondary-300">
-											Rows per page:
-										</span>
-										<select
-											value={pageSize}
-											onChange={(e) => {
-												setPageSize(Number(e.target.value));
-												setCurrentPage(1);
-											}}
-											className="text-sm border border-secondary-300 dark:border-secondary-600 rounded px-2 py-1 bg-white dark:bg-secondary-700 text-secondary-900 dark:text-white"
-										>
-											<option value={25}>25</option>
-											<option value={50}>50</option>
-											<option value={100}>100</option>
-										</select>
+				{!repository.host_repositories ||
+				repository.host_repositories.length === 0 ? (
+					<div className="px-6 py-12 text-center">
+						<Server className="mx-auto h-12 w-12 text-secondary-400" />
+						<h3 className="mt-2 text-sm font-medium text-secondary-900 dark:text-white">
+							No hosts using this repository
+						</h3>
+						<p className="mt-1 text-sm text-secondary-500 dark:text-secondary-300">
+							This repository hasn't been reported by any hosts yet.
+						</p>
+					</div>
+				) : (
+					<div className="divide-y divide-secondary-200 dark:divide-secondary-700">
+						{repository.host_repositories.map((hostRepo) => (
+							<div
+								key={hostRepo.id}
+								className="px-6 py-4 hover:bg-secondary-50 dark:hover:bg-secondary-700/50"
+							>
+								<div className="flex items-center justify-between">
+									<div className="flex items-center gap-3">
+										<div
+											className={`w-3 h-3 rounded-full ${
+												hostRepo.hosts.status === "active"
+													? "bg-green-500"
+													: hostRepo.hosts.status === "pending"
+														? "bg-yellow-500"
+														: "bg-red-500"
+											}`}
+										/>
+										<div>
+											<Link
+												to={`/hosts/${hostRepo.hosts.id}`}
+												className="text-primary-600 hover:text-primary-700 font-medium"
+											>
+												{hostRepo.hosts.friendly_name}
+											</Link>
+											<div className="flex items-center gap-4 text-sm text-secondary-500 dark:text-secondary-400 mt-1">
+												<span>IP: {hostRepo.hosts.ip}</span>
+												<span>
+													OS: {hostRepo.hosts.os_type}{" "}
+													{hostRepo.hosts.os_version}
+												</span>
+												<span>
+													Last Update:{" "}
+													{new Date(
+														hostRepo.hosts.last_update,
+													).toLocaleDateString()}
+												</span>
+											</div>
+										</div>
 									</div>
-									<div className="flex items-center gap-2">
-										<button
-											type="button"
-											onClick={() => setCurrentPage(currentPage - 1)}
-											disabled={currentPage === 1}
-											className="px-3 py-1 text-sm border border-secondary-300 dark:border-secondary-600 rounded disabled:opacity-50 disabled:cursor-not-allowed hover:bg-secondary-50 dark:hover:bg-secondary-700"
-										>
-											Previous
-										</button>
-										<span className="text-sm text-secondary-700 dark:text-secondary-300">
-											Page {currentPage} of {totalPages}
-										</span>
-										<button
-											type="button"
-											onClick={() => setCurrentPage(currentPage + 1)}
-											disabled={currentPage === totalPages}
-											className="px-3 py-1 text-sm border border-secondary-300 dark:border-secondary-600 rounded disabled:opacity-50 disabled:cursor-not-allowed hover:bg-secondary-50 dark:hover:bg-secondary-700"
-										>
-											Next
-										</button>
+									<div className="flex items-center gap-4">
+										<div className="text-center">
+											<div className="text-xs text-secondary-500 dark:text-secondary-400">
+												Last Checked
+											</div>
+											<div className="text-sm text-secondary-900 dark:text-white">
+												{new Date(hostRepo.last_checked).toLocaleDateString()}
+											</div>
+										</div>
 									</div>
 								</div>
-							)}
-						</>
-					)}
-				</div>
+							</div>
+						))}
+					</div>
+				)}
 			</div>
 		</div>
 	);

frontend/src/pages/Settings.jsx

@@ -5,13 +5,11 @@ import {
 	Clock,
 	Code,
 	Download,
-	Image,
 	Plus,
 	Save,
 	Server,
 	Settings as SettingsIcon,
 	Shield,
-	Upload,
 	X,
 } from "lucide-react";
 
@@ -82,15 +80,6 @@ const Settings = () => {
 	});
 	const [showUploadModal, setShowUploadModal] = useState(false);
 
-	// Logo management state
-	const [logoUploadState, setLogoUploadState] = useState({
-		dark: { uploading: false, error: null },
-		light: { uploading: false, error: null },
-		favicon: { uploading: false, error: null },
-	});
-	const [showLogoUploadModal, setShowLogoUploadModal] = useState(false);
-	const [selectedLogoType, setSelectedLogoType] = useState("dark");
-
 	// Version checking state
 	const [versionInfo, setVersionInfo] = useState({
 		currentVersion: null, // Will be loaded from API
@@ -203,37 +192,6 @@ const Settings = () => {
 		},
 	});
 
-	// Logo upload mutation
-	const uploadLogoMutation = useMutation({
-		mutationFn: ({ logoType, fileContent, fileName }) =>
-			fetch("/api/v1/settings/logos/upload", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					Authorization: `Bearer ${localStorage.getItem("token")}`,
-				},
-				body: JSON.stringify({ logoType, fileContent, fileName }),
-			}).then((res) => res.json()),
-		onSuccess: (_data, variables) => {
-			queryClient.invalidateQueries(["settings"]);
-			setLogoUploadState((prev) => ({
-				...prev,
-				[variables.logoType]: { uploading: false, error: null },
-			}));
-			setShowLogoUploadModal(false);
-		},
-		onError: (error, variables) => {
-			console.error("Upload logo error:", error);
-			setLogoUploadState((prev) => ({
-				...prev,
-				[variables.logoType]: {
-					uploading: false,
-					error: error.message || "Failed to upload logo",
-				},
-			}));
-		},
-	});
-
 	// Load current version on component mount
 	useEffect(() => {
 		const loadCurrentVersion = async () => {
@@ -598,181 +556,6 @@ const Settings = () => {
 								</p>
 							</div>
 
-							{/* Logo Management Section */}
-							<div className="mt-6 pt-6 border-t border-secondary-200 dark:border-secondary-600">
-								<div className="flex items-center mb-4">
-									<Image className="h-5 w-5 text-primary-600 mr-2" />
-									<h3 className="text-lg font-semibold text-secondary-900 dark:text-white">
-										Logo & Branding
-									</h3>
-								</div>
-								<p className="text-sm text-secondary-500 dark:text-secondary-300 mb-4">
-									Customize your PatchMon installation with custom logos and
-									favicon.
-								</p>
-
-								<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-									{/* Dark Logo */}
-									<div className="bg-white dark:bg-secondary-800 rounded-lg p-4 border border-secondary-200 dark:border-secondary-600">
-										<h4 className="text-sm font-medium text-secondary-900 dark:text-white mb-3">
-											Dark Logo
-										</h4>
-										{settings?.logo_dark && (
-											<div className="flex items-center justify-center p-3 bg-secondary-50 dark:bg-secondary-700 rounded-lg mb-3">
-												<img
-													src={settings.logo_dark}
-													alt="Dark Logo"
-													className="max-h-12 max-w-full object-contain"
-													onError={(e) => {
-														e.target.style.display = "none";
-													}}
-												/>
-											</div>
-										)}
-										<p className="text-xs text-secondary-600 dark:text-secondary-400 mb-3 truncate">
-											{settings?.logo_dark
-												? settings.logo_dark.split("/").pop()
-												: "Default"}
-										</p>
-										<button
-											type="button"
-											onClick={() => {
-												setSelectedLogoType("dark");
-												setShowLogoUploadModal(true);
-											}}
-											disabled={logoUploadState.dark.uploading}
-											className="w-full btn-outline flex items-center justify-center gap-2 text-sm py-2"
-										>
-											{logoUploadState.dark.uploading ? (
-												<>
-													<div className="animate-spin rounded-full h-3 w-3 border-b-2 border-current"></div>
-													Uploading...
-												</>
-											) : (
-												<>
-													<Upload className="h-3 w-3" />
-													Upload
-												</>
-											)}
-										</button>
-										{logoUploadState.dark.error && (
-											<p className="text-xs text-red-600 dark:text-red-400 mt-2">
-												{logoUploadState.dark.error}
-											</p>
-										)}
-									</div>
-
-									{/* Light Logo */}
-									<div className="bg-white dark:bg-secondary-800 rounded-lg p-4 border border-secondary-200 dark:border-secondary-600">
-										<h4 className="text-sm font-medium text-secondary-900 dark:text-white mb-3">
-											Light Logo
-										</h4>
-										{settings?.logo_light && (
-											<div className="flex items-center justify-center p-3 bg-secondary-50 dark:bg-secondary-700 rounded-lg mb-3">
-												<img
-													src={settings.logo_light}
-													alt="Light Logo"
-													className="max-h-12 max-w-full object-contain"
-													onError={(e) => {
-														e.target.style.display = "none";
-													}}
-												/>
-											</div>
-										)}
-										<p className="text-xs text-secondary-600 dark:text-secondary-400 mb-3 truncate">
-											{settings?.logo_light
-												? settings.logo_light.split("/").pop()
-												: "Default"}
-										</p>
-										<button
-											type="button"
-											onClick={() => {
-												setSelectedLogoType("light");
-												setShowLogoUploadModal(true);
-											}}
-											disabled={logoUploadState.light.uploading}
-											className="w-full btn-outline flex items-center justify-center gap-2 text-sm py-2"
-										>
-											{logoUploadState.light.uploading ? (
-												<>
-													<div className="animate-spin rounded-full h-3 w-3 border-b-2 border-current"></div>
-													Uploading...
-												</>
-											) : (
-												<>
-													<Upload className="h-3 w-3" />
-													Upload
-												</>
-											)}
-										</button>
-										{logoUploadState.light.error && (
-											<p className="text-xs text-red-600 dark:text-red-400 mt-2">
-												{logoUploadState.light.error}
-											</p>
-										)}
-									</div>
-
-									{/* Favicon */}
-									<div className="bg-white dark:bg-secondary-800 rounded-lg p-4 border border-secondary-200 dark:border-secondary-600">
-										<h4 className="text-sm font-medium text-secondary-900 dark:text-white mb-3">
-											Favicon
-										</h4>
-										{settings?.favicon && (
-											<div className="flex items-center justify-center p-3 bg-secondary-50 dark:bg-secondary-700 rounded-lg mb-3">
-												<img
-													src={settings.favicon}
-													alt="Favicon"
-													className="h-8 w-8 object-contain"
-													onError={(e) => {
-														e.target.style.display = "none";
-													}}
-												/>
-											</div>
-										)}
-										<p className="text-xs text-secondary-600 dark:text-secondary-400 mb-3 truncate">
-											{settings?.favicon
-												? settings.favicon.split("/").pop()
-												: "Default"}
-										</p>
-										<button
-											type="button"
-											onClick={() => {
-												setSelectedLogoType("favicon");
-												setShowLogoUploadModal(true);
-											}}
-											disabled={logoUploadState.favicon.uploading}
-											className="w-full btn-outline flex items-center justify-center gap-2 text-sm py-2"
-										>
-											{logoUploadState.favicon.uploading ? (
-												<>
-													<div className="animate-spin rounded-full h-3 w-3 border-b-2 border-current"></div>
-													Uploading...
-												</>
-											) : (
-												<>
-													<Upload className="h-3 w-3" />
-													Upload
-												</>
-											)}
-										</button>
-										{logoUploadState.favicon.error && (
-											<p className="text-xs text-red-600 dark:text-red-400 mt-2">
-												{logoUploadState.favicon.error}
-											</p>
-										)}
-									</div>
-								</div>
-
-								<div className="mt-4 p-3 bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-700 rounded-md">
-									<p className="text-xs text-blue-700 dark:text-blue-300">
-										<strong>Supported formats:</strong> PNG, JPG, SVG.{" "}
-										<strong>Max size:</strong> 5MB.
-										<strong> Recommended sizes:</strong> 200x60px for logos,
-										32x32px for favicon.
-									</p>
-								</div>
-							</div>
-
 							{/* Update Interval */}
 							<div>
 								<label
@@ -1536,18 +1319,6 @@ const Settings = () => {
 					error={uploadAgentMutation.error}
 				/>
 			)}
-
-			{/* Logo Upload Modal */}
-			{showLogoUploadModal && (
-				<LogoUploadModal
-					isOpen={showLogoUploadModal}
-					onClose={() => setShowLogoUploadModal(false)}
-					onSubmit={uploadLogoMutation.mutate}
-					isLoading={uploadLogoMutation.isPending}
-					error={uploadLogoMutation.error}
-					logoType={selectedLogoType}
-				/>
-			)}
 		</div>
 	);
 };
@@ -1696,181 +1467,4 @@ const AgentUploadModal = ({ isOpen, onClose, onSubmit, isLoading, error }) => {
 	);
 };
 
-// Logo Upload Modal Component
-const LogoUploadModal = ({
-	isOpen,
-	onClose,
-	onSubmit,
-	isLoading,
-	error,
-	logoType,
-}) => {
-	const [selectedFile, setSelectedFile] = useState(null);
-	const [previewUrl, setPreviewUrl] = useState(null);
-	const [uploadError, setUploadError] = useState("");
-
-	const handleFileSelect = (e) => {
-		const file = e.target.files[0];
-		if (file) {
-			// Validate file type
-			const allowedTypes = [
-				"image/png",
-				"image/jpeg",
-				"image/jpg",
-				"image/svg+xml",
-			];
-			if (!allowedTypes.includes(file.type)) {
-				setUploadError("Please select a PNG, JPG, or SVG file");
-				return;
-			}
-
-			// Validate file size (5MB limit)
-			if (file.size > 5 * 1024 * 1024) {
-				setUploadError("File size must be less than 5MB");
-				return;
-			}
-
-			setSelectedFile(file);
-			setUploadError("");
-
-			// Create preview URL
-			const url = URL.createObjectURL(file);
-			setPreviewUrl(url);
-		}
-	};
-
-	const handleSubmit = (e) => {
-		e.preventDefault();
-		setUploadError("");
-
-		if (!selectedFile) {
-			setUploadError("Please select a file");
-			return;
-		}
-
-		// Convert file to base64
-		const reader = new FileReader();
-		reader.onload = (event) => {
-			const base64 = event.target.result;
-			onSubmit({
-				logoType,
-				fileContent: base64,
-				fileName: selectedFile.name,
-			});
-		};
-		reader.readAsDataURL(selectedFile);
-	};
-
-	const handleClose = () => {
-		setSelectedFile(null);
-		setPreviewUrl(null);
-		setUploadError("");
-		onClose();
-	};
-
-	if (!isOpen) return null;
-
-	return (
-		<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
-			<div className="bg-white dark:bg-secondary-800 rounded-lg shadow-xl max-w-2xl w-full mx-4 max-h-[90vh] overflow-y-auto">
-				<div className="px-6 py-4 border-b border-secondary-200 dark:border-secondary-600">
-					<div className="flex items-center justify-between">
-						<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
-							Upload{" "}
-							{logoType === "favicon"
-								? "Favicon"
-								: `${logoType.charAt(0).toUpperCase() + logoType.slice(1)} Logo`}
-						</h3>
-						<button
-							type="button"
-							onClick={handleClose}
-							className="text-secondary-400 hover:text-secondary-600 dark:text-secondary-500 dark:hover:text-secondary-300"
-						>
-							<X className="h-5 w-5" />
-						</button>
-					</div>
-				</div>
-
-				<form onSubmit={handleSubmit} className="px-6 py-4">
-					<div className="space-y-4">
-						<div>
-							<label className="block">
-								<span className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-2">
-									Select File
-								</span>
-								<input
-									type="file"
-									accept="image/png,image/jpeg,image/jpg,image/svg+xml"
-									onChange={handleFileSelect}
-									className="block w-full text-sm text-secondary-500 dark:text-secondary-400 file:mr-4 file:py-2 file:px-4 file:rounded-md file:border-0 file:text-sm file:font-medium file:bg-primary-50 file:text-primary-700 hover:file:bg-primary-100 dark:file:bg-primary-900 dark:file:text-primary-200"
-								/>
-							</label>
-							<p className="mt-1 text-xs text-secondary-500 dark:text-secondary-400">
-								Supported formats: PNG, JPG, SVG. Max size: 5MB.
-								{logoType === "favicon"
-									? " Recommended: 32x32px SVG."
-									: " Recommended: 200x60px."}
-							</p>
-						</div>
-
-						{previewUrl && (
-							<div>
-								<div className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-2">
-									Preview
-								</div>
-								<div className="flex items-center justify-center p-4 bg-white dark:bg-secondary-800 rounded-lg border border-secondary-200 dark:border-secondary-600">
-									<img
-										src={previewUrl}
-										alt="Preview"
-										className={`object-contain ${
-											logoType === "favicon" ? "h-8 w-8" : "max-h-16 max-w-full"
-										}`}
-									/>
-								</div>
-							</div>
-						)}
-
-						{(uploadError || error) && (
-							<div className="bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md p-3">
-								<p className="text-sm text-red-800 dark:text-red-200">
-									{uploadError ||
-										error?.response?.data?.error ||
-										error?.message}
-								</p>
-							</div>
-						)}
-
-						<div className="bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded-md p-3">
-							<div className="flex">
-								<AlertCircle className="h-4 w-4 text-yellow-600 dark:text-yellow-400 mr-2 mt-0.5" />
-								<div className="text-sm text-yellow-800 dark:text-yellow-200">
-									<p className="font-medium">Important:</p>
-									<ul className="mt-1 list-disc list-inside space-y-1">
-										<li>This will replace the current {logoType} logo</li>
-										<li>A backup will be created automatically</li>
-										<li>The change will be applied immediately</li>
-									</ul>
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<div className="flex justify-end gap-3 mt-6">
-						<button type="button" onClick={handleClose} className="btn-outline">
-							Cancel
-						</button>
-						<button
-							type="submit"
-							disabled={isLoading || !selectedFile}
-							className="btn-primary"
-						>
-							{isLoading ? "Uploading..." : "Upload Logo"}
-						</button>
-					</div>
-				</form>
-			</div>
-		</div>
-	);
-};
-
 export default Settings;

frontend/src/pages/settings/Integrations.jsx

@@ -14,7 +14,6 @@ import SettingsLayout from "../../components/SettingsLayout";
 import api from "../../utils/api";
 
 const Integrations = () => {
-	const [activeTab, setActiveTab] = useState("proxmox");
 	const [tokens, setTokens] = useState([]);
 	const [host_groups, setHostGroups] = useState([]);
 	const [loading, setLoading] = useState(true);
@@ -22,7 +21,6 @@ const Integrations = () => {
 	const [new_token, setNewToken] = useState(null);
 	const [show_secret, setShowSecret] = useState(false);
 	const [server_url, setServerUrl] = useState("");
-	const [force_proxmox_install, setForceProxmoxInstall] = useState(false);
 
 	// Form state
 	const [form_data, setFormData] = useState({
@@ -35,16 +33,6 @@ const Integrations = () => {
 
 	const [copy_success, setCopySuccess] = useState({});
 
-	// Helper function to build Proxmox enrollment URL with optional force flag
-	const getProxmoxUrl = () => {
-		const baseUrl = `${server_url}/api/v1/auto-enrollment/proxmox-lxc?token_key=${new_token.token_key}&token_secret=${new_token.token_secret}`;
-		return force_proxmox_install ? `${baseUrl}&force=true` : baseUrl;
-	};
-
-	const handleTabChange = (tabName) => {
-		setActiveTab(tabName);
-	};
-
 	// biome-ignore lint/correctness/useExhaustiveDependencies: Only run on mount
 	useEffect(() => {
 		load_tokens();
@@ -175,226 +163,193 @@ const Integrations = () => {
 		<SettingsLayout>
 			<div className="space-y-6">
 				{/* Header */}
-				<div>
-					<h1 className="text-2xl font-bold text-secondary-900 dark:text-white">
-						Integrations
-					</h1>
-					<p className="mt-1 text-sm text-secondary-600 dark:text-secondary-400">
-						Manage auto-enrollment tokens for Proxmox and other integrations
-					</p>
+				<div className="flex items-center justify-between">
+					<div>
+						<h1 className="text-2xl font-bold text-secondary-900 dark:text-white">
+							Integrations
+						</h1>
+						<p className="mt-1 text-sm text-secondary-600 dark:text-secondary-400">
+							Manage auto-enrollment tokens for Proxmox and other integrations
+						</p>
+					</div>
+					<button
+						type="button"
+						onClick={() => setShowCreateModal(true)}
+						className="btn-primary flex items-center gap-2"
+					>
+						<Plus className="h-4 w-4" />
+						New Token
+					</button>
 				</div>
 
-				{/* Tabs Navigation */}
-				<div className="bg-white dark:bg-secondary-800 border border-secondary-200 dark:border-secondary-600 rounded-lg overflow-hidden">
-					<div className="border-b border-secondary-200 dark:border-secondary-600 flex">
-						<button
-							type="button"
-							onClick={() => handleTabChange("proxmox")}
-							className={`px-6 py-3 text-sm font-medium ${
-								activeTab === "proxmox"
-									? "text-primary-600 dark:text-primary-400 border-b-2 border-primary-500 bg-primary-50 dark:bg-primary-900/20"
-									: "text-secondary-500 dark:text-secondary-400 hover:text-secondary-700 dark:hover:text-secondary-300 hover:bg-secondary-50 dark:hover:bg-secondary-700/50"
-							}`}
-						>
-							Proxmox LXC
-						</button>
-						{/* Future tabs can be added here */}
+				{/* Proxmox Integration Section */}
+				<div className="bg-white dark:bg-secondary-800 border border-secondary-200 dark:border-secondary-600 rounded-lg p-6">
+					<div className="flex items-center gap-3 mb-4">
+						<div className="w-10 h-10 bg-primary-100 dark:bg-primary-900 rounded-lg flex items-center justify-center">
+							<Server className="h-5 w-5 text-primary-600 dark:text-primary-400" />
+						</div>
+						<div>
+							<h3 className="text-lg font-semibold text-secondary-900 dark:text-white">
+								Proxmox LXC Auto-Enrollment
+							</h3>
+							<p className="text-sm text-secondary-600 dark:text-secondary-400">
+								Automatically discover and enroll LXC containers from Proxmox
+								hosts
+							</p>
+						</div>
 					</div>
 
-					{/* Tab Content */}
-					<div className="p-6">
-						{/* Proxmox Tab */}
-						{activeTab === "proxmox" && (
-							<div className="space-y-6">
-								{/* Header with New Token Button */}
-								<div className="flex items-center justify-between">
-									<div className="flex items-center gap-3">
-										<div className="w-10 h-10 bg-primary-100 dark:bg-primary-900 rounded-lg flex items-center justify-center">
-											<Server className="h-5 w-5 text-primary-600 dark:text-primary-400" />
-										</div>
-										<div>
-											<h3 className="text-lg font-semibold text-secondary-900 dark:text-white">
-												Proxmox LXC Auto-Enrollment
-											</h3>
-											<p className="text-sm text-secondary-600 dark:text-secondary-400">
-												Automatically discover and enroll LXC containers from
-												Proxmox hosts
-											</p>
-										</div>
-									</div>
-									<button
-										type="button"
-										onClick={() => setShowCreateModal(true)}
-										className="btn-primary flex items-center gap-2"
-									>
-										<Plus className="h-4 w-4" />
-										New Token
-									</button>
-								</div>
-
-								{/* Token List */}
-								{loading ? (
-									<div className="text-center py-8">
-										<div className="inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-primary-600" />
-									</div>
-								) : tokens.length === 0 ? (
-									<div className="text-center py-8 text-secondary-600 dark:text-secondary-400">
-										<p>No auto-enrollment tokens created yet.</p>
-										<p className="text-sm mt-2">
-											Create a token to enable automatic host enrollment from
-											Proxmox.
-										</p>
-									</div>
-								) : (
-									<div className="space-y-3">
-										{tokens.map((token) => (
-											<div
-												key={token.id}
-												className="border border-secondary-200 dark:border-secondary-600 rounded-lg p-4 hover:border-primary-300 dark:hover:border-primary-700 transition-colors"
-											>
-												<div className="flex justify-between items-start">
-													<div className="flex-1">
-														<div className="flex items-center gap-2 flex-wrap">
-															<h4 className="font-medium text-secondary-900 dark:text-white">
-																{token.token_name}
-															</h4>
-															<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-200">
-																Proxmox LXC
-															</span>
-															{token.is_active ? (
-																<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200">
-																	Active
-																</span>
-															) : (
-																<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-secondary-100 text-secondary-800 dark:bg-secondary-700 dark:text-secondary-200">
-																	Inactive
-																</span>
-															)}
-														</div>
-														<div className="mt-2 space-y-1 text-sm text-secondary-600 dark:text-secondary-400">
-															<div className="flex items-center gap-2">
-																<span className="font-mono text-xs bg-secondary-100 dark:bg-secondary-700 px-2 py-1 rounded">
-																	{token.token_key}
-																</span>
-																<button
-																	type="button"
-																	onClick={() =>
-																		copy_to_clipboard(
-																			token.token_key,
-																			`key-${token.id}`,
-																		)
-																	}
-																	className="text-primary-600 hover:text-primary-700 dark:text-primary-400"
-																>
-																	{copy_success[`key-${token.id}`] ? (
-																		<CheckCircle className="h-4 w-4" />
-																	) : (
-																		<Copy className="h-4 w-4" />
-																	)}
-																</button>
-															</div>
-															<p>
-																Usage: {token.hosts_created_today}/
-																{token.max_hosts_per_day} hosts today
-															</p>
-															{token.host_groups && (
-																<p>
-																	Default Group:{" "}
-																	<span
-																		className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium"
-																		style={{
-																			backgroundColor: `${token.host_groups.color}20`,
-																			color: token.host_groups.color,
-																		}}
-																	>
-																		{token.host_groups.name}
-																	</span>
-																</p>
-															)}
-															{token.allowed_ip_ranges?.length > 0 && (
-																<p>
-																	Allowed IPs:{" "}
-																	{token.allowed_ip_ranges.join(", ")}
-																</p>
-															)}
-															<p>Created: {format_date(token.created_at)}</p>
-															{token.last_used_at && (
-																<p>
-																	Last Used: {format_date(token.last_used_at)}
-																</p>
-															)}
-															{token.expires_at && (
-																<p>
-																	Expires: {format_date(token.expires_at)}
-																	{new Date(token.expires_at) < new Date() && (
-																		<span className="ml-2 text-red-600 dark:text-red-400">
-																			(Expired)
-																		</span>
-																	)}
-																</p>
-															)}
-														</div>
-													</div>
-													<div className="flex items-center gap-2">
-														<button
-															type="button"
-															onClick={() =>
-																toggle_token_active(token.id, token.is_active)
-															}
-															className={`px-3 py-1 text-sm rounded ${
-																token.is_active
-																	? "bg-secondary-100 text-secondary-700 hover:bg-secondary-200 dark:bg-secondary-700 dark:text-secondary-300"
-																	: "bg-green-100 text-green-700 hover:bg-green-200 dark:bg-green-900 dark:text-green-300"
-															}`}
-														>
-															{token.is_active ? "Disable" : "Enable"}
-														</button>
-														<button
-															type="button"
-															onClick={() =>
-																delete_token(token.id, token.token_name)
-															}
-															className="text-red-600 hover:text-red-800 dark:text-red-400 p-2"
-														>
-															<Trash2 className="h-4 w-4" />
-														</button>
-													</div>
-												</div>
+					{/* Token List */}
+					{loading ? (
+						<div className="text-center py-8">
+							<div className="inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-primary-600" />
+						</div>
+					) : tokens.length === 0 ? (
+						<div className="text-center py-8 text-secondary-600 dark:text-secondary-400">
+							<p>No auto-enrollment tokens created yet.</p>
+							<p className="text-sm mt-2">
+								Create a token to enable automatic host enrollment from Proxmox.
+							</p>
+						</div>
+					) : (
+						<div className="space-y-3">
+							{tokens.map((token) => (
+								<div
+									key={token.id}
+									className="border border-secondary-200 dark:border-secondary-600 rounded-lg p-4 hover:border-primary-300 dark:hover:border-primary-700 transition-colors"
+								>
+									<div className="flex justify-between items-start">
+										<div className="flex-1">
+											<div className="flex items-center gap-2 flex-wrap">
+												<h4 className="font-medium text-secondary-900 dark:text-white">
+													{token.token_name}
+												</h4>
+												<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-200">
+													Proxmox LXC
+												</span>
+												{token.is_active ? (
+													<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200">
+														Active
+													</span>
+												) : (
+													<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-secondary-100 text-secondary-800 dark:bg-secondary-700 dark:text-secondary-200">
+														Inactive
+													</span>
+												)}
 											</div>
-										))}
-									</div>
-								)}
-
-								{/* Documentation Section */}
-								<div className="bg-primary-50 dark:bg-primary-900/20 border border-primary-200 dark:border-primary-800 rounded-lg p-6">
-									<h3 className="text-lg font-semibold text-primary-900 dark:text-primary-200 mb-3">
-										How to Use Auto-Enrollment
-									</h3>
-									<ol className="list-decimal list-inside space-y-2 text-sm text-primary-800 dark:text-primary-300">
-										<li>
-											Create a new auto-enrollment token using the button above
-										</li>
-										<li>
-											Copy the one-line installation command shown in the
-											success dialog
-										</li>
-										<li>SSH into your Proxmox host as root</li>
-										<li>
-											Paste and run the command - it will automatically discover
-											and enroll all running LXC containers
-										</li>
-										<li>View enrolled containers in the Hosts page</li>
-									</ol>
-									<div className="mt-4 p-3 bg-primary-100 dark:bg-primary-900/40 rounded border border-primary-200 dark:border-primary-700">
-										<p className="text-xs text-primary-800 dark:text-primary-300">
-											<strong>💡 Tip:</strong> You can run the same command
-											multiple times safely - already enrolled containers will
-											be automatically skipped.
-										</p>
+											<div className="mt-2 space-y-1 text-sm text-secondary-600 dark:text-secondary-400">
+												<div className="flex items-center gap-2">
+													<span className="font-mono text-xs bg-secondary-100 dark:bg-secondary-700 px-2 py-1 rounded">
+														{token.token_key}
+													</span>
+													<button
+														type="button"
+														onClick={() =>
+															copy_to_clipboard(
+																token.token_key,
+																`key-${token.id}`,
+															)
+														}
+														className="text-primary-600 hover:text-primary-700 dark:text-primary-400"
+													>
+														{copy_success[`key-${token.id}`] ? (
+															<CheckCircle className="h-4 w-4" />
+														) : (
+															<Copy className="h-4 w-4" />
+														)}
+													</button>
+												</div>
+												<p>
+													Usage: {token.hosts_created_today}/
+													{token.max_hosts_per_day} hosts today
+												</p>
+												{token.host_groups && (
+													<p>
+														Default Group:{" "}
+														<span
+															className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium"
+															style={{
+																backgroundColor: `${token.host_groups.color}20`,
+																color: token.host_groups.color,
+															}}
+														>
+															{token.host_groups.name}
+														</span>
+													</p>
+												)}
+												{token.allowed_ip_ranges?.length > 0 && (
+													<p>
+														Allowed IPs: {token.allowed_ip_ranges.join(", ")}
+													</p>
+												)}
+												<p>Created: {format_date(token.created_at)}</p>
+												{token.last_used_at && (
+													<p>Last Used: {format_date(token.last_used_at)}</p>
+												)}
+												{token.expires_at && (
+													<p>
+														Expires: {format_date(token.expires_at)}
+														{new Date(token.expires_at) < new Date() && (
+															<span className="ml-2 text-red-600 dark:text-red-400">
+																(Expired)
+															</span>
+														)}
+													</p>
+												)}
+											</div>
+										</div>
+										<div className="flex items-center gap-2">
+											<button
+												type="button"
+												onClick={() =>
+													toggle_token_active(token.id, token.is_active)
+												}
+												className={`px-3 py-1 text-sm rounded ${
+													token.is_active
+														? "bg-secondary-100 text-secondary-700 hover:bg-secondary-200 dark:bg-secondary-700 dark:text-secondary-300"
+														: "bg-green-100 text-green-700 hover:bg-green-200 dark:bg-green-900 dark:text-green-300"
+												}`}
+											>
+												{token.is_active ? "Disable" : "Enable"}
+											</button>
+											<button
+												type="button"
+												onClick={() => delete_token(token.id, token.token_name)}
+												className="text-red-600 hover:text-red-800 dark:text-red-400 p-2"
+											>
+												<Trash2 className="h-4 w-4" />
+											</button>
+										</div>
 									</div>
 								</div>
-							</div>
-						)}
+							))}
+						</div>
+					)}
+				</div>
+
+				{/* Documentation Section */}
+				<div className="bg-primary-50 dark:bg-primary-900/20 border border-primary-200 dark:border-primary-800 rounded-lg p-6">
+					<h3 className="text-lg font-semibold text-primary-900 dark:text-primary-200 mb-3">
+						How to Use Auto-Enrollment
+					</h3>
+					<ol className="list-decimal list-inside space-y-2 text-sm text-primary-800 dark:text-primary-300">
+						<li>Create a new auto-enrollment token using the button above</li>
+						<li>
+							Copy the one-line installation command shown in the success dialog
+						</li>
+						<li>SSH into your Proxmox host as root</li>
+						<li>
+							Paste and run the command - it will automatically discover and
+							enroll all running LXC containers
+						</li>
+						<li>View enrolled containers in the Hosts page</li>
+					</ol>
+					<div className="mt-4 p-3 bg-primary-100 dark:bg-primary-900/40 rounded border border-primary-200 dark:border-primary-700">
+						<p className="text-xs text-primary-800 dark:text-primary-300">
+							<strong>💡 Tip:</strong> You can run the same command multiple
+							times safely - already enrolled containers will be automatically
+							skipped.
+						</p>
 					</div>
 				</div>
 			</div>
@@ -671,32 +626,10 @@ const Integrations = () => {
 										Run this command on your Proxmox host to download and
 										execute the enrollment script:
 									</p>
-
-									{/* Force Install Toggle */}
-									<div className="mb-3">
-										<label className="flex items-center gap-2 text-sm">
-											<input
-												type="checkbox"
-												checked={force_proxmox_install}
-												onChange={(e) =>
-													setForceProxmoxInstall(e.target.checked)
-												}
-												className="rounded border-secondary-300 dark:border-secondary-600 text-primary-600 focus:ring-primary-500 dark:focus:ring-primary-400 dark:bg-secondary-700"
-											/>
-											<span className="text-secondary-800 dark:text-secondary-200">
-												Force install (bypass broken packages in containers)
-											</span>
-										</label>
-										<p className="text-xs text-secondary-600 dark:text-secondary-400 mt-1">
-											Enable this if your LXC containers have broken packages
-											(CloudPanel, WHM, etc.) that block apt-get operations
-										</p>
-									</div>
-
 									<div className="flex items-center gap-2">
 										<input
 											type="text"
-											value={`curl -s "${getProxmoxUrl()}" | bash`}
+											value={`curl -s "${server_url}/api/v1/auto-enrollment/proxmox-lxc?token_key=${new_token.token_key}&token_secret=${new_token.token_secret}" | bash`}
 											readOnly
 											className="flex-1 px-3 py-2 border border-secondary-300 dark:border-secondary-600 rounded-md bg-secondary-50 dark:bg-secondary-900 text-secondary-900 dark:text-white font-mono text-xs"
 										/>
@@ -704,7 +637,7 @@ const Integrations = () => {
 											type="button"
 											onClick={() =>
 												copy_to_clipboard(
-													`curl -s "${getProxmoxUrl()}" | bash`,
+													`curl -s "${server_url}/api/v1/auto-enrollment/proxmox-lxc?token_key=${new_token.token_key}&token_secret=${new_token.token_secret}" | bash`,
 													"curl-command",
 												)
 											}

frontend/src/pages/settings/SettingsServerConfig.jsx

@@ -1,8 +1,7 @@
-import { Code, Image, Server } from "lucide-react";
+import { Code, Server } from "lucide-react";
 import { useEffect, useState } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
 import SettingsLayout from "../../components/SettingsLayout";
-import BrandingTab from "../../components/settings/BrandingTab";
 import ProtocolUrlTab from "../../components/settings/ProtocolUrlTab";
 import VersionUpdateTab from "../../components/settings/VersionUpdateTab";
 
@@ -13,7 +12,6 @@ const SettingsServerConfig = () => {
 		// Set initial tab based on current route
 		if (location.pathname === "/settings/server-version") return "version";
 		if (location.pathname === "/settings/server-url") return "protocol";
-		if (location.pathname === "/settings/branding") return "branding";
 		if (location.pathname === "/settings/server-config/version")
 			return "version";
 		return "protocol";
@@ -25,8 +23,6 @@ const SettingsServerConfig = () => {
 			setActiveTab("version");
 		} else if (location.pathname === "/settings/server-url") {
 			setActiveTab("protocol");
-		} else if (location.pathname === "/settings/branding") {
-			setActiveTab("branding");
 		} else if (location.pathname === "/settings/server-config/version") {
 			setActiveTab("version");
 		} else if (location.pathname === "/settings/server-config") {
@@ -41,12 +37,6 @@ const SettingsServerConfig = () => {
 			icon: Server,
 			href: "/settings/server-url",
 		},
-		{
-			id: "branding",
-			name: "Branding",
-			icon: Image,
-			href: "/settings/branding",
-		},
 		{
 			id: "version",
 			name: "Server Version",
@@ -59,8 +49,6 @@ const SettingsServerConfig = () => {
 		switch (activeTab) {
 			case "protocol":
 				return <ProtocolUrlTab />;
-			case "branding":
-				return <BrandingTab />;
 			case "version":
 				return <VersionUpdateTab />;
 			default:

frontend/src/utils/api.js

@@ -51,16 +51,7 @@ export const dashboardAPI = {
 	getStats: () => api.get("/dashboard/stats"),
 	getHosts: () => api.get("/dashboard/hosts"),
 	getPackages: () => api.get("/dashboard/packages"),
-	getHostDetail: (hostId, params = {}) => {
-		const queryString = new URLSearchParams(params).toString();
-		const url = `/dashboard/hosts/${hostId}${queryString ? `?${queryString}` : ""}`;
-		return api.get(url);
-	},
-	getPackageTrends: (params = {}) => {
-		const queryString = new URLSearchParams(params).toString();
-		const url = `/dashboard/package-trends${queryString ? `?${queryString}` : ""}`;
-		return api.get(url);
-	},
+	getHostDetail: (hostId) => api.get(`/dashboard/hosts/${hostId}`),
 	getRecentUsers: () => api.get("/dashboard/recent-users"),
 	getRecentCollection: () => api.get("/dashboard/recent-collection"),
 };
@@ -141,7 +132,6 @@ export const repositoryAPI = {
 	getByHost: (hostId) => api.get(`/repositories/host/${hostId}`),
 	update: (repositoryId, data) =>
 		api.put(`/repositories/${repositoryId}`, data),
-	delete: (repositoryId) => api.delete(`/repositories/${repositoryId}`),
 	toggleHostRepository: (hostId, repositoryId, isEnabled) =>
 		api.patch(`/repositories/host/${hostId}/repository/${repositoryId}`, {
 			isEnabled,
@@ -233,8 +223,8 @@ export const versionAPI = {
 export const authAPI = {
 	login: (username, password) =>
 		api.post("/auth/login", { username, password }),
-	verifyTfa: (username, token, remember_me = false) =>
-		api.post("/auth/verify-tfa", { username, token, remember_me }),
+	verifyTfa: (username, token) =>
+		api.post("/auth/verify-tfa", { username, token }),
 	signup: (username, email, password, firstName, lastName) =>
 		api.post("/auth/signup", {
 			username,

frontend/src/utils/osIcons.jsx

@@ -24,16 +24,8 @@ export const getOSIcon = (osType) => {
 	// Linux distributions with authentic react-icons
 	if (os.includes("ubuntu")) return SiUbuntu;
 	if (os.includes("debian")) return SiDebian;
-	if (
-		os.includes("centos") ||
-		os.includes("rhel") ||
-		os.includes("red hat") ||
-		os.includes("almalinux") ||
-		os.includes("rocky")
-	)
+	if (os.includes("centos") || os.includes("rhel") || os.includes("red hat"))
 		return SiCentos;
-	if (os === "ol" || os.includes("oraclelinux") || os.includes("oracle linux"))
-		return SiLinux; // Use generic Linux icon for Oracle Linux
 	if (os.includes("fedora")) return SiFedora;
 	if (os.includes("arch")) return SiArchlinux;
 	if (os.includes("alpine")) return SiAlpinelinux;
@@ -80,10 +72,6 @@ export const getOSDisplayName = (osType) => {
 	if (os.includes("ubuntu")) return "Ubuntu";
 	if (os.includes("debian")) return "Debian";
 	if (os.includes("centos")) return "CentOS";
-	if (os.includes("almalinux")) return "AlmaLinux";
-	if (os.includes("rocky")) return "Rocky Linux";
-	if (os === "ol" || os.includes("oraclelinux") || os.includes("oracle linux"))
-		return "Oracle Linux";
 	if (os.includes("rhel") || os.includes("red hat"))
 		return "Red Hat Enterprise Linux";
 	if (os.includes("fedora")) return "Fedora";

frontend/vite.config.js

@@ -43,25 +43,5 @@ export default defineConfig({
 		outDir: "dist",
 		sourcemap: process.env.NODE_ENV !== "production",
 		target: "es2018",
-		rollupOptions: {
-			output: {
-				manualChunks: {
-					// React core
-					"react-vendor": ["react", "react-dom", "react-router-dom"],
-					// Large utility libraries
-					"utils-vendor": ["axios", "@tanstack/react-query", "date-fns"],
-					// Chart libraries
-					"chart-vendor": ["chart.js", "react-chartjs-2"],
-					// Icon libraries
-					"icons-vendor": ["lucide-react", "react-icons"],
-					// DnD libraries
-					"dnd-vendor": [
-						"@dnd-kit/core",
-						"@dnd-kit/sortable",
-						"@dnd-kit/utilities",
-					],
-				},
-			},
-		},
 	},
 });

setup.sh

@@ -35,7 +35,7 @@ NC='\033[0m' # No Color
 
 # Global variables
 SCRIPT_VERSION="self-hosting-install.sh v1.2.7-selfhost-2025-01-20-1"
-DEFAULT_GITHUB_REPO="https://github.com/PatchMon/PatchMon.git"
+DEFAULT_GITHUB_REPO="https://github.com/9technologygroup/patchmon.net.git"
 FQDN=""
 CUSTOM_FQDN=""
 EMAIL=""
@@ -254,7 +254,7 @@ check_prerequisites() {
 }
 
 select_branch() {
-    print_info "Fetching available releases from GitHub repository..."
+    print_info "Fetching available branches from GitHub repository..."
     
     # Create temporary directory for git operations
     TEMP_DIR="/tmp/patchmon_branches_$$"
@@ -263,88 +263,84 @@ select_branch() {
     
     # Try to clone the repository normally
     if git clone "$DEFAULT_GITHUB_REPO" . 2>/dev/null; then
-        # Get list of tags sorted by version (semantic versioning)
-        # Using git tag with version sorting
-        tags=$(git tag -l --sort=-v:refname 2>/dev/null | head -3)
+        # Get list of remote branches and trim whitespace
+        branches=$(git branch -r | grep -v HEAD | sed 's/origin\///' | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//' | sort -u)
         
-        if [ -n "$tags" ]; then
-            print_info "Available releases and branches:"
+        if [ -n "$branches" ]; then
+            print_info "Available branches with details:"
             echo ""
             
-            # Display last 3 release tags
-            option_count=1
-            declare -A options_map
-            
-            while IFS= read -r tag; do
-                if [ -n "$tag" ]; then
-                    # Get tag date and commit info
-                    tag_date=$(git log -1 --format="%ci" "$tag" 2>/dev/null || echo "Unknown")
+            # Get branch information
+            branch_count=1
+            while IFS= read -r branch; do
+                if [ -n "$branch" ]; then
+                    # Get last commit date for this branch
+                    last_commit=$(git log -1 --format="%ci" "origin/$branch" 2>/dev/null || echo "Unknown")
+                    
+                    # Get release tag associated with this branch (if any)
+                    release_tag=$(git describe --tags --exact-match "origin/$branch" 2>/dev/null || echo "")
                     
                     # Format the date
-                    if [ "$tag_date" != "Unknown" ]; then
-                        formatted_date=$(date -d "$tag_date" "+%Y-%m-%d %H:%M" 2>/dev/null || echo "$tag_date")
+                    if [ "$last_commit" != "Unknown" ]; then
+                        formatted_date=$(date -d "$last_commit" "+%Y-%m-%d %H:%M" 2>/dev/null || echo "$last_commit")
                     else
                         formatted_date="Unknown"
                     fi
                     
-                    # Mark the first one as latest
-                    if [ $option_count -eq 1 ]; then
-                        printf "%2d. %-20s (Latest Release - %s)\n" "$option_count" "$tag" "$formatted_date"
-                    else
-                        printf "%2d. %-20s (Release - %s)\n" "$option_count" "$tag" "$formatted_date"
+                    # Display branch info
+                    printf "%2d. %-20s" "$branch_count" "$branch"
+                    printf " (Last commit: %s)" "$formatted_date"
+                    
+                    if [ -n "$release_tag" ]; then
+                        printf " [Release: %s]" "$release_tag"
                     fi
                     
-                    # Store the tag for later selection
-                    options_map[$option_count]="$tag"
-                    option_count=$((option_count + 1))
+                    echo ""
+                    branch_count=$((branch_count + 1))
                 fi
-            done <<< "$tags"
-            
-            # Add main branch as an option
-            main_commit=$(git log -1 --format="%ci" "origin/main" 2>/dev/null || echo "Unknown")
-            if [ "$main_commit" != "Unknown" ]; then
-                formatted_main_date=$(date -d "$main_commit" "+%Y-%m-%d %H:%M" 2>/dev/null || echo "$main_commit")
-            else
-                formatted_main_date="Unknown"
-            fi
-            printf "%2d. %-20s (Development Branch - %s)\n" "$option_count" "main" "$formatted_main_date"
-            options_map[$option_count]="main"
+            done <<< "$branches"
             
             echo ""
             
-            # Default to option 1 (latest release tag)
-            default_option=1
+            # Determine default selection: prefer 'main' if present
+            main_index=$(echo "$branches" | nl -w1 -s':' | awk -F':' '$2=="main"{print $1}' | head -1)
+            if [ -z "$main_index" ]; then
+                main_index=1
+            fi
             
             while true; do
-                read_input "Select version/branch number" SELECTION_NUMBER "$default_option"
+                read_input "Select branch number" BRANCH_NUMBER "$main_index"
                 
-                if [[ "$SELECTION_NUMBER" =~ ^[0-9]+$ ]]; then
-                    selected_option="${options_map[$SELECTION_NUMBER]}"
-                    if [ -n "$selected_option" ]; then
-                        DEPLOYMENT_BRANCH="$selected_option"
+                if [[ "$BRANCH_NUMBER" =~ ^[0-9]+$ ]]; then
+                    selected_branch=$(echo "$branches" | sed -n "${BRANCH_NUMBER}p" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
+                    if [ -n "$selected_branch" ]; then
+                        DEPLOYMENT_BRANCH="$selected_branch"
                         
-                        # Show confirmation
-                        if [ "$selected_option" = "main" ]; then
-                            print_status "Selected branch: main (latest development code)"
-                            print_info "Last commit: $formatted_main_date"
+                        # Show additional info for selected branch
+                        last_commit=$(git log -1 --format="%ci" "origin/$selected_branch" 2>/dev/null || echo "Unknown")
+                        release_tag=$(git describe --tags --exact-match "origin/$selected_branch" 2>/dev/null || echo "")
+                        
+                        if [ "$last_commit" != "Unknown" ]; then
+                            formatted_date=$(date -d "$last_commit" "+%Y-%m-%d %H:%M" 2>/dev/null || echo "$last_commit")
                         else
-                            print_status "Selected release: $selected_option"
-                            tag_date=$(git log -1 --format="%ci" "$selected_option" 2>/dev/null || echo "Unknown")
-                            if [ "$tag_date" != "Unknown" ]; then
-                                formatted_date=$(date -d "$tag_date" "+%Y-%m-%d %H:%M" 2>/dev/null || echo "$tag_date")
-                                print_info "Release date: $formatted_date"
-                            fi
+                            formatted_date="Unknown"
+                        fi
+                        
+                        print_status "Selected branch: $DEPLOYMENT_BRANCH"
+                        print_info "Last commit: $formatted_date"
+                        if [ -n "$release_tag" ]; then
+                            print_info "Release tag: $release_tag"
                         fi
                         break
                     else
-                        print_error "Invalid selection number. Please try again."
+                        print_error "Invalid branch number. Please try again."
                     fi
                 else
                     print_error "Please enter a valid number."
                 fi
             done
         else
-            print_warning "No release tags found, using default: main"
+            print_warning "No branches found, using default: main"
             DEPLOYMENT_BRANCH="main"
         fi
     else
@@ -793,13 +789,9 @@ create_env_files() {
     cat > backend/.env << EOF
 # Database Configuration
 DATABASE_URL="postgresql://$DB_USER:$DB_PASS@localhost:5432/$DB_NAME"
-PM_DB_CONN_MAX_ATTEMPTS=30
-PM_DB_CONN_WAIT_INTERVAL=2
 
 # JWT Configuration
 JWT_SECRET="$JWT_SECRET"
-JWT_EXPIRES_IN=1h
-JWT_REFRESH_EXPIRES_IN=7d
 
 # Server Configuration
 PORT=$BACKEND_PORT
@@ -811,12 +803,6 @@ API_VERSION=v1
 # CORS Configuration
 CORS_ORIGIN="$SERVER_PROTOCOL_SEL://$FQDN"
 
-# Session Configuration
-SESSION_INACTIVITY_TIMEOUT_MINUTES=30
-
-# User Configuration
-DEFAULT_USER_ROLE=user
-
 # Rate Limiting (times in milliseconds)
 RATE_LIMIT_WINDOW_MS=900000
 RATE_LIMIT_MAX=5000
@@ -827,7 +813,6 @@ AGENT_RATE_LIMIT_MAX=1000
 
 # Logging
 LOG_LEVEL=info
-ENABLE_LOGGING=true
 EOF
 
     # Frontend .env