surya/freeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Altra conversione in Typescript , partendo da un progetto di esempio funzionante...

Browse Source
This commit is contained in:
paolo
2018-11-02 20:10:45 +01:00
parent 0fd5bf5034
commit 42b5afd40a
36 changed files with 10588 additions and 11973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.babelrc
View File

@@ -1,4 +1,17 @@
{ {
"env": {
"test": {
"presets": [ [
"@babel/preset-env", {
"modules": "commonjs",
"targets": {
"node": "current"
}
}
]
]
}
},
"presets": [ "presets": [
[ [
"@babel/preset-env", { "@babel/preset-env", {
@@ -18,7 +31,7 @@
], ],
"plugins": [ "plugins": [
[ [
"@babel/transform-runtime", { "@babel/plugin-transform-runtime", {
"polyfill": false, "polyfill": false,
"regenerator": false "regenerator": false
} }

5
.gitignore vendored
View File

@@ -7,6 +7,8 @@ node_modules
/src-cordova/platforms /src-cordova/platforms
/src-cordova/plugins /src-cordova/plugins
/src-cordova/www /src-cordova/www
/src-pwa
/src-ssr
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
@@ -18,3 +20,6 @@ yarn-error.log*
*.ntvs* *.ntvs*
*.njsproj *.njsproj
*.sln *.sln
# Coverage
coverage

35
.stylintrc Normal file
View File

@@ -0,0 +1,35 @@
{
"blocks": "never",
"brackets": "never",
"colons": "never",
"colors": "always",
"commaSpace": "always",
"commentSpace": "always",
"cssLiteral": "never",
"depthLimit": false,
"duplicates": true,
"efficient": "always",
"extendPref": false,
"globalDupe": true,
"indentPref": 2,
"leadingZero": "never",
"maxErrors": false,
"maxWarnings": false,
"mixed": false,
"namingConvention": false,
"namingConventionStrict": false,
"none": "never",
"noImportant": false,
"parenSpace": "never",
"placeholder": false,
"prefixVarsWithDollar": "always",
"quotePref": "single",
"semicolons": "never",
"sortOrder": false,
"stackedProperties": "never",
"trailingWhitespace": "never",
"universal": "never",
"valid": true,
"zeroUnits": "never",
"zIndexNormalize": false
}

119
README.md
View File

@@ -1,3 +1,118 @@
# Quasar App <div align="center">
> WIP # Quasar TypeScript
A starter kit to build powerful and amazing native-looking apps, thanks to the Quasar Framework and TypeScript
</div>
<div align="center">
[![Made with Quasar](https://img.shields.io/badge/made%20with-Quasar-blue.svg?style=for-the-badge)](https://github.com/quasarframework/quasar)
[![Uses TypeScript](https://img.shields.io/badge/uses-TypeScript-3F51B5.svg?style=for-the-badge)](https://github.com/Microsoft/TypeScript)
[![License MIT](https://img.shields.io/github/license/kevinmarrec/quasar-typescript.svg?style=for-the-badge)](https://opensource.org/licenses/MIT)
</div>
<div align="center">
[![js-standard-style](https://cdn.rawgit.com/standard/standard/master/badge.svg)](https://github.com/standard/standard)
[![Build](https://img.shields.io/circleci/project/github/kevinmarrec/quasar-typescript/master.svg?style=for-the-badge)](https://circleci.com/gh/kevinmarrec/quasar-typescript/tree/master)
[![Coverage](https://img.shields.io/codecov/c/github/kevinmarrec/quasar-typescript/master.svg?style=for-the-badge)](https://codecov.io/gh/kevinmarrec/quasar-typescript/branch/master)
</div>
## Features ⚡️(WIP)
- [TypeScript](https://github.com/Microsoft/TypeScript) ✔
- [Pug](https://github.com/pugjs/pug) Template Engine ✔
- Internationalization (I18n) ✔
- SSR compliant using Quasar SSR ✔
- ...
## Built-in Tools 🔨
- [TSlint](https://github.com/palantir/tslint) TypeScript Linter configured with the [Standard](https://github.com/standard/standard) JavaScript Code Style
- Testing Suite using [Jest](https://github.com/facebook/jest) (See `Testing` section)
- Configurable CI Pipeline using [CircleCI](https://circleci.com/) & [Codecov](https://codecov.io) (See `CI Pipeline` section)
## Installation 🔧
**System prerequisites :**
- Pretested on Windows, Mac & Linux
- Node.js 8 LTS or 10 latest
- yarn > 1.9 (no guarantees if you prefer to use npm)
Clone this repository :
```bash
$ git clone git@github.com:kevinmarrec/quasar-typescript example
$ cd example
$ yarn
```
## Usage
```bash
$ yarn dev # Start a SPA server
$ yarn dev:ssr # Start a SSR + PWA server
```
## Testing (WIP)
## CI Pipeline (WIP)
## Building
You can build your application for production using :
```bash
$ yarn build # Build your SPA (it places the artifacts at /dist/spa-mat)
$ yarn build:ssr # Build your SSR + PWA (it places the artifacts at /dist/ssr-mat)
```
If you want then to clean build artifacts, just do :
```bash
$ yarn build:clean
```
## Serving
You can serve your production ready application locally using :
```bash
$ yarn serve # Serve your SPA
$ yarn serve:ssr # Serve your SSR + PWA
```
By default, SPA and SSR apps are respectively served on ports `4000` and `3000`
You can override the port using an environment variable :
```bash
$ PORT=3210 yarn serve # Serve your SPA on port 3210
$ PORT=3210 yarn serve:ssr # Serve your SSR + PWA on port 3210
```
## Deploy with Now.sh
Deploying with [Now](https://zeit.co/now) is a breeze. The Now CLI is already shipped in the starter kit development dependencies so all you need to do is :
```bash
$ yarn deploy # Deploy your SPA on Now.sh
$ yarn deploy:ssr # Deploy your SSR + PWA on Now.sh
```
> You might want to use a "now alias" or connect your domain to Now - or even look into automatic deployment with [their Github integration](https://zeit.co/blog/now-for-github).
`Now.sh` will install the dependencies automatically then run `$ yarn start`. Your website will be up and running on an HTTPS connection in a matter of seconds !
## References
* **Quasar 0.17.15** : [Website](https://quasar-framework.org) | [Documentation](https://quasar-framework.org/guide) | [Github](https://github.com/quasarframework/quasar)
* **Vue I18n 8.1.0** : [Website](https://kazupon.github.io/vue-i18n) | [Documentation](https://kazupon.github.io/vue-i18n/guide/started.html) | [Github](https://github.com/kazupon/vue-i18n)
## License
[MIT](https://opensource.org/licenses/MIT)
Copyright (c) 2018-present, Kevin Marrec

12
config/envparser.js
View File

@@ -1,12 +0,0 @@
const DotEnv = require('dotenv')
const parsedEnv = DotEnv.config().parsed
module.exports = function () {
// Let's stringify our variables
for (key in parsedEnv) {
if (typeof parsedEnv[key] === 'string') {
parsedEnv[key] = JSON.stringify(parsedEnv[key])
}
}
return parsedEnv
}

3
config/helpers/env.js
View File

@@ -1,3 +0,0 @@
module.exports = function (key, fallback) {
return process.env[key] || fallback
}

47
jest.config.js Normal file
View File

@@ -0,0 +1,47 @@
module.exports = {
globals: {
__DEV__: true
},
verbose: true,
testURL: 'http://localhost/',
collectCoverage: false,
coverageDirectory: '<rootDir>/test/coverage',
collectCoverageFrom: [
'<rootDir>/src/components/**/*.vue',
'<rootDir>/src/layouts/**/*.vue',
'<rootDir>/src/pages/**/*.vue',
'<rootDir>/src/plugins/**/*.ts',
'<rootDir>/src/mixins/**/*.ts',
'<rootDir>/src/directives/**/*.ts'
],
coverageThreshold: {
global: {
branches: 50,
functions: 50,
lines: 50,
statements: 50
}
},
testMatch: [
'<rootDir>/**/__tests__/**/*.spec.ts'
],
moduleFileExtensions: [
'ts',
'js',
'json',
'vue'
],
moduleNameMapper: {
'^vue$': '<rootDir>/node_modules/vue/dist/vue.common.js',
'^quasar$': '<rootDir>/tmp/quasar.common.js',
'^~/(.*)$': '<rootDir>/$1',
'^@/(.*)$': '<rootDir>/src/$1'
},
transform: {
'.*\\.vue$': '<rootDir>/node_modules/vue-jest',
'.*\\.ts$': '<rootDir>/node_modules/ts-jest'
},
snapshotSerializers: [
'<rootDir>/node_modules/jest-serializer-vue'
]
}

11128
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

83
package.json
View File

@@ -1,55 +1,56 @@
{ {
"name": "myapp", "name": "quasar-typescript",
"version": "1.0.0", "version": "0.1.0",
"description": "MyApp Pao descrizione", "description": "",
"productName": "MyApp Pao", "productName": "Quasar TypeScript",
"cordovaId": "", "cordovaId": "org.cordova.quasar.app",
"author": "paolo <paolo.arena77@gmail.com>", "author": "Kevin Marrec",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "quasar dev -m pwa", "lint": "tslint --project tsconfig.json",
"build": "quasar build -m pwa", "lint:fix": "tslint --project tsconfig.json --fix",
"test": "quasar dev" "dev": "NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev",
"dev:ssr": "NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m ssr",
"dev:pwa": "NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m pwa",
"test:unit": "jest",
"test:cover": "jest --coverage",
"build": "quasar build",
"build:ssr": "quasar build -m ssr",
"build:clean": "quasar clean",
"serve": "quasar serve ./dist/spa-mat",
"serve:ssr": "quasar serve ./dist/ssr-mat",
"serve:coverage": "quasar serve test/coverage/lcov-report/ --cache 0 --port 8788",
"deploy": "now dist/spa-mat",
"deploy:ssr": "now dist/ssr-mat"
}, },
"dependencies": { "dependencies": {
"@types/bcrypt": "^3.0.0",
"axios": "^0.18.0", "axios": "^0.18.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"chart": "^0.1.2", "vue-i18n": "^8.1.0",
"chart.js": "^2.7.3",
"countup.js": "^1.9.3",
"js-cookie": "^2.2.0",
"js-md5": "^0.7.3",
"lodash": "^4.17.11",
"quasar-extras": "^2.0.8",
"roboto-font": "^0.1.0",
"tslib": "^1.9.3",
"vivus": "^0.4.4",
"vue-i18n": "^8.2.1",
"vue-i18n-loader": "^1.0.0",
"vue-property-decorator": "^7.2.0", "vue-property-decorator": "^7.2.0",
"vue-template-loader": "^1.0.0",
"vuelidate": "^0.7.4", "vuelidate": "^0.7.4",
"webpack-stream": "^5.1.1" "vuex-class": "^0.3.1",
"vuex-module-decorators": "^0.9.0"
}, },
"devDependencies": { "devDependencies": {
"@types/express": "^4.16.0", "@types/jest": "^23.3.4",
"@types/extract-text-webpack-plugin": "^3.0.3", "@types/node": "^10.11.5",
"@types/html-webpack-plugin": "^3.2.0", "@vue/test-utils": "^1.0.0-beta.25",
"@types/node": "^10.12.0", "babel-core": "^7.0.0-bridge.0",
"@types/webpack": "^4.4.17", "codecov": "^3.1.0",
"@types/webpack-merge": "^4.1.3", "jest": "^23.6.0",
"dotenv": "^6.1.0", "jest-serializer-vue": "^2.0.2",
"json-loader": "^0.5.7", "now": "^11.4.6",
"karma-sourcemap-loader": "^0.3.7", "pug": "^2.0.3",
"mocha-webpack": "^1.1.0", "pug-plain-loader": "^1.0.0",
"quasar-cli": "^0.17.0", "quasar-cli": "^0.17.20",
"strip-ansi": "^3.0.1", "strip-ansi": "=3.0.1",
"ts-loader": "^5.2.2", "ts-jest": "^23.10.4",
"typescript": "^3.1.3", "ts-loader": "^5.2.1",
"vue-class-component": "^6.3.2", "tslint": "^5.11.0",
"vue-cli-plugin-quasar": "^0.17.1", "tslint-config-standard": "^8.0.1",
"vuex-module-decorators": "^0.9.0" "typescript": "^3.1.1",
"vue-jest": "^2.6.0"
}, },
"engines": { "engines": {
"node": ">= 8.9.0", "node": ">= 8.9.0",

66
quasar.conf.js
View File

@@ -1,8 +1,6 @@
// Configuration for your app // Configuration for your app
const path = require('path');
// Get our env variables const path = require('path');
const envparser = require('./config/envparser');
const extendTypescriptToWebpack = (config) => { const extendTypescriptToWebpack = (config) => {
config.resolve config.resolve
@@ -25,6 +23,7 @@ module.exports = function (ctx) {
router: 'src/router/index.ts', router: 'src/router/index.ts',
store: 'src/store/index.ts' store: 'src/store/index.ts'
}, },
// app plugins (/src/plugins)
plugins: ['i18n', 'axios', 'vuelidate'], plugins: ['i18n', 'axios', 'vuelidate'],
css: [ css: [
'app.styl' 'app.styl'
@@ -59,11 +58,11 @@ module.exports = function (ctx) {
} }
}, },
devServer: { devServer: {
// https: true, https: false,
port: 8080, port: 8080,
host: 'localhost', open: true // opens browser window automatically
open: false // opens browser window automatically
}, },
// framework: 'all' --- includes everything; for dev only!
framework: { framework: {
components: [ components: [
'QLayout', 'QLayout',
@@ -101,30 +100,31 @@ module.exports = function (ctx) {
'QInnerLoading', 'QInnerLoading',
'QSpinnerGears', 'QSpinnerGears',
'QDatetime', 'QDatetime',
], ],
directives: [ directives: [
'Ripple' 'Ripple',
'CloseOverlay'
], ],
// Quasar plugins // Quasar plugins
plugins: [ plugins: [
'Notify', 'ActionSheet', 'Loading' 'Notify',
'Meta',
'Cookies',
'ActionSheet', 'Loading'
], ],
config: {
// optional (v0.17+)
loading: {
// Loading defaults
}
},
//iconSet: ctx.theme.mat ? 'material-icons' : 'ionicons',
iconSet: 'fontawesome', iconSet: 'fontawesome',
//iconSet: 'roboto-font', i18n: 'it', // Quasar language
i18n: 'it' // Quasar language
}, },
// animations: 'all' --- includes all animations
animations: [], animations: [],
ssr: { ssr: {
pwa: false pwa: {
runtimeCaching: [
{
urlPattern: '/statics',
handler: 'networkFirst'
}
]
}
}, },
pwa: { pwa: {
workboxPluginMode: 'InjectManifest', workboxPluginMode: 'InjectManifest',
@@ -166,31 +166,5 @@ module.exports = function (ctx) {
] ]
} }
}, },
cordova: {
// id: 'org.cordova.quasar.app'
},
electron: {
// bundler: 'builder', // or 'packager'
extendWebpack(cfg) {
// do something with Electron process Webpack cfg
},
packager: {
// https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
// OS X / Mac App Store
// appBundleId: '',
// appCategoryType: '',
// osxSign: '',
// protocol: 'myapp://path',
// Window only
// win32metadata: { ... }
},
builder: {
// https://www.electron.build/configuration/configuration
// appId: 'quasar-app'
}
}
} }
}; };

4
src/components/Header.vue
View File

@@ -54,8 +54,8 @@
import {Quasar} from 'quasar'; import {Quasar} from 'quasar';
import drawer from '../components/layout/drawer/drawer.vue' import drawer from '../layouts/drawer/drawer.vue'
import messagePopover from '../components/layout/toolbar/messagePopover.vue' import messagePopover from '../layouts/toolbar/messagePopover.vue'
import user from '../store/modules/user'; import user from '../store/modules/user';

7
src/components/HelloWorld.ts
View File

@@ -1,13 +1,6 @@
import { Component, Vue } from 'vue-property-decorator'; import { Component, Vue } from 'vue-property-decorator';
import WithRender from './hello-world.html';
/*
@WithRender
@Component @Component
export default class HelloWorld extends Vue { export default class HelloWorld extends Vue {
} }
*/

0
src/plugins/.gitkeep → src/components/__tests__/.gitkeep
View File

42
src/components/views/login/signup.vue
View File

@@ -92,7 +92,10 @@
</div> </div>
</template> </template>
<script> <script lang="ts">
import Vue from 'vue'
import { Component, Prop, Watch } from 'vue-property-decorator'
import { import {
required, required,
email, email,
@@ -104,17 +107,20 @@
requiredUnless requiredUnless
} from 'vuelidate/lib/validators' } from 'vuelidate/lib/validators'
import {mapGetters, mapActions} from 'vuex' import { validationMixin } from 'vuelidate';
import { mapGetters, mapActions } from 'vuex'
import * as types from '../../../store/mutation-types' import * as types from '../../../store/mutation-types'
import {Errori_MongoDb} from '../../../store/modules/user' import { Errori_MongoDb } from '../../../store/modules/user'
import axios from 'axios'; import axios from 'axios';
import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar' import { Loading, QSpinnerFacebook, QSpinnerGears } from 'quasar'
export default { @Component({
data() { mixins: [validationMixin],
data () {
return { return {
url: process.env.VUE_APP_URL, url: process.env.VUE_APP_URL,
form: { form: {
@@ -140,7 +146,7 @@
'getUserServer', 'getUserServer',
'getServerCode', 'getServerCode',
]), ]),
env() { env () {
return env return env
}, },
}, },
@@ -159,7 +165,7 @@
}) })
} }
}, },
password: {required, minLength: minLength(8), maxLength: maxLength(20)}, password: { required, minLength: minLength(8), maxLength: maxLength(20) },
username: { username: {
required, minLength: minLength(6), maxLength: maxLength(20), required, minLength: minLength(6), maxLength: maxLength(20),
isUnique: value => { isUnique: value => {
@@ -175,7 +181,7 @@
repeatPassword: { repeatPassword: {
sameAsPassword: sameAs('password') sameAsPassword: sameAs('password')
}, },
terms: {required}, terms: { required },
} }
}, },
@@ -183,10 +189,10 @@
...mapActions("user", { ...mapActions("user", {
signup: types.USER_SIGNUP, signup: types.USER_SIGNUP,
}), }),
showNotif(msg) { showNotif (msg) {
this.$q.notify(msg) this.$q.notify(msg)
}, },
errorMsg(cosa, item) { errorMsg (cosa, item) {
try { try {
if (!item.$error) return ''; if (!item.$error) return '';
if (item.$params.email && !item.email) return this.$t('reg.err.email'); if (item.$params.email && !item.email) return this.$t('reg.err.email');
@@ -214,7 +220,7 @@
//console.log("ERR : " + error); //console.log("ERR : " + error);
} }
}, },
checkErrors(riscode) { checkErrors (riscode) {
//console.log("RIS = " + riscode); //console.log("RIS = " + riscode);
if (riscode === Errori_MongoDb.DUPLICATE_EMAIL_ID) { if (riscode === Errori_MongoDb.DUPLICATE_EMAIL_ID) {
this.showNotif(this.$t('reg.err.duplicate_email')); this.showNotif(this.$t('reg.err.duplicate_email'));
@@ -227,7 +233,7 @@
} }
}, },
submit() { submit () {
this.$v.form.$touch(); this.$v.form.$touch();
this.duplicate_email = false; this.duplicate_email = false;
@@ -243,14 +249,14 @@
return return
} }
this.$q.loading.show({message: this.$t('reg.incorso')}); this.$q.loading.show({ message: this.$t('reg.incorso') });
console.log(this.form); console.log(this.form);
this.signup(this.form) this.signup(this.form)
.then((riscode) => { .then((riscode) => {
this.checkErrors(riscode); this.checkErrors(riscode);
this.$q.loading.hide(); this.$q.loading.hide();
}).catch(error => { }).catch((error: string) => {
console.log("ERROR = " + error); console.log("ERROR = " + error);
this.$q.loading.hide(); this.$q.loading.hide();
}); });
@@ -259,7 +265,11 @@
// ... // ...
} }
}, },
})
export default class Signup extends Vue {
} }
</script> </script>
<style scoped> <style scoped>
@@ -269,3 +279,5 @@
max-width: 450px; max-width: 450px;
} }
</style> </style>

47
src/css/app.styl
View File

@@ -1,46 +1 @@
// This file is included in the build if src/main.js imports // app global css
// either app.mat.styl or app.ios.styl.
// Check "DEFAULT / CUSTOM STYLE" in src/main.js
// App Shared Variables
// --------------------------------------------------
// To customize the look and feel of this app, you can override
// the Stylus variables found in Quasar's source Stylus files. Setting
// variables before Quasar's Stylus will use these variables rather than
// Quasar's default Stylus variable values. Stylus variables specific
// to the themes belong in either the app.ios.styl or app.mat.styl files.
// App Shared Color Variables
// --------------------------------------------------
// It's highly recommended to change the default colors
// to match your app's branding.
$primary = #027be3
$secondary = #26A69A
$tertiary = #555
$neutral = #E0E1E2
$positive = #21BA45
$negative = #DB2828
$info = #31CCEC
$warning = #F2C037
$light = #f4f4f4
$dark = #333
$faded = #777
$text-color = lighten(black, 17%)
$background-color = white
$link-color = lighten($primary, 25%)
$link-color-active = $primary
$typography-font-family ?= 'Roboto'
$toolbar-color ?= white
$toolbar-background ?= $primary
$toolbar-active-color ?= $primary
$toolbar-faded-color ?= composite-color($primary)

2
src/components/layout/content-header.vue → src/layouts/content-header.vue
View File

@@ -28,7 +28,7 @@
</template> </template>
<script type="text/javascript"> <script type="text/javascript">
import { mapActions, mapGetters } from 'vuex' import { mapActions, mapGetters } from 'vuex'
import * as types from '../../store/mutation-types' import * as types from '../store/mutation-types'
export default { export default {
computed: { computed: {
...mapGetters("glob", ['getLayoutNeeded', 'getIsLoginPage']), ...mapGetters("glob", ['getLayoutNeeded', 'getIsLoginPage']),

2
src/components/layout/drawer/drawer.vue → src/layouts/drawer/drawer.vue
View File

@@ -30,7 +30,7 @@
import menuOne from './menuOne.vue' import menuOne from './menuOne.vue'
import menuTwo from './menuTwo.vue' import menuTwo from './menuTwo.vue'
import * as types from '../../../store/mutation-types' import * as types from '../../store/mutation-types'
import {mapGetters, mapActions} from 'vuex' import {mapGetters, mapActions} from 'vuex'

0
src/components/layout/drawer/menuOne.vue → src/layouts/drawer/menuOne.vue
View File

0
src/components/layout/drawer/menuTwo.vue → src/layouts/drawer/menuTwo.vue
View File

0
src/components/layout/img/avatar-1.svg → src/layouts/img/avatar-1.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
src/components/layout/img/quasar-logo.png → src/layouts/img/quasar-logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

0
src/components/layout/img/vue-logo.png → src/layouts/img/vue-logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

2
src/components/layout/toolbar/messagePopover.vue → src/layouts/toolbar/messagePopover.vue
View File

@@ -23,7 +23,7 @@
</template> </template>
<script> <script>
import { mapGetters, mapActions } from 'vuex' import { mapGetters, mapActions } from 'vuex'
import * as types from '../../../store/mutation-types' import * as types from '../../store/mutation-types'
export default { export default {
mounted () { mounted () {
if (this.getPosts.length < 1) { if (this.getPosts.length < 1) {

33
src/pages/Error404.vue
View File

@@ -1,27 +1,18 @@
<template> <template lang="pug">
<q-page-container> .fixed-center.text-center
<q-page class="flex flex-center"> img(src="~assets/sad.svg", style="width:30vw;max-width:150px;")
<div class="fixed-center text-center"> p.q-mt-sm.text-faded
<p> | {{ $t('pages.errors.e404.message') }} #[strong (404)]
<img q-btn(
src="~assets/sad.svg"
style="width:30vw;max-width:150px;"
>
</p>
<p class="text-faded">Sorry, nothing here...<strong>(404)</strong></p>
<q-btn
color="secondary" color="secondary"
style="width:200px;" style="width:200px;"
@click="$router.push('/')" @click="$router.push('/')"
>Go back ) {{ $t('pages.errors.e404.back') }}
</q-btn>
</div>
</q-page>
</q-page-container>
</template> </template>
<script> <script lang="ts">
export default { import { Vue, Component } from 'vue-property-decorator'
name: 'Error404'
} @Component
export default class Error404 extends Vue {}
</script> </script>

7
src/quasar.d.ts vendored
View File

@@ -1,7 +0,0 @@
declare module "*.vue" {
import * as Vue from 'vue';
export default typeof Vue
}
declare module "quasar"
declare const __THEME

7
src/router/index.ts
View File

@@ -4,8 +4,7 @@ import { PositionResult } from 'vue-router/types/router'
import routes from '@/router/routes' import routes from '@/router/routes'
Vue.use(VueRouter); Vue.use(VueRouter)
/* /*
* If not building with SSR mode, you can * If not building with SSR mode, you can
* directly export the Router instantiation * directly export the Router instantiation
@@ -13,14 +12,14 @@ Vue.use(VueRouter);
export default function (/* { store, ssrContext } */) { export default function (/* { store, ssrContext } */) {
const Router = new VueRouter({ const Router = new VueRouter({
scrollBehavior: () => ({y: 0} as PositionResult), scrollBehavior: () => ({ y: 0 } as PositionResult),
routes, routes,
// Leave these as is and change from quasar.conf.js instead! // Leave these as is and change from quasar.conf.js instead!
// quasar.conf.js -> build -> vueRouterMode // quasar.conf.js -> build -> vueRouterMode
mode: process.env.VUE_ROUTER_MODE as RouterMode, mode: process.env.VUE_ROUTER_MODE as RouterMode,
base: process.env.VUE_ROUTER_BASE base: process.env.VUE_ROUTER_BASE
}); })
return Router return Router
} }

53
src/router/routes.ts
View File

@@ -1,32 +1,39 @@
import { RouteConfig } from 'vue-router' import { RouteConfig } from 'vue-router';
import VueI18n from 'vue-i18n';
import Vue from 'vue'
Vue.use(VueI18n);
function load (component) {
return () => import(`@/components/${component}.vue`)
}
const routes: [RouteConfig] = [
{ path: '/', component: () => import('@/pages/Index.vue') },
{ path: '/signup', component: load('views/login/signup'), meta: { name: 'Registration' } },
{ path: '/signin', component: load('views/login/signin'), meta: { name: 'Login' } },
{ path: '/vreg', component: load('views/login/vreg'), meta: { name: 'Verify Reg' } },
{ path: '/requestresetpwd', component: load('views/login/requestresetpwd'), meta: { name: 'Reset your Password' } },
{ path: '/updatepwd', component: load('views/login/updatepassword'), meta: { name: 'Update your Password' } },
{ path: '/simpleform', component: load('views/form/simpleForm/simpleForm'), meta: { name: 'SimpleForm' } },
{ path: '/embeeded', component: load('views/form/embeeded/embeeded'), meta: { name: 'Embeeded' } },
const routes: RouteConfig[] = [
{ path: '/', component: () => import('@/pages/Index.vue'), meta: { name: 'Home' } },
{ path: '/signup', component: () => import('@/components/views/login/signup.vue'), meta: { name: 'Registration' } },
{ path: '/signin', component: () => import('@/components/views/login/signin.vue'), meta: { name: 'Login' } },
{ path: '/vreg', component: () => import('@/components/views/login/vreg.vue'), meta: { name: 'Verify Reg' } },
{
path: '/requestresetpwd',
component: () => import('@/components/views/login/requestresetpwd.vue'),
meta: { name: 'Reset your Password' }
},
{
path: '/updatepwd',
component: () => import('@/components/views/login/updatepassword.vue'),
meta: { name: 'Update your Password' }
},
{
path: '/simpleform',
component: () => import('@/components/views/form/simpleForm/simpleForm.vue'),
meta: { name: 'SimpleForm' }
},
{
path: '/embeeded',
component: () => import('@/components/views/form/embeeded/embeeded.vue'),
meta: { name: 'Embeeded' }
},
]; ];
// Always leave this as last one // Always leave this as last one
if (process.env.MODE !== 'ssr') { if (process.env.MODE !== 'ssr') {
routes.push({ routes.push({
name: 'pages.errors.e404',
path: '*', path: '*',
component: () => import('pages/Error404.vue') component: () => import('@/pages/Error404.vue')
}) });
} }
export default routes export default routes;

9
src/shims-html.d.ts vendored
View File

@@ -1,9 +0,0 @@
declare module '*.html' {
import Vue, { ComponentOptions, FunctionalComponentOptions } from 'vue'
interface WithRender {
<V extends Vue, U extends ComponentOptions<V> | FunctionalComponentOptions>(options: U): U
<V extends typeof Vue>(component: V): V
}
const withRender: WithRender
export default withRender
}

36
src/store/index.ts
View File

@@ -1,41 +1,13 @@
import Vue from 'vue' import Vue from 'vue';
import Vuex from 'vuex' import Vuex from 'vuex';
//import glob from './modules/glob'; import { IUserState } from '@/types';
import {IUserState} from './types'
Vue.use(Vuex); Vue.use(Vuex);
export interface IRootState { export interface IRootState {
//app: IAppState;
user: IUserState; user: IUserState;
//tagsView: ITagsViewState;
role: IRootState; role: IRootState;
} }
//const debug = process.env.NODE_ENV !== 'production'; export default new Vuex.Store<IRootState>({});
export default new Vuex.Store<IRootState>({
});
/*
Vue.filter('time', timestamp => {
return new Date(timestamp).toLocaleTimeString()
});
*/
/*
export default new Vuex.Store({
state: {
version: '1.0.0',
},
modules: {
glob,
user,
},
//strict: debug,
//plugins: debug ? [createLogger()] : []
});
*/

300
src/store/modules/user.ts
View File

@@ -1,14 +1,14 @@
import Vue from 'vue' import Vue from 'vue';
import Vuex from 'vuex' import Vuex from 'vuex';
import {Module, VuexModule, Mutation, MutationAction, Action} from 'vuex-module-decorators' import { Module, VuexModule, Mutation, MutationAction, Action } from 'vuex-module-decorators';
var bcrypt = require('bcryptjs'); let bcrypt = require('bcryptjs');
import * as types from '@/store/mutation-types' import * as types from '@/store/mutation-types';
import {serv_constants} from "@/store/modules/serv_constants"; import { serv_constants } from '@/store/modules/serv_constants';
import {IUserState, ILinkReg, IResult, IIdToken} from '../types' import { IUserState, ILinkReg, IResult, IIdToken } from '@/types';
export const Errori_MongoDb = { export const Errori_MongoDb = {
CALLING: 10, CALLING: 10,
@@ -20,8 +20,7 @@ export const Errori_MongoDb = {
Vue.use(Vuex); Vue.use(Vuex);
@Module({ dynamic: true, name: 'user' })
@Module({dynamic: true, name: 'user'})
export default class User extends VuexModule { export default class User extends VuexModule {
// Non occorrono i getters, basta questi qui: // Non occorrono i getters, basta questi qui:
_id: IUserState['_id'] = ''; _id: IUserState['_id'] = '';
@@ -34,19 +33,20 @@ export default class User extends VuexModule {
idToken: IUserState['idToken'] = ''; idToken: IUserState['idToken'] = '';
userId: IUserState['userId'] = 0; userId: IUserState['userId'] = 0;
tokens: IUserState['tokens'] = []; tokens: IUserState['tokens'] = [];
verified_email: IUserState['verified_email'] = false; verifiedEmail: IUserState['verifiedEmail'] = false;
servercode = 0; servercode = 0;
getlang(): any { getlang (): any {
if (this.lang !== "") if (this.lang !== '') {
return this.lang; return this.lang;
else } else {
return process.env.LANG_DEFAULT; return process.env.LANG_DEFAULT;
} }
}
sendRequest(url: string, method: string, mydata: any) { sendRequest (url: string, method: string, mydata: any) {
console.log("LANG " + this.getlang()); console.log('LANG ' + this.getlang());
let mytok: string = this.getTok(); let mytok: string = this.getTok();
const authHeader = new Headers(); const authHeader = new Headers();
@@ -55,9 +55,9 @@ export default class User extends VuexModule {
authHeader.append('accept-language', this.getlang()); authHeader.append('accept-language', this.getlang());
const configInit: RequestInit = { const configInit: RequestInit = {
method: method, method: method,
cache: "no-cache", cache: 'no-cache',
body: JSON.stringify(mydata), body: JSON.stringify(mydata),
headers: authHeader, headers: authHeader
}; };
const request: Promise<Response> = fetch(url, configInit); const request: Promise<Response> = fetch(url, configInit);
@@ -65,87 +65,88 @@ export default class User extends VuexModule {
} }
getTok() { getTok () {
if (this.tokens) { if (this.tokens) {
if (typeof this.tokens[0] !== 'undefined') if (typeof this.tokens[0] !== 'undefined') {
return this.tokens[0].token; return this.tokens[0].token;
else } else {
return ''; return '';
}
} else { } else {
return ''; return '';
} }
} }
@MutationAction({ mutate: ['user'] })
@MutationAction({mutate: ['user']}) async setpassword (newstr: string) {
async setpassword(newstr: string) { return { password: newstr };
return {password: newstr}
} }
@MutationAction({mutate: [types.USER_EMAIL]}) @MutationAction({ mutate: [types.USER_EMAIL] })
async setemail(newstr: string) { async setemail (newstr: string) {
return {email: newstr} return { email: newstr };
} }
@MutationAction({mutate: [types.USER_LANG]}) @MutationAction({ mutate: [types.USER_LANG] })
async setlang(newstr: string) { async setlang (newstr: string) {
return {lang: newstr} return { lang: newstr };
} }
@Mutation @Mutation
authUser(data: IUserState) { authUser (data: IUserState) {
this.username = data.username; this.username = data.username;
this.userId = data.userId; this.userId = data.userId;
this.idToken = data.idToken; this.idToken = data.idToken;
this.verified_email = data.verified_email; this.verifiedEmail = data.verifiedEmail;
this.tokens = [ this.tokens = [
{access: "auth", token: data.idToken}, { access: 'auth', token: data.idToken }
]; ];
}; }
@Mutation @Mutation
UpdatePwd(data: IIdToken) { UpdatePwd (data: IIdToken) {
this.idToken = data.idToken; this.idToken = data.idToken;
if (!this.tokens) if (!this.tokens) {
this.tokens = []; this.tokens = [];
this.tokens.push({access: "auth", token: data.idToken}); }
}; this.tokens.push({ access: 'auth', token: data.idToken });
}
@Mutation @Mutation
setServerCode(servercode: number) { setServerCode (servercode: number) {
this.servercode = servercode; this.servercode = servercode;
}; }
@Mutation @Mutation
clearAuthData(): void { clearAuthData (): void {
this.username = ''; this.username = '';
this.tokens = []; this.tokens = [];
this.idToken = ''; this.idToken = '';
this.userId = 0; this.userId = 0;
this.verified_email = false; this.verifiedEmail = false;
} }
@Action({commit: types.USER_UPDATEPWD}) @Action({ commit: types.USER_UPDATEPWD })
resetpwd(paramquery: IUserState) { resetpwd (paramquery: IUserState) {
var call = process.env.MONGODB_HOST + '/updatepwd'; let call = process.env.MONGODB_HOST + '/updatepwd';
console.log("CALL " + call); console.log('CALL ' + call);
let usertosend = { let usertosend = {
keyappid: process.env.PAO_APP_ID, keyappid: process.env.PAO_APP_ID,
idapp: process.env.APP_ID, idapp: process.env.APP_ID,
email: paramquery.email, email: paramquery.email,
password: paramquery.password, password: paramquery.password,
tokenforgot: paramquery.tokenforgot, tokenforgot: paramquery.tokenforgot
}; };
console.log(usertosend); console.log(usertosend);
this.setServerCode(Errori_MongoDb.CALLING); this.setServerCode(Errori_MongoDb.CALLING);
var myres; let myres;
var x_auth_token: string = ""; let x_auth_token: string = '';
return this.sendRequest(call, "POST", usertosend) return this.sendRequest(call, 'POST', usertosend)
.then((res) => { .then((res) => {
console.log(res); console.log(res);
myres = res; myres = res;
@@ -154,40 +155,40 @@ export default class User extends VuexModule {
return myres.json(); return myres.json();
} }
this.setServerCode(Errori_MongoDb.ERR_GENERICO); this.setServerCode(Errori_MongoDb.ERR_GENERICO);
return {code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore: ' + myres.status, resetpwd: true}; return { code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore: ' + myres.status, resetpwd: true };
}) })
.then((body) => { .then((body) => {
this.UpdatePwd({idToken: x_auth_token}); this.UpdatePwd({ idToken: x_auth_token });
localStorage.setItem('token', x_auth_token); localStorage.setItem('token', x_auth_token);
return {code: body.code, msg: body.msg}; return { code: body.code, msg: body.msg };
}).catch((err) => { }).catch((err) => {
console.log("ERROR: " + err); console.log('ERROR: ' + err);
this.setServerCode(Errori_MongoDb.ERR_GENERICO); this.setServerCode(Errori_MongoDb.ERR_GENERICO);
return {code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore'}; return { code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore' };
}); });
} }
@Action({commit: types.USER_REQUESTRESETPWD}) @Action({ commit: types.USER_REQUESTRESETPWD })
requestpwd(paramquery: IUserState) { requestpwd (paramquery: IUserState) {
var call = process.env.MONGODB_HOST + '/requestnewpwd'; let call = process.env.MONGODB_HOST + '/requestnewpwd';
console.log("CALL " + call); console.log('CALL ' + call);
let usertosend = { let usertosend = {
keyappid: process.env.PAO_APP_ID, keyappid: process.env.PAO_APP_ID,
idapp: process.env.APP_ID, idapp: process.env.APP_ID,
email: paramquery.email, email: paramquery.email
}; };
console.log(usertosend); console.log(usertosend);
this.setServerCode(Errori_MongoDb.CALLING); this.setServerCode(Errori_MongoDb.CALLING);
var myres; let myres;
return this.sendRequest(call, "POST", usertosend) return this.sendRequest(call, 'POST', usertosend)
.then((res) => { .then((res) => {
console.log(res); console.log(res);
myres = res; myres = res;
@@ -195,36 +196,36 @@ export default class User extends VuexModule {
return myres.json(); return myres.json();
} }
this.setServerCode(Errori_MongoDb.ERR_GENERICO); this.setServerCode(Errori_MongoDb.ERR_GENERICO);
return {code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore: ' + myres.status, resetpwd: true}; return { code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore: ' + myres.status, resetpwd: true };
}) })
.then((body) => { .then((body) => {
return {code: body.code, msg: body.msg}; return { code: body.code, msg: body.msg };
}).catch((err) => { }).catch((err) => {
console.log("ERROR: " + err); console.log('ERROR: ' + err);
this.setServerCode(Errori_MongoDb.ERR_GENERICO); this.setServerCode(Errori_MongoDb.ERR_GENERICO);
return {code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore'}; return { code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore' };
}); });
} }
@Action({commit: types.USER_VREG}) @Action({ commit: types.USER_VREG })
vreg(paramquery: ILinkReg) { vreg (paramquery: ILinkReg) {
var call = process.env.MONGODB_HOST + '/vreg'; let call = process.env.MONGODB_HOST + '/vreg';
console.log("CALL " + call); console.log('CALL ' + call);
let usertosend = { let usertosend = {
keyappid: process.env.PAO_APP_ID, keyappid: process.env.PAO_APP_ID,
idapp: process.env.APP_ID, idapp: process.env.APP_ID,
idLink: paramquery.idLink, idLink: paramquery.idLink
}; };
console.log(usertosend); console.log(usertosend);
this.setServerCode(Errori_MongoDb.CALLING); this.setServerCode(Errori_MongoDb.CALLING);
var myres; let myres;
return this.sendRequest(call, "POST", usertosend) return this.sendRequest(call, 'POST', usertosend)
.then((res) => { .then((res) => {
console.log(res); console.log(res);
myres = res; myres = res;
@@ -232,110 +233,111 @@ export default class User extends VuexModule {
return myres.json(); return myres.json();
} }
this.setServerCode(Errori_MongoDb.ERR_GENERICO); this.setServerCode(Errori_MongoDb.ERR_GENERICO);
return {code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore: ' + myres.status}; return { code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore: ' + myres.status };
}) })
.then((body) => { .then((body) => {
//console.log("RITORNO 2 "); // console.log("RITORNO 2 ");
//this.setServerCode(myres); // this.setServerCode(myres);
if (body.code === serv_constants.RIS_CODE_EMAIL_VERIFIED) if (body.code === serv_constants.RIS_CODE_EMAIL_VERIFIED) {
localStorage.setItem('verificato', "1"); localStorage.setItem('verificato', '1');
return {code: body.code, msg: body.msg}; }
return { code: body.code, msg: body.msg };
}).catch((err) => { }).catch((err) => {
console.log("ERROR: " + err); console.log('ERROR: ' + err);
this.setServerCode(Errori_MongoDb.ERR_GENERICO); this.setServerCode(Errori_MongoDb.ERR_GENERICO);
return {code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore'}; return { code: Errori_MongoDb.ERR_GENERICO, msg: 'Errore' };
}); });
} }
@Action({commit: types.USER_VREG}) @Action({ commit: types.USER_VREG })
signup(authData: IUserState) { signup (authData: IUserState) {
var call = process.env.MONGODB_HOST + '/users'; let call = process.env.MONGODB_HOST + '/users';
console.log("CALL " + call); console.log('CALL ' + call);
//console.log("PASSW: " + authData.password); // console.log("PASSW: " + authData.password);
return bcrypt.hash(authData.password, bcrypt.genSaltSync(12)) return bcrypt.hash(authData.password, bcrypt.genSaltSync(12))
.then((hashedPassword:string) => { .then((hashedPassword: string) => {
let usertosend = { let usertosend = {
keyappid: process.env.PAO_APP_ID, keyappid: process.env.PAO_APP_ID,
lang: this.getlang(), lang: this.getlang(),
email: authData.email, email: authData.email,
password: String(hashedPassword), password: String(hashedPassword),
username: authData.username, username: authData.username,
idapp: process.env.APP_ID, idapp: process.env.APP_ID
}; };
console.log(usertosend); console.log(usertosend);
var myres: IResult; let myres: IResult;
this.setServerCode(Errori_MongoDb.CALLING); this.setServerCode(Errori_MongoDb.CALLING);
var x_auth_token: string = ''; let x_auth_token: string = '';
return this.sendRequest(call, "POST", usertosend) return this.sendRequest(call, 'POST', usertosend)
.then((res) => { .then((res) => {
myres = res; myres = res;
x_auth_token = String(res.headers.get('x-auth')); x_auth_token = String(res.headers.get('x-auth'));
if (x_auth_token) { if (x_auth_token) {
return res.json(); return res.json();
} else { } else {
return {status: 400, code: Errori_MongoDb.ERR_GENERICO} return { status: 400, code: Errori_MongoDb.ERR_GENERICO };
} }
}) })
.then((body) => { .then((body) => {
if (process.env.DEV) { if (process.env.DEV) {
console.log("RISULTATO "); console.log('RISULTATO ');
console.log("STATUS " + myres.status + " " + (myres.statusText)); console.log('STATUS ' + myres.status + ' ' + (myres.statusText));
console.log("BODY:"); console.log('BODY:');
console.log(body); console.log(body);
} }
this.setServerCode(myres.status); this.setServerCode(myres.status);
if (myres.status === 200) { if (myres.status === 200) {
var iduser = body._id; let iduser = body._id;
var username = authData.username; let username = authData.username;
if (process.env.DEV) { if (process.env.DEV) {
console.log("USERNAME = " + username); console.log('USERNAME = ' + username);
console.log("IDUSER= " + iduser); console.log('IDUSER= ' + iduser);
} }
this.authUser({ this.authUser({
username: username, username: username,
userId: iduser, userId: iduser,
idToken: x_auth_token, idToken: x_auth_token,
verified_email: false verifiedEmail: false
}); });
const now = new Date(); const now = new Date();
//const expirationDate = new Date(now.getTime() + myres.data.expiresIn * 1000); // const expirationDate = new Date(now.getTime() + myres.data.expiresIn * 1000);
const expirationDate = new Date(now.getTime() + 1000); const expirationDate = new Date(now.getTime() + 1000);
localStorage.setItem('username', username); localStorage.setItem('username', username);
localStorage.setItem('token', x_auth_token); localStorage.setItem('token', x_auth_token);
localStorage.setItem('userId', iduser); localStorage.setItem('userId', iduser);
localStorage.setItem('expirationDate', expirationDate.toString()); localStorage.setItem('expirationDate', expirationDate.toString());
localStorage.setItem('verificato', "0"); localStorage.setItem('verificato', '0');
//dispatch('storeUser', authData); // dispatch('storeUser', authData);
//dispatch('setLogoutTimer', myres.data.expiresIn); // dispatch('setLogoutTimer', myres.data.expiresIn);
return Errori_MongoDb.OK; return Errori_MongoDb.OK;
} else if (myres.status === 404) { } else if (myres.status === 404) {
if (process.env.DEV) { if (process.env.DEV) {
console.log("CODE = " + body.code); console.log('CODE = ' + body.code);
} }
return body.code; return body.code;
} else { } else {
if (process.env.DEV) { if (process.env.DEV) {
console.log("CODE = " + body.code); console.log('CODE = ' + body.code);
} }
return body.code; return body.code;
} }
}) })
.catch((error) => { .catch((error) => {
if (process.env.DEV) { if (process.env.DEV) {
console.log("ERROREEEEEEEEE"); console.log('ERROREEEEEEEEE');
console.log(error); console.log(error);
} }
this.setServerCode(Errori_MongoDb.ERR_GENERICO); this.setServerCode(Errori_MongoDb.ERR_GENERICO);
@@ -344,46 +346,46 @@ export default class User extends VuexModule {
}); });
} }
@Action({commit: types.USER_SIGNIN}) @Action({ commit: types.USER_SIGNIN })
signin(authData: IUserState) { signin (authData: IUserState) {
var call = process.env.MONGODB_HOST + '/users/login'; let call = process.env.MONGODB_HOST + '/users/login';
console.log("LOGIN " + call); console.log('LOGIN ' + call);
console.log("MYLANG = " + this.getlang()); console.log('MYLANG = ' + this.getlang());
const usertosend = { const usertosend = {
username: authData.username, username: authData.username,
password: authData.password, password: authData.password,
idapp: process.env.APP_ID, idapp: process.env.APP_ID,
keyappid: process.env.PAO_APP_ID, keyappid: process.env.PAO_APP_ID,
lang: this.getlang(), lang: this.getlang()
}; };
console.log(usertosend); console.log(usertosend);
var myres: IResult; let myres: IResult;
this.setServerCode(Errori_MongoDb.CALLING); this.setServerCode(Errori_MongoDb.CALLING);
var x_auth_token: string = ""; let x_auth_token: string = '';
return this.sendRequest(call, "POST", usertosend) return this.sendRequest(call, 'POST', usertosend)
.then((res) => { .then((res) => {
myres = res; myres = res;
x_auth_token = String(res.headers.get('x-auth')); x_auth_token = String(res.headers.get('x-auth'));
var injson = res.json(); let injson = res.json();
if (x_auth_token || injson) { if (x_auth_token || injson) {
return injson; return injson;
} else { } else {
return {status: 400, code: Errori_MongoDb.ERR_GENERICO} return { status: 400, code: Errori_MongoDb.ERR_GENERICO };
} }
}) })
.then((body) => { .then((body) => {
if (process.env.DEV) { if (process.env.DEV) {
console.log("RISULTATO "); console.log('RISULTATO ');
console.log("STATUS " + myres.status + " " + (myres.statusText)); console.log('STATUS ' + myres.status + ' ' + (myres.statusText));
console.log("BODY:"); console.log('BODY:');
console.log(body); console.log(body);
} }
@@ -395,48 +397,48 @@ export default class User extends VuexModule {
this.setServerCode(myres.status); this.setServerCode(myres.status);
if (myres.status === 200) { if (myres.status === 200) {
var iduser = body._id; let iduser = body._id;
var username = authData.username; let username = authData.username;
var verified_email = body.verified_email === "true" || body.verified_email === true; let verifiedEmail = body.verifiedEmail === 'true' || body.verifiedEmail === true;
if (process.env.DEV) { if (process.env.DEV) {
console.log("USERNAME = " + username); console.log('USERNAME = ' + username);
console.log("IDUSER= " + iduser); console.log('IDUSER= ' + iduser);
this.authUser({ this.authUser({
username: username, username: username,
userId: iduser, userId: iduser,
idToken: x_auth_token, idToken: x_auth_token,
verified_email: verified_email verifiedEmail: verifiedEmail
}); });
} }
const now = new Date(); const now = new Date();
//const expirationDate = new Date(now.getTime() + myres.data.expiresIn * 1000); // const expirationDate = new Date(now.getTime() + myres.data.expiresIn * 1000);
const expirationDate = new Date(now.getTime() + 1000); const expirationDate = new Date(now.getTime() + 1000);
localStorage.setItem('username', username); localStorage.setItem('username', username);
localStorage.setItem('token', x_auth_token); localStorage.setItem('token', x_auth_token);
localStorage.setItem('userId', iduser); localStorage.setItem('userId', iduser);
localStorage.setItem('expirationDate', expirationDate.toString()); localStorage.setItem('expirationDate', expirationDate.toString());
localStorage.setItem('isLoggedin', String(true)); localStorage.setItem('isLoggedin', String(true));
localStorage.setItem('verificato', String(verified_email)); localStorage.setItem('verificato', String(verifiedEmail));
//dispatch('storeUser', authData); // dispatch('storeUser', authData);
//dispatch('setLogoutTimer', myres.data.expiresIn); // dispatch('setLogoutTimer', myres.data.expiresIn);
return Errori_MongoDb.OK; return Errori_MongoDb.OK;
} else if (myres.status === 404) { } else if (myres.status === 404) {
if (process.env.DEV) { if (process.env.DEV) {
console.log("CODE = " + body.code); console.log('CODE = ' + body.code);
} }
return body.code; return body.code;
} else { } else {
if (process.env.DEV) { if (process.env.DEV) {
console.log("CODE = " + body.code); console.log('CODE = ' + body.code);
} }
return body.code; return body.code;
} }
}) })
.catch((error) => { .catch((error) => {
if (process.env.DEV) { if (process.env.DEV) {
console.log("ERROREEEEEEEEE"); console.log('ERROREEEEEEEEE');
console.log(error); console.log(error);
} }
this.setServerCode(Errori_MongoDb.ERR_GENERICO); this.setServerCode(Errori_MongoDb.ERR_GENERICO);
@@ -444,48 +446,48 @@ export default class User extends VuexModule {
}); });
} }
@Action({commit: types.USER_AUTOLOGIN}) @Action({ commit: types.USER_AUTOLOGIN })
autologin() { autologin () {
const token = localStorage.getItem('token'); const token = localStorage.getItem('token');
if (!token) { if (!token) {
return return;
} }
const expirationDateStr = localStorage.getItem('expirationDate'); const expirationDateStr = localStorage.getItem('expirationDate');
let expirationDate = new Date(String(expirationDateStr)); let expirationDate = new Date(String(expirationDateStr));
const now = new Date(); const now = new Date();
if (now >= expirationDate) { if (now >= expirationDate) {
return return;
} }
const userId = Number(localStorage.getItem('userId')); const userId = Number(localStorage.getItem('userId'));
const username = String(localStorage.getItem('username')); const username = String(localStorage.getItem('username'));
const verified_email = localStorage.getItem('verificato') === "1"; const verifiedEmail = localStorage.getItem('verificato') === '1';
this.authUser({ this.authUser({
username: username, username: username,
userId: userId, userId: userId,
idToken: token, idToken: token,
verified_email: verified_email verifiedEmail: verifiedEmail
}); });
} }
@Action({commit: types.USER_LOGOUT}) @Action({ commit: types.USER_LOGOUT })
logout() { logout () {
var call = process.env.MONGODB_HOST + '/users/me/token'; let call = process.env.MONGODB_HOST + '/users/me/token';
console.log("CALL " + call); console.log('CALL ' + call);
let usertosend = { let usertosend = {
keyappid: process.env.PAO_APP_ID, keyappid: process.env.PAO_APP_ID,
idapp: process.env.APP_ID, idapp: process.env.APP_ID
}; };
console.log(usertosend); console.log(usertosend);
this.sendRequest(call, "DELETE", usertosend) this.sendRequest(call, 'DELETE', usertosend)
.then( .then(
(res) => { (res) => {
console.log(res); console.log(res);
} }
).catch((err) => { ).catch((err) => {
console.log("ERROR: " + err); console.log('ERROR: ' + err);
}).then(() => { }).then(() => {
this.clearAuthData(); this.clearAuthData();
}); });
@@ -495,9 +497,9 @@ export default class User extends VuexModule {
localStorage.removeItem('userId'); localStorage.removeItem('userId');
localStorage.removeItem('username'); localStorage.removeItem('username');
localStorage.removeItem('isLoggedin'); localStorage.removeItem('isLoggedin');
localStorage.removeItem('verified_email'); localStorage.removeItem('verifiedEmail');
//router.replace('/signin') // router.replace('/signin')
} }
} }

3
src/store/mutation-types.ts
View File

@@ -1,4 +1,3 @@
export const SET_VALUE = 'SET_VALUE'; export const SET_VALUE = 'SET_VALUE';
export const SET_DEFFERED_PROMPT = 'defprompt'; export const SET_DEFFERED_PROMPT = 'defprompt';
export const SET_LOGIN_PAGE = 'setloginpage'; export const SET_LOGIN_PAGE = 'setloginpage';
@@ -23,5 +22,3 @@ export const USER_LOGOUT = 'logout';
export const USER_VREG = 'vreg'; export const USER_VREG = 'vreg';
export const USER_REQUESTRESETPWD = 'requestpwd'; export const USER_REQUESTRESETPWD = 'requestpwd';
export const USER_UPDATEPWD = 'resetpwd'; export const USER_UPDATEPWD = 'resetpwd';

37
src/store/types.ts
View File

@@ -1,37 +0,0 @@
export interface IToken {
access: string;
token: string;
}
export interface IUserState {
_id? : string;
email? : string;
username : string;
idapp? : any;
password? : string;
lang? : string;
ripetipassword?: string;
idToken : string;
userId : number;
tokens? : IToken[];
verified_email: boolean;
tokenforgot? : string;
}
export interface ILinkReg {
idLink : string;
}
export interface IIdToken {
idToken : string;
}
export interface IResult {
status : number;
statusText : string;
}

16
src/vue.d.ts vendored
View File

@@ -1,16 +0,0 @@
declare module "*.vue" {
import Vue from "vue"
export default Vue
}
/* Now when you're importing components from a page, for example:
<script lang="ts">
import Vue from 'vue'
import TestComponent from '../components/test-component.vue'
export default Vue.extend({
components: {
'test-component': TestComponent
}
})
</script>
*/

2
tsconfig.json
View File

@@ -7,8 +7,6 @@
"sourceMap": true, "sourceMap": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"noImplicitAny": true, "noImplicitAny": true,
"emitHelpers": true,
"importHelpers": true,
"moduleResolution": "node", "moduleResolution": "node",
"lib": [ "lib": [
"es2015", "es2015",

13
tslint.json Normal file
View File

@@ -0,0 +1,13 @@
{
"defaultSeverity": "warning",
"extends": [
"tslint-config-standard"
],
"rules": {
"semicolon": [
true,
"always",
"ignore-bound-class-methods"
]
}
}

9698
yarn.lock Normal file
View File

File diff suppressed because it is too large Load Diff