From c1e46d7cdd63de1bfb9698a777667743f858b47a Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 24 Mar 2021 20:19:16 +0100 Subject: [PATCH 01/10] add additional docker container which is running skeema on startup to update dbs if they have changed, cleanup mariadb/Dockerfile --- docker-compose.override.yml | 14 ++++++++ mariadb/Dockerfile | 66 ------------------------------------- skeema/.skeema | 5 +++ skeema/Dockerfile | 28 ++++++++++++++++ 4 files changed, 47 insertions(+), 66 deletions(-) create mode 100644 skeema/.skeema create mode 100644 skeema/Dockerfile diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 97cdb3155..0235f5053 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -57,6 +57,20 @@ services: - external-net volumes: - /sessions + + ######################################################### + ## skeema for updating dbs if changes happend ########### + ######################################################### + skeema: + build: + context: . + dockerfile: ./skeema/Dockerfile + target: skeema_run + container_name: skeema + depends_on: + - mariadb + networks: + - internal-net volumes: frontend_node_modules: diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index ef2f35a46..526ebf250 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -1,29 +1,12 @@ -######################################################################################################### -# Build skeema -######################################################################################################### -FROM golang:1.14.4 as skeema_build -RUN go get -d -v github.com/skeema/skeema -WORKDIR /go/src/github.com/skeema/skeema -RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/bin/skeema . - ######################################################################################################### # mariadb server ######################################################################################################### From mariadb/server:10.5 as mariadb_server ENV DOCKER_WORKDIR="/docker-entrypoint-initdb.d" -#ENV DOCKER_WORKDIR="/skeema" - -# copy skeema -#COPY --from=skeema_build /go/bin/skeema /usr/bin/ RUN mkdir -p ${DOCKER_WORKDIR} WORKDIR ${DOCKER_WORKDIR} -#COPY ./mariadb/.skeema . -#COPY ./login_server/skeema/ . -#COPY ./mariadb/.skeema.login ./gradido_login/.skeema -#COPY ./community_server/skeema/ . -#RUN for f in *.c; do cp -- "$f" "$OTHERDIR/old#$f"; done # create databases COPY ./mariadb/setup_dbs.sql a_setup_dbs.sql @@ -35,52 +18,3 @@ COPY ./community_server/skeema/ . RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../d_$f"; sed -i '1i use gradido_community;' "../d_$f"; done RUN cd ./gradido_community/insert && for f in *.sql; do cp -- "$f" "../../e_$f"; sed -i '1i use gradido_community;' "../../e_$f"; done -RUN ls -ls - - -#USER mysql -#VOLUME /var/lib/mysql -#RUN mysqld -#RUN mysql -e 'CREATE DATABASE gradido_login_server;' -#RUN mysql -e 'CREATE DATABASE gradido_community_server;' - - -#RUN skeema push - -######################################################################################################### -# mariadb server selfmade -######################################################################################################### -From alpine:latest as mariadb_DIV - -ENV DOCKER_WORKDIR="/skeema" - -#VOLUME /var/lib/mysql - -#RUN apt-get update \ -# && apt-get -y --no-install-recommends install mariadb-server mariadb-client \ -# && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* -RUN apk add mariadb mariadb-client - -# copy skeema -COPY --from=skeema_build /go/bin/skeema /usr/bin/ - -RUN mkdir -p ${DOCKER_WORKDIR} -WORKDIR ${DOCKER_WORKDIR} - -COPY ./mariadb/setup_dbs.sh . -COPY ./mariadb/.skeema . -COPY ./login_server/skeema/ . -COPY ./mariadb/.skeema.login ./gradido_login/.skeema -COPY ./community_server/skeema/ . -COPY ./mariadb/.skeema.community ./gradido_community/.skeema - -USER mysql -#VOLUME /var/lib/mysql -#RUN mysqld -#RUN chmod +x ./setup_dbs.sh -#RUN mysql < setup_dbs.sql -#RUN skeema push - -#EXPOSE 3306 - -#CMD ["mysld"] \ No newline at end of file diff --git a/skeema/.skeema b/skeema/.skeema new file mode 100644 index 000000000..dc87968d6 --- /dev/null +++ b/skeema/.skeema @@ -0,0 +1,5 @@ +[production] +flavor=mariadb:10.5 +host=mariadb +port=3306 +user=root \ No newline at end of file diff --git a/skeema/Dockerfile b/skeema/Dockerfile new file mode 100644 index 000000000..8c921ba23 --- /dev/null +++ b/skeema/Dockerfile @@ -0,0 +1,28 @@ +######################################################################################################### +# Build skeema +######################################################################################################### +FROM golang:1.14.4 as skeema_build +RUN go get -d -v github.com/skeema/skeema +WORKDIR /go/src/github.com/skeema/skeema +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/bin/skeema . + +######################################################################################################### +# Run skeema +######################################################################################################### +From alpine:latest as skeema_run + +ENV DOCKER_WORKDIR="/skeema" + +# copy skeema +COPY --from=skeema_build /go/bin/skeema /usr/bin/ + +RUN mkdir -p ${DOCKER_WORKDIR} +WORKDIR ${DOCKER_WORKDIR} + +COPY ./skeema/.skeema . +COPY ./login_server/skeema/ . +COPY ./mariadb/.skeema.login ./gradido_login/.skeema +COPY ./community_server/skeema/ . +COPY ./mariadb/.skeema.community ./gradido_community/.skeema + +CMD skeema push \ No newline at end of file From 053193dea24458c506b8d6cde4c836e9484c083d Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 25 Mar 2021 09:48:05 +0100 Subject: [PATCH 02/10] send-gdd-sendmessage-step-one --- frontend/src/store/store.js | 18 ++++-- frontend/src/views/KontoOverview/GddSend.vue | 67 ++++++++++++++++++-- 2 files changed, 73 insertions(+), 12 deletions(-) diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 486b8a617..eadb6b1ed 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -22,7 +22,7 @@ export const store = new Vuex.Store({ session_id : '', email: "", amount: 0, - target_date:"2021-02-19T13:25:36+00:00", + target_date:"", memo:"", auto_sign: true }, @@ -137,24 +137,28 @@ export const store = new Vuex.Store({ }, ajaxCreate: async ({ dispatch, state }) => { //console.log('action: ajaxCreate') - state.ajaxCreateData.amount = (state.ajaxCreateData.amount)*10000 - const result = await communityAPI.create($cookies.get("gdd_session_id", email, amount, memo)) - console.log(result) + + state.ajaxCreateData.amount = (state.ajaxCreateData.amount)*10000 + + const result = await communityAPI.create(state.session_id, state.ajaxCreateData.email, state.ajaxCreateData.amount, state.ajaxCreateData.memo) + + return result + //console.log(result) }, ajaxListTransactions: async ({commit, dispatch, state}) => { // console.log('action: ajaxListTransactions', state.session_id) // const result = await communityAPI.transactions(state.session_id) }, accountBalance: async ({ commit, dispatch, state }) => { - console.log('action: accountBalance') + //console.log('action: accountBalance') // console.log('action: dispatch', dispatch) // console.log('action: state.session_id', state.session_id) // console.log(" action: $cookies.get('gdd_session_id') ", $cookies.get("gdd_session_id") ) // commit('session_id', $cookies.get("gdd_session_id")) // commit('email', $cookies.get("gdd_u")) const result = await communityAPI.balance($cookies.get("gdd_session_id")) - console.log("accountBalance result", result) - console.log("aresult.result.data.balance", result.result.data.balance) + //console.log("accountBalance result", result) + //console.log("aresult.result.data.balance", result.result.data.balance) if(result.success) { commit('user_balance', result.result.data.balance) } else { diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index b6bd00e19..18f7f0bbe 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -1,7 +1,7 @@ @@ -151,12 +191,15 @@ export default { amount: '', memo:'' }, - sent: false, + send: false, + row_form: true, + row_check: false, + row_thx: false, } }, methods: { sendbutton(){ - this.sent = true + this.send = true }, async onDecode (decodedString) { console.log('onDecode JSON.parse(decodedString)',JSON.parse(decodedString) ) @@ -191,7 +234,18 @@ export default { this.$store.state.ajaxCreateData.memo = this.form.memo this.$store.state.ajaxCreateData.target_date = Date.now() - this.$store.dispatch('ajaxCreate') + this.row_form = false + this.row_check = true + this.row_thx = false + + + console.log(ref) + }, + sendTransaction() { + this.$store.dispatch('ajaxCreate') + this.row_form = false + this.row_check = false + this.row_thx = true }, onReset(event) { event.preventDefault() @@ -201,6 +255,9 @@ export default { this.$nextTick(() => { this.show = true }) + this.row_form = true + this.row_check = false + this.row_thx = false } }, computed: { From 39ba3a2386d563cad4a6eaf10ad80e9d2e18c313 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 25 Mar 2021 10:57:19 +0100 Subject: [PATCH 03/10] fix-lint, remove href --- frontend/src/views/KontoOverview/GddSend.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index a373452a7..732fef4ac 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -157,7 +157,7 @@
Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!
- Meine Zahlung + Meine Zahlung {{ $store.state.ajaxCreateData.email }} Empfänger From 584526c1992024518988b6afbb440b6621909ceb Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 25 Mar 2021 11:20:17 +0100 Subject: [PATCH 04/10] send form variable in store --- frontend/src/store/store.js | 3 + frontend/src/views/KontoOverview/GddSend.vue | 65 ++++++++++--------- .../src/views/KontoOverview/GddStatus.vue | 2 +- frontend/src/views/KontoOverview/GddTable.vue | 2 +- 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index d8a474d40..01cc6ff10 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -13,6 +13,9 @@ export const store = new Vuex.Store({ sizeDE: 'normal', sizeGB: 'big', loginfail: false, + row_form: true, + row_check: false, + row_thx: false, user: { name: '', balance: 0, diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index 732fef4ac..eb265aaaa 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -1,6 +1,6 @@