Merge branch 'master' into vue_with_nginx

This commit is contained in:
einhornimmond 2021-03-25 09:39:53 +01:00
commit f97b7cf709
164 changed files with 12214 additions and 7640 deletions

View File

@ -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

View File

@ -4,34 +4,13 @@ name: gradido test CI
on: [push] on: [push]
jobs: 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 ############################################ # JOB: DOCKER BUILD TEST FRONTEND ############################################
############################################################################## ##############################################################################
build_test_frontend: build_test_frontend:
name: Docker Build Test - Frontend name: Docker Build Test - Frontend
runs-on: ubuntu-latest runs-on: ubuntu-latest
#needs: [nothing] # [prepare] #needs: [nothing]
steps: steps:
########################################################################## ##########################################################################
# CHECKOUT CODE ########################################################## # CHECKOUT CODE ##########################################################
@ -39,7 +18,7 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
########################################################################## ##########################################################################
# NEO4J ################################################################## # FRONTEND ###############################################################
########################################################################## ##########################################################################
- name: Frontend | Build `test` image - name: Frontend | Build `test` image
run: | run: |
@ -78,30 +57,58 @@ jobs:
# path: /tmp/backend.tar # path: /tmp/backend.tar
############################################################################## ##############################################################################
# JOB: DOCKER BUILD TEST WEBAPP ############################################## # JOB: DOCKER BUILD TEST LOGIN SERVER ########################################
############################################################################## ##############################################################################
#build_test_webapp: build_test_login_server:
# name: Docker Build Test - WebApp name: Docker Build Test - Login Server
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# needs: [prepare] #needs: [nothing]
# steps: steps:
# ########################################################################## ##########################################################################
# # CHECKOUT CODE ########################################################## # CHECKOUT CODE ##########################################################
# ########################################################################## ##########################################################################
# - name: Checkout code - name: Checkout code
# uses: actions/checkout@v2 uses: actions/checkout@v2
# ########################################################################## with:
# # BUILD WEBAPP DOCKER IMAGE (build) ###################################### submodules: recursive
# ########################################################################## ##########################################################################
# - name: webapp | Build `test` image # BUILD LOGIN SERVER DOCKER IMAGE (build) ################################
# run: | ##########################################################################
# docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/ - name: login server | Build `test` image
# docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar run: |
# - name: Upload Artifact docker build --target login_server_debug -t "gradido/loginserver:test" -f ./login_server/Dockerfile.debug login_server/
# uses: actions/upload-artifact@v2 docker save "gradido/loginserver:test" > /tmp/loginserver.tar
# with: - name: Upload Artifact
# name: docker-webapp-test uses: actions/upload-artifact@v2
# path: /tmp/webapp.tar 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 ######################################################### # JOB: LINT FRONTEND #########################################################
@ -207,38 +214,46 @@ jobs:
# run: docker-compose exec -T backend yarn test # run: docker-compose exec -T backend yarn test
############################################################################## ##############################################################################
# JOB: UNIT TEST WEBAPP ###################################################### # JOB: UNIT TEST FRONTEND ###################################################
############################################################################## ##############################################################################
#unit_test_webapp: unit_test_frontend:
# name: Unit tests - webapp name: Unit tests - Frontend
runs-on: ubuntu-latest
needs: [build_test_frontend]
steps:
##########################################################################
# CHECKOUT CODE ##########################################################
##########################################################################
- name: Checkout code
uses: actions/checkout@v2
##########################################################################
# DOWNLOAD DOCKER IMAGES #################################################
##########################################################################
- name: Download Docker Image (Webapp)
uses: actions/download-artifact@v2
with:
name: docker-frontend-test
path: /tmp
- name: Load Docker Image
run: docker load < /tmp/frontend.tar
##########################################################################
# UNIT TESTS FRONTEND ####################################################
##########################################################################
- name: frontend | Unit tests
run: docker run --rm gradido/frontend:test yarn run test
#test:
# runs-on: ubuntu-latest # runs-on: ubuntu-latest
# needs: [build_test_webapp]
# steps: # steps:
# ########################################################################## # - uses: actions/checkout@v2
# # CHECKOUT CODE ########################################################## # - name: Build the stack
# ########################################################################## # run: |
# - name: Checkout code # git submodule update --init --recursive
# uses: actions/checkout@v2 # docker-compose up -d
# ########################################################################## # - name: Test
# # DOWNLOAD DOCKER IMAGES ################################################# # env:
# ########################################################################## # GN_INSTANCE_FOLDER: /tmp/gradio-node-instance
# - name: Download Docker Image (Webapp) # GN_CONTAINER_NAME: gradido-node-build
# uses: actions/download-artifact@v2 # run: docker run gradido-node-test
# with: # timeout-minutes: 2
# name: docker-webapp-test
# path: /tmp
# - name: Load Docker Image
# run: docker load < /tmp/webapp.tar
# ##########################################################################
# # UNIT TESTS WEBAPP #####################################################
# ##########################################################################
# # TODO: Why do we need those .envs?
# - name: backend | copy env files webapp
# run: cp webapp/.env.template webapp/.env
# - name: backend | copy env files backend
# run: cp backend/.env.template backend/.env
# - name: backend | docker-compose
# 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

9
.gitmodules vendored
View File

@ -2,12 +2,12 @@
path = gn path = gn
url = https://github.com/gradido/gn.git url = https://github.com/gradido/gn.git
branch = master branch = master
[submodule "mithril_client"] #[submodule "mithril_client"]
path = community_server/mithril_client # path = community_server/mithril_client
url = git@github.com:gradido/gradido_mithrilJS_client.git # url = https://github.com/gradido/gradido_mithrilJS_client.git
[submodule "src/protobuf"] [submodule "src/protobuf"]
path = community_server/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"] [submodule "dependencies/tinf"]
path = login_server/dependencies/tinf path = login_server/dependencies/tinf
url = https://github.com/jibsen/tinf.git url = https://github.com/jibsen/tinf.git
@ -23,4 +23,3 @@
[submodule "dependencies/spirit-po"] [submodule "dependencies/spirit-po"]
path = login_server/dependencies/spirit-po path = login_server/dependencies/spirit-po
url = https://github.com/cbeck88/spirit-po.git url = https://github.com/cbeck88/spirit-po.git

View File

@ -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). 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 #### 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

View File

@ -55,7 +55,7 @@ class JsonRequestClientComponent extends Component
]), '/getRunningUserTasks'); ]), '/getRunningUserTasks');
} }
public function getUsers($session_id, $searchString) public function getUsers($session_id, $searchString, $accountState)
{ {
if($searchString == "") { if($searchString == "") {
return ['state' => 'error', 'type' => 'parameter error', 'msg' => 'search string is empty']; return ['state' => 'error', 'type' => 'parameter error', 'msg' => 'search string is empty'];
@ -66,7 +66,8 @@ class JsonRequestClientComponent extends Component
return $this->sendRequest(json_encode([ return $this->sendRequest(json_encode([
'session_id' => $session_id, 'session_id' => $session_id,
'search' => $searchString 'search' => $searchString,
'account_state' => $accountState,
]), '/getUsers'); ]), '/getUsers');
} }

View File

@ -197,7 +197,7 @@ class StateBalancesController extends AppController
} }
uasort($transactions, array($this, 'sortTransactions')); uasort($transactions, array($this, 'sortTransactions'));
$this->set('transactions', $transactions); $this->set('transactions', $transactions);
$this->set('transactionExecutingCount', $session->read('Transaction.executing')); $this->set('transactionExecutingCount', $session->read('Transactions.executing'));
$this->set('balance', $session->read('StateUser.balance')); $this->set('balance', $session->read('StateUser.balance'));
$this->set('timeUsed', microtime(true) - $startTime); $this->set('timeUsed', microtime(true) - $startTime);
$this->set('gdtSum', $gdtSum); $this->set('gdtSum', $gdtSum);
@ -370,7 +370,7 @@ class StateBalancesController extends AppController
return $this->returnJson([ return $this->returnJson([
'state' => 'success', 'state' => 'success',
'transactions' => $transactions, 'transactions' => $transactions,
'transactionExecutingCount' => $session->read('Transaction.executing'), 'transactionExecutingCount' => $session->read('Transactions.executing'),
'count' => count($transactions), 'count' => count($transactions),
'gdtSum' => $gdtSum, 'gdtSum' => $gdtSum,
'timeUsed' => microtime(true) - $startTime 'timeUsed' => microtime(true) - $startTime

View File

@ -196,7 +196,7 @@ class StateUserTransactionsController extends AppController
return $this->returnJson([ return $this->returnJson([
'state' => 'success', 'state' => 'success',
'transactions' => $transactions, 'transactions' => $transactions,
'transactionExecutingCount' => $session->read('Transaction.executing'), 'transactionExecutingCount' => $session->read('Transactions.executing'),
'count' => $all_user_transactions_count, 'count' => $all_user_transactions_count,
'timeUsed' => microtime(true) - $startTime 'timeUsed' => microtime(true) - $startTime
]); ]);

View File

@ -99,9 +99,14 @@ class StateUsersController extends AppController
//$this->set('timeUsed', $timeUsed); //$this->set('timeUsed', $timeUsed);
$csfr_token = $this->request->getParam('_csrfToken'); $csfr_token = $this->request->getParam('_csrfToken');
$this->set(compact('timeUsed', 'searchForm', 'csfr_token')); $this->set(compact('timeUsed', 'searchForm', 'csfr_token'));
$empty_string = '... empty ...';
if ($this->request->is('post')) { if ($this->request->is('post')) {
$finalUserEntrys = [];
$requestData = $this->request->getData(); $requestData = $this->request->getData();
$account_state = $requestData['account_state'];
if($requestData['search'] == '' && $account_state != 'all') {
$requestData['search'] = $empty_string;
}
if ($searchForm->validate($requestData)) { if ($searchForm->validate($requestData)) {
//var_dump($requestData); //var_dump($requestData);
@ -111,7 +116,7 @@ class StateUsersController extends AppController
$searchType = 'email'; $searchType = 'email';
} }
// find users on login server // find users on login server
$resultJson = $this->JsonRequestClient->getUsers($session->read('session_id'), $searchString); $resultJson = $this->JsonRequestClient->getUsers($session->read('session_id'), $searchString, $account_state);
$loginServerUser = []; $loginServerUser = [];
if ($resultJson['state'] == 'success') { if ($resultJson['state'] == 'success') {
$dataJson = $resultJson['data']; $dataJson = $resultJson['data'];
@ -139,19 +144,32 @@ class StateUsersController extends AppController
} }
} }
// find user on community server db // find user on community server db
$globalSearch = '%' . $searchString . '%';
$communityUsers = $this->StateUsers $communityUsers = $this->StateUsers
->find('all') ->find('all')
->contain(['StateBalances' => ['fields' => ['amount', 'state_user_id']]]); ->contain(['StateBalances' => ['fields' => ['amount', 'state_user_id']]]);
if($account_state == 'email not activated') {
if(count($pubkeySorted) > 0) {
$communityUsers->where(['hex(public_key) IN' => array_keys($pubkeySorted)]);
} else {
$communityUsers = null;
}
} else {
$globalSearch = '%' . $searchString . '%';
$communityUsers->where(['OR' => [ $communityUsers->where(['OR' => [
'first_name LIKE' => $globalSearch, 'first_name LIKE' => $globalSearch,
'last_name LIKE' => $globalSearch, 'last_name LIKE' => $globalSearch,
//'username LIKE' => $globalSearch, //'username LIKE' => $globalSearch,
'email LIKE' => $globalSearch 'email LIKE' => $globalSearch
]]); ]]);
}
//var_dump($communityUsers->toArray()); //var_dump($communityUsers->toArray());
if($communityUsers) {
foreach ($communityUsers as $u) { foreach ($communityUsers as $u) {
$pubkey_hex = bin2hex(stream_get_contents($u->public_key)); $pubkey_hex = bin2hex(stream_get_contents($u->public_key));
$u->public_hex = $pubkey_hex; $u->public_hex = $pubkey_hex;
@ -160,7 +178,8 @@ class StateUsersController extends AppController
} }
array_push($pubkeySorted[$pubkey_hex]['community'], $u); array_push($pubkeySorted[$pubkey_hex]['community'], $u);
} }
$finalUserEntrys = []; }
// detect states // detect states
foreach ($pubkeySorted as $pubhex => $user) { foreach ($pubkeySorted as $pubhex => $user) {
$finalUser = []; $finalUser = [];

View File

@ -323,7 +323,7 @@ class TransactionCreationsController extends AppController
$this->set('firstDayLastMonth', $firstDayLastMonth); $this->set('firstDayLastMonth', $firstDayLastMonth);
$this->set('activeUser', $user); $this->set('activeUser', $user);
$this->set('creationForm', $creationForm); $this->set('creationForm', $creationForm);
$this->set('transactionExecutingCount', $session->read('Transaction.executing')); $this->set('transactionExecutingCount', $session->read('Transactions.executing'));
$this->set('timeUsed', microtime(true) - $startTime); $this->set('timeUsed', microtime(true) - $startTime);
$this->set('countUsers', $countUsers); $this->set('countUsers', $countUsers);
$this->set('limit', $limit); $this->set('limit', $limit);

View File

@ -11,7 +11,9 @@ class UserSearchForm extends Form
protected function _buildSchema(Schema $schema) protected function _buildSchema(Schema $schema)
{ {
return $schema->addField('search', ['type' => 'string']); return $schema
->addField('search', ['type' => 'string'])
->addField('account_state', ['type' => 'select']);
} }
function validationDefault(Validator $validator) function validationDefault(Validator $validator)

View File

@ -11,6 +11,19 @@ $this->assign('title', __('Benutzer suchen'));
$this->loadHelper('Form', [ $this->loadHelper('Form', [
'templates' => 'horizontal_form', 'templates' => 'horizontal_form',
]); ]);
$stateOptions = [
'all' => __('Alle'),
//'account created'=>__('Konto angelegt'),
//'account not on login-server' => __('Konto nicht auf Login-Server'),
//'email activated' => __('Konto aktiviert'),
//'account copied to community' => __('Konto auf Gemeinschafts-Server'),
'email not activated' => __('Konto nicht aktiviert'),
//'account multiple times on login-server' => __('Konto mehrfach vorhanden'),
//'account not on community server' => __('Konto nicht auf Gemeinschafts-Server'),
//'no keys' => __('Keine Schlüssel generiert')
];
?> ?>
<?= $this->Html->css([ <?= $this->Html->css([
'loginServer/style.css', 'loginServer/style.css',
@ -41,7 +54,8 @@ $this->loadHelper('Form', [
<p class="form-header">Benutzer suchen</p> <p class="form-header">Benutzer suchen</p>
<div class="form-body"> <div class="form-body">
<?= $this->Form->create($searchForm, []) ?> <?= $this->Form->create($searchForm, []) ?>
<?= $this->Form->control('search', ['label' => __('Suchbegriff'), 'class' => 'form-control', 'id' => 'inlineFormInputGroup', 'placeholder' => __('Vorname/Nachname/E-Mail')]) ?> <?= $this->Form->control('search', ['label' => __('Suchbegriff'), 'class' => 'form-control', 'id' => 'inlineFormInputGroup', 'placeholder' => __('Vorname/Nachname/E-Mail'), 'required' => false]) ?>
<?= $this->Form->control('account_state', ['label' => __('Konto Status'), 'class' => 'form-control', 'type' => 'select', 'options' => $stateOptions]) ?>
<?= $this->Form->button('<i class="material-icons-outlined">search</i>&nbsp;' . __('Suchen'), ['class' => 'form-button']) ?> <?= $this->Form->button('<i class="material-icons-outlined">search</i>&nbsp;' . __('Suchen'), ['class' => 'form-button']) ?>
<?= $this->Form->hidden('order_row', ['id' => 'input-order-row']) ?> <?= $this->Form->hidden('order_row', ['id' => 'input-order-row']) ?>
</div> </div>
@ -59,7 +73,7 @@ $this->loadHelper('Form', [
csfr_token = '<?= $csfr_token ?>'; csfr_token = '<?= $csfr_token ?>';
</script> </script>
<?= $this->Html->script('userSearch') ?> <?= $this->Html->script('userSearch.min') ?>
<!-- npm run build im mithril client! --> <!-- npm run build im mithril client! -->
<!-- keybase://team/gradido/gradido_mithril_user_search --> <!-- keybase://team/gradido/gradido_mithril_user_search -->

View File

@ -185,7 +185,7 @@ process.chdir = function (dir) {
process.umask = function() { return 0; }; process.umask = function() { return 0; };
},{}],2:[function(require,module,exports){ },{}],2:[function(require,module,exports){
(function (setImmediate,clearImmediate){ (function (setImmediate,clearImmediate){(function (){
var nextTick = require('process/browser.js').nextTick; var nextTick = require('process/browser.js').nextTick;
var apply = Function.prototype.apply; var apply = Function.prototype.apply;
var slice = Array.prototype.slice; var slice = Array.prototype.slice;
@ -262,9 +262,9 @@ exports.setImmediate = typeof setImmediate === "function" ? setImmediate : funct
exports.clearImmediate = typeof clearImmediate === "function" ? clearImmediate : function(id) { exports.clearImmediate = typeof clearImmediate === "function" ? clearImmediate : function(id) {
delete immediateIds[id]; delete immediateIds[id];
}; };
}).call(this,require("timers").setImmediate,require("timers").clearImmediate) }).call(this)}).call(this,require("timers").setImmediate,require("timers").clearImmediate)
},{"process/browser.js":1,"timers":2}],3:[function(require,module,exports){ },{"process/browser.js":1,"timers":2}],3:[function(require,module,exports){
(function (global,setImmediate){ (function (global,setImmediate){(function (){
new function() { new function() {
function Vnode(tag, key, attrs0, children, text, dom) { function Vnode(tag, key, attrs0, children, text, dom) {
@ -1425,7 +1425,7 @@ m.vnode = Vnode
if (typeof module !== "undefined") module["exports"] = m if (typeof module !== "undefined") module["exports"] = m
else window.m = m else window.m = m
} }
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("timers").setImmediate) }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("timers").setImmediate)
},{"timers":2}],4:[function(require,module,exports){ },{"timers":2}],4:[function(require,module,exports){
/*! @preserve /*! @preserve
* numeral.js * numeral.js
@ -2442,10 +2442,10 @@ return numeral;
})); }));
},{}],5:[function(require,module,exports){ },{}],5:[function(require,module,exports){
(function (global){ (function (global){(function (){
/**! /**!
* @fileOverview Kickass library to create and place poppers near their reference elements. * @fileOverview Kickass library to create and place poppers near their reference elements.
* @version 1.16.0 * @version 1.16.1
* @license * @license
* Copyright (c) 2016 Federico Zivolo and contributors * Copyright (c) 2016 Federico Zivolo and contributors
* *
@ -2797,7 +2797,7 @@ function getBordersSize(styles, axis) {
var sideA = axis === 'x' ? 'Left' : 'Top'; var sideA = axis === 'x' ? 'Left' : 'Top';
var sideB = sideA === 'Left' ? 'Right' : 'Bottom'; var sideB = sideA === 'Left' ? 'Right' : 'Bottom';
return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10); return parseFloat(styles['border' + sideA + 'Width']) + parseFloat(styles['border' + sideB + 'Width']);
} }
function getSize(axis, body, html, computedStyle) { function getSize(axis, body, html, computedStyle) {
@ -2952,8 +2952,8 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
var scrollParent = getScrollParent(children); var scrollParent = getScrollParent(children);
var styles = getStyleComputedProperty(parent); var styles = getStyleComputedProperty(parent);
var borderTopWidth = parseFloat(styles.borderTopWidth, 10); var borderTopWidth = parseFloat(styles.borderTopWidth);
var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10); var borderLeftWidth = parseFloat(styles.borderLeftWidth);
// In cases where the parent is fixed, we must ignore negative scroll in offset calc // In cases where the parent is fixed, we must ignore negative scroll in offset calc
if (fixedPosition && isHTML) { if (fixedPosition && isHTML) {
@ -2974,8 +2974,8 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
// differently when margins are applied to it. The margins are included in // differently when margins are applied to it. The margins are included in
// the box of the documentElement, in the other cases not. // the box of the documentElement, in the other cases not.
if (!isIE10 && isHTML) { if (!isIE10 && isHTML) {
var marginTop = parseFloat(styles.marginTop, 10); var marginTop = parseFloat(styles.marginTop);
var marginLeft = parseFloat(styles.marginLeft, 10); var marginLeft = parseFloat(styles.marginLeft);
offsets.top -= borderTopWidth - marginTop; offsets.top -= borderTopWidth - marginTop;
offsets.bottom -= borderTopWidth - marginTop; offsets.bottom -= borderTopWidth - marginTop;
@ -3914,8 +3914,8 @@ function arrow(data, options) {
// Compute the sideValue using the updated popper offsets // Compute the sideValue using the updated popper offsets
// take popper margin in account because we don't have this info available // take popper margin in account because we don't have this info available
var css = getStyleComputedProperty(data.instance.popper); var css = getStyleComputedProperty(data.instance.popper);
var popperMarginSide = parseFloat(css['margin' + sideCapitalized], 10); var popperMarginSide = parseFloat(css['margin' + sideCapitalized]);
var popperBorderSide = parseFloat(css['border' + sideCapitalized + 'Width'], 10); var popperBorderSide = parseFloat(css['border' + sideCapitalized + 'Width']);
var sideValue = center - data.offsets.popper[side] - popperMarginSide - popperBorderSide; var sideValue = center - data.offsets.popper[side] - popperMarginSide - popperBorderSide;
// prevent arrowElement from being placed not contiguously to its popper // prevent arrowElement from being placed not contiguously to its popper
@ -5068,11 +5068,11 @@ return Popper;
}))); })));
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{}],6:[function(require,module,exports){ },{}],6:[function(require,module,exports){
(function (process){ (function (process){(function (){
/**! /**!
* tippy.js v5.1.4 * tippy.js v5.2.1
* (c) 2017-2020 atomiks * (c) 2017-2020 atomiks
* MIT License * MIT License
*/ */
@ -5100,7 +5100,7 @@ function _extends() {
return _extends.apply(this, arguments); return _extends.apply(this, arguments);
} }
var version = "5.1.4"; var version = "5.2.1";
/** /**
* Triggers reflow * Triggers reflow
@ -5749,7 +5749,6 @@ function bindGlobalEventListeners() {
var isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined'; var isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
var ua = isBrowser ? navigator.userAgent : ''; var ua = isBrowser ? navigator.userAgent : '';
var isIE = /MSIE |Trident\//.test(ua); var isIE = /MSIE |Trident\//.test(ua);
var isUCBrowser = /UCBrowser\//.test(ua);
var isIOS = isBrowser && /iPhone|iPad|iPod/.test(navigator.platform); var isIOS = isBrowser && /iPhone|iPad|iPod/.test(navigator.platform);
function updateIOSClass(isAdd) { function updateIOSClass(isAdd) {
var shouldAdd = isAdd && isIOS && currentInput.isTouch; var shouldAdd = isAdd && isIOS && currentInput.isTouch;
@ -5939,8 +5938,9 @@ function updatePopperElement(popper, prevProps, nextProps) {
*/ */
function updateTransitionEndListener(tooltip, action, listener) { function updateTransitionEndListener(tooltip, action, listener) {
var eventName = isUCBrowser && document.body.style.webkitTransition !== undefined ? 'webkitTransitionEnd' : 'transitionend'; ['transitionend', 'webkitTransitionEnd'].forEach(function (event) {
tooltip[action + 'EventListener'](eventName, listener); tooltip[action + 'EventListener'](event, listener);
});
} }
/** /**
* Adds/removes theme from tooltip's classList * Adds/removes theme from tooltip's classList
@ -6070,6 +6070,7 @@ function createTippy(reference, passedProps) {
var pluginsHooks = plugins.map(function (plugin) { var pluginsHooks = plugins.map(function (plugin) {
return plugin.fn(instance); return plugin.fn(instance);
}); });
var hadAriaExpandedAttributeOnCreate = reference.hasAttribute('aria-expanded');
addListenersToTriggerTarget(); addListenersToTriggerTarget();
handleAriaExpandedAttribute(); handleAriaExpandedAttribute();
@ -6090,8 +6091,9 @@ function createTippy(reference, passedProps) {
instance.clearDelayTimeouts(); instance.clearDelayTimeouts();
} }
}); });
popper.addEventListener('mouseleave', function () { popper.addEventListener('mouseleave', function (event) {
if (instance.props.interactive && includes(instance.props.trigger, 'mouseenter')) { if (instance.props.interactive && includes(instance.props.trigger, 'mouseenter')) {
debouncedOnMouseMove(event);
doc.addEventListener('mousemove', debouncedOnMouseMove); doc.addEventListener('mousemove', debouncedOnMouseMove);
} }
}); });
@ -6170,6 +6172,13 @@ function createTippy(reference, passedProps) {
} }
function handleAriaExpandedAttribute() { function handleAriaExpandedAttribute() {
// If the user has specified `aria-expanded` on their reference when the
// instance was created, we have to assume they're controlling it externally
// themselves
if (hadAriaExpandedAttributeOnCreate) {
return;
}
var nodes = normalizeToArray(instance.props.triggerTarget || reference); var nodes = normalizeToArray(instance.props.triggerTarget || reference);
nodes.forEach(function (node) { nodes.forEach(function (node) {
if (instance.props.interactive) { if (instance.props.interactive) {
@ -6300,7 +6309,11 @@ function createTippy(reference, passedProps) {
break; break;
case 'focus': case 'focus':
on(isIE ? 'focusout' : 'blur', onBlur); on(isIE ? 'focusout' : 'blur', onBlurOrFocusOut);
break;
case 'focusin':
on('focusout', onBlurOrFocusOut);
break; break;
} }
}); });
@ -6371,7 +6384,7 @@ function createTippy(reference, passedProps) {
return el === reference || el === popper; return el === reference || el === popper;
}); });
if (isCursorOverReferenceOrPopper) { if (event.type === 'mousemove' && isCursorOverReferenceOrPopper) {
return; return;
} }
@ -6405,14 +6418,15 @@ function createTippy(reference, passedProps) {
doc.body.addEventListener('mouseleave', scheduleHide); doc.body.addEventListener('mouseleave', scheduleHide);
doc.addEventListener('mousemove', debouncedOnMouseMove); doc.addEventListener('mousemove', debouncedOnMouseMove);
pushIfUnique(mouseMoveListeners, debouncedOnMouseMove); pushIfUnique(mouseMoveListeners, debouncedOnMouseMove);
debouncedOnMouseMove(event);
return; return;
} }
scheduleHide(event); scheduleHide(event);
} }
function onBlur(event) { function onBlurOrFocusOut(event) {
if (event.target !== getCurrentTarget()) { if (!includes(instance.props.trigger, 'focusin') && event.target !== getCurrentTarget()) {
return; return;
} // If focus was moved to within the popper } // If focus was moved to within the popper
@ -6993,7 +7007,6 @@ exports.hideAll = hideAll;
exports.includes = includes; exports.includes = includes;
exports.isBrowser = isBrowser; exports.isBrowser = isBrowser;
exports.isMouseEvent = isMouseEvent; exports.isMouseEvent = isMouseEvent;
exports.isUCBrowser = isUCBrowser;
exports.normalizeToArray = normalizeToArray; exports.normalizeToArray = normalizeToArray;
exports.removeProperties = removeProperties; exports.removeProperties = removeProperties;
exports.setVisibilityState = setVisibilityState; exports.setVisibilityState = setVisibilityState;
@ -7002,11 +7015,11 @@ exports.useIfDefined = useIfDefined;
exports.warnWhen = warnWhen; exports.warnWhen = warnWhen;
}).call(this,require('_process')) }).call(this)}).call(this,require('_process'))
},{"_process":1,"popper.js":5}],7:[function(require,module,exports){ },{"_process":1,"popper.js":5}],7:[function(require,module,exports){
(function (process){ (function (process){(function (){
/**! /**!
* tippy.js v5.1.4 * tippy.js v5.2.1
* (c) 2017-2020 atomiks * (c) 2017-2020 atomiks
* MIT License * MIT License
*/ */
@ -7256,7 +7269,7 @@ var animateFill = {
var _instance$popperChild = instance.popperChildren, var _instance$popperChild = instance.popperChildren,
tooltip = _instance$popperChild.tooltip, tooltip = _instance$popperChild.tooltip,
content = _instance$popperChild.content; content = _instance$popperChild.content;
var backdrop = instance.props.animateFill && !index.isUCBrowser ? createBackdropElement() : null; var backdrop = instance.props.animateFill ? createBackdropElement() : null;
function addBackdropToPopperChildren() { function addBackdropToPopperChildren() {
instance.popperChildren.backdrop = backdrop; instance.popperChildren.backdrop = backdrop;
@ -7391,7 +7404,7 @@ var followCursor = {
// scroll for "vertical" // scroll for "vertical"
if (getIsEnabled() && (getIsInitialBehavior() || instance.props.followCursor !== true)) { if (getIsEnabled() && getIsInitialBehavior()) {
instance.popperInstance.disableEventListeners(); instance.popperInstance.disableEventListeners();
} }
} }
@ -7432,7 +7445,6 @@ var followCursor = {
var isCursorOverReference = index.closestCallback(event.target, function (el) { var isCursorOverReference = index.closestCallback(event.target, function (el) {
return el === reference; return el === reference;
}); });
var rect = reference.getBoundingClientRect();
var followCursor = instance.props.followCursor; var followCursor = instance.props.followCursor;
var isHorizontal = followCursor === 'horizontal'; var isHorizontal = followCursor === 'horizontal';
var isVertical = followCursor === 'vertical'; var isVertical = followCursor === 'vertical';
@ -7456,6 +7468,7 @@ var followCursor = {
clientWidth: 0, clientWidth: 0,
clientHeight: 0, clientHeight: 0,
getBoundingClientRect: function getBoundingClientRect() { getBoundingClientRect: function getBoundingClientRect() {
var rect = reference.getBoundingClientRect();
return { return {
width: isVerticalPlacement ? size : 0, width: isVerticalPlacement ? size : 0,
height: isVerticalPlacement ? 0 : size, height: isVerticalPlacement ? 0 : size,
@ -7721,7 +7734,7 @@ exports.inlinePositioning = inlinePositioning;
exports.sticky = sticky; exports.sticky = sticky;
}).call(this,require('_process')) }).call(this)}).call(this,require('_process'))
},{"./tippy.chunk.cjs.js":6,"_process":1,"popper.js":5}],8:[function(require,module,exports){ },{"./tippy.chunk.cjs.js":6,"_process":1,"popper.js":5}],8:[function(require,module,exports){
'use strict'; 'use strict';
@ -7749,7 +7762,7 @@ function launch() {
}); });
})(document, window, domIsReady); })(document, window, domIsReady);
},{"./texte/de":14,"./view":15,"mithril":3}],9:[function(require,module,exports){ },{"./texte/de":13,"./view":14,"mithril":3}],9:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -7906,24 +7919,6 @@ exports["default"] = _default;
},{"mithril":3}],12:[function(require,module,exports){ },{"mithril":3}],12:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = encode;
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
function encode(receiver, subject, body) {
//return encodeURIComponent(receiver + '?subject=' + subject + '&body=' + body)
return encodeURIComponent(receiver) + '?subject=' + encodeURIComponent(subject) + '&body=' + encodeURIComponent(body);
}
},{}],13:[function(require,module,exports){
"use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
@ -7949,9 +7944,7 @@ __('account multiple times on login-server');
__('account not on community server'); __('account not on community server');
__('no keys'); __('no keys');
*/ */
var AccountState = var AccountState = /*#__PURE__*/function () {
/*#__PURE__*/
function () {
function AccountState(stateName) { function AccountState(stateName) {
_classCallCheck(this, AccountState); _classCallCheck(this, AccountState);
@ -8050,7 +8043,7 @@ function () {
exports["default"] = AccountState; exports["default"] = AccountState;
},{"mithril":3}],14:[function(require,module,exports){ },{"mithril":3}],13:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -8226,7 +8219,6 @@ var _default = {
DELETE_FROM_COMMUNITY_SUCCESS: 'Benutzer Konto vom Gemeinschafts-Server erfolgreich gelöscht', DELETE_FROM_COMMUNITY_SUCCESS: 'Benutzer Konto vom Gemeinschafts-Server erfolgreich gelöscht',
VERIFICATION_EMAIL_RESEND: 'Verification Email erneut zusenden', VERIFICATION_EMAIL_RESEND: 'Verification Email erneut zusenden',
VERIFICATION_EMAIL_RESEND_SUCCESS: 'Verification Email wird erneut zugestellt', VERIFICATION_EMAIL_RESEND_SUCCESS: 'Verification Email wird erneut zugestellt',
MAILTO_VERIFICATION_EMAIL: 'Verification Email selbst verschicken',
COPY_FAILED: 'Fehler beim Kopieren', COPY_FAILED: 'Fehler beim Kopieren',
DELETE_FAILED: 'Fehler beim löschen', DELETE_FAILED: 'Fehler beim löschen',
RESEND_FAILED: 'Senden fehlgeschlagen', RESEND_FAILED: 'Senden fehlgeschlagen',
@ -8240,7 +8232,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{}],15:[function(require,module,exports){ },{}],14:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -8305,7 +8297,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"../model/AccountState":13,"./userTable":23,"mithril":3}],16:[function(require,module,exports){ },{"../model/AccountState":12,"./userTable":21,"mithril":3}],15:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -8405,7 +8397,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"../../../lib/dialog":11,"mithril":3}],17:[function(require,module,exports){ },{"../../../lib/dialog":11,"mithril":3}],16:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -8450,7 +8442,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"./actionBase":16,"mithril":3}],18:[function(require,module,exports){ },{"./actionBase":15,"mithril":3}],17:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -8575,7 +8567,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"../../../lib/dialog":11,"./actionBase":16,"mithril":3}],19:[function(require,module,exports){ },{"../../../lib/dialog":11,"./actionBase":15,"mithril":3}],18:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -8671,127 +8663,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"../../../lib/dialog":11,"./actionBase":16,"mithril":3}],20:[function(require,module,exports){ },{"../../../lib/dialog":11,"./actionBase":15,"mithril":3}],19:[function(require,module,exports){
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports["default"] = void 0;
var _mithril = _interopRequireDefault(require("mithril"));
var _actionBase = _interopRequireDefault(require("./actionBase"));
var _dialog = _interopRequireDefault(require("../../../lib/dialog"));
var _emailToLink = _interopRequireDefault(require("../../../lib/emailToLink"));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
/*
* @author: Dario Rekowski
*
* @date: 20.03.20
*
* @brief: getting email verification code in silence
*/
function oninit(vnode) {
vnode.state.loading = true;
vnode.state.results = null;
vnode.state.additionalUserData = [];
vnode.state.serverData = [];
_mithril["default"].request({
method: 'POST',
url: window.location.protocol + '//' + document.domain + '/state-users/ajaxGetUserEmailVerificationCode',
data: vnode.attrs.user,
headers: {
'X-CSRF-Token': csfr_token
}
}).then(function (result) {
vnode.state.loading = false;
if (result.state === 'success') {
vnode.state.copyResult = 'success';
vnode.state.additionalUserData = result.data.userData;
vnode.state.serverData = result.data.server; //console.log("ajax result: %o", result)
} else {//console.log("result error")
}
})["catch"](function (e) {
vnode.state.loading = false;
console.error("ajax error: %s in file: %s in line: %d", e.message, e.fileName, e.lineNumber);
});
}
function getField(vnode, index) {
if (null === vnode.state.results) {
return (0, _mithril["default"])('i.spinner-border.spinner-border-sm');
} else if (index in vnode.state.results) {
return vnode.state.results[index];
} else {
return '0';
}
}
function view(vnode) {
var email = vnode.attrs.user.email;
var first_name = vnode.attrs.user.first_name;
var last_name = vnode.attrs.user.last_name;
var recevier = first_name + ' ' + last_name + ' <' + email + '>';
var userData = vnode.state.additionalUserData;
var serverData = vnode.state.serverData; //console.log('Server data: %o', serverData)
//vnode.state.additionalUserData.verificationCode
var link = serverData['loginServer.path'] + '/checkEmail/' + userData['EmailVerificationCode.Register'];
var body = 'Liebe(r) ' + first_name + ' ' + last_name + ',\n\
\n\
Der Admin hat ein erneutes zusenden deiner Bestätigungsemail angefordert. \n\
Du hast vor einer Weile ein Gradido Konto mit dieser E-Mail angelegt, aber es noch nicht bestätigt. \n\
\n\
Bitte klicke zur Bestätigung auf den Link: ' + link + '\n\
oder kopiere den obigen Link in Dein Browserfenster.\n\
\n\
Mit freundlichen Grüßen\n\
Dario, Gradido Server Admin\n\
';
if (true === vnode.state.loading) {
return (0, _mithril["default"])('span', [(0, _mithril["default"])('span', [(0, _mithril["default"])('button.btn.btn-secondary.btn-xs', {
title: window.texte.MAILTO_VERIFICATION_EMAIL,
disabled: true
}, (0, _mithril["default"])('i.spinner-border.spinner-border-sm')), window.texte.MAILTO_VERIFICATION_EMAIL])]);
} else {
return (0, _mithril["default"])('span', [(0, _mithril["default"])('span', [(0, _mithril["default"])('a.btn.btn-primary.btn-xs', {
title: window.texte.MAILTO_VERIFICATION_EMAIL,
href: 'mailto:' + (0, _emailToLink["default"])(recevier, 'Gradido: E-Mail Verification', body)
}, (0, _mithril["default"])('i.mdi.mdi-email-outline')), window.texte.MAILTO_VERIFICATION_EMAIL])]);
}
return (0, _mithril["default"])('span', [(0, _mithril["default"])('span', [(0, _mithril["default"])('a.btn.btn-secondary.btn-xs', {
title: window.texte.MAILTO_VERIFICATION_EMAIL,
href: 'mailto:' + (0, _emailToLink["default"])(recevier, 'Gradido: E-Mail Verification', body),
disabled: vnode.state.loading === true
}, vnode.state.loading === true ? (0, _mithril["default"])('i.spinner-border.spinner-border-sm') : (0, _mithril["default"])('i.mdi.mdi-email-outline')), window.texte.MAILTO_VERIFICATION_EMAIL])]);
/*return m('span', [
window.texte.RECEIVE_TRANSACTIONS_COUNT,
getField(vnode, 'receive'),
', ',
window.texte.SENDED_TRANSACTIONS_COUNT,
getField(vnode, 'sended'),
', ',
window.texte.CREATION_TRANSACTIONS_COUNT,
getField(vnode, 'creation')
])*/
}
var _default = {
view: view,
oninit: oninit
};
exports["default"] = _default;
},{"../../../lib/dialog":11,"../../../lib/emailToLink":12,"./actionBase":16,"mithril":3}],21:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -8830,12 +8702,12 @@ function oninit(vnode) {
vnode.state.loading = false; vnode.state.loading = false;
if (result.state === 'success') { if (result.state === 'success') {
//vnode.state.message = m('div.alert.alert-success', window.texte.DELETE_FROM_COMMUNITY_SUCCESS) vnode.state.message = (0, _mithril["default"])('div.alert.alert-success', window.texte.DELETE_FROM_COMMUNITY_SUCCESS);
vnode.state.copyResult = 'success'; vnode.state.copyResult = 'success';
vnode.state.results = result.counts; vnode.state.results = result.counts;
} else { } else {
//console.log("result error") //console.log("result error")
//vnode.state.message = m('div.alert.alert-danger', window.texte.DELETE_FAILED) vnode.state.message = (0, _mithril["default"])('div.alert.alert-danger', window.texte.DELETE_FAILED);
vnode.state.copyResult = 'error'; vnode.state.copyResult = 'error';
} }
})["catch"](function (e) { })["catch"](function (e) {
@ -8866,7 +8738,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"../../../lib/dialog":11,"./actionBase":16,"mithril":3}],22:[function(require,module,exports){ },{"../../../lib/dialog":11,"./actionBase":15,"mithril":3}],20:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -8896,7 +8768,7 @@ function view(vnode) {
ajaxData: vnode.attrs.user, ajaxData: vnode.attrs.user,
alertSuccess: window.texte.VERIFICATION_EMAIL_RESEND_SUCCESS, alertSuccess: window.texte.VERIFICATION_EMAIL_RESEND_SUCCESS,
alertFailed: window.texte.RESEND_FAILED, alertFailed: window.texte.RESEND_FAILED,
btnColor: 'btn-gradido-orange', btnColor: 'btn-primary',
btnSymbol: 'mdi-email', btnSymbol: 'mdi-email',
btnTitle: window.texte.VERIFICATION_EMAIL_RESEND, btnTitle: window.texte.VERIFICATION_EMAIL_RESEND,
progessText: window.texte.RESEND_IN_PROGRESS progessText: window.texte.RESEND_IN_PROGRESS
@ -8908,7 +8780,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"./actionBase":16,"mithril":3}],23:[function(require,module,exports){ },{"./actionBase":15,"mithril":3}],21:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -8932,6 +8804,10 @@ function oninit(vnode) {
} }
vnode.state.openedUser = -1; vnode.state.openedUser = -1;
vnode.state.order = {
field: 'default',
dir: 'DESC'
};
} }
function openButtonClick(vnode, index) { function openButtonClick(vnode, index) {
@ -8942,6 +8818,27 @@ function openButtonClick(vnode, index) {
} }
} }
function changeOrder(vnode, fieldName) {
var field = vnode.state.order.field;
var dir = vnode.state.order.dir;
if (field != fieldName) {
vnode.state.order.field = fieldName;
vnode.state.order.dir = 'DESC';
} else if (field == fieldName) {
var new_dir;
if (dir == 'DESC') {
new_dir = 'ASC';
} else {
new_dir = 'DESC';
}
vnode.state.order.dir = new_dir;
} //console.log("change to %s %s", vnode.state.order.field, vnode.state.order.dir)
}
function updateStateForActiveUser(newState, vnode) { function updateStateForActiveUser(newState, vnode) {
//console.log('updateStateForActiveUser') //console.log('updateStateForActiveUser')
if (-1 !== vnode.state.openedUser) { if (-1 !== vnode.state.openedUser) {
@ -8957,12 +8854,154 @@ function deleteActiveUser(vnode) {
} }
} }
function sortByCreated(var1, var2, dir) {
if (var1.created == var2.created) {
return 0;
}
var var1_date = new Date(var1.created);
var var2_date = new Date(var2.created); // kleiner als null => niedriger index, a kommt zuerst, b kommt als nächstes
// größer als null => höherer index, b kommt zuerst
if (dir == 'DESC') {
// descending
if (var1_date < var2_date) {
return 1;
} else {
return -1;
}
} else {
// ascending
if (var1_date < var2_date) {
return -1;
} else {
return 1;
}
}
}
function sortyByString(var1, var2, dir, field) {
if (var1[field] == var2[field]) {
return 0;
} // kleiner als null => niedriger index, a kommt zuerst, b kommt als nächstes
// größer als null => höherer index, b kommt zuerst
if (dir == 'DESC') {
// descending
if (var1[field] < var2[field]) {
return 1;
} else {
return -1;
}
} else {
// ascending
if (var1[field] < var2[field]) {
return -1;
} else {
return 1;
}
}
}
function sortByBalance(var1, var2, dir) {
if (var1.balance == var2.balance) {
return 0;
}
var var1_balance = parseFloat(var1.balance);
var var2_balance = parseFloat(var2.balance); // kleiner als null => niedriger index, a kommt zuerst, b kommt als nächstes
// größer als null => höherer index, b kommt zuerst
if (dir == 'DESC') {
// descending
if (var1_balance < var2_balance) {
return 1;
} else {
return -1;
}
} else {
// ascending
if (var1_balance < var2_balance) {
return -1;
} else {
return 1;
}
}
} // js sort work in place, so no copy is created
function sort(vnode, user) {
var field = vnode.state.order.field;
var dir = vnode.state.order.dir;
if (field == 'created') {
user.sort(function (var1, var2) {
return sortByCreated(var1, var2, dir);
});
} else if (field == 'name' || field == 'email' || field == 'pubkeyhex') {
user.sort(function (var1, var2) {
return sortyByString(var1, var2, dir, field);
});
} else if (field == 'balance') {
user.sort(function (var1, var2) {
return sortByBalance(var1, var2, dir);
});
}
}
function getArrow(vnode, fieldName) {
// Arrow-up: &#8593;
// Arrow-down: &#8595;
if (vnode.state.order.field == fieldName) {
if (vnode.state.order.dir == 'DESC') {
return _mithril["default"].trust('&#8595&nbsp;');
} else {
return _mithril["default"].trust('&#8593&nbsp;');
}
}
return _mithril["default"].trust('&nbsp;&nbsp;');
}
function view(vnode) { function view(vnode) {
// js sort work in place, so me made a deep copy first
var user_sorted = JSON.parse(JSON.stringify(vnode.state.orderedUsers));
if (vnode.state.order.field != 'default') {
sort(vnode, user_sorted);
}
return (0, _mithril["default"])('table.table.table-hover.table-sm', [(0, _mithril["default"])('thead', (0, _mithril["default"])('tr.solid-header', [(0, _mithril["default"])('th', { return (0, _mithril["default"])('table.table.table-hover.table-sm', [(0, _mithril["default"])('thead', (0, _mithril["default"])('tr.solid-header', [(0, _mithril["default"])('th', {
style: { style: {
'padding-left': '1.5rem' 'padding-left': '1.5rem'
} }
}), (0, _mithril["default"])('th', window.texte.NAME), (0, _mithril["default"])('th', window.texte.EMAIL), (0, _mithril["default"])('th', window.texte.BALANCE), (0, _mithril["default"])('th', _mithril["default"].trust(window.texte.PUBLIC_KEY)), (0, _mithril["default"])('th', window.texte.CREATED)])), (0, _mithril["default"])('tbody', vnode.state.orderedUsers.map(function (value, index) { }), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
onclick: function onclick() {
changeOrder(vnode, 'name');
},
className: 'grd_clickable'
}, [getArrow(vnode, 'name'), window.texte.NAME])), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
onclick: function onclick() {
changeOrder(vnode, 'email');
},
className: 'grd_clickable'
}, [getArrow(vnode, 'email'), window.texte.EMAIL])), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
onclick: function onclick() {
changeOrder(vnode, 'balance');
},
className: 'grd_clickable'
}, [getArrow(vnode, 'balance'), window.texte.BALANCE])), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
onclick: function onclick() {
changeOrder(vnode, 'pubkeyhex');
},
className: 'grd_clickable'
}, [getArrow(vnode, 'pubkeyhex'), _mithril["default"].trust(window.texte.PUBLIC_KEY)])), (0, _mithril["default"])('th', (0, _mithril["default"])('a', {
onclick: function onclick() {
changeOrder(vnode, 'created');
},
className: 'grd_clickable'
}, [getArrow(vnode, 'created'), window.texte.CREATED]))])), (0, _mithril["default"])('tbody', user_sorted.map(function (value, index) {
var open = vnode.state.openedUser === index; var open = vnode.state.openedUser === index;
return [(0, _mithril["default"])(_rowView["default"], { return [(0, _mithril["default"])(_rowView["default"], {
user: value, user: value,
@ -8989,7 +9028,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"./rowAction":24,"./rowView":25,"mithril":3}],24:[function(require,module,exports){ },{"./rowAction":22,"./rowView":23,"mithril":3}],22:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -9009,8 +9048,6 @@ var _copyCommunityLogin = _interopRequireDefault(require("./actions/copyCommunit
var _verificationResend = _interopRequireDefault(require("./actions/verificationResend")); var _verificationResend = _interopRequireDefault(require("./actions/verificationResend"));
var _mailtoVerificationResend = _interopRequireDefault(require("./actions/mailtoVerificationResend"));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
var checkTodoAction = new RegExp(/{{([a-z-]*)}}/); var checkTodoAction = new RegExp(/{{([a-z-]*)}}/);
@ -9034,9 +9071,6 @@ function getAction(name) {
case 'verification-resend': case 'verification-resend':
return _verificationResend["default"]; return _verificationResend["default"];
case 'mailto-verification-resend':
return _mailtoVerificationResend["default"];
} }
return null; return null;
@ -9077,7 +9111,7 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"./actions/copyCommunityLogin":17,"./actions/copyLoginCommunity":18,"./actions/deleteCommunityServer":19,"./actions/mailtoVerificationResend":20,"./actions/userTransactionsOverview":21,"./actions/verificationResend":22,"mithril":3}],25:[function(require,module,exports){ },{"./actions/copyCommunityLogin":16,"./actions/copyLoginCommunity":17,"./actions/deleteCommunityServer":18,"./actions/userTransactionsOverview":19,"./actions/verificationResend":20,"mithril":3}],23:[function(require,module,exports){
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
@ -9148,4 +9182,4 @@ var _default = {
}; };
exports["default"] = _default; exports["default"] = _default;
},{"../../lib/Gradido":9,"../../lib/Tooltip":10,"../../model/AccountState":13,"mithril":3}]},{},[8]); },{"../../lib/Gradido":9,"../../lib/Tooltip":10,"../../model/AccountState":12,"mithril":3}]},{},[8]);

File diff suppressed because one or more lines are too long

View File

@ -15,8 +15,10 @@ mit:
```ini ```ini
unsercure.allow_cors_all = 1 unsercure.allow_cors_all = 1
``` ```
Wird bei allen JSON-Requests zum Header: Access-Control-Allow-Origin:* Wird bei allen JSON-Requests zum Header hinzugefügt:
hinzugefügt. - Access-Control-Allow-Origin:*
- Access-Control-Allow-Headers: "Access-Control-Allow-Headers, Origin,Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers"
In diesen Beispielen gehe ich jetzt davon aus, das du das gesamte Gradido Projekt mit Docker gebaut hast und auf dem lokalen Rechner laufen lässt. In diesen Beispielen gehe ich jetzt davon aus, das du das gesamte Gradido Projekt mit Docker gebaut hast und auf dem lokalen Rechner laufen lässt.
@ -82,3 +84,129 @@ Wenn alles okay ist erhältst du:
```json ```json
{"state":"success"} {"state":"success"}
``` ```
## Update User Data
Update first name, last name, user language and enable/disable user
Language currently supported de and en
User will be disabled if he wants a account delete but has transactions.
Until transactions are saved in real blockchain, we need this data because the public key
is in db only saved in state_users so we wenn delete this entry, validating all transactions not longer possible.
Disabled User cannot login and cannot receive transactions.
In update Object only one of the sets needs to be there.
Update password can only be used if in Login-Server config:
```ini
unsecure.allow_passwort_via_json_request = 1
```
POST http://localhost/login_api/updateUserInfos
```json
{"session_id": -127182, "email": "max.musterman@gmail.de", "update": {
"User.first_name": "Max",
"User.last_name" : "Musterman",
"User.disabled": 0,
"User.language": "de"
"User.password": "1234"
}
}
```
also valid
```json
{"session_id": -127182, "email": "max.musterman@gmail.de", "update": {
"User.last_name" : "Musterman"
}
}
```
It returns if everything is okay
```json
{"state":"success", "valid_values": 4, "errors":[]}
```
- valid_values: should contain count of entrys in update if no error occured (User.password will not be counted)
- errors: contain on error string for every entry in update, which type isn't like expected
- password:
- "new password is the same as old password": no change taking place
- "password changed, coludn"t load private key for re-encryption": password was successfully changed, is at the moment only a warning as long as user_backups are unencrypted, safe to ignore
- "stored pubkey and private key didn't match": error by re-encryption keys, no changes saved
- "User.password isn't valid": if password validation failed, followed by reasons why (additional array in array)
example:
```json
{"errors":[
"User.password isn't valid",[
"Passwort: Dein Passwort ist zu kurz!\n",
"Passwort: Bitte gebe ein g&uuml;ltiges Password ein mit mindestens 8 Zeichen, Gro&szlig;- und Kleinbuchstaben, mindestens einer Zahl und einem Sonderzeichen (@$!%*?&+-_) ein!\n"
]
],
"state":"success",
"valid_values":0
}
```
## Retrieve User Data
Retrieve different user data, in ask only one field is needed, or every possible combination
from the available fields
Normal User can only retrieve data for himself, admins (login-server admin) can retrieve data from every user
Email is also the email address of user from which data are asked
POST http://localhost/login_api/getUserInfos
```json
{"session_id": -127182, "email": "max.musterman@gmail.de", "ask": [
"EmailVerificationCode.Register",
"loginServer.path",
"user.pubkeyhex",
"user.first_name",
"user.last_name",
"user.disabled",
"user.email_checked",
]
}
```
returns if no error occured:
```json
{"state": "success", "userData": {
"EmailVerificationCode.Register": "2718271129122",
"pubkeyhex": "131c7f68dd94b2be4c913400ff7ff4cdc03ac2bda99c2d29edcacb3b065c67e6",
"first_name": "Max",
"last_name": "Musterman",
"disabled": 0,
"email_checked": 1
}, "server": {
"loginServer.path": "http://localhost/account"
},
"errors": []
}
```
Return only the fields which are defined in ask
- EmailVerificationCode.Register: return the email verification code for check email (create one if none exist), work only if logged in user is admin and the email isn't from him
- loginServer.path: the redirect path to login-server, for example for login with login-server html frontend
- user.pubkeyhex: public key of user in hex-format
- user.first_name: first name of user
- user.last_name: last name of user
- user.disabled: User will be disabled if he wants a account delete but has transactions.
Until transactions are saved in real blockchain, we need this data because the public key
is in db only saved in state_users so we wenn delete this entry, validating all transactions not longer possible.
Disabled User cannot login and cannot receive transactions.
- email_checked: If user has clicked on link in verification email (register), can only transfer gradidos if email_checked is 1
- errors: array of strings if error occure
## Login by Email Verification Code
Used for replace http://localhost/account/checkEmail
Can be used to set check_email to 1 (will be done automaticly if called with valid email verification code of type register or registerDirect)
Can be used for password reset (additional step required: call update user info with new password)
GET http://localhost/login_api/loginViaEmailVerificationCode?emailVerificationCode=382738273892983
return
```json
{"state":"success", "email_verification_code_type":"resetPassword","info":[],"session_id":1853761475}
```
- email_verification_code_type
- resetPassword: for password resets, will be deleted immediately, is a only one use code
- registerDirect: code generated by register for check email
- register: code generated by auto-register via elopage for check email
- info can contain additional info strings
- user hasn't password: if user hasn't set a password yet (for example if he was registered via elopage)
- email already activated: if email was already checked
- session_id: session_id for new session

22
frontend/.babelrc Normal file
View File

@ -0,0 +1,22 @@
{
"presets": [
[
"@babel/preset-env"
]
],
"env": {
"test": {
"plugins": ["require-context-hook"],
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": "10"
}
}
]
]
}
}
}

3
frontend/.eslintignore Normal file
View File

@ -0,0 +1,3 @@
node_modules
**/*.min.js
dist

View File

@ -1,14 +1,30 @@
module.exports = { module.exports = {
root: true, root: true,
env: { env: {
node: true browser: true,
}, node: true,
extends: ['plugin:vue/essential'], jest: true
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
}, },
parserOptions: { parserOptions: {
parser: 'babel-eslint' parser: 'babel-eslint'
},
extends: [
'plugin:vue/essential',
'plugin:prettier/recommended'
],
// required to lint *.vue files
plugins: [
'vue',
'prettier',
'jest'
],
// add your custom rules here
rules: {
'no-console': ['error'],
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'vue/component-name-in-template-casing': ['error', 'kebab-case'],
'prettier/prettier': ['error', {
htmlWhitespaceSensitivity: 'ignore'
}],
} }
}; }

2
frontend/.gitignore vendored
View File

@ -18,3 +18,5 @@ package-lock.json
*.ntvs* *.ntvs*
*.njsproj *.njsproj
*.sln *.sln
*~

8
frontend/.prettierrc.js Normal file
View File

@ -0,0 +1,8 @@
module.exports = {
semi: false,
printWidth: 100,
singleQuote: true,
trailingComma: "all",
tabWidth: 2,
bracketSpacing: true
};

View File

@ -1,14 +1,12 @@
module.exports = { module.exports = {
"presets": [ presets: ['@vue/app'],
"@vue/app" plugins: [
],
"plugins": [
[ [
"component", 'component',
{ {
"libraryName": "element-ui", libraryName: 'element-ui',
"styleLibraryName": "theme-chalk" styleLibraryName: 'theme-chalk',
} },
] ],
] ],
} }

View File

@ -1,12 +1,12 @@
// This configuration file is not used anywhere in the code, it's a hack to handle InteliJ relative path imports // This configuration file is not used anywhere in the code, it's a hack to handle InteliJ relative path imports
// Keep in sync with actual webpack aliases // Keep in sync with actual webpack aliases
const path = require('path'); const path = require('path')
module.exports = { module.exports = {
resolve: { resolve: {
alias: { alias: {
'@': path.resolve(__dirname, 'src') '@': path.resolve(__dirname, 'src'),
} },
} },
}; }

25
frontend/jest.config.js Normal file
View File

@ -0,0 +1,25 @@
module.exports = {
verbose: true,
collectCoverageFrom: ['**/*.{js,vue}', '!**/node_modules/**', '!**/?(*.)+(spec|test).js?(x)'],
moduleFileExtensions: [
'js',
//'jsx',
'json',
'vue',
],
coverageReporters: ['lcov'],
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1',
},
transform: {
'^.+\\.vue$': 'vue-jest',
// '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
'^.+\\.(js|jsx)?$': 'babel-jest',
},
//setupFiles: [
// "<rootDir>/test/registerContext.js"
//],
testMatch: ['**/?(*.)+(spec|test).js?(x)'],
// snapshotSerializers: ['jest-serializer-vue'],
transformIgnorePatterns: ['<rootDir>/node_modules/'],
}

View File

@ -1,17 +1,22 @@
{ {
"name": "bootstrap-vue-gradido-wallet", "name": "bootstrap-vue-gradido-wallet",
"version": "0.9.1", "version": "0.9.2",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "node server.js", "start": "node server.js",
"serve": "vue-cli-service serve --open", "serve": "vue-cli-service serve --open",
"build": "vue-cli-service build", "build": "vue-cli-service build",
"lint": "vue-cli-service lint", "lint": "eslint --ext .js,.vue .",
"dev": "yarn run serve", "dev": "yarn run serve",
"i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'" "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'",
"test": "jest"
}, },
"dependencies": { "dependencies": {
"@vue/test-utils": "^1.1.3",
"axios": "^0.21.1", "axios": "^0.21.1",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^26.6.3",
"babel-plugin-require-context-hook": "^1.0.0",
"bootstrap": "4.3.1", "bootstrap": "4.3.1",
"bootstrap-vue": "^2.5.0", "bootstrap-vue": "^2.5.0",
"chart.js": "^2.9.3", "chart.js": "^2.9.3",
@ -22,18 +27,29 @@
"element-ui": "2.4.11", "element-ui": "2.4.11",
"es6-promise": "^4.1.1", "es6-promise": "^4.1.1",
"eslint": "^5.16.0", "eslint": "^5.16.0",
"eslint-plugin-vue": "^7.5.0", "eslint-config-prettier": "^8.1.0",
"eslint-config-standard": "^16.0.2",
"eslint-loader": "^4.0.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.3.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-promise": "^4.3.1",
"eslint-plugin-standard": "^5.0.0",
"eslint-plugin-vue": "^7.8.0",
"express": "^4.17.1", "express": "^4.17.1",
"flatpickr": "^4.5.7", "flatpickr": "^4.5.7",
"fuse.js": "^3.2.0", "fuse.js": "^3.2.0",
"google-maps": "^3.2.1", "google-maps": "^3.2.1",
"jest": "^26.6.3",
"nouislider": "^12.1.0", "nouislider": "^12.1.0",
"particles-bg-vue": "1.2.3", "particles-bg-vue": "1.2.3",
"perfect-scrollbar": "^1.3.0", "perfect-scrollbar": "^1.3.0",
"prettier": "^2.2.1",
"qrcode": "^1.4.4", "qrcode": "^1.4.4",
"quill": "^1.3.6", "quill": "^1.3.6",
"sweetalert2": "^9.5.4", "sweetalert2": "^9.5.4",
"vee-validate": "^3.2.1", "vee-validate": "^3.4.5",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-bootstrap-typeahead": "^0.2.6", "vue-bootstrap-typeahead": "^0.2.6",
"vue-chartjs": "^3.5.0", "vue-chartjs": "^3.5.0",
@ -44,6 +60,7 @@
"vue-flatpickr-component": "^8.1.2", "vue-flatpickr-component": "^8.1.2",
"vue-good-table": "^2.21.3", "vue-good-table": "^2.21.3",
"vue-i18n": "^8.22.4", "vue-i18n": "^8.22.4",
"vue-jest": "^3.0.7",
"vue-moment": "^4.1.0", "vue-moment": "^4.1.0",
"vue-qrcode": "^0.3.5", "vue-qrcode": "^0.3.5",
"vue-qrcode-reader": "^2.3.16", "vue-qrcode-reader": "^2.3.16",
@ -73,6 +90,6 @@
"last 2 versions", "last 2 versions",
"not ie <= 10" "not ie <= 10"
], ],
"author": "Bernd Hückstädt - https://www.gradido.net/", "author": "Gradido-Akademie - https://www.gradido.net/",
"description": "Gradido Wallet" "description": "Gradido, the Natural Economy of Life, is a way to worldwide prosperity and peace in harmony with nature. - Gradido, die Natürliche Ökonomie des lebens, ist ein Weg zu weltweitem Wohlstand und Frieden in Harmonie mit der Natur."
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -1,11 +1,11 @@
<!-- <!--
========================================================= =========================================================
* Gradido Wallet - v0.0.1 * Gradido Konto - v0.0.1
========================================================= =========================================================
* Product Page: https://www.gradido.net * Product Page: https://www.gradido.net
* Copyright 2020 Bernd Hückstädt - Gradido (https://www.gradido.net) * Copyright 2021 Gradido-Akademie - (https://www.gradido.net)
* Coded by www.gradido.net * Coded by www.gradido.net
@ -21,7 +21,7 @@
<link rel="icon" type="image/png" sizes="96x96" href="<%= webpackConfig.output.publicPath %>favicon.png"> <link rel="icon" type="image/png" sizes="96x96" href="<%= webpackConfig.output.publicPath %>favicon.png">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>Gradido Wallet</title> <title>Gradido Account</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<!-- Fonts --> <!-- Fonts -->

View File

@ -1,7 +1,7 @@
var express = require('express'); var express = require('express')
var serveStatic = require('serve-static'); var serveStatic = require('serve-static')
var app = express(); var app = express()
app.use(serveStatic(__dirname + "/dist")); app.use(serveStatic(__dirname + '/dist'))
var port = process.env.PORT || 5000; var port = process.env.PORT || 5000
app.listen(port); app.listen(port)
// console.log('http://localhost:5000 server started.'); // console.log('http://localhost:5000 server started.');

View File

@ -1,34 +1,50 @@
<template> <template>
<div id="app" class="font-sans text-gray-800"> <div id="app" class="font-sans text-gray-800">
<header class=""> <header>
<b-col class="text-center">
<b-dropdown
size="sm"
split
variant="secondary"
:text="$t('language') + ' - ' + $i18n.locale"
class="m-md-2"
>
<b-dropdown-divider></b-dropdown-divider>
<b-dropdown-item @click.prevent="setLocale('de')">Deutsch</b-dropdown-item>
<b-dropdown-item @click.prevent="setLocale('en')">English</b-dropdown-item>
</b-dropdown>
</b-col>
</header> </header>
<div class=""> <div class="">
<particles-bg type="custom" :config="config" :bg="true" /> <particles-bg type="custom" :config="config" :bg="true" />
<router-view /> <router-view />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { ParticlesBg } from "particles-bg-vue"; import { ParticlesBg } from 'particles-bg-vue'
import icon from "./icon.js"; import icon from './icon.js'
import { localeChanged } from 'vee-validate'
export default { export default {
name: 'app', name: 'app',
components: { components: {
ParticlesBg ParticlesBg,
}, },
created () { created() {
//console.log("this.$cookies.get('gdd_session_id') ", this.$cookies.get('gdd_session_id') ) //console.log('xx', $cookies.get('gdd_lang'))
console.log(" $cookies.isKey('gdd_session_id') ", this.$cookies.isKey("gdd_session_id") ) //console.log('%cWillkommen bei Gradido %cgreen text', 'font-weight:bold', 'color: green')
if ( this.$cookies.isKey('gdd_session_id') ) { if ($cookies.isKey('gdd_session_id') == true) {
//this.$store.state.email = this.$cookies.get('gdd_u') //console.log('%cHey %c' + $cookies.get('gdd_u') + '', 'font-weight:bold', 'color: orange')
console.log("login to kontooverview") this.$store.commit('session_id', $cookies.get('gdd_session_id'))
this.$router.push('/KontoOverview') this.$store.commit('email', $cookies.get('gdd_u'))
}else { this.$store.commit('language', $cookies.get('gdd_lang'))
console.log("login to LOGIN") this.$i18n.locale = $cookies.get('gdd_lang')
this.$router.push("/Login") this.$router.push('overview')
} else {
//console.log('app.vue to Logout')
this.$store.dispatch('logout')
} }
}, },
data() { data() {
@ -43,33 +59,64 @@ export default {
body: icon, body: icon,
alpha: [0.6, 0], alpha: [0.6, 0],
scale: [0.1, 0.4], scale: [0.1, 0.4],
position: "all", position: 'all',
cross: "dead", cross: 'dead',
random: 2, random: 2,
}, },
}; }
},
methods: {
setLocale(locale) {
this.$i18n.locale = locale
this.$store.commit('language', this.$i18n.locale)
localeChanged(locale)
},
}, },
} }
</script> </script>
<style> <style>
.btn { .btn-primary pim {
background-color: #5A7B02; background-color: #5a7b02;
border-color: #5e72e4; border-color: #5e72e4;
} }
a, .copyright{ a,
color: #5A7B02; .copyright {
} color: #5a7b02;
gradido-global-color-text{color: #3D443B } }
gradido-global-color-accent{color: #047006 } gradido-global-color-text {
gradido-global-color-6e0a9c9e{color: #000 } color: #3d443b;
gradido-global-color-2d0fb154{color: #047006 } }
gradido-global-color-16efe88c{color: #7EBC55 } gradido-global-color-accent {
gradido-global-color-1939326{color: #F6FFF6 } color: #047006;
gradido-global-color-9d79fc1{color: #047006 } }
gradido-global-color-6347f4d{color: #5A7B02 } gradido-global-color-6e0a9c9e {
gradido-global-color-4fbc19a{color: #014034 } color: #000;
gradido-global-color-d341874{color: #B6D939 } }
gradido-global-color-619d338{color: #8EBFB1 } gradido-global-color-2d0fb154 {
gradido-global-color-44819a9{color: #026873 } color: #047006;
}
gradido-global-color-16efe88c {
color: #7ebc55;
}
gradido-global-color-1939326 {
color: #f6fff6;
}
gradido-global-color-9d79fc1 {
color: #047006;
}
gradido-global-color-6347f4d {
color: #5a7b02;
}
gradido-global-color-4fbc19a {
color: #014034;
}
gradido-global-color-d341874 {
color: #b6d939;
}
gradido-global-color-619d338 {
color: #8ebfb1;
}
gradido-global-color-44819a9 {
color: #026873;
}
</style> </style>

View File

@ -1,33 +1,33 @@
import axios from 'axios'; import axios from 'axios'
import CONFIG from '../config' import CONFIG from '../config'
const apiGet = async (url) => { const apiGet = async (url) => {
try { try {
const result = await axios.get(url); const result = await axios.get(url)
if(result.status !== 200){ if (result.status !== 200) {
throw new Error('HTTP Status Error '+result.status) throw new Error('HTTP Status Error ' + result.status)
} }
if(result.data.state !== 'success'){ if (result.data.state !== 'success') {
throw new Error(result.data.msg) throw new Error(result.data.msg)
} }
return { success: true, result } return { success: true, result }
} catch(error){ } catch (error) {
return { success: false, result: error} return { success: false, result: error }
} }
} }
const apiPost = async (url, payload) => { const apiPost = async (url, payload) => {
try { try {
const result = await axios.post(url, payload); const result = await axios.post(url, payload)
if(result.status !== 200){ if (result.status !== 200) {
throw new Error('HTTP Status Error '+result.status) throw new Error('HTTP Status Error ' + result.status)
} }
if(result.data.state !== 'success'){ if (result.data.state !== 'success') {
throw new Error(result.data.msg) throw new Error(result.data.msg)
} }
return { success: true, result } return { success: true, result }
} catch(error){ } catch (error) {
return { success: false, result: error} return { success: false, result: error }
} }
} }
@ -38,17 +38,27 @@ const communityAPI = {
transactions: async (session_id) => { transactions: async (session_id) => {
return apiGet(CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'ajaxListTransactions/' + session_id) return apiGet(CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'ajaxListTransactions/' + session_id)
}, },
create: async (session_id, email, amount, memo, target_date = new Date() ) => { /*create: async (session_id, email, amount, memo, target_date = new Date() ) => {
const payload = { const payload = {
session_id, session_id,
email, email,
amount, amount,
target_date, target_date,
memo, memo,
auto_sign: true auto_sign: true,
} }
return apiPost(CONFIG.COMMUNITY_API_TRANSACTION_CREATION_URL + 'ajaxCreate/', payload) return apiPost(CONFIG.COMMUNITY_API_TRANSACTION_CREATION_URL + 'ajaxCreate/', payload)
},*/
send: async (session_id, email, amount, memo) => {
const payload = {
session_id,
email,
amount,
memo,
auto_sign: true,
} }
return apiPost(CONFIG.COMMUNITY_API_TRANSACTION_SEND_COINS + 'ajaxCreate/', payload)
},
} }
export default communityAPI export default communityAPI

View File

@ -1,4 +1,4 @@
import axios from 'axios'; import axios from 'axios'
import CONFIG from '../config' import CONFIG from '../config'
// control email-text sended with email verification code // control email-text sended with email verification code
@ -9,16 +9,16 @@ const EMAIL_TYPE = {
const apiPost = async (url, payload) => { const apiPost = async (url, payload) => {
try { try {
const result = await axios.post(url, payload); const result = await axios.post(url, payload)
if(result.status !== 200){ if (result.status !== 200) {
throw new Error('HTTP Status Error '+result.status) throw new Error('HTTP Status Error ' + result.status)
} }
if(result.data.state !== 'success'){ if (result.data.state !== 'success') {
throw new Error(result.data.msg) throw new Error(result.data.msg)
} }
return { success: true, result } return { success: true, result }
} catch(error){ } catch (error) {
return { success: false, result: error} return { success: false, result: error }
} }
} }
@ -31,17 +31,17 @@ const loginAPI = {
return apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', payload) return apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', payload)
}, },
logout: async (session_id) => { logout: async (session_id) => {
const payload= { session_id } const payload = { session_id }
return apiPost(CONFIG.LOGIN_API_URL + 'logout', payload) return apiPost(CONFIG.LOGIN_API_URL + 'logout', payload)
}, },
create : async (email, first_name, last_name, password) => { create: async (email, first_name, last_name, password) => {
const payload = { const payload = {
email, email,
first_name, first_name,
last_name, last_name,
password, password,
emailType: EMAIL_TYPE.DEFAULT, emailType: EMAIL_TYPE.DEFAULT,
login_after_register: true login_after_register: true,
} }
return apiPost(CONFIG.LOGIN_API_URL + 'createUser', payload) return apiPost(CONFIG.LOGIN_API_URL + 'createUser', payload)
}, },

View File

@ -1,50 +1,45 @@
<template> <template>
<b-badge <b-badge :variant="type" :pill="rounded" :size="size" :class="{ 'badge-circle': circle }">
:variant="type"
:pill="rounded"
:size="size"
:class="{'badge-circle': circle }">
<slot> <slot>
<i v-if="icon" :class="icon"></i> <i v-if="icon" :class="icon"></i>
</slot> </slot>
</b-badge> </b-badge>
</template> </template>
<script> <script>
export default { export default {
name: "badge", name: 'badge',
props: { props: {
tag: { tag: {
type: String, type: String,
default: "span", default: 'span',
description: "Html tag to use for the badge." description: 'Html tag to use for the badge.',
}, },
rounded: { rounded: {
type: Boolean, type: Boolean,
default: false, default: false,
description: "Whether badge is of pill type" description: 'Whether badge is of pill type',
}, },
circle: { circle: {
type: Boolean, type: Boolean,
default: false, default: false,
description: "Whether badge is circle" description: 'Whether badge is circle',
}, },
icon: { icon: {
type: String, type: String,
default: "", default: '',
description: "Icon name. Will be overwritten by slot if slot is used" description: 'Icon name. Will be overwritten by slot if slot is used',
}, },
type: { type: {
type: String, type: String,
default: "default", default: 'default',
description: "Badge type (primary|info|danger|default|warning|success)" description: 'Badge type (primary|info|danger|default|warning|success)',
}, },
size: { size: {
type: String, type: String,
description: 'Badge size (md, lg)', description: 'Badge size (md, lg)',
default: '' default: '',
} },
} },
}; }
</script> </script>
<style> <style></style>
</style>

View File

@ -8,7 +8,6 @@
> >
<slot v-if="!dismissible"></slot> <slot v-if="!dismissible"></slot>
<template v-else> <template v-else>
<template v-if="icon || $slots.icon"> <template v-if="icon || $slots.icon">
<slot name="icon"> <slot name="icon">
<span class="alert-icon" data-notify="icon"> <span class="alert-icon" data-notify="icon">
@ -17,14 +16,16 @@
</slot> </slot>
</template> </template>
<span class="alert-text"> <slot></slot> </span> <span class="alert-text"><slot></slot></span>
<slot name="dismiss-icon"> <slot name="dismiss-icon">
<button type="button" <button
type="button"
class="close" class="close"
data-dismiss="alert" data-dismiss="alert"
aria-label="Close" aria-label="Close"
@click="dismissAlert"> @click="dismissAlert"
>
<span aria-hidden="true">×</span> <span aria-hidden="true">×</span>
</button> </button>
</slot> </slot>
@ -33,39 +34,43 @@
</fade-transition> </fade-transition>
</template> </template>
<script> <script>
import { FadeTransition } from 'vue2-transitions'; import { FadeTransition } from 'vue2-transitions'
export default { export default {
name: 'base-alert', name: 'base-alert',
components: { components: {
FadeTransition FadeTransition,
},
created() {
//console.log('base-alert gesetzt in =>', this.$route.path)
}, },
props: { props: {
type: { type: {
type: String, type: String,
default: 'default', default: 'default',
description: 'Alert type' description: 'Alert type',
}, },
dismissible: { dismissible: {
type: Boolean, type: Boolean,
default: false, default: false,
description: 'Whether alert is dismissible (closeable)' description: 'Whether alert is dismissible (closeable)',
}, },
icon: { icon: {
type: String, type: String,
default: '', default: '',
description: 'Alert icon to display' description: 'Alert icon to display',
} },
}, },
data() { data() {
return { return {
visible: true visible: true,
}; }
}, },
methods: { methods: {
dismissAlert() { dismissAlert() {
this.visible = false; this.visible = false
} this.$store.state.loginfail = false
} },
}; },
}
</script> </script>

View File

@ -12,7 +12,7 @@
{ 'btn-wd': wide }, { 'btn-wd': wide },
{ 'btn-icon btn-fab': icon }, { 'btn-icon btn-fab': icon },
{ 'btn-link': link }, { 'btn-link': link },
{ disabled: disabled } { disabled: disabled },
]" ]"
> >
<slot name="loading"> <slot name="loading">
@ -34,36 +34,36 @@ export default {
type: { type: {
type: String, type: String,
default: 'default', default: 'default',
description: 'Button type (primary|secondary|danger etc)' description: 'Button type (primary|secondary|danger etc)',
}, },
nativeType: { nativeType: {
type: String, type: String,
default: 'button', default: 'button',
description: 'Button native type (e.g button, input etc)' description: 'Button native type (e.g button, input etc)',
}, },
size: { size: {
type: String, type: String,
default: '', default: '',
description: 'Button size (sm|lg)' description: 'Button size (sm|lg)',
}, },
outline: { outline: {
type: Boolean, type: Boolean,
description: 'Whether button is outlined (only border has color)' description: 'Whether button is outlined (only border has color)',
}, },
link: { link: {
type: Boolean, type: Boolean,
description: 'Whether button is a link (no borders or background)' description: 'Whether button is a link (no borders or background)',
} },
}, },
methods: { methods: {
handleClick(evt) { handleClick(evt) {
this.$emit('click', evt); this.$emit('click', evt)
} },
} },
}; }
</script> </script>
<style lang="scss"> <style lang="scss">
.base-button { .base-button {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -71,5 +71,5 @@ export default {
i { i {
padding: 0 3px; padding: 0 3px;
} }
} }
</style> </style>

View File

@ -9,22 +9,19 @@
<component <component
:is="titleTag" :is="titleTag"
class="btn-rotate" class="btn-rotate"
:class="[{'dropdown-toggle': hasToggle}, titleClasses]" :class="[{ 'dropdown-toggle': hasToggle }, titleClasses]"
:aria-expanded="isOpen" :aria-expanded="isOpen"
data-toggle="dropdown" data-toggle="dropdown"
> >
<slot name="title" :is-open="isOpen"> <slot name="title" :is-open="isOpen">
<i :class="icon"></i> {{ title }} <i :class="icon"></i>
{{ title }}
</slot> </slot>
</component> </component>
</slot> </slot>
<ul <ul
class="dropdown-menu" class="dropdown-menu"
:class="[ :class="[{ show: isOpen }, { 'dropdown-menu-right': menuOnRight }, menuClasses]"
{ show: isOpen },
{ 'dropdown-menu-right': menuOnRight },
menuClasses
]"
> >
<slot></slot> <slot></slot>
</ul> </ul>
@ -37,60 +34,60 @@ export default {
tag: { tag: {
type: String, type: String,
default: 'div', default: 'div',
description: 'Dropdown html tag (e.g div, ul etc)' description: 'Dropdown html tag (e.g div, ul etc)',
}, },
titleTag: { titleTag: {
type: String, type: String,
default: 'button', default: 'button',
description: 'Dropdown title (toggle) html tag' description: 'Dropdown title (toggle) html tag',
}, },
title: { title: {
type: String, type: String,
description: 'Dropdown title' description: 'Dropdown title',
}, },
direction: { direction: {
type: String, type: String,
default: 'down', // up | down default: 'down', // up | down
description: 'Dropdown menu direction (up|down)' description: 'Dropdown menu direction (up|down)',
}, },
icon: { icon: {
type: String, type: String,
description: 'Dropdown icon' description: 'Dropdown icon',
}, },
titleClasses: { titleClasses: {
type: [String, Object, Array], type: [String, Object, Array],
description: 'Title css classes' description: 'Title css classes',
}, },
menuClasses: { menuClasses: {
type: [String, Object], type: [String, Object],
description: 'Menu css classes' description: 'Menu css classes',
}, },
menuOnRight: { menuOnRight: {
type: Boolean, type: Boolean,
description: 'Whether menu should appear on the right' description: 'Whether menu should appear on the right',
}, },
hasToggle: { hasToggle: {
type: Boolean, type: Boolean,
description: 'Whether dropdown has arrow icon shown', description: 'Whether dropdown has arrow icon shown',
default: true default: true,
} },
}, },
data() { data() {
return { return {
isOpen: false isOpen: false,
}; }
}, },
methods: { methods: {
toggleDropDown() { toggleDropDown() {
this.isOpen = !this.isOpen; this.isOpen = !this.isOpen
this.$emit('change', this.isOpen); this.$emit('change', this.isOpen)
}, },
closeDropDown() { closeDropDown() {
this.isOpen = false; this.isOpen = false
this.$emit('change', false); this.$emit('change', false)
} },
} },
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.dropdown { .dropdown {

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="header" :class="{[`bg-${type}`]: type}"> <div class="header" :class="{ [`bg-${type}`]: type }">
<b-container fluid> <b-container fluid>
<div class="header-body"> <div class="header-body">
<slot></slot> <slot></slot>
@ -8,16 +8,15 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'base-header', name: 'base-header',
props: { props: {
type: { type: {
type: String, type: String,
default: 'success', default: 'success',
description: 'Header background type' description: 'Header background type',
} },
} },
} }
</script> </script>
<style> <style></style>
</style>

View File

@ -1,14 +1,27 @@
<template> <template>
<div> <div>
<b-pagination first-number last-number :per-page="perPage" :size="size" :value="value" @change="(val) => $emit('change', val)" :align="align" :total-rows="total"> <b-pagination
first-number
last-number
:per-page="perPage"
:size="size"
:value="value"
@change="(val) => $emit('change', val)"
:align="align"
:total-rows="total"
>
<template v-slot:prev-text> <template v-slot:prev-text>
<a class="page-link" aria-label="Previous"> <a class="page-link" aria-label="Previous">
<span aria-hidden="true"><i class="fa fa-angle-left" aria-hidden="true"></i></span> <span aria-hidden="true">
<i class="fa fa-angle-left" aria-hidden="true"></i>
</span>
</a> </a>
</template> </template>
<template v-slot:next-text> <template v-slot:next-text>
<a class="page-link" aria-label="Next"> <a class="page-link" aria-label="Next">
<span aria-hidden="true"><i class="fa fa-angle-right" aria-hidden="true"></i></span> <span aria-hidden="true">
<i class="fa fa-angle-right" aria-hidden="true"></i>
</span>
</a> </a>
</template> </template>
</b-pagination> </b-pagination>
@ -16,41 +29,39 @@
</template> </template>
<script> <script>
export default { export default {
name: "base-pagination", name: 'base-pagination',
props: { props: {
pageCount: { pageCount: {
type: Number, type: Number,
default: 0, default: 0,
description: description: 'Pagination page count. This should be specified in combination with perPage',
"Pagination page count. This should be specified in combination with perPage"
}, },
perPage: { perPage: {
type: Number, type: Number,
default: 10, default: 10,
description: description: 'Pagination per page. Should be specified with total or pageCount',
"Pagination per page. Should be specified with total or pageCount"
}, },
total: { total: {
type: Number, type: Number,
default: 0, default: 0,
description: description:
"Can be specified instead of pageCount. The page count in this case will be total/perPage" 'Can be specified instead of pageCount. The page count in this case will be total/perPage',
}, },
value: { value: {
type: Number, type: Number,
default: 1, default: 1,
description: "Pagination value" description: 'Pagination value',
}, },
size: { size: {
type: String, type: String,
default: "", default: '',
description: "Pagination size" description: 'Pagination size',
}, },
align: { align: {
type: String, type: String,
default: "", default: '',
description: "Pagination alignment (e.g center|start|end)" description: 'Pagination alignment (e.g center|start|end)',
}
}, },
}; },
}
</script> </script>

View File

@ -3,82 +3,77 @@
<div :class="`progress-${type}`" v-if="showLabel"> <div :class="`progress-${type}`" v-if="showLabel">
<div class="progress-label"> <div class="progress-label">
<slot name="label"> <slot name="label">
<span>{{label}}</span> <span>{{ label }}</span>
</slot> </slot>
</div> </div>
<div class="progress-percentage"> <div class="progress-percentage">
<slot> <slot>
<span>{{value}}%</span> <span>{{ value }}%</span>
</slot> </slot>
</div> </div>
</div> </div>
<b-progress <b-progress :size="size" :class="[progressClasses]" :style="`height: ${height}px`">
:size="size"
:class="[progressClasses]"
:style="`height: ${height}px`">
<b-progress-bar :class="computedClasses" :value="value"></b-progress-bar> <b-progress-bar :class="computedClasses" :value="value"></b-progress-bar>
</b-progress> </b-progress>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "base-progress", name: 'base-progress',
props: { props: {
striped: { striped: {
type: Boolean, type: Boolean,
description: "Whether progress is striped" description: 'Whether progress is striped',
}, },
animated: { animated: {
type: Boolean, type: Boolean,
description: description: 'Whether progress is animated (works only with `striped` prop together)',
"Whether progress is animated (works only with `striped` prop together)"
}, },
label: { label: {
type: String, type: String,
description: "Progress label (shown on the left above progress)" description: 'Progress label (shown on the left above progress)',
}, },
height: { height: {
type: Number, type: Number,
default: 3, default: 3,
description: "Progress line height" description: 'Progress line height',
}, },
type: { type: {
type: String, type: String,
default: "default", default: 'default',
description: "Progress type (e.g danger, primary etc)" description: 'Progress type (e.g danger, primary etc)',
}, },
showLabel: { showLabel: {
type: Boolean, type: Boolean,
default: false default: false,
}, },
progressClasses: { progressClasses: {
type: [Array, String], type: [Array, String],
default: '', default: '',
description: 'Progress css classes' description: 'Progress css classes',
}, },
size: { size: {
type: String, type: String,
default: '' default: '',
}, },
value: { value: {
type: Number, type: Number,
default: 0, default: 0,
validator: value => { validator: (value) => {
return value >= 0 && value <= 100; return value >= 0 && value <= 100
},
description: 'Progress value',
}, },
description: "Progress value"
}
}, },
computed: { computed: {
computedClasses() { computedClasses() {
return [ return [
{ "progress-bar-striped": this.striped }, { 'progress-bar-striped': this.striped },
{ "progress-bar-animated": this.animated }, { 'progress-bar-animated': this.animated },
{ [`bg-${this.type}`]: this.type } { [`bg-${this.type}`]: this.type },
]; ]
} },
} },
}; }
</script> </script>
<style> <style></style>
</style>

View File

@ -2,56 +2,55 @@
<div class="slider" :disabled="disabled"></div> <div class="slider" :disabled="disabled"></div>
</template> </template>
<script> <script>
import noUiSlider from 'nouislider'; import noUiSlider from 'nouislider'
export default { export default {
name: 'base-slider', name: 'base-slider',
props: { props: {
value: { value: {
type: [String, Array, Number], type: [String, Array, Number],
description: 'slider value' description: 'slider value',
}, },
disabled: { disabled: {
type: Boolean, type: Boolean,
default: false, default: false,
description: 'whether the slider is disabled' description: 'whether the slider is disabled',
}, },
start: { start: {
type: [Number, Array], type: [Number, Array],
default: 0, default: 0,
description: description:
'[noUi Slider start](https://refreshless.com/nouislider/slider-options/#section-start)' '[noUi Slider start](https://refreshless.com/nouislider/slider-options/#section-start)',
}, },
connect: { connect: {
type: [Boolean, Array], type: [Boolean, Array],
default: () => [true, false], default: () => [true, false],
description: description:
'[noUi Slider connect](https://refreshless.com/nouislider/slider-options/#section-connect)' '[noUi Slider connect](https://refreshless.com/nouislider/slider-options/#section-connect)',
}, },
range: { range: {
type: Object, type: Object,
default: () => { default: () => {
return { return {
min: 0, min: 0,
max: 100 max: 100,
}; }
}, },
description: description:
'[noUi Slider range](https://refreshless.com/nouislider/slider-values/#section-range)' '[noUi Slider range](https://refreshless.com/nouislider/slider-values/#section-range)',
}, },
options: { options: {
type: Object, type: Object,
default: () => { default: () => {
return {}; return {}
},
description: '[noUi Slider options](https://refreshless.com/nouislider/slider-options/)',
}, },
description:
'[noUi Slider options](https://refreshless.com/nouislider/slider-options/)'
}
}, },
data() { data() {
return { return {
slider: null slider: null,
}; }
}, },
methods: { methods: {
createSlider() { createSlider() {
@ -59,38 +58,35 @@ export default {
start: this.value || this.start, start: this.value || this.start,
connect: Array.isArray(this.value) ? true : this.connect, connect: Array.isArray(this.value) ? true : this.connect,
range: this.range, range: this.range,
...this.options ...this.options,
}); })
const slider = this.$el.noUiSlider; const slider = this.$el.noUiSlider
slider.on('slide', () => { slider.on('slide', () => {
let value = slider.get(); let value = slider.get()
if (value !== this.value) { if (value !== this.value) {
this.$emit('input', value); this.$emit('input', value)
}
});
} }
})
},
}, },
mounted() { mounted() {
this.createSlider(); this.createSlider()
}, },
watch: { watch: {
value(newValue, oldValue) { value(newValue, oldValue) {
const slider = this.$el.noUiSlider; const slider = this.$el.noUiSlider
const sliderValue = slider.get(); const sliderValue = slider.get()
if (newValue !== oldValue && sliderValue !== newValue) { if (newValue !== oldValue && sliderValue !== newValue) {
if (Array.isArray(sliderValue) && Array.isArray(newValue)) { if (Array.isArray(sliderValue) && Array.isArray(newValue)) {
if ( if (oldValue.length === newValue.length && oldValue.every((v, i) => v === newValue[i])) {
oldValue.length === newValue.length && slider.set(newValue)
oldValue.every((v, i) => v === newValue[i])
) {
slider.set(newValue);
} }
} else { } else {
slider.set(newValue); slider.set(newValue)
} }
} }
} },
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -10,10 +10,7 @@
<tbody :class="tbodyClasses"> <tbody :class="tbodyClasses">
<tr v-for="(item, index) in data" :key="index"> <tr v-for="(item, index) in data" :key="index">
<slot :row="item" :index="index"> <slot :row="item" :index="index">
<td <td v-for="(column, index) in columns" :key="index">
v-for="(column, index) in columns"
:key="index"
>
{{ itemValue(item, column) }} {{ itemValue(item, column) }}
</td> </td>
</slot> </slot>
@ -28,42 +25,42 @@ export default {
columns: { columns: {
type: Array, type: Array,
default: () => [], default: () => [],
description: 'Table columns' description: 'Table columns',
}, },
data: { data: {
type: Array, type: Array,
default: () => [], default: () => [],
description: 'Table data' description: 'Table data',
}, },
type: { type: {
type: String, // striped | hover type: String, // striped | hover
default: '', default: '',
description: 'Whether table is striped or hover type' description: 'Whether table is striped or hover type',
}, },
theadClasses: { theadClasses: {
type: String, type: String,
default: '', default: '',
description: '<thead> css classes' description: '<thead> css classes',
}, },
tbodyClasses: { tbodyClasses: {
type: String, type: String,
default: '', default: '',
description: '<tbody> css classes' description: '<tbody> css classes',
} },
}, },
computed: { computed: {
tableClass() { tableClass() {
return this.type && `table-${this.type}`; return this.type && `table-${this.type}`
} },
}, },
methods: { methods: {
hasValue(item, column) { hasValue(item, column) {
return item[column.toLowerCase()] !== 'undefined'; return item[column.toLowerCase()] !== 'undefined'
}, },
itemValue(item, column) { itemValue(item, column) {
return item[column.toLowerCase()]; return item[column.toLowerCase()]
} },
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -1,7 +1,6 @@
<template> <template>
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<b-breadcrumb <b-breadcrumb :class="[{ [`bg-${type}`]: type }, listClasses]">
:class="[{[`bg-${type}`]: type}, listClasses]">
<slot></slot> <slot></slot>
</b-breadcrumb> </b-breadcrumb>
</nav> </nav>
@ -13,14 +12,14 @@ export default {
type: { type: {
type: String, type: String,
default: '', default: '',
description: 'Breadcrumb background type' description: 'Breadcrumb background type',
}, },
listClasses: { listClasses: {
type: [String, Object], type: [String, Object],
default: '', default: '',
description: 'Breadcrumb list classes' description: 'Breadcrumb list classes',
} },
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -10,9 +10,9 @@ export default {
active: { active: {
type: Boolean, type: Boolean,
default: false, default: false,
description: 'Whether breadcrumb item is active' description: 'Whether breadcrumb item is active',
} },
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -1,43 +1,40 @@
<template> <template>
<bread-crumb list-classes="breadcrumb-links breadcrumb-dark"> <bread-crumb list-classes="breadcrumb-links breadcrumb-dark">
<BreadCrumbItem> <bread-crumb-item>
<router-link to="/"> <router-link to="/overview">
<i class="fas fa-home"></i> <i class="fas fa-home"></i>
</router-link> </router-link>
</BreadCrumbItem> </bread-crumb-item>
<BreadCrumbItem <bread-crumb-item
v-for="(route, index) in $route.matched.slice()" v-for="(route, index) in $route.matched.slice()"
:key="route.name" :key="route.name"
:active="index === $route.matched.length - 1" :active="index === $route.matched.length - 1"
style="display:inline-block" style="display: inline-block"
>
<router-link
:to="{ name: route.name }"
v-if="index < $route.matched.length - 1"
> >
<router-link :to="{ name: route.name }" v-if="index < $route.matched.length - 1">
{{ route.name }} {{ route.name }}
</router-link> </router-link>
<span v-else>{{ route.name }}</span> <span v-else>{{ route.name }}</span>
</BreadCrumbItem> </bread-crumb-item>
</bread-crumb> </bread-crumb>
</template> </template>
<script> <script>
import BreadCrumb from './Breadcrumb'; import BreadCrumb from './Breadcrumb'
import BreadCrumbItem from './BreadcrumbItem'; import BreadCrumbItem from './BreadcrumbItem'
export default { export default {
name: 'route-breadcrumb', name: 'route-breadcrumb',
components: { components: {
BreadCrumb, BreadCrumb,
BreadCrumbItem BreadCrumbItem,
}, },
methods: { methods: {
getBreadName(route) { getBreadName(route) {
return route.name; return route.name
} },
} },
}; }
</script> </script>
<style scoped></style> <style scoped></style>

View File

@ -1,27 +1,27 @@
<template> <template>
<div class="btn-group-toggle" data-toggle="buttons"> <div class="btn-group-toggle" data-toggle="buttons">
<label class="btn" :class="[{ active: value }, buttonClasses]"> <label class="btn" :class="[{ active: value }, buttonClasses]">
<input v-model="model" type="checkbox" checked="" autocomplete="off"> <input v-model="model" type="checkbox" checked="" autocomplete="off" />
<slot></slot> <slot></slot>
</label> </label>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'button-checkbox', name: 'button-checkbox',
props: { props: {
value: { value: {
type: Boolean, type: Boolean,
description: 'Checked value' description: 'Checked value',
}, },
buttonClasses: { buttonClasses: {
type: [String, Object], type: [String, Object],
description: 'Inner button css classes' description: 'Inner button css classes',
} },
}, },
model: { model: {
prop: 'value', prop: 'value',
event: 'change' event: 'change',
}, },
computed: { computed: {
model: { model: {
@ -30,10 +30,9 @@
}, },
set(val) { set(val) {
this.$emit('change', val) this.$emit('change', val)
} },
} },
} },
} }
</script> </script>
<style> <style></style>
</style>

View File

@ -1,35 +1,44 @@
<template> <template>
<div class="btn-group-toggle" data-toggle="buttons"> <div class="btn-group-toggle" data-toggle="buttons">
<label v-for="(option, index) in options" <label
v-for="(option, index) in options"
:key="index" :key="index"
class="btn" class="btn"
:class="[{ active: value === option.value }, buttonClasses]"> :class="[{ active: value === option.value }, buttonClasses]"
<input :value="option.value" v-model="model" type="radio" id="option1" autocomplete="off" checked=""> >
{{option.label}} <input
:value="option.value"
v-model="model"
type="radio"
id="option1"
autocomplete="off"
checked=""
/>
{{ option.label }}
</label> </label>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'button-radio-group', name: 'button-radio-group',
props: { props: {
options: { options: {
type: Array, type: Array,
description: 'Radio options. Should be an array of objects {value: "", label: ""}', description: 'Radio options. Should be an array of objects {value: "", label: ""}',
default: () => [] default: () => [],
}, },
value: { value: {
type: String, type: String,
description: 'Radio value' description: 'Radio value',
}, },
buttonClasses: { buttonClasses: {
type: [String, Object], type: [String, Object],
description: 'Inner button css classes' description: 'Inner button css classes',
} },
}, },
model: { model: {
prop: 'value', prop: 'value',
event: 'change' event: 'change',
}, },
computed: { computed: {
model: { model: {
@ -38,10 +47,9 @@
}, },
set(val) { set(val) {
this.$emit('change', val) this.$emit('change', val)
} },
} },
} },
} }
</script> </script>
<style> <style></style>
</style>

View File

@ -2,17 +2,16 @@
<b-card <b-card
no-body no-body
:class="[ :class="[
{'card-lift--hover': hover}, { 'card-lift--hover': hover },
{'shadow': shadow}, { shadow: shadow },
{[`shadow-${shadowSize}`]: shadowSize}, { [`shadow-${shadowSize}`]: shadowSize },
{[`bg-gradient-${gradient}`]: gradient}, { [`bg-gradient-${gradient}`]: gradient },
{[`bg-${type}`]: type} { [`bg-${type}`]: type },
]"> ]"
>
<slot name="image"></slot> <slot name="image"></slot>
<b-card-header :class="headerClasses" v-if="$slots.header"> <b-card-header :class="headerClasses" v-if="$slots.header">
<slot name="header"> <slot name="header"></slot>
</slot>
</b-card-header> </b-card-header>
<b-card-body :class="bodyClasses" v-if="!noBody"> <b-card-body :class="bodyClasses" v-if="!noBody">
<slot></slot> <slot></slot>
@ -26,48 +25,47 @@
</b-card> </b-card>
</template> </template>
<script> <script>
export default { export default {
name: "card", name: 'card',
props: { props: {
type: { type: {
type: String, type: String,
description: "Card type" description: 'Card type',
}, },
gradient: { gradient: {
type: String, type: String,
description: "Card background gradient type (warning,danger etc)" description: 'Card background gradient type (warning,danger etc)',
}, },
hover: { hover: {
type: Boolean, type: Boolean,
description: "Whether card should move on hover" description: 'Whether card should move on hover',
}, },
shadow: { shadow: {
type: Boolean, type: Boolean,
description: "Whether card has shadow" description: 'Whether card has shadow',
}, },
shadowSize: { shadowSize: {
type: String, type: String,
description: "Card shadow size" description: 'Card shadow size',
}, },
noBody: { noBody: {
type: Boolean, type: Boolean,
default: false, default: false,
description: "Whether card should have wrapper body class" description: 'Whether card should have wrapper body class',
}, },
bodyClasses: { bodyClasses: {
type: [String, Object, Array], type: [String, Object, Array],
description: "Card body css classes" description: 'Card body css classes',
}, },
headerClasses: { headerClasses: {
type: [String, Object, Array], type: [String, Object, Array],
description: "Card header css classes" description: 'Card header css classes',
}, },
footerClasses: { footerClasses: {
type: [String, Object, Array], type: [String, Object, Array],
description: "Card footer css classes" description: 'Card footer css classes',
} },
} },
}; }
</script> </script>
<style> <style></style>
</style>

View File

@ -1,57 +1,58 @@
<template> <template>
<card class="card-stats" :show-footer-line="true"> <card class="card-stats" :show-footer-line="true">
<b-row> <b-row>
<b-col> <b-col>
<slot> <slot>
<h5 class="card-title text-uppercase text-muted mb-0" v-if="title">{{title}}</h5> <h5 class="card-title text-uppercase text-muted mb-0" v-if="title">
<span class="h2 font-weight-bold mb-0" v-if="subTitle">{{subTitle}}</span> {{ title }}
</h5>
<span class="h2 font-weight-bold mb-0" v-if="subTitle">
{{ subTitle }}
</span>
</slot> </slot>
</b-col> </b-col>
<b-col cols="auto" v-if="$slots.icon || icon"> <b-col cols="auto" v-if="$slots.icon || icon">
<slot name="icon"> <slot name="icon">
<div class="icon icon-shape text-white rounded-circle shadow" <div
:class="[`bg-${type}`, iconClasses]"> class="icon icon-shape text-white rounded-circle shadow"
:class="[`bg-${type}`, iconClasses]"
>
<i :class="icon"></i> <i :class="icon"></i>
</div> </div>
</slot> </slot>
</b-col> </b-col>
<b-col cols="auto" v-if="$slots.img || img"> <b-col cols="auto" v-if="$slots.img || img">
<slot name="img"> <slot name="img">
<img :src="img" width="80" /> <img :src="img" width="80" />
</slot> </slot>
</b-col> </b-col>
</b-row> </b-row>
<p class="mt-3 mb-0 text-sm"> <p class="mt-3 mb-0 text-sm">
<slot name="footer"> <slot name="footer"></slot>
</slot>
</p> </p>
</card> </card>
</template> </template>
<script> <script>
import Card from './Card.vue'; import Card from './Card.vue'
export default { export default {
name: 'stats-card', name: 'stats-card',
components: { components: {
Card Card,
}, },
props: { props: {
type: { type: {
type: String, type: String,
default: 'primary' default: 'primary',
}, },
icon: String, icon: String,
img: String, img: String,
title: String, title: String,
subTitle: String, subTitle: String,
iconClasses: [String, Array] iconClasses: [String, Array],
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -1,5 +1,5 @@
import { Bar, mixins } from 'vue-chartjs'; import { Bar, mixins } from 'vue-chartjs'
import globalOptionsMixin from "@/components/Charts/globalOptionsMixin"; import globalOptionsMixin from '@/components/Charts/globalOptionsMixin'
export default { export default {
name: 'bar-chart', name: 'bar-chart',
@ -8,23 +8,23 @@ export default {
props: { props: {
extraOptions: { extraOptions: {
type: Object, type: Object,
default: () => ({}) default: () => ({}),
} },
}, },
data() { data() {
return { return {
ctx: null ctx: null,
}; }
}, },
mounted() { mounted() {
this.$watch( this.$watch(
'chartData', 'chartData',
(newVal, oldVal) => { (newVal, oldVal) => {
if (!oldVal) { if (!oldVal) {
this.renderChart(this.chartData, this.extraOptions); this.renderChart(this.chartData, this.extraOptions)
} }
}, },
{ immediate: true } { immediate: true },
); )
} },
}; }

View File

@ -1,5 +1,5 @@
import { Line, mixins } from 'vue-chartjs'; import { Line, mixins } from 'vue-chartjs'
import globalOptionsMixin from "@/components/Charts/globalOptionsMixin"; import globalOptionsMixin from '@/components/Charts/globalOptionsMixin'
export default { export default {
name: 'line-chart', name: 'line-chart',
extends: Line, extends: Line,
@ -7,23 +7,23 @@ export default {
props: { props: {
extraOptions: { extraOptions: {
type: Object, type: Object,
default: () => ({}) default: () => ({}),
} },
}, },
data() { data() {
return { return {
ctx: null ctx: null,
}; }
}, },
mounted() { mounted() {
this.$watch( this.$watch(
'chartData', 'chartData',
(newVal, oldVal) => { (newVal, oldVal) => {
if (!oldVal) { if (!oldVal) {
this.renderChart(this.chartData, this.extraOptions); this.renderChart(this.chartData, this.extraOptions)
} }
}, },
{ immediate: true } { immediate: true },
); )
} },
}; }

View File

@ -1,10 +1,10 @@
import { parseOptions } from "@/components/Charts/optionHelpers"; import { parseOptions } from '@/components/Charts/optionHelpers'
import Chart from 'chart.js' import Chart from 'chart.js'
export const Charts = { export const Charts = {
mode: 'light',//(themeMode) ? themeMode : 'light'; mode: 'light', //(themeMode) ? themeMode : 'light';
fonts: { fonts: {
base: 'Open Sans' base: 'Open Sans',
}, },
colors: { colors: {
gray: { gray: {
@ -16,114 +16,115 @@ export const Charts = {
600: '#8898aa', 600: '#8898aa',
700: '#525f7f', 700: '#525f7f',
800: '#32325d', 800: '#32325d',
900: '#212529' 900: '#212529',
}, },
theme: { theme: {
'default': '#172b4d', default: '#172b4d',
'primary': '#5e72e4', primary: '#5e72e4',
'secondary': '#f4f5f7', secondary: '#f4f5f7',
'info': '#11cdef', info: '#11cdef',
'success': '#2dce89', success: '#2dce89',
'danger': '#f5365c', danger: '#f5365c',
'warning': '#fb6340' warning: '#fb6340',
}, },
black: '#12263F', black: '#12263F',
white: '#FFFFFF', white: '#FFFFFF',
transparent: 'transparent', transparent: 'transparent',
} },
}; }
function chartOptions() { function chartOptions() {
let { colors, mode, fonts } = Charts; let { colors, mode, fonts } = Charts
// Options // Options
let options = { let options = {
defaults: { defaults: {
global: { global: {
responsive: true, responsive: true,
maintainAspectRatio: false, maintainAspectRatio: false,
defaultColor: (mode === 'dark') ? colors.gray[700] : colors.gray[600], defaultColor: mode === 'dark' ? colors.gray[700] : colors.gray[600],
defaultFontColor: (mode === 'dark') ? colors.gray[700] : colors.gray[600], defaultFontColor: mode === 'dark' ? colors.gray[700] : colors.gray[600],
defaultFontFamily: fonts.base, defaultFontFamily: fonts.base,
defaultFontSize: 13, defaultFontSize: 13,
layout: { layout: {
padding: 0 padding: 0,
}, },
legend: { legend: {
display: false, display: false,
position: 'bottom', position: 'bottom',
labels: { labels: {
usePointStyle: true, usePointStyle: true,
padding: 16 padding: 16,
} },
}, },
elements: { elements: {
point: { point: {
radius: 0, radius: 0,
backgroundColor: colors.theme['primary'] backgroundColor: colors.theme['primary'],
}, },
line: { line: {
tension: .4, tension: 0.4,
borderWidth: 4, borderWidth: 4,
borderColor: colors.theme['primary'], borderColor: colors.theme['primary'],
backgroundColor: colors.transparent, backgroundColor: colors.transparent,
borderCapStyle: 'rounded' borderCapStyle: 'rounded',
}, },
rectangle: { rectangle: {
backgroundColor: colors.theme['warning'] backgroundColor: colors.theme['warning'],
}, },
arc: { arc: {
backgroundColor: colors.theme['primary'], backgroundColor: colors.theme['primary'],
borderColor: (mode == 'dark') ? colors.gray[800] : colors.white, borderColor: mode == 'dark' ? colors.gray[800] : colors.white,
borderWidth: 4 borderWidth: 4,
} },
}, },
tooltips: { tooltips: {
enabled: true, enabled: true,
mode: 'index', mode: 'index',
intersect: false, intersect: false,
} },
}, },
pie: { pie: {
tooltips: { tooltips: {
mode: 'point' mode: 'point',
} },
}, },
doughnut: { doughnut: {
tooltips: { tooltips: {
mode: 'point' mode: 'point',
}, },
cutoutPercentage: 83, cutoutPercentage: 83,
legendCallback: function (chart) { legendCallback: function (chart) {
let data = chart.data; let data = chart.data
let content = ''; let content = ''
data.labels.forEach(function (label, index) { data.labels.forEach(function (label, index) {
let bgColor = data.datasets[0].backgroundColor[index]; let bgColor = data.datasets[0].backgroundColor[index]
content += '<span class="chart-legend-item">'; content += '<span class="chart-legend-item">'
content += '<i class="chart-legend-indicator" style="background-color: ' + bgColor + '"></i>'; content +=
content += label; '<i class="chart-legend-indicator" style="background-color: ' + bgColor + '"></i>'
content += '</span>'; content += label
}); content += '</span>'
})
return content; return content
},
},
},
} }
}
}
};
// yAxes // yAxes
Chart.scaleService.updateScaleDefaults('linear', { Chart.scaleService.updateScaleDefaults('linear', {
gridLines: { gridLines: {
borderDash: [2], borderDash: [2],
borderDashOffset: [2], borderDashOffset: [2],
color: (mode === 'dark') ? colors.gray[900] : colors.gray[200], color: mode === 'dark' ? colors.gray[900] : colors.gray[200],
drawBorder: false, drawBorder: false,
drawTicks: true, drawTicks: true,
zeroLineWidth: 1, zeroLineWidth: 1,
zeroLineColor: (mode === 'dark') ? colors.gray[900] : colors.gray[200], zeroLineColor: mode === 'dark' ? colors.gray[900] : colors.gray[200],
zeroLineBorderDash: [2], zeroLineBorderDash: [2],
zeroLineBorderDashOffset: [2] zeroLineBorderDashOffset: [2],
}, },
ticks: { ticks: {
beginAtZero: true, beginAtZero: true,
@ -132,9 +133,9 @@ function chartOptions() {
if (!(value % 10)) { if (!(value % 10)) {
return value return value
} }
} },
} },
}); })
// xAxes // xAxes
Chart.scaleService.updateScaleDefaults('category', { Chart.scaleService.updateScaleDefaults('category', {
@ -146,13 +147,13 @@ function chartOptions() {
zeroLineWidth: 1, zeroLineWidth: 1,
}, },
ticks: { ticks: {
padding: 20 padding: 20,
}, },
maxBarThickness: 10 maxBarThickness: 10,
}); })
return options; return options
}; }
let initialized = false let initialized = false
@ -160,27 +161,29 @@ export function initGlobalOptions() {
if (initialized) { if (initialized) {
return return
} }
parseOptions(Chart, chartOptions()); parseOptions(Chart, chartOptions())
initialized = true initialized = true
} }
export const basicOptions = { export const basicOptions = {
maintainAspectRatio: false, maintainAspectRatio: false,
legend: { legend: {
display: false display: false,
}, },
responsive: true responsive: true,
}; }
export let blueChartOptions = { export let blueChartOptions = {
scales: { scales: {
yAxes: [{ yAxes: [
{
gridLines: { gridLines: {
color: Charts.colors.gray[700], color: Charts.colors.gray[700],
zeroLineColor: Charts.colors.gray[700] zeroLineColor: Charts.colors.gray[700],
} },
}] },
} ],
}; },
}
export let lineChartOptionsBlue = { export let lineChartOptionsBlue = {
...basicOptions, ...basicOptions,
@ -192,7 +195,7 @@ export let lineChartOptionsBlue = {
xPadding: 12, xPadding: 12,
mode: 'nearest', mode: 'nearest',
intersect: 0, intersect: 0,
position: 'nearest' position: 'nearest',
}, },
responsive: true, responsive: true,
scales: { scales: {
@ -202,15 +205,15 @@ export let lineChartOptionsBlue = {
gridLines: { gridLines: {
drawBorder: false, drawBorder: false,
color: 'rgba(29,140,248,0.0)', color: 'rgba(29,140,248,0.0)',
zeroLineColor: 'transparent' zeroLineColor: 'transparent',
}, },
ticks: { ticks: {
suggestedMin: 60, suggestedMin: 60,
suggestedMax: 125, suggestedMax: 125,
padding: 20, padding: 20,
fontColor: '#9e9e9e' fontColor: '#9e9e9e',
} },
} },
], ],
xAxes: [ xAxes: [
@ -219,13 +222,13 @@ export let lineChartOptionsBlue = {
gridLines: { gridLines: {
drawBorder: false, drawBorder: false,
color: 'rgba(29,140,248,0.1)', color: 'rgba(29,140,248,0.1)',
zeroLineColor: 'transparent' zeroLineColor: 'transparent',
}, },
ticks: { ticks: {
padding: 20, padding: 20,
fontColor: '#9e9e9e' fontColor: '#9e9e9e',
} },
} },
] ],
} },
}; }

View File

@ -1,7 +1,7 @@
import { initGlobalOptions } from "@/components/Charts/config"; import { initGlobalOptions } from '@/components/Charts/config'
import './roundedCornersExtension' import './roundedCornersExtension'
export default { export default {
mounted() { mounted() {
initGlobalOptions(); initGlobalOptions()
} },
} }

View File

@ -2,9 +2,9 @@
export function parseOptions(parent, options) { export function parseOptions(parent, options) {
for (let item in options) { for (let item in options) {
if (typeof options[item] !== 'object') { if (typeof options[item] !== 'object') {
parent[item] = options[item]; parent[item] = options[item]
} else { } else {
parseOptions(parent[item], options[item]); parseOptions(parent[item], options[item])
} }
} }
} }

View File

@ -3,64 +3,63 @@
// Code from: https://codepen.io/jedtrow/full/ygRYgo // Code from: https://codepen.io/jedtrow/full/ygRYgo
// //
import Chart from 'chart.js' import Chart from 'chart.js'
Chart.elements.Rectangle.prototype.draw = function() { Chart.elements.Rectangle.prototype.draw = function () {
let ctx = this._chart.ctx
let ctx = this._chart.ctx; let vm = this._view
let vm = this._view; let left, right, top, bottom, signX, signY, borderSkipped, radius
let left, right, top, bottom, signX, signY, borderSkipped, radius; let borderWidth = vm.borderWidth
let borderWidth = vm.borderWidth;
// Set Radius Here // Set Radius Here
// If radius is large enough to cause drawing errors a max radius is imposed // If radius is large enough to cause drawing errors a max radius is imposed
let cornerRadius = 6; let cornerRadius = 6
if (!vm.horizontal) { if (!vm.horizontal) {
// bar // bar
left = vm.x - vm.width / 2; left = vm.x - vm.width / 2
right = vm.x + vm.width / 2; right = vm.x + vm.width / 2
top = vm.y; top = vm.y
bottom = vm.base; bottom = vm.base
signX = 1; signX = 1
signY = bottom > top ? 1 : -1; signY = bottom > top ? 1 : -1
borderSkipped = vm.borderSkipped || 'bottom'; borderSkipped = vm.borderSkipped || 'bottom'
} else { } else {
// horizontal bar // horizontal bar
left = vm.base; left = vm.base
right = vm.x; right = vm.x
top = vm.y - vm.height / 2; top = vm.y - vm.height / 2
bottom = vm.y + vm.height / 2; bottom = vm.y + vm.height / 2
signX = right > left ? 1 : -1; signX = right > left ? 1 : -1
signY = 1; signY = 1
borderSkipped = vm.borderSkipped || 'left'; borderSkipped = vm.borderSkipped || 'left'
} }
// Canvas doesn't allow us to stroke inside the width so we can // Canvas doesn't allow us to stroke inside the width so we can
// adjust the sizes to fit if we're setting a stroke on the line // adjust the sizes to fit if we're setting a stroke on the line
if (borderWidth) { if (borderWidth) {
// borderWidth shold be less than bar width and bar height. // borderWidth shold be less than bar width and bar height.
let barSize = Math.min(Math.abs(left - right), Math.abs(top - bottom)); let barSize = Math.min(Math.abs(left - right), Math.abs(top - bottom))
borderWidth = borderWidth > barSize ? barSize : borderWidth; borderWidth = borderWidth > barSize ? barSize : borderWidth
let halfStroke = borderWidth / 2; let halfStroke = borderWidth / 2
// Adjust borderWidth when bar top position is near vm.base(zero). // Adjust borderWidth when bar top position is near vm.base(zero).
let borderLeft = left + (borderSkipped !== 'left' ? halfStroke * signX : 0); let borderLeft = left + (borderSkipped !== 'left' ? halfStroke * signX : 0)
let borderRight = right + (borderSkipped !== 'right' ? -halfStroke * signX : 0); let borderRight = right + (borderSkipped !== 'right' ? -halfStroke * signX : 0)
let borderTop = top + (borderSkipped !== 'top' ? halfStroke * signY : 0); let borderTop = top + (borderSkipped !== 'top' ? halfStroke * signY : 0)
let borderBottom = bottom + (borderSkipped !== 'bottom' ? -halfStroke * signY : 0); let borderBottom = bottom + (borderSkipped !== 'bottom' ? -halfStroke * signY : 0)
// not become a vertical line? // not become a vertical line?
if (borderLeft !== borderRight) { if (borderLeft !== borderRight) {
top = borderTop; top = borderTop
bottom = borderBottom; bottom = borderBottom
} }
// not become a horizontal line? // not become a horizontal line?
if (borderTop !== borderBottom) { if (borderTop !== borderBottom) {
left = borderLeft; left = borderLeft
right = borderRight; right = borderRight
} }
} }
ctx.beginPath(); ctx.beginPath()
ctx.fillStyle = vm.backgroundColor; ctx.fillStyle = vm.backgroundColor
ctx.strokeStyle = vm.borderColor; ctx.strokeStyle = vm.borderColor
ctx.lineWidth = borderWidth; ctx.lineWidth = borderWidth
// Corner points, from bottom-left to bottom-right clockwise // Corner points, from bottom-left to bottom-right clockwise
// | 1 2 | // | 1 2 |
@ -69,62 +68,61 @@ Chart.elements.Rectangle.prototype.draw = function() {
[left, bottom], [left, bottom],
[left, top], [left, top],
[right, top], [right, top],
[right, bottom] [right, bottom],
]; ]
// Find first (starting) corner with fallback to 'bottom' // Find first (starting) corner with fallback to 'bottom'
let borders = ['bottom', 'left', 'top', 'right']; let borders = ['bottom', 'left', 'top', 'right']
let startCorner = borders.indexOf(borderSkipped, 0); let startCorner = borders.indexOf(borderSkipped, 0)
if (startCorner === -1) { if (startCorner === -1) {
startCorner = 0; startCorner = 0
} }
function cornerAt(index) { function cornerAt(index) {
return corners[(startCorner + index) % 4]; return corners[(startCorner + index) % 4]
} }
// Draw rectangle from 'startCorner' // Draw rectangle from 'startCorner'
let corner = cornerAt(0); let corner = cornerAt(0)
ctx.moveTo(corner[0], corner[1]); ctx.moveTo(corner[0], corner[1])
for (let i = 1; i < 4; i++) { for (let i = 1; i < 4; i++) {
corner = cornerAt(i); corner = cornerAt(i)
let nextCornerId = i + 1; let nextCornerId = i + 1
if (nextCornerId == 4) { if (nextCornerId == 4) {
nextCornerId = 0 nextCornerId = 0
} }
let nextCorner = cornerAt(nextCornerId); let nextCorner = cornerAt(nextCornerId)
let width = corners[2][0] - corners[1][0]; let width = corners[2][0] - corners[1][0]
let height = corners[0][1] - corners[1][1]; let height = corners[0][1] - corners[1][1]
let x = corners[1][0]; let x = corners[1][0]
let y = corners[1][1]; let y = corners[1][1]
let radius = cornerRadius; let radius = cornerRadius
// Fix radius being too large // Fix radius being too large
if (radius > height / 2) { if (radius > height / 2) {
radius = height / 2; radius = height / 2
} }
if (radius > width / 2) { if (radius > width / 2) {
radius = width / 2; radius = width / 2
} }
ctx.moveTo(x + radius, y); ctx.moveTo(x + radius, y)
ctx.lineTo(x + width - radius, y); ctx.lineTo(x + width - radius, y)
ctx.quadraticCurveTo(x + width, y, x + width, y + radius); ctx.quadraticCurveTo(x + width, y, x + width, y + radius)
ctx.lineTo(x + width, y + height - radius); ctx.lineTo(x + width, y + height - radius)
ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height); ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height)
ctx.lineTo(x + radius, y + height); ctx.lineTo(x + radius, y + height)
ctx.quadraticCurveTo(x, y + height, x, y + height - radius); ctx.quadraticCurveTo(x, y + height, x, y + height - radius)
ctx.lineTo(x, y + radius); ctx.lineTo(x, y + radius)
ctx.quadraticCurveTo(x, y, x + radius, y); ctx.quadraticCurveTo(x, y, x + radius, y)
} }
ctx.fill(); ctx.fill()
if (borderWidth) { if (borderWidth) {
ctx.stroke(); ctx.stroke()
} }
}; }

View File

@ -0,0 +1,28 @@
import { mount } from '@vue/test-utils'
import CloseButton from './CloseButton'
const localVue = global.localVue
describe('CloseButton', () => {
let wrapper
let propsData = {
target: 'Target',
expanded: false,
}
const Wrapper = () => {
return mount(CloseButton, { localVue, propsData })
}
describe('mount', () => {
beforeEach(() => {
wrapper = Wrapper()
})
it('emmits click event', () => {
wrapper.find('.navbar-toggler').trigger('click')
expect(wrapper.emitted('click')).toBeTruthy()
})
})
})

View File

@ -9,7 +9,8 @@
:aria-expanded="expanded" :aria-expanded="expanded"
aria-label="Toggle navigation" aria-label="Toggle navigation"
> >
<span></span> <span></span> <span></span>
<span></span>
</button> </button>
</template> </template>
<script> <script>
@ -18,18 +19,18 @@ export default {
props: { props: {
target: { target: {
type: [String, Number], type: [String, Number],
description: 'Close button target element' description: 'Close button target element',
}, },
expanded: { expanded: {
type: Boolean, type: Boolean,
description: 'Whether button is expanded (aria-expanded attribute)' description: 'Whether button is expanded (aria-expanded attribute)',
} },
}, },
methods: { methods: {
handleClick(evt) { handleClick(evt) {
this.$emit('click', evt); this.$emit('click', evt)
} },
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -1,10 +1,5 @@
<template> <template>
<div <div id="accordion" role="tablist" aria-multiselectable="true" class="accordion">
id="accordion"
role="tablist"
aria-multiselectable="true"
class="accordion"
>
<slot></slot> <slot></slot>
</div> </div>
</template> </template>
@ -16,18 +11,18 @@ export default {
animationDuration: { animationDuration: {
type: Number, type: Number,
default: 250, default: 250,
description: 'Collapse animation duration' description: 'Collapse animation duration',
}, },
multipleActive: { multipleActive: {
type: Boolean, type: Boolean,
default: true, default: true,
description: 'Whether you can have multiple collapse items opened at the same time' description: 'Whether you can have multiple collapse items opened at the same time',
}, },
activeIndex: { activeIndex: {
type: Number, type: Number,
default: -1, default: -1,
description: 'Active collapse item index' description: 'Active collapse item index',
} },
}, },
provide() { provide() {
return { return {
@ -35,50 +30,50 @@ export default {
multipleActive: this.multipleActive, multipleActive: this.multipleActive,
addItem: this.addItem, addItem: this.addItem,
removeItem: this.removeItem, removeItem: this.removeItem,
deactivateAll: this.deactivateAll deactivateAll: this.deactivateAll,
}; }
}, },
data() { data() {
return { return {
items: [] items: [],
}; }
}, },
methods: { methods: {
addItem(item) { addItem(item) {
const index = this.$slots.default.indexOf(item.$vnode); const index = this.$slots.default.indexOf(item.$vnode)
if (index !== -1) { if (index !== -1) {
this.items.splice(index, 0, item); this.items.splice(index, 0, item)
} }
}, },
removeItem(item) { removeItem(item) {
const items = this.items; const items = this.items
const index = items.indexOf(item); const index = items.indexOf(item)
if (index > -1) { if (index > -1) {
items.splice(index, 1); items.splice(index, 1)
} }
}, },
deactivateAll() { deactivateAll() {
this.items.forEach(item => { this.items.forEach((item) => {
item.active = false; item.active = false
}); })
}, },
activateItem() { activateItem() {
if (this.activeIndex !== -1) { if (this.activeIndex !== -1) {
this.items[this.activeIndex].active = true; this.items[this.activeIndex].active = true
}
} }
}, },
},
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.activateItem(); this.activateItem()
}); })
}, },
watch: { watch: {
activeIndex() { activeIndex() {
this.activateItem(); this.activateItem()
} },
} },
}; }
</script> </script>
<style scoped></style> <style scoped></style>

View File

@ -8,7 +8,7 @@
@click.prevent="activate" @click.prevent="activate"
:aria-controls="`content-${itemId}`" :aria-controls="`content-${itemId}`"
> >
<slot name="title"> {{ title }} </slot> <slot name="title">{{ title }}</slot>
<i class="tim-icons icon-minimal-down"></i> <i class="tim-icons icon-minimal-down"></i>
</a> </a>
</b-card-header> </b-card-header>
@ -26,67 +26,66 @@
</b-card> </b-card>
</template> </template>
<script> <script>
import { CollapseTransition } from 'vue2-transitions'; import { CollapseTransition } from 'vue2-transitions'
export default { export default {
name: 'collapse-item', name: 'collapse-item',
components: { components: {
CollapseTransition CollapseTransition,
}, },
props: { props: {
title: { title: {
type: String, type: String,
default: '', default: '',
description: 'Collapse item title' description: 'Collapse item title',
}, },
id: String id: String,
}, },
inject: { inject: {
animationDuration: { animationDuration: {
default: 250 default: 250,
}, },
multipleActive: { multipleActive: {
default: false default: false,
}, },
addItem: { addItem: {
default: () => {} default: () => {},
}, },
removeItem: { removeItem: {
default: () => {} default: () => {},
}, },
deactivateAll: { deactivateAll: {
default: () => {} default: () => {},
} },
}, },
computed: { computed: {
itemId() { itemId() {
return this.id || this.title; return this.id || this.title
} },
}, },
data() { data() {
return { return {
active: false active: false,
}; }
}, },
methods: { methods: {
activate() { activate() {
let wasActive = this.active; let wasActive = this.active
if (!this.multipleActive) { if (!this.multipleActive) {
this.deactivateAll(); this.deactivateAll()
}
this.active = !wasActive;
console.log(this.active)
} }
this.active = !wasActive
},
}, },
mounted() { mounted() {
this.addItem(this); this.addItem(this)
}, },
destroyed() { destroyed() {
if (this.$el && this.$el.parentNode) { if (this.$el && this.$el.parentNode) {
this.$el.parentNode.removeChild(this.$el); this.$el.parentNode.removeChild(this.$el)
} }
this.removeItem(this); this.removeItem(this)
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -1,14 +1,16 @@
<template> <template>
<div class="custom-control custom-checkbox" <div
:class="[ class="custom-control custom-checkbox"
{disabled: disabled}, :class="[{ disabled: disabled }, { [`custom-checkbox-${type}`]: type }, inlineClass]"
{[`custom-checkbox-${type}`]: type},inlineClass]"> >
<input :id="cbId" <input
:id="cbId"
class="custom-control-input" class="custom-control-input"
:class="inputClasses" :class="inputClasses"
type="checkbox" type="checkbox"
:disabled="disabled" :disabled="disabled"
v-model="model"/> v-model="model"
/>
<label :for="cbId" class="custom-control-label"> <label :for="cbId" class="custom-control-label">
<slot> <slot>
<span v-if="inline">&nbsp;</span> <span v-if="inline">&nbsp;</span>
@ -17,62 +19,60 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "base-checkbox", name: 'base-checkbox',
model: { model: {
prop: "checked" prop: 'checked',
}, },
props: { props: {
checked: { checked: {
type: [Array, Boolean], type: [Array, Boolean],
description: "Whether checkbox is checked" description: 'Whether checkbox is checked',
}, },
disabled: { disabled: {
type: Boolean, type: Boolean,
description: "Whether checkbox is disabled" description: 'Whether checkbox is disabled',
}, },
inline: { inline: {
type: Boolean, type: Boolean,
description: "Whether checkbox is inline" description: 'Whether checkbox is inline',
}, },
inputClasses: { inputClasses: {
type: [String, Object, Array], type: [String, Object, Array],
description: "Checkbox input classes" description: 'Checkbox input classes',
}, },
type: { type: {
type: String, type: String,
description: 'Checkbox type (e.g info, danger etc)' description: 'Checkbox type (e.g info, danger etc)',
} },
}, },
data() { data() {
return { return {
cbId: "", cbId: '',
touched: false touched: false,
}; }
}, },
computed: { computed: {
model: { model: {
get() { get() {
return this.checked; return this.checked
}, },
set(check) { set(check) {
if (!this.touched) { if (!this.touched) {
this.touched = true; this.touched = true
}
this.$emit("input", check);
} }
this.$emit('input', check)
},
}, },
inlineClass() { inlineClass() {
if (this.inline) { if (this.inline) {
return `form-check-inline`; return `form-check-inline`
} }
return '' return ''
} },
}, },
created() { created() {
this.cbId = Math.random() this.cbId = Math.random().toString(16).slice(2)
.toString(16) },
.slice(2); }
}
};
</script> </script>

View File

@ -1,18 +1,25 @@
<template> <template>
<validation-provider :rules="rules" :name="name" v-bind="$attrs" v-slot="{errors, valid, invalid, validated}"> <validation-provider
:rules="rules"
:name="name"
v-bind="$attrs"
v-slot="{ errors, valid, invalid, validated }"
>
<b-form-group> <b-form-group>
<slot name="label"> <slot name="label">
<label v-if="label" :class="labelClasses"> <label v-if="label" :class="labelClasses">
{{label}} {{ label }}
</label> </label>
</slot> </slot>
<div :class="[ <div
{'input-group': hasIcon}, :class="[
{'focused': focused}, { 'input-group': hasIcon },
{'input-group-alternative': alternative}, { focused: focused },
{'has-label': label || $slots.label}, { 'input-group-alternative': alternative },
inputGroupClasses { 'has-label': label || $slots.label },
]"> inputGroupClasses,
]"
>
<div v-if="prependIcon || $slots.prepend" class="input-group-prepend"> <div v-if="prependIcon || $slots.prepend" class="input-group-prepend">
<span class="input-group-text"> <span class="input-group-text">
<slot name="prepend"> <slot name="prepend">
@ -29,7 +36,12 @@
:valid="valid" :valid="valid"
:required="required" :required="required"
class="form-control" class="form-control"
:class="[{'is-valid': valid && validated && successMessage}, {'is-invalid': invalid && validated}, inputClasses]"> :class="[
{ 'is-valid': valid && validated && successMessage },
{ 'is-invalid': invalid && validated },
inputClasses,
]"
/>
</slot> </slot>
<div v-if="appendIcon || $slots.append" class="input-group-append"> <div v-if="appendIcon || $slots.append" class="input-group-append">
<span class="input-group-text"> <span class="input-group-text">
@ -42,11 +54,11 @@
</div> </div>
<slot name="success"> <slot name="success">
<div class="valid-feedback" v-if="valid && validated && successMessage"> <div class="valid-feedback" v-if="valid && validated && successMessage">
{{successMessage}} {{ successMessage }}
</div> </div>
</slot> </slot>
<slot name="error"> <slot name="error">
<div v-if="errors[0]" class="invalid-feedback" style="display: block;"> <div v-if="errors[0]" class="invalid-feedback" style="display: block">
{{ errors[0] }} {{ errors[0] }}
</div> </div>
</slot> </slot>
@ -54,80 +66,80 @@
</validation-provider> </validation-provider>
</template> </template>
<script> <script>
export default { export default {
inheritAttrs: false, inheritAttrs: false,
name: "base-input", name: 'base-input',
props: { props: {
required: { required: {
type: Boolean, type: Boolean,
description: "Whether input is required (adds an asterix *)" description: 'Whether input is required (adds an asterix *)',
}, },
group: { group: {
type: Boolean, type: Boolean,
description: "Whether input is an input group (manual override in special cases)" description: 'Whether input is an input group (manual override in special cases)',
}, },
alternative: { alternative: {
type: Boolean, type: Boolean,
description: "Whether input is of alternative layout" description: 'Whether input is of alternative layout',
}, },
label: { label: {
type: String, type: String,
description: "Input label (text before input)" description: 'Input label (text before input)',
}, },
error: { error: {
type: String, type: String,
description: "Input error (below input)" description: 'Input error (below input)',
}, },
successMessage: { successMessage: {
type: String, type: String,
description: "Input success message", description: 'Input success message',
default: '' default: '',
}, },
labelClasses: { labelClasses: {
type: String, type: String,
description: "Input label css classes", description: 'Input label css classes',
default: "form-control-label" default: 'form-control-label',
}, },
inputClasses: { inputClasses: {
type: String, type: String,
description: "Input css classes" description: 'Input css classes',
}, },
inputGroupClasses: { inputGroupClasses: {
type: String, type: String,
description: "Input group css classes" description: 'Input group css classes',
}, },
value: { value: {
type: [String, Number], type: [String, Number],
description: "Input value" description: 'Input value',
}, },
type: { type: {
type: String, type: String,
description: "Input type", description: 'Input type',
default: "text" default: 'text',
}, },
appendIcon: { appendIcon: {
type: String, type: String,
description: "Append icon (right)" description: 'Append icon (right)',
}, },
prependIcon: { prependIcon: {
type: String, type: String,
description: "Prepend icon (left)" description: 'Prepend icon (left)',
}, },
rules: { rules: {
type: [String, Array, Object], type: [String, Array, Object],
description: 'Vee validate validation rules', description: 'Vee validate validation rules',
default: '' default: '',
}, },
name: { name: {
type: String, type: String,
description: 'Input name (used for validation)', description: 'Input name (used for validation)',
default: '' default: '',
} },
}, },
data() { data() {
return { return {
focused: false focused: false,
}; }
}, },
computed: { computed: {
listeners() { listeners() {
@ -135,42 +147,41 @@
...this.$listeners, ...this.$listeners,
input: this.updateValue, input: this.updateValue,
focus: this.onFocus, focus: this.onFocus,
blur: this.onBlur blur: this.onBlur,
}; }
}, },
slotData() { slotData() {
return { return {
focused: this.focused, focused: this.focused,
error: this.error, error: this.error,
...this.listeners ...this.listeners,
}; }
}, },
hasIcon() { hasIcon() {
const { append, prepend } = this.$slots; const { append, prepend } = this.$slots
return ( return (
append !== undefined || append !== undefined ||
prepend !== undefined || prepend !== undefined ||
this.appendIcon !== undefined || this.appendIcon !== undefined ||
this.prependIcon !== undefined || this.prependIcon !== undefined ||
this.group this.group
); )
} },
}, },
methods: { methods: {
updateValue(evt) { updateValue(evt) {
let value = evt.target.value; let value = evt.target.value
this.$emit("input", value); this.$emit('input', value)
}, },
onFocus(evt) { onFocus(evt) {
this.focused = true; this.focused = true
this.$emit("focus", evt); this.$emit('focus', evt)
}, },
onBlur(evt) { onBlur(evt) {
this.focused = false; this.focused = false
this.$emit("blur", evt); this.$emit('blur', evt)
} },
} },
}; }
</script> </script>
<style> <style></style>
</style>

View File

@ -1,7 +1,5 @@
<template> <template>
<div <div class="custom-control custom-radio" :class="[inlineClass, { disabled: disabled }]">
class="custom-control custom-radio"
:class="[inlineClass, { disabled: disabled }]">
<input <input
:id="cbId" :id="cbId"
class="custom-control-input" class="custom-control-input"
@ -18,51 +16,49 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'base-radio', name: 'base-radio',
props: { props: {
name: { name: {
type: [String, Number], type: [String, Number],
description: 'Radio label' description: 'Radio label',
}, },
disabled: { disabled: {
type: Boolean, type: Boolean,
description: 'Whether radio is disabled' description: 'Whether radio is disabled',
}, },
value: { value: {
type: [String, Boolean], type: [String, Boolean],
description: 'Radio value' description: 'Radio value',
}, },
inline: { inline: {
type: Boolean, type: Boolean,
description: 'Whether radio is inline' description: 'Whether radio is inline',
} },
}, },
data() { data() {
return { return {
cbId: '' cbId: '',
}; }
}, },
computed: { computed: {
model: { model: {
get() { get() {
return this.value; return this.value
}, },
set(value) { set(value) {
this.$emit('input', value); this.$emit('input', value)
} },
}, },
inlineClass() { inlineClass() {
if (this.inline) { if (this.inline) {
return `form-check-inline`; return `form-check-inline`
}
return '';
} }
return ''
},
}, },
created() { created() {
this.cbId = Math.random() this.cbId = Math.random().toString(16).slice(2)
.toString(16) },
.slice(2); }
}
};
</script> </script>

View File

@ -2,11 +2,11 @@
<b-row v-loading="true" id="loading"></b-row> <b-row v-loading="true" id="loading"></b-row>
</template> </template>
<script> <script>
import Vue from 'vue'; import Vue from 'vue'
import { Loading } from 'element-ui'; import { Loading } from 'element-ui'
Vue.use(Loading.directive); Vue.use(Loading.directive)
export default {}; export default {}
</script> </script>
<style> <style>
#loading { #loading {

View File

@ -1,10 +1,11 @@
<template> <template>
<SlideYUpTransition :duration="animationDuration"> <slide-y-up-transition :duration="animationDuration">
<b-modal class="modal fade" <b-modal
class="modal fade"
ref="app-modal" ref="app-modal"
:size="size" :size="size"
:hide-header="!$slots.header" :hide-header="!$slots.header"
:modal-class="[{'modal-mini': type === 'mini'}, ...modalClasses]" :modal-class="[{ 'modal-mini': type === 'mini' }, ...modalClasses]"
@mousedown.self="closeModal" @mousedown.self="closeModal"
tabindex="-1" tabindex="-1"
role="dialog" role="dialog"
@ -15,17 +16,19 @@
:footer-class="footerClasses" :footer-class="footerClasses"
:content-class="[gradient ? `bg-gradient-${gradient}` : '', ...modalContentClasses]" :content-class="[gradient ? `bg-gradient-${gradient}` : '', ...modalContentClasses]"
:body-class="bodyClasses" :body-class="bodyClasses"
:aria-hidden="!show"> :aria-hidden="!show"
>
<template v-slot:modal-header> <template v-slot:modal-header>
<slot name="header"></slot> <slot name="header"></slot>
<slot name="close-button"> <slot name="close-button">
<button type="button" <button
type="button"
class="close" class="close"
v-if="showClose" v-if="showClose"
@click="closeModal" @click="closeModal"
data-dismiss="modal" data-dismiss="modal"
aria-label="Close"> aria-label="Close"
>
<span :aria-hidden="!show">×</span> <span :aria-hidden="!show">×</span>
</button> </button>
</slot> </slot>
@ -36,90 +39,89 @@
<template v-slot:modal-footer> <template v-slot:modal-footer>
<slot name="footer"></slot> <slot name="footer"></slot>
</template> </template>
</b-modal> </b-modal>
</SlideYUpTransition> </slide-y-up-transition>
</template> </template>
<script> <script>
import { SlideYUpTransition } from "vue2-transitions"; import { SlideYUpTransition } from 'vue2-transitions'
export default { export default {
name: "modal", name: 'modal',
components: { components: {
SlideYUpTransition SlideYUpTransition,
}, },
props: { props: {
show: Boolean, show: Boolean,
showClose: { showClose: {
type: Boolean, type: Boolean,
default: true default: true,
}, },
type: { type: {
type: String, type: String,
default: "", default: '',
validator(value) { validator(value) {
let acceptedValues = ["", "notice", "mini"]; let acceptedValues = ['', 'notice', 'mini']
return acceptedValues.indexOf(value) !== -1; return acceptedValues.indexOf(value) !== -1
}, },
description: 'Modal type (notice|mini|"") ' description: 'Modal type (notice|mini|"") ',
}, },
modalClasses: { modalClasses: {
type: [Object, String], type: [Object, String],
description: "Modal dialog css classes" description: 'Modal dialog css classes',
}, },
size: { size: {
type: String, type: String,
description: 'Modal size', description: 'Modal size',
validator(value) { validator(value) {
let acceptedValues = ["", "sm", "lg"]; let acceptedValues = ['', 'sm', 'lg']
return acceptedValues.indexOf(value) !== -1; return acceptedValues.indexOf(value) !== -1
}, },
}, },
modalContentClasses: { modalContentClasses: {
type: [Object, String], type: [Object, String],
description: "Modal dialog content css classes" description: 'Modal dialog content css classes',
}, },
gradient: { gradient: {
type: String, type: String,
description: "Modal gradient type (danger, primary etc)" description: 'Modal gradient type (danger, primary etc)',
}, },
headerClasses: { headerClasses: {
type: [Object, String], type: [Object, String],
description: "Modal Header css classes" description: 'Modal Header css classes',
}, },
bodyClasses: { bodyClasses: {
type: [Object, String], type: [Object, String],
description: "Modal Body css classes" description: 'Modal Body css classes',
}, },
footerClasses: { footerClasses: {
type: [Object, String], type: [Object, String],
description: "Modal Footer css classes" description: 'Modal Footer css classes',
}, },
animationDuration: { animationDuration: {
type: Number, type: Number,
default: 500, default: 500,
description: "Modal transition duration" description: 'Modal transition duration',
} },
}, },
methods: { methods: {
closeModal() { closeModal() {
this.$emit("update:show", false); this.$emit('update:show', false)
this.$emit("close"); this.$emit('close')
} },
}, },
watch: { watch: {
show(val) { show(val) {
if (val) { if (val) {
this.$refs['app-modal'].show(); this.$refs['app-modal'].show()
} else { } else {
this.$refs['app-modal'].hide(); this.$refs['app-modal'].hide()
} }
} },
} },
}; }
</script> </script>
<style> <style>
.modal-backdrop { .modal-backdrop {
background-color: rgba(0, 0, 0, 0.6) !important; background-color: rgba(0, 0, 0, 0.6) !important;
} }
</style> </style>

View File

@ -1,12 +1,13 @@
<template> <template>
<!--Notice modal--> <!--Notice modal-->
<modal :show.sync="$store.state.modals" <modal
:show.sync="$store.state.modals"
modal-classes="modal-danger" modal-classes="modal-danger"
modal-content-classes="bg-gradient-danger"> modal-content-classes="bg-gradient-danger"
>
<h6 slot="header" class="modal-title">Your attention is required</h6> <h6 slot="header" class="modal-title">Your attention is required</h6>
<div class="py-3 text-center"> <div class="py-3 text-center">
<form ref="form" @submit.stop.prevent="handleSubmit"> <form ref="form" @submit.stop.prevent="handleSubmit">
<b-form-group <b-form-group
label="Name" label="Name"
@ -14,34 +15,28 @@
invalid-feedback="Name is required" invalid-feedback="Name is required"
:state="nameState" :state="nameState"
> >
<b-form-input <b-form-input id="name-input" v-model="name" :state="nameState" required></b-form-input>
id="name-input"
v-model="name"
:state="nameState"
required
></b-form-input>
</b-form-group> </b-form-group>
</form> </form>
</div> </div>
<template slot="footer"> <template slot="footer">
<base-button type="white">Ok</base-button> <base-button type="white">Ok</base-button>
<base-button type="link" class="text-white ml-auto" @click="$store.state.modals = false">abbrechen</base-button> <base-button type="link" class="ml-auto" @click="$store.state.modals = false">
abbrechen
</base-button>
</template> </template>
</modal> </modal>
</template> </template>
<script> <script>
export default {
export default {
name: 'modal', name: 'modal',
data() { data() {
return { return {
name: '', name: '',
nameState: null, nameState: null,
submittedNames: [] submittedNames: [],
} }
}, },
/*Modal*/ /*Modal*/
@ -75,11 +70,11 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$bvModal.hide('modal-prevent-closing') this.$bvModal.hide('modal-prevent-closing')
}) })
} },
}; }
</script> </script>
<style> <style>
.modal-backdrop { .modal-backdrop {
background-color: rgba(0, 0, 0, 0.6) !important; background-color: rgba(0, 0, 0, 0.6) !important;
} }
</style> </style>

View File

@ -18,10 +18,7 @@
</button> </button>
</slot> </slot>
<b-navbar-toggle <b-navbar-toggle target="nav-text-collapse" @click.stop="toggleMenu"></b-navbar-toggle>
target="nav-text-collapse"
@click.stop="toggleMenu">
</b-navbar-toggle>
<b-collapse <b-collapse
is-nav is-nav
@ -29,7 +26,8 @@
class="navbar-custom-collapse collapse" class="navbar-custom-collapse collapse"
:class="menuClasses" :class="menuClasses"
:visible="show" :visible="show"
v-click-outside="closeMenu"> v-click-outside="closeMenu"
>
<slot :close-menu="closeMenu"></slot> <slot :close-menu="closeMenu"></slot>
</b-collapse> </b-collapse>
</div> </div>
@ -43,29 +41,28 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
description: description:
'Whether navbar menu is shown (valid for viewports < specified by `expand` prop)' 'Whether navbar menu is shown (valid for viewports < specified by `expand` prop)',
}, },
transparent: { transparent: {
type: Boolean, type: Boolean,
default: false, default: false,
description: 'Whether navbar is transparent' description: 'Whether navbar is transparent',
}, },
expand: { expand: {
type: String, type: String,
default: 'lg', default: 'lg',
description: 'Breakpoint where nav should expand' description: 'Breakpoint where nav should expand',
}, },
menuClasses: { menuClasses: {
type: [String, Object, Array], type: [String, Object, Array],
default: '', default: '',
description: description: 'Navbar menu (items) classes. Can be used to align menu items to the right/left',
'Navbar menu (items) classes. Can be used to align menu items to the right/left'
}, },
containerClasses: { containerClasses: {
type: [String, Object, Array], type: [String, Object, Array],
default: 'container', default: 'container',
description: description:
'Container classes. Can be used to control container classes (contains both navbar brand and menu items)' 'Container classes. Can be used to control container classes (contains both navbar brand and menu items)',
}, },
type: { type: {
type: String, type: String,
@ -81,43 +78,43 @@ export default {
'primary', 'primary',
'light', 'light',
'info', 'info',
'vue' 'vue',
].includes(value); ].includes(value)
},
description: 'Navbar color type',
}, },
description: 'Navbar color type'
}
}, },
model: { model: {
prop: 'show', prop: 'show',
event: 'change' event: 'change',
}, },
computed: { computed: {
classes() { classes() {
let color = `bg-${this.type}`; let color = `bg-${this.type}`
let classes = [ let classes = [
{ 'navbar-transparent': this.transparent }, { 'navbar-transparent': this.transparent },
{ [`navbar-expand-${this.expand}`]: this.expand } { [`navbar-expand-${this.expand}`]: this.expand },
]; ]
if (this.position) { if (this.position) {
classes.push(`navbar-${this.position}`); classes.push(`navbar-${this.position}`)
} }
if (!this.transparent) { if (!this.transparent) {
classes.push(color); classes.push(color)
} }
return classes; return classes
}, },
hasMenu() { hasMenu() {
return this.$slots.default; return this.$slots.default
} },
}, },
methods: { methods: {
toggleMenu() { toggleMenu() {
this.$emit('change', !this.show); this.$emit('change', !this.show)
}, },
closeMenu() { closeMenu() {
this.$emit('change', false); this.$emit('change', false)
} },
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -15,7 +15,7 @@
</template> </template>
<script> <script>
export default { export default {
name: 'navbar-toggle-button' name: 'navbar-toggle-button',
}; }
</script> </script>
<style></style> <style></style>

View File

@ -19,14 +19,14 @@ export default {
props: { props: {
target: { target: {
type: [String, Number], type: [String, Number],
description: 'Button target element' description: 'Button target element',
}, },
toggled: { toggled: {
type: Boolean, type: Boolean,
default: false, default: false,
description: 'Whether button is toggled' description: 'Whether button is toggled',
} },
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -3,12 +3,7 @@
@click="tryClose" @click="tryClose"
data-notify="container" data-notify="container"
class="alert alert-notify alert-dismissible" class="alert alert-notify alert-dismissible"
:class="[ :class="[{ 'alert-with-icon': icon }, verticalAlign, horizontalAlign, alertType]"
{ 'alert-with-icon': icon },
verticalAlign,
horizontalAlign,
alertType
]"
role="alert" role="alert"
:style="customPosition" :style="customPosition"
data-notify-position="top-center" data-notify-position="top-center"
@ -22,173 +17,163 @@
</template> </template>
<span class="alert-text"> <span class="alert-text">
<span v-if="title" class="title"> <span v-if="title" class="title">
<b>{{ title }}<br/></b> <b>
{{ title }}
<br />
</b>
</span> </span>
<span v-if="message" v-html="message"></span> <span v-if="message" v-html="message"></span>
<content-render <content-render v-if="!message && component" :component="component"></content-render>
v-if="!message && component"
:component="component"
></content-render>
</span> </span>
<slot name="dismiss-icon"> <slot name="dismiss-icon">
<button type="button" <button type="button" class="close" data-dismiss="alert" aria-label="Close" @click="close">
class="close"
data-dismiss="alert"
aria-label="Close"
@click="close">
<span aria-hidden="true">×</span> <span aria-hidden="true">×</span>
</button> </button>
</slot> </slot>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'notification', name: 'notification',
components: { components: {
contentRender: { contentRender: {
props: ['component'], props: ['component'],
render: function (createElement) { render: function (createElement) {
return createElement(this.component) return createElement(this.component)
} },
} },
}, },
props: { props: {
message: String, message: String,
title: { title: {
type: String, type: String,
description: 'Notification title' description: 'Notification title',
}, },
icon: { icon: {
type: String, type: String,
description: 'Notification icon' description: 'Notification icon',
}, },
verticalAlign: { verticalAlign: {
type: String, type: String,
default: 'top', default: 'top',
validator: value => { validator: (value) => {
let acceptedValues = ['top', 'bottom']; let acceptedValues = ['top', 'bottom']
return acceptedValues.indexOf(value) !== -1; return acceptedValues.indexOf(value) !== -1
}, },
description: 'Vertical alignment of notification (top|bottom)' description: 'Vertical alignment of notification (top|bottom)',
}, },
horizontalAlign: { horizontalAlign: {
type: String, type: String,
default: 'right', default: 'right',
validator: value => { validator: (value) => {
let acceptedValues = ['left', 'center', 'right']; let acceptedValues = ['left', 'center', 'right']
return acceptedValues.indexOf(value) !== -1; return acceptedValues.indexOf(value) !== -1
}, },
description: 'Horizontal alignment of notification (left|center|right)' description: 'Horizontal alignment of notification (left|center|right)',
}, },
type: { type: {
type: String, type: String,
default: 'info', default: 'info',
validator: value => { validator: (value) => {
let acceptedValues = [ let acceptedValues = ['default', 'info', 'primary', 'danger', 'warning', 'success']
'default', return acceptedValues.indexOf(value) !== -1
'info',
'primary',
'danger',
'warning',
'success'
];
return acceptedValues.indexOf(value) !== -1;
}, },
description: 'Notification type of notification (default|info|primary|danger|warning|success)' description:
'Notification type of notification (default|info|primary|danger|warning|success)',
}, },
timeout: { timeout: {
type: Number, type: Number,
default: 5000, default: 5000,
validator: value => { validator: (value) => {
return value >= 0; return value >= 0
}, },
description: 'Notification timeout (closes after X milliseconds). Default is 5000 (5s)' description: 'Notification timeout (closes after X milliseconds). Default is 5000 (5s)',
}, },
timestamp: { timestamp: {
type: Date, type: Date,
default: () => new Date(), default: () => new Date(),
description: 'Notification timestamp (used internally to handle notification removal correctly)' description:
'Notification timestamp (used internally to handle notification removal correctly)',
}, },
component: { component: {
type: [Object, Function], type: [Object, Function],
description: 'Custom content component. Cane be a `.vue` component or render function' description: 'Custom content component. Cane be a `.vue` component or render function',
}, },
showClose: { showClose: {
type: Boolean, type: Boolean,
default: true, default: true,
description: 'Whether to show close button' description: 'Whether to show close button',
}, },
closeOnClick: { closeOnClick: {
type: Boolean, type: Boolean,
default: true, default: true,
description: 'Whether to close notification when clicking it\' body' description: "Whether to close notification when clicking it' body",
}, },
clickHandler: { clickHandler: {
type: Function, type: Function,
description: 'Custom notification click handler' description: 'Custom notification click handler',
} },
}, },
data() { data() {
return { return {
elmHeight: 0 elmHeight: 0,
}; }
}, },
computed: { computed: {
hasIcon() { hasIcon() {
return this.icon && this.icon.length > 0; return this.icon && this.icon.length > 0
}, },
alertType() { alertType() {
return `alert-${this.type}`; return `alert-${this.type}`
}, },
customPosition() { customPosition() {
let initialMargin = 20; let initialMargin = 20
let alertHeight = this.elmHeight + 10; let alertHeight = this.elmHeight + 10
let sameAlertsCount = this.$notifications.state.filter(alert => { let sameAlertsCount = this.$notifications.state.filter((alert) => {
return ( return (
alert.horizontalAlign === this.horizontalAlign && alert.horizontalAlign === this.horizontalAlign &&
alert.verticalAlign === this.verticalAlign && alert.verticalAlign === this.verticalAlign &&
alert.timestamp <= this.timestamp alert.timestamp <= this.timestamp
); )
}).length; }).length
if (this.$notifications.settings.overlap) { if (this.$notifications.settings.overlap) {
sameAlertsCount = 1; sameAlertsCount = 1
} }
let pixels = (sameAlertsCount - 1) * alertHeight + initialMargin; let pixels = (sameAlertsCount - 1) * alertHeight + initialMargin
let styles = {}; let styles = {}
if (this.verticalAlign === 'top') { if (this.verticalAlign === 'top') {
styles.top = `${pixels}px`; styles.top = `${pixels}px`
} else { } else {
styles.bottom = `${pixels}px`; styles.bottom = `${pixels}px`
}
return styles;
} }
return styles
},
}, },
methods: { methods: {
close() { close() {
this.$emit('close', this.timestamp); this.$emit('close', this.timestamp)
}, },
tryClose(evt) { tryClose(evt) {
if (this.clickHandler) { if (this.clickHandler) {
this.clickHandler(evt, this); this.clickHandler(evt, this)
} }
if (this.closeOnClick) { if (this.closeOnClick) {
this.close(); this.close()
}
} }
}, },
},
mounted() { mounted() {
this.elmHeight = this.$el.clientHeight; this.elmHeight = this.$el.clientHeight
if (this.timeout) { if (this.timeout) {
setTimeout(this.close, this.timeout); setTimeout(this.close, this.timeout)
} }
} },
}; }
</script> </script>
<style lang="scss"> <style lang="scss">
.notifications .alert { .notifications .alert {
position: fixed; position: fixed;
z-index: 10000; z-index: 10000;
@ -205,5 +190,5 @@
&.right { &.right {
right: 20px; right: 20px;
} }
} }
</style> </style>

View File

@ -1,55 +1,52 @@
<template> <template>
<div class="notifications"> <div class="notifications">
<slide-y-up-transition :duration="transitionDuration" <slide-y-up-transition :duration="transitionDuration" group mode="out-in">
group
mode="out-in">
<notification <notification
v-for="notification in notifications" v-for="notification in notifications"
v-bind="notification" v-bind="notification"
:clickHandler="notification.onClick" :clickHandler="notification.onClick"
:key="notification.timestamp.getTime()" :key="notification.timestamp.getTime()"
@close="removeNotification" @close="removeNotification"
> ></notification>
</notification>
</slide-y-up-transition> </slide-y-up-transition>
</div> </div>
</template> </template>
<script> <script>
import Notification from './Notification.vue'; import Notification from './Notification.vue'
import { SlideYUpTransition } from 'vue2-transitions'; import { SlideYUpTransition } from 'vue2-transitions'
export default { export default {
components: { components: {
SlideYUpTransition, SlideYUpTransition,
Notification Notification,
}, },
props: { props: {
transitionDuration: { transitionDuration: {
type: Number, type: Number,
default: 200 default: 200,
}, },
overlap: { overlap: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}, },
data() { data() {
return { return {
notifications: this.$notifications.state notifications: this.$notifications.state,
}; }
}, },
methods: { methods: {
removeNotification(timestamp) { removeNotification(timestamp) {
this.$notifications.removeNotification(timestamp); this.$notifications.removeNotification(timestamp)
} },
}, },
created() { created() {
this.$notifications.settings.overlap = this.overlap; this.$notifications.settings.overlap = this.overlap
}, },
watch: { watch: {
overlap: function (newVal) { overlap: function (newVal) {
this.$notifications.settings.overlap = newVal; this.$notifications.settings.overlap = newVal
} },
} },
}; }
</script> </script>

View File

@ -1,4 +1,4 @@
import Notifications from './Notifications.vue'; import Notifications from './Notifications.vue'
const NotificationStore = { const NotificationStore = {
state: [], // here the notifications will be added state: [], // here the notifications will be added
@ -9,58 +9,58 @@ const NotificationStore = {
type: 'info', type: 'info',
timeout: 5000, timeout: 5000,
closeOnClick: true, closeOnClick: true,
showClose: true showClose: true,
}, },
setOptions(options) { setOptions(options) {
this.settings = Object.assign(this.settings, options); this.settings = Object.assign(this.settings, options)
}, },
removeNotification(timestamp) { removeNotification(timestamp) {
const indexToDelete = this.state.findIndex(n => n.timestamp === timestamp); const indexToDelete = this.state.findIndex((n) => n.timestamp === timestamp)
if (indexToDelete !== -1) { if (indexToDelete !== -1) {
this.state.splice(indexToDelete, 1); this.state.splice(indexToDelete, 1)
} }
}, },
addNotification(notification) { addNotification(notification) {
if (typeof notification === 'string' || notification instanceof String) { if (typeof notification === 'string' || notification instanceof String) {
notification = { message: notification }; notification = { message: notification }
} }
notification.timestamp = new Date(); notification.timestamp = new Date()
notification.timestamp.setMilliseconds( notification.timestamp.setMilliseconds(
notification.timestamp.getMilliseconds() + this.state.length notification.timestamp.getMilliseconds() + this.state.length,
); )
notification = Object.assign({}, this.settings, notification); notification = Object.assign({}, this.settings, notification)
this.state.push(notification); this.state.push(notification)
}, },
notify(notification) { notify(notification) {
if (Array.isArray(notification)) { if (Array.isArray(notification)) {
notification.forEach(notificationInstance => { notification.forEach((notificationInstance) => {
this.addNotification(notificationInstance); this.addNotification(notificationInstance)
}); })
} else { } else {
this.addNotification(notification); this.addNotification(notification)
} }
} },
}; }
const NotificationsPlugin = { const NotificationsPlugin = {
install(Vue, options) { install(Vue, options) {
let app = new Vue({ let app = new Vue({
data: { data: {
notificationStore: NotificationStore notificationStore: NotificationStore,
}, },
methods: { methods: {
notify(notification) { notify(notification) {
this.notificationStore.notify(notification); this.notificationStore.notify(notification)
} },
} },
}); })
Vue.prototype.$notify = app.notify; Vue.prototype.$notify = app.notify
Vue.prototype.$notifications = app.notificationStore; Vue.prototype.$notifications = app.notificationStore
Vue.component('Notifications', Notifications); Vue.component('Notifications', Notifications)
if (options) { if (options) {
NotificationStore.setOptions(options); NotificationStore.setOptions(options)
} }
} },
}; }
export default NotificationsPlugin; export default NotificationsPlugin

View File

@ -1,12 +1,8 @@
<template> <template>
<vue-bootstrap-typeahead <vue-bootstrap-typeahead v-model="query" :data="users" @change="getUser" />
v-model="query"
:data="users"
@change="getUser"
/>
</template> </template>
<script> <script>
import VueBootstrapTypeahead from 'vue-bootstrap-typeahead' import VueBootstrapTypeahead from 'vue-bootstrap-typeahead'
// Global registration // Global registration
//Vue.component('vue-bootstrap-typeahead', VueBootstrapTypeahead) //Vue.component('vue-bootstrap-typeahead', VueBootstrapTypeahead)
@ -15,71 +11,71 @@
// Local registration // Local registration
export default { export default {
name: "SearchUser", name: 'SearchUser',
components: { components: {
VueBootstrapTypeahead VueBootstrapTypeahead,
}, },
data() { data() {
return { return {
user: "", user: '',
users: [ users: [
"Bob", 'Bob',
"Alice", 'Alice',
"Bernd", 'Bernd',
"Dario", 'Dario',
"Alex", 'Alex',
"Pauls", 'Pauls',
"Ulf", 'Ulf',
"Delaware", 'Delaware',
"Florida", 'Florida',
"Georgia", 'Georgia',
"Hawaii", 'Hawaii',
"Idaho", 'Idaho',
"Illnois", 'Illnois',
"Indiana", 'Indiana',
"Iowa", 'Iowa',
"Kansas", 'Kansas',
"Kentucky", 'Kentucky',
"Louisiana", 'Louisiana',
"Maine", 'Maine',
"Maryland", 'Maryland',
"Massachusetts", 'Massachusetts',
"Michigan", 'Michigan',
"Minnesota", 'Minnesota',
"Mississippi", 'Mississippi',
"Missouri", 'Missouri',
"Montana", 'Montana',
"Nebraska", 'Nebraska',
"Nevada", 'Nevada',
"New Hampshire", 'New Hampshire',
"New Jersey", 'New Jersey',
"New Mexico", 'New Mexico',
"New York", 'New York',
"North Carolina", 'North Carolina',
"North Dakota", 'North Dakota',
"Ohio", 'Ohio',
"Oklahoma", 'Oklahoma',
"Oregon", 'Oregon',
"Pennsylvania", 'Pennsylvania',
"Rhode Island", 'Rhode Island',
"South Carolina", 'South Carolina',
"South Dakota", 'South Dakota',
"Tennessee", 'Tennessee',
"Texas", 'Texas',
"Utah", 'Utah',
"Vermont", 'Vermont',
"Virginia", 'Virginia',
"Washington", 'Washington',
"West Virginia", 'West Virginia',
"Wisconsin", 'Wisconsin',
"Wyoming" 'Wyoming',
] ],
}; }
}, },
methods: { methods: {
getUser() { getUser() {
alert(this.data.user) alert(this.data.user)
} },
} },
}; }
</script> </script>

View File

@ -1,60 +1,69 @@
<template> <template>
<nav class="navbar navbar-vertical fixed-left navbar-expand-md navbar-light bg-transparent" id="sidenav-main"> <nav
class="navbar navbar-vertical fixed-left navbar-expand-md navbar-light bg-transparent"
id="sidenav-main"
>
<div class="container-fluid"> <div class="container-fluid">
<!--Toggler--> <!--Toggler-->
<navbar-toggle-button @click.native="showSidebar"> <navbar-toggle-button @click.native="showSidebar"></navbar-toggle-button>
<div class="navbar-brand">
</navbar-toggle-button> <img :src="logo" class="navbar-brand-img" alt="..." />
<router-link class="navbar-brand" to="/"> </div>
<img :src="logo" class="navbar-brand-img" alt="..."> <b-row class="text-center">
</router-link> <b-col>{{ $n($store.state.user.balance) }} GDD</b-col>
</b-row>
<slot name="mobile-right"> <slot name="mobile-right">
<ul class="nav align-items-center d-md-none"> <ul class="nav align-items-center d-md-none">
<base-dropdown class="nav-item" menu-on-right tag="li" title-tag="a"> <base-dropdown class="nav-item" menu-on-right tag="li" title-tag="a">
<a slot="title-container" class="nav-link" href="#" role="button"> <a slot="title-container" class="nav-link" href="#" role="button">
<div class="media align-items-center"> <div class="media align-items-center">
<span class="avatar avatar-sm rounded-circle"> <span class="avatar avatar-sm">
<img alt="Image placeholder" src="img/theme/team-1.jpg"> <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
</span> </span>
</div> </div>
</a> </a>
xx
<router-link to="/KontoOverview" class="dropdown-item text-lg text-muted"> <router-link to="/overview" class="dropdown-item text-lg text-muted">
<i class="ni ni-single-02"></i> <i class="ni ni-single-02"></i>
<span>{{ $t('site.overview.account_overview')}}</span> <span>{{ $t('site.overview.account_overview') }}</span>
</router-link> </router-link>
<router-link to="/profile" class="dropdown-item text-lg text-muted"> <router-link to="/profile" class="dropdown-item text-lg text-muted">
<i class="ni ni-single-02"></i> <i class="ni ni-single-02"></i>
<span>{{ $t('site.navbar.my-profil')}}</span> <span>{{ $t('site.navbar.my-profil') }}</span>
</router-link> </router-link>
<router-link to="/profileedit" class="dropdown-item text-lg text-muted"> <router-link to="/profileedit" class="dropdown-item text-lg text-muted">
<i class="ni ni-settings-gear-65"></i> <i class="ni ni-settings-gear-65"></i>
<span>{{ $t('site.navbar.settings') }}</span> <span>{{ $t('site.navbar.settings') }}</span>
</router-link> </router-link>
<router-link to="/transactions" class="dropdown-item text-lg text-muted">
<i class="ni ni-calendar-grid-58"></i>
<span>Transactions</span>
</router-link>
<!--
<router-link to="/activity" class="dropdown-item text-lg text-muted"> <router-link to="/activity" class="dropdown-item text-lg text-muted">
<i class="ni ni-calendar-grid-58"></i> <i class="ni ni-calendar-grid-58"></i>
<span>{{ $t('site.navbar.activity') }}</span> <span>{{ $t('site.navbar.activity') }}</span>
</router-link> </router-link>
-->
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<router-link @click="logout" class="dropdown-item text-lg text-muted"> <div @click="logout" class="dropdown-item text-lg text-muted">
<i class="ni ni-support-16"></i> <i class="ni ni-support-16"></i>
<span>{{ $t('logout') }}</span> {{ $t('logout') }}
</router-link> </div>
</base-dropdown> </base-dropdown>
</ul> </ul>
</slot> </slot>
<slot></slot> <slot></slot>
<div v-show="$sidebar.showSidebar" class="navbar-collapse collapse show" id="sidenav-collapse-main"> <div
v-show="$sidebar.showSidebar"
class="navbar-collapse collapse show"
id="sidenav-collapse-main"
>
<div class="navbar-collapse-header d-md-none"> <div class="navbar-collapse-header d-md-none">
<div class="row"> <div class="row">
<div class="col-6 collapse-brand"> <div class="col-6 collapse-brand">
<router-link to="/"> <router-link to="/overview">
<img :src="logo"> <img :src="logo" />
</router-link> </router-link>
</div> </div>
<div class="col-6 collapse-close"> <div class="col-6 collapse-close">
@ -62,52 +71,47 @@
</div> </div>
</div> </div>
</div> </div>
<ul class="navbar-nav"> <ul class="navbar-nav">
<slot name="links"> <slot name="links"></slot>
</slot>
</ul> </ul>
<hr class="my-3" />
<hr class="my-3">
<ul class="navbar-nav mb-md-3"> <ul class="navbar-nav mb-md-3">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-lg" href="#!" @click="logout">
<a class="nav-link text-lg bg-light" href="#!" @click="logout">
{{ $t('logout') }} {{ $t('logout') }}
</a> </a>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</nav> </nav>
</template> </template>
<script> <script>
import NavbarToggleButton from '@/components/NavbarToggleButton' import NavbarToggleButton from '@/components/NavbarToggleButton'
import VueQrcode from 'vue-qrcode'
export default { export default {
name: 'sidebar', name: 'sidebar',
components: { components: {
NavbarToggleButton NavbarToggleButton,
VueQrcode,
}, },
props: { props: {
logo: { logo: {
type: String, type: String,
default: 'img/brand/green.png', default: 'img/brand/green.png',
description: 'Sidebar app logo' description: 'Gradido Sidebar app logo',
}, },
autoClose: { autoClose: {
type: Boolean, type: Boolean,
default: true, default: true,
description: 'Whether sidebar should autoclose on mobile when clicking an item' description: 'Whether sidebar should autoclose on mobile when clicking an item',
} },
}, },
provide() { provide() {
return { return {
autoClose: this.autoClose autoClose: this.autoClose,
}; }
}, },
methods: { methods: {
closeSidebar() { closeSidebar() {
@ -116,22 +120,14 @@
showSidebar() { showSidebar() {
this.$sidebar.displaySidebar(true) this.$sidebar.displaySidebar(true)
}, },
setLocale(locale) { logout() {
this.$i18n.locale = locale
//this.$router.push({
// params: { lang: locale }
//})
//this.hideDropdown()
},
logout(){
//console.log("DashboardNavbar.vue user logout() : ")
this.$store.dispatch('logout') this.$store.dispatch('logout')
} },
}, },
beforeDestroy() { beforeDestroy() {
if (this.$sidebar.showSidebar) { if (this.$sidebar.showSidebar) {
this.$sidebar.showSidebar = false; this.$sidebar.showSidebar = false
} }
} },
}; }
</script> </script>

View File

@ -15,31 +15,28 @@
> >
<template v-if="addLink"> <template v-if="addLink">
<span class="nav-link-text"> <span class="nav-link-text">
{{ link.name }} <b class="caret"></b> {{ link.name }}
<b class="caret"></b>
</span> </span>
</template> </template>
<template v-else> <template v-else>
<i :class="link.icon"></i> <i :class="link.icon"></i>
<span class="nav-link-text">{{ link.name }} <b class="caret"></b></span> <span class="nav-link-text">
{{ link.name }}
<b class="caret"></b>
</span>
</template> </template>
</a> </a>
<collapse-transition> <collapse-transition>
<div <div v-if="$slots.default || this.isMenu" v-show="!collapsed" class="collapse show">
v-if="$slots.default || this.isMenu"
v-show="!collapsed"
class="collapse show"
>
<ul class="nav nav-sm flex-column"> <ul class="nav nav-sm flex-column">
<slot></slot> <slot></slot>
</ul> </ul>
</div> </div>
</collapse-transition> </collapse-transition>
<slot <slot name="title" v-if="children.length === 0 && !$slots.default && link.path">
name="title"
v-if="children.length === 0 && !$slots.default && link.path"
>
<component <component
:to="link.path" :to="link.path"
@click.native="linkClick" @click.native="linkClick"
@ -61,19 +58,19 @@
</b-nav-item> </b-nav-item>
</template> </template>
<script> <script>
import { CollapseTransition } from 'vue2-transitions'; import { CollapseTransition } from 'vue2-transitions'
export default { export default {
name: 'sidebar-item', name: 'sidebar-item',
components: { components: {
CollapseTransition CollapseTransition,
}, },
props: { props: {
menu: { menu: {
type: Boolean, type: Boolean,
default: false, default: false,
description: description:
"Whether the item is a menu. Most of the item it's not used and should be used only if you want to override the default behavior." "Whether the item is a menu. Most of the item it's not used and should be used only if you want to override the default behavior.",
}, },
link: { link: {
type: Object, type: Object,
@ -81,115 +78,109 @@ export default {
return { return {
name: '', name: '',
path: '', path: '',
children: [] children: [],
}; }
}, },
description: description:
'Sidebar link. Can contain name, path, icon and other attributes. See examples for more info' 'Sidebar link. Can contain name, path, icon and other attributes. See examples for more info',
} },
}, },
provide() { provide() {
return { return {
addLink: this.addChild, addLink: this.addChild,
removeLink: this.removeChild removeLink: this.removeChild,
}; }
}, },
inject: { inject: {
addLink: { default: null }, addLink: { default: null },
removeLink: { default: null }, removeLink: { default: null },
autoClose: { autoClose: {
default: true default: true,
} },
}, },
data() { data() {
return { return {
children: [], children: [],
collapsed: true collapsed: true,
}; }
}, },
computed: { computed: {
baseComponent() { baseComponent() {
return this.isMenu || this.link.isRoute ? 'li' : 'router-link'; return this.isMenu || this.link.isRoute ? 'li' : 'router-link'
}, },
linkPrefix() { linkPrefix() {
if (this.link.name) { if (this.link.name) {
let words = this.link.name.split(' '); let words = this.link.name.split(' ')
return words.map(word => word.substring(0, 1)).join(''); return words.map((word) => word.substring(0, 1)).join('')
} }
return '' return ''
}, },
isMenu() { isMenu() {
return this.children.length > 0 || this.menu === true; return this.children.length > 0 || this.menu === true
}, },
isActive() { isActive() {
if (this.$route && this.$route.path) { if (this.$route && this.$route.path) {
let matchingRoute = this.children.find(c => let matchingRoute = this.children.find((c) => this.$route.path.startsWith(c.link.path))
this.$route.path.startsWith(c.link.path)
);
if (matchingRoute !== undefined) { if (matchingRoute !== undefined) {
return true; return true
} }
} }
return false; return false
} },
}, },
methods: { methods: {
addChild(item) { addChild(item) {
const index = this.$slots.default.indexOf(item.$vnode); const index = this.$slots.default.indexOf(item.$vnode)
this.children.splice(index, 0, item); this.children.splice(index, 0, item)
}, },
removeChild(item) { removeChild(item) {
const tabs = this.children; const tabs = this.children
const index = tabs.indexOf(item); const index = tabs.indexOf(item)
tabs.splice(index, 1); tabs.splice(index, 1)
}, },
elementType(link, isParent = true) { elementType(link, isParent = true) {
if (link.isRoute === false) { if (link.isRoute === false) {
return isParent ? 'li' : 'a'; return isParent ? 'li' : 'a'
} else { } else {
return 'router-link'; return 'router-link'
} }
}, },
linkAbbreviation(name) { linkAbbreviation(name) {
const matches = name.match(/\b(\w)/g); const matches = name.match(/\b(\w)/g)
return matches.join(''); return matches.join('')
}, },
linkClick() { linkClick() {
if ( if (this.autoClose && this.$sidebar && this.$sidebar.showSidebar === true) {
this.autoClose && this.$sidebar.displaySidebar(false)
this.$sidebar &&
this.$sidebar.showSidebar === true
) {
this.$sidebar.displaySidebar(false);
} }
}, },
collapseMenu() { collapseMenu() {
this.collapsed = !this.collapsed; this.collapsed = !this.collapsed
}, },
collapseSubMenu(link) { collapseSubMenu(link) {
link.collapsed = !link.collapsed; link.collapsed = !link.collapsed
} },
}, },
mounted() { mounted() {
if (this.addLink) { if (this.addLink) {
this.addLink(this); this.addLink(this)
} }
if (this.link.collapsed !== undefined) { if (this.link.collapsed !== undefined) {
this.collapsed = this.link.collapsed; this.collapsed = this.link.collapsed
} }
if (this.isActive && this.isMenu) { if (this.isActive && this.isMenu) {
this.collapsed = false; this.collapsed = false
} }
}, },
destroyed() { destroyed() {
if (this.$el && this.$el.parentNode) { if (this.$el && this.$el.parentNode) {
this.$el.parentNode.removeChild(this.$el); this.$el.parentNode.removeChild(this.$el)
} }
if (this.removeLink) { if (this.removeLink) {
this.removeLink(this); this.removeLink(this)
} }
} },
}; }
</script> </script>
<style> <style>
.sidebar-menu-item { .sidebar-menu-item {

View File

@ -1,43 +1,43 @@
import Sidebar from './SideBar.vue'; import Sidebar from './SideBar.vue'
import SidebarItem from './SidebarItem.vue'; import SidebarItem from './SidebarItem.vue'
const SidebarStore = { const SidebarStore = {
showSidebar: false, showSidebar: false,
sidebarLinks: [], sidebarLinks: [],
isMinimized: false, isMinimized: false,
displaySidebar(value) { displaySidebar(value) {
this.showSidebar = value; this.showSidebar = value
}, },
toggleMinimize() { toggleMinimize() {
document.body.classList.toggle('sidebar-mini'); document.body.classList.toggle('sidebar-mini')
// we simulate the window Resize so the charts will get updated in realtime. // we simulate the window Resize so the charts will get updated in realtime.
const simulateWindowResize = setInterval(() => { const simulateWindowResize = setInterval(() => {
window.dispatchEvent(new Event('resize')); window.dispatchEvent(new Event('resize'))
}, 180); }, 180)
// we stop the simulation of Window Resize after the animations are completed // we stop the simulation of Window Resize after the animations are completed
setTimeout(() => { setTimeout(() => {
clearInterval(simulateWindowResize); clearInterval(simulateWindowResize)
}, 1000); }, 1000)
this.isMinimized = !this.isMinimized; this.isMinimized = !this.isMinimized
} },
}; }
const SidebarPlugin = { const SidebarPlugin = {
install(Vue, options) { install(Vue, options) {
if (options && options.sidebarLinks) { if (options && options.sidebarLinks) {
SidebarStore.sidebarLinks = options.sidebarLinks; SidebarStore.sidebarLinks = options.sidebarLinks
} }
let app = new Vue({ let app = new Vue({
data: { data: {
sidebarStore: SidebarStore sidebarStore: SidebarStore,
} },
}); })
Vue.prototype.$sidebar = app.sidebarStore; Vue.prototype.$sidebar = app.sidebarStore
Vue.component('side-bar', Sidebar); Vue.component('side-bar', Sidebar)
Vue.component('sidebar-item', SidebarItem); Vue.component('sidebar-item', SidebarItem)
} },
}; }
export default SidebarPlugin; export default SidebarPlugin

View File

@ -16,18 +16,18 @@ export default {
inject: ['addTab', 'removeTab'], inject: ['addTab', 'removeTab'],
data() { data() {
return { return {
active: false active: false,
}; }
}, },
mounted() { mounted() {
this.addTab(this); this.addTab(this)
}, },
destroyed() { destroyed() {
if (this.$el && this.$el.parentNode) { if (this.$el && this.$el.parentNode) {
this.$el.parentNode.removeChild(this.$el); this.$el.parentNode.removeChild(this.$el)
} }
this.removeTab(this); this.removeTab(this)
} },
}; }
</script> </script>
<style></style> <style></style>

View File

@ -4,7 +4,7 @@
:class="[ :class="[
{ 'col-md-4': vertical && !tabNavWrapperClasses }, { 'col-md-4': vertical && !tabNavWrapperClasses },
{ 'col-12': centered && !tabNavWrapperClasses }, { 'col-12': centered && !tabNavWrapperClasses },
tabNavWrapperClasses tabNavWrapperClasses,
]" ]"
> >
<b-nav <b-nav
@ -14,7 +14,7 @@
`nav-pills-${type}`, `nav-pills-${type}`,
{ 'flex-column': vertical }, { 'flex-column': vertical },
{ 'justify-content-center': centered }, { 'justify-content-center': centered },
tabNavClasses tabNavClasses,
]" ]"
> >
<b-nav-item <b-nav-item
@ -28,7 +28,7 @@
@click.prevent="activateTab(tab)" @click.prevent="activateTab(tab)"
:aria-expanded="tab.active" :aria-expanded="tab.active"
> >
<tab-item-content :tab="tab"> </tab-item-content> <tab-item-content :tab="tab"></tab-item-content>
</b-nav-item> </b-nav-item>
</b-nav> </b-nav>
</div> </div>
@ -37,7 +37,7 @@
:class="[ :class="[
{ 'tab-space': !vertical }, { 'tab-space': !vertical },
{ 'col-md-8': vertical && !tabContentClasses }, { 'col-md-8': vertical && !tabContentClasses },
tabContentClasses tabContentClasses,
]" ]"
> >
<slot></slot> <slot></slot>
@ -52,110 +52,104 @@ export default {
TabItemContent: { TabItemContent: {
props: ['tab'], props: ['tab'],
render(h) { render(h) {
return h('div', [this.tab.$slots.title || this.tab.title]); return h('div', [this.tab.$slots.title || this.tab.title])
} },
} },
}, },
provide() { provide() {
return { return {
addTab: this.addTab, addTab: this.addTab,
removeTab: this.removeTab removeTab: this.removeTab,
}; }
}, },
props: { props: {
type: { type: {
type: String, type: String,
default: 'primary', default: 'primary',
validator: value => { validator: (value) => {
let acceptedValues = [ let acceptedValues = ['primary', 'info', 'success', 'warning', 'danger']
'primary', return acceptedValues.indexOf(value) !== -1
'info', },
'success',
'warning',
'danger'
];
return acceptedValues.indexOf(value) !== -1;
}
}, },
activeTab: { activeTab: {
type: String, type: String,
default: '', default: '',
description: 'Active tab name' description: 'Active tab name',
}, },
tabNavWrapperClasses: { tabNavWrapperClasses: {
type: [String, Object], type: [String, Object],
default: '', default: '',
description: 'ul wrapper css classes' description: 'ul wrapper css classes',
}, },
tabNavClasses: { tabNavClasses: {
type: [String, Object], type: [String, Object],
default: '', default: '',
description: 'ul css classes' description: 'ul css classes',
}, },
tabContentClasses: { tabContentClasses: {
type: [String, Object], type: [String, Object],
default: '', default: '',
description: 'tab content css classes' description: 'tab content css classes',
}, },
vertical: Boolean, vertical: Boolean,
centered: Boolean, centered: Boolean,
value: String value: String,
}, },
data() { data() {
return { return {
tabs: [] tabs: [],
}; }
}, },
methods: { methods: {
findAndActivateTab(title) { findAndActivateTab(title) {
let tabToActivate = this.tabs.find(t => t.title === title); let tabToActivate = this.tabs.find((t) => t.title === title)
if (tabToActivate) { if (tabToActivate) {
this.activateTab(tabToActivate); this.activateTab(tabToActivate)
} }
}, },
activateTab(tab) { activateTab(tab) {
if (this.handleClick) { if (this.handleClick) {
this.handleClick(tab); this.handleClick(tab)
} }
this.deactivateTabs(); this.deactivateTabs()
tab.active = true; tab.active = true
}, },
deactivateTabs() { deactivateTabs() {
this.tabs.forEach(tab => { this.tabs.forEach((tab) => {
tab.active = false; tab.active = false
}); })
}, },
addTab(tab) { addTab(tab) {
const index = this.$slots.default.indexOf(tab.$vnode); const index = this.$slots.default.indexOf(tab.$vnode)
if (!this.activeTab && index === 0) { if (!this.activeTab && index === 0) {
tab.active = true; tab.active = true
} }
if (this.activeTab === tab.name) { if (this.activeTab === tab.name) {
tab.active = true; tab.active = true
} }
this.tabs.splice(index, 0, tab); this.tabs.splice(index, 0, tab)
}, },
removeTab(tab) { removeTab(tab) {
const tabs = this.tabs; const tabs = this.tabs
const index = tabs.indexOf(tab); const index = tabs.indexOf(tab)
if (index > -1) { if (index > -1) {
tabs.splice(index, 1); tabs.splice(index, 1)
}
} }
}, },
},
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
if (this.value) { if (this.value) {
this.findAndActivateTab(this.value); this.findAndActivateTab(this.value)
} }
}); })
}, },
watch: { watch: {
value(newVal) { value(newVal) {
this.findAndActivateTab(newVal); this.findAndActivateTab(newVal)
} },
} },
}; }
</script> </script>
<style scoped></style> <style scoped></style>

View File

@ -1,30 +1,30 @@
import BaseCheckbox from './Inputs/BaseCheckbox.vue'; import BaseCheckbox from './Inputs/BaseCheckbox.vue'
import BaseAlert from './BaseAlert.vue'; import BaseAlert from './BaseAlert.vue'
import BaseRadio from './Inputs/BaseRadio.vue'; import BaseRadio from './Inputs/BaseRadio.vue'
import BaseInput from './Inputs/BaseInput.vue'; import BaseInput from './Inputs/BaseInput.vue'
import Badge from './Badge'; import Badge from './Badge'
import BaseProgress from './BaseProgress.vue'; import BaseProgress from './BaseProgress.vue'
import BaseButton from './BaseButton.vue'; import BaseButton from './BaseButton.vue'
import BaseDropdown from './BaseDropdown.vue'; import BaseDropdown from './BaseDropdown.vue'
import BaseTable from './BaseTable.vue'; import BaseTable from './BaseTable.vue'
import Card from './Cards/Card.vue'; import Card from './Cards/Card.vue'
import StatsCard from './Cards/StatsCard.vue'; import StatsCard from './Cards/StatsCard.vue'
import BaseNav from './Navbar/BaseNav'; import BaseNav from './Navbar/BaseNav'
import NavbarToggleButton from './Navbar/NavbarToggleButton'; import NavbarToggleButton from './Navbar/NavbarToggleButton'
import TabPane from './Tabs/Tab.vue'; import TabPane from './Tabs/Tab.vue'
import Tabs from './Tabs/Tabs.vue'; import Tabs from './Tabs/Tabs.vue'
import Collapse from './Collapse/Collapse.vue'; import Collapse from './Collapse/Collapse.vue'
import CollapseItem from './Collapse/CollapseItem.vue'; import CollapseItem from './Collapse/CollapseItem.vue'
import Modal from './Modal.vue'; import Modal from './Modal.vue'
import BaseSlider from './BaseSlider.vue'; import BaseSlider from './BaseSlider.vue'
import LoadingPanel from './LoadingPanel.vue'; import LoadingPanel from './LoadingPanel.vue'
import BasePagination from './BasePagination.vue'; import BasePagination from './BasePagination.vue'
import SidebarPlugin from './SidebarPlugin'; import SidebarPlugin from './SidebarPlugin'
export { export {
BaseCheckbox, BaseCheckbox,
@ -48,5 +48,5 @@ export {
BaseButton, BaseButton,
Collapse, Collapse,
CollapseItem, CollapseItem,
LoadingPanel LoadingPanel,
}; }

View File

@ -11,8 +11,12 @@ const environment = {
const server = { const server = {
LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/', LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/',
COMMUNITY_API_STATE_BALANCE_URL: process.env.COMMUNITY_API_STATE_BALANCE_URL || 'http://localhost/state-balances/', COMMUNITY_API_STATE_BALANCE_URL:
COMMUNITY_API_TRANSACTION_CREATION_URL: process.env.COMMUNITY_API_TRANSACTION_CREATION_URL || 'http://localhost/transaction-creations/', process.env.COMMUNITY_API_STATE_BALANCE_URL || 'http://localhost/state-balances/',
// Schöpfung
// COMMUNITY_API_TRANSACTION_CREATION_URL: process.env.COMMUNITY_API_TRANSACTION_CREATION_URL || 'http://localhost/transaction-creations/',
COMMUNITY_API_TRANSACTION_SEND_COINS:
process.env.COMMUNITY_API_TRANSACTION_SEND_COINS || 'http://localhost/transaction-send-coins/',
} }
const CONFIG = { const CONFIG = {

View File

@ -1,15 +1,15 @@
export default { export default {
bind: function(el, binding, vnode) { bind: function (el, binding, vnode) {
el.clickOutsideEvent = function(event) { el.clickOutsideEvent = function (event) {
// here I check that click was outside the el and his childrens // here I check that click was outside the el and his childrens
if (!(el == event.target || el.contains(event.target))) { if (!(el == event.target || el.contains(event.target))) {
// and if it did, call method provided in attribute value // and if it did, call method provided in attribute value
vnode.context[binding.expression](event); vnode.context[binding.expression](event)
} }
}; }
document.body.addEventListener('click', el.clickOutsideEvent); document.body.addEventListener('click', el.clickOutsideEvent)
}, },
unbind: function(el) { unbind: function (el) {
document.body.removeEventListener('click', el.clickOutsideEvent); document.body.removeEventListener('click', el.clickOutsideEvent)
} },
}; }

View File

@ -1,16 +1,31 @@
import Vue from 'vue' import Vue from 'vue'
import VueI18n from 'vue-i18n' import VueI18n from 'vue-i18n'
import en from 'vee-validate/dist/locale/en'
import de from 'vee-validate/dist/locale/de'
Vue.use(VueI18n) Vue.use(VueI18n)
function loadLocaleMessages () { function loadLocaleMessages() {
const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i) const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i)
const messages = {} const messages = {}
locales.keys().forEach(key => { locales.keys().forEach((key) => {
const matched = key.match(/([A-Za-z0-9-_]+)\./i) const matched = key.match(/([A-Za-z0-9-_]+)\./i)
if (matched && matched.length > 1) { if (matched && matched.length > 1) {
const locale = matched[1] const locale = matched[1]
messages[locale] = locales(key) messages[locale] = locales(key)
if (locale === 'de') {
messages[locale] = {
validations: de,
...messages[locale],
}
}
if (locale === 'en') {
messages[locale] = {
validations: en,
...messages[locale],
}
}
} }
}) })
return messages return messages
@ -19,20 +34,23 @@ function loadLocaleMessages () {
const numberFormats = { const numberFormats = {
'en-US': { 'en-US': {
currency: { currency: {
style: 'currency' style: 'currency',
} currency: 'GDD',
abbreviate: true,
},
}, },
'de-DE': { 'de-DE': {
currency: { currency: {
style: 'currency' style: 'currency',
} currency: 'GDD',
} abbreviate: true,
},
},
} }
export default new VueI18n({ export default new VueI18n({
locale: 'en', locale: 'en',
fallbackLocale: 'en', fallbackLocale: 'en',
messages: loadLocaleMessages(), messages: loadLocaleMessages(),
numberFormats numberFormats,
}) })

File diff suppressed because one or more lines are too long

View File

@ -1,21 +1,21 @@
{ {
"message": "hallo gradido !!", "message": "hallo gradido !!",
"welcome":"Willkommen!", "welcome":"Willkommen!",
"logout":"Logout", "logout":"Abmelden",
"login":"Login", "login":"Login",
"signup": "Registrieren", "signup": "Registrieren",
"imprint":"Impressum", "imprint":"Impressum",
"privacy_policy":"Datenschutzerklärung", "privacy_policy":"Datenschutzerklärung",
"license":"Lizenz", "back":"Zurück",
"back":"zurück", "sent":"Senden",
"transactions":"Transaktionen", "transactions":"Transaktionen",
"language":"Sprachen", "language":"Language",
"languages":{ "languages":{
"de": "Deutsch", "de": "Deutsch",
"en": "English" "en": "English"
}, },
"form": { "form": {
"cancel":"abbrechen", "cancel":"Abbrechen",
"firstname":"Vorname", "firstname":"Vorname",
"lastname":"Nachname", "lastname":"Nachname",
"email":"eMail", "email":"eMail",
@ -29,7 +29,7 @@
"from":"von", "from":"von",
"to":"bis", "to":"bis",
"at":"am", "at":"am",
"send_now":"jetzt versenden" "send_now":"Jetzt versenden"
}, },
"transaction":{ "transaction":{
"show_part": "Die letzten <strong>{count}</strong> Transaktionen", "show_part": "Die letzten <strong>{count}</strong> Transaktionen",
@ -38,23 +38,23 @@
}, },
"site": { "site": {
"login": { "login": {
"community":"Du bist die Gemeinschaft", "community":"Tausend Dank, weil du bei uns bist!",
"remember":"Passwort merken", "remember":"Passwort merken",
"signin":"Anmelden", "signin":"Anmelden",
"forgot_pwd":"Passwort vergessen?", "forgot_pwd":"Passwort vergessen?",
"new_wallet":"Neues Wallet erstellen" "new_wallet":"Neues Konto erstellen"
}, },
"signup": { "signup": {
"title": "Erstelle deine Gradido Wallet", "title": "Erstelle dein Gradido-Konto",
"subtitle": "Werde ein teil der Gemeinschaft!", "subtitle": "Werde Teil der Gemeinschaft!",
"strength":"Passwortsicherheit:", "strength":"Passwortsicherheit:",
"strong":"stark", "strong":"stark",
"agree":"habe ich gelesen und verstanden und stimme diesen zu." "agree":"habe ich gelesen und verstanden und stimme diesen zu."
}, },
"password": { "password": {
"title": "Passwort zurücksetzen", "title": "Passwort zurücksetzen",
"subtitle": "Wenn sie das Passwort vergessen haben oder ändern möchten.", "subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen.",
"reset_now": "jetzt zurücksetzen" "reset_now": "Jetzt zurücksetzen"
}, },
"thx": { "thx": {
"title": "Danke!", "title": "Danke!",
@ -68,7 +68,7 @@
}, },
"navbar" : { "navbar" : {
"my-profil":"Mein Profil", "my-profil":"Mein Profil",
"settings":"Einstellung", "settings":"Einstellungen",
"activity":"Aktivität", "activity":"Aktivität",
"support":"Support" "support":"Support"
}, },
@ -80,19 +80,19 @@
}, },
"landing1" : { "landing1" : {
"explore": "Erkunden Sie Gradido", "explore": "Erkunden Sie Gradido",
"text": "Gesundes Geld für eine gesunde Welt - Das Gradido-Modell kann weltweiten Wohlstand und Frieden schaffen", "text": "Gesundes Geld für eine gesunde Welt Das Gradido-Modell kann weltweiten Wohlstand und Frieden schaffen",
"link": "Seiten erkunden" "link": "Seiten erkunden"
}, },
"404" : { "404" : {
"ooops" : "Ooops!", "ooops" : "Ooops!",
"text" : "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden", "text" : "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden",
"back" : "zurück zur Übersicht!" "back" : "Zurück zur Übersicht!"
} }
}, },
"admin": { "admin": {
"site": { "site": {
"overview": { "overview": {
"created": "created", "created": "Schöpfen",
"transience" : "Transience", "transience" : "Transience",
"exchanged": "Exchanged", "exchanged": "Exchanged",
"members" : "Members" "members" : "Members"
@ -101,9 +101,5 @@
}, },
"nav": { "nav": {
"features": "Neuigkeiten" "features": "Neuigkeiten"
},
"about": {
"title": "Über uns",
"content": "Lorem ipsum deutsch dolor sit amet consectetur adipisicing elit. Aut dicta incidunt ea ut commodi quidem temporibus illo quia. Et itaque deleniti veniam tempore facere ipsum animi totam culpa minima vel voluptatem adipisci natus blanditiis similique sunt expedita, ex dicta doloremque repellat vitae temporibus. Quisquam quia, accusantium blanditiis architecto facilis saepe! Lorem ipsum dolor sit amet consectetur adipisicing elit. Ad unde laborum ut suscipit iure aliquam sapiente doloribus exercitationem nam sint."
} }
} }

View File

@ -4,12 +4,12 @@
"logout":"Logout", "logout":"Logout",
"login":"Login", "login":"Login",
"signup": "Sign up", "signup": "Sign up",
"imprint":"Imprint", "imprint":"Legal notice",
"privacy_policy":"Privacy policy", "privacy_policy":"Privacy policy",
"license":"License", "back":"Back",
"back":"back", "sent":"Send",
"transactions":"transactions", "transactions":"Transactions",
"language":"Language", "language":"Sprache",
"languages":{ "languages":{
"de": "Deutsch", "de": "Deutsch",
"en": "English" "en": "English"
@ -19,9 +19,9 @@
"firstname":"Firstname", "firstname":"Firstname",
"lastname":"Lastname", "lastname":"Lastname",
"email":"Email", "email":"Email",
"email_repeat":"repeat_email", "email_repeat":"Repeat Email",
"password":"Password", "password":"Password",
"password_repeat":"repeat password", "password_repeat":"Repeat password",
"amount":"Amount", "amount":"Amount",
"memo":"Memo", "memo":"Memo",
"message":"Message", "message":"Message",
@ -30,7 +30,7 @@
"to":"to", "to":"to",
"at":"at", "at":"at",
"time":"Time", "time":"Time",
"send_now":"send now" "send_now":"Send now"
}, },
"transaction":{ "transaction":{
"show_part": "The last <strong>{count}</strong> transactions", "show_part": "The last <strong>{count}</strong> transactions",
@ -39,27 +39,27 @@
}, },
"site": { "site": {
"login": { "login": {
"community":"You are the community", "community":"A thousand thanks for being with us!",
"remember":"Remember me", "remember":"Remember password",
"signin":"Sign in", "signin":"Sign in",
"forgot_pwd":"Forgot password?", "forgot_pwd":"Forgot password?",
"new_wallet":"Create new wallet" "new_wallet":"Create new account"
}, },
"signup": { "signup": {
"title": "Create your Gradido Wallet", "title": "Create your Gradido account",
"subtitle": "Become a part of the community!", "subtitle": "Become a part of the community!",
"strength":"password strength:", "strength":"Password strength:",
"strong":"strong", "strong":"strong",
"agree":"I have read and understood and agree to them the" "agree":"I have read and understood and agree to them"
}, },
"password": { "password": {
"title": "reset password", "title": "Reset password",
"subtitle": "If you have forgotten the password or want to change it.", "subtitle": "If you have forgotten your password, you can reset it here.",
"reset_now": "reset now" "reset_now": "Reset now"
}, },
"thx": { "thx": {
"title": "Thank you", "title": "Thank you!",
"subtitle": "We have sent you an eMail." "subtitle": "We have sent you an email."
}, },
"overview":{ "overview":{
"account_overview":"Account overview", "account_overview":"Account overview",
@ -68,7 +68,7 @@
"add_work":"New Community Contribution" "add_work":"New Community Contribution"
}, },
"navbar" : { "navbar" : {
"my-profil":"My Profil", "my-profil":"My profile",
"settings":"Settings", "settings":"Settings",
"activity":"Activity", "activity":"Activity",
"support":"Support" "support":"Support"
@ -76,20 +76,21 @@
"sidebar" : { "sidebar" : {
"community":"Community", "community":"Community",
"members_area":"Members area", "members_area":"Members area",
"membership":"Membership" "membership":"Membership",
"language":"Languages"
}, },
"landing1" : { "landing1" : {
"explore":"Explore Gradido", "explore":"Explore Gradido",
"text":"If you want to get inspiration or just show something directly to your clients, you can jump start your development with our pre-built example pages.", "text":"Healthy money for a healthy world — the Gradido model can create global prosperity and peace",
"link":"Explore pages" "link":"Explore pages"
}, },
"404" : { "404" : {
"ooops" : "Ooops!", "ooops" : "Ooops!",
"text" : "Page not found. Don't worry though, we have plenty of other pages to explore", "text" : "Page not found. Do not worry though, we have plenty of other pages to explore",
"back" : "Back to dashboard!" "back" : "Back to dashboard!"
} }
}, },
"admin": { "admin": {
"site": { "site": {
"overview": { "overview": {
"creation": "Creation", "creation": "Creation",
@ -98,12 +99,8 @@
"members" : "Members" "members" : "Members"
} }
} }
}, },
"nav": { "nav": {
"features": "Features" "features": "Features"
},
"about": {
"title": "About",
"content": "Lorem ipsum english dolor sit amet consectetur adipisicing elit. Aut dicta incidunt ea ut commodi quidem temporibus illo quia. Et itaque deleniti veniam tempore facere ipsum animi totam culpa minima vel voluptatem adipisci natus blanditiis similique sunt expedita, ex dicta doloremque repellat vitae temporibus. Quisquam quia, accusantium blanditiis architecto facilis saepe! Lorem ipsum dolor sit amet consectetur adipisicing elit. Ad unde laborum ut suscipit iure aliquam sapiente doloribus exercitationem nam sint."
} }
} }

View File

@ -1,20 +1,20 @@
import Vue from 'vue'; import Vue from 'vue'
import DashboardPlugin from './plugins/dashboard-plugin'; import DashboardPlugin from './plugins/dashboard-plugin'
import App from './App.vue'; import App from './App.vue'
import i18n from './i18n.js'; import i18n from './i18n.js'
import VueCookies from 'vue-cookies'; import VeeValidate from './vee-validate.js'
import VueCookies from 'vue-cookies'
// store // store
import {store} from './store/store'; import { store } from './store/store'
// router setup // router setup
import router from './routes/router'; import router from './routes/router'
// plugin setup // plugin setup
Vue.use(DashboardPlugin); Vue.use(DashboardPlugin)
Vue.config.productionTip = false; Vue.config.productionTip = false
Vue.use(VueCookies); Vue.use(VueCookies)
/* eslint-disable no-new */ /* eslint-disable no-new */
new Vue({ new Vue({
@ -22,5 +22,5 @@ new Vue({
router, router,
store, store,
i18n, i18n,
render: h => h(App) render: (h) => h(App),
}); })

View File

@ -1,67 +1,67 @@
// Polyfills for js features used in the Dashboard but not supported in some browsers (mainly IE) // Polyfills for js features used in the Dashboard but not supported in some browsers (mainly IE)
import '@/polyfills'; import '@/polyfills'
// Notifications plugin. Used on Notifications page // Notifications plugin. Used on Notifications page
import Notifications from '@/components/NotificationPlugin'; import Notifications from '@/components/NotificationPlugin'
// Validation plugin used to validate forms // Validation plugin used to validate forms
import { configure } from 'vee-validate'; import { configure } from 'vee-validate'
// A plugin file where you could register global components used across the app // A plugin file where you could register global components used across the app
import GlobalComponents from './globalComponents'; import GlobalComponents from './globalComponents'
// A plugin file where you could register global directives // A plugin file where you could register global directives
import GlobalDirectives from './globalDirectives'; import GlobalDirectives from './globalDirectives'
// Sidebar on the right. Used as a local plugin in DashboardLayout.vue // Sidebar on the right. Used as a local plugin in DashboardLayout.vue
import SideBar from '@/components/SidebarPlugin'; import SideBar from '@/components/SidebarPlugin'
// element ui language configuration // element ui language configuration
import lang from 'element-ui/lib/locale/lang/en'; import lang from 'element-ui/lib/locale/lang/en'
import locale from 'element-ui/lib/locale'; import locale from 'element-ui/lib/locale'
locale.use(lang); locale.use(lang)
// vue-bootstrap // vue-bootstrap
import { BootstrapVue, IconsPlugin } from 'bootstrap-vue' import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
// asset imports // asset imports
import '@/assets/scss/argon.scss'; import '@/assets/scss/argon.scss'
import '@/assets/vendor/nucleo/css/nucleo.css'; import '@/assets/vendor/nucleo/css/nucleo.css'
import { extend } from 'vee-validate'; import { extend } from 'vee-validate'
import * as rules from 'vee-validate/dist/rules'; import * as rules from 'vee-validate/dist/rules'
import { messages } from 'vee-validate/dist/locale/en.json'; import { messages } from 'vee-validate/dist/locale/en.json'
import VueQrcodeReader from "vue-qrcode-reader"; import VueQrcodeReader from 'vue-qrcode-reader'
import VueQrcode from "vue-qrcode"; import VueQrcode from 'vue-qrcode'
import VueFlatPickr from 'vue-flatpickr-component'
import VueGoodTablePlugin from 'vue-good-table'; import VueGoodTablePlugin from 'vue-good-table'
// import the styles // import the styles
import 'vue-good-table/dist/vue-good-table.css'; import 'vue-good-table/dist/vue-good-table.css'
import VueMoment from 'vue-moment'; import VueMoment from 'vue-moment'
Object.keys(rules).forEach(rule => { Object.keys(rules).forEach((rule) => {
extend(rule, { extend(rule, {
...rules[rule], // copies rule configuration ...rules[rule], // copies rule configuration
message: messages[rule] // assign message message: messages[rule], // assign message
}); })
}); })
export default { export default {
install(Vue) { install(Vue) {
Vue.use(GlobalComponents); Vue.use(GlobalComponents)
Vue.use(GlobalDirectives); Vue.use(GlobalDirectives)
Vue.use(SideBar); Vue.use(SideBar)
Vue.use(Notifications); Vue.use(Notifications)
Vue.use(BootstrapVue); Vue.use(BootstrapVue)
Vue.use(IconsPlugin); Vue.use(IconsPlugin)
Vue.use(VueGoodTablePlugin); Vue.use(VueGoodTablePlugin)
Vue.use(VueMoment); Vue.use(VueMoment)
Vue.use(VueQrcodeReader); Vue.use(VueQrcodeReader)
Vue.use(VueQrcode); Vue.use(VueQrcode)
Vue.use(VueFlatPickr)
configure({ configure({
classes: { classes: {
valid: 'is-valid', valid: 'is-valid',
invalid: 'is-invalid', invalid: 'is-invalid',
dirty: ['is-dirty', 'is-dirty'], // multiple classes per flag! dirty: ['is-dirty', 'is-dirty'], // multiple classes per flag!
} },
}) })
} },
}; }

View File

@ -1,45 +1,45 @@
import BaseInput from '@/components/Inputs/BaseInput.vue'; import BaseInput from '@/components/Inputs/BaseInput.vue'
import BaseDropdown from '@/components/BaseDropdown.vue'; import BaseDropdown from '@/components/BaseDropdown.vue'
import Card from '@/components/Cards/Card.vue'; import Card from '@/components/Cards/Card.vue'
import Modal from '@/components/Modal.vue'; import Modal from '@/components/Modal.vue'
import StatsCard from '@/components/Cards/StatsCard.vue'; import StatsCard from '@/components/Cards/StatsCard.vue'
import BaseButton from '@/components/BaseButton.vue'; import BaseButton from '@/components/BaseButton.vue'
import Badge from '@/components/Badge.vue'; import Badge from '@/components/Badge.vue'
import BaseCheckbox from '@/components/Inputs/BaseCheckbox.vue'; import BaseCheckbox from '@/components/Inputs/BaseCheckbox.vue'
import BaseRadio from "@/components/Inputs/BaseRadio"; import BaseRadio from '@/components/Inputs/BaseRadio'
import BaseProgress from "@/components/BaseProgress"; import BaseProgress from '@/components/BaseProgress'
import BasePagination from "@/components/BasePagination"; import BasePagination from '@/components/BasePagination'
import BaseAlert from "@/components/BaseAlert"; import BaseAlert from '@/components/BaseAlert'
import BaseNav from "@/components/Navbar/BaseNav"; import BaseNav from '@/components/Navbar/BaseNav'
import BaseHeader from '@/components/BaseHeader'; import BaseHeader from '@/components/BaseHeader'
import { ValidationProvider, ValidationObserver } from 'vee-validate'; import { ValidationProvider, ValidationObserver } from 'vee-validate'
import { Input, Tooltip, Popover } from 'element-ui'; import { Input, Tooltip, Popover } from 'element-ui'
/** /**
* You can register global components here and use them as a plugin in your main Vue instance * You can register global components here and use them as a plugin in your main Vue instance
*/ */
const GlobalComponents = { const GlobalComponents = {
install(Vue) { install(Vue) {
Vue.component(Badge.name, Badge); Vue.component(Badge.name, Badge)
Vue.component(BaseAlert.name, BaseAlert); Vue.component(BaseAlert.name, BaseAlert)
Vue.component(BaseButton.name, BaseButton); Vue.component(BaseButton.name, BaseButton)
Vue.component(BaseCheckbox.name, BaseCheckbox); Vue.component(BaseCheckbox.name, BaseCheckbox)
Vue.component(BaseHeader.name, BaseHeader); Vue.component(BaseHeader.name, BaseHeader)
Vue.component(BaseInput.name, BaseInput); Vue.component(BaseInput.name, BaseInput)
Vue.component(BaseDropdown.name, BaseDropdown); Vue.component(BaseDropdown.name, BaseDropdown)
Vue.component(BaseNav.name, BaseNav); Vue.component(BaseNav.name, BaseNav)
Vue.component(BasePagination.name, BasePagination); Vue.component(BasePagination.name, BasePagination)
Vue.component(BaseProgress.name, BaseProgress); Vue.component(BaseProgress.name, BaseProgress)
Vue.component(BaseRadio.name, BaseRadio); Vue.component(BaseRadio.name, BaseRadio)
Vue.component(Card.name, Card); Vue.component(Card.name, Card)
Vue.component(Modal.name, Modal); Vue.component(Modal.name, Modal)
Vue.component(StatsCard.name, StatsCard); Vue.component(StatsCard.name, StatsCard)
Vue.component(Input.name, Input); Vue.component(Input.name, Input)
Vue.component('validation-provider', ValidationProvider) Vue.component('validation-provider', ValidationProvider)
Vue.component('validation-observer', ValidationObserver) Vue.component('validation-observer', ValidationObserver)
Vue.use(Tooltip); Vue.use(Tooltip)
Vue.use(Popover); Vue.use(Popover)
} },
}; }
export default GlobalComponents; export default GlobalComponents

View File

@ -1,4 +1,4 @@
import clickOutside from '@/directives/click-ouside.js'; import clickOutside from '@/directives/click-ouside.js'
/** /**
* You can register global directives here and use them as a plugin in your main Vue instance * You can register global directives here and use them as a plugin in your main Vue instance
@ -6,8 +6,8 @@ import clickOutside from '@/directives/click-ouside.js';
const GlobalDirectives = { const GlobalDirectives = {
install(Vue) { install(Vue) {
Vue.directive('click-outside', clickOutside); Vue.directive('click-outside', clickOutside)
} },
}; }
export default GlobalDirectives; export default GlobalDirectives

View File

@ -8,19 +8,18 @@ Vue.use(VueRouter)
const router = new VueRouter({ const router = new VueRouter({
routes, // short for routes: routes routes, // short for routes: routes
linkActiveClass: 'active', linkActiveClass: 'active',
scrollBehavior: (to, from ,savedPosition) => { scrollBehavior: (to, from, savedPosition) => {
if (savedPosition) { if (savedPosition) {
return savedPosition; return savedPosition
} }
if (to.hash) { if (to.hash) {
return { selector: to.hash } return { selector: to.hash }
} }
return { x: 0, y: 0 } return { x: 0, y: 0 }
} },
}); })
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
let language = to.params.lang let language = to.params.lang
if (!language) { if (!language) {
language = 'de' language = 'de'

View File

@ -2,8 +2,7 @@ import DashboardLayout from '@/views/Layout/DashboardLayout.vue'
import AuthLayoutGDD from '@/views/Layout/AuthLayout_gdd.vue' import AuthLayoutGDD from '@/views/Layout/AuthLayout_gdd.vue'
import AuthLayout from '@/views/Layout/AuthLayout.vue' import AuthLayout from '@/views/Layout/AuthLayout.vue'
import NotFound from '@/views/NotFoundPage.vue' // import NotFound from '@/views/NotFoundPage.vue'
const routes = [ const routes = [
{ {
@ -13,47 +12,56 @@ const routes = [
children: [ children: [
{ {
path: '/login', path: '/login',
component: () => import('../views/Pages/Login.vue') component: () => import('../views/Pages/Login.vue'),
}, },
{ {
path: '/thx', path: '/thx',
component: () => import('../views/Pages/thx.vue') component: () => import('../views/Pages/thx.vue'),
}, },
{ {
path: '/register', path: '/register',
component: () => import('../views/Pages/Register.vue') component: () => import('../views/Pages/Register.vue'),
}, },
{ {
path: '/password', path: '/password',
component: () => import('../views/Pages/Password.vue') component: () => import('../views/Pages/Password.vue'),
} },
] {
path: '/explorer',
name: 'Explorer',
component: () => import('../views/Pages/Explorer.vue'),
},
],
}, },
{ {
path: '/', path: '/',
redirect: 'KontoOverview', redirect: 'overview',
component: DashboardLayout, component: DashboardLayout,
children: [ children: [
{ {
path: '/KontoOverview', path: '/overview',
component: () => import('../views/KontoOverview.vue'), component: () => import('../views/KontoOverview.vue'),
meta: { meta: {
requiresAuth: true requiresAuth: true,
} },
}, },
{ {
path: '/profile', path: '/profile',
component: () => import('../views/Pages/UserProfileCard.vue') component: () => import('../views/Pages/UserProfileCard.vue'),
}, },
{ {
path: '/profileedit', path: '/profileedit',
component: () => import('../views/Pages/UserProfileEdit.vue') component: () => import('../views/Pages/UserProfileEdit.vue'),
}, },
{ {
path: '/activity', path: '/activity',
component: () => import('../views/Pages/UserProfileActivity.vue') component: () => import('../views/Pages/UserProfileActivity.vue'),
} },
] {
path: '/transactions',
component: () => import('../views/Pages/UserProfileTransactionList.vue'),
},
],
}, },
, ,
{ {
@ -66,20 +74,11 @@ const routes = [
name: 'Adminübersicht', name: 'Adminübersicht',
component: () => import('../views/AdminOverview.vue'), component: () => import('../views/AdminOverview.vue'),
meta: { meta: {
requiresAuth: true requiresAuth: true,
}
}
]
}, },
{ },
path: '/', ],
redirect: 'login', },
component: AuthLayout, ]
children: [
{ path: '*', component: NotFound } export default routes
]
}
];
export default routes;

View File

@ -1,9 +1,9 @@
import Vue from 'vue'; import Vue from 'vue'
import Router from 'vue-router'; import Router from 'vue-router'
import DashboardLayout from '../views/Starter/SampleLayout.vue'; import DashboardLayout from '../views/Starter/SampleLayout.vue'
import Starter from '../views/Starter/SamplePage.vue'; import Starter from '../views/Starter/SamplePage.vue'
Vue.use(Router); Vue.use(Router)
export default new Router({ export default new Router({
routes: [ routes: [
@ -16,18 +16,18 @@ export default new Router({
{ {
path: 'dashboard', path: 'dashboard',
name: 'dashboard', name: 'dashboard',
components: { default: Starter } components: { default: Starter },
} },
]
}
], ],
scrollBehavior: (to, from ,savedPosition) => { },
],
scrollBehavior: (to, from, savedPosition) => {
if (savedPosition) { if (savedPosition) {
return savedPosition; return savedPosition
} }
if (to.hash) { if (to.hash) {
return { selector: to.hash }; return { selector: to.hash }
} }
return { x: 0, y: 0 }; return { x: 0, y: 0 }
} },
}); })

View File

@ -4,30 +4,38 @@ Vue.use(Vuex)
import router from '../routes/router.js' import router from '../routes/router.js'
import loginAPI from '../apis/loginAPI' import loginAPI from '../apis/loginAPI'
import communityAPI from '../apis/communityAPI' import communityAPI from '../apis/communityAPI'
import axios from 'axios'
export const store = new Vuex.Store({ export const store = new Vuex.Store({
state: { state: {
session_id: null, session_id: null,
email: null, email: null,
user : { language: 'en',
name:"", sizeDE: 'normal',
sizeGB: 'big',
loginfail: false,
user: {
name: '',
balance: 0, balance: 0,
balance_gdt: 0 balance_gdt: 0,
}, },
ajaxCreateData: { ajaxCreateData: {
session_id : '', session_id: '',
email: "", email: '',
amount: 0, amount: 0,
target_date:"2021-02-19T13:25:36+00:00", target_date: '2021-02-19T13:25:36+00:00',
memo:"", memo: '',
auto_sign: true auto_sign: true,
}, },
transactions: [], transactions: [],
modals: false modals: false,
optionAxios: {
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'Access-Control-Allow-Origin': '*',
'Access-Control-Allow-Credentials': 'true',
},
},
}, },
// Retrieve a state variable
getters: { getters: {
//isLoggedIn: (state /*, getters */) => { //isLoggedIn: (state /*, getters */) => {
// return state.session_id !== null; // return state.session_id !== null;
@ -35,107 +43,128 @@ export const store = new Vuex.Store({
}, },
// Syncronous mutation of the state // Syncronous mutation of the state
mutations: { mutations: {
language: (state, language) => {
//console.log('mutation: language', language)
state.language = language
$cookies.set('gdd_lang', language)
if (state.language == 'de') {
state.sizeDE = 'big'
state.sizeGB = 'normal'
} else {
state.sizeDE = 'normal'
state.sizeGB = 'big'
}
},
loginfail: (state, loginfail) => {
//console.log('mutation: email')
state.loginfail = loginfail
},
email: (state, email) => { email: (state, email) => {
//console.log('mutation: email') //console.log('mutation: email')
state.email = email state.email = email
}, },
session_id: (state,session_id) => { session_id: (state, session_id) => {
//console.log('mutation: session_id') //console.log('mutation: session_id')
state.session_id = session_id state.session_id = session_id
}, },
user_balance: (state,balance) => { user_balance: (state, balance) => {
//console.log('mutation: user_balance') //console.log('mutation: user_balance')
state.user.balance = (balance)/10000 state.user.balance = balance / 10000
}, },
user_balance_gdt: (state,balance) => { user_balance_gdt: (state, balance) => {
//console.log('mutation: user_balance_gdt') //console.log('mutation: user_balance_gdt')
state.user.balance_gdt = (balance)/10000 state.user.balance_gdt = balance / 10000
}, },
transactions: (state,transactions) => { transactions: (state, transactions) => {
//console.log('mutation: transactions') //console.log('mutation: transactions')
state.transactions = transactions state.transactions = transactions
} },
}, },
// Asyncronous actions - used for api calls // Asyncronous actions - used for api calls
actions: { actions: {
login: async ({ dispatch, commit }, data) => { login: async ({ dispatch, commit }, data) => {
console.log('action: login') const result = await loginAPI.login(data.email, data.password)
const result = await loginAPI.login(data.email,data.password) if (result.success) {
console.log('result',result)
console.log('result.success',result.success)
if( result.success ){
commit('session_id', result.result.data.session_id) commit('session_id', result.result.data.session_id)
commit('email', data.email) commit('email', data.email)
$cookies.set('gdd_session_id', result.result.data.session_id); $cookies.set('gdd_session_id', result.result.data.session_id)
$cookies.set('gdd_u', data.email); $cookies.set('gdd_u', data.email)
router.push('/KontoOverview') router.push('/overview')
} else { } else {
// Register failed, we perform a logout // Register failed, we perform a logout
dispatch('logout') //alert('>>>>> FAIl LOGIN')
commit('loginfail', true)
//dispatch('logout')
} }
}, },
passwordReset: async (data) => { passwordReset: async (data) => {
console.log("<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>", data.email) //console.log('<<<<<<<<<<< PASSWORT RESET TODO >>>>>>>>>>>', data.email)
}, },
schoepfen: async (data) => { schoepfen: async (data) => {
// http://localhost/transaction-creations/ajaxCreate // http://localhost/transaction-creations/ajaxCreate
}, },
createUser: async ({ commit, dispatch }, data) => { createUser: async ({ commit, dispatch }, data) => {
console.log('action: createUser') // console.log('action: createUser')
const result = await loginAPI.create(data.email,data.first_name,data.last_name,data.password) const result = await loginAPI.create(
if( result.success ){ data.email,
data.first_name,
data.last_name,
data.password,
)
if (result.success) {
commit('session_id', result.result.data.session_id) commit('session_id', result.result.data.session_id)
commit('email', data.email) commit('email', data.email)
$cookies.set('gdd_session_id', result.result.data.session_id); $cookies.set('gdd_session_id', result.result.data.session_id)
$cookies.set('gdd_u', data.email); $cookies.set('gdd_u', data.email)
router.push('/KontoOverview') router.push('/overview')
} else { } else {
// Register failed, we perform a logout // Register failed, we perform a logout
// console.log('action createUser to logout start')
dispatch('logout') dispatch('logout')
} }
}, },
logout: async ({ commit , state }) => { logout: async ({ commit, state }) => {
console.log('action: logout') //console.log('action: logout')
// Are we actually logged in? // Are we actually logged in?
if(state.session_id){ if (state.session_id) {
const result = await loginAPI.logout(state.session_id) const result = await loginAPI.logout(state.session_id)
// The result can be error, but thats ok with us // The result can be error, but thats ok with us
} }
commit('session_id', null) commit('session_id', null)
commit('email', null) commit('email', null)
$cookies.remove('gdd_session_id'); $cookies.remove('gdd_session_id')
$cookies.remove('gdd_u'); $cookies.remove('gdd_u')
$cookies.remove('gdd_lang')
router.push('/Login') router.push('/Login')
}, },
ajaxCreate: async ({ dispatch, state }) => { ajaxCreate: async ({ dispatch, state }) => {
//console.log('action: ajaxCreate') //console.log('action: ajaxCreate')
state.ajaxCreateData.amount = (state.ajaxCreateData.amount)*10000 state.ajaxCreateData.amount = state.ajaxCreateData.amount * 10000
axios.post("http://localhost/transaction-send-coins/ajaxCreate", state.ajaxCreateData).then((result) => { const result = await communityAPI.create($cookies.get('gdd_session_id', email, amount, memo))
console.log("store ajaxCreate result", result) //console.log(result)
if( result.success ){
// TODO
} else {
//dispatch('logout')
}
}, (error) => {
console.log(error);
});
}, },
ajaxListTransactions: async ({commit, dispatch, state}) => { ajaxListTransactions: async ({ commit, dispatch, state }) => {
// console.log('action: ajaxListTransactions', state.session_id) // console.log('action: ajaxListTransactions', state.session_id)
// const result = await communityAPI.transactions(state.session_id) // const result = await communityAPI.transactions(state.session_id)
}, },
accountBalance: async ({ commit, dispatch, state }) => { accountBalance: async ({ commit, dispatch, state }) => {
//console.log('action: accountBalance') //console.log('action: accountBalance')
const result = await communityAPI.balance(state.session_id) // console.log('action: dispatch', dispatch)
//console.log(result) // console.log('action: state.session_id', state.session_id)
if(result.success) { // 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)
if (result.success) {
commit('user_balance', result.result.data.balance) commit('user_balance', result.result.data.balance)
} else { } else {
//console.log('action accountBalance to logout start')
dispatch('logout') dispatch('logout')
} }
} },
} },
}) })

View File

@ -4,12 +4,12 @@
* @param [timeout] the throttle interval * @param [timeout] the throttle interval
*/ */
export function throttle(handlerFunc, timeout = 66) { export function throttle(handlerFunc, timeout = 66) {
let resizeTimeout; let resizeTimeout
if (!resizeTimeout) { if (!resizeTimeout) {
resizeTimeout = setTimeout(() => { resizeTimeout = setTimeout(() => {
resizeTimeout = null; resizeTimeout = null
handlerFunc(); handlerFunc()
// The actualResizeHandler will execute at a rate of 15fps // The actualResizeHandler will execute at a rate of 15fps
}, timeout); }, timeout)
} }
} }

View File

@ -0,0 +1,25 @@
import { configure, extend } from 'vee-validate'
import { required, email, min } from 'vee-validate/dist/rules'
import i18n from './i18n'
configure({
defaultMessage: (field, values) => {
values._field_ = i18n.t(`fields.${field}`)
return i18n.t(`validations.messages.${values._rule_}`, values)
},
})
extend('email', {
...email,
message: (_, values) => i18n.t('validations.messages.email', values),
})
extend('required', {
...required,
message: (_, values) => i18n.t('validations.messages.required', values),
})
extend('min', {
...min,
message: (_, values) => i18n.t('validations.messages.min', values),
})

View File

@ -3,54 +3,66 @@
<base-header class="pb-6 pb-8 pt-5 pt-md-8"> <base-header class="pb-6 pb-8 pt-5 pt-md-8">
<b-row> <b-row>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card :title="$t('admin.site.overview.creation')" <stats-card
:title="$t('admin.site.overview.creation')"
type="gradient-red" type="gradient-red"
sub-title="350,897" sub-title="350,897"
icon="ni ni-active-40" icon="ni ni-active-40"
class="mb-4"> class="mb-4"
>
<template slot="footer" > <template slot="footer">
<span class="text-success mr-2">3.48%</span> <span class="text-success mr-2">3.48%</span>
<span class="text-nowrap">{{ $t('site.overview.since_last_month') }}</span> <span class="text-nowrap">
{{ $t('site.overview.since_last_month') }}
</span>
</template> </template>
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card :title="$t('admin.site.overview.transience')" <stats-card
:title="$t('admin.site.overview.transience')"
type="gradient-orange" type="gradient-orange"
sub-title="2,356" sub-title="2,356"
icon="ni ni-chart-pie-35" icon="ni ni-chart-pie-35"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-success mr-2">12.18%</span> <span class="text-success mr-2">12.18%</span>
<span class="text-nowrap">{{ $t('site.overview.since_last_month') }}</span> <span class="text-nowrap">
{{ $t('site.overview.since_last_month') }}
</span>
</template> </template>
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card :title="$t('admin.site.overview.exchanged')" <stats-card
:title="$t('admin.site.overview.exchanged')"
type="gradient-green" type="gradient-green"
sub-title="924" sub-title="924"
icon="ni ni-money-coins" icon="ni ni-money-coins"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-danger mr-2">5.72%</span> <span class="text-danger mr-2">5.72%</span>
<span class="text-nowrap">{{ $t('site.overview.since_last_month') }}</span> <span class="text-nowrap">
{{ $t('site.overview.since_last_month') }}
</span>
</template> </template>
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card :title="$t('admin.site.overview.members')" <stats-card
:title="$t('admin.site.overview.members')"
type="gradient-info" type="gradient-info"
sub-title="49,65%" sub-title="49,65%"
icon="ni ni-chart-bar-32" icon="ni ni-chart-bar-32"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-success mr-2">54.8%</span> <span class="text-success mr-2">54.8%</span>
<span class="text-nowrap">{{ $t('site.overview.since_last_month') }}</span> <span class="text-nowrap">
{{ $t('site.overview.since_last_month') }}
</span>
</template> </template>
</stats-card> </stats-card>
</b-col> </b-col>
@ -65,7 +77,7 @@
<b-row align-v="center" slot="header"> <b-row align-v="center" slot="header">
<b-col> <b-col>
<h6 class="text-light text-uppercase ls-1 mb-1">Charts</h6> <h6 class="text-light text-uppercase ls-1 mb-1">Charts</h6>
<h5 class="h3 text-white mb-0">Geschöpft</h5> <h5 class="h3 mb-0">Geschöpft</h5>
</b-col> </b-col>
<b-col> <b-col>
<b-nav class="nav-pills justify-content-end"> <b-nav class="nav-pills justify-content-end">
@ -73,7 +85,8 @@
class="mr-2 mr-md-0" class="mr-2 mr-md-0"
:active="bigLineChart.activeIndex === 0" :active="bigLineChart.activeIndex === 0"
link-classes="py-2 px-1" link-classes="py-2 px-1"
@click.prevent="initBigChart(0)"> @click.prevent="initBigChart(0)"
>
<span class="d-none d-md-block">geschöpft</span> <span class="d-none d-md-block">geschöpft</span>
<span class="d-md-none">M</span> <span class="d-md-none">M</span>
</b-nav-item> </b-nav-item>
@ -109,8 +122,7 @@
ref="bigChart" ref="bigChart"
:chart-data="bigLineChart.chartData" :chart-data="bigLineChart.chartData"
:extra-options="bigLineChart.extraOptions" :extra-options="bigLineChart.extraOptions"
> ></line-chart>
</line-chart>
</card> </card>
</b-col> </b-col>
@ -123,111 +135,99 @@
</b-col> </b-col>
</b-row> </b-row>
<bar-chart <bar-chart :height="350" ref="barChart" :chart-data="redBarChart.chartData"></bar-chart>
:height="350"
ref="barChart"
:chart-data="redBarChart.chartData"
>
</bar-chart>
</card> </card>
</b-col> </b-col>
</b-row> </b-row>
<!-- End charts--> <!-- End charts-->
<br />
<br />
<br> <br />
<br>
<br>
<!--Tables User Search && New User--> <!--Tables User Search && New User-->
<admin-user-search /> <admin-user-search />
<br> <br />
<br> <br />
<br> <br />
<admin-user-creation/> <admin-user-creation />
<br />
<br>
<b-card-header> <b-card-header>
<hr> <hr />
<h3>Admin Participation List</h3> <h3>Admin Participation List</h3>
<small>/public/json-example/admin_card_statistic.json</small> <small>/public/json-example/admin_card_statistic.json</small>
<p> <p>
{{cardstatistic}} {{ cardstatistic }}
</p> </p>
</b-card-header> </b-card-header>
<b-card-header> <b-card-header>
<hr> <hr />
<h3>Admin Charts Statistic</h3> <h3>Admin Charts Statistic</h3>
<small>/public/json-example/admin_charts_statistic.json</small> <small>/public/json-example/admin_charts_statistic.json</small>
<p> <p>
{{chartsstatistic}} {{ chartsstatistic }}
</p> </p>
</b-card-header> </b-card-header>
<b-card-header> <b-card-header>
<hr> <hr />
<h3>Admin Community Statistic</h3> <h3>Admin Community Statistic</h3>
<small>/public/json-example/admin_community_statistic.json</small> <small>/public/json-example/admin_community_statistic.json</small>
<p> <p>
{{communitystatistic}} {{ communitystatistic }}
</p> </p>
</b-card-header> </b-card-header>
<b-card-header> <b-card-header>
<hr> <hr />
<h3>Admin User List</h3> <h3>Admin User List</h3>
<small>/public/json-example/admin_userlist.json</small> <small>/public/json-example/admin_userlist.json</small>
<p> <p>
{{userlist}} {{ userlist }}
</p> </p>
</b-card-header> </b-card-header>
<b-card-header> <b-card-header>
<hr> <hr />
<h3>Admin Transaction List</h3> <h3>Admin Transaction List</h3>
<small>/public/json-example/admin_transaction_list.json</small> <small>/public/json-example/admin_transaction_list.json</small>
<p> <p>
{{transactionlist}} {{ transactionlist }}
</p> </p>
<hr> <hr />
</b-card-header> </b-card-header>
<b-card-header> <b-card-header>
<h3>Admin Transience List</h3> <h3>Admin Transience List</h3>
<small>/public/json-example/admin_transience_list.json</small> <small>/public/json-example/admin_transience_list.json</small>
<p> <p>
{{transiencelist}} {{ transiencelist }}
</p> </p>
</b-card-header> </b-card-header>
<!--End tables--> <!--End tables-->
</b-container> </b-container>
</div> </div>
</template> </template>
<script> <script>
// Charts // Charts
import * as chartConfigs from '@/components/Charts/config'; import * as chartConfigs from '@/components/Charts/config'
import LineChart from '@/components/Charts/LineChart'; import LineChart from '@/components/Charts/LineChart'
import BarChart from '@/components/Charts/BarChart'; import BarChart from '@/components/Charts/BarChart'
// Components // Components
import BaseProgress from '@/components/BaseProgress'; import BaseProgress from '@/components/BaseProgress'
import StatsCard from '@/components/Cards/StatsCard'; import StatsCard from '@/components/Cards/StatsCard'
import SearchUser from '@/components/SearchUser'; import SearchUser from '@/components/SearchUser'
// Tables // Tables
import PageVisitsTable from './Dashboard/PageVisitsTable'; import PageVisitsTable from './Dashboard/PageVisitsTable'
import AdminUserSearch from './AdminOverview/AdminUserSearch'; import AdminUserSearch from './AdminOverview/AdminUserSearch'
import AdminUserCreation from './AdminOverview/AdminUserCreation'; import AdminUserCreation from './AdminOverview/AdminUserCreation'
import axios from 'axios'; import axios from 'axios'
export default {
export default {
components: { components: {
LineChart, LineChart,
BarChart, BarChart,
@ -241,7 +241,7 @@
data() { data() {
return { return {
statisticdata: [], statisticdata: [],
cardstatistic:[], cardstatistic: [],
chartsstatistic: [], chartsstatistic: [],
communitystatistic: [], communitystatistic: [],
userlist: [], userlist: [],
@ -249,18 +249,18 @@
transiencelist: [], transiencelist: [],
filter: '', filter: '',
items: [ items: [
{ id: 1, first_name: "Mikkel", last_name: "Hansen", age: 54 }, { id: 1, first_name: 'Mikkel', last_name: 'Hansen', age: 54 },
{ id: 2, first_name: "Kasper", last_name: "Hvidt", age: 42 }, { id: 2, first_name: 'Kasper', last_name: 'Hvidt', age: 42 },
{ id: 3, first_name: "Lasse", last_name: "Boesen", age: 39 }, { id: 3, first_name: 'Lasse', last_name: 'Boesen', age: 39 },
{ id: 4, first_name: "Kasper", last_name: "Hansen", age: 62 }, { id: 4, first_name: 'Kasper', last_name: 'Hansen', age: 62 },
{ id: 5, first_name: "Mads", last_name: "Mikkelsen", age: 31 }, { id: 5, first_name: 'Mads', last_name: 'Mikkelsen', age: 31 },
], ],
bigLineChart: { bigLineChart: {
allData: [ allData: [
[0, 20, 10, 30, 15, 40, 20, 60, 60], [0, 20, 10, 30, 15, 40, 20, 60, 60],
[0, 20, 5, 25, 10, 30, 35, 60, 40], [0, 20, 5, 25, 10, 30, 35, 60, 40],
[0, 2, 5, 7, 10, 30, 15, 9, 10], [0, 2, 5, 7, 10, 30, 15, 9, 10],
[0, 2, 5, 7, 10, 14, 29, 78, 120] [0, 2, 5, 7, 10, 14, 29, 78, 120],
], ],
activeIndex: 0, activeIndex: 0,
chartData: { chartData: {
@ -268,7 +268,7 @@
{ {
label: 'Performance', label: 'Performance',
data: [0, 20, 10, 30, 15, 40, 20, 60, 60], data: [0, 20, 10, 30, 15, 40, 20, 60, 60],
} },
], ],
labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
}, },
@ -277,107 +277,122 @@
redBarChart: { redBarChart: {
chartData: { chartData: {
labels: ['Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], labels: ['Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
datasets: [{ datasets: [
{
label: 'Sales', label: 'Sales',
data: [25, 20, 30, 22, 17, 29] data: [25, 20, 30, 22, 17, 29],
}] },
],
},
extraOptions: chartConfigs.blueChartOptions,
}, },
extraOptions: chartConfigs.blueChartOptions
} }
};
}, },
methods: { methods: {
TransienceList() { TransienceList() {
axios.get("/json-example/admin_transience_list.json").then((d) => { axios.get('/json-example/admin_transience_list.json').then(
(d) => {
//console.log(d); //console.log(d);
this.transiencelist = d.data; this.transiencelist = d.data
},
}, (error) => { (error) => {
console.log(error); //console.log(error)
}); },
)
}, },
TransactionList() { TransactionList() {
axios.get("/json-example/admin_transaction_list.json").then((d) => { axios.get('/json-example/admin_transaction_list.json').then(
(d) => {
//console.log(d); //console.log(d);
this.transactionlist = d.data; this.transactionlist = d.data
},
}, (error) => { (error) => {
console.log(error); //console.log(error)
}); },
)
}, },
UserList() { UserList() {
axios.get("/json-example/admin_userlist.json").then((d) => { axios.get('/json-example/admin_userlist.json').then(
(d) => {
//console.log(d); //console.log(d);
this.userlist = d.data; this.userlist = d.data
},
}, (error) => { (error) => {
console.log(error); //console.log(error)
}); },
)
}, },
CommunityStatistic() { CommunityStatistic() {
axios.get("/json-example/admin_community_statistic.json").then((d) => { axios.get('/json-example/admin_community_statistic.json').then(
(d) => {
//console.log(d); //console.log(d);
this.communitystatistic = d.data; this.communitystatistic = d.data
},
}, (error) => { (error) => {
console.log(error); //console.log(error)
}); },
)
}, },
ChartsStatistic() { ChartsStatistic() {
axios.get("/json-example/admin_charts_statistic.json").then((d) => { axios.get('/json-example/admin_charts_statistic.json').then(
(d) => {
//console.log(d); //console.log(d);
this.chartsstatistic = d.data; this.chartsstatistic = d.data
},
}, (error) => { (error) => {
console.log(error); //console.log(error)
}); },
)
}, },
CardStatistic() { CardStatistic() {
axios.get("/json-example/admin_card_statistic.json").then((d) => { axios.get('/json-example/admin_card_statistic.json').then(
(d) => {
//console.log(d); //console.log(d);
this.cardstatistic = d.data; this.cardstatistic = d.data
},
}, (error) => { (error) => {
console.log(error); //console.log(error)
}); },
)
}, },
StatisticDatas() { StatisticDatas() {
axios.get("/json-example/admin_statisticdatas.json").then((d) => { axios.get('/json-example/admin_statisticdatas.json').then(
(d) => {
//console.log(d); //console.log(d);
this.userdata = d.data; this.userdata = d.data
},
}, (error) => { (error) => {
console.log(error); //console.log(error)
}); },
)
}, },
initBigChart(index) { initBigChart(index) {
let chartData = { let chartData = {
datasets: [ datasets: [
{ {
label: 'Performance', label: 'Performance',
data: this.bigLineChart.allData[index] data: this.bigLineChart.allData[index],
} },
], ],
labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
};
this.bigLineChart.chartData = chartData;
this.bigLineChart.activeIndex = index;
} }
this.bigLineChart.chartData = chartData
this.bigLineChart.activeIndex = index
},
}, },
mounted() { mounted() {
this.initBigChart(0); this.initBigChart(0)
this.TransienceList(); this.TransienceList()
this.TransactionList(); this.TransactionList()
this.UserList(); this.UserList()
this.CommunityStatistic(); this.CommunityStatistic()
this.ChartsStatistic(); this.ChartsStatistic()
this.CardStatistic(); this.CardStatistic()
} },
}
}
</script> </script>
<style> <style>
.el-table .cell{ .el-table .cell {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
} }

View File

@ -1,10 +1,8 @@
<template> <template>
<div> <div>
<b-card-header>Gradido Schüpfung</b-card-header> <b-card-header>Gradido Schüpfung</b-card-header>
<!--Tables--> <!--Tables-->
<b-row class="mt-5"> <b-row class="mt-5">
<b-col xl="8" class="mb-5 mb-xl-0"> <b-col xl="8" class="mb-5 mb-xl-0">
<vue-good-table <vue-good-table
:columns="columns" :columns="columns"
@ -21,22 +19,17 @@
skipDiacritics: true, skipDiacritics: true,
searchFn: mySearchFn, searchFn: mySearchFn,
placeholder: 'durchsuche die tabelle' placeholder: 'durchsuche die tabelle',
}" }"
:pagination-options="{ :pagination-options="{
enabled: true, enabled: true,
mode: 'pages' mode: 'pages',
}" }"
> >
<div slot="table-actions"> <div slot="table-actions">Einträge suchen .</div>
Einträge suchen .
</div>
</vue-good-table> </vue-good-table>
</b-col> </b-col>
<b-col xl="4" class="mb-5 mb-xl-0"> <b-col xl="4" class="mb-5 mb-xl-0">
<b-card body-class="p-0" header-class="border-0"> <b-card body-class="p-0" header-class="border-0">
<template v-slot:header> <template v-slot:header>
<b-row align-v="center"> <b-row align-v="center">
@ -49,39 +42,34 @@
</b-row> </b-row>
</template> </template>
<b-card-body> <b-card-body>
<p>{{ creation.createdAt }} </p> <p>{{ creation.createdAt }}</p>
<p>{{ creation.group }} </p> <p>{{ creation.group }}</p>
<p>{{ creation.id }} </p> <p>{{ creation.id }}</p>
<p>{{ creation.name }} </p> <p>{{ creation.name }}</p>
<p>{{ creation.originalIndex }} </p> <p>{{ creation.originalIndex }}</p>
<p>{{ creation.text }} </p> <p>{{ creation.text }}</p>
<p>{{ creation.vgt_id }} </p> <p>{{ creation.vgt_id }}</p>
</b-card-body> </b-card-body>
</b-card> </b-card>
</b-col> </b-col>
</b-row> </b-row>
<!--End tables--> <!--End tables-->
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'admin-user-creation', name: 'admin-user-creation',
data(){ data() {
return { return {
creation:{ creation: {
createdAt:"", createdAt: '',
group:"", group: '',
id:"", id: '',
name:"", name: '',
originalIndex:"", originalIndex: '',
text:"", text: '',
vgt_id:"", vgt_id: '',
}, },
columns: [ columns: [
{ {
@ -107,51 +95,230 @@ export default {
}, },
], ],
rows: [ rows: [
{ id:1, createdAt: '2021-01-25', name:"Sellora", group: "gruppe1", text: "aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, {
{ id:2, createdAt: '2021-01-31', name:"Jane", group: "gruppe14", text: "WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, id: 1,
{ id:3, createdAt: '2021-01-30', name:"Susan", group: "gruppe31", text: "IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, createdAt: '2021-01-25',
{ id:4, createdAt: '2020-01-11', name:"Chris", group: "gruppe12", text: "TZadhhCYXCda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, name: 'Sellora',
{ id:5, createdAt: '2020-12-21', name:"Dan", group: "gruppe11", text: "Wad3323hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, group: 'gruppe1',
{ id:6, createdAt: '2020-12-31', name:"zBohn", group: "gruppe71", text: "Tadh hD da hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, text: 'aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
{ id:7, createdAt: '2020-12-31', name:"xyTellohn", group: "gruppe31", text: "Fad AD31 hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, },
{ id:8, createdAt: '2021-01-25', name:"uSellora", group: "gruppe1", text: "aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, {
{ id:9, createdAt: '2021-01-31', name:"yJane", group: "gruppe14", text: "55 55 55 WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, id: 2,
{ id:10, createdAt: '2021-01-20', name:"kSusan", group: "gruppe31", text: "IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, createdAt: '2021-01-31',
{ id:11, createdAt: '2021-01-25', name:"qSellora", group: "gruppe12", text: "aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, name: 'Jane',
{ id:12, createdAt: '2021-01-31', name:"fJane", group: "gruppe15", text: "WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, group: 'gruppe14',
{ id:13, createdAt: '2021-01-38', name:"aSusan", group: "gruppe1", text: "asssss IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, text: 'WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
{ id:14, createdAt: '2020-01-11', name:"uChris", group: "gruppe12", text: "TZadhhCYXCda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, },
{ id:15, createdAt: '2020-12-21', name:"tzDan", group: "gruppe11", text: "Wad33 23hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, {
{ id:16, createdAt: '2020-12-31', name:"fBohn", group: "gruppe71", text: "3f Tadh hD da hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, id: 3,
{ id:17, createdAt: '2020-12-31', name:"aEsau", group: "gruppe15", text: "2324 adhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, createdAt: '2021-01-30',
{ id:18, createdAt: '2021-01-25', name:"gSellora", group: "gruppe1", text: "5h aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, name: 'Susan',
{ id:19, createdAt: '2021-01-31', name:"sJane", group: "gruppe14", text: "as sdsd WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, group: 'gruppe31',
{ id:20, createdAt: '2021-01-30', name:"oSusan", group: "gruppe31", text: "sd IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, text: 'IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
{ id:21, createdAt: '2021-01-25', name:"Sellora", group: "gruppe1", text: "3 aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, },
{ id:22, createdAt: '2021-01-13', name:"rtJane", group: "gruppe14", text: "q WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, {
{ id:23, createdAt: '2021-01-16', name:"rSusan", group: "gruppe31", text: "Iare YXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, id: 4,
{ id:24, createdAt: '2020-01-15', name:"sChris", group: "gruppe12", text: "43 TZad hhCYXCda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, createdAt: '2020-01-11',
{ id:25, createdAt: '2020-12-14', name:"dDan", group: "gruppe11", text: "aas aWad3323hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, name: 'Chris',
{ id:26, createdAt: '2020-12-13', name:"fBohn", group: "gruppe71", text: "Ta adh hD da hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, group: 'gruppe12',
{ id:27, createdAt: '2020-12-12', name:"gTellohn", group: "gruppe31", text: "55 Fad AD31 hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, text: 'TZadhhCYXCda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
{ id:28, createdAt: '2021-01-12', name:"zSellora", group: "gruppe1", text: "e q raASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, },
{ id:29, createdAt: '2021-01-12', name:"uJane", group: "gruppe14", text: "erW QadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, {
{ id:30, createdAt: '2021-01-11', name:"iSusan", group: "gruppe31", text: "3IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk" }, id: 5,
createdAt: '2020-12-21',
name: 'Dan',
group: 'gruppe11',
text: 'Wad3323hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 6,
createdAt: '2020-12-31',
name: 'zBohn',
group: 'gruppe71',
text: 'Tadh hD da hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 7,
createdAt: '2020-12-31',
name: 'xyTellohn',
group: 'gruppe31',
text: 'Fad AD31 hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 8,
createdAt: '2021-01-25',
name: 'uSellora',
group: 'gruppe1',
text: 'aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 9,
createdAt: '2021-01-31',
name: 'yJane',
group: 'gruppe14',
text: '55 55 55 WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 10,
createdAt: '2021-01-20',
name: 'kSusan',
group: 'gruppe31',
text: 'IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 11,
createdAt: '2021-01-25',
name: 'qSellora',
group: 'gruppe12',
text: 'aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 12,
createdAt: '2021-01-31',
name: 'fJane',
group: 'gruppe15',
text: 'WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 13,
createdAt: '2021-01-38',
name: 'aSusan',
group: 'gruppe1',
text: 'asssss IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 14,
createdAt: '2020-01-11',
name: 'uChris',
group: 'gruppe12',
text: 'TZadhhCYXCda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 15,
createdAt: '2020-12-21',
name: 'tzDan',
group: 'gruppe11',
text: 'Wad33 23hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 16,
createdAt: '2020-12-31',
name: 'fBohn',
group: 'gruppe71',
text: '3f Tadh hD da hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 17,
createdAt: '2020-12-31',
name: 'aEsau',
group: 'gruppe15',
text: '2324 adhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 18,
createdAt: '2021-01-25',
name: 'gSellora',
group: 'gruppe1',
text: '5h aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 19,
createdAt: '2021-01-31',
name: 'sJane',
group: 'gruppe14',
text: 'as sdsd WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 20,
createdAt: '2021-01-30',
name: 'oSusan',
group: 'gruppe31',
text: 'sd IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 21,
createdAt: '2021-01-25',
name: 'Sellora',
group: 'gruppe1',
text: '3 aASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 22,
createdAt: '2021-01-13',
name: 'rtJane',
group: 'gruppe14',
text: 'q WQadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 23,
createdAt: '2021-01-16',
name: 'rSusan',
group: 'gruppe31',
text: 'Iare YXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 24,
createdAt: '2020-01-15',
name: 'sChris',
group: 'gruppe12',
text: '43 TZad hhCYXCda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 25,
createdAt: '2020-12-14',
name: 'dDan',
group: 'gruppe11',
text: 'aas aWad3323hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 26,
createdAt: '2020-12-13',
name: 'fBohn',
group: 'gruppe71',
text: 'Ta adh hD da hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 27,
createdAt: '2020-12-12',
name: 'gTellohn',
group: 'gruppe31',
text: '55 Fad AD31 hhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 28,
createdAt: '2021-01-12',
name: 'zSellora',
group: 'gruppe1',
text: 'e q raASDASdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 29,
createdAt: '2021-01-12',
name: 'uJane',
group: 'gruppe14',
text: 'erW QadCXhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
{
id: 30,
createdAt: '2021-01-11',
name: 'iSusan',
group: 'gruppe31',
text: '3IaYXCYdhhda hkahkh hakdh kaks hkadhk kdhkasdh kdhkhka dka dhakhdk',
},
], ],
}; }
}, },
methods: { methods: {
onRowClick(params) { onRowClick(params) {
/*
console.log("onRowClick", params.row.createdAt) console.log('onRowClick', params.row.createdAt)
console.log("onRowClick", params.row.group) console.log('onRowClick', params.row.group)
console.log("onRowClick", params.row.id) console.log('onRowClick', params.row.id)
console.log("onRowClick", params.row.name) console.log('onRowClick', params.row.name)
console.log("onRowClick", params.row.originalIndex) console.log('onRowClick', params.row.originalIndex)
console.log("onRowClick", params.row.text) console.log('onRowClick', params.row.text)
console.log("onRowClick", params.row.vgt_id) console.log('onRowClick', params.row.vgt_id)
*/
this.creation.createdAt = params.row.createdAt this.creation.createdAt = params.row.createdAt
this.creation.group = params.row.group this.creation.group = params.row.group
@ -168,13 +335,13 @@ export default {
// params.event - click event // params.event - click event
}, },
onSearch(params) { onSearch(params) {
console.log("onSearch", params) //console.log('onSearch', params)
// params.searchTerm - term being searched for // params.searchTerm - term being searched for
// params.rowCount - number of rows that match search // params.rowCount - number of rows that match search
}, },
mySearchFn(params){ mySearchFn(params) {
//console.log("mySearchFn", params) //console.log("mySearchFn", params)
} },
} },
}; }
</script> </script>

View File

@ -18,17 +18,14 @@
enabled: true, enabled: true,
skipDiacritics: true, skipDiacritics: true,
searchFn: mySearchFn, searchFn: mySearchFn,
placeholder: 'durchsuche die tabelle' placeholder: 'durchsuche die tabelle',
}" }"
:pagination-options="{ :pagination-options="{
enabled: true, enabled: true,
mode: 'pages' mode: 'pages',
}" > }"
<div slot="table-actions"> >
Mitglieder suchen . <div slot="table-actions">Mitglieder suchen .</div>
</div>
</vue-good-table> </vue-good-table>
</b-col> </b-col>
<b-col xl="4" class="mb-5 mb-xl-0"> <b-col xl="4" class="mb-5 mb-xl-0">
@ -53,9 +50,15 @@
</b-col> </b-col>
</b-row> </b-row>
<b-row class=""> <b-row class="">
<label for="example-email-input" class="col-md-3 col-form-label form-control-label">Email</label> <label for="example-email-input" class="col-md-3 col-form-label form-control-label">
Email
</label>
<b-col md="10"> <b-col md="10">
<base-input type="email" placeholder="gradido@example.com" id="example-email-input0" /> <base-input
type="email"
placeholder="gradido@example.com"
id="example-email-input0"
/>
</b-col> </b-col>
</b-row> </b-row>
<b-row class=""> <b-row class="">
@ -65,7 +68,6 @@
</b-col> </b-col>
</b-row> </b-row>
</form> </form>
</b-card-body> </b-card-body>
</b-card> </b-card>
@ -77,13 +79,17 @@
<h3 class="mb-0">Mitglied Daten</h3> <h3 class="mb-0">Mitglied Daten</h3>
</b-col> </b-col>
<b-col class="text-right"> <b-col class="text-right">
<a href="#!" @click="showNewUser=true" class="btn btn-sm btn-warning">schliesen</a> <a href="#!" @click="showNewUser = true" class="btn btn-sm btn-warning">
schliesen
</a>
</b-col> </b-col>
</b-row> </b-row>
</template> </template>
<b-card-body> <b-card-body>
<img style="width: 147px" src="https://demos.creative-tim.com/argon-dashboard-pro/assets/img/theme/team-4.jpg" /> <img
style="width: 147px"
src="https://demos.creative-tim.com/argon-dashboard-pro/assets/img/theme/team-4.jpg"
/>
<form> <form>
<b-row class=""> <b-row class="">
@ -93,9 +99,16 @@
</b-col> </b-col>
</b-row> </b-row>
<b-row class=""> <b-row class="">
<label for="example-email-input" class="col-md-3 col-form-label form-control-label">Email</label> <label for="example-email-input" class="col-md-3 col-form-label form-control-label">
Email
</label>
<b-col md="10"> <b-col md="10">
<base-input type="email" autocomplete="username email" placeholder="agradido@example.com" id="example-email-input1"/> <base-input
type="email"
autocomplete="username email"
placeholder="agradido@example.com"
id="example-email-input1"
/>
</b-col> </b-col>
</b-row> </b-row>
<b-row class=""> <b-row class="">
@ -105,10 +118,8 @@
</b-col> </b-col>
</b-row> </b-row>
</form> </form>
</b-card-body> </b-card-body>
</b-card> </b-card>
</b-col> </b-col>
</b-row> </b-row>
</div> </div>
@ -117,18 +128,18 @@
<script> <script>
export default { export default {
name: 'admin-user-search', name: 'admin-user-search',
data(){ data() {
return { return {
showNewUser: true, showNewUser: true,
formSetUser: { formSetUser: {
name:"", name: '',
email:"", email: '',
group:"" group: '',
}, },
formGetUser: { formGetUser: {
name:"", name: '',
email:"", email: '',
group:"" group: '',
}, },
columns: [ columns: [
{ {
@ -154,20 +165,68 @@ export default {
}, },
], ],
rows: [ rows: [
{ id:1, name:"John", email: "temail@tutanota.com", createdAt: '1976-10-25',group: "gruppe1" }, {
{ id:2, name:"Jane", email: "temail@tutanota.com", createdAt: '2011-10-31', group: "gruppe2" }, id: 1,
{ id:3, name:"Susan", email: "temail@tutanota.com", createdAt: '2011-10-30', group: "gruppe4" }, name: 'John',
{ id:4, name:"Chris", email: "temail@tutanota.com", createdAt: '2011-10-11', group: "gruppe3" }, email: 'temail@tutanota.com',
{ id:5, name:"Dan", email: "temail@tutanota.com", createdAt: '2011-10-21', group: "gruppe1" }, createdAt: '1976-10-25',
{ id:6, name:"Bohn", email: "temail@tutanota.com", createdAt: '2011-10-31', group: "gruppe2" }, group: 'gruppe1',
{ id:7, name:"Tellohn", email: "temail@tutanota.com", createdAt: '2009-10-31', group: "gruppe2" }, },
{ id:7, name:"Tellohn", email: "temail@tutanota.com", createdAt: '2009-10-31', group: "gruppe5" }, {
id: 2,
name: 'Jane',
email: 'temail@tutanota.com',
createdAt: '2011-10-31',
group: 'gruppe2',
},
{
id: 3,
name: 'Susan',
email: 'temail@tutanota.com',
createdAt: '2011-10-30',
group: 'gruppe4',
},
{
id: 4,
name: 'Chris',
email: 'temail@tutanota.com',
createdAt: '2011-10-11',
group: 'gruppe3',
},
{
id: 5,
name: 'Dan',
email: 'temail@tutanota.com',
createdAt: '2011-10-21',
group: 'gruppe1',
},
{
id: 6,
name: 'Bohn',
email: 'temail@tutanota.com',
createdAt: '2011-10-31',
group: 'gruppe2',
},
{
id: 7,
name: 'Tellohn',
email: 'temail@tutanota.com',
createdAt: '2009-10-31',
group: 'gruppe2',
},
{
id: 7,
name: 'Tellohn',
email: 'temail@tutanota.com',
createdAt: '2009-10-31',
group: 'gruppe5',
},
], ],
}; }
}, },
methods: { methods: {
onRowClick(params) { onRowClick(params) {
console.log(params.row) //console.log(params.row)
this.showNewUser = false this.showNewUser = false
// params.row - row object // params.row - row object
// params.pageIndex - index of this row on the current page. // params.pageIndex - index of this row on the current page.
@ -176,28 +235,27 @@ export default {
// params.event - click event // params.event - click event
}, },
onSearch(params) { onSearch(params) {
console.log(params) //console.log(params)
// params.searchTerm - term being searched for // params.searchTerm - term being searched for
// params.rowCount - number of rows that match search // params.rowCount - number of rows that match search
}, },
mySearchFn(params){ mySearchFn(params) {
//console.log(params) //console.log(params)
}, },
validateEmail(value){ validateEmail(value) {
if (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(value)) if (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(value)) {
{ this.msg['email'] = ''
this.msg['email'] = ''; } else {
} else{ this.msg['email'] = 'Invalid Email Address'
this.msg['email'] = 'Invalid Email Address';
} }
}, },
}, },
watch: { watch: {
mail(value){ mail(value) {
// binding this to the data value in the email input // binding this to the data value in the email input
this.email = value; this.email = value
this.validateEmail(value); this.validateEmail(value)
}, },
} },
}; }
</script> </script>

View File

@ -1,19 +1,14 @@
<template> <template>
<div> <div>default</div>
default
</div>
</template> </template>
<script> <script>
export default { export default {
name: 'default', name: 'default',
data(){ data() {
return { return {}
};
}, },
methods: { methods: {},
}, watch: {},
watch: { }
}
};
</script> </script>

View File

@ -1,16 +1,16 @@
<template> <template>
<div> <div>
<base-header class="pb-6 pb-8 pt-5 pt-md-8"> <base-header class="pb-6 pb-8 pt-5 pt-md-8">
<!-- Card stats --> <!-- Card stats -->
<b-row> <b-row>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card title="Total traffic" <stats-card
title="Total traffic"
type="gradient-red" type="gradient-red"
sub-title="350,897" sub-title="350,897"
icon="ni ni-active-40" icon="ni ni-active-40"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-success mr-2">3.48%</span> <span class="text-success mr-2">3.48%</span>
<span class="text-nowrap">Since last month</span> <span class="text-nowrap">Since last month</span>
@ -18,12 +18,13 @@
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card title="Total traffic" <stats-card
title="Total traffic"
type="gradient-orange" type="gradient-orange"
sub-title="2,356" sub-title="2,356"
icon="ni ni-chart-pie-35" icon="ni ni-chart-pie-35"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-success mr-2">12.18%</span> <span class="text-success mr-2">12.18%</span>
<span class="text-nowrap">Since last month</span> <span class="text-nowrap">Since last month</span>
@ -31,26 +32,27 @@
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card title="Sales" <stats-card
title="Sales"
type="gradient-green" type="gradient-green"
sub-title="924" sub-title="924"
icon="ni ni-money-coins" icon="ni ni-money-coins"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-danger mr-2">5.72%</span> <span class="text-danger mr-2">5.72%</span>
<span class="text-nowrap">Since last month</span> <span class="text-nowrap">Since last month</span>
</template> </template>
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card title="Performance" <stats-card
title="Performance"
type="gradient-info" type="gradient-info"
sub-title="49,65%" sub-title="49,65%"
icon="ni ni-chart-bar-32" icon="ni ni-chart-bar-32"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-success mr-2">54.8%</span> <span class="text-success mr-2">54.8%</span>
<span class="text-nowrap">Since last month</span> <span class="text-nowrap">Since last month</span>
@ -68,7 +70,7 @@
<b-row align-v="center" slot="header"> <b-row align-v="center" slot="header">
<b-col> <b-col>
<h6 class="text-light text-uppercase ls-1 mb-1">Overview</h6> <h6 class="text-light text-uppercase ls-1 mb-1">Overview</h6>
<h5 class="h3 text-white mb-0">Sales value</h5> <h5 class="h3 mb-0">Sales value</h5>
</b-col> </b-col>
<b-col> <b-col>
<b-nav class="nav-pills justify-content-end"> <b-nav class="nav-pills justify-content-end">
@ -76,7 +78,8 @@
class="mr-2 mr-md-0" class="mr-2 mr-md-0"
:active="bigLineChart.activeIndex === 0" :active="bigLineChart.activeIndex === 0"
link-classes="py-2 px-3" link-classes="py-2 px-3"
@click.prevent="initBigChart(0)"> @click.prevent="initBigChart(0)"
>
<span class="d-none d-md-block">Month</span> <span class="d-none d-md-block">Month</span>
<span class="d-md-none">M</span> <span class="d-md-none">M</span>
</b-nav-item> </b-nav-item>
@ -96,8 +99,7 @@
ref="bigChart" ref="bigChart"
:chart-data="bigLineChart.chartData" :chart-data="bigLineChart.chartData"
:extra-options="bigLineChart.extraOptions" :extra-options="bigLineChart.extraOptions"
> ></line-chart>
</line-chart>
</card> </card>
</b-col> </b-col>
@ -110,12 +112,7 @@
</b-col> </b-col>
</b-row> </b-row>
<bar-chart <bar-chart :height="350" ref="barChart" :chart-data="redBarChart.chartData"></bar-chart>
:height="350"
ref="barChart"
:chart-data="redBarChart.chartData"
>
</bar-chart>
</card> </card>
</b-col> </b-col>
</b-row> </b-row>
@ -132,38 +129,37 @@
</b-row> </b-row>
<!--End tables--> <!--End tables-->
</b-container> </b-container>
</div> </div>
</template> </template>
<script> <script>
// Charts // Charts
import * as chartConfigs from '@/components/Charts/config'; import * as chartConfigs from '@/components/Charts/config'
import LineChart from '@/components/Charts/LineChart'; import LineChart from '@/components/Charts/LineChart'
import BarChart from '@/components/Charts/BarChart'; import BarChart from '@/components/Charts/BarChart'
// Components // Components
import BaseProgress from '@/components/BaseProgress'; import BaseProgress from '@/components/BaseProgress'
import StatsCard from '@/components/Cards/StatsCard'; import StatsCard from '@/components/Cards/StatsCard'
// Tables // Tables
import SocialTrafficTable from './Dashboard/SocialTrafficTable'; import SocialTrafficTable from './Dashboard/SocialTrafficTable'
import PageVisitsTable from './Dashboard/PageVisitsTable'; import PageVisitsTable from './Dashboard/PageVisitsTable'
export default { export default {
components: { components: {
LineChart, LineChart,
BarChart, BarChart,
//BaseProgress, //BaseProgress,
StatsCard, StatsCard,
PageVisitsTable, PageVisitsTable,
SocialTrafficTable SocialTrafficTable,
}, },
data() { data() {
return { return {
bigLineChart: { bigLineChart: {
allData: [ allData: [
[0, 20, 10, 30, 15, 40, 20, 60, 60], [0, 20, 10, 30, 15, 40, 20, 60, 60],
[0, 20, 5, 25, 10, 30, 15, 40, 40] [0, 20, 5, 25, 10, 30, 15, 40, 40],
], ],
activeIndex: 0, activeIndex: 0,
chartData: { chartData: {
@ -171,7 +167,7 @@
{ {
label: 'Performance', label: 'Performance',
data: [0, 20, 10, 30, 15, 40, 20, 60, 60], data: [0, 20, 10, 30, 15, 40, 20, 60, 60],
} },
], ],
labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
}, },
@ -180,14 +176,16 @@
redBarChart: { redBarChart: {
chartData: { chartData: {
labels: ['Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], labels: ['Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
datasets: [{ datasets: [
{
label: 'Sales', label: 'Sales',
data: [25, 20, 30, 22, 17, 29] data: [25, 20, 30, 22, 17, 29],
}] },
],
},
extraOptions: chartConfigs.blueChartOptions,
}, },
extraOptions: chartConfigs.blueChartOptions
} }
};
}, },
methods: { methods: {
initBigChart(index) { initBigChart(index) {
@ -195,22 +193,22 @@
datasets: [ datasets: [
{ {
label: 'Performance', label: 'Performance',
data: this.bigLineChart.allData[index] data: this.bigLineChart.allData[index],
} },
], ],
labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
};
this.bigLineChart.chartData = chartData;
this.bigLineChart.activeIndex = index;
} }
this.bigLineChart.chartData = chartData
this.bigLineChart.activeIndex = index
},
}, },
mounted() { mounted() {
this.initBigChart(0); this.initBigChart(0)
} },
}; }
</script> </script>
<style> <style>
.el-table .cell{ .el-table .cell {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
} }

View File

@ -1,7 +1,5 @@
<template> <template>
<div> <div>
<!--Tables--> <!--Tables-->
<b-row class="mt-5"> <b-row class="mt-5">
<b-col xl="8" class="mb-5 mb-xl-0"> <b-col xl="8" class="mb-5 mb-xl-0">
@ -23,13 +21,10 @@
}" }"
:pagination-options="{ :pagination-options="{
enabled: true, enabled: true,
mode: 'pages' mode: 'pages',
}" }"
> >
<div slot="table-actions"> <div slot="table-actions">Mitglieder suchen .</div>
Mitglieder suchen .
</div>
</vue-good-table> </vue-good-table>
</b-col> </b-col>
<b-col xl="4" class="mb-5 mb-xl-0"> <b-col xl="4" class="mb-5 mb-xl-0">
@ -37,22 +32,18 @@
</b-col> </b-col>
</b-row> </b-row>
<!--End tables--> <!--End tables-->
</div> </div>
</template> </template>
<script> <script>
import SocialTrafficTable from './SocialTrafficTable'; import SocialTrafficTable from './SocialTrafficTable'
export default { export default {
name: 'my-component', name: 'my-component',
components: { components: {
SocialTrafficTable SocialTrafficTable,
}, },
data(){ data() {
return { return {
columns: [ columns: [
{ {
@ -78,20 +69,68 @@ export default {
}, },
], ],
rows: [ rows: [
{ id:1, name:"John", age: 20, createdAt: '1976-10-25',score: 0.03343 }, {
{ id:2, name:"Jane", age: 24, createdAt: '2011-10-31', score: 0.03343 }, id: 1,
{ id:3, name:"Susan", age: 16, createdAt: '2011-10-30', score: 0.03343 }, name: 'John',
{ id:4, name:"Chris", age: 55, createdAt: '2011-10-11', score: 0.03343 }, age: 20,
{ id:5, name:"Dan", age: 40, createdAt: '2011-10-21', score: 0.03343 }, createdAt: '1976-10-25',
{ id:6, name:"Bohn", age: 70, createdAt: '2011-10-31', score: 0.03343 }, score: 0.03343,
{ id:7, name:"Tellohn", age: 56, createdAt: '2009-10-31', score: 0.13343 }, },
{ id:7, name:"Tellohn", age: 56, createdAt: '2009-10-31', score: 0.03343 }, {
id: 2,
name: 'Jane',
age: 24,
createdAt: '2011-10-31',
score: 0.03343,
},
{
id: 3,
name: 'Susan',
age: 16,
createdAt: '2011-10-30',
score: 0.03343,
},
{
id: 4,
name: 'Chris',
age: 55,
createdAt: '2011-10-11',
score: 0.03343,
},
{
id: 5,
name: 'Dan',
age: 40,
createdAt: '2011-10-21',
score: 0.03343,
},
{
id: 6,
name: 'Bohn',
age: 70,
createdAt: '2011-10-31',
score: 0.03343,
},
{
id: 7,
name: 'Tellohn',
age: 56,
createdAt: '2009-10-31',
score: 0.13343,
},
{
id: 7,
name: 'Tellohn',
age: 56,
createdAt: '2009-10-31',
score: 0.03343,
},
], ],
}; }
}, },
methods: { methods: {
onRowClick(params) { onRowClick(params) {
console.log(params) //console.log(params)
// params.row - row object // params.row - row object
// params.pageIndex - index of this row on the current page. // params.pageIndex - index of this row on the current page.
// params.selected - if selection is enabled this argument // params.selected - if selection is enabled this argument
@ -99,13 +138,13 @@ export default {
// params.event - click event // params.event - click event
}, },
onSearch(params) { onSearch(params) {
console.log(params) //console.log(params)
// params.searchTerm - term being searched for // params.searchTerm - term being searched for
// params.rowCount - number of rows that match search // params.rowCount - number of rows that match search
}, },
mySearchFn(params){ mySearchFn(params) {
console.log(params) //console.log(params)
} },
} },
}; }
</script> </script>

View File

@ -1,5 +1,4 @@
<template> <template>
<b-card body-class="p-0" header-class="border-0"> <b-card body-class="p-0" header-class="border-0">
<template v-slot:header> <template v-slot:header>
<b-row align-v="center"> <b-row align-v="center">
@ -12,38 +11,26 @@
</b-row> </b-row>
</template> </template>
<el-table class="table-responsive table" <el-table class="table-responsive table" :data="tableData" header-row-class-name="thead-light">
:data="tableData" <el-table-column label="Page name" min-width="130px" prop="page">
header-row-class-name="thead-light"> <template v-slot="{ row }">
<el-table-column label="Page name" <div class="font-weight-600">{{ row.page }}</div>
min-width="130px"
prop="page">
<template v-slot="{row}">
<div class="font-weight-600">{{row.page}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="Visitors" <el-table-column label="Visitors" min-width="70px" prop="visitors"></el-table-column>
min-width="70px" <el-table-column label="Unique users" min-width="90px" prop="unique"></el-table-column>
prop="visitors">
</el-table-column>
<el-table-column label="Unique users"
min-width="90px"
prop="unique">
</el-table-column>
<el-table-column label="Bounce rate" <el-table-column label="Bounce rate" min-width="90px" prop="bounceRate">
min-width="90px" <template v-slot="{ row }">
prop="bounceRate"> {{ row.bounceRate }}
<template v-slot="{row}">
{{row.bounceRate}}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</b-card> </b-card>
</template> </template>
<script> <script>
import { Table, TableColumn, DropdownMenu, DropdownItem, Dropdown} from 'element-ui' import { Table, TableColumn, DropdownMenu, DropdownItem, Dropdown } from 'element-ui'
export default { export default {
name: 'page-visits-table', name: 'page-visits-table',
components: { components: {
[Table.name]: Table, [Table.name]: Table,
@ -59,36 +46,35 @@
page: '/argon/', page: '/argon/',
visitors: '4,569', visitors: '4,569',
unique: '340', unique: '340',
bounceRate: '46,53%' bounceRate: '46,53%',
}, },
{ {
page: '/argon/index.html', page: '/argon/index.html',
visitors: '3,985', visitors: '3,985',
unique: '319', unique: '319',
bounceRate: '46,53%' bounceRate: '46,53%',
}, },
{ {
page: '/argon/charts.html', page: '/argon/charts.html',
visitors: '3,513', visitors: '3,513',
unique: '294', unique: '294',
bounceRate: '36,49%' bounceRate: '36,49%',
}, },
{ {
page: '/argon/tables.html', page: '/argon/tables.html',
visitors: '2,050', visitors: '2,050',
unique: '147', unique: '147',
bounceRate: '50,87%' bounceRate: '50,87%',
}, },
{ {
page: '/argon/profile.html', page: '/argon/profile.html',
visitors: '1,795', visitors: '1,795',
unique: '190', unique: '190',
bounceRate: '46,53%' bounceRate: '46,53%',
} },
] ],
}
}
} }
},
}
</script> </script>
<style> <style></style>
</style>

View File

@ -11,24 +11,19 @@
</b-row> </b-row>
</template> </template>
<el-table class="table-responsive table" :data="tableData" header-row-class-name="thead-light">
<el-table
class="table-responsive table"
:data="tableData"
header-row-class-name="thead-light">
<el-table-column label="Referral" min-width="115px" prop="name"> <el-table-column label="Referral" min-width="115px" prop="name">
<template v-slot="{row}"> <template v-slot="{ row }">
<div class="font-weight-600">{{row.name}}</div> <div class="font-weight-600">{{ row.name }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="Visitors" min-width="110px" prop="visitors"> <el-table-column label="Visitors" min-width="110px" prop="visitors"></el-table-column>
</el-table-column>
<el-table-column min-width="220px" prop="progress"> <el-table-column min-width="220px" prop="progress">
<template v-slot="{row}"> <template v-slot="{ row }">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<span class="mr-2">{{row.progress}}%</span> <span class="mr-2">{{ row.progress }}%</span>
<base-progress :type="row.progressType" :value="row.progress" /> <base-progress :type="row.progressType" :value="row.progress" />
</div> </div>
</template> </template>
@ -37,9 +32,9 @@
</b-card> </b-card>
</template> </template>
<script> <script>
import { BaseProgress } from '@/components'; import { BaseProgress } from '@/components'
import { Table, TableColumn, DropdownMenu, DropdownItem, Dropdown} from 'element-ui' import { Table, TableColumn, DropdownMenu, DropdownItem, Dropdown } from 'element-ui'
export default { export default {
name: 'social-traffic-table', name: 'social-traffic-table',
components: { components: {
BaseProgress, BaseProgress,
@ -81,12 +76,10 @@
visitors: '2,645', visitors: '2,645',
progress: 30, progress: 30,
progressType: 'gradient-warning', progressType: 'gradient-warning',
},
],
} }
] },
} }
}
}
</script> </script>
<style> <style></style>
</style>

View File

@ -4,12 +4,13 @@
<!-- Card stats --> <!-- Card stats -->
<b-row> <b-row>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card title="Total traffic" <stats-card
title="Total traffic"
type="gradient-red" type="gradient-red"
sub-title="350,897" sub-title="350,897"
icon="ni ni-active-40" icon="ni ni-active-40"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-success mr-2">3.48%</span> <span class="text-success mr-2">3.48%</span>
<span class="text-nowrap">Since last month</span> <span class="text-nowrap">Since last month</span>
@ -17,12 +18,13 @@
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card title="Total traffic" <stats-card
title="Total traffic"
type="gradient-orange" type="gradient-orange"
sub-title="2,356" sub-title="2,356"
icon="ni ni-chart-pie-35" icon="ni ni-chart-pie-35"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-success mr-2">12.18%</span> <span class="text-success mr-2">12.18%</span>
<span class="text-nowrap">Since last month</span> <span class="text-nowrap">Since last month</span>
@ -30,26 +32,27 @@
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card title="Sales" <stats-card
title="Sales"
type="gradient-green" type="gradient-green"
sub-title="924" sub-title="924"
icon="ni ni-money-coins" icon="ni ni-money-coins"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-danger mr-2">5.72%</span> <span class="text-danger mr-2">5.72%</span>
<span class="text-nowrap">Since last month</span> <span class="text-nowrap">Since last month</span>
</template> </template>
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="3" md="6"> <b-col xl="3" md="6">
<stats-card title="Performance" <stats-card
title="Performance"
type="gradient-info" type="gradient-info"
sub-title="49,65%" sub-title="49,65%"
icon="ni ni-chart-bar-32" icon="ni ni-chart-bar-32"
class="mb-4"> class="mb-4"
>
<template slot="footer"> <template slot="footer">
<span class="text-success mr-2">54.8%</span> <span class="text-success mr-2">54.8%</span>
<span class="text-nowrap">Since last month</span> <span class="text-nowrap">Since last month</span>
@ -63,8 +66,7 @@
<b-row> <b-row>
<b-col> <b-col>
<b-card no-body class="border-0"> <b-card no-body class="border-0">
<div id="map-custom" class="map-canvas" <div id="map-custom" class="map-canvas" style="height: 600px"></div>
style="height: 600px;"></div>
</b-card> </b-card>
</b-col> </b-col>
</b-row> </b-row>
@ -72,79 +74,96 @@
</div> </div>
</template> </template>
<script> <script>
import { API_KEY } from './Maps/API_KEY'; import { API_KEY } from './Maps/API_KEY'
import GoogleMapsLoader from 'google-maps'; import GoogleMapsLoader from 'google-maps'
GoogleMapsLoader.KEY = API_KEY; GoogleMapsLoader.KEY = API_KEY
export default { export default {
methods: { methods: {
initMap(google) { initMap(google) {
let map, lat = 40.748817, lng = -73.985428, color = "#5e72e4"; let map,
map = document.getElementById('map-custom'); lat = 40.748817,
lng = -73.985428,
color = '#5e72e4'
map = document.getElementById('map-custom')
let myLatlng = new google.maps.LatLng(lat, lng); let myLatlng = new google.maps.LatLng(lat, lng)
let mapOptions = { let mapOptions = {
zoom: 12, zoom: 12,
scrollwheel: false, scrollwheel: false,
center: myLatlng, center: myLatlng,
mapTypeId: google.maps.MapTypeId.ROADMAP, mapTypeId: google.maps.MapTypeId.ROADMAP,
styles: [{ styles: [
"featureType": "administrative", {
"elementType": "labels.text.fill", featureType: 'administrative',
"stylers": [{ "color": "#444444" }] elementType: 'labels.text.fill',
}, { stylers: [{ color: '#444444' }],
"featureType": "landscape", },
"elementType": "all", {
"stylers": [{ "color": "#f2f2f2" }] featureType: 'landscape',
}, { elementType: 'all',
"featureType": "poi", stylers: [{ color: '#f2f2f2' }],
"elementType": "all", },
"stylers": [{ "visibility": "off" }] {
}, { featureType: 'poi',
"featureType": "road", elementType: 'all',
"elementType": "all", stylers: [{ visibility: 'off' }],
"stylers": [{ "saturation": -100 }, { "lightness": 45 }] },
}, { {
"featureType": "road.highway", featureType: 'road',
"elementType": "all", elementType: 'all',
"stylers": [{ "visibility": "simplified" }] stylers: [{ saturation: -100 }, { lightness: 45 }],
}, { },
"featureType": "road.arterial", {
"elementType": "labels.icon", featureType: 'road.highway',
"stylers": [{ "visibility": "off" }] elementType: 'all',
}, { stylers: [{ visibility: 'simplified' }],
"featureType": "transit", },
"elementType": "all", {
"stylers": [{ "visibility": "off" }] featureType: 'road.arterial',
}, { "featureType": "water", "elementType": "all", "stylers": [{ "color": color }, { "visibility": "on" }] }] elementType: 'labels.icon',
stylers: [{ visibility: 'off' }],
},
{
featureType: 'transit',
elementType: 'all',
stylers: [{ visibility: 'off' }],
},
{
featureType: 'water',
elementType: 'all',
stylers: [{ color: color }, { visibility: 'on' }],
},
],
} }
map = new google.maps.Map(map, mapOptions); map = new google.maps.Map(map, mapOptions)
let marker = new google.maps.Marker({ let marker = new google.maps.Marker({
position: myLatlng, position: myLatlng,
map: map, map: map,
animation: google.maps.Animation.DROP, animation: google.maps.Animation.DROP,
title: 'Hello World!' title: 'Hello World!',
}); })
let contentString = '<div class="info-window-content"><h2>Argon Dashboard PRO</h2>' + let contentString =
'<p>A beautiful premium dashboard for Bootstrap 4.</p></div>'; '<div class="info-window-content"><h2>Argon Dashboard PRO</h2>' +
'<p>A beautiful premium dashboard for Bootstrap 4.</p></div>'
let infowindow = new google.maps.InfoWindow({ let infowindow = new google.maps.InfoWindow({
content: contentString content: contentString,
}); })
google.maps.event.addListener(marker, 'click', function () { google.maps.event.addListener(marker, 'click', function () {
infowindow.open(map, marker); infowindow.open(map, marker)
}); })
} },
}, },
mounted() { mounted() {
GoogleMapsLoader.load(google => { GoogleMapsLoader.load((google) => {
this.initMap(google); this.initMap(google)
}); })
} },
}; }
</script> </script>

Some files were not shown because too many files have changed in this diff Show More