Update deploy.php

.gitea/workflows/deploy.yml

@@ -0,0 +1,31 @@
+name: Deploy to Production
+on:
+  push:
+    branches: [main]
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+      
+      - name: Install Deployer
+        run: |
+          composer global require deployer/deployer
+          export PATH="$HOME/.composer/vendor/bin:$PATH"
+
+      
+      - name: Setup SSH
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -H ${{ secrets.HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan -H caloriethingy.com >> ~/.ssh/known_hosts
+      
+      - name: Deploy
+        run: dep deploy calorie

.gitignore

@@ -41,6 +41,9 @@ phpunit.phar
 /frontend/web/index.php
 /frontend/web/index-test.php
 /frontend/web/robots.txt
+/api/web/index.php
+/api/web/index-test.php
+/api/web/robots.txt
 /backend/web/index.php
 /backend/web/index-test.php
 /backend/web/robots.txt

CHANGELOG.md

@@ -7,6 +7,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.2]
+
+### Fixes
+
+* Automatic upload checkbox on upload form #1
+
+### Added 
+
+* Sign in directly after signing up #2
+* "Today So Far" summary on the success page 
+* API for registering and login
+* API for fetching meals, summary, and posting meal
+* JWT tokens for API requests
+* Date, type, and context as columns to the meal
+* Terms and privacy
+
+### Changed
+
+* User view text to be more consistent
+* User meal entry form to allow input of additional metadata and context clues
+* Sleekplan moved to login
+
+### Removed
+
+* Form fields not needed
+* File name requirement from Meal model. Isn't necessary to have a file to record a meal
+
+## [0.1.1] - 2025-02-19
+
+### Added
+
+* SleekPlan javascript for user feedback
 
 ## [0.1.0] - 2025-02-10
 
@@ -18,5 +50,7 @@ This marks the first release!
 * Able to upload from phone with the rear camera initially
 * Confetti on success :)
 
-[Unreleased]: https://github.com/cgsmith/calorie/compare/0.1.0...HEAD
+[Unreleased]: https://github.com/cgsmith/calorie/compare/0.1.2...HEAD
+[0.1.2]: https://github.com/cgsmith/calorie/releases/tag/0.1.2
+[0.1.1]: https://github.com/cgsmith/calorie/releases/tag/0.1.1
 [0.1.0]: https://github.com/cgsmith/calorie/releases/tag/0.1.0

LICENSE

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

README.md

@@ -5,6 +5,8 @@ using the Yii2 framework.
 
 Read about it in the [MVP](mvp.md)
 
+License is [GNU GPLv3](LICENSE)
+
 ## Application Overview
 
 The application allows users to log meals, including uploading images for analysis, and view daily nutritional
@@ -37,7 +39,7 @@ You're application should be running at http://localhost:20080!
 
 1. `docker exec -it calorie-frontend-1 bash`
 2. `yii migrate`
-3. `yii fixture/load "*"` (creates chris@fivedevs.com with password of `password`)
+3. `yii fixture/load "*"` (creates admin@example.com with password of `password`)
 
 🎉 You should be able to login!
 

api/Dockerfile

@@ -0,0 +1,7 @@
+FROM yiisoftware/yii2-php:8.3-apache
+
+# Change document root for Apache
+RUN sed -i -e 's|/app/web|/app/api/web|g' /etc/apache2/sites-available/000-default.conf
+
+RUN echo "xdebug.client_port=9003" >> /usr/local/etc/php/conf.d/xdebug.ini
+RUN echo "xdebug.idekey=api" >> /usr/local/etc/php/conf.d/xdebug.ini

api/components/JwtAuth.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace api\components;
+
+use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
+use Yii;
+use yii\filters\auth\AuthMethod;
+use yii\web\UnauthorizedHttpException;
+
+class JwtAuth extends AuthMethod
+{
+    public function authenticate($user, $request, $response)
+    {
+        $authHeader = $request->getHeaders()->get('Authorization');
+        if ($authHeader && preg_match('/^Bearer\s+(.*?)$/', $authHeader, $matches)) {
+            $jwt = $matches[1];
+            try {
+                $decoded = JWT::decode($jwt, new Key(Yii::$app->params['jwtSecret'], 'HS256'));
+                return $user->loginByAccessToken($decoded->sub);
+            } catch (\Exception $e) {
+                throw new UnauthorizedHttpException('Invalid token');
+            }
+        }
+
+        return null;
+    }
+}

api/config/.gitignore

@@ -0,0 +1,4 @@
+codeception-local.php
+params-local.php
+test-local.php
+main-local.php

api/config/bootstrap.php

@@ -0,0 +1 @@
+<?php

api/config/main.php

@@ -1,4 +1,10 @@
 <?php
+
+use yii\log\FileTarget;
+use yii\rest\UrlRule;
+use yii\web\JsonParser;
+use yii\web\UrlManager;
+
 $params = array_merge(
     require __DIR__ . '/../../common/config/params.php',
     require __DIR__ . '/../../common/config/params-local.php',
@@ -7,44 +13,53 @@ $params = array_merge(
 );
 
 return [
-    'id' => 'app-backend',
+    'id' => 'calorie-api',
     'basePath' => dirname(__DIR__),
-    'controllerNamespace' => 'backend\controllers',
-    'bootstrap' => ['log'],
+    'controllerNamespace' => 'api\controllers',
+    'bootstrap' => [
+        'log' => [
+            'class'   => '\yii\filters\ContentNegotiator',
+            'formats' => [
+                //  comment next line to use GII
+                'application/json' => \yii\web\Response::FORMAT_JSON,
+            ],
+        ],
+    ],
     'modules' => [],
     'components' => [
         'request' => [
-            'csrfParam' => '_csrf-backend',
-        ],
-        'user' => [
-            'identityClass' => 'common\models\User',
-            'enableAutoLogin' => true,
-            'identityCookie' => ['name' => '_identity-backend', 'httpOnly' => true],
-        ],
-        'session' => [
-            // this is the name of the session cookie used for login on the backend
-            'name' => 'advanced-backend',
+            'enableCookieValidation' => false,
+            'enableCsrfValidation'   => false,
+            'parsers' => [
+                'application/json' => JsonParser::class,
+            ]
         ],
         'log' => [
             'traceLevel' => YII_DEBUG ? 3 : 0,
             'targets' => [
                 [
-                    'class' => \yii\log\FileTarget::class,
+                    'class' => FileTarget::class,
                     'levels' => ['error', 'warning'],
                 ],
             ],
         ],
-        'errorHandler' => [
-            'errorAction' => 'site/error',
-        ],
-        /*
         'urlManager' => [
+            'class' => UrlManager::class,
             'enablePrettyUrl' => true,
+            //'enableStrictParsing' => true,
             'showScriptName' => false,
             'rules' => [
+                ['class' => UrlRule::class, 'controller' => ['meal', 'auth']],
+                'POST /meals/create-meal' => 'meal/create-meal',
+                'GET /meals/get-daily-summary' => 'meal/get-daily-summary',
             ],
         ],
-        */
+        'user' => [
+            'identityClass' => \common\models\User::class,
+            'enableSession'   => false,
+            'enableAutoLogin' => false,
+            'loginUrl'        => null,
+        ],
     ],
     'params' => $params,
 ];

api/config/params.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'jwtSecret' => '',
+];

api/config/test.php

@@ -0,0 +1,4 @@
+<?php
+
+return [
+];

api/controllers/AuthController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace api\controllers;
+
+use common\models\User;
+use Firebase\JWT\JWT;
+use Yii;
+use yii\rest\Controller;
+use yii\web\Response;
+use yii\web\UnauthorizedHttpException;
+
+class AuthController extends Controller
+{
+    public function verbs()
+    {
+        return [
+            'register' => ['POST'],
+            'login' => ['POST'],
+        ];
+    }
+
+    private function generateJwt($user)
+    {
+        $key = Yii::$app->params['jwtSecret']; // Set in params.php
+        $payload = [
+            'iss' => 'calorie-thingy',
+            'aud' => 'calorie-thingy',
+            'iat' => time(),
+            'exp' => time() + (60 * 60 * 24 * 7), // 7 days expiration
+            'sub' => $user->auth_key,
+        ];
+
+        return JWT::encode($payload, $key, 'HS256');
+    }
+
+    public function actionRegister()
+    {
+        Yii::$app->response->format = Response::FORMAT_JSON;
+        $data = Yii::$app->request->post();
+
+        if (empty($data['email']) || empty($data['password'])) {
+            return ['error' => 'Email and password are required'];
+        }
+
+        if (User::findOne(['email' => $data['email']])) {
+            return ['error' => 'Email already exists'];
+        }
+
+        $user = new User();
+        $user->email = $data['email'];
+        $user->password_hash = Yii::$app->security->generatePasswordHash($data['password']);
+        $user->generateAuthKey();
+        $user->generateEmailVerificationToken();
+        if ($user->save()) {
+            return ['token' => $this->generateJwt($user)];
+        }
+
+        return ['error' => 'Registration failed'];
+    }
+
+    public function actionLogin()
+    {
+        Yii::$app->response->format = Response::FORMAT_JSON;
+        $data = Yii::$app->request->post();
+
+        $user = User::findOne(['email' => $data['email'] ?? null]);
+        if (!$user || !Yii::$app->security->validatePassword($data['password'], $user->password_hash)) {
+            throw new UnauthorizedHttpException();
+        }
+        // @todo not sure if it makes sense to generate an auth key each login via the API?
+        $user->generateAuthKey();
+        $user->save();
+
+        return ['token' => $this->generateJwt($user)];
+    }
+}

api/controllers/MealController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace api\controllers;
+
+use api\components\JwtAuth;
+use common\models\Meal;
+use common\models\MealForm;
+use Yii;
+use yii\data\ActiveDataProvider;
+use yii\rest\ActiveController;
+use yii\web\Response;
+use yii\web\UploadedFile;
+
+class MealController extends ActiveController
+{
+    public $modelClass = Meal::class;
+
+    public function behaviors()
+    {
+        $behaviors = parent::behaviors();
+        $behaviors['authenticator'] = [
+            'class' => JwtAuth::class,
+        ];
+        return $behaviors;
+    }
+
+
+    public function actionCreateMeal()
+    {
+        Yii::$app->response->format = Response::FORMAT_JSON;
+        $model = new MealForm();
+        $model->load(Yii::$app->request->post());
+        $model->picture = UploadedFile::getInstance($model, 'picture');
+        if ($model->upload()) {
+            $id = \Yii::$app->gemini->mealInquiry($model);
+            return array_merge(['meal' => Meal::findOne($id)], $this->actionGetDailySummary());
+        }
+
+        return ['error' => 'Failed to save meal'];
+    }
+
+    public function actionGetDailySummary()
+    {
+        // @TODO make this a common function of the user maybe?
+        Yii::$app->response->format = Response::FORMAT_JSON;
+        $startOfDay = strtotime('today midnight');
+        $endOfDay = strtotime('tomorrow midnight') - 1;
+
+        $today = Meal::find()
+            ->select([
+                'SUM(calories) AS calories',
+                'SUM(protein) AS protein',
+                'SUM(fat) AS fat',
+                'SUM(carbohydrates) AS carbohydrates',
+                'SUM(fiber) AS fiber'
+            ])
+            ->where(['user_id' => Yii::$app->user->id])
+            ->andWhere(['between', 'created_at', $startOfDay, $endOfDay])
+            ->asArray()
+            ->one();
+
+        return ['summary' => $today];
+    }
+
+    public function actions()
+    {
+        $actions = parent::actions();
+
+        // Modify the index action
+        $actions['index']['prepareDataProvider'] = function() {
+            // Get the user_id from the JWT token
+            $userId = Yii::$app->user->identity->id;
+
+            // Create the query to filter meals by the authenticated user
+            $query = Meal::find()->where(['user_id' => $userId]);
+
+            // Return the data provider with the filtered query
+            return new ActiveDataProvider([
+                'query' => $query,
+            ]);
+        };
+
+        return $actions;
+    }
+}

api/controllers/SiteController.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace backend\controllers;
-
-use common\models\LoginForm;
-use Yii;
-use yii\filters\VerbFilter;
-use yii\filters\AccessControl;
-use yii\web\Controller;
-use yii\web\Response;
-
-/**
- * Site controller
- */
-class SiteController extends Controller
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function behaviors()
-    {
-        return [
-            'access' => [
-                'class' => AccessControl::class,
-                'rules' => [
-                    [
-                        'actions' => ['login', 'error'],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index'],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
-            ],
-            'verbs' => [
-                'class' => VerbFilter::class,
-                'actions' => [
-                    'logout' => ['post'],
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function actions()
-    {
-        return [
-            'error' => [
-                'class' => \yii\web\ErrorAction::class,
-            ],
-        ];
-    }
-
-    /**
-     * Displays homepage.
-     *
-     * @return string
-     */
-    public function actionIndex()
-    {
-
-        return $this->render('index');
-    }
-
-    /**
-     * Login action.
-     *
-     * @return string|Response
-     */
-    public function actionLogin()
-    {
-
-        if (!Yii::$app->user->isGuest) {
-            return $this->goHome();
-        }
-
-        $this->layout = 'blank';
-
-        $model = new LoginForm();
-        if ($model->load(Yii::$app->request->post()) && $model->login()) {
-            return $this->goBack();
-        }
-
-        $model->password = '';
-
-        return $this->render('login', [
-            'model' => $model,
-        ]);
-    }
-
-    /**
-     * Logout action.
-     *
-     * @return Response
-     */
-    public function actionLogout()
-    {
-        Yii::$app->user->logout();
-
-        return $this->goHome();
-    }
-}

api/runtime/.gitignore

@@ -0,0 +1,3 @@
+cache
+debug
+logs

api/web/.htaccess

@@ -0,0 +1,7 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteBase /
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule . /index.php [L]
+</IfModule>

common/components/GeminiApiComponent.php

@@ -3,6 +3,7 @@
 namespace common\components;
 
 use common\models\Meal;
+use common\models\MealForm;
 use Exception;
 use Yii;
 use yii\helpers\FileHelper;
@@ -27,28 +28,19 @@ class GeminiApiComponent extends \yii\base\Component
                 'format' => Client::FORMAT_JSON
             ],
         ]);
-
     }
 
-    public function mealInquiry($filePath)
+    public function mealInquiry(MealForm $model)
     {
         $data = [
             "contents" => [
-                [
-                    "role" => "user",
-                    "parts" => [
-                        [
-                            "text" => "INSERT_INPUT_HERE"
-                        ]
-                    ]
-                ],
                 [
                     "role" => "user",
                     "parts" => [
                         [
                             "inline_data" => [
-                                "data" => base64_encode(file_get_contents($filePath)),
-                                "mimeType" => FileHelper::getMimeType($filePath)
+                                "data" => base64_encode(file_get_contents(Yii::getAlias('@frontend/web/') . $model->filepath)),
+                                "mimeType" => FileHelper::getMimeType(Yii::getAlias('@frontend/web/') . $model->filepath)
                             ]
                         ]
                     ]
@@ -58,7 +50,10 @@ class GeminiApiComponent extends \yii\base\Component
                 "role" => "user",
                 "parts" => [
                     [
-                        "text" => "Provide a caloric and macro estimate for pictures I provide to you. Try to be as accurate as possible and always calculate the everything you see in the picture. Proivde a 3 or 4 word `food_name`"
+                        "text" => "Provide a caloric and macro estimate for pictures I provide to you. Try to be as 
+                        accurate as possible and always calculate the everything you see in the picture. Provide a 
+                        3 or 7 word `food_name` with no special characters. If the user provides context pay attention 
+                        as it may contain details about the calories or specifics details about the picture."
                     ]
                 ]
             ],
@@ -102,6 +97,10 @@ class GeminiApiComponent extends \yii\base\Component
             ]
         ];
 
+        $data['contents'][0]['parts'][] = [
+                'text' => !empty($model->context) ? 'Context: ' . $model->context : 'INSERT_TEXT_HERE'
+        ];
+
         $response = $this->client
             ->post([$this->model, 'key' => $this->apiKey])
             ->setData($data)
@@ -114,15 +113,21 @@ class GeminiApiComponent extends \yii\base\Component
         $meal = new Meal();
         $gemini = json_decode($response->getContent(), true);
         $geminiMeal = json_decode($gemini['candidates'][0]['content']['parts'][0]['text'], true);
+        $meal->context = $model->context;
+        $meal->date = $model->date->format('Y-m-d H:i:s');
+        $meal->type = $model->type;
         $meal->protein = $geminiMeal['protein'];
         $meal->calories = $geminiMeal['calories'];
         $meal->carbohydrates = $geminiMeal['carbohydrates'];
         $meal->fat = $geminiMeal['fat'];
         $meal->fiber = $geminiMeal['fiber'];
         $meal->food_name = $geminiMeal['food_name'];
+        // @TODO if moved a job queue then this must be an object otherwise the queue is NOT aware of the user
         $meal->user_id = Yii::$app->user->id;
-        $meal->file_name = $filePath;
+        $meal->file_name = $model->filepath;
         Yii::debug($meal);
+        $meal->validate();
+        $errors = $meal->getErrors();
         $meal->save();
         // @TODO catch unidentified pictures?
 

common/config/__autocomplete.php

@@ -20,9 +20,7 @@ class Yii {
 
 /**
  * @property yii\rbac\DbManager                     $authManager
- * @property \Da\User\Model\User                    $user
- * @property \common\components\GeminiApiComponent  $sonar
- * @property \common\components\HubspotApiComponent $hubspot
+ * @property \common\components\GeminiApiComponent  $gemini
  * @property \common\components\PostmarkComponent   $postmark
  * @property \yii\queue\db\Queue                    $queue
  *

common/config/bootstrap.php

@@ -1,5 +1,5 @@
 <?php
 Yii::setAlias('@common', dirname(__DIR__));
 Yii::setAlias('@frontend', dirname(dirname(__DIR__)) . '/frontend');
-Yii::setAlias('@backend', dirname(dirname(__DIR__)) . '/api');
+Yii::setAlias('@api', dirname(dirname(__DIR__)) . '/api');
 Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console');

common/config/main.php

@@ -2,9 +2,7 @@
 
 use common\components\PostmarkComponent;
 use common\components\GeminiApiComponent;
-use common\components\HubspotApiComponent;
 use yii\caching\FileCache;
-use yii\queue\db\Queue;
 
 $params = array_merge(
     require __DIR__ . '/params.php',
@@ -12,7 +10,7 @@ $params = array_merge(
 );
 
 return [
-    'name' => $params['company_name'] . ' - ' . $params['product_name'],
+    'name' => $params['product_name'],
     'aliases' => [
         '@bower' => '@vendor/bower-asset',
         '@npm' => '@vendor/npm-asset',

common/models/Meal.php

@@ -2,15 +2,21 @@
 
 namespace common\models;
 
+use DateTime;
+use Yii;
 use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveRecord;
+use yii\web\UnauthorizedHttpException;
 
 /**
  * This is the model class for table "meal".
  *
  * @property int $id
  * @property string $file_name
+ * @property string $context
+ * @property DateTime $date
  * @property string $food_name
+ * @property string $type
  * @property int $calories
  * @property int $protein
  * @property int $fat
@@ -24,6 +30,10 @@ class Meal extends ActiveRecord
 {
 
     public $base64File;
+    public const BREAKFAST = 'breakfast';
+    public const LUNCH     = 'lunch';
+    public const DINNER    = 'dinner';
+    public const OTHER     = 'other';
 
     /**
      * {@inheritdoc}
@@ -53,8 +63,10 @@ class Meal extends ActiveRecord
     public function rules()
     {
         return [
-            [['food_name', 'file_name', 'calories', 'protein', 'fat', 'carbohydrates', 'fiber'], 'required'],
+            [['date', 'food_name', 'calories', 'protein', 'fat', 'carbohydrates', 'fiber', 'type'], 'required'],
             [['user_id', 'calories', 'protein', 'fat', 'carbohydrates', 'fiber', 'created_at', 'updated_at'], 'integer'],
+            [['type', 'context'], 'string'],
+            [['type'], 'in', 'range' => [self::BREAKFAST, self::LUNCH, self::DINNER, self::OTHER]],
             [['file_name'], 'string', 'max' => 255],
         ];
     }
@@ -76,4 +88,30 @@ class Meal extends ActiveRecord
             'updated_at' => 'Updated At',
         ];
     }
+
+
+    // Automatically set the user_id before saving a new meal
+    /**
+     * @throws UnauthorizedHttpException
+     */
+    public function beforeSave($insert)
+    {
+        if ($this->isNewRecord) {
+            // Get the currently authenticated user's ID
+            if (Yii::$app->user->isGuest) {
+                throw new \yii\web\UnauthorizedHttpException('User not authenticated.');
+            }
+
+            // Set the user_id to the current authenticated user
+            $this->user_id = Yii::$app->user->identity->id;
+        }
+
+        return parent::beforeSave($insert);
+    }
+
+    // Define relationships (if any)
+    public function getUser()
+    {
+        return $this->hasOne(User::class, ['id' => 'user_id']);
+    }
 }

common/models/MealForm.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace common\models;
+
+use DateInterval;
+use DateTime;
+use Ramsey\Uuid\Uuid;
+use Yii;
+use yii\base\Model;
+use yii\web\UploadedFile;
+
+class MealForm extends Model
+{
+
+    public $context;
+    /**
+     * @var UploadedFile
+     */
+    public $picture;
+    public string $filepath;
+    public $date;
+    public int $day = 0;
+    public $type = Meal::OTHER; // type of meal - default to other
+
+    public function init()
+    {
+        // @todo get user timezone to determine - should depend on their location not their settings
+        $hour = (int) (new DateTime())->format('H');
+        if ($hour >= 6 && $hour < 11) { // Breakfast time
+            $this->type = Meal::BREAKFAST;
+        } elseif ($hour >= 11 && $hour < 15) { // Lunch time
+            $this->type = Meal::LUNCH;
+        } elseif ($hour >= 15 && $hour < 21) { // Dinner time
+            $this->type = Meal::DINNER;
+        }
+    }
+
+
+    public function rules()
+    {
+        return [
+            [['picture'], 'image', 'skipOnEmpty' => false],
+            [['picture', 'day', 'type'], 'required'],
+            [['type'], 'string'],
+            [['day'], 'integer'],
+            [['context'], 'string', 'length' => [0, 100]],
+            [['day'], 'in', 'range' => [0, -1, -2, -3, -4]],
+            [['day'], 'validateCreationDate'],
+            [['type'], 'in', 'range' => [Meal::BREAKFAST, Meal::LUNCH, Meal::DINNER, Meal::OTHER]],
+        ];
+    }
+
+    /**
+     * How many days to subtract depending on the user selection
+     *
+     * @param $attribute
+     * @param $params
+     * @param $validator
+     * @param $current
+     * @return void
+     * @throws \DateInvalidOperationException
+     * @throws \DateMalformedIntervalStringException
+     */
+    public function validateCreationDate($attribute, $params, $validator, $current)
+    {
+        $this->date = new DateTime();
+        $this->date = $this->date->sub(new DateInterval('P' . abs($current) . 'D'));
+    }
+
+
+    public function newFileName(): void
+    {
+        $this->filepath = (string)'uploads/' . Yii::$app->user->id . '-' . Uuid::uuid4() . '.' . $this->picture->extension;
+    }
+
+    public function getTypeList(): array
+    {
+        return [
+            Meal::BREAKFAST => 'Breakfast',
+            Meal::LUNCH => 'Lunch',
+            Meal::DINNER => 'Dinner',
+            Meal::OTHER => '🤷'
+        ];
+    }
+
+    public function upload(): bool
+    {
+        if ($this->validate()) {
+            $this->newFileName();
+            $this->picture->saveAs('@frontend/web/' . $this->filepath);
+            return true;
+        } else {
+            $errors = $this->getErrors();
+            return false;
+        }
+    }
+}

common/models/User.php

@@ -92,17 +92,7 @@ class User extends ActiveRecord implements IdentityInterface
             ['status', 'default', 'value' => self::STATUS_ACTIVE],
             [['email'], 'email'],
             [['email'], 'unique'],
-            [['sales_agent_id', 'created_at', 'updated_at'], 'integer'],
-            [
-                'sales_agent_id',
-                'required',
-                'when' => function ($model) {
-                    return $model->role === 'sales-agent';
-                },
-                'whenClient' => "function (attribute, value) {
-                    return $('#role').val() == 'sales-agent';
-                }"
-            ],
+            [['created_at', 'updated_at'], 'integer'],
             [
                 'status',
                 'in',
@@ -192,7 +182,7 @@ class User extends ActiveRecord implements IdentityInterface
      */
     public static function findIdentityByAccessToken($token, $type = null)
     {
-        throw new NotSupportedException('"findIdentityByAccessToken" is not implemented.');
+        return static::findOne(['auth_key' => $token, 'status' => self::STATUS_ACTIVE]);
     }
 
     /**

composer.json

@@ -1,10 +1,11 @@
 {
   "license": "proprietary",
   "require": {
-    "php": ">=7.4.0",
+    "php": ">=8.3.0",
     "ext-json": "*",
     "cgsmith/yii2-flatpickr-widget": "~1.1",
     "donatj/phpuseragentparser": "^1.9",
+    "firebase/php-jwt": "^6.11",
     "ramsey/uuid": "^4.7",
     "sentry/sentry": "^4.9",
     "twbs/bootstrap-icons": "^1.11",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2aa71ca3104de10ae9406cd03e93cd1d",
+    "content-hash": "b786f2c120f3e18850b5f0af38aa0a2c",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
@@ -412,6 +412,69 @@
             },
             "time": "2024-11-01T03:51:45+00:00"
         },
+        {
+            "name": "firebase/php-jwt",
+            "version": "v6.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/firebase/php-jwt.git",
+                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/8f718f4dfc9c5d5f0c994cdfd103921b43592712",
+                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "guzzlehttp/guzzle": "^7.4",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
+                "psr/cache": "^2.0||^3.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0"
+            },
+            "suggest": {
+                "ext-sodium": "Support EdDSA (Ed25519) signatures",
+                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Firebase\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Neuman Vong",
+                    "email": "neuman+pear@twilio.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Anant Narayanan",
+                    "email": "anant@php.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+            "homepage": "https://github.com/firebase/php-jwt",
+            "keywords": [
+                "jwt",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/firebase/php-jwt/issues",
+                "source": "https://github.com/firebase/php-jwt/tree/v6.11.0"
+            },
+            "time": "2025-01-23T05:11:06+00:00"
+        },
         {
             "name": "guzzlehttp/guzzle",
             "version": "7.9.2",
@@ -2295,16 +2358,16 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "5.2.0",
+            "version": "5.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "5f74784541891f054a3f17dcb87a94b3f2552e0d"
+                "reference": "6e06224627dcd89e7d4753f44ba4df35034b6314"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5f74784541891f054a3f17dcb87a94b3f2552e0d",
-                "reference": "5f74784541891f054a3f17dcb87a94b3f2552e0d",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/6e06224627dcd89e7d4753f44ba4df35034b6314",
+                "reference": "6e06224627dcd89e7d4753f44ba4df35034b6314",
                 "shasum": ""
             },
             "require": {
@@ -2315,13 +2378,13 @@
                 "ext-json": "*",
                 "ext-mbstring": "*",
                 "php": "^8.1",
-                "phpunit/php-code-coverage": "^9.2 || ^10.0 || ^11.0",
-                "phpunit/php-text-template": "^2.0 || ^3.0 || ^4.0",
-                "phpunit/php-timer": "^5.0.3 || ^6.0 || ^7.0",
-                "phpunit/phpunit": "^9.5.20 || ^10.0 || ^11.0",
+                "phpunit/php-code-coverage": "^9.2 || ^10.0 || ^11.0 || ^12.0",
+                "phpunit/php-text-template": "^2.0 || ^3.0 || ^4.0 || ^5.0",
+                "phpunit/php-timer": "^5.0.3 || ^6.0 || ^7.0 || ^8.0",
+                "phpunit/phpunit": "^9.5.20 || ^10.0 || ^11.0 || ^12.0",
                 "psy/psysh": "^0.11.2 || ^0.12",
-                "sebastian/comparator": "^4.0.5 || ^5.0 || ^6.0",
-                "sebastian/diff": "^4.0.3 || ^5.0 || ^6.0",
+                "sebastian/comparator": "^4.0.5 || ^5.0 || ^6.0 || ^7.0",
+                "sebastian/diff": "^4.0.3 || ^5.0 || ^6.0 || ^7.0",
                 "symfony/console": ">=5.4.24 <8.0",
                 "symfony/css-selector": ">=5.4.24 <8.0",
                 "symfony/event-dispatcher": ">=5.4.24 <8.0",
@@ -2339,7 +2402,7 @@
             },
             "require-dev": {
                 "codeception/lib-innerbrowser": "*@dev",
-                "codeception/lib-web": "^1.0",
+                "codeception/lib-web": "*@dev",
                 "codeception/module-asserts": "*@dev",
                 "codeception/module-cli": "*@dev",
                 "codeception/module-db": "*@dev",
@@ -2404,7 +2467,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/Codeception/issues",
-                "source": "https://github.com/Codeception/Codeception/tree/5.2.0"
+                "source": "https://github.com/Codeception/Codeception/tree/5.2.1"
             },
             "funding": [
                 {
@@ -2412,7 +2475,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2025-02-16T20:29:26+00:00"
+            "time": "2025-02-20T14:52:49+00:00"
         },
         {
             "name": "codeception/lib-asserts",

console/migrations/m250220_180319_alter_meal_table_set_file_name_nullable.php

@@ -0,0 +1,25 @@
+<?php
+
+use yii\db\Migration;
+
+class m250220_180319_alter_meal_table_set_file_name_nullable extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->alterColumn('{{%meal}}', 'file_name', $this->string()->null());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        echo "m250220_180319_alter_meal_table_set_file_name_nullable cannot be reverted.\n";
+
+        return false;
+    }
+
+}

console/migrations/m250223_111753_add_type_date_context_columns_to_meal.php

@@ -0,0 +1,27 @@
+<?php
+
+use yii\db\Migration;
+
+class m250223_111753_add_type_date_context_columns_to_meal extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->addColumn('{{%meal}}', 'type', $this->string()->null()); // nullable because existing user data
+        $this->addColumn('{{%meal}}', 'date', $this->date()->null()); // nullable because existing user data
+        $this->addColumn('{{%meal}}', 'context', $this->string(100)->null());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropColumn('{{%meal}}', 'type');
+        $this->dropColumn('{{%meal}}', 'date');
+        $this->dropColumn('{{%meal}}', 'context');
+    }
+
+}

deploy.php

@@ -4,34 +4,36 @@ namespace Deployer;
 require 'recipe/yii.php';
 
 // Config
-set('repository', 'git@github.com:cgsmith/calorie.git');
+set('repository', 'https://git.sometimescode.com/cgsmith/caloriethingy.com.git');
 
 add('shared_files', [
     //'yii',
+    'console/config/main-local.php',
     'common/config/main-local.php',
     'common/config/params-local.php',
     'frontend/config/main-local.php',
     'frontend/config/params-local.php',
 ]);
-add('shared_dirs', []);
+add('shared_dirs', [
+    'frontend/web/uploads',
+]);
 add('writable_dirs', []);
 
 // Hosts
 host('calorie')
-    ->set('remote_user', 'root')
+    ->set('remote_user', 'chris')
+    ->set('hostname', 'caloriethingy.com')
     ->set('deploy_path', '/var/www/calorie')
     ->set('environment', 'Production')
-    ->setLabels([
-        'env' => 'prod',
-    ]);
+    ->set('labels', ['env' => 'prod']);
+
 host('test.calorie')
     ->set('composer_options', '--verbose --prefer-dist --no-progress --no-interaction')
-    ->set('remote_user', 'root')
+    ->set('remote_user', 'chris')
     ->set('deploy_path', '/var/www/test.calorie')
     ->set('environment', 'Testing')
-    ->setLabels([
-        'env' => 'test',
-    ]);
+    ->set('labels', ['env' => 'test']);
+
 
 // Tasks
 task('init-app', function () {
@@ -40,7 +42,7 @@ task('init-app', function () {
 
 desc('Restart yii queue workers');
 task('yii:queue:restart', function () {
-    run('systemctl restart yii-queue@*');
+    run('systemctl restart calorie-queue@*');
 });
 
 task('deploy:prod', function() {

docker-compose.yml

@@ -14,6 +14,20 @@ services:
     extra_hosts: # https://stackoverflow.com/a/67158212/1106908
       - "host.docker.internal:host-gateway"
 
+  api:
+    build: api
+    ports:
+      - "20081:80"
+    environment:
+      - PHP_ENABLE_XDEBUG=1
+    volumes:
+      # Re-use local composer cache via host-volume
+      - ~/.composer-docker/cache:/root/.composer/cache:delegated
+      # Mount source-code for development
+      - ./:/app
+    extra_hosts: # https://stackoverflow.com/a/67158212/1106908
+      - "host.docker.internal:host-gateway"
+
   mysql:
     image: mysql:8
     environment:

environments/dev/api/config/codeception-local.php

@@ -0,0 +1,11 @@
+<?php
+
+return yii\helpers\ArrayHelper::merge(
+    require dirname(dirname(__DIR__)) . '/common/config/codeception-local.php',
+    require __DIR__ . '/main.php',
+    require __DIR__ . '/main-local.php',
+    require __DIR__ . '/test.php',
+    require __DIR__ . '/test-local.php',
+    [
+    ]
+);

environments/dev/api/config/main-local.php

@@ -4,7 +4,7 @@ $config = [
     'components' => [
         'request' => [
             // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
-            'cookieValidationKey' => 'fKCQhZtDFPI3Xt13xTqMdvn16F_Yd1Sl',
+            'cookieValidationKey' => '',
         ],
     ],
 ];
@@ -14,11 +14,13 @@ if (!YII_ENV_TEST) {
     $config['bootstrap'][] = 'debug';
     $config['modules']['debug'] = [
         'class' => \yii\debug\Module::class,
+        'allowedIPs' => ['*'],
     ];
 
     $config['bootstrap'][] = 'gii';
     $config['modules']['gii'] = [
         'class' => \yii\gii\Module::class,
+        'allowedIPs' => ['*'],
     ];
 }
 

environments/dev/api/config/params-local.php

@@ -0,0 +1,4 @@
+<?php
+
+return [
+];

environments/dev/api/config/test-local.php

@@ -0,0 +1,4 @@
+<?php
+
+return [
+];

environments/dev/api/web/index-test.php

@@ -0,0 +1,28 @@
+<?php
+
+// NOTE: Make sure this file is not accessible when deployed to production
+if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
+    die('You are not allowed to access this file.');
+}
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../vendor/yiisoft/yii2/Yii.php';
+require __DIR__ . '/../../common/config/bootstrap.php';
+require __DIR__ . '/../config/bootstrap.php';
+
+
+$config = yii\helpers\ArrayHelper::merge(
+    require __DIR__ . '/../../common/config/main.php',
+    require __DIR__ . '/../../common/config/main-local.php',
+    require __DIR__ . '/../../common/config/test.php',
+    require __DIR__ . '/../../common/config/test-local.php',
+    require __DIR__ . '/../config/main.php',
+    require __DIR__ . '/../config/main-local.php',
+    require __DIR__ . '/../config/test.php',
+    require __DIR__ . '/../config/test-local.php'
+);
+
+(new yii\web\Application($config))->run();

environments/dev/api/web/index.php

@@ -0,0 +1,18 @@
+<?php
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'dev');
+
+require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../vendor/yiisoft/yii2/Yii.php';
+require __DIR__ . '/../../common/config/bootstrap.php';
+require __DIR__ . '/../config/bootstrap.php';
+
+$config = yii\helpers\ArrayHelper::merge(
+    require __DIR__ . '/../../common/config/main.php',
+    require __DIR__ . '/../../common/config/main-local.php',
+    require __DIR__ . '/../config/main.php',
+    require __DIR__ . '/../config/main-local.php'
+);
+
+(new yii\web\Application($config))->run();

environments/dev/api/web/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

environments/index.php

@@ -32,6 +32,7 @@ return [
     'Development' => [
         'path' => 'dev',
         'setWritable' => [
+            'api/runtime',
             'console/runtime',
             'frontend/runtime',
             'frontend/web/assets',
@@ -41,6 +42,7 @@ return [
             'yii_test',
         ],
         'setCookieValidationKey' => [
+            'api/config/main-local.php',
             'common/config/codeception-local.php',
             'frontend/config/main-local.php',
         ],

frontend/config/main.php

@@ -41,9 +41,6 @@ return [
             ],
         ],
         'request' => [
-            'parsers' => [
-                'application/json' => 'yii\web\JsonParser',
-            ],
             'csrfParam' => '_csrf-frontend',
         ],
         'session' => [

frontend/controllers/MealController.php

@@ -3,14 +3,14 @@
 namespace frontend\controllers;
 
 use common\models\Meal;
+use common\models\MealForm;
 use common\models\search\MealSearch;
-use frontend\models\MealForm;
+use DateTime;
 use Yii;
-use yii\data\ActiveDataProvider;
 use yii\filters\AccessControl;
+use yii\filters\VerbFilter;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
 use yii\web\UploadedFile;
 
 /**
@@ -64,9 +64,10 @@ class MealController extends Controller
         $model = new MealForm();
 
         if (Yii::$app->request->isPost) {
+            $model->load(Yii::$app->request->post());
             $model->picture = UploadedFile::getInstance($model, 'picture');
             if ($model->upload()) {
-                $id = \Yii::$app->gemini->mealInquiry($model->filepath);
+                $id = \Yii::$app->gemini->mealInquiry($model);
                 return Yii::$app->response->redirect(['meal/success', 'id' => $id]);
             }
         }
@@ -79,8 +80,30 @@ class MealController extends Controller
     public function actionSuccess($id)
     {
         $model = $this->findModel($id);
+        $sum = Meal::find()
+            ->select([
+                'SUM(calories) AS calories',
+                'SUM(protein) AS protein',
+                'SUM(fat) AS fat',
+                'SUM(carbohydrates) AS carbohydrates',
+                'SUM(fiber) AS fiber'
+            ])
+            ->where(['user_id' => Yii::$app->user->id, 'date' => $model->date])
+            ->asArray()
+            ->one();
+        $sum = array_merge(['calories' => 0, 'protein' => 0, 'fat' => 0, 'carbohydrates' => 0, 'fiber' => 0], $sum);
 
-        return $this->render('success', ['model' => $model]);
+        $today = new DateTime();
+        $modelDate = new DateTime($model->date); // @todo should be a date object
+        $diff = $today->diff($modelDate);
+
+        $sum['title'] = match ($diff->days) {
+            0 => 'Today So Far',
+            1 => 'Yesterday\'s Sum',
+            default => $modelDate->format('M jS'),
+        };
+
+        return $this->render('success', ['model' => $model, 'sum' => $sum]);
     }
 
     /**

frontend/controllers/SiteController.php

@@ -4,6 +4,7 @@ namespace frontend\controllers;
 
 use common\components\GeminiApiComponent;
 use common\jobs\EmailJob;
+use common\models\User;
 use frontend\models\ResendVerificationEmailForm;
 use frontend\models\VerifyEmailForm;
 use Yii;
@@ -34,7 +35,7 @@ class SiteController extends Controller
         return [
             'access' => [
                 'class' => AccessControl::class,
-                'only' => ['logout', 'signup', 'webhook'],
+                'only' => ['logout', 'signup', 'privacy', 'terms'],
                 'rules' => [
                     [
                         'actions' => ['signup'],
@@ -42,9 +43,14 @@ class SiteController extends Controller
                         'roles' => ['?'],
                     ],
                     [
-                        'actions' => ['webhook'],
+                        'actions' => ['privacy'],
                         'allow' => true,
-                        'roles' => ['?'],
+                        'roles' => ['?', '@'],
+                    ],
+                    [
+                        'actions' => ['terms'],
+                        'allow' => true,
+                        'roles' => ['?', '@'],
                     ],
                     [
                         'actions' => ['logout'],
@@ -57,7 +63,6 @@ class SiteController extends Controller
                 'class' => VerbFilter::class,
                 'actions' => [
                     'logout' => ['post'],
-                    'webhook' => ['post','head'],
                 ],
             ],
         ];
@@ -100,6 +105,16 @@ class SiteController extends Controller
         return $this->render('index');
     }
 
+    public function actionPrivacy()
+    {
+        return $this->render('privacy');
+    }
+
+    public function actionTerms()
+    {
+        return $this->render('terms');
+    }
+
     /**
      * Logs in a user.
      *
@@ -144,7 +159,8 @@ class SiteController extends Controller
     {
         $model = new SignupForm();
         if ($model->load(Yii::$app->request->post()) && $model->signup()) {
-            Yii::$app->session->setFlash('success', 'Thank you for registering! Sign in and snap your first meal!');
+            Yii::$app->session->setFlash('success', 'Thank you for registering! Snap your first meal!');
+            Yii::$app->user->login(User::findByEmail($model->email), 3600 * 24 * 30);
             return $this->response->redirect(['meal/upload']);
         }
 

frontend/models/MealForm.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace frontend\models;
-
-use Ramsey\Uuid\Uuid;
-use Yii;
-use yii\base\Model;
-use yii\web\UploadedFile;
-
-class MealForm extends Model
-{
-
-    /**
-     * @var UploadedFile
-     */
-    public $picture;
-    public string $filepath;
-
-    public function rules() {
-        return [
-            [['picture'], 'file', 'skipOnEmpty' => false],
-            [['picture'], 'required'],
-        ];
-    }
-
-    public function newFileName()
-    {
-        $this->filepath = (string)'uploads/' . Yii::$app->user->id . '-' . Uuid::uuid4() . '.' . $this->picture->extension;
-    }
-
-    public function upload()
-    {
-        if ($this->validate()) {
-            $this->newFileName();
-            $this->picture->saveAs($this->filepath);
-            return true;
-        } else {
-            return false;
-        }
-    }
-}

frontend/views/layouts/main.php

@@ -19,14 +19,29 @@ $this->beginPage() ?>
     <!DOCTYPE html>
     <html lang="<?= Yii::$app->language ?>" class="h-100">
     <head>
+        <?php
+        if (!Yii::$app->user->isGuest) {
+        ?>
+        <script type="text/javascript">window.$sleek = [];
+            window.SLEEK_PRODUCT_ID = 87924416;
+            (function () {
+                d = document;
+                s = d.createElement("script");
+                s.src = "https://client.sleekplan.com/sdk/e.js";
+                s.async = 1;
+                d.getElementsByTagName("head")[0].appendChild(s);
+            })();</script>
+        <?php } ?>
         <meta charset="<?= Yii::$app->charset ?>">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <?php
         $this->registerCsrfMetaTags() ?>
         <title><?= Html::encode($this->title) ?></title>
-        <?php $this->head() ?>
+        <?php
+        $this->head() ?>
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+        <link rel="stylesheet"
+              href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
     </head>
     <body class="d-flex flex-column h-100">
     <?php
@@ -99,7 +114,15 @@ $this->beginPage() ?>
 
     <footer class="footer mt-auto py-3 text-muted">
         <div class="container">
-            <p class="float-start">&copy; <?= Html::encode(Yii::$app->name) ?> <?= date('Y') ?></p>
+            <p class="float-start">
+                &copy; <?= Html::encode(Yii::$app->name) ?> <?= date('Y') ?>
+                <a href="<?= Url::to(['/site/terms']) ?>" class="text-black">Terms and Conditions</a>
+                <a href="<?= Url::to(['/site/privacy']) ?>" class="text-black">Privacy Policy</a>&nbsp;
+                <a href="https://x.com/caloriethingy" target="_blank" class="text-black mx-2"><i class="bi bi-twitter-x"></i></a>
+                <a href="https://github.com/caloriethingy/website" target="_blank" class="text-black">
+                    <i class="bi bi-github"></i>
+                </a>
+            </p>
         </div>
     </footer>
 

frontend/views/meal/_form.php

@@ -12,7 +12,7 @@ use yii\widgets\ActiveForm;
 
     <?php $form = ActiveForm::begin(); ?>
 
-    <?= $form->field($model, 'file_name')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'file_name')->hiddenInput(['maxlength' => true]) ?>
 
     <?= $form->field($model, 'calories')->textInput() ?>
 
@@ -24,11 +24,6 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'fiber')->textInput() ?>
 
-    <?= $form->field($model, 'meal')->textInput() ?>
-
-    <?= $form->field($model, 'created_at')->textInput() ?>
-
-    <?= $form->field($model, 'updated_at')->textInput() ?>
 
     <div class="form-group">
         <?= Html::submitButton('Save', ['class' => 'btn btn-success']) ?>

frontend/views/meal/index.php

@@ -17,21 +17,21 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
 
     <p>
-        <?= Html::a('Create Meal', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Capture Meal', ['upload'], ['class' => 'btn btn-success']) ?>
     </p>
 
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
             'food_name',
+            'type',
             'calories',
             'protein',
             'fat',
             'carbohydrates',
             'fiber',
-            'created_at:datetime',
+            'date:date',
             [
                 'class' => ActionColumn::class,
                 'urlCreator' => function ($action, Meal $model, $key, $index, $column) {

frontend/views/meal/success.php

@@ -1,6 +1,5 @@
 <?php
 
-use common\models\Meal;
 use frontend\assets\ConfettiAsset;
 
 /* @var $this yii\web\View */
@@ -9,7 +8,6 @@ $this->title = Yii::$app->name;
 
 ConfettiAsset::register($this);
 
-
 $this->registerJs("
 var end = Date.now() + (2 * 1000);
 var scalar = 2;
@@ -57,24 +55,57 @@ var isMobile = window.innerWidth < 768; // Adjust as needed for tablets
         and your food. But also you. 🤖🍕
     </p>
 
-    <div class="card mx-auto p-3" style="max-width: 400px; border-radius: 12px; box-shadow: 0 4px 10px rgba(0,0,0,0.1); z-index: 200;">
-        <h4 class="mb-3 text-center">🍽️ <strong><?= $model->food_name ?></strong></h4>
-        <div class="row">
-            <div class="col-6 text-right">
-                <p class="mb-0"><strong>🔥 Calories</strong></p>
-                <p class="mb-0"><strong>🍗 Protein</strong></p>
-                <p class="mb-0"><strong>🥑 Fat</strong></p>
-                <p class="mb-0"><strong>🍞 Carbs</strong></p>
+    <div class="container text-center mt-4">
+        <div class="row justify-content-center">
+            <!-- Food Item Card -->
+            <div class="col-md-6 d-flex">
+                <div class="card p-3 w-100 h-100 d-flex flex-column" style="max-width: 400px; border-radius: 12px; box-shadow: 0 4px 10px rgba(0,0,0,0.1); z-index: 200;">
+                    <h4 class="mb-3 text-center">🍽️ <strong><?= $model->food_name ?></strong></h4>
+                    <div class="row flex-grow-1">
+                        <div class="col-6 text-end">
+                            <p class="mb-0"><strong>🔥 Calories</strong></p>
+                            <p class="mb-0"><strong>🍗 Protein</strong></p>
+                            <p class="mb-0"><strong>🥑 Fat</strong></p>
+                            <p class="mb-0"><strong>🍞 Carbs</strong></p>
+                            <p class="mb-0"><strong>🌾 Fiber</strong></p>
+                        </div>
+                        <div class="col-6 text-start">
+                            <p class="mb-0"><?= $model->calories ?> kcal</p>
+                            <p class="mb-0"><?= $model->protein ?> g</p>
+                            <p class="mb-0"><?= $model->fat ?> g</p>
+                            <p class="mb-0"><?= $model->carbohydrates ?> g</p>
+                            <p class="mb-0"><?= $model->fiber ?> g</p>
+                        </div>
+                    </div>
+                </div>
             </div>
 
-            <div class="col-6">
-                <p class="mb-0"><?= $model->calories ?> kcal</p>
-                <p class="mb-0"><?= $model->protein ?> g</p>
-                <p class="mb-0"><?= $model->fat ?> g</p>
-                <p class="mb-0"><?= $model->carbohydrates ?> g</p>
+            <!-- Daily Totals Section -->
+            <div class="col-md-6 d-flex mt-3 mt-md-0">
+                <div class="card p-3 w-100 h-100 d-flex flex-column" style="max-width: 400px; border-radius: 12px; box-shadow: 0 4px 10px rgba(0,0,0,0.1); z-index: 200;">
+                    <h4 class="card-title text-center">📊 <strong><?=$sum['title']?></strong></h4>
+                    <div class="row flex-grow-1">
+                        <div class="col-6 text-end">
+                            <p class="mb-0"><strong>🔥 Calories</strong></p>
+                            <p class="mb-0"><strong>🍗 Protein</strong></p>
+                            <p class="mb-0"><strong>🥑 Fat</strong></p>
+                            <p class="mb-0"><strong>🍞 Carbs</strong></p>
+                            <p class="mb-0"><strong>🌾 Fiber</strong></p>
+                        </div>
+                        <div class="col-6 text-start">
+                            <p class="mb-0"><?= $sum['calories']; ?> kcal</p>
+                            <p class="mb-0"><?= $sum['protein']; ?> g</p>
+                            <p class="mb-0"><?= $sum['fat']; ?> g</p>
+                            <p class="mb-0"><?= $sum['carbohydrates']; ?> g</p>
+                            <p class="mb-0"><?= $sum['fiber']; ?> g</p>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
+
+
     <div class="p-5 mb-4 bg-transparent rounded-3">
         <div class="container-fluid py-5 text-center">
             <p><a class="btn btn-lg btn-primary" href="/meal/upload" style="z-index: 200;">Feed me more data! 🍔</a></p>

frontend/views/meal/update.php

@@ -5,9 +5,9 @@ use yii\helpers\Html;
 /** @var yii\web\View $this */
 /** @var common\models\Meal $model */
 
-$this->title = 'Update Meal: ' . $model->id;
+$this->title = 'Update Meal: ' . $model->food_name;
 $this->params['breadcrumbs'][] = ['label' => 'Meals', 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = ['label' => $model->food_name, 'url' => ['view', 'id' => $model->id]];
 $this->params['breadcrumbs'][] = 'Update';
 ?>
 <div class="meal-update">

frontend/views/meal/upload.php

@@ -1,62 +1,247 @@
 <?php
 
+use common\models\Meal;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /** @var yii\web\View $this */
-/** @var common\models\Meal $model */
+/** @var common\models\MealForm $model */
 /** @var yii\widgets\ActiveForm $form */
 
-$emoji = ['🍕', '🍔', '🍎', '🥑', '🥗', '🍣', '🍩', '🌮', '🍉', '🍞', '🍜', '🥩', '🍪', '🥕', '🧀', '🍓', '🍍', '🥒', '🍇', '🥞', '🦞', '🍗', '🍛'];
+$emoji = [
+    '🍕',
+    '🍔',
+    '🍎',
+    '🥑',
+    '🥗',
+    '🍣',
+    '🍩',
+    '🌮',
+    '🍉',
+    '🍞',
+    '🍜',
+    '🥩',
+    '🍪',
+    '🥕',
+    '🧀',
+    '🍓',
+    '🍍',
+    '🥒',
+    '🍇',
+    '🥞',
+    '🦞',
+    '🍗',
+    '🍛'
+];
 $randEmojiIndex = array_rand($emoji, 1);
-$this->registerJS("
-    let foodEmojis = ".json_encode($emoji).";
-    let index = 0;
-    let lastIndex = ".$randEmojiIndex.";
+$this->registerJS(
+    "
+    let foodEmojis = " . json_encode($emoji) . ";
+    let emojiIndex = " . $randEmojiIndex . ";
+    setInterval(() => {
+        $('#upload-title').text('Upload Your ' + foodEmojis[emojiIndex]);
+        emojiIndex = (emojiIndex + 1) % foodEmojis.length; // Cycle through emojis
+    }, 1100); // Adjust the interval (in milliseconds) for the desired speed
 
-    function cycleEmojis() {
-        let newIndex;
-        do {
-            newIndex = Math.floor(Math.random() * foodEmojis.length);
-        } while (newIndex === lastIndex); // Ensure it's different from the last one
-
-        lastIndex = newIndex; // Update lastIndex to track the last used emoji
-
-        $('#upload-title').fadeOut(200, function() {
-            $(this).html('Upload Your ' + foodEmojis[newIndex]).fadeIn(200);
-        });
-    }
-
-    setInterval(cycleEmojis, 1500); // Change every 1.5 seconds
-    
-     $('#mealform-picture').on('change', function(ev) {
-             $('#submitButton').text('Processing...');
-             $('#submitButton').attr('disabled', true);
-             $(this).parents('form').submit();
-             ev.preventDefault();
+    $('#file-input').on('change', function(ev) {
+     if (localStorage.getItem('autoUpload') === 'true') { // Check localStorage
+        $('#submitButton').text('Processing...');
+        $('#submitButton').attr('disabled', true);
+        $(this).parents('form').submit();
+        ev.preventDefault();
+      }
     });
-");
+    
+    $('#submitButton').on('click', function(ev) {
+        $('#submitButton').text('Processing...');
+        $('#submitButton').attr('disabled', true);
+        $(this).parents('form').submit();
+        ev.preventDefault();
+      }
+    );
+"
+);
+
+$this->registerCssFile('@web/css/upload.css');
 ?>
 
 <div class="meal-form container mt-5">
-    <div class="card shadow-sm p-4">
-        <h5 id="upload-title" class="mb-3">Upload Your <?= $emoji[$randEmojiIndex] ?></h5>
+    <div class="upload-box">
+        <h5 id="upload-title" class="mb-3 fs-2 fw-bold">Upload Your <?= $emoji[$randEmojiIndex] ?></h5>
 
         <?php
         $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
 
-        <div class="mb-3">
-            <label for="mealform-picture" class="form-label">Your picture will automatically submit after selected. Just
-                be patient.</label>
-            <?= $form->field($model, 'picture')
-                ->fileInput([
-                    'class' => 'form-control',
-                    'capture' => 'environment',
-                ]); ?>
+        <?= $form->errorSummary($model); ?>
+        <?=$form->field($model, 'context')->textInput([
+            'class' => 'form-control mb-3',
+            'placeholder' => 'Add context (optional)',
+            'autofocus',
+        ])->label(false) ?>
+
+        <div id="gesture-area" class="gesture-area">
+            Tap to take a picture or Long Press to upload a file
+            <img id="image-preview" src="#" alt="Image Preview" style="display: none; max-width: 100%;">
         </div>
-        <div class="form-group">
-            <?= Html::submitButton('Submit', ['id' => 'submitButton', 'class' => 'btn btn-success']) ?>
+
+        <?= Html::activeFileInput($model, 'picture', ['style' => 'display: none;', 'id' => 'file-input']) ?>
+        <?= $form->field($model, 'day')->hiddenInput()->label(false); ?>
+
+        <div id="metadata-fields">
+            <div class="mb-3">
+                <div class="btn-group d-flex justify-content-center" role="group">
+                    <button id="prev-day-btn" class="btn btn-light" type="button">&lt;</button>
+                    <button id="current-day-btn" class="btn btn-light" type="button">Today</button>
+                    <button id="next-day-btn" class="btn btn-light" type="button" disabled>&gt;</button>
+                </div>
+            </div>
+
+                <?= $form
+                    ->field($model, 'type')
+                    ->radioList($model->getTypeList(), [
+                            'class' => 'btn-group d-flex justify-content-center',
+                            'item' => function ($index, $label, $name, $checked, $value) {
+                                $return = '<input class="btn-check" type="radio" value="'.$value.'" id="'.$value.'" name="' . $name . '" autocomplete="off" ' . ($checked ? "checked" : "") . '>';
+                                $return .= '<label class="btn btn-outline-primary" for="'.$value.'">' . $label . '</label>';
+                                return $return;
+                            },
+                    ])
+                    ->label(false); ?>
         </div>
-        <?php ActiveForm::end(); ?>
+
+        <div class="mb-3 form-check mt-3">
+            <label class="form-check-label" for="auto-upload-checkbox">Automatically upload</label>
+            <input type="checkbox" class="form-check-input" id="auto-upload-checkbox">
+        </div>
+        <div class="d-grid gap-2 d-md-block">
+            <?= Html::submitButton('Save meal!', ['id' => 'submitButton', 'class' => 'btn btn-success']) ?>
+        </div>
+
+        <?php
+        ActiveForm::end(); ?>
     </div>
+    <script>
+        const gestureArea = document.getElementById('gesture-area');
+        const fileInput = document.getElementById('file-input');
+        const cameraInput = document.getElementById('camera-input');
+        const imagePreview = document.getElementById('image-preview'); // Get the image element
+
+        const body = document.body;
+        const autoUploadCheckbox = document.getElementById('auto-upload-checkbox');
+
+        fileInput.addEventListener('change', (event) => {
+            const file = event.target.files; // Corrected to access the first file
+            const reader = new FileReader();
+
+            reader.onload = (e) => {
+                imagePreview.src = e.target.result;
+                imagePreview.style.display = 'block';
+            }
+
+            if (file) {
+                reader.readAsDataURL(file);
+            }
+        });
+
+        // Load checkbox state from localStorage
+        if (localStorage.getItem('autoUpload') === 'true') {
+            autoUploadCheckbox.checked = true;
+        }
+
+        // Save checkbox state to localStorage on change
+        autoUploadCheckbox.addEventListener('change', () => {
+            localStorage.setItem('autoUpload', autoUploadCheckbox.checked);
+        });
+
+
+        const prevDayBtn = document.getElementById('prev-day-btn');
+        const nextDayBtn = document.getElementById('next-day-btn');
+        const currentDayBtn = document.getElementById('current-day-btn'); // Changed to button
+        const day = document.getElementById('mealform-day'); // Changed to button
+        let currentDate = new Date();
+        let today = new Date(); // Store today's date
+        currentDate.setDate(currentDate.getDate() - Math.abs(day.value));
+        function updateDayDisplay() {
+            const diff = Math.floor((today - currentDate) / (1000 * 60 * 60 * 24)); // Difference in days
+            const options = {weekday: 'long'};
+
+            if (diff === 0) {
+                currentDayBtn.textContent = 'Today';
+            } else if (diff === 1) {
+                currentDayBtn.textContent = 'Yesterday';
+            } else {
+                currentDayBtn.textContent = currentDate.toLocaleDateString(undefined, options);
+            }
+
+            // Disable "next" button if currentDate is today
+            nextDayBtn.disabled = (currentDate.toDateString() === today.toDateString());
+
+            // Disable "prev" button if currentDate is 4 days before today
+            prevDayBtn.disabled = (diff >= 4);
+        }
+
+        updateDayDisplay();
+
+        prevDayBtn.addEventListener('click', () => {
+            currentDate.setDate(currentDate.getDate() - 1);
+            day.value--;
+            updateDayDisplay();
+        });
+
+        nextDayBtn.addEventListener('click', () => {
+            currentDate.setDate(currentDate.getDate() + 1);
+            day.value++;
+            updateDayDisplay();
+        });
+
+        function isMobileDevice() {
+            return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+        }
+
+        if (isMobileDevice()) {
+            gestureArea.textContent = 'Click to take a picture or long press to add from the media gallery';
+            // Mobile device: Handle long-press and tap
+            let longPressTimer;
+            let touchStartX = 0;
+            let touchStartY = 0;
+            let isLongPress = false;
+
+            gestureArea.addEventListener('touchstart', (e) => {
+                touchStartX = e.touches.clientX;
+                touchStartY = e.touches.clientY;
+
+                longPressTimer = setTimeout(() => {
+                    isLongPress = true;
+                    body.style.backgroundColor = '';
+                    fileInput.removeAttribute('capture'); // Remove capture for long press
+                    fileInput.click();
+                }, 1000); // Adjust duration as needed
+
+                body.style.backgroundColor = 'rgba(0, 0, 0, 0.2)';
+            });
+
+            gestureArea.addEventListener('touchmove', (e) => {
+                clearTimeout(longPressTimer);
+                isLongPress = false;
+                body.style.backgroundColor = '';
+            });
+
+            gestureArea.addEventListener('touchend', () => {
+                clearTimeout(longPressTimer);
+                body.style.backgroundColor = '';
+                if (!isLongPress) {
+                    fileInput.setAttribute('capture', 'environment'); // Set capture for tap
+                    fileInput.click();
+                }
+                isLongPress = false;
+            });
+
+        } else {
+            // Non-mobile device: Handle click for file upload
+            gestureArea.textContent = 'Click to upload your meal';
+            gestureArea.addEventListener('click', () => {
+                fileInput.click();
+            });
+        }
+    </script>
 </div>

frontend/views/meal/view.php

@@ -6,7 +6,7 @@ use yii\widgets\DetailView;
 /** @var yii\web\View $this */
 /** @var common\models\Meal $model */
 
-$this->title = $model->id;
+$this->title = $model->food_name;
 $this->params['breadcrumbs'][] = ['label' => 'Meals', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 \yii\web\YiiAsset::register($this);
@@ -29,16 +29,12 @@ $this->params['breadcrumbs'][] = $this->title;
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
-            'id',
-            'file_name',
             'calories',
             'protein',
             'fat',
             'carbohydrates',
             'fiber',
-            'meal',
-            'created_at',
-            'updated_at',
+            'created_at:datetime',
         ],
     ]) ?>
 

frontend/views/site/login.php

@@ -44,6 +44,7 @@ $this->params['breadcrumbs'][] = $this->title;
             </div>
 
             <div class="form-group">
+                <?= Html::a('Signup', ['site/signup'], ['class' => 'btn btn-secondary']) ?>
                 <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
             </div>
 

frontend/views/site/privacy.php

@@ -0,0 +1,67 @@
+<?php
+
+/** @var yii\web\View $this */
+
+$this->title = 'Calorie Thingy';
+$this->registerJsFile('@web/js/site.js');
+?>
+
+<header class="text-center py-5">
+    <div class="container">
+        <h1>Privacy Policy</h1>
+        <p class="lead">Your privacy matters to us</p>
+    </div>
+</header>
+
+<div class="container my-5">
+    <div class="row">
+        <div class="col-lg-8 mx-auto">
+
+            <h2>1. Information We Collect</h2>
+            <p>When using CalorieThingy, we collect:</p>
+            <ul>
+                <li><strong>First Name:</strong> Stored for personalization.</li>
+                <li><strong>Email Address:</strong> Used for account management.</li>
+                <li><strong>Meal Photos:</strong> Stored indefinitely unless deleted by the user.</li>
+                <li><strong>Caloric & Nutritional Info:</strong> AI-generated estimates.</li>
+            </ul>
+
+            <h2>2. How We Use Your Data</h2>
+            <p>We use your data to:</p>
+            <ul>
+                <li>Analyze and track meals.</li>
+                <li>Improve AI-based meal recognition.</li>
+                <li>Allow you to view past meals.</li>
+                <li>Send account-related notifications.</li>
+            </ul>
+
+            <h2>3. Data Storage & Security</h2>
+            <ul>
+                <li>Your data is securely stored in an encrypted database.</li>
+                <li><strong>Meal photos</strong> are stored indefinitely.</li>
+                <li>Security measures prevent unauthorized access.</li>
+            </ul>
+
+            <h2>4. Your Rights & Choices</h2>
+            <p>You can:</p>
+            <ul>
+                <li>Request access to your data.</li>
+                <li>Delete your meal photos and account info.</li>
+                <li>Opt-out of non-essential data processing.</li>
+            </ul>
+
+            <h2>5. Third-Party Services</h2>
+            <p>We use a paid version of <strong>Google Gemini AI</strong> for food analysis. No personally identifiable data is shared with Google.</p>
+
+            <h2>6. Changes to This Policy</h2>
+            <p>We may update this Privacy Policy. You will be notified of any significant changes.</p>
+
+            <h2>7. Contact Us</h2>
+            <p>If you have any questions, please contact us:</p>
+            <ul>
+                <li>Email: <span id="email"></span></li>
+            </ul>
+
+        </div>
+    </div>
+</div>

frontend/views/site/signup.php

@@ -6,6 +6,7 @@
 
 use yii\bootstrap5\Html;
 use yii\bootstrap5\ActiveForm;
+use yii\helpers\Url;
 
 $this->title = 'Signup';
 $this->params['breadcrumbs'][] = $this->title;
@@ -26,6 +27,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 <?= $form->field($model, 'password')->passwordInput() ?>
 
                 <div class="form-group">
+                    <p>I have read and agree to the <a href="<?= Url::to(['/site/terms']) ?>">Terms and Conditions</a>.</p>
                     <?= Html::submitButton('Signup', ['class' => 'btn btn-primary', 'name' => 'signup-button']) ?>
                 </div>
 

frontend/views/site/terms.php

@@ -0,0 +1,54 @@
+<?php
+
+/** @var yii\web\View $this */
+
+$this->title = 'Calorie Thingy';
+$this->registerJsFile('@web/js/site.js');
+?>
+
+<header class="text-center py-5">
+    <div class="container">
+        <h1>Terms & Conditions</h1>
+        <p class="lead">Please read these terms carefully before using CalorieThingy.</p>
+    </div>
+</header>
+
+<div class="container my-5">
+    <div class="row">
+        <div class="col-lg-8 mx-auto">
+
+            <h2>1. Introduction</h2>
+            <p>Welcome to <strong>Calorie Thingy</strong>. By accessing or using our app, you agree to these Terms and Conditions.</p>
+
+            <h2>2. Use of Our Services</h2>
+            <p>You agree to use CalorieThingy for personal and non-commercial purposes only. You must not misuse or abuse our services in any way.</p>
+
+            <h2>3. User Accounts</h2>
+            <ul>
+                <li>You must provide accurate and up-to-date information when creating an account.</li>
+                <li>You are responsible for maintaining the confidentiality of your login credentials.</li>
+                <li>We reserve the right to terminate accounts for violations of these terms.</li>
+            </ul>
+
+            <h2>4. Meal Photos & Data Storage</h2>
+            <ul>
+                <li>Meal photos you upload will be stored indefinitely unless deleted by you.</li>
+                <li>We use AI-powered food analysis (via Google Gemini API) to provide nutritional insights.</li>
+                <li>Your personal data is stored securely and is not shared with third parties without consent.</li>
+            </ul>
+
+            <h2>5. Limitation of Liability</h2>
+            <p>We do not guarantee the accuracy of AI-generated nutritional data. You are responsible for verifying any health or diet-related decisions.</p>
+
+            <h2>6. Changes to These Terms</h2>
+            <p>We may update these Terms at any time. Continued use of the app constitutes acceptance of the new Terms.</p>
+
+            <h2>7. Contact Us</h2>
+            <p>If you have any questions, please contact us:</p>
+            <ul>
+                <li>Email: <span id="email"></span></li>
+            </ul>
+
+        </div>
+    </div>
+</div>

frontend/web/css/site.css

@@ -216,12 +216,12 @@ a.desc:after {
     padding: 0;
     margin: 20px 0;
 }
-  
+
 /* Pagination item styles */
 .pagination li {
     margin: 0 5px;
 }
-  
+
 /* Pagination link styles */
 .pagination li a, .pagination li span {
     display: flex;
@@ -238,7 +238,7 @@ a.desc:after {
     font-weight: bold;
     transition: background-color 0.3s, color 0.3s;
 }
-  
+
 .pagination li.active.disabled a,
 .pagination li.disabled.active a {
     background-color: black;

frontend/web/css/upload.css

@@ -0,0 +1,22 @@
+#upload-title {
+    font-size: 2rem;
+    font-weight: bold;
+    min-height: 50px;
+    display: inline-block;
+    transition: color 0.2s ease-in-out;
+}
+
+#gesture-area {
+    -webkit-user-select: none; /* Safari */
+    -ms-user-select: none; /* IE 10+ and Edge */
+    user-select: none; /* Standard syntax */
+    -webkit-touch-callout: none; /* Prevents default callout on hold in iOS */
+}
+
+
+.gesture-area {
+    border: 2px dashed #ccc;
+    padding: 20px;
+    margin-bottom: 10px;
+    text-align: center;
+}

frontend/web/js/site.js

@@ -0,0 +1,6 @@
+document.addEventListener("DOMContentLoaded", function () {
+    let user = "info";
+    let domain = "caloriethingy.com";
+    let emailElement = document.getElementById("email");
+    emailElement.innerHTML = `<a href="mailto:${user}@${domain}">${user}@${domain}</a>`;
+});