Merge branch 'master' of gitlab.com:MrFry/mrfrys-node-server into master

middlewares/auth.middleware.js

@@ -39,7 +39,7 @@ module.exports = function (options) {
     }
 
     // FIXME Allowing all urls with _next in it, but not in params
-    if (req.url.split('?')[0].includes('_next')) {
+    if (req.url.split('?')[0].includes('_next') || req.url.split('?')[0].includes('well-known/acme-challenge')) {
       req.session = { isException: true }
       next()
       return

modules/api/api.js

@@ -45,7 +45,7 @@ const testUsersFile = 'data/testUsers.json'
 
 // other constants
 const maxVeteranPwGetCount = 10
-const addPWPerDay = 1 // every x day a user can give a pw
+const addPWPerDay = 3 // every x day a user can give a pw
 const maxPWCount = 6 // maximum pw give opportunities a user can have at once
 // const daysAfterUserGetsPWs = 2 // days after user gets pw-s
 

modules/qmining/qmining-page

@@ -1 +1 @@
-Subproject commit 8ae3e7865d5c555fb6fc27939ab99ef83f578bbd
+Subproject commit 7ac65348e41463670fc303fffc788f0baa03d288

modules/stuff/stuff.js

@@ -171,7 +171,13 @@ function GetApp () {
 
         let f = []
 
-        fs.readdirSync(curr).forEach((item) => {
+        let files = fs.readdirSync(curr)
+        files.sort(function (a, b) {
+          return fs.statSync(curr + b).mtime.getTime() -
+                      fs.statSync(curr + a).mtime.getTime()
+        })
+
+        files.forEach((item) => {
           if (item[0] !== '.') {
             let res = { name: item }
             let stat = fs.statSync(curr + '/' + item)

qminingPublic/moodle-test-userscript

@@ -1 +1 @@
-Subproject commit f8d4bf2a414d2973582c08bfa8b8b8f19389b2e9
+Subproject commit cbaaa7a376a9ac40e95b534c8a1181a017e95ddd

serverStats.sh

@@ -91,6 +91,7 @@ function jsonStats () {
     -e "s,/dataCount,${G}&${NC},g" \
     -e "s,/menuClick,${G}&${NC},g" \
     -e "s,/allqr,${G}&${NC},g" \
+    -e "s,/uploaddata,${G}&${NC},g" \
     -e "s,/legacy,${G}&${NC},g" \
     -e "s,/donate,${P}&${NC},g" \
     -e "s,/tiszai,${P}&${NC},g" \

sharedViews/login.ejs

@@ -29,6 +29,7 @@
           margin: 20px;
         }
         .title {
+          margin: 20px;
           font-size: 50px;
           font-weight: bold;
           color: white;
@@ -89,9 +90,6 @@
       <div class='title'>
         Frylabs
       </div>
-      <div id='text' class='text'>
-        Új jelszót a meglévő felhasználóktól lehet kérni
-      </div>
       <div id='feedback'>
         <textarea placeholder='Feedback' id='feedbackTextArea'></textarea>
         <div class='ircLinkContainer' >