From ccaf53aa24e612f601e06589e228cf9981d820f8 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Sat, 8 Jun 2019 15:16:56 +0200
Subject: [PATCH] cleaning

---
 locales/email/en.json           | 3 ++-
 locales/email/es.json           | 3 ++-
 locales/email/zh.json           | 3 ++-
 pages/add/_edit.vue             | 1 -
 pages/admin.vue                 | 7 +------
 pages/event/_id.vue             | 4 ----
 pages/export.vue                | 1 -
 pages/settings.vue              | 2 --
 server/api/auth.js              | 2 +-
 server/api/controller/bot.js    | 1 -
 server/api/controller/export.js | 2 --
 server/api/controller/user.js   | 1 -
 server/api/models/user.js       | 6 ++++--
 server/emails/register/html.pug | 2 +-
 14 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/locales/email/en.json b/locales/email/en.json
index c22030f9..7dca66f0 100644
--- a/locales/email/en.json
+++ b/locales/email/en.json
@@ -2,5 +2,6 @@
   "registration_email": "registration_email",
   "recover_email": "recover_email",
   "press here": "press here",
-  "register.request": "register.request"
+  "register.request": "register.request",
+  "email.registration": "email.registration"
 }
\ No newline at end of file
diff --git a/locales/email/es.json b/locales/email/es.json
index c22030f9..7dca66f0 100644
--- a/locales/email/es.json
+++ b/locales/email/es.json
@@ -2,5 +2,6 @@
   "registration_email": "registration_email",
   "recover_email": "recover_email",
   "press here": "press here",
-  "register.request": "register.request"
+  "register.request": "register.request",
+  "email.registration": "email.registration"
 }
\ No newline at end of file
diff --git a/locales/email/zh.json b/locales/email/zh.json
index c22030f9..7dca66f0 100644
--- a/locales/email/zh.json
+++ b/locales/email/zh.json
@@ -2,5 +2,6 @@
   "registration_email": "registration_email",
   "recover_email": "recover_email",
   "press here": "press here",
-  "register.request": "register.request"
+  "register.request": "register.request",
+  "email.registration": "email.registration"
 }
\ No newline at end of file
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 11642eeb..7472c2bf 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -241,7 +241,6 @@ export default {
         end_datetime = moment(this.date.end)
           .set('hour', end_hour).set('minute', end_minute)
       } else {
-        console.log(this.date)
         start_datetime = moment(this.date).set('hour', start_hour).set('minute', start_minute)
         end_datetime = moment(this.date).set('hour', end_hour).set('minute', end_minute)
       }
diff --git a/pages/admin.vue b/pages/admin.vue
index 23e0c75a..a9299a90 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  el-card(:title='$t("common.admin")' width='80%' :visible='open' :before-close='close')
+  el-card
     nuxt-link.float-right(to='/')
       v-icon(name='times' color='red')
     h5 {{$t('common.admin')}}
@@ -224,11 +224,6 @@ export default {
       } catch (e) {
       }
     },
-    close (done) {
-      console.log('oppure qui !')
-      this.$router.replace('/')
-      // done()
-    }    
   }
 }
 </script>
\ No newline at end of file
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 5e168453..4dc9f7a0 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -59,7 +59,6 @@ export default {
   // key: to => to.fullPath,
   // Called to know which transition to apply
   // transition(to, from) {
-  //   console.log('dentro transition')
   //   if (!from) return 'slide-left'
   //   return +to.params.id < +from.params.id ? 'slide-right' : 'slide-left'
   // },
@@ -109,9 +108,6 @@ export default {
   },
   methods: {
     ...mapActions(['delEvent']),
-    keydown (e) {
-      console.error(e)
-    },
     comment_filter (value) {
       return value.replace(/<a.*href="([^">]+).*>(?:.(?!\<\/a\>))*.<\/a>/, (orig, url) => {
         // get extension
diff --git a/pages/export.vue b/pages/export.vue
index bacef4b8..80bdbcdb 100644
--- a/pages/export.vue
+++ b/pages/export.vue
@@ -58,7 +58,6 @@
 </template>
 <script>
 import { mapState, mapGetters } from 'vuex'
-import path from 'path'
 import Calendar from '@/components/Calendar'
 import List from '@/components/List'
 import Search from '@/components/Search'
diff --git a/pages/settings.vue b/pages/settings.vue
index 80269052..a21051ac 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -27,11 +27,9 @@ export default {
   methods: {
     async change () {
       if (!this.password) return
-      // this.$auth.user.password = this.password
       const user_data = { id : this.$auth.user.id, password: this.password }
       try {
         const user = await this.$axios.$put('/user', user_data)
-        console.error(user)
       } catch (e) {
         console.log(e)
       }
diff --git a/server/api/auth.js b/server/api/auth.js
index 7e7a8cdc..f13d4ed9 100644
--- a/server/api/auth.js
+++ b/server/api/auth.js
@@ -19,7 +19,7 @@ const Auth = {
         .status(403)
         .send({ message: 'Failed to authenticate token ' })
     }
-    
+
     req.user = await User.findOne({
       where: { id: { [Op.eq]: req.user.id }, is_active: true }
     })
diff --git a/server/api/controller/bot.js b/server/api/controller/bot.js
index a1b8ba81..a4acf850 100644
--- a/server/api/controller/bot.js
+++ b/server/api/controller/bot.js
@@ -10,7 +10,6 @@ moment.locale('it')
 const botController = {
   bot: null,
   async initialize() {
-    console.error('dentro bot inizialiteds')
     const settings = await settingsController.settings()
     if (!settings.mastodon_auth || !settings.mastodon_auth.access_token) return
     const mastodon_auth = settings.mastodon_auth
diff --git a/server/api/controller/export.js b/server/api/controller/export.js
index f0b5ba26..ff920e52 100644
--- a/server/api/controller/export.js
+++ b/server/api/controller/export.js
@@ -6,8 +6,6 @@ const ics = require('ics')
 const exportController = {
 
   async export(req, res) {
-    console.log('type ', req.params.type)
-    console.error(req)
     const type = req.params.type
     const tags = req.query.tags
     const places = req.query.places
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index f8668450..401c9e54 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -206,7 +206,6 @@ const userController = {
 
   async update(req, res) {
     const user = await User.findByPk(req.body.id)
-    console.error(req.body.id)
     if (user) {
       if (!user.is_active && req.body.is_active) {
         await mail.send(user.email, 'confirm', { user, config: config.SHARED_CONF })
diff --git a/server/api/models/user.js b/server/api/models/user.js
index dff5f86b..b4cdde52 100644
--- a/server/api/models/user.js
+++ b/server/api/models/user.js
@@ -15,8 +15,10 @@ module.exports = (sequelize, DataTypes) => {
     is_admin: DataTypes.BOOLEAN,
     is_active: DataTypes.BOOLEAN
   }, {
-    defaultScope: {
-      attributes: { exclude: ['password', 'recover_code'] }
+    scopes: {
+      withoutPassword: {
+        attributes: { exclude: ['password', 'recover_code'] }
+      }
     }
   })
 
diff --git a/server/emails/register/html.pug b/server/emails/register/html.pug
index 8cdb9def..6137f5b3 100644
--- a/server/emails/register/html.pug
+++ b/server/emails/register/html.pug
@@ -1,4 +1,4 @@
-p= t('registration_email')
+p= t('email.registration')
 
 hr
 small #{config.title} / #{config.description}