Skip to content

It's Merge Conflict Time - #1

Merged
Dealer-09 merged 2 commits into
mainfrom
dev
Jul 9, 2026
Merged

It's Merge Conflict Time #1
Dealer-09 merged 2 commits into
mainfrom
dev

Conversation

@Dealer-09

Copy link
Copy Markdown
Owner

Lets Fix This Shit

@Dealer-09
Dealer-09 requested a review from Copilot July 6, 2026 04:11
@Dealer-09 Dealer-09 self-assigned this Jul 6, 2026
@Dealer-09 Dealer-09 added the duplicate This issue or pull request already exists label Jul 6, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR introduces a new “AI Toolkit” private page and adds a backend OpenWeather proxy endpoint to support location-based weather display, alongside dependency and auth redirect updates.

Changes:

  • Add /api/openweather/:lat/:lon endpoint and wire it into the server.
  • Add new client/private/AI-Toolkit/ page (HTML/CSS/JS) using TFJS + geolocation + weather/map UI.
  • Update Clerk sign-in/sign-up redirects to land on the private dashboard; replace axios with node-fetch.

Reviewed changes

Copilot reviewed 8 out of 9 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
server/index.js Imports and registers the new OpenWeather API route.
server/aiSearch.js Adds OpenWeather handler and exports it alongside existing Gemini handlers.
package.json Removes axios and adds node-fetch dependency.
package-lock.json Lockfile updates reflecting dependency swap to node-fetch.
client/public/Accounts/signup.html Updates post-signup redirect to private dashboard.
client/public/Accounts/signin.html Updates post-signin redirect to private dashboard.
client/private/AI-Toolkit/toolkit.js Implements TFJS model loading, image upload prediction, and weather/map fetching via new API route.
client/private/AI-Toolkit/toolkit.html Adds the AI Toolkit UI page structure.
client/private/AI-Toolkit/toolkit.css Adds styles for the AI Toolkit UI.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread server/aiSearch.js
Comment on lines +27 to +39
async function endpoint_openWeatherAPI(req, res)
{
const { lat, lon } = req.params;
const wres = await fetch(`https://api.openweathermap.org/data/2.5/weather?lat=${lat}&lon=${lon}&appid=${process.env.OPENWEATHER_API_KEY}&units=metric`);
const data = await wres.json();
res.json({
name: data.name,
weather: data.weather[0].description,
temp: data.main.temp,
humidity: data.main.humidity,
wind: data.wind.speed
});
}
Comment thread server/index.js
app.get('/api/gemini/youtube', endpoint_geminiYoutubeSearch);
app.post('/api/gemini/chat', express.json(), geminiChatBot.endpoint_chatbot.bind(geminiChatBot));

app.get('/api/openweather/:lat/:lon', endpoint_openWeatherAPI);
Comment on lines +49 to +58
<script src="script.js"></script>

</body>

</html>

<script src="../AI-Toolkit/toolkit.js"></script>
</body>

</html> No newline at end of file
Comment on lines +35 to +36
<iframe id="gmaps" style="border:0" loading="lazy" allowfullscreen
src="https://maps.google.com/maps?q=0,0&z=15&output=embed">
Comment on lines +93 to +111
upload.addEventListener('change', async (e) => {
const file = e.target.files[0];
img.src = URL.createObjectURL(file);

img.onload = async () => {
const tensor = tf.browser.fromPixels(img)
.resizeNearestNeighbor([224, 224])
.toFloat()
.expandDims();

const predictions = await model.predict(tensor).data();

const topIdx = predictions.indexOf(Math.max(...predictions));

getLocationAndStart();

predictionText.innerHTML = `Predicted: ${topIdx}`;
}
}); No newline at end of file
@Dealer-09
Dealer-09 merged commit eedd3f1 into main Jul 9, 2026
1 check passed
@Dealer-09
Dealer-09 deleted the dev branch July 10, 2026 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

duplicate This issue or pull request already exists

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants