Skip to content

Week2-AmirHossein-Conflicts resolved #7

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

Open
amirhshad wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Week2-AmirHossein-Conflicts resolved #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
215c676
ex1 added
amirhshad Nov 22, 2020
e6bc6d4
ex1 modified
amirhshad Nov 23, 2020
d0d5f99
ex1 modified
amirhshad Nov 23, 2020
433e60e
ex2 is added
amirhshad Nov 23, 2020
553fc62
ex3 is added
amirhshad Nov 23, 2020
f68507e
ex4 is added
amirhshad Nov 23, 2020
46c3901
ex5 is added
amirhshad Nov 23, 2020
dde1798
counter is fixed - timer is added
amirhshad Nov 25, 2020
6c75d23
Pomodoro project added - some bugs need to fix
amirhshad Nov 27, 2020
6ba8033
Timer time is fixed
amirhshad Nov 27, 2020
0152fa7
Pomodoro project is finished and added
amirhshad Nov 28, 2020
8d97c0f
index.js modified
amirhshad Nov 30, 2020
0dcf918
AmirHossein folder added
amirhshad Dec 5, 2020
dbb234e
Ex2 euro sign in added
amirhshad Dec 5, 2020
5c80060
Bugs fixed
amirhshad Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ex1 modified
  • Loading branch information
@amirhshad
amirhshad committed Nov 23, 2020
commit e6bc6d49a9ba1e8d8575bfec070556dcbd698bdc
17 changes: 4 additions & 13 deletions Week2/js-exercises/ex1-oddOnesOut.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,10 @@ const myNumbers = [1, 2, 3, 4];


//Filter MEthod:
const evenDouble = myNumbers.filter(number => {
if(number % 2 === 0){
let even = number * 2; //This gives me the answer but when it return the even, answers will got back to normal! Why it's like this?
return even;
}
const evenDouble = myNumbers
.filter(number => (number % 2 === 0))
.map(number => number *2 )
// let even = number * 2; //This gives me the answer but when it return the even, answers will got back to normal! Why it's like this?

});
console.log(evenDouble);

//Map Method:
const evenNum = myNumbers.map(number => {
if(number % 2 === 0) {
return number *2;
};
});
console.log(evenNum);
1 change: 1 addition & 0 deletions Week2/js-exercises/ex2-whatsYourMondayWorth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

function dayWorth(tasks, hourlyRate) {
// put your code in here, the function does returns a euro formatted string

}

const mondayTasks = [{
Expand Down