diff --git a/src/services/juxt-web/routes/console/communities.js b/src/services/juxt-web/routes/console/communities.js index 40366de..9e23825 100644 --- a/src/services/juxt-web/routes/console/communities.js +++ b/src/services/juxt-web/routes/console/communities.js @@ -12,7 +12,6 @@ router.get('/', async function (req, res) { let popularCommunities = await database.getMostPopularCommunities(9); let newCommunities = await database.getNewCommunities(6); res.render(req.directory + '/communities.ejs', { - // EJS variable and server-side variable popularCommunities: popularCommunities, newCommunities: newCommunities, cdnURL: config.CDN_domain, diff --git a/src/services/juxt-web/routes/web/login.js b/src/services/juxt-web/routes/web/login.js index fea074e..cdf5b1a 100644 --- a/src/services/juxt-web/routes/web/login.js +++ b/src/services/juxt-web/routes/web/login.js @@ -71,14 +71,6 @@ router.post('/', async (req, res) => { return res.send(response); } }); - - /*const tokens = apiResponse.body; - - response.cookie('refresh_token', tokens.refresh_token, { domain : '.pretendo.cc' }); - response.cookie('access_token', tokens.access_token, { domain : '.pretendo.cc' }); - response.cookie('token_type', tokens.token_type, { domain : '.pretendo.cc' }); - - response.redirect('/account');*/ }); diff --git a/src/webfiles/ctr/announcements.ejs b/src/webfiles/ctr/announcements.ejs index 928c4e3..c6a174d 100644 --- a/src/webfiles/ctr/announcements.ejs +++ b/src/webfiles/ctr/announcements.ejs @@ -21,7 +21,7 @@
-
+
<% if(totalNumPosts === 0) {%>

No Posts

diff --git a/src/webfiles/ctr/community.ejs b/src/webfiles/ctr/community.ejs index c5d3039..2cd8b70 100644 --- a/src/webfiles/ctr/community.ejs +++ b/src/webfiles/ctr/community.ejs @@ -148,7 +148,7 @@ -
+
<% if(totalNumPosts === 0) {%>

No Posts

diff --git a/src/webfiles/ctr/feed.ejs b/src/webfiles/ctr/feed.ejs index d01bdcd..589884f 100644 --- a/src/webfiles/ctr/feed.ejs +++ b/src/webfiles/ctr/feed.ejs @@ -20,7 +20,7 @@
-
+
<% if(posts.length === 0) {%>

<%= lang.activity_feed.empty %>

diff --git a/src/webfiles/ctr/js/juxt.js b/src/webfiles/ctr/js/juxt.js index f5f61e0..9a97ab0 100644 --- a/src/webfiles/ctr/js/juxt.js +++ b/src/webfiles/ctr/js/juxt.js @@ -773,13 +773,13 @@ function loadPosts(type) { var xhttp = new XMLHttpRequest(); xhttp.onreadystatechange = function() { if (this.readyState === 4 && this.status === 200) { - document.getElementById('community-posts-inner-body').innerHTML = this.responseText; + document.getElementById('wrapper').innerHTML = this.responseText; cave.transition_end(); initCommunityUsers(); } else if(this.readyState === 4 && this.status === 204) { - document.getElementById('community-posts-inner-body').innerHTML = '

No Posts

'; + document.getElementById('wrapper').innerHTML = '

No Posts

'; cave.transition_end(); } else if (this.readyState === 4){ @@ -855,7 +855,7 @@ function loadFeedPosts(element) { var xhttp = new XMLHttpRequest(); xhttp.onreadystatechange = function() { if (this.readyState === 4 && this.status === 200) { - document.getElementById('community-posts-inner-body').innerHTML += this.responseText; + document.getElementById('wrapper').innerHTML += this.responseText; } else if(this.readyState === 4 && this.status === 204) { diff --git a/src/webfiles/portal/announcements.ejs b/src/webfiles/portal/announcements.ejs index 22e8e13..4a81376 100644 --- a/src/webfiles/portal/announcements.ejs +++ b/src/webfiles/portal/announcements.ejs @@ -34,7 +34,7 @@

<%= community.description %>

-
+
<% if(totalNumPosts === 0) {%>

<%= lang.global.no_posts %>

<%} else { %> diff --git a/src/webfiles/portal/community.ejs b/src/webfiles/portal/community.ejs index f583ff3..534c109 100644 --- a/src/webfiles/portal/community.ejs +++ b/src/webfiles/portal/community.ejs @@ -189,7 +189,7 @@ -
+
<% if(totalNumPosts === 0) {%>

<%= lang.global.no_posts %>

<%} else { %> diff --git a/src/webfiles/portal/feed.ejs b/src/webfiles/portal/feed.ejs index 570b670..3fe61ad 100644 --- a/src/webfiles/portal/feed.ejs +++ b/src/webfiles/portal/feed.ejs @@ -18,7 +18,7 @@

<%= lang.global.activity_feed %>

-
+
<% if(posts.length === 0) {%>

<%= lang.activity_feed.empty %>

<%} else { %> diff --git a/src/webfiles/portal/js/juxt.js b/src/webfiles/portal/js/juxt.js index c213c5a..591001d 100644 --- a/src/webfiles/portal/js/juxt.js +++ b/src/webfiles/portal/js/juxt.js @@ -444,13 +444,13 @@ function loadPosts(type) { var xhttp = new XMLHttpRequest(); xhttp.onreadystatechange = function() { if (this.readyState === 4 && this.status === 200) { - document.getElementById('community-posts-inner-body').innerHTML = this.responseText; + document.getElementById('wrapper').innerHTML = this.responseText; wiiuBrowser.showLoadingIcon(false); initCommunityUsers(); } else if(this.readyState === 4 && this.status === 204) { - document.getElementById('community-posts-inner-body').innerHTML = '

No Posts

'; + document.getElementById('wrapper').innerHTML = '

No Posts

'; wiiuBrowser.showLoadingIcon(false); } else if (this.readyState === 4){ @@ -527,7 +527,7 @@ function loadFeedPosts(element) { var xhttp = new XMLHttpRequest(); xhttp.onreadystatechange = function() { if (this.readyState === 4 && this.status === 200) { - document.getElementById('community-posts-inner-body').innerHTML += this.responseText; + document.getElementById('wrapper').innerHTML += this.responseText; } else if(this.readyState === 4 && this.status === 204) { diff --git a/src/webfiles/portal/nav_bar.ejs b/src/webfiles/portal/nav_bar.ejs index 62782aa..5a8c3eb 100644 --- a/src/webfiles/portal/nav_bar.ejs +++ b/src/webfiles/portal/nav_bar.ejs @@ -2,7 +2,8 @@