diff --git a/docu/neue-struktur.drawio b/docu/neue-struktur.drawio
new file mode 100644
index 000000000..98d84b645
--- /dev/null
+++ b/docu/neue-struktur.drawio
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docu/neue-struktur.png b/docu/neue-struktur.png
new file mode 100644
index 000000000..43036a4a9
Binary files /dev/null and b/docu/neue-struktur.png differ
diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index 77856862a..a1da31707 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -1,14 +1,6 @@
import axios from 'axios';
import CONFIG from '../config'
-// axios.defaults.withCredentials = true ist eine Anweisung an Axios, alle Anfragen mit Anmeldeinformationen zu senden,
-// wie z. Autorisierungsheader, TLS-Client-Zertifikate oder Cookies (wie in unserem Fall).
-axios.defaults.withCredentials = true
-
-//Wir setzen unsere axios.defaults.baseURL für unsere Axios-Anfrage auf unsere.
-// Auf APIdiese Weise wird diese Basis-URL verwendet, wenn wir über Axios senden. Damit können wir nur unsere Endpunkte wie /registerund /loginzu unseren Aktionen hinzufügen, ohne jedes Mal die vollständige URL anzugeben.
-axios.defaults.baseURL = CONFIG.COMMUNITY_API_STATE_BALANCE_URL
-
const apiGet = async (url) => {
try {
const result = await axios.get(url);
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index d8930ac26..35731a213 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -5,7 +5,7 @@ import router from '../routes/router.js'
import loginAPI from '../apis/loginAPI'
import communityAPI from '../apis/communityAPI'
import axios from 'axios'
-// import CONFIG from '../config'
+import CONFIG from '../config'
export const store = new Vuex.Store({
@@ -69,20 +69,32 @@ export const store = new Vuex.Store({
login: async ({ dispatch, commit }, data) => {
console.log('action: login')
console.log('action: data', data.email)
+ //console.log('action: CONFIG.LOGIN_API_URL', CONFIG.LOGIN_API_URL)
+
+ axios.post("http://localhost/login_api/unsecureLogin/",
+ {"email": data.email, "password":data.password }).then((result) => {
+ console.log("store login result", result)
+
+ // const result = await loginAPI.login(data.email,data.password)
+ console.log('result.data.state',result.data.state)
+ console.log('result.data.session_id',result.data.session_id)
+
+
+ if( result.data.state ){
+ commit('session_id', result.data.session_id)
+ commit('email', data.email)
+ $cookies.set('gdd_session_id', result.data.session_id);
+ $cookies.set('gdd_u', data.email);
+ router.push('/overview')
+ } else {
+ // Register failed, we perform a logout
+ dispatch('logout')
+ }
+ }, (error) => {
+ console.log(error);
+ });
+
- const result = await loginAPI.login(data.email,data.password)
- console.log('result',result)
- console.log('result.success',result.success)
- // if( result.success ){
- // commit('session_id', result.result.data.session_id)
- // commit('email', data.email)
- // $cookies.set('gdd_session_id', result.result.data.session_id);
- // $cookies.set('gdd_u', data.email);
- // router.push('/overview')
- // } else {
- // // Register failed, we perform a logout
- // dispatch('logout')
- // }
},
passwordReset: async (data) => {
console.log("<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>", data.email)
diff --git a/frontend/src/views/AdminOverview.vue b/frontend/src/views/AdminOverview.vue
index 5d4040d24..6ed76740e 100644
--- a/frontend/src/views/AdminOverview.vue
+++ b/frontend/src/views/AdminOverview.vue
@@ -226,9 +226,7 @@
import AdminUserCreation from './AdminOverview/AdminUserCreation';
import axios from 'axios';
- // axios.defaults.withCredentials = true. Dies ist erforderlich, da Axios standardmäßig keine Cookies weitergibt.
- axios.defaults.withCredentials = true
-
+
export default {
components: {
LineChart,
diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/KontoOverview/GddTable.vue
index f3a90cfca..2163574ab 100644
--- a/frontend/src/views/KontoOverview/GddTable.vue
+++ b/frontend/src/views/KontoOverview/GddTable.vue
@@ -40,10 +40,7 @@