aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.html2
-rw-r--r--src/actions/app.js7
-rw-r--r--src/components/forum-element.js40
-rw-r--r--src/components/mao-app.js2
-rw-r--r--src/components/mao-forums.js2
5 files changed, 37 insertions, 16 deletions
diff --git a/index.html b/index.html
index 58f5a95..582aa37 100644
--- a/index.html
+++ b/index.html
@@ -110,7 +110,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
</style>
</head>
<body>
- <mao-app appTitle="CSN Mao"></mao-app>
+ <mao-app appTitle="CSN Maø"></mao-app>
<noscript>
Please enable JavaScript to view this website.
</noscript>
diff --git a/src/actions/app.js b/src/actions/app.js
index 31b51a4..7c5b321 100644
--- a/src/actions/app.js
+++ b/src/actions/app.js
@@ -57,12 +57,7 @@ const loadPage = (page) => (dispatch, getState) => {
break;
case 'admin':
- if(getState().firebaseAdmin.isAdmin) {
- import('../components/mao-admin.js');
- } else {
- page = 'view404';
- import('../components/my-view404.js');
- }
+ import('../components/mao-admin.js');
break;
default:
diff --git a/src/components/forum-element.js b/src/components/forum-element.js
index 3177892..c45c664 100644
--- a/src/components/forum-element.js
+++ b/src/components/forum-element.js
@@ -58,17 +58,33 @@ class ForumElement extends connect(store)(LitElement) {
margin-top: 5px;
}
- .comment-title {
- text-align: center;
+ .comment-author {
+ text-align: right;
+ font-weight: lighter;
+ font-style: italic;
+ word-break: break-all;
}
- .comment-author {
- text-align: center;
+ .comment-date {
+ text-align: left;
font-weight: lighter;
font-style: italic;
word-break: break-all;
}
+ .comment {
+ border: 1px solid black;
+ border-radius: 25px;
+ background: #e1e1e1;
+ padding: 20px;
+ margin-bottom: 10px;
+ }
+
+ .title-grid {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ }
+
.forum-date {
text-align: left;
}
@@ -114,7 +130,6 @@ class ForumElement extends connect(store)(LitElement) {
<div hidden="${!props.showComments}">
<hr hidden="${!props.showComments && !props.postComment}">
- <h4 class="comment-title">Comments</h4>
<div id="comment-area"></div>
</div>
</div>
@@ -179,15 +194,26 @@ class ForumElement extends connect(store)(LitElement) {
for(var i = this.comments.length-1; i >= 0; i--) {
var commentElement = document.createElement('div');
+ commentElement.classList.add('comment');
+
+ var titleGrid = document.createElement('div');
+ titleGrid.classList.add('title-grid');
- var authorElement = document.createElement('h4');
+ var dateElement = document.createElement('span');
+ dateElement.classList.add('comment-date');
+ dateElement.innerHTML = this.comments[i].date.toDate().toLocaleDateString("en-US");
+
+ var authorElement = document.createElement('span');
authorElement.classList.add('comment-author');
authorElement.innerHTML = this.comments[i].user;
+ titleGrid.appendChild(dateElement);
+ titleGrid.appendChild(authorElement);
+
var contentElement = document.createElement('p');
contentElement.innerHTML = this.comments[i].content;
- commentElement.appendChild(authorElement);
+ commentElement.appendChild(titleGrid);
commentElement.appendChild(contentElement);
commentArea.appendChild(commentElement);
diff --git a/src/components/mao-app.js b/src/components/mao-app.js
index 820322d..65a1841 100644
--- a/src/components/mao-app.js
+++ b/src/components/mao-app.js
@@ -231,7 +231,7 @@ class MaoApp extends connect(store)(LitElement) {
</main>
<footer>
- <p>Designed with &hearts; by Lucy Wood.</p>
+ <p>Designed with &hearts; by John Neumann.</p>
</footer>
<snack-bar active?="${_snackbarOpened}">
diff --git a/src/components/mao-forums.js b/src/components/mao-forums.js
index b7631d2..cf58bc4 100644
--- a/src/components/mao-forums.js
+++ b/src/components/mao-forums.js
@@ -77,7 +77,7 @@ class MaoForums extends connect(store)(PageViewElement) {
.post-grid {
display: grid;
- grid-gap: 10px;
+ grid-gap: 8px;
grid-template-columns: 1fr;
}