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.

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

Feedback branch #46

Open
wants to merge 100 commits into
base: feedback
Choose a base branch
from
Open

Feedback branch #46

wants to merge 100 commits into from

Conversation

lukaszdutka
Copy link
Owner

whole code to put feedback on

AleksandraCyp and others added 30 commits January 25, 2021 13:13
* Add basic files, including confituration files and package.json

* Delete index.js content
Should work on master as Ola added package.json in different task.
* Add scss files

* Import files to app.scss and add placeholders

* Add mixin to responsive-view

* Change config import order

* Add comments to files

* Add mixin to config file
* MNG-87-add images and fonts to project

* MNG-87 add images

rename images, fix one typo from styles > sass config file, deleted bellota Text font - can be add from google fonts with @import
styled loading page
added fonts
addes variables - colors and some mixins
* Add the Pokemon class

* Fix getters and setters in Pokemon Class

* Change getters into functions, remove isAlive key, add readonly to some keys

* Fix Pokemon.subtractHP method

* Change pokemonType to PokemonType
fixed variable names
added transition
added template placeholders for diffrent views to html
* Add template for starting page

* Add basic styling to starting page

* Pre-position the elements

* Change color names

* Style info buttons

* Style header

* Add button hover class

* Add hover to start btn

* Add template for info modal

* Add placeholder attribute to input field

* Add styling for responsive view

* Adjust index.html

* Resolve conflicts

* Correct responsive view
* add Player class

* type of list of pokemons

* Protection against bad data

* length of name

* add new method

+ add activePokemon value
+ add alivePokemons array

* Corrections
* Add basic choose view css and html

* Add responsievness

* Comment out the script that makes the choose pokemon page visible

* Improve choosing page layout

* merge with master

* Fix choose view height
* Create fightClass

* Add test for fight class

* MNG-90 91 Fix tests and run the project with webpack server

* MNG-85 Fix test error
* MNG-79 fight view for mobile initially

* MNG-79 added responsive for desktop
* MNG-84 Add pokemon data, import json and correct abstract class

* MNG-84 Finish pokemon factory

* MNG-84 Pokemon factory test and class corrections
…stener to the … (#11)

* Set timeOut for showing the starting page, add event listener to the info button, fix some css for starting page

* Add the exitButton variable in showAPopUpScreen.ts

* Change the approach to rendering the starting page, change btn into button

* Change repeting ID

* Change modal functions and make app variable scoped

* Delete empty rulesets

* Fix hiding modal and function names
* Add keyup to input

* Add activateStart.ts

* Uncomment html

* Add class to activate/disable start button

* Add activateStartButton function

* Change class name to button-enabled
* Function RenderChoosePokemonScreen

* Appendig function to the whole index.ts

* Corrections
* Add GameHandler class

* Fix GameHandler class and add tests

* Fix tests
Filter moves to 4  for each pokemon
Use mostly pokemon type moves
MNG-107 Add geodude instead of tentacruel
* Add choosePokemonsPage.ts

* Add all functions for choose pokemon page

* Change event.target, loading time
> created menu and back button with options.
Options need to be fixed (now are default).
Animation also needs to look better
AleksandraCyp and others added 29 commits February 13, 2021 11:20
#31)

* Fix resultsModalPopUpFunction.ts, implement it, delete some unneccessary comments and console.logs

* Autoformat, remove border to pup up screen

* Add MNG-120: if the pokemon is dead, a new pokemon has to be chosen

* Resolve conflicts, delete unnecessary setTImeOuts
* Fix resultsModalPopUpFunction.ts, implement it, delete some unneccessary comments and console.logs

* Autoformat, remove border to pup up screen

* Add MNG-120: if the pokemon is dead, a new pokemon has to be chosen

* Resolve conflicts, delete unnecessary setTImeOuts

* Delete not active pokemons from menu

* Delete test code

Co-authored-by: Daria Dziubaltowska <daria305@gmail.com>
…d-HP-bar

MNG-125 hide the pokemon and HPbar when pokemon dies
mango, visibility after dead
* Add HP bar transition + some cursor plus underline names

* Add transition
…s-and-About-

MNG-105 authors and about modal
mango gif
fixed "jumping view" while changing pokemon or loading buttons
logwindow
some other small view changes
* Add test for too long name

* Add test for too many pokemons

* Add test for useMango

* Add test for addPokemon function
zzz animation
modals style

Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com>
* Update README.md

* update

* Update README.md

* update

* Update README.md

* typos

* some polishing

* ekhem
Copy link

@maciekkwiet maciekkwiet left a comment

Choose a reason for hiding this comment

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

Generalnie aplikacja jest napisana bardzo dobrze, gratulacje dla całego zespołu!

{
"name": "coderscamp2020.project.typescript.pokemonfight",
"version": "1.0.0",
"description": "**UWAGA! Zaczynając pracę nad projektem — nie róbcie forka.\r Jedna osoba z zespołu (np. Mentor) powinna użyć przycisku `Use this template` i dodać innych członków zespołu jako Collaborators do tego repozytorium.\r Mentorzy mogą dowolnie zmieniać zakres projektu lub zdecydować się na zupełnie inny temat.**",

Choose a reason for hiding this comment

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

To już chyba nie jest potrzebne


#choose-page {

padding: 5vh;

Choose a reason for hiding this comment

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

Wcięcie

@@ -0,0 +1,69 @@
// File should contains:

Choose a reason for hiding this comment

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

Po co jest ten folder SASS?

@@ -0,0 +1,204 @@
<!DOCTYPE html>

Choose a reason for hiding this comment

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

Niektóre klasy i id są nieużywane

return pokemon
}

_capitalize(str: string): string {

Choose a reason for hiding this comment

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

Private

grid-column: span 5;
width: 100%;
height: 1.8rem;
// @include boxshadow;

Choose a reason for hiding this comment

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

Niepotrzebny komentarz

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants