From 3ec3d57275cddc1c640fc8e9e7c73392783531ac Mon Sep 17 00:00:00 2001 From: bednie <88800117+bednie@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:49:03 -0600 Subject: [PATCH 01/16] Create LICENSE --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From a8533421928dac35abd97cd068b78509c917a527 Mon Sep 17 00:00:00 2001 From: jyassien Date: Sun, 17 Nov 2024 16:05:53 -0700 Subject: [PATCH 02/16] add env variables to the build workflow. --- .github/workflows/firebase-hosting-merge.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 873aeec..b80aff1 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -18,6 +18,14 @@ jobs: run: rm -rf build - name: Install dependencies + env: + REACT_APP_FIREBASE_API_KEY: ${{ secrets.REACT_APP_FIREBASE_API_KEY }} + REACT_APP_FIREBASE_APP_ID: ${{ secrets.REACT_APP_FIREBASE_APP_ID }} + REACT_APP_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.REACT_APP_FIREBASE_MESSAGING_SENDER_ID }} + REACT_APP_FIREBASE_MEASUREMENT_ID: ${{ secrets.REACT_APP_FIREBASE_MEASUREMENT_ID }} + REACT_APP_FIREBASE_AUTH_DOMAIN: ${{ vars.REACT_APP_FIREBASE_AUTH_DOMAIN }} + REACT_APP_FIREBASE_PROJECT_ID: ${{ vars.REACT_APP_FIREBASE_PROJECT_ID }} + REACT_APP_FIREBASE_STORAGE_BUCKET: ${{ vars.REACT_APP_FIREBASE_STORAGE_BUCKET }} run: npm ci && npm run build - uses: FirebaseExtended/action-hosting-deploy@v0 From 2d77777dd3a3174b55e53b42ef819cbf8c25d39d Mon Sep 17 00:00:00 2001 From: jyassien Date: Sun, 17 Nov 2024 16:23:37 -0700 Subject: [PATCH 03/16] change secrets to vars --- .github/workflows/firebase-hosting-merge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index b80aff1..0c07d3a 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -19,10 +19,10 @@ jobs: - name: Install dependencies env: - REACT_APP_FIREBASE_API_KEY: ${{ secrets.REACT_APP_FIREBASE_API_KEY }} - REACT_APP_FIREBASE_APP_ID: ${{ secrets.REACT_APP_FIREBASE_APP_ID }} - REACT_APP_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.REACT_APP_FIREBASE_MESSAGING_SENDER_ID }} - REACT_APP_FIREBASE_MEASUREMENT_ID: ${{ secrets.REACT_APP_FIREBASE_MEASUREMENT_ID }} + REACT_APP_FIREBASE_API_KEY: ${{ vars.REACT_APP_FIREBASE_API_KEY }} + REACT_APP_FIREBASE_APP_ID: ${{ vars.REACT_APP_FIREBASE_APP_ID }} + REACT_APP_FIREBASE_MESSAGING_SENDER_ID: ${{ vars.REACT_APP_FIREBASE_MESSAGING_SENDER_ID }} + REACT_APP_FIREBASE_MEASUREMENT_ID: ${{ vars.REACT_APP_FIREBASE_MEASUREMENT_ID }} REACT_APP_FIREBASE_AUTH_DOMAIN: ${{ vars.REACT_APP_FIREBASE_AUTH_DOMAIN }} REACT_APP_FIREBASE_PROJECT_ID: ${{ vars.REACT_APP_FIREBASE_PROJECT_ID }} REACT_APP_FIREBASE_STORAGE_BUCKET: ${{ vars.REACT_APP_FIREBASE_STORAGE_BUCKET }} From b73b67055f31ab55038eee25c3d46f385f8df491 Mon Sep 17 00:00:00 2001 From: jyassien Date: Sun, 17 Nov 2024 16:40:43 -0700 Subject: [PATCH 04/16] add backend env variable to the build. --- .github/workflows/firebase-hosting-merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 0c07d3a..31fef8c 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -26,6 +26,7 @@ jobs: REACT_APP_FIREBASE_AUTH_DOMAIN: ${{ vars.REACT_APP_FIREBASE_AUTH_DOMAIN }} REACT_APP_FIREBASE_PROJECT_ID: ${{ vars.REACT_APP_FIREBASE_PROJECT_ID }} REACT_APP_FIREBASE_STORAGE_BUCKET: ${{ vars.REACT_APP_FIREBASE_STORAGE_BUCKET }} + REACT_APP_BACKEND_API_URL: ${{ vars.REACT_APP_BACKEND_API_URL }} run: npm ci && npm run build - uses: FirebaseExtended/action-hosting-deploy@v0 From 63f40cd66b99d1284c19a5465cedf9bc6be5f122 Mon Sep 17 00:00:00 2001 From: jyassien Date: Sun, 17 Nov 2024 16:47:13 -0700 Subject: [PATCH 05/16] testing. --- src/contexts/AccountContext.jsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/contexts/AccountContext.jsx b/src/contexts/AccountContext.jsx index 74d08b3..91e8a31 100644 --- a/src/contexts/AccountContext.jsx +++ b/src/contexts/AccountContext.jsx @@ -86,10 +86,7 @@ export const AccountProvider = ({ children }) => { // Account ifno initialization and update functions const getUserAccInfo = async (userId, headers = {}) => { try { - const response = await axios.get( - `${url}/users/${userId}/account`, - headers - ); + const response = await axios.get(`/users/${userId}/account`, headers); // console.log("Response:", response.data); // console.log("Response:", response.status); const data = response?.data; From ab416e2f8665d90dc7d1482b88e8e9f92bf8e3aa Mon Sep 17 00:00:00 2001 From: jyassien Date: Sun, 17 Nov 2024 17:05:20 -0700 Subject: [PATCH 06/16] print env vars --- .github/workflows/firebase-hosting-merge.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 31fef8c..4ae118e 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -17,6 +17,14 @@ jobs: - name: Remove build folder run: rm -rf build + - name: Debug environment variables + run: | + echo "FIREBASE_API_KEY: $REACT_APP_FIREBASE_API_KEY" + echo "FIREBASE_PROJECT_ID: $REACT_APP_FIREBASE_PROJECT_ID" + env: + REACT_APP_FIREBASE_API_KEY: ${{ vars.REACT_APP_FIREBASE_API_KEY }} + REACT_APP_FIREBASE_PROJECT_ID: ${{ vars.REACT_APP_FIREBASE_PROJECT_ID }} + - name: Install dependencies env: REACT_APP_FIREBASE_API_KEY: ${{ vars.REACT_APP_FIREBASE_API_KEY }} From 37a9f6c8140368e9d518b10ec2352ae8c2a4f284 Mon Sep 17 00:00:00 2001 From: jyassien Date: Sun, 17 Nov 2024 17:10:17 -0700 Subject: [PATCH 07/16] testing. --- src/dashboard/Dashboard.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dashboard/Dashboard.jsx b/src/dashboard/Dashboard.jsx index e985ee0..b4041d1 100644 --- a/src/dashboard/Dashboard.jsx +++ b/src/dashboard/Dashboard.jsx @@ -13,8 +13,10 @@ import { } from "../contexts/AccountContext"; const url = process.env.REACT_APP_BACKEND_API_URL; - +console.log("url: ", url); const Dashboard = () => { + const url2 = process.env.REACT_APP_BACKEND_API_URL; + console.log("url: ", url2); const [userScanHistory, setUserScanHistory] = useState([]); const [startDate, setStartDate] = useState(() => { const date = new Date(); From 6d8b331332c59ea20d4974cc3ad66fe81cbfaa96 Mon Sep 17 00:00:00 2001 From: jyassien Date: Sun, 17 Nov 2024 17:16:55 -0700 Subject: [PATCH 08/16] testing --- src/dashboard/Dashboard.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dashboard/Dashboard.jsx b/src/dashboard/Dashboard.jsx index b4041d1..f8394aa 100644 --- a/src/dashboard/Dashboard.jsx +++ b/src/dashboard/Dashboard.jsx @@ -16,7 +16,7 @@ const url = process.env.REACT_APP_BACKEND_API_URL; console.log("url: ", url); const Dashboard = () => { const url2 = process.env.REACT_APP_BACKEND_API_URL; - console.log("url: ", url2); + console.log("url2: ", url2); const [userScanHistory, setUserScanHistory] = useState([]); const [startDate, setStartDate] = useState(() => { const date = new Date(); @@ -40,7 +40,7 @@ const Dashboard = () => { }; const response = await axios.get( - `${url}/users/scan-history`, + `${url2}/users/scan-history`, uplaodHeaders ); From 45774cfc699b4c49e933da44b52c23c90781403c Mon Sep 17 00:00:00 2001 From: jyassien Date: Sun, 17 Nov 2024 17:35:46 -0700 Subject: [PATCH 09/16] still testing.. --- .github/workflows/firebase-hosting-merge.yml | 2 ++ src/contexts/AccountContext.jsx | 5 ++++- src/dashboard/Dashboard.jsx | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 4ae118e..9965d68 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -21,9 +21,11 @@ jobs: run: | echo "FIREBASE_API_KEY: $REACT_APP_FIREBASE_API_KEY" echo "FIREBASE_PROJECT_ID: $REACT_APP_FIREBASE_PROJECT_ID" + echo "REACT_APP_BACKEND_API_URL: $REACT_APP_BACKEND_API_URL" env: REACT_APP_FIREBASE_API_KEY: ${{ vars.REACT_APP_FIREBASE_API_KEY }} REACT_APP_FIREBASE_PROJECT_ID: ${{ vars.REACT_APP_FIREBASE_PROJECT_ID }} + REACT_APP_BACKEND_API_URL: ${{ vars.REACT_APP_BACKEND_API_URL }} - name: Install dependencies env: diff --git a/src/contexts/AccountContext.jsx b/src/contexts/AccountContext.jsx index 91e8a31..74d08b3 100644 --- a/src/contexts/AccountContext.jsx +++ b/src/contexts/AccountContext.jsx @@ -86,7 +86,10 @@ export const AccountProvider = ({ children }) => { // Account ifno initialization and update functions const getUserAccInfo = async (userId, headers = {}) => { try { - const response = await axios.get(`/users/${userId}/account`, headers); + const response = await axios.get( + `${url}/users/${userId}/account`, + headers + ); // console.log("Response:", response.data); // console.log("Response:", response.status); const data = response?.data; diff --git a/src/dashboard/Dashboard.jsx b/src/dashboard/Dashboard.jsx index f8394aa..be035ae 100644 --- a/src/dashboard/Dashboard.jsx +++ b/src/dashboard/Dashboard.jsx @@ -39,8 +39,12 @@ const Dashboard = () => { }, }; + // const response = await axios.get( + // `${url}/users/scan-history`, + // uplaodHeaders + // ); const response = await axios.get( - `${url2}/users/scan-history`, + `https://app-id543mmv6a-uc.a.run.app/users/scan-history`, uplaodHeaders ); From 002c828be37eb96b061ead1ab498cd79eecc4103 Mon Sep 17 00:00:00 2001 From: jyassien Date: Sun, 17 Nov 2024 22:12:26 -0700 Subject: [PATCH 10/16] chat and evaluation starting and default data save and fetch from backend. --- src/App.js | 31 +++++----- src/chat/Chat.css | 2 +- src/chat/Chat.jsx | 26 +++++--- src/contexts/EvaluationContext.jsx | 96 ++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 24 deletions(-) create mode 100644 src/contexts/EvaluationContext.jsx diff --git a/src/App.js b/src/App.js index 9b34841..1bb5848 100644 --- a/src/App.js +++ b/src/App.js @@ -17,6 +17,7 @@ import "./assets/styles/style.css"; import "./App.css"; import { AccountProvider } from "./contexts/AccountContext"; +import { EvaluationProvider } from "./contexts/EvaluationContext"; function App() { // const location = useLocation(); // Use to pass state object from current location of component to the navigating page. @@ -27,24 +28,26 @@ function App() {
-
- - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> + +
+ + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> - {/* Route Nesting Framework. We can also create a Layout component to make it visible to every component. */} - {/* + {/* Route Nesting Framework. We can also create a Layout component to make it visible to every component. */} + {/* }/> }/> */} - -
+ +
+