Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SolidBase
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
38
Issues
38
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SolidBase
SolidBase
Commits
6e5b7257
Commit
6e5b7257
authored
Feb 24, 2020
by
Johannes Winter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
consent banner on chart and configuration
parent
fbfbadf1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
src/views/Chart.vue
src/views/Chart.vue
+5
-1
src/views/Config.vue
src/views/Config.vue
+4
-1
No files found.
src/views/Chart.vue
View file @
6e5b7257
...
...
@@ -326,6 +326,7 @@
<
b
-
icon
pack
=
"
fas
"
icon
=
"
sync-alt
"
size
=
"
is-large
"
custom
-
class
=
"
fa-spin
"
>
<
/b-icon
>
<
/b-loading
>
<
mtmConsent
/>
<
/div
>
<
/template
>
...
...
@@ -341,6 +342,8 @@ import ControlField from '@/components/ControlField.vue'
import
editPintModalButton
from
'
@/components/editPintModalButton.vue
'
import
joinIntentsModal
from
'
@/components/joinIntentsModal.vue
'
import
money
from
'
@/components/money.vue
'
import
mtmConsent
from
'
@/components/matomo-consent-banner.vue
'
const
months
=
[
'
january
'
,
'
february
'
,
'
march
'
,
'
april
'
,
'
may
'
,
'
june
'
,
'
july
'
,
'
august
'
,
'
september
'
,
'
october
'
,
'
november
'
,
'
december
'
...
...
@@ -372,7 +375,8 @@ export default {
ControlField
,
editPintModalButton
,
joinIntentsModal
,
money
money
,
mtmConsent
}
,
props
:
[
'
url
'
],
data
()
{
...
...
src/views/Config.vue
View file @
6e5b7257
...
...
@@ -34,6 +34,7 @@
<hr>
</div>
</div>
<mtmConsent/>
<!--
<div>
TODO: make work
<b-loading
:is-full-page=
"true"
:active=
"loggedIn"
>
...
...
@@ -52,6 +53,7 @@ import locale2 from 'locale2'
import
LoginButton
from
'
@/components/LoginButton.vue
'
import
PersonalInfo
from
'
@/components/PersonalInfo.vue
'
import
classEditor
from
'
@/components/classEditor.vue
'
import
mtmConsent
from
'
@/components/matomo-consent-banner.vue
'
export
default
{
name
:
'
Config
'
,
...
...
@@ -68,7 +70,8 @@ export default {
components
:
{
LoginButton
,
PersonalInfo
,
classEditor
classEditor
,
mtmConsent
},
computed
:
{
loggedIn
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment