Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull Request: Merge from main to develop for Phase 3 Completion #55

Merged
merged 33 commits into from
Oct 12, 2024
Merged

Pull Request: Merge from main to develop for Phase 3 Completion #55

merged 33 commits into from
Oct 12, 2024

Conversation

dylanson25
Copy link
Owner

@dylanson25 dylanson25 commented Oct 12, 2024 •
edited
Loading

This PR merges the changes from the main branch back into develop to finalize Phase 3. Below are the key updates and improvements included in this phase:

Phase 3 Highlights:

  • UI/UX Enhancements: Improved design consistency and added new styling to enhance user experience.
  • Astro Islands with Vue: Successfully integrated Vue Islands within Astro, optimizing performance for interactive components.
  • Pokémon Minigame: Added a fun "Who's that Pokémon?" minigame, where users can guess the Pokémon based on options provided. The game is fully functional with visual feedback for correct and incorrect answers.

Next Steps:

  • Review and confirm successful integration of Phase 3 features in the development environment.
  • Begin planning for Phase 4, which will include further optimizations and new features.

dylanson25 and others added 30 commits October 8, 2024 13:33
@dylanson25
[#23] - Install vue
7f182af
@dylanson25
[#23] - Configure Vue
3ce6320
@dylanson25
Merge pull request #42 from dylanson25/feat/23-issue-set-up-astro-isl…
3c01dfe 
…ands-for-interactive-components

[#23] Feat  issue set up astro islands for interactive components
@dylanson25
[#41] - Install axios
e158a3b
@dylanson25
[#41] - DotEnv installation
85f4c02
@dylanson25
[#41] - Request model
d92b5c7
@dylanson25
[#41] - PokemonApi Base Config
a04370c
@dylanson25
[#41] - implement interceptor
687e653
@dylanson25
Merge pull request #43 from dylanson25/feat/41-install-axios-and-set-…
f4d1ba4 
…up-pokémon-api-integration

[#41] Feat install axios and set up pokémon api integration
@dylanson25
[#23] - Vue Devtools Config
7ae7a4e
@dylanson25
Merge pull request #48 from dylanson25/feat/23-config-devtools-vue
429669a 
[#23] - Vue Devtools Config
@dylanson25
[#46] - Interface nedded to pokemon game
157ba47
@dylanson25
[#46] - Install confetti library
0af59db
@dylanson25
[#46] - Fix type problem PokemonApi
39fa2e9
@dylanson25
[#46] - Composable usePokemonGame
285238d
@dylanson25
Merge pull request #49 from dylanson25/feat/46-implement-pokémon-gues…
d88216b 
…sing-game-logic-using-vue-3-and-api-integration

[#46] -  Feat implement pokémon guessing game logic using vue 3 and api integration
@dylanson25
[#45] - Pokemon image component
db83c91
@dylanson25
Merge pull request #50 from dylanson25/feat/45-create-pokemon-picture…
bf6730c 
…-component

[#45] - Pokemon image component
@dylanson25
[#44] - Create PokemonOptions component
949207a
@dylanson25
Merge pull request #51 from dylanson25/feat/44-create-a-pokemon-optio…
2194344 
…n-selection-component-with-correctincorrect-state

[#44] - Create PokemonOptions component
@dylanson25
[#47] - Fix Lifecycle vue not work in composables
e978f6e
@dylanson25
[#47] - fix typle conlict
d5be0e3
@dylanson25
[#47] - Pokemon game page
d6a6208
@dylanson25
[#47] - Implement PokemonGame
fa6165c
@dylanson25
[#47] - Delete unused imports
697e019
@dylanson25
[#47] - Fix Netlify deplot
dc94449
@dylanson25
Merge pull request #53 from dylanson25/feat/47-create-a-pokémon-game-…
5be7984 
…view-with-loading-and-gameplay-sections

[#47] Feat  create a pokémon game view with loading and gameplay sections
@dylanson25
[#52] - Change layout styles
a2e6e4f
@dylanson25
[#52] - Move buttons options on two columns
3500156
@dylanson25
[#52] - rearrengement of components and color adjust
2411944
@dylanson25 dylanson25 self-assigned this Oct 12, 2024
@netlify Netlify
Copy link

netlify bot commented Oct 12, 2024 •
edited
Loading

✅ Deploy Preview for dylanson25dev ready!

Name Link
🔨 Latest commit 969a01c
🔍 Latest deploy log https://app.netlify.com/sites/dylanson25dev/deploys/6709e1b7d4fac700082bdc30
😎 Deploy Preview https://deploy-preview-55--dylanson25dev.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@dylanson25 dylanson25 changed the title Main Pull Request: Merge from main to develop for Phase 3 Completion Oct 12, 2024
@dylanson25 dylanson25 merged commit c4fc079 into develop Oct 12, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dylanson25 dylanson25

Labels
None yet
Projects
None yet
Milestone
Phase 3: Implement "Which Pokémon is ...
Development

Successfully merging this pull request may close these issues.
1 participant
@dylanson25