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

Stevie's frontend challenge (incomplete) #119

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ Note that others may be doing the same task at the same time, so the data may ch

* [The Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch) for making requests.
* [Postman](https://www.getpostman.com/) or [Insomnia](https://insomnia.rest/) for exploring the API.

//////////////////////
167 changes: 167 additions & 0 deletions bundle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
(() => {
Copy link

Choose a reason for hiding this comment

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

I believe is good practice to .gitignore this file to avoid conflicts if working in a team. This file will anyway be autogenerated when running 'npm run build' locally

var __getOwnPropNames = Object.getOwnPropertyNames;
var __commonJS = (cb, mod) => function __require() {
return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
};

// chitterModel.js
var require_chitterModel = __commonJS({
"chitterModel.js"(exports, module) {
var ChitterModel2 = class {
constructor() {
this.chits = [];
this.session = [];
console.log("session contents", this.session);
}
getChits() {
return this.chits;
}
addChit(chit) {
this.chits.push(chit);
}
reset() {
this.chits = [];
}
setChits(chits2) {
this.reset();
chits2.forEach((chit) => this.chits.push(`${chit.user.handle}: ${chit.body}`));
}
openSession(sessiondata) {
console.log("this is coming from the model:", sessiondata.session_key);
this.session.push(sessiondata.session_key);
}
};
module.exports = ChitterModel2;
}
});

// chitterView.js
var require_chitterView = __commonJS({
"chitterView.js"(exports, module) {
var ChitterView2 = class {
constructor(model) {
console.log(model);
this.chitterModel = model;
console.log(this.chitterModel);
this.maincontainerEl = document.querySelector("#main-container");
this.addChitButtonEl = document.querySelector("#add-chit-button");
this.addChitButtonEl.addEventListener("click", () => {
const textInput = document.querySelector("#text-input").value;
this.addChit(textInput);
});
}
addChit(input) {
console.log("test10");
this.chitterModel.addChit(input);
console.log("test20");
console.log("test30");
this.displayChits();
}
displayChits() {
console.log(this.chitterModel);
document.querySelectorAll(".chit").forEach((chit) => {
chit.remove();
});
this.chitterModel.getChits().forEach((chit) => {
const chitEl = document.createElement("div");
chitEl.innerText = chit;
chitEl.className = "chit";
this.maincontainerEl.append(chitEl);
document.querySelector("#text-input").value = "";
});
}
testChits() {
this.maincontainerEl.append("hello");
}
testModel() {
chits = this.chitterModel.chits;
this.maincontainerEl.append(chits);
}
};
module.exports = ChitterView2;
}
});

// chitterApi.js
var require_chitterApi = __commonJS({
"chitterApi.js"(exports, module) {
var ChitterApi2 = class {
loadChits(callback) {
fetch("https://chitter-backend-api-v2.herokuapp.com/peeps").then((response) => response.json()).then((jsonData) => {
callback(jsonData);
});
}
createUser(username, password, callback) {
fetch("https://chitter-backend-api-v2.herokuapp.com/users", {
method: "POST",
headers: {
"Content-Type": "application/json"
},
body: `{"user": {"handle":"${username}", "password":"${password}"}}`
}).then((response) => response.json()).then((data) => {
callback(data);
console.log("Success:", data);
}).catch((error) => {
console.error("Error:", error);
});
}
createSession(data, password, callback) {
console.log("here's the data from createUser", data);
console.log(data.handle);
fetch("https://chitter-backend-api-v2.herokuapp.com/sessions", {
method: "POST",
headers: {
"Content-Type": "application/json"
},
body: `{"session": {"handle":"${data.handle}", "password":"${password}"}}`
}).then((response) => response.json()).then((data2) => {
callback(data2);
console.log("Success:", data2);
}).catch((error) => {
console.error("Error:", error);
});
}
createChit(sessiondata, chit) {
console.log("data from the session:", sessiondata);
console.log("the chit:", chit);
console.log("user id", sessiondata.user_id);
console.log("sessionkey", sessiondata.session_key);
fetch("https://chitter-backend-api-v2.herokuapp.com/peeps", {
method: "POST",
headers: {
"Content-Type": "application/json",
"Authorization": `Token token=${sessiondata.session_key}`
},
body: `{"peep": {"user_id":${sessiondata.user_id}, "body":"${chit}"}}`
});
}
};
module.exports = ChitterApi2;
}
});

// index.js
var ChitterModel = require_chitterModel();
var ChitterView = require_chitterView();
var ChitterApi = require_chitterApi();
var chitterModel = new ChitterModel();
var api = new ChitterApi();
var chitterView = new ChitterView(chitterModel, api);
chitterModel.addChit("chitterModel.addChit works");
if (chitterModel.session.length === 0) {
api.createUser("stevie235", "1234", (userdata) => {
api.createSession(userdata, "1234", (sessiondata) => {
chitterModel.openSession(sessiondata);
console.log("just made a session");
console.log("session array length:", chitterModel.session.length);
});
});
} else {
console.log("session already created");
}
api.loadChits((chits2) => {
chitterModel.setChits(chits2);
chitterView.displayChits();
console.log("is console.log a callback here (index.js)?", chits2);
});
})();
33 changes: 33 additions & 0 deletions chitterModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
class ChitterModel {
Copy link

Choose a reason for hiding this comment

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

Good. I think the model does what it is suppose to do and names are clear enough to be understood from someone who didn't write the code

constructor() {
this.chits = []
this.session = []
console.log('session contents', this.session)
}

getChits() {
return this.chits
}

addChit(chit) {
this.chits.push(chit)
}

reset() {
this.chits = []
}

setChits(chits) {
this.reset();
chits.forEach((chit) => this.chits.push(`${chit.user.handle}: ${chit.body}`));
}
Comment on lines +20 to +23
Copy link

Choose a reason for hiding this comment

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

It might be easier to store everything that comes from the server into the chits array (including body, user, time, likes,...) and then, when displaying what you want to display, select what you want. In that case, this method could have just been something like this.chits = chits


openSession(sessiondata) {
console.log('this is coming from the model:', sessiondata.session_key)
this.session.push(sessiondata.session_key)
}


}

module.exports = ChitterModel;
26 changes: 26 additions & 0 deletions chitterModel.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
const ChitterModel = require('./chitterModel')
const ChitterApi = require("./chitterApi")

describe('ChitterModel', () => {
it('is initialised with an empty array', () => {
const chitterModel = new ChitterModel
expect(chitterModel.getChits()).toEqual([])
})

it('allows a user to add a chit to the chits array', () => {
const chitterModel = new ChitterModel
chitterModel.addChit('one')
expect(chitterModel.getChits()).toEqual(['one'])
})

// it('displays the session data', () => {
// const chitterModel = new ChitterModel
// const api = new ChitterApi();
// api.createUser('stevie205', '1234', userdata => {
// api.createSession(userdata, '1234', sessiondata)
// chitterModel.openSession(sessiondata)
// })
// expect(chitterModel.openSession).toEqual(sessiondata)
// })
})

61 changes: 61 additions & 0 deletions chitterView.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
class ChitterView {
Copy link

Choose a reason for hiding this comment

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

View methods are well explained and should work for using the page locally. It is missing the API interface

constructor(model) {
console.log(model)
this.chitterModel = model;
console.log(this.chitterModel)
this.maincontainerEl = document.querySelector('#main-container');
this.addChitButtonEl = document.querySelector('#add-chit-button')
this.addChitButtonEl.addEventListener('click', () => {
const textInput = document.querySelector('#text-input').value;
this.addChit(textInput)
});
}

addChit(input) {
console.log('test10')
this.chitterModel.addChit(input)
console.log('test20')
// this.api.createChit(input)
console.log('test30')
this.displayChits()
}

displayChits() {
console.log(this.chitterModel)
document.querySelectorAll('.chit').forEach(chit => {
chit.remove();
});
Comment on lines +25 to +27
Copy link

Choose a reason for hiding this comment

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

As a refactor suggestion, this could have been a separate method

(this.chitterModel.getChits().forEach(chit => {
const chitEl = document.createElement('div')
chitEl.innerText = chit
chitEl.className = 'chit';
this.maincontainerEl.append(chitEl);
Comment on lines +29 to +32
Copy link

Choose a reason for hiding this comment

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

Also separate this in a different method could look nice

document.querySelector('#text-input').value = ''
}))

}

// displayChits() {
// // console.log(this.chitterModel)
// this.chitterModel.getChits()
// chits = this.chitterModel.getChits()
// chits.forEach(chit => {
// const chitEl = document.createElement('div')
// chitEl.innerText = chit
// chitEl.className = 'chit';
// this.maincontainerEl.append(chitEl);
// })
// }

testChits() {
this.maincontainerEl.append('hello')
}

testModel() {
chits = this.chitterModel.chits
this.maincontainerEl.append(chits)
}

}

module.exports = ChitterView;
30 changes: 30 additions & 0 deletions chitterView.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* @jest-environment jsdom
*/

const fs = require('fs');
const ChitterView = require('./chitterView')
const ChitterModel = require('./chitterModel')

describe('ChitterView', () => {
it('displays a chit', () => {
document.body.innerHTML = fs.readFileSync('./index.html')
const chitterModel = new ChitterModel
const chitterView = new ChitterView(chitterModel)
chitterModel.addChit('hello')
chitterView.displayChits()
console.log('4')
expect(document.querySelector('.chit').length).toBe(1)
})

it('displays two chits', () => {
document.body.innerHTML = fs.readFileSync('./index.html')
const chitterModel = new ChitterModel
const chitterView = new ChitterView(chitterModel)
chitterModel.addChit('hello')
chitterModel.addChit('hello hello')
chitterView.displayChits()
expect(document.querySelectorAll('.chit').length).toBe(2)
})
})

15 changes: 15 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!doctype html>
<html>
<head>
<title>Notes app</title>
</head>
<body>
<h1>Chitter</h1>
<button id="add-chit-button">post chit</button>
<input type="text" id="text-input" placeholder="write something"/>
<div id="main-container">

</div>
<script type="text/javascript" src="bundle.js"></script>
</body>
</html>
Loading