Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • main
1 result

Target

Select target project
  • medina/public/cce-frontend
1 result
Select Git revision
  • main
1 result
Show changes
Commits on Source (29)
  • Aljaz Nuncic's avatar
    Working · 05995c3d
    Aljaz Nuncic authored
    05995c3d
  • Aljaz Nuncic's avatar
    Added gitignore file · f4b698e6
    Aljaz Nuncic authored
    f4b698e6
  • Aljaz Nuncic's avatar
    connectin to api is working · c8486e11
    Aljaz Nuncic authored
    c8486e11
  • Aljaž Nunčič's avatar
    Display node tree graph · 60a428ce
    Aljaž Nunčič authored
    60a428ce
  • Aljaž Nunčič's avatar
    Merge branch 'tmpbrnch' into 'develop' · b03ed4b2
    Aljaž Nunčič authored
    b03ed4b2
  • Zitnik, Anze's avatar
    Update production API URL · cd656aed
    Zitnik, Anze authored
    cd656aed
  • Zitnik, Anze's avatar
    Empty repo · e30d46e8
    Zitnik, Anze authored
    e30d46e8
  • Zitnik, Anze's avatar
    First master version · 6844823b
    Zitnik, Anze authored
    Squashed commit of the following:
    
    commit cd656aed
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Thu Feb 10 15:08:37 2022 +0100
    
        Update production API URL
    
    commit b03ed4b2
    Merge: c8486e11 60a428ce
    Author: Aljaž Nunčič <330-aljaz_nuncic@users.noreply.gitlab.xlab.si>
    Date:   Wed Feb 9 17:12:50 2022 +0000
    
        Merge branch 'tmpbrnch' into 'develop'
    
    commit 60a428ce
    Author: Aljaž Nunčič <330-aljaz_nuncic@users.noreply.gitlab.xlab.si>
    Date:   Wed Feb 9 17:12:50 2022 +0000
    
        Display node tree graph
    
    commit c8486e11
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu Jan 20 13:34:34 2022 +0100
    
        connectin to api is working
    
    commit f4b698e6
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu Jan 20 13:20:35 2022 +0100
    
        Added gitignore file
    
    commit 05995c3d
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Wed Jan 19 16:53:57 2022 +0100
    
        Working
    6844823b
  • Zitnik, Anze's avatar
    Merge branch 'master' into develop · 14cdd30b
    Zitnik, Anze authored
    14cdd30b
  • Zitnik, Anze's avatar
    Add LICENSE (Apache 2.0) · faae5317
    Zitnik, Anze authored
    faae5317
  • Zitnik, Anze's avatar
    Merge branch 'master' into develop · 39eb7355
    Zitnik, Anze authored
    39eb7355
  • Zitnik, Anze's avatar
    Add CI stage for auto deploy to MEDINA k8s · fc2106bc
    Zitnik, Anze authored
    fc2106bc
  • Zitnik, Anze's avatar
    Merge branch 'master' into develop · a619adb6
    Zitnik, Anze authored
    a619adb6
  • Aljaz Nuncic's avatar
    02e365d9
  • Zitnik, Anze's avatar
    Changed date+time format · 77189922
    Zitnik, Anze authored
    77189922
  • Aljaž Nunčič's avatar
    Add some hover attributes, date formatting · 4ae46985
    Aljaž Nunčič authored and Zitnik, Anze's avatar Zitnik, Anze committed
    4ae46985
  • Zitnik, Anze's avatar
    Merge branch 'develop' into 'master' · 30e703bf
    Zitnik, Anze authored
    Add some hover attributes, date formatting
    
    See merge request medina/cce-frontend!2
    30e703bf
  • Zitnik, Anze's avatar
    Merge branch 'master' into develop · 4d613528
    Zitnik, Anze authored
    4d613528
  • Zitnik, Anze's avatar
    Use HTTPS to access API - change URL · cdfe4a3f
    Zitnik, Anze authored
    cdfe4a3f
  • Zitnik, Anze's avatar
    Merge branch 'master' into develop · d6722953
    Zitnik, Anze authored
    d6722953
  • Zitnik, Anze's avatar
    CI: use docker image from XLAB nexus repo · e706b2ba
    Zitnik, Anze authored
    e706b2ba
  • Zitnik, Anze's avatar
    Add word breaking, permanent node description box option, instructions · dc3d4b90
    Zitnik, Anze authored
    Updated version parsing from package.json.
    Versions of dependencies updated.
    Version 1.1.2
    
    Squashed commit of the following:
    
    commit e318c485
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:31:26 2022 +0200
    
        Version up - 1.1.2
    
    commit 95f07516
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:26:49 2022 +0200
    
        Added word breaking, permanent node description box option, instructions
    
    commit 64b5b515
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:25:53 2022 +0200
    
        Updated getting for CI from package.json
    dc3d4b90
  • Zitnik, Anze's avatar
    Display 'targetValue' attribute · 38a5a145
    Zitnik, Anze authored
    Squashed commit of the following:
    
    commit a19afbab
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 27 13:33:56 2022 +0200
    
        Version up: 0.1.3
    
    commit a2bf39a7
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Thu May 26 17:39:06 2022 +0200
    
        Add targetValue property.
    
        Rearrange properties in infoBox.
        Don't show 'code' if same as 'name'.
    
    commit d7dd3b66
    Merge: 0bedbed3 dc3d4b90
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:04:47 2022 +0200
    
        Merge branch 'master' into develop
    
    commit 0bedbed3
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:00:02 2022 +0200
    
        Minor fix in instructions.
    
    commit 8df42ada
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:47:09 2022 +0200
    
        Revert "Updated getting for CI from package.json"
    
        This reverts commit 64b5b515.
    
    commit e318c485
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:31:26 2022 +0200
    
        Version up - 1.1.2
    
    commit 95f07516
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:26:49 2022 +0200
    
        Added word breaking, permanent node description box option, instructions
    
    commit 64b5b515
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:25:53 2022 +0200
    
        Updated getting for CI from package.json
    38a5a145
  • Zitnik, Anze's avatar
    Auto collapse and expand: start with collapsed nodes. · 0e63df2e
    Zitnik, Anze authored
    Squashed commit of the following:
    
    commit a83a43f5
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 13:31:46 2022 +0200
    
        Version 0.1.4
    
    commit 05820fd4
    Merge: a19afbab 023e3fdd
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 11:30:14 2022 +0000
    
        Merge branch 'auto-collapse' into 'develop'
    
        Start with collapsed nodes
    
        See merge request medina/cce-frontend!3
    
    commit 023e3fdd
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 11:30:14 2022 +0000
    
        Start with collapsed nodes
    
    commit a19afbab
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 27 13:33:56 2022 +0200
    
        Version up: 0.1.3
    
    commit a2bf39a7
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Thu May 26 17:39:06 2022 +0200
    
        Add targetValue property.
    
        Rearrange properties in infoBox.
        Don't show 'code' if same as 'name'.
    
    commit d7dd3b66
    Merge: 0bedbed3 dc3d4b90
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:04:47 2022 +0200
    
        Merge branch 'master' into develop
    
    commit 0bedbed3
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:00:02 2022 +0200
    
        Minor fix in instructions.
    
    commit 8df42ada
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:47:09 2022 +0200
    
        Revert "Updated getting for CI from package.json"
    
        This reverts commit 64b5b515.
    
    commit e318c485
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:31:26 2022 +0200
    
        Version up - 1.1.2
    
    commit 95f07516
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:26:49 2022 +0200
    
        Added word breaking, permanent node description box option, instructions
    
    commit 64b5b515
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:25:53 2022 +0200
    
        Updated getting for CI from package.json
    0e63df2e
  • Zitnik, Anze's avatar
    Enable setting of API URL via environment variable. · 957c3667
    Zitnik, Anze authored
    Squashed commit of the following:
    
    commit 00434fb5
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 17:09:08 2022 +0200
    
        Version 0.1.5
    
    commit 8c3a83fe
    Merge: 41cff35a f05e3580
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 15:08:02 2022 +0000
    
        Merge branch 'settable-api-url' into 'develop'
    
        Enable setting of API URL via environment variable.
    
        See merge request medina/cce-frontend!4
    
    commit f05e3580
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 15:08:01 2022 +0000
    
        Enable setting of API URL via environment variable.
    
    commit 41cff35a
    Merge: a83a43f5 0e63df2e
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 15:48:32 2022 +0200
    
        Merge branch 'master' into develop
    
    commit a83a43f5
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 13:31:46 2022 +0200
    
        Version 0.1.4
    
    commit 05820fd4
    Merge: a19afbab 023e3fdd
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 11:30:14 2022 +0000
    
        Merge branch 'auto-collapse' into 'develop'
    
        Start with collapsed nodes
    
        See merge request medina/cce-frontend!3
    
    commit 023e3fdd
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 11:30:14 2022 +0000
    
        Start with collapsed nodes
    
    commit a19afbab
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 27 13:33:56 2022 +0200
    
        Version up: 0.1.3
    
    commit a2bf39a7
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Thu May 26 17:39:06 2022 +0200
    
        Add targetValue property.
    
        Rearrange properties in infoBox.
        Don't show 'code' if same as 'name'.
    
    commit d7dd3b66
    Merge: 0bedbed3 dc3d4b90
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:04:47 2022 +0200
    
        Merge branch 'master' into develop
    
    commit 0bedbed3
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:00:02 2022 +0200
    
        Minor fix in instructions.
    
    commit 8df42ada
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:47:09 2022 +0200
    
        Revert "Updated getting for CI from package.json"
    
        This reverts commit 64b5b515.
    
    commit e318c485
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:31:26 2022 +0200
    
        Version up - 1.1.2
    
    commit 95f07516
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:26:49 2022 +0200
    
        Added word breaking, permanent node description box option, instructions
    
    commit 64b5b515
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:25:53 2022 +0200
    
        Updated getting for CI from package.json
    957c3667
  • Zitnik, Anze's avatar
    Version 0.1.6 · fe39a876
    Zitnik, Anze authored
    Squashed commit of the following:
    
    commit d2b5365c
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri Jun 17 13:59:13 2022 +0200
    
        Version 0.1.6
    
    commit 80caeaf7
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri Jun 17 13:55:41 2022 +0200
    
        Upgrade dependencies, prettify code (linter).
    
        Squashed commit of the following:
    
        commit 7d756575507f136d1a760c429b437b00bdff2e5b
        Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
        Date:   Fri Jun 17 13:16:58 2022 +0200
    
            Fix problem with marking of sequential permanent opening of the node info-box
    
        commit cacf992409eafd839d5a0f7ebd433da113204be4
        Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
        Date:   Fri Jun 17 13:16:34 2022 +0200
    
            Use eslint prettier
    
        commit 9c632288a885e5087575bcb6a04fee55fd5356da
        Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
        Date:   Fri Jun 17 12:22:40 2022 +0200
    
            Fix vulnerabilities and update packages
    
    commit 00434fb5
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 17:09:08 2022 +0200
    
        Version 0.1.5
    
    commit 8c3a83fe
    Merge: 41cff35a f05e3580
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 15:08:02 2022 +0000
    
        Merge branch 'settable-api-url' into 'develop'
    
        Enable setting of API URL via environment variable.
    
        See merge request medina/cce-frontend!4
    
    commit f05e3580
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 15:08:01 2022 +0000
    
        Enable setting of API URL via environment variable.
    
    commit 41cff35a
    Merge: a83a43f5 0e63df2e
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 15:48:32 2022 +0200
    
        Merge branch 'master' into develop
    
    commit a83a43f5
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 13:31:46 2022 +0200
    
        Version 0.1.4
    
    commit 05820fd4
    Merge: a19afbab 023e3fdd
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 11:30:14 2022 +0000
    
        Merge branch 'auto-collapse' into 'develop'
    
        Start with collapsed nodes
    
        See merge request medina/cce-frontend!3
    
    commit 023e3fdd
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 11:30:14 2022 +0000
    
        Start with collapsed nodes
    
    commit a19afbab
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 27 13:33:56 2022 +0200
    
        Version up: 0.1.3
    
    commit a2bf39a7
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Thu May 26 17:39:06 2022 +0200
    
        Add targetValue property.
    
        Rearrange properties in infoBox.
        Don't show 'code' if same as 'name'.
    
    commit d7dd3b66
    Merge: 0bedbed3 dc3d4b90
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:04:47 2022 +0200
    
        Merge branch 'master' into develop
    
    commit 0bedbed3
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:00:02 2022 +0200
    
        Minor fix in instructions.
    
    commit 8df42ada
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:47:09 2022 +0200
    
        Revert "Updated getting for CI from package.json"
    
        This reverts commit 64b5b515.
    
    commit e318c485
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:31:26 2022 +0200
    
        Version up - 1.1.2
    
    commit 95f07516
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:26:49 2022 +0200
    
        Added word breaking, permanent node description box option, instructions
    
    commit 64b5b515
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:25:53 2022 +0200
    
        Updated getting for CI from package.json
    fe39a876
  • Zitnik, Anze's avatar
    Update README.md · 872923c6
    Zitnik, Anze authored
    872923c6
  • Zitnik, Anze's avatar
    Support for multiple ToEs and history. v0.2.0. · 7961c00b
    Zitnik, Anze authored
    Squashed commit of the following:
    
    commit 568b4460
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon Oct 10 12:48:56 2022 +0200
    
        Version 0.2.0
    
    commit 14ea1373
    Merge: cf7dd2f6 2e79e6d8
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Thu Oct 6 08:38:05 2022 +0000
    
        Support for multiple trees (ToEs) and history
    
        Merge branch 'feature/multiple-trees' into 'develop'
        See merge request medina/cce-frontend!5
    
    commit 2e79e6d8
    Author: Špela Dragan <spela.dragan@xlab.si>
    Date:   Thu Oct 6 08:38:05 2022 +0000
    
        Feature/multiple trees
    
    commit cf7dd2f6
    Merge: d2b5365c fe39a876
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri Jun 17 14:14:40 2022 +0200
    
        Merge branch 'master' into develop
    
    commit d2b5365c
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri Jun 17 13:59:13 2022 +0200
    
        Version 0.1.6
    
    commit 80caeaf7
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri Jun 17 13:55:41 2022 +0200
    
        Upgrade dependencies, prettify code (linter).
    
        Squashed commit of the following:
    
        commit 7d756575507f136d1a760c429b437b00bdff2e5b
        Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
        Date:   Fri Jun 17 13:16:58 2022 +0200
    
            Fix problem with marking of sequential permanent opening of the node info-box
    
        commit cacf992409eafd839d5a0f7ebd433da113204be4
        Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
        Date:   Fri Jun 17 13:16:34 2022 +0200
    
            Use eslint prettier
    
        commit 9c632288a885e5087575bcb6a04fee55fd5356da
        Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
        Date:   Fri Jun 17 12:22:40 2022 +0200
    
            Fix vulnerabilities and update packages
    
    commit 00434fb5
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 17:09:08 2022 +0200
    
        Version 0.1.5
    
    commit 8c3a83fe
    Merge: 41cff35a f05e3580
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 15:08:02 2022 +0000
    
        Merge branch 'settable-api-url' into 'develop'
    
        Enable setting of API URL via environment variable.
    
        See merge request medina/cce-frontend!4
    
    commit f05e3580
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 15:08:01 2022 +0000
    
        Enable setting of API URL via environment variable.
    
    commit 41cff35a
    Merge: a83a43f5 0e63df2e
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 15:48:32 2022 +0200
    
        Merge branch 'master' into develop
    
    commit a83a43f5
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 13:31:46 2022 +0200
    
        Version 0.1.4
    
    commit 05820fd4
    Merge: a19afbab 023e3fdd
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 11:30:14 2022 +0000
    
        Merge branch 'auto-collapse' into 'develop'
    
        Start with collapsed nodes
    
        See merge request medina/cce-frontend!3
    
    commit 023e3fdd
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Mon May 30 11:30:14 2022 +0000
    
        Start with collapsed nodes
    
    commit a19afbab
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 27 13:33:56 2022 +0200
    
        Version up: 0.1.3
    
    commit a2bf39a7
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Thu May 26 17:39:06 2022 +0200
    
        Add targetValue property.
    
        Rearrange properties in infoBox.
        Don't show 'code' if same as 'name'.
    
    commit d7dd3b66
    Merge: 0bedbed3 dc3d4b90
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:04:47 2022 +0200
    
        Merge branch 'master' into develop
    
    commit 0bedbed3
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 10:00:02 2022 +0200
    
        Minor fix in instructions.
    
    commit 8df42ada
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:47:09 2022 +0200
    
        Revert "Updated getting for CI from package.json"
    
        This reverts commit 64b5b515.
    
    commit e318c485
    Author: Anže Žitnik <anze.zitnik@xlab.si>
    Date:   Fri May 20 09:31:26 2022 +0200
    
        Version up - 1.1.2
    
    commit 95f07516
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:26:49 2022 +0200
    
        Added word breaking, permanent node description box option, instructions
    
    commit 64b5b515
    Author: Aljaz Nuncic <aljaz.nuncic@xlab.si>
    Date:   Thu May 19 19:25:53 2022 +0200
    
        Updated getting for CI from package.json
    7961c00b
  • Zitnik, Anze's avatar
    v0.2.0 · ec9fff95
    Zitnik, Anze authored
    Merge branch 'master' into public
    ec9fff95
image: nexus-registry.xlab.si:5001/docker:stable
variables:
REGISTRY: registry-gitlab.xlab.si
MEDINA_REGISTRY: optima-medina-docker-dev.artifact.tecnalia.com
MEDINA_REG_PATH: wp4/t41
stages:
- build
- push
- deploy
before_script:
- mkdir -p $HOME/.docker
- echo "$DOCKER_AUTH_CONFIG" > $HOME/.docker/config.json
- export SERVICE=cce-frontend
- export VERSION=$(grep -w "version" package.json | cut -d ':' -f 2 | cut -d ',' -f 1 | xargs echo)
build:
stage: build
script: docker build --no-cache -t $REGISTRY/medina/$SERVICE:$VERSION .
push:
stage: push
script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $REGISTRY
- docker tag $REGISTRY/medina/$SERVICE:$VERSION $REGISTRY/medina/$SERVICE:latest
- docker push $REGISTRY/medina/$SERVICE:$VERSION
- docker push $REGISTRY/medina/$SERVICE:latest
- docker logout $REGISTRY
- docker login $MEDINA_REGISTRY -u medina.fordevelopers@gmail.com -p AKCp8kqMZkcPRPGZhHBw7uKFsyifF1iHb2ZvbBy5PK88wD8EdeSHZqFsc4h1wp3M2oVYGazhv
- docker tag $REGISTRY/medina/$SERVICE:$VERSION $MEDINA_REGISTRY/$MEDINA_REG_PATH/$SERVICE:$VERSION
- docker tag $REGISTRY/medina/$SERVICE:$VERSION $MEDINA_REGISTRY/$MEDINA_REG_PATH/$SERVICE:latest
- docker push $MEDINA_REGISTRY/$MEDINA_REG_PATH/$SERVICE:$VERSION
- docker push $MEDINA_REGISTRY/$MEDINA_REG_PATH/$SERVICE:latest
- docker logout $MEDINA_REGISTRY
only:
- master
deploy:
stage: deploy
script:
- docker run --rm curlimages/curl -I -X POST "https://xlab:110bb809200c797e6031787b51a049b819@cicd.medina.esilab.org/jenkins/job/medina/job/wp4/job/task_4.1/job/cce-deploy/buildWithParameters?PRJ_ENV=dev&PRJ_IMAGE_TAG=latest&YAMLS_OVERRIDE="
only:
- master
{
"name": "cce-frontend",
"version": "0.1.5",
"version": "0.1.6",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "cce-frontend",
"version": "0.1.5",
"version": "0.1.6",
"dependencies": {
"@fortawesome/fontawesome-free": "^6.1.1",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
......@@ -20,7 +20,7 @@
"core-js": "^3.23.1",
"eslint-plugin-vue": "^9.1.1",
"jquery": "^3.6.0",
"moment": "^2.29.3",
"luxon": "^3.0.3",
"vue": "^3.2.37",
"vue-axios": "^3.4.1",
"vue-router": "^4.0.16",
......@@ -2945,9 +2945,9 @@
"dev": true
},
"node_modules/@vue/devtools-api": {
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.1.4.tgz",
"integrity": "sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ=="
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
"integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
},
"node_modules/@vue/eslint-config-prettier": {
"version": "7.0.0",
......@@ -7707,6 +7707,14 @@
"node": ">=10"
}
},
"node_modules/luxon": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/luxon/-/luxon-3.0.3.tgz",
"integrity": "sha512-+EfHWnF+UT7GgTnq5zXg3ldnTKL2zdv7QJgsU5bjjpbH17E3qi/puMhQyJVYuCq+FRkogvB5WB6iVvUr+E4a7w==",
"engines": {
"node": ">=12"
}
},
"node_modules/magic-string": {
"version": "0.25.9",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
......@@ -7974,14 +7982,6 @@
"integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==",
"dev": true
},
"node_modules/moment": {
"version": "2.29.3",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
"integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==",
"engines": {
"node": "*"
}
},
"node_modules/mrmime": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
......@@ -10350,9 +10350,9 @@
}
},
"node_modules/terser": {
"version": "5.14.1",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz",
"integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==",
"version": "5.15.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
"integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
"dev": true,
"dependencies": {
"@jridgewell/source-map": "^0.3.2",
......@@ -13871,9 +13871,9 @@
}
},
"@vue/devtools-api": {
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.1.4.tgz",
"integrity": "sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ=="
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
"integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
},
"@vue/eslint-config-prettier": {
"version": "7.0.0",
......@@ -17412,6 +17412,11 @@
"yallist": "^4.0.0"
}
},
"luxon": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/luxon/-/luxon-3.0.3.tgz",
"integrity": "sha512-+EfHWnF+UT7GgTnq5zXg3ldnTKL2zdv7QJgsU5bjjpbH17E3qi/puMhQyJVYuCq+FRkogvB5WB6iVvUr+E4a7w=="
},
"magic-string": {
"version": "0.25.9",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
......@@ -17612,11 +17617,6 @@
"integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==",
"dev": true
},
"moment": {
"version": "2.29.3",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
"integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="
},
"mrmime": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
......@@ -19327,9 +19327,9 @@
"dev": true
},
"terser": {
"version": "5.14.1",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz",
"integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==",
"version": "5.15.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
"integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
"dev": true,
"requires": {
"@jridgewell/source-map": "^0.3.2",
......
{
"name": "cce-frontend",
"version": "0.1.6",
"version": "0.2.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
......@@ -27,7 +27,7 @@
"core-js": "^3.23.1",
"eslint-plugin-vue": "^9.1.1",
"jquery": "^3.6.0",
"moment": "^2.29.3",
"luxon": "^3.0.3",
"vue": "^3.2.37",
"vue-axios": "^3.4.1",
"vue-router": "^4.0.16",
......@@ -39,8 +39,8 @@
"@vue/cli-plugin-eslint": "~5.0.6",
"@vue/cli-service": "~5.0.6",
"@vue/compiler-sfc": "^3.2.37",
"eslint": "^8.17.0",
"@vue/eslint-config-prettier": "^7.0.0",
"eslint": "^8.17.0",
"eslint-plugin-prettier": "^4.0.0",
"prettier": "^2.7.1",
"sass": "^1.52.3",
......
......@@ -14,10 +14,8 @@ export default {
font-family: Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
color: #2c3e50;
background: #f3f8fb;
padding: 60px;
height: 100vh;
}
</style>
<template>
<div class="dropdown">
<button
class="btn btn-primary dropdown-toggle"
type="button"
data-bs-toggle="dropdown"
aria-expanded="false"
>
{{ currentTreeShown }}
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
<li
v-for="tree in toeHistory"
:key="tree.treeStateId"
:class="disabled(tree)"
@click="getHistoryTree(tree)"
class="dropdown-item"
>
<a>
{{ formatDatetime(tree.timeUpdated) }}
</a>
</li>
</ul>
</div>
</template>
<script>
import { DateTime } from "luxon";
import { getLastTree } from "@/helpers/helpers";
export default {
name: "ToeHistory",
props: ["toeHistory", "currentTreeState"],
data: function () {
return {
formatDatetime(datetime) {
return DateTime.fromISO(datetime).toLocaleString(
DateTime.DATETIME_FULL
);
},
disabled(tree) {
if (tree.treeStateId === this.currentTreeState.treeStateId) {
return "disabled";
}
return "";
},
};
},
computed: {
currentTreeShown() {
if (
this.currentTreeState.treeStateId ===
getLastTree(this.toeHistory).treeStateId
) {
return "Current tree state";
} else {
return this.formatDatetime(this.currentTreeState.timeUpdated);
}
},
},
methods: {
getHistoryTree(tree) {
this.$store.dispatch("getTreeDataByStateId", tree.treeStateId);
},
},
};
</script>
<style scoped lang="scss">
@import "@/styles/_variables.scss";
.disabled {
pointer-events: none;
opacity: 0.6;
}
.dropdown-item {
cursor: pointer;
}
</style>
<template>
<div class="dropdown">
<button
class="btn btn-primary dropdown-toggle"
type="button"
data-bs-toggle="dropdown"
aria-expanded="false"
>
{{ initSelectedToe.name }}
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
<li
v-for="toe in toeList"
:key="toe.toeId"
:class="disabled(toe)"
@click="setToeTree(toe)"
class="dropdown-item"
>
<a>{{ toe.name }}</a>
</li>
</ul>
</div>
</template>
<script>
export default {
name: "ToeList",
props: ["toeList", "initSelectedToe"],
data: function () {
return {
disabled(toe) {
if (toe.toeId === this.initSelectedToe.targetOfEvaluationId) {
return "disabled";
}
return "";
},
};
},
methods: {
setToeTree(toe) {
this.$store.dispatch("selectToe", toe.toeId);
},
},
};
</script>
<style scoped lang="scss">
@import "@/styles/_variables.scss";
.toe-list {
.dropdown-toggle {
max-width: 100%;
padding: 6px 12px;
overflow: hidden;
text-overflow: ellipsis;
}
.dropdown-item {
cursor: pointer;
}
.disabled {
pointer-events: none;
opacity: 0.6;
}
}
</style>
<template>
<div class="container">
<div id="toe-container" class="container">
<div class="box info-box" v-show="hoveredNode">
<div class="close-button">
<i @click="infoBoxClose" title="Close" class="fa fa-solid fa-xmark"></i>
......@@ -151,7 +151,7 @@
<script>
import VueTree from "@ssthouse/vue3-tree-chart";
import "@ssthouse/vue3-tree-chart/dist/vue3-tree-chart.css";
import { formatDateHelper } from "@/helpers/dataFormat";
import { formatDateHelper } from "@/helpers/helpers";
import $ from "jquery";
import { collapseExpandTree } from "@/mixins/collapseExpandTree";
......@@ -233,6 +233,11 @@ export default {
return formatDateHelper(date);
},
},
watch: {
treeData() {
this.infoBoxClose();
},
},
};
</script>
......@@ -246,6 +251,11 @@ export default {
max-width: 5000px;
}
#toe-container {
position: relative;
padding-bottom: 20px;
}
.tree-container {
background: white;
margin-top: 20px;
......@@ -289,9 +299,11 @@ export default {
}
&.info-box {
position: absolute;
border-color: $color-blue;
z-index: 10;
left: 72px;
left: 12px;
top: 74px;
}
&#instructions {
......
import { DateTime } from "luxon";
export function formatDateHelper(value) {
if (value) {
return DateTime.fromISO(value).toFormat("DD MMM YYYY HH:mm:ss");
}
}
export function getLastTree(historyData) {
if (!historyData.length) return;
let lastTreeIdx = 0;
let closestTime = DateTime.fromISO(historyData[0].timeUpdated);
for (let i = 0; i < historyData.length; i++) {
let diff = DateTime.fromISO(historyData[i].timeUpdated).diff(
DateTime.fromISO(closestTime)
);
if (diff.milliseconds > 0) {
closestTime = historyData[i].timeUpdated;
lastTreeIdx = i;
}
}
return historyData[lastTreeIdx];
}
import api from "@/client/client";
export const ApiService = {
getEvaluationTreeData() {
return api.get("/tree");
getToeList() {
return api.get("/toeList");
},
getToeHistory(toeId) {
return api.get("/toes/" + toeId + "/listHistory");
},
getTreeByStateId(stateId) {
return api.get("/history/" + stateId);
},
};
......@@ -5,33 +5,88 @@ import { collapseExpandTree } from "@/mixins/collapseExpandTree";
const store = createStore({
state: {
treeData: {},
toeList: {},
toeHistory: {},
treeDataListByStateId: [],
},
mutations: {
SAVE_TREE_DATA(state, treeData) {
state.treeData = treeData;
},
SAVE_TOE_LIST(state, toeList) {
state.toeList = toeList;
},
SAVE_TOE_HISTORY(state, toeHistory) {
state.toeHistory = toeHistory;
},
SAVE_TREE_DATA_LIST(state, treeData) {
state.treeDataListByStateId.push(treeData);
},
},
getters: {
treeData: (state) => state.treeData,
toeList: (state) => state.toeList,
toeHistory: (state) => state.toeHistory,
treeByStateId: (state) => (stateId) => {
return state.treeDataListByStateId.find(
(tree) => tree.treeStateId === stateId
);
},
},
actions: {
async getTreeData({ commit }) {
await ApiService.getEvaluationTreeData()
async getTreeDataByStateId({ commit }, stateId) {
if (!stateId) return;
if (stateId && this.getters.treeByStateId(stateId)) {
return commit("SAVE_TREE_DATA", this.getters.treeByStateId(stateId));
}
ApiService.getTreeByStateId(stateId)
.then((response) => {
// collapse all except root
collapseExpandTree.methods.collapseAllFromLevel(
response.data.root,
1
);
commit("SAVE_TREE_DATA", response.data);
commit("SAVE_TREE_DATA_LIST", response.data);
})
.catch((err) => {
console.error("Error getting tree by tree state id: " + err);
});
},
async getToeList({ commit }) {
await ApiService.getToeList()
.then((response) => {
commit("SAVE_TOE_LIST", response.data);
})
.catch((err) => {
console.log("ERROR at action getTreeData: " + err);
console.error("Error getting ToE list: " + err);
});
},
async updateTreeData({ commit }, data) {
commit("SAVE_TREE_DATA", data);
async getToeHistory({ commit }, id) {
await ApiService.getToeHistory(id)
.then((response) => {
commit("SAVE_TOE_HISTORY", response.data);
})
.catch((err) => {
console.error("Error getting ToE history: " + err);
});
},
async initToeListAndTree({ dispatch }) {
// TODO: add logic for when there are no trees
await dispatch("getToeList").then(() => {
dispatch("getToeHistory", this.state.toeList[0].toeId).then(() => {
dispatch(
"getTreeDataByStateId",
this.state.toeHistory[0].treeStateId
);
});
});
},
async selectToe({ dispatch }, toeId) {
await dispatch("getToeHistory", toeId).then(() => {
dispatch("getTreeDataByStateId", this.state.toeHistory[0].treeStateId);
});
},
},
});
......
<template>
<div id="home">
<div id="home" class="container" v-if="treeData.root">
<div class="row toe-dropdowns">
<div class="col-sm-6 toe-list">
<ToeList :toeList="toeList" :initSelectedToe="treeData"></ToeList>
</div>
<div class="col-sm-6 toe-history">
<ToeHistory
:toeHistory="toeHistory"
:currentTreeState="treeData"
></ToeHistory>
</div>
</div>
<Tree :treeData="treeData.root"></Tree>
</div>
</template>
......@@ -7,6 +18,8 @@
<script>
import { mapGetters } from "vuex";
import Tree from "@/components/Tree";
import ToeList from "@/components/ToeList";
import ToeHistory from "@/components/ToeHistory";
export default {
name: "Home",
......@@ -15,14 +28,27 @@ export default {
},
computed: {
...mapGetters(["treeData"]),
...mapGetters(["toeList"]),
...mapGetters(["toeHistory"]),
},
components: {
Tree,
ToeList,
ToeHistory,
},
created() {
this.$store.dispatch("getTreeData");
this.$store.dispatch("initToeListAndTree");
},
};
</script>
<style scoped lang="scss"></style>
<style scoped lang="scss">
.toe-dropdowns {
padding: 40px 12px 10px;
}
.toe-history {
.dropdown {
float: right;
}
}
</style>