From 3555d07fd65f6690bd4c027d671b3d90b2ca4e78 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 18 Dec 2024 14:36:51 +0100 Subject: [PATCH] lint, fix problems with vee-validate --- backend/.env.org | 78 ++++++++++++++++++++ backend/src/graphql/resolver/UserResolver.ts | 2 - frontend/package.json | 6 +- frontend/vite.config.js | 12 +++ frontend/yarn.lock | 15 +++- 5 files changed, 104 insertions(+), 9 deletions(-) create mode 100644 backend/.env.org diff --git a/backend/.env.org b/backend/.env.org new file mode 100644 index 000000000..bbd7b5c05 --- /dev/null +++ b/backend/.env.org @@ -0,0 +1,78 @@ +# Server +PORT=4000 +JWT_SECRET=secret123 +JWT_EXPIRES_IN=10m +GRAPHIQL=false +GDT_API_URL=https://gdt.gradido.net + +# Database +DB_HOST=localhost +DB_PORT=3306 +DB_USER=root +DB_PASSWORD= +DB_DATABASE=gradido_community +TYPEORM_LOGGING_RELATIVE_PATH=typeorm.backend.log + +# Klicktipp +KLICKTIPP=false +KLICKTTIPP_API_URL=https://api.klicktipp.com +KLICKTIPP_USER=gradido_test +KLICKTIPP_PASSWORD=secret321 +KLICKTIPP_APIKEY_DE=SomeFakeKeyDE +KLICKTIPP_APIKEY_EN=SomeFakeKeyEN + +# DltConnector +DLT_CONNECTOR=true +DLT_CONNECTOR_URL=http://localhost:6010 + +# Community +COMMUNITY_NAME=Gradido Entwicklung +COMMUNITY_URL=http://localhost +COMMUNITY_REGISTER_PATH=/register +COMMUNITY_REDEEM_PATH=/redeem/{code} +COMMUNITY_REDEEM_CONTRIBUTION_PATH=/redeem/CL-{code} +COMMUNITY_DESCRIPTION=Die lokale Entwicklungsumgebung von Gradido. +COMMUNITY_SUPPORT_MAIL=support@supportmail.com + +# Login Server +LOGIN_APP_SECRET=21ffbbc616fe +LOGIN_SERVER_KEY=a51ef8ac7ef1abf162fb7a65261acd7a + +# EMail +EMAIL=false +EMAIL_TEST_MODUS=false +EMAIL_TEST_RECEIVER=stage1@gradido.net +EMAIL_USERNAME=gradido_email +EMAIL_SENDER=info@gradido.net +EMAIL_PASSWORD=xxx +EMAIL_SMTP_URL=gmail.com +EMAIL_SMTP_PORT=587 +EMAIL_LINK_VERIFICATION_PATH=/checkEmail/{optin}{code} +EMAIL_LINK_SETPASSWORD_PATH=/reset-password/{optin} +EMAIL_LINK_FORGOTPASSWORD_PATH=/forgot-password +EMAIL_LINK_OVERVIEW_PATH=/overview +EMAIL_CODE_VALID_TIME=1440 +EMAIL_CODE_REQUEST_TIME=10 + +# Webhook +WEBHOOK_ELOPAGE_SECRET=secret + +# SET LOG LEVEL AS NEEDED IN YOUR .ENV +# POSSIBLE VALUES: all | trace | debug | info | warn | error | fatal +LOG_LEVEL=INFO + +# Federation +FEDERATION_VALIDATE_COMMUNITY_TIMER=60000 +FEDERATION_XCOM_SENDCOINS_ENABLED=false + +# GMS +# GMS_ACTIVE=true +# Coordinates of Illuminz test instance +#GMS_API_URL=http://54.176.169.179:3071 +GMS_API_URL=http://localhost:4044 +GMS_DASHBOARD_URL=http://localhost:8080 + +# HUMHUB +HUMHUB_ACTIVE=true +HUMHUB_API_URL=https://community-test.gradido.net +HUMHUB_JWT_KEY=GwdkIKi-rkRS0mXC4Cg3MYc3ktZh89VFmntDpNKET_dUfcIdjL_957F3nCv3brNtDfbbV81NViKaktUsfExrkH diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 267cf626c..cfdd6dd2e 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -31,8 +31,6 @@ import { User } from '@model/User' import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' import { UserLocationResult } from '@model/UserLocationResult' -import { updateGmsUser } from '@/apis/gms/GmsClient' -import { GmsUser } from '@/apis/gms/model/GmsUser' import { HumHubClient } from '@/apis/humhub/HumHubClient' import { GetUser } from '@/apis/humhub/model/GetUser' import { subscribe } from '@/apis/KlicktippController' diff --git a/frontend/package.json b/frontend/package.json index 29b4500a5..ac205e77a 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -23,9 +23,9 @@ "@babel/preset-env": "^7.13.12", "@morev/vue-transitions": "^3.0.2", "@types/leaflet": "^1.9.12", - "@vee-validate/i18n": "^4.13.2", - "@vee-validate/rules": "^4.13.2", - "@vee-validate/yup": "^4.13.2", + "@vee-validate/i18n": "^4.14.7", + "@vee-validate/rules": "^4.14.1", + "@vee-validate/yup": "^4.14.1", "@vitejs/plugin-vue": "5.1.4", "@vue-leaflet/vue-leaflet": "^0.10.1", "@vue/apollo-composable": "^4.0.2", diff --git a/frontend/vite.config.js b/frontend/vite.config.js index e5d8759eb..72d1c1433 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -25,6 +25,18 @@ export default defineConfig({ alias: { '@': path.resolve(__dirname, './src'), assets: path.join(__dirname, 'src/assets'), + '@vee-validate/i18n/dist/locale/en.json': + '/node_modules/@vee-validate/i18n/dist/locale/en.json', + '@vee-validate/i18n/dist/locale/de.json': + '/node_modules/@vee-validate/i18n/dist/locale/de.json', + '@vee-validate/i18n/dist/locale/es.json': + '/node_modules/@vee-validate/i18n/dist/locale/es.json', + '@vee-validate/i18n/dist/locale/fr.json': + '/node_modules/@vee-validate/i18n/dist/locale/fr.json', + '@vee-validate/i18n/dist/locale/nl.json': + '/node_modules/@vee-validate/i18n/dist/locale/nl.json', + '@vee-validate/i18n/dist/locale/tr.json': + '/node_modules/@vee-validate/i18n/dist/locale/tr.json', }, extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'], }, diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 244eb7f2a..b462d9e2f 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1316,6 +1316,13 @@ resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31" integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA== +"@rollup/plugin-json@^6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-6.1.0.tgz#fbe784e29682e9bb6dee28ea75a1a83702e7b805" + integrity sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA== + dependencies: + "@rollup/pluginutils" "^5.1.0" + "@rollup/pluginutils@^4.2.0": version "4.2.1" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" @@ -1324,7 +1331,7 @@ estree-walker "^2.0.1" picomatch "^2.2.2" -"@rollup/pluginutils@^5.1.3": +"@rollup/pluginutils@^5.1.0", "@rollup/pluginutils@^5.1.3": version "5.1.4" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.4.tgz#bb94f1f9eaaac944da237767cdfee6c5b2262d4a" integrity sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ== @@ -1527,19 +1534,19 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.1.tgz#28fa185f67daaf7b7a1a8c1d445132c5d979f8bd" integrity sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA== -"@vee-validate/i18n@^4.13.2": +"@vee-validate/i18n@^4.14.7": version "4.14.7" resolved "https://registry.yarnpkg.com/@vee-validate/i18n/-/i18n-4.14.7.tgz#846301d67edcbbdf4b9c2944962033e20d405919" integrity sha512-CTGNXC0d6tMSi6pEbf+jW1ZsLhvtNClgKDna8QmHD9G/8U8W9MlyQfgcQMqmpUz0kUHyGHNZ3B13jzILUeVcXw== -"@vee-validate/rules@^4.13.2": +"@vee-validate/rules@^4.14.1": version "4.14.7" resolved "https://registry.yarnpkg.com/@vee-validate/rules/-/rules-4.14.7.tgz#99c9c11e0964b167b0f52175acb94f903aa64b13" integrity sha512-DK2Frj6s8eQZgjeSRYHOIX3heFX1aic8taKY6q4RPY/5JtEkLDCxyWP3EBt1bteoiSDGDADrmahwqkcfJShhoA== dependencies: vee-validate "4.14.7" -"@vee-validate/yup@^4.13.2": +"@vee-validate/yup@^4.14.1": version "4.14.7" resolved "https://registry.yarnpkg.com/@vee-validate/yup/-/yup-4.14.7.tgz#a029151394ae4fbc7a038dbb49acc86f2ba78ddc" integrity sha512-sMLkSXbVWIFK0BE8gEp2Gcdd3aqpTggBjbkrYmcdgyHBeYoPmhBHhUpkXDFhmsckie2xv6lNTicGO5oJt71N1Q==