v1 by marissa-anj · Pull Request #42 · LaurierCS/Pod4F23

marissa-anj · 2023-11-24T05:09:23Z

No description provided.

marissa-anj · 2023-11-24T05:13:12Z

ok this just needs links
rn i am hardcoding a constant url, i dont actually know where group id comes from
id also like to redirect the user to the home page after the save, but im tired so ill test and revise tmrw

marissa-anj · 2023-11-27T07:53:26Z

hover over marker now shows

recommendations data adjusted to receive this time format from the backend

the group_id and url is dynamically passed to get api call

ISSUES:
-user_id is hardcoded, not sure where this is stored
-the post data looks correct, although I am getting a 405 post method not allowed error
(this might be due to my corsconfig)

test data in recs was inserting this into sql
INSERT INTO groups_recommendations (activity_id, place_name, place_url, times, group_id_id) VALUES ('Restaurant', 'Mcdonalds', 'https://www.google.com/maps/place/McDonald''s/@43.4653179,-80.5636315,13z/data=!3m1!5s0x882bf3f248c504eb:0xeab7ed8f6958c881!4m10!1m2!2m1!1sgoogle+map+mcdonalds!3m6!1s0x882bf3f2346da8a7:0x305e7d4baf34ec1!8m2!3d43.4817485!4d-80.5255702!15sChRnb29nbGUgbWFwIG1jZG9uYWxkcyIDiAEBWgsiCW1jZG9uYWxkc5IBFGZhc3RfZm9vZF9yZXN0YXVyYW504AEA!16s%2Fg%2F1td013lr?entry=ttu', '["2023-11-20 13:00:00", "2024-01-03 09:00:00", "2023-11-21 04:00:00"]', '5633940446'), ('Restaurant', 'Bao Sandwich Bar', 'https://www.google.com/maps/place/Bao+Sandwich+Bar/@43.4725227,-80.5515083,14.96z/data=!4m9!1m2!2m1!1sgoogle+map+mcdonalds!3m5!1s0x882bf3f652a2a84b:0x5948e3c22a39734c!8m2!3d43.4764771!4d-80.5300292!16s%2Fg%2F11bxd7hmwf?entry=ttu', '["2024-01-03 09:00:00", "2023-11-21 04:00:00"]', '5633940446'), ('Movie Theater', 'Princess Cinema', 'https://www.google.com/maps/place/Princess+Cinemas/@43.4655732,-80.5248735,16.7z/data=!3m1!5s0x882bf40d264bc213:0x58bf7744feab91e4!4m6!3m5!1s0x882bf41278b8fbe3:0x69669374e1015e19!8m2!3d43.4668469!4d-80.5233381!16s%2Fg%2F1w6_pg3g?entry=ttu', '["2023-11-20 13:00:00", "2024-01-03 09:00:00"]', '5633940446');

marissa-anj · 2023-11-28T00:02:04Z

so for the user id i set the local storage test email manually because my google Oauth does not work and i cant test completely in a user setting, so please verify if this works. Thank you!

ctlchan · 2023-11-28T17:21:27Z

      <Router>
        <Routes>
          <Route path='/' element={<Home/>} />
+          <Route path='/activities' element={<Activities/>} />


Shouldn't be needed since everything is in the preferences route.

ctlchan · 2023-11-28T17:22:53Z

        <Routes>
          <Route path='/' element={<Home/>} />
+          <Route path='/activities' element={<Activities/>} />
+          <Route path='/recommendation' element={<Recommendation/>}/>


Will need to make it /recommendation:group_id like the others so we can pass through useParams().

Additionally let's make it plural recommendations to be consistent with the other pages. Together /recommendations/:group_id

ctlchan · 2023-11-28T17:27:06Z



-        navigate('/');
+        navigate('/recommendation');


Then this can be changed to /recommendation/${group_id}

Additionally, let's make it plural recommendations to be consistent with the other pages.

ctlchan · 2023-11-28T17:48:15Z

Couldn't test the actual recommendation returns but I trust that it works fine as you showed. The flow of the routes seems fine barring the missing url parameters.

I noticed the extra links on the home page, which I'm guessing are there just from testing? But some link to routes that ultimately shouldn't exist (i.e., any of the individual preference components).

pabloj2001

Good job on this page! I have a number of comments but they should all be quick fixes. I noticed that during merging with main you might've overridden some of the API files, we'll need to remove those changes by resetting the branch to a previous commit, merging with main again while ensuring the overriding doesn't happen again, and then applying the latest changes again. We can do it together later.

pabloj2001 · 2023-11-28T21:39:50Z



-        navigate('/');
+        navigate('/recommendation');


Additionally, let's make it plural recommendations to be consistent with the other pages.

pabloj2001 · 2023-11-28T21:41:23Z

+import { GoogleOAuthProvider } from '@react-oauth/google';
+import './index.css';
+
+const apiKey ="AIzaSyABQ4Pci5rnkud1UShQlNtU7iGG7waWghU"


apiKey needs to be removed and turned to an environment variable.

pabloj2001 · 2023-11-28T21:42:40Z

+if (apiKey) {
+  // If API key is available, dynamically load Google Maps API
+  const script = document.createElement('script');
+  script.src = `https://maps.googleapis.com/maps/api/js?key=AIzaSyABQ4Pci5rnkud1UShQlNtU7iGG7waWghU&libraries=places`;
+  script.async = true;
+  script.defer = true;
+
+  script.onload = renderApp; // Render the app once the Google Maps API script has loaded
+
+  document.head.appendChild(script);


I'm a little confused as to why we're using 2 different methods to load the Google Maps API throughout the app. Couldn't we have reused the same method we used for location preferences? Let's leave it for now though for the sake of time.

pabloj2001 · 2023-11-28T21:43:14Z

+            };
+
+            // Perform an API request to save the vote
+            fetch(import.meta.env.VITE_SERVER + `groups/${group_id}/votes`, {


Let's end all the API calls with a slash / for consistency and compatibility.

pabloj2001 · 2023-11-28T21:46:46Z

+              rec_id: {
+                recommendation_id: selectedRecommendation.id,
+                selected_time: selectedTime,
+              },
+              user_id: userdata,
+              group_id: group_id,


rec_id is just the id of the recommendation, so selectedRecommendation.id, and user_id should be userdata.user_id. We don't need to pass the group_id since it's given in the URL. I had forgotten about the time in the Votes model, thanks for noticing, we will need to make a new field for it in the API model. Overall I think we only need rec_id, selected_time, and user_id.

pabloj2001 · 2023-11-28T21:48:52Z

+    })
+      .then((response) => response.json())
+      .then((json) => {
+        setRecommendations(json);


When parsing the json recommendations, I'm afraid it doesn't parse recursively, so the times json array doesn't get parsed to an array and remains as a string. For this reason, we'll have to manually parse all the times fields.

json.map((rec) => { rec.times = JSON.parse(rec.times); });

Something like this before setting the recommendations should do it.

pabloj2001 · 2023-11-28T21:51:31Z

        <Routes>
          <Route path='/' element={<Home/>} />
+          <Route path='/activities' element={<Activities/>} />
+          <Route path='/recommendation' element={<Recommendation/>}/>


Additionally let's make it plural recommendations to be consistent with the other pages. Together /recommendations/:group_id

v1

642f7db

Merge branch 'main' into Mae/recommend

97b96b2

userid

c21e287

pabloj2001 requested review from ctlchan and pabloj2001 November 28, 2023 01:25

pabloj2001 assigned marissa-anj Nov 28, 2023

ctlchan reviewed Nov 28, 2023

View reviewed changes

pabloj2001 requested changes Nov 28, 2023

View reviewed changes

recsfinal?

64b8e52

Uh oh!

Conversation

marissa-anj commented Nov 24, 2023

Uh oh!

marissa-anj commented Nov 24, 2023

Uh oh!

marissa-anj commented Nov 27, 2023

Uh oh!

marissa-anj commented Nov 28, 2023

Uh oh!

ctlchan Nov 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ctlchan commented Nov 28, 2023

Uh oh!

pabloj2001 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ctlchan Nov 28, 2023 •

edited

Loading