diff --git a/js/models.js b/js/models.js index 99c2777..c143bf2 100644 --- a/js/models.js +++ b/js/models.js @@ -54,7 +54,7 @@ class StoryList { // instance method? // query the /stories endpoint (no auth required) - const response = await axios({ + const response = axios({ url: `${BASE_URL}/stories`, method: "GET", }); @@ -63,7 +63,7 @@ class StoryList { const stories = response.data.stories.map(story => new Story(story)); console.log("stories instances here: ", stories); // build an instance of our own class using the new array of stories - return new StoryList(stories); + return new StoryList(response); } /** Adds story data to API, makes a Story instance, adds it to story list. @@ -74,18 +74,13 @@ class StoryList { */ async addStory(user, newStory) { - - //console.debug("addStory called"); - //console.log("user.loginToken = ", user.loginToken); - const response = await axios.post( `${BASE_URL}/stories`, - { token: user.loginToken, story: newStory } + { token: user.logintoken, story: newStory } ); const story = new Story(response.data.story); - this.stories.unshift(story); - console.log("this is what a single story looks like... ", story); + stories.unshift(story); return story; } } @@ -105,7 +100,7 @@ class User { username, name, createdAt, - favorites = [], + favorites, ownStories = [] }, token) { @@ -180,7 +175,6 @@ class User { * of favorites for a partiuclar user */ - async insertStoryIntoFavorites(story) { const response = await axios({ @@ -194,7 +188,6 @@ class User { } - /** second method - take a story instance and remove it from our array of * favorited articles */ @@ -207,14 +200,22 @@ class User { data: { token: `${currentUser.loginToken}` } }); - return currentUser.favorites; - - } + currentUser.favorites = response.data.user.favorites; + console.log("response.data.user.favorites = ", response.data.user.favorites); + console.log("CU Faves ", currentUser.favorites); + // return currentUser; + } + /*****/ + /** Stopping point of sprint. instertStoryIntoFavorites and removedStoryFromFavorites + * are working functions. + * Building out UI for these fucntions is next step. + */ + /*****/ /** When we already have credentials (token & username) for a user, * we can log them in automatically. This function does that. diff --git a/js/nav.js b/js/nav.js index 501a3d9..c171b16 100644 --- a/js/nav.js +++ b/js/nav.js @@ -34,7 +34,7 @@ function updateNavOnLogin() { $(".main-nav-links").show(); $navLogin.hide(); $navLogOut.show(); - $navUserProfile.text(`${currentUser.username}`).show(); + $navUserProfile.text(`${currentUser.user}`).show(); } /** Show story submission form on click on "submit" */ diff --git a/js/user.js b/js/user.js index ccf6b78..d985317 100644 --- a/js/user.js +++ b/js/user.js @@ -35,7 +35,7 @@ async function signup(evt) { console.debug("signup", evt); evt.preventDefault(); - const name = $("#signup-name").val(); + const name = $("#signup-name").text(); const username = $("#signup-username").val(); const password = $("#signup-password").val(); @@ -44,7 +44,7 @@ async function signup(evt) { currentUser = await User.signup(username, password, name); saveUserCredentialsInLocalStorage(); - updateUIOnUserLogin(); + updateUiOnUserLogin(); $signupForm.trigger("reset"); } @@ -57,7 +57,6 @@ $signupForm.on("submit", signup); */ function logout(evt) { - console.debug("logout", evt); localStorage.clear(); location.reload(); } @@ -73,7 +72,6 @@ $navLogOut.on("click", logout); */ async function checkForRememberedUser() { - console.debug("checkForRememberedUser"); const token = localStorage.getItem("token"); const username = localStorage.getItem("username"); if (!token || !username) return false;