Skip to content

Week03 #18

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
EliaYazdi wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Week03 #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6f46237
update
EliaYazdi Jul 29, 2019
fcab898
map.filter
EliaYazdi Jul 30, 2019
f275389
new update
EliaYazdi Jul 31, 2019
20f4bbb
maartjas.incomplemte
EliaYazdi Aug 1, 2019
115fd6e
book update
EliaYazdi Aug 1, 2019
b95e9fa
Step2.1
EliaYazdi Aug 2, 2019
a6005c4
step2-2 done!
EliaYazdi Aug 2, 2019
5e7684c
step 2-3 done!
EliaYazdi Aug 2, 2019
787c1c7
step2-4 done!
EliaYazdi Aug 2, 2019
360e397
step2-5 done!
EliaYazdi Aug 2, 2019
7738e89
step2-6 done!
EliaYazdi Aug 2, 2019
21bc280
step2-7 done!
EliaYazdi Aug 2, 2019
e1f4d40
step3 done!
EliaYazdi Aug 3, 2019
eada74e
steo 3 done!
EliaYazdi Aug 3, 2019
04738a5
step3-bonus done!
EliaYazdi Aug 3, 2019
6e4aee1
fixed the errors!
EliaYazdi Aug 3, 2019
63a4312
step2-1
EliaYazdi Aug 15, 2019
666dd0a
step 2-2
EliaYazdi Aug 15, 2019
7282fc9
step 2-2
EliaYazdi Aug 15, 2019
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
new update
  • Loading branch information
@EliaYazdi
EliaYazdi committed Jul 31, 2019
commit f275389e7d2a7104840791703e04005e9e13e5ae
76 changes: 47 additions & 29 deletions Week1/homework/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//make an array

const bookList = [
/*const bookList = [
'elia1',
'elia2',
'elia3',
Expand All @@ -20,65 +20,83 @@ const bookList = [

//make an object containing info

const bookInfo = {
elia1: {
let ul = document.createElement('ul');
document.getElementById('books').appendChild(ul);

bookList.forEach(book => {
let li = document.createElement('li');
ul.appendChild(li);
li.innerHTML += book;
});
*/

const bookInfo = [{

name: 'Elia 1',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',

},
elia2: {
name: 'Elia 1',
{
name: 'Elia 2',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',
},
elia3: {
name: 'Elia 1',
{
name: 'Elia 3',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',
},
elia4: {
name: 'Elia 1',
{
name: 'Elia 4',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',
},
elia5: {
name: 'Elia 1',
{
name: 'Elia 5',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',
},
elia6: {
name: 'Elia 1',
{
name: 'Elia 6',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',
},

elia7: {
name: 'Elia 1',
{
name: 'Elia 7',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',
},
elia8: {
name: 'Elia 1',
{
name: 'Elia 8',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',
},
elia9: {
name: 'Elia 1',
{
name: 'Elia 9',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',
},
elia1: {
name: 'Elia 1',
{
name: 'Elia 10',
Author: 'Elia the Famouse',
Language: 'English',
img: 'eli.jpg',
},
};

let ul = document.createElement('ul');
document.getElementById('books').appendChild(ul);
];

bookList.forEach(function (book) {
let li = document.createElement('li');
ul.appendChild(li);
li.innerHTML += book;
bookInfo.forEach(info => {
let div = document.createElement('div');
document.getElementById('inf').appendChild(div);
div.innerHTML += info.name;
});
Binary file added Week1/homework/eli.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 15 additions & 1 deletion Week1/homework/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
<!-- replace this with your HTML content -->
<!DOCTYPE html>
<html>

<head>
<title>Elia Books</title>
</head>
<p id="books"></p>
<div id="inf"></div>

<body>
<script src="app.js">
</script>
</body>

</html>
13 changes: 4 additions & 9 deletions Week2/homework/maartjes-work.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict';

const monday = [
{
const monday = [{
name: 'Write a summary HTML/CSS',
duration: 180,
},
Expand All @@ -19,8 +18,7 @@ const monday = [
},
];

const tuesday = [
{
const tuesday = [{
name: 'Keep writing summary',
duration: 240,
},
Expand All @@ -45,10 +43,7 @@ const tuesday = [
const maartjesTasks = monday.concat(tuesday);
const maartjesHourlyRate = 20;

function computeEarnings(tasks, hourlyRate) {
// Replace this comment and the next line with your code
console.log(tasks, hourlyRate);
}


// eslint-disable-next-line no-unused-vars
const earnings = computeEarnings(maartjesTasks, maartjesHourlyRate);
Expand All @@ -62,4 +57,4 @@ module.exports = {
maartjesTasks,
maartjesHourlyRate,
computeEarnings,
};
};