diff --git a/package-lock.json b/package-lock.json index aa05152024..8d43f7f605 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "@material/top-app-bar": "^12.0", "ajv": "^8.6.2", "animate.css": "^4.1.1", - "bootstrap": "^4.6.0", + "bootstrap": "^5.1.0", "clipboard": "^2.0.8", "external-svg-loader": "^1.3.4", "jquery": "^3.6.0", @@ -2439,6 +2439,16 @@ "node": ">=4" } }, + "node_modules/@popperjs/core": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz", + "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ==", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@stylelint/postcss-css-in-js": { "version": "0.37.2", "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz", @@ -3711,16 +3721,15 @@ "dev": true }, "node_modules/bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.0.tgz", + "integrity": "sha512-bs74WNI9BgBo3cEovmdMHikSKoXnDgA6VQjJ7TyTotU6L7d41ZyCEEelPwkYEzsG/Zjv3ie9IE3EMAje0W9Xew==", "funding": { "type": "opencollective", "url": "https://opencollective.com/bootstrap" }, "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.9.3" } }, "node_modules/brace-expansion": { @@ -22149,6 +22158,12 @@ } } }, + "@popperjs/core": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz", + "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ==", + "peer": true + }, "@stylelint/postcss-css-in-js": { "version": "0.37.2", "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz", @@ -23205,9 +23220,9 @@ "dev": true }, "bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.0.tgz", + "integrity": "sha512-bs74WNI9BgBo3cEovmdMHikSKoXnDgA6VQjJ7TyTotU6L7d41ZyCEEelPwkYEzsG/Zjv3ie9IE3EMAje0W9Xew==", "requires": {} }, "brace-expansion": { diff --git a/package.json b/package.json index 6abae2a536..e0d9643ade 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@material/top-app-bar": "^12.0", "ajv": "^8.6.2", "animate.css": "^4.1.1", - "bootstrap": "^4.6.0", + "bootstrap": "^5.1.0", "clipboard": "^2.0.8", "external-svg-loader": "^1.3.4", "jquery": "^3.6.0", diff --git a/templates/Default/sidebar.html.twig b/templates/Default/sidebar.html.twig index 22f6c2fcb6..ff84794a6c 100644 --- a/templates/Default/sidebar.html.twig +++ b/templates/Default/sidebar.html.twig @@ -21,7 +21,7 @@ notifications {{ "notifications"|trans({}, "catroweb") }} - + @@ -29,7 +29,7 @@ events {{ "achievements.sidebar.title"|trans({}, "catroweb") }} - + diff --git a/templates/Header/header_notification_options.html.twig b/templates/Header/header_notification_options.html.twig index 0778de93d1..ed5b0ee45c 100644 --- a/templates/Header/header_notification_options.html.twig +++ b/templates/Header/header_notification_options.html.twig @@ -8,7 +8,7 @@ class="btn top-app-bar-btn-options mdc-list-item mdc-ripple-upgraded" role="menuitem" tabindex="0"> - delete + delete {{ "deleteAllNotificationsButtonTitle"|trans({}, "catroweb") }} @@ -17,7 +17,7 @@ class="btn top-app-bar-btn-options mdc-list-item mdc-ripple-upgraded" role="menuitem" tabindex="0"> - done + done {{ "clearAllNotificationsButtonTitle"|trans({}, "catroweb") }} diff --git a/templates/Header/header_project_options.html.twig b/templates/Header/header_project_options.html.twig index 83abe3cb38..6d7a8f06a1 100644 --- a/templates/Header/header_project_options.html.twig +++ b/templates/Header/header_project_options.html.twig @@ -9,7 +9,7 @@ role="menuitem" tabindex="0" data-clipboard-text="{{ url('program', { id : program.id }) }}"> - share + share {{ "share.text"|trans({}, "catroweb") }} @@ -19,7 +19,7 @@ class="btn top-app-bar-btn-options mdc-list-item mdc-ripple-upgraded" role="menuitem" tabindex="1"> - flag + flag {{ "report"|trans({}, "catroweb") }} diff --git a/templates/Header/header_studio_options.html.twig b/templates/Header/header_studio_options.html.twig index 0fe2ba2311..9a1cc7d56f 100644 --- a/templates/Header/header_studio_options.html.twig +++ b/templates/Header/header_studio_options.html.twig @@ -11,7 +11,7 @@ role="menuitem" tabindex="0" data-clipboard-text="{{ url('studio_details', { id : studio.id }) }}"> - share + share {{ "share.text"|trans({}, "catroweb") }} @@ -19,7 +19,7 @@ class="btn top-app-bar-btn-options mdc-list-item mdc-ripple-upgraded" role="menuitem" tabindex="1"> - flag + flag {{ "report"|trans({}, "catroweb") }} diff --git a/templates/Index/welcome-section.html.twig b/templates/Index/welcome-section.html.twig index 3e4acc5f88..471dc4d71b 100644 --- a/templates/Index/welcome-section.html.twig +++ b/templates/Index/welcome-section.html.twig @@ -22,38 +22,41 @@ {{ include('Index/youtubeHelpVideo.html.twig') }}
- - get_app - {# Play Store Logo #} - {{ "googlePlay"|trans({}, "catroweb") }} - - {% if flavor() == "luna" %} - - Discord server - Discord chat - - {% elseif flavor() == 'arduino' %} - {% elseif flavor() == 'mindstorms' %} - {# show nothing for now #} - {% elseif flavor() == 'embroidery' %} - - explore - {# Code&Stitch Instagram #} - Instagram - - {% else %} - +
+ get_app - {# App Store Logo #} - {{ "iosAppStore"|trans({}, "catroweb") }} + {# Play Store Logo #} + {{ "googlePlay"|trans({}, "catroweb") }} - - get_app - {# Huawei AppGallery Logo #} - {{ "huaweiAppGallery"|trans({}, "catroweb") }} - - {% endif %} + {% if flavor() == "luna" %} + + Discord server + Discord chat + + {% elseif flavor() == 'arduino' %} + {% elseif flavor() == 'mindstorms' %} + {# show nothing for now #} + {% elseif flavor() == 'embroidery' %} + + explore + {# Code&Stitch Instagram #} + Instagram + + {% else %} + + get_app + {# App Store Logo #} + {{ "iosAppStore"|trans({}, "catroweb") }} + + + get_app + {# Huawei AppGallery Logo #} + {{ "huaweiAppGallery"|trans({}, "catroweb") }} + + {% endif %} +
+
diff --git a/templates/Program/program.html.twig b/templates/Program/program.html.twig index a0adfaadbf..f97fe13bf3 100644 --- a/templates/Program/program.html.twig +++ b/templates/Program/program.html.twig @@ -37,18 +37,18 @@ - + translate @@ -59,7 +59,7 @@
- person + person {{ program.user }} @@ -71,12 +71,12 @@
query_builder - {{ program_details.age }} + {{ program_details.age }}
description - {{ program_details.filesize }} MB + {{ program_details.filesize }} MB
diff --git a/templates/Program/programComments.html.twig b/templates/Program/programComments.html.twig index 9f9dd48b00..4fdf0195e8 100644 --- a/templates/Program/programComments.html.twig +++ b/templates/Program/programComments.html.twig @@ -56,7 +56,7 @@ - + translate @@ -67,7 +67,7 @@ @@ -78,14 +78,14 @@ {# Everybody, but the comment owner must be able to report a comment #} - not_interested + not_interested {% endif %} {% if program_details.isAdmin or (app.user and comment.username == app.user.username) %} {# Only Admins and comment owner can delete the comment #} - delete + delete {% endif %}
diff --git a/templates/Program/program_apk_generation_buttons.html.twig b/templates/Program/program_apk_generation_buttons.html.twig index f89076e424..81a6414d79 100644 --- a/templates/Program/program_apk_generation_buttons.html.twig +++ b/templates/Program/program_apk_generation_buttons.html.twig @@ -9,7 +9,7 @@
- + {% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'download-progressbar' ~ suffix|default(), 'size': 'small'} only %} diff --git a/templates/Program/program_code_statistics_button.html.twig b/templates/Program/program_code_statistics_button.html.twig index f1058de827..f628d88309 100644 --- a/templates/Program/program_code_statistics_button.html.twig +++ b/templates/Program/program_code_statistics_button.html.twig @@ -2,7 +2,7 @@ class="btn btn-outline-primary btn-block" onclick="program.projectViewButtonsAction('{{ path('code_statistics', {'id': program.id }) }}', '#code-statistics-button-spinner{{ suffix|default('') }}', '#code-statistics-icon{{ suffix|default('') }}')"> - + {% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'code-statistics-spinner' ~ suffix|default(), 'size': 'small'} %} show_chart diff --git a/templates/Program/program_code_view_button.html.twig b/templates/Program/program_code_view_button.html.twig index e56874e519..00c3809dae 100644 --- a/templates/Program/program_code_view_button.html.twig +++ b/templates/Program/program_code_view_button.html.twig @@ -2,7 +2,7 @@ class="btn btn-outline-primary btn-block" onclick="program.projectViewButtonsAction('{{ path('code_view', {'id': program.id }) }}', '#code-view-button-spinner{{ suffix|default('') }}', '#code-view-icon{{ suffix|default('') }}')"> - + {% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'code-view-spinner' ~ suffix|default(), 'size': 'small'} %} extension diff --git a/templates/Program/program_description.html.twig b/templates/Program/program_description.html.twig index e8ce4f5b7b..f917b2dd96 100644 --- a/templates/Program/program_description.html.twig +++ b/templates/Program/program_description.html.twig @@ -6,7 +6,7 @@ {% if app.user and my_program %} edit + class="ms-3 material-icons catro-icon-button align-bottom">edit {% endif %} @@ -46,7 +46,7 @@ {% if app.user and my_program %} edit + class="ms-3 material-icons catro-icon-button align-bottom">edit {% endif %} @@ -79,7 +79,7 @@ {% if app.user and my_program %} edit + class="ms-3 material-icons catro-icon-button align-bottom">edit {% endif %} diff --git a/templates/Program/program_details.html.twig b/templates/Program/program_details.html.twig index 429fb911cc..060375b60f 100644 --- a/templates/Program/program_details.html.twig +++ b/templates/Program/program_details.html.twig @@ -7,11 +7,11 @@
visibility - {{ "programs.views"|trans({ '%views%' : program_details.views }, "catroweb") }} + {{ "programs.views"|trans({ '%views%' : program_details.views }, "catroweb") }}
query_builder - {{ program_details.age }} + {{ program_details.age }}
{% include 'Program/program_code_statistics_button.html.twig' %} @@ -21,11 +21,11 @@
description - {{ program_details.filesize }} MB + {{ program_details.filesize }} MB
get_app - {{ "programs.downloads"|trans({ '%downloads%' : program_details.downloads }, "catroweb") }} + {{ "programs.downloads"|trans({ '%downloads%' : program_details.downloads }, "catroweb") }}
{% include 'Program/program_code_view_button.html.twig' %} diff --git a/templates/Program/program_download_button.html.twig b/templates/Program/program_download_button.html.twig index f24479bfc5..f7fdda5da5 100644 --- a/templates/Program/program_download_button.html.twig +++ b/templates/Program/program_download_button.html.twig @@ -10,7 +10,7 @@ '#download-pb{{ suffix|default('') }}', '#download-icon{{ suffix|default('') }}')"> - + {% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'download-progressbar' ~ suffix|default(), 'size': 'small'} only %} get_app {{ "download"|trans({}, "catroweb") }} diff --git a/templates/Program/program_reactions_modal.html.twig b/templates/Program/program_reactions_modal.html.twig index 83c85c7d0e..3d6b7d6432 100644 --- a/templates/Program/program_reactions_modal.html.twig +++ b/templates/Program/program_reactions_modal.html.twig @@ -5,7 +5,7 @@
-
diff --git a/templates/Program/program_remix_graph_button.html.twig b/templates/Program/program_remix_graph_button.html.twig index 3fd16656fc..23f3fe645c 100644 --- a/templates/Program/program_remix_graph_button.html.twig +++ b/templates/Program/program_remix_graph_button.html.twig @@ -2,7 +2,7 @@ class="btn btn-outline-primary btn-block" onclick="program.projectViewButtonsAction('{{path('remix_graph', {'id': program.id })}}', '#remix-graph-button-spinner{{ suffix|default('') }}', '#remix-graph-icon{{ suffix|default('') }}')"> - + {% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'remix-graph-spinner' ~ suffix|default(), 'size': 'small'} %} call_split diff --git a/templates/Program/program_sign_app_modal.html.twig b/templates/Program/program_sign_app_modal.html.twig index fce6c9668e..a4166c1061 100644 --- a/templates/Program/program_sign_app_modal.html.twig +++ b/templates/Program/program_sign_app_modal.html.twig @@ -35,14 +35,14 @@ aria-hidden="true">
  • - vpn_key + vpn_key {{ 'program.signApp.generate_key'|trans({}, "catroweb") }}
    • @@ -126,7 +126,7 @@
    diff --git a/templates/Program/program_tags.html.twig b/templates/Program/program_tags.html.twig index 3b58bab4a2..69b6489db3 100644 --- a/templates/Program/program_tags.html.twig +++ b/templates/Program/program_tags.html.twig @@ -7,7 +7,7 @@

    {{ ("extensions.title")|trans({}, "catroweb") }}:

    {% for extension in program.extensions %} - {{ extension.getTitleLtmCode()|trans({}, "catroweb") }} {% endfor %}
    @@ -18,7 +18,7 @@

    {{ ("tags.title")|trans({}, "catroweb") }}:

    {% for tag in program.tags %} - {{ tag.getTitleLtmCode()|trans({}, "catroweb") }} {% endfor %}
    diff --git a/templates/Program/projectThumbnail.html.twig b/templates/Program/projectThumbnail.html.twig index b2cfad716e..4c9f328e32 100644 --- a/templates/Program/projectThumbnail.html.twig +++ b/templates/Program/projectThumbnail.html.twig @@ -15,7 +15,7 @@
    - + {% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'upload-image-pb', 'size': 'small'} only %}
    diff --git a/templates/Studio/studio_details_comment_list.html.twig b/templates/Studio/studio_details_comment_list.html.twig index c4afb82446..f6d15d2a25 100644 --- a/templates/Studio/studio_details_comment_list.html.twig +++ b/templates/Studio/studio_details_comment_list.html.twig @@ -12,7 +12,7 @@ - delete + delete {% endif %}

    {{ comment.text }}

    diff --git a/templates/Studio/studio_details_header.html.twig b/templates/Studio/studio_details_header.html.twig index 6a0582d327..7008fccdb7 100644 --- a/templates/Studio/studio_details_header.html.twig +++ b/templates/Studio/studio_details_header.html.twig @@ -12,12 +12,12 @@
    - person{{ members_count }} + person{{ members_count }}
    {% else %}
    - person{{ members_count }} + person{{ members_count }}
    {% endif %}
    @@ -26,11 +26,11 @@ schedule - {{ activities_count }} + {{ activities_count }} {% else %} schedule - {{ activities_count }} + {{ activities_count }} {% endif %}
    diff --git a/templates/Studio/studio_details_project_list.html.twig b/templates/Studio/studio_details_project_list.html.twig index d124af9e8f..050d2fcf2a 100644 --- a/templates/Studio/studio_details_project_list.html.twig +++ b/templates/Studio/studio_details_project_list.html.twig @@ -24,7 +24,7 @@ {% if user_role == 'admin' %} - delete + delete {% endif %}
    diff --git a/templates/UserManagement/Followers/follower-item.html.twig b/templates/UserManagement/Followers/follower-item.html.twig index c99abc2966..4bca402425 100644 --- a/templates/UserManagement/Followers/follower-item.html.twig +++ b/templates/UserManagement/Followers/follower-item.html.twig @@ -18,7 +18,7 @@
    {% if user.country %} -
    location_on {{ user.country }}
    +
    location_on {{ user.country }}
    {% endif %} {% if app.user != null and app.user.hasFollower(user.profile) and (hideFollowsMe is not defined or hideFollowsMe != true) %}
    @@ -28,7 +28,7 @@
    -
    +
    {% if app.user != null and app.user.id != user.id %}
    diff --git a/templates/UserManagement/Profile/myProfileData.html.twig b/templates/UserManagement/Profile/myProfileData.html.twig index 36e2b4d9a3..6b310b596d 100644 --- a/templates/UserManagement/Profile/myProfileData.html.twig +++ b/templates/UserManagement/Profile/myProfileData.html.twig @@ -28,7 +28,7 @@
    - person + person
    {{ username }}
    @@ -50,7 +50,7 @@
    - email + email
    {{ firstMail }}
    @@ -75,7 +75,7 @@
    - vpn_key + vpn_key
    ************
    @@ -93,7 +93,7 @@ class="mdc-icon-button material-icons trailing-icon">edit
    - location_on + location_on {{ country }}
    @@ -105,7 +105,7 @@
    - settings + settings {{ 'accountSettings'|trans({}, 'catroweb') }} -
    +
    diff --git a/tests/behat/features/web/notifications/notifications_sidebar_badge.feature b/tests/behat/features/web/notifications/notifications_sidebar_badge.feature index 1b2532254b..722f59566d 100644 --- a/tests/behat/features/web/notifications/notifications_sidebar_badge.feature +++ b/tests/behat/features/web/notifications/notifications_sidebar_badge.feature @@ -18,7 +18,7 @@ Feature: Sidebar should show amount of new notifications in form of a badge Given I log in as "OtherUser" When I open the menu Then the element "#sidebar-notifications" should be visible - But the element "#sidebar-notifications .badge-pill" should not be visible + But the element "#sidebar-notifications .rounded-pill" should not be visible Scenario: If user marks the notification as read then the badge should be updated Given there are "5"+ notifications for "Catrobat"