Skip to content

Commit

Permalink
Merge pull request #127 from Pho86/natlan
Browse files Browse the repository at this point in the history
update packages and readme for natlan
  • Loading branch information
Pho86 authored Oct 8, 2024
2 parents e52c879 + ab07a84 commit 9922a2f
Show file tree
Hide file tree
Showing 11 changed files with 694 additions and 565 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Depending on which AI for teambuilder, provide a key, base is GOOGLE_API_KEY because it is more free.
Depending on which AI for teambuilder, provide a key, base is GOOGLE_API_KEY.
GOOGLE_API_KEY=""
OPENAI_API_KEY=""
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@

Tenryou is a companion website create for the action-rpg game [Genshin Impact](https://genshin.mihoyo.com/). Tenryou is intended to help players view information from the game in a visual and cohesive manner with via information pulled from various resources to provide up-to-date information with a teambuilder prototype to help you create your team.

<!-- [![Contributors][contributors-shield]][contributors-url]
[![Stargazers][stars-shield]][stars-url]
[![Issues][issues-shield]][issues-url]
[![MIT License][license-shield]][license-url] -->

## Current Features
* User Card Profile/Team Builder
* Characters
Expand All @@ -23,7 +18,7 @@ Tenryou is a companion website create for the action-rpg game [Genshin Impact](h
* And more...

## Current Roadmap
- [ ] Add more options to edit user images
- [ ] Add more customization options to edit user images
- [ ] Improve Teambuilder by migrating to a different AI and add example teams
- [ ] TCG Support
- [ ] Add calculator for stats, and ascension
Expand Down Expand Up @@ -82,6 +77,10 @@ npm run cypress:open

```

## Screenshots
<img src="public/HomePage.png" alt="homepage page"/>
<img src="public/Teambuilder.png" alt="teambuilder page"/>

## Contributing

Contribute by reporting a bug/suggesting an enhancement
Expand Down
938 changes: 477 additions & 461 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
"@types/mdx": "^2.0.13",
"@vercel/analytics": "^1.3.1",
"@vercel/speed-insights": "^1.0.12",
"ai": "^3.3.26",
"ai": "^3.4.5",
"autoprefixer": "^10.4.20",
"axios": "^1.7.7",
"enkanetwork.js": "^2.8.6",
"enkanetwork.js": "^2.8.8",
"framer-motion": "^11.4.0",
"genshin-db": "^5.1.8",
"html-react-parser": "^5.1.15",
"html-to-image": "^1.11.11",
"locomotive-scroll": "^4.1.4",
"next": "14.2.3",
"next": "^14.2.14",
"next-themes": "^0.3.0",
"nextjs-toploader": "^1.6.12",
"openai": "^4.57.1",
Expand Down
Binary file added public/HomePage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Teambuilder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/regions/Eff_UI_Talent_Alhatham.webp
Binary file not shown.
Binary file added public/regions/Natlan.webp
Binary file not shown.
4 changes: 2 additions & 2 deletions src/app/api/teambuild/google/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ export async function POST(req: Request, res: NextResponse) {
const systemPrompt = `${prompt}, YOU ARE ON [PART ${body.part}] ${body.part > 1 && `Past Info Provided: ${currentInfo}`}`;
console.log(`YOU ARE ON [PART ${body.part}] ${body.part > 1 && `Past Info Provided: `}`)
const result = await streamText({
model: google('models/gemini-1.5-flash-latest'),
model: google('models/gemini-1.5-flash-latest') ,
system: systemPrompt,
prompt: teams
prompt: teams,
});

return result.toTextStreamResponse();
Expand Down
273 changes: 189 additions & 84 deletions src/app/components/DailyDomains/index.tsx

Large diffs are not rendered by default.

25 changes: 17 additions & 8 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,23 @@ import Birthdays from "./components/Birthdays";


export default async function Home() {
const response = await fetch(`https://api.ambr.top/assets/data/event.json`, {
cache: 'no-cache'
});

if (!response.ok) {
throw new Error("failed to fetch")
let EventsData = null;
let eventsError = false;

try {
const response = await fetch(`https://gi.yatta.moe/assets/data/event.json`, {
cache: 'no-cache'
});

if (!response.ok) {
eventsError = true;
} else {
EventsData = await response.json();
}
} catch (error) {
eventsError = true;
console.error("Failed to fetch events data:", error);
}
const EventsData = await response.json()

const data = [
{
Expand All @@ -32,7 +41,7 @@ export default async function Home() {
},
{
title: 'Current Events',
children: <Events Events={EventsData} />
children: !eventsError ? <Events Events={EventsData} /> : <p className="px-3 text-lg">An error has occured, please try again later.</p>
},
{
title: 'Users',
Expand Down

0 comments on commit 9922a2f

Please sign in to comment.