mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 09:56:05 +00:00
lint fix
This commit is contained in:
ogerly
commit
10b86924f7
18
.github/workflows/push.yml
vendored
18
.github/workflows/push.yml
vendored
@ -1,18 +0,0 @@
|
||||
name: on-push
|
||||
on: push
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Build the stack
|
||||
run: |
|
||||
git submodule update --init --recursive
|
||||
docker-compose up -d
|
||||
- name: Test
|
||||
env:
|
||||
GN_INSTANCE_FOLDER: /tmp/gradio-node-instance
|
||||
GN_CONTAINER_NAME: gradido-node-build
|
||||
run: docker run gradido-node-test
|
||||
timeout-minutes: 2
|
||||
|
||||
116
.github/workflows/test.yml
vendored
116
.github/workflows/test.yml
vendored
@ -4,34 +4,13 @@ name: gradido test CI
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
##############################################################################
|
||||
# JOB: PREPARE #####################################################
|
||||
##############################################################################
|
||||
#prepare:
|
||||
# name: Prepare
|
||||
# runs-on: ubuntu-latest
|
||||
# # needs: [nothing]
|
||||
# steps:
|
||||
# ##########################################################################
|
||||
# # CHECKOUT CODE ##########################################################
|
||||
# ##########################################################################
|
||||
# - name: Checkout code
|
||||
# uses: actions/checkout@v2
|
||||
# ##########################################################################
|
||||
# # TODO: DO STUFF ??? #####################################################
|
||||
# ##########################################################################
|
||||
# - name: Check translation files
|
||||
# run: |
|
||||
# scripts/translations/sort.sh
|
||||
# scripts/translations/missing-keys.sh
|
||||
|
||||
##############################################################################
|
||||
# JOB: DOCKER BUILD TEST FRONTEND ############################################
|
||||
##############################################################################
|
||||
build_test_frontend:
|
||||
name: Docker Build Test - Frontend
|
||||
runs-on: ubuntu-latest
|
||||
#needs: [nothing] # [prepare]
|
||||
#needs: [nothing]
|
||||
steps:
|
||||
##########################################################################
|
||||
# CHECKOUT CODE ##########################################################
|
||||
@ -39,7 +18,7 @@ jobs:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
##########################################################################
|
||||
# NEO4J ##################################################################
|
||||
# FRONTEND ###############################################################
|
||||
##########################################################################
|
||||
- name: Frontend | Build `test` image
|
||||
run: |
|
||||
@ -78,30 +57,58 @@ jobs:
|
||||
# path: /tmp/backend.tar
|
||||
|
||||
##############################################################################
|
||||
# JOB: DOCKER BUILD TEST WEBAPP ##############################################
|
||||
# JOB: DOCKER BUILD TEST LOGIN SERVER ########################################
|
||||
##############################################################################
|
||||
#build_test_webapp:
|
||||
# name: Docker Build Test - WebApp
|
||||
# runs-on: ubuntu-latest
|
||||
# needs: [prepare]
|
||||
# steps:
|
||||
# ##########################################################################
|
||||
# # CHECKOUT CODE ##########################################################
|
||||
# ##########################################################################
|
||||
# - name: Checkout code
|
||||
# uses: actions/checkout@v2
|
||||
# ##########################################################################
|
||||
# # BUILD WEBAPP DOCKER IMAGE (build) ######################################
|
||||
# ##########################################################################
|
||||
# - name: webapp | Build `test` image
|
||||
# run: |
|
||||
# docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
|
||||
# docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
|
||||
# - name: Upload Artifact
|
||||
# uses: actions/upload-artifact@v2
|
||||
# with:
|
||||
# name: docker-webapp-test
|
||||
# path: /tmp/webapp.tar
|
||||
build_test_login_server:
|
||||
name: Docker Build Test - Login Server
|
||||
runs-on: ubuntu-latest
|
||||
#needs: [nothing]
|
||||
steps:
|
||||
##########################################################################
|
||||
# CHECKOUT CODE ##########################################################
|
||||
##########################################################################
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: recursive
|
||||
##########################################################################
|
||||
# BUILD LOGIN SERVER DOCKER IMAGE (build) ################################
|
||||
##########################################################################
|
||||
- name: login server | Build `test` image
|
||||
run: |
|
||||
docker build --target login_server_debug -t "gradido/loginserver:test" -f ./login_server/Dockerfile.debug login_server/
|
||||
docker save "gradido/loginserver:test" > /tmp/loginserver.tar
|
||||
- name: Upload Artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: docker-loginserver-test
|
||||
path: /tmp/loginserver.tar
|
||||
|
||||
##############################################################################
|
||||
# JOB: DOCKER BUILD TEST COMMUNITY SERVER ####################################
|
||||
##############################################################################
|
||||
build_test_community_server:
|
||||
name: Docker Build Test - Community Server
|
||||
runs-on: ubuntu-latest
|
||||
#needs: [nothing]
|
||||
steps:
|
||||
##########################################################################
|
||||
# CHECKOUT CODE ##########################################################
|
||||
##########################################################################
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
##########################################################################
|
||||
# BUILD COMMUNITY SERVER DOCKER IMAGE (build) ############################
|
||||
##########################################################################
|
||||
- name: community server | Build `test` image
|
||||
run: |
|
||||
docker build -t "gradido/communityserver:test" -f ./community_server/Dockerfile ./
|
||||
docker save "gradido/communityserver:test" > /tmp/communityserver.tar
|
||||
- name: Upload Artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: docker-communityserver-test
|
||||
path: /tmp/communityserver.tar
|
||||
|
||||
##############################################################################
|
||||
# JOB: LINT FRONTEND #########################################################
|
||||
@ -241,4 +248,19 @@ jobs:
|
||||
# run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
|
||||
# - name: webapp | Unit tests
|
||||
# #run: docker run --rm ocelotsocialnetwork/webapp:build yarn run test
|
||||
# run: docker-compose exec -T webapp yarn test
|
||||
# run: docker-compose exec -T webapp yarn test
|
||||
|
||||
#test:
|
||||
# runs-on: ubuntu-latest
|
||||
# steps:
|
||||
# - uses: actions/checkout@v2
|
||||
# - name: Build the stack
|
||||
# run: |
|
||||
# git submodule update --init --recursive
|
||||
# docker-compose up -d
|
||||
# - name: Test
|
||||
# env:
|
||||
# GN_INSTANCE_FOLDER: /tmp/gradio-node-instance
|
||||
# GN_CONTAINER_NAME: gradido-node-build
|
||||
# run: docker run gradido-node-test
|
||||
# timeout-minutes: 2
|
||||
8
.gitmodules
vendored
8
.gitmodules
vendored
@ -2,12 +2,12 @@
|
||||
path = gn
|
||||
url = https://github.com/gradido/gn.git
|
||||
branch = master
|
||||
[submodule "mithril_client"]
|
||||
path = community_server/mithril_client
|
||||
url = git@github.com:gradido/gradido_mithrilJS_client.git
|
||||
#[submodule "mithril_client"]
|
||||
# path = community_server/mithril_client
|
||||
# url = https://github.com/gradido/gradido_mithrilJS_client.git
|
||||
[submodule "src/protobuf"]
|
||||
path = community_server/src/protobuf
|
||||
url = git@github.com:gradido/gradido_protocol.git
|
||||
url = https://github.com/gradido/gradido_protocol.git
|
||||
[submodule "dependencies/tinf"]
|
||||
path = login_server/dependencies/tinf
|
||||
url = https://github.com/jibsen/tinf.git
|
||||
|
||||
21
CHANGELOG.md
21
CHANGELOG.md
@ -4,4 +4,25 @@ All notable changes to this project will be documented in this file. Dates are d
|
||||
|
||||
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
||||
|
||||
#### [0.9.2](https://github.com/gradido/gradido/compare/0.9.1...0.9.2)
|
||||
|
||||
- Reload after login fixed [`#50`](https://github.com/gradido/gradido/pull/50)
|
||||
- Monorepo login server [`#48`](https://github.com/gradido/gradido/pull/48)
|
||||
- Stage0 [`#3`](https://github.com/gradido/gradido/pull/3)
|
||||
- Add auto-sign Transaction functionality [`5592275`](https://github.com/gradido/gradido/commit/55922753a7ffd9552be132501d744da491c409b5)
|
||||
- read in login the real client ip X-Real-IP from nginx forwarded not from community server [`512d307`](https://github.com/gradido/gradido/commit/512d307a19b955bb6e26ae8b274def354829b50f)
|
||||
- move check if all passwords allow direct into pwdValidation so it will work with every code which ask for password [`e2c38c1`](https://github.com/gradido/gradido/commit/e2c38c1a0fc25a4a2bc922c4bbc44d86b6d00d8b)
|
||||
|
||||
#### 0.9.1
|
||||
|
||||
> 13 March 2021
|
||||
|
||||
- Login gbb [`#12`](https://github.com/gradido/gradido/pull/12)
|
||||
- Admin prework axios json [`#10`](https://github.com/gradido/gradido/pull/10)
|
||||
- Merge pull request #1 from gradido/master [`#8`](https://github.com/gradido/gradido/pull/8)
|
||||
- [WIP] 2 create a dockerfile for the frontend application [`#6`](https://github.com/gradido/gradido/pull/6)
|
||||
- Master - first step [`#1`](https://github.com/gradido/gradido/pull/1)
|
||||
- Add docker compose [`#7`](https://github.com/gradido/gradido/pull/7)
|
||||
- style 404 side :) [`c7bdf89`](https://github.com/gradido/gradido/commit/c7bdf8978594b932615e48f9bb1c19d3c3bf3fcf)
|
||||
- publish workflow test [`df6f66f`](https://github.com/gradido/gradido/commit/df6f66ffe70baa9ed3f70b460a6c0c14011bb944)
|
||||
- many translations. translation structure [`bf68547`](https://github.com/gradido/gradido/commit/bf685479767d19c246c4d6abe3577dc3cb666346)
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit f0b1d113cee2a76e9dbb098b315f4acaf38410d0
|
||||
@ -5,7 +5,8 @@ module.exports = {
|
||||
},
|
||||
extends: ['plugin:vue/essential'],
|
||||
rules: {
|
||||
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
||||
// TODO no console!
|
||||
'no-console': 'off',
|
||||
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
|
||||
},
|
||||
parserOptions: {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "bootstrap-vue-gradido-wallet",
|
||||
"version": "0.9.1",
|
||||
"version": "0.9.2",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"start": "node server.js",
|
||||
|
||||
@ -56,16 +56,16 @@
|
||||
import GddWorkTable from '../../views/KontoOverview/GddWorkTable.vue';
|
||||
|
||||
|
||||
import * as chartConfigs from '@/components/Charts/config';
|
||||
import * as chartConfigs from '@/components/Charts/config';
|
||||
import LineChart from '@/components/Charts/LineChart';
|
||||
import BarChart from '@/components/Charts/BarChart';
|
||||
//import BarChart from '@/components/Charts/BarChart';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
GddTable,
|
||||
GddWorkTable,
|
||||
LineChart,
|
||||
BarChart
|
||||
//BarChart
|
||||
},
|
||||
data(){
|
||||
return {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "gradido",
|
||||
"version": "0.9.1",
|
||||
"version": "0.9.2",
|
||||
"description": "Gradido",
|
||||
"main": "index.js",
|
||||
"repository": "git@github.com:gradido/gradido.git",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user