Leahnaya/website
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/website.git synced 2026-08-24 09:36:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixed some frontend issues (and reverted something I mistakenly added)

Browse Source
This commit is contained in:
mrjvs
2019-01-01 13:25:21 +01:00
parent 6dbfd5dd6c
commit 86b5aec033
9 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
assets/css/pretendo-auth.css
View File

@@ -42,14 +42,4 @@ body footer .content {
.card .content .lowText {
text-align: right;
color: #707070;
}
.error {
background-color: #eea9a9;
border-left: 3px solid #d83434;
padding: 1em;
color: rgba(0, 0, 0, 0.7);
}
.error.hide {
display: none;
}

19
assets/css/pretendo-common.css
View File

@@ -389,6 +389,25 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
flex: 1;
}
.error {
background-color: #eea9a9;
border-left: 3px solid #d83434;
padding: 1em;
color: rgba(0, 0, 0, 0.7);
}
.error.hide {
display: none;
}
.success {
background-color: #9fc983;
border-left: 3px solid #337419;
padding: 1em;
color: rgba(0, 0, 0, 0.7);
}
.success.hide {
display: none;
}
@media screen and (max-width: 500px) {
section.bigCardWrapper {
padding: 0;

27
assets/js/auth.js → assets/js/api.js
View File

@@ -17,6 +17,11 @@ function showErrorPopup(errorText) {
document.getElementById('errorBox').classList.remove('hide');
}
function showSuccessPopup(successText) {
document.getElementById('successBox').innerHTML = successText;
document.getElementById('successBox').classList.remove('hide');
}
function login() {
var xhr = postAjax('/api/v1/login', {
email: document.getElementById('email_input').value,
@@ -53,4 +58,26 @@ function register() {
showErrorPopup(response.errors);
}
}
}
function sendMessage() {
var xhr = postAjax('/api/v1/sendmessage', {
email: document.getElementById('email_input').value,
subject: document.getElementById('subject_input').value,
message: document.getElementById('message_input').value
});
xhr.onload = function () {
if (xhr.responseText.charAt(0) !== "{") {
return showErrorPopup('Whoops, something went wrong. Try again later.');
}
response = JSON.parse(xhr.responseText);
if (response.success === true) {
document.getElementById('email_input').value = '';
document.getElementById('subject_input').value = '';
document.getElementById('message_input').value = '';
return showSuccessPopup('Your message has been sent.');
} else if (response.errors) {
showErrorPopup(response.errors);
}
}
}

1
models/blog-post.js
View File

@@ -63,6 +63,7 @@ blogPostSchema.methods.postTemplate = function(callback) {
content: self.content,
title: self.name,
date: self.meta.date,
dateString: moment(self.meta.date).format('YYYY-MM-DD'),
category: self.meta.category,
author: author.authorTemplate()
});

6
routes/pnid.js
View File

@@ -101,15 +101,15 @@ router.post('/api/v1/login', passport.authenticate('PNIDStrategy'), function (re
* errors: Strings[messages]
* }
*/
router.post('/api/v1/register'/*, recaptcha.middleware.verify*/, async (request, response) => {
router.post('/api/v1/register', recaptcha.middleware.verify, async (request, response) => {
if (!request.body) {
return apiHelper.sendApiGenericError(response);
}
/*if (request.recaptcha.error) {
if (request.recaptcha.error) {
logger.log('warn', `[reCaptcha ERROR] ${request.recaptcha.error} | IP: ${request.ip} | Data: ${JSON.stringify(request.body)}`);
return apiHelper.sendApiError(response, 500, ['Captcha error']);
}*/
}
const { email, password, confirm_password, username } = request.body;

16
views/contact.hbs
View File

@@ -4,6 +4,8 @@
{{> head-common }}
<!-- page specific -->
<link rel="stylesheet" href="/assets/css/pretendo-contact.css">
<!-- scripts -->
<script src="/assets/js/api.js" defer></script>
</head>
<body class="flex">
{{> nav-default }}
@@ -13,16 +15,18 @@
<div class="bigCard">
<p class="txt-highlight">ERROR</p>
<h1 class="txt-title">{{ locale.contact.title }}</h1>
<div id="errorBox" class="error hide"></div>
<div id="successBox" class="success hide"></div>
<form action="/api/v1/sendmessage" method="POST">
<div class="input-container">
<input type="text" name="email" placeholder="{{ locale.contact.email_placeholder }}">
<input type="text" name="subject" placeholder="{{ locale.contact.subject_placeholder }}">
</div>
<textarea name="message" placeholder="{{ locale.contact.message_placeholder }}"></textarea>
<div class="txt-center">
<button class="btn">{{ locale.contact.button_text }}</button>
<input type="text" id="email_input" name="email" placeholder="{{ locale.contact.email_placeholder }}">
<input type="text" id="subject_input" name="subject" placeholder="{{ locale.contact.subject_placeholder }}">
</div>
<textarea name="message" id="message_input" placeholder="{{ locale.contact.message_placeholder }}"></textarea>
</form>
<div class="txt-center">
<button onclick="sendMessage()" class="btn">{{ locale.contact.button_text }}</button>
</div>
</div>
</section>
</div>

2
views/login.hbs
View File

@@ -7,7 +7,7 @@
<link rel="stylesheet" href="/assets/css/pretendo-common.css">
<!-- page specific -->
<link rel="stylesheet" href="/assets/css/pretendo-auth.css">
<script src="/assets/js/auth.js" defer></script>
<script src="/assets/js/api.js" defer></script>
</head>
<body class="flex center">
<div class="card">

2
views/post.hbs
View File

@@ -10,7 +10,7 @@
<div class="bgExtrude"></div>
<section class="bigCardWrapper">
<div class="bigCard">
<p class="txt-highlight">{{ post.category }} &mdash; {{ post.date }}</p>
<p class="txt-highlight">{{ post.category }} &mdash; {{ post.dateString }}</p>
<h1 class="txt-title">{{ post.title }}</h1>
{{{ post.content }}}
<div class="profile">

2
views/register.hbs
View File

@@ -9,7 +9,7 @@
<link rel="stylesheet" href="/assets/css/pretendo-auth.css">
<script src='https://www.google.com/recaptcha/api.js'></script>
<script src="/assets/js/auth.js" defer></script>
<script src="/assets/js/api.js" defer></script>
</head>
<body class="flex center">
<div class="card">