From 26d31191afd48ce45e10d40577d74cb36c5e9f6c Mon Sep 17 00:00:00 2001 From: kostis30fyllou Date: Mon, 19 Jul 2021 18:36:00 +0300 Subject: [PATCH] [Monitor Dashboard]: Remove dashboard-theme folder. Remove cleanlibrary. Add gitignore. Add gitmodules --- .gitignore | 4 + .gitmodules | 9 + clean-library.sh | 3 - package.json | 1 - src/app/openaireLibrary | 1 + src/assets/common-assets | 1 + src/assets/dashboard-theme | 1 + src/assets/dashboard-theme/button.css | 23 -- src/assets/dashboard-theme/card.css | 47 ---- src/assets/dashboard-theme/dropdowns.css | 32 --- src/assets/dashboard-theme/input.css | 14 -- src/assets/dashboard-theme/main.css | 10 - src/assets/dashboard-theme/notification.css | 3 - src/assets/dashboard-theme/sortable.css | 20 -- src/assets/dashboard-theme/structure.css | 262 -------------------- src/assets/dashboard-theme/tabs-pills.css | 86 ------- src/assets/dashboard-theme/text.css | 64 ----- src/assets/dashboard-theme/variables.css | 9 - 18 files changed, 16 insertions(+), 574 deletions(-) create mode 100644 .gitignore create mode 100644 .gitmodules delete mode 100644 clean-library.sh create mode 160000 src/app/openaireLibrary create mode 160000 src/assets/common-assets create mode 160000 src/assets/dashboard-theme delete mode 100644 src/assets/dashboard-theme/button.css delete mode 100644 src/assets/dashboard-theme/card.css delete mode 100644 src/assets/dashboard-theme/dropdowns.css delete mode 100644 src/assets/dashboard-theme/input.css delete mode 100644 src/assets/dashboard-theme/main.css delete mode 100644 src/assets/dashboard-theme/notification.css delete mode 100644 src/assets/dashboard-theme/sortable.css delete mode 100644 src/assets/dashboard-theme/structure.css delete mode 100644 src/assets/dashboard-theme/tabs-pills.css delete mode 100644 src/assets/dashboard-theme/text.css delete mode 100644 src/assets/dashboard-theme/variables.css diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..164614e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +node_modules/ +dist/ +.idea/ +package-lock.json diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0dde49f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "src/app/openaireLibrary"] + path = src/app/openaireLibrary + url = gitea@code-repo.d4science.org:MaDgIK/openaire-library.git +[submodule "src/assets/common-assets"] + path = src/assets/common-assets + url = gitea@code-repo.d4science.org:MaDgIK/openaire-assets.git +[submodule "src/assets/dashboard-theme"] + path = src/assets/dashboard-theme + url = gitea@code-repo.d4science.org:MaDgIK/dashboard-theme.git diff --git a/clean-library.sh b/clean-library.sh deleted file mode 100644 index 716cb96..0000000 --- a/clean-library.sh +++ /dev/null @@ -1,3 +0,0 @@ -cd src/app/openaireLibrary -cd ../../../ -echo "Done" diff --git a/package.json b/package.json index 89ef34f..a8cb75a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "build:ssr-beta": "npm run build-beta && ng run monitor-dashboard:server:beta", "build:ssr-prod": "npm run build-prod && ng run monitor-dashboard:server:production", "prerender": "ng run monitor-dashboard:prerender", - "postinstall": "chmod +x clean-library.sh && ./clean-library.sh", "after-build-clean": "rm -rf dist/monitor-dashboard/browser/assets/common-assets/.svn/ src/app/openaireLibrary/.svn node_modules src/assets/common-assets/.svn/" }, "private": true, diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary new file mode 160000 index 0000000..410643a --- /dev/null +++ b/src/app/openaireLibrary @@ -0,0 +1 @@ +Subproject commit 410643a682b184f96982bb228657a16769c622ff diff --git a/src/assets/common-assets b/src/assets/common-assets new file mode 160000 index 0000000..2f572df --- /dev/null +++ b/src/assets/common-assets @@ -0,0 +1 @@ +Subproject commit 2f572df5783cb32cc84969b75939e45ffce3b424 diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme new file mode 160000 index 0000000..3e966ab --- /dev/null +++ b/src/assets/dashboard-theme @@ -0,0 +1 @@ +Subproject commit 3e966ab23829756c256c266a2201042785f83963 diff --git a/src/assets/dashboard-theme/button.css b/src/assets/dashboard-theme/button.css deleted file mode 100644 index 9b5303c..0000000 --- a/src/assets/dashboard-theme/button.css +++ /dev/null @@ -1,23 +0,0 @@ -.uk-button { - font-weight: 700; -} - -.uk-button:not(.uk-button-link) { - text-transform: none; - font-size: 13px; -} - -.uk-button.uk-button-default:enabled { - border-color: #B5B5B5; - color: currentColor; - background-color: #FFFFFF; -} - -.uk-button.uk-button-default:hover:enabled { - background-color: #FFFFFF; - border-color: currentColor; -} - -div[search-input] .search { - font-size: var(--xs-font-size) !important; -} diff --git a/src/assets/dashboard-theme/card.css b/src/assets/dashboard-theme/card.css deleted file mode 100644 index 014e29e..0000000 --- a/src/assets/dashboard-theme/card.css +++ /dev/null @@ -1,47 +0,0 @@ -.uk-card.uk-card-default { - color: currentColor !important; - background-color: #FFFFFF; - box-shadow: 0 3px 6px #0000001A; -} - -.uk-card-body { - padding: 19px 25px; -} - -.uk-card-body .uk-card-title { - font-size: var(--font-size); - font-family: "Roboto", sans-serif; - font-weight: 700; - color: var(--muted-color) !important; -} - -.uk-card-body a.uk-card-title:hover, .uk-card-body a.uk-card-title:active, .uk-card-body a.uk-card-title:focus { - color: var(--secondary-color) !important; -} - -.uk-card .uk-button.action { - color: var(--muted-color); -} - -.uk-card-header { - background-color: #F2F2F2; - color: rgba(var(--text-color-rgb), 0.8); - box-shadow: 0 3px 6px #00000029; - padding: 10px 20px; - font-family: "Roboto", sans-serif; - z-index: 1; - position: relative; -} - -.uk-card-header .title { - color: rgba(var(--text-color-rgb), 0.5); -} - -.uk-card-header th { - color: #7A7A7A; - font-weight: bold; -} - -.uk-card .title { - color: rgb(var(--text-color-rgb), 0.5) !important; -} diff --git a/src/assets/dashboard-theme/dropdowns.css b/src/assets/dashboard-theme/dropdowns.css deleted file mode 100644 index 4ce857a..0000000 --- a/src/assets/dashboard-theme/dropdowns.css +++ /dev/null @@ -1,32 +0,0 @@ -.uk-dropdown { - background-color: white; - min-width: 150px; - padding: 10px 0; - text-align: left; -} - -.sidebar_main_swipe.sidebar_mini #sidebar_content .uk-dropdown { - min-width: auto; -} - -.uk-dropdown > ul { - padding: 0 !important; -} - - -.uk-dropdown-nav > li > a, .uk-dropdown-nav > li:hover > a { - padding: 3px 10px; - color: var(--text-color); - font-weight: 400 !important; - font-size: var(--xs-font-size); - font-family: "Open Sans", sans-serif; -} - -.uk-dropdown-nav > li:hover { - background-color: rgba(var(--secondary-color-rgb), 0.3); -} - -.uk-dropdown .uk-nav-divider { - margin: 3px 10px; - border-color: var(--secondary-color); -} diff --git a/src/assets/dashboard-theme/input.css b/src/assets/dashboard-theme/input.css deleted file mode 100644 index 0820ed2..0000000 --- a/src/assets/dashboard-theme/input.css +++ /dev/null @@ -1,14 +0,0 @@ -.uk-form-label, .input-box .mat-select { - font-size: var(--font-size); -} -/* Chrome, Safari, Edge, Opera */ -input::-webkit-outer-spin-button, -input::-webkit-inner-spin-button { - -webkit-appearance: none; - margin: 0; -} - -/* Firefox */ -input[type=number] { - -moz-appearance: textfield; -} diff --git a/src/assets/dashboard-theme/main.css b/src/assets/dashboard-theme/main.css deleted file mode 100644 index 5f6b6d3..0000000 --- a/src/assets/dashboard-theme/main.css +++ /dev/null @@ -1,10 +0,0 @@ -@import "variables.css"; -@import "text.css"; -@import "structure.css"; -@import "input.css"; -@import "dropdowns.css"; -@import "tabs-pills.css"; -@import "card.css"; -@import "button.css"; -@import "sortable.css"; -@import "notification.css"; diff --git a/src/assets/dashboard-theme/notification.css b/src/assets/dashboard-theme/notification.css deleted file mode 100644 index 608ac83..0000000 --- a/src/assets/dashboard-theme/notification.css +++ /dev/null @@ -1,3 +0,0 @@ -.uk-notification-message { - font-size: var(--small-font-size); -} diff --git a/src/assets/dashboard-theme/sortable.css b/src/assets/dashboard-theme/sortable.css deleted file mode 100644 index 30aea09..0000000 --- a/src/assets/dashboard-theme/sortable.css +++ /dev/null @@ -1,20 +0,0 @@ -.dashboard .uk-sortable > * { - cursor: move; -} - -.dashboard .uk-sortable-drag .uk-card.uk-card-hover { - -webkit-box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); - box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); -} - -.dashboard .uk-sortable-drag { - overflow: unset !important; -} - -.uk-drag .dashboard .disable-sortable { - pointer-events: none; -} - -.dashboard .uk-sortable .uk-sortable-nodrag { - cursor: default; -} diff --git a/src/assets/dashboard-theme/structure.css b/src/assets/dashboard-theme/structure.css deleted file mode 100644 index 6db00f0..0000000 --- a/src/assets/dashboard-theme/structure.css +++ /dev/null @@ -1,262 +0,0 @@ -:root { - --sidebar-width: 230px; - --sidebar-mini-width: 130px; - --sidebar-font-size: 14px; - --header-height: 100px; - --background-color: #F9FBFC; -} - -#sidebar_main .badge { - height: 59px; - position: absolute; - top: 0; - left: -5px; - z-index: 1; - background-color: transparent; - display: block !important; -} - -#sidebar_main .sidebar_main_header .logo { - margin-left: 35px; - margin-top: 25px; - margin-right: 10px; - height: 50px; - position: relative; -} - -.sidebar_mini #sidebar_main .sidebar_main_header .logo { - margin-right: 15px; - margin-left: 15px; -} - -#sidebar_main .sidebar_main_header .logo > img { - height: 100%; -} - -#sidebar_main .sidebar_main_header .logo > .logo-label { - font-size: var(--xs-font-size); - color: var(--text-color); -} - -#sidebar_main #sidebar_content { - width: var(--sidebar-width); - position: fixed; - height: 100%; - top: 0; - bottom: 0; - left: 0; - z-index: 981; - background: #fff; - transition: 0.5s; - -webkit-transition: 0.5s; - -moz-transition: 0.5s; - -ms-transition: 0.5s; - -o-transition: 0.5s; - transition-property: width; -} - -.sidebar_main_swipe.sidebar_mini #sidebar_switcher_toggle { - left: var(--sidebar-mini-width); -} - -.sidebar_main_swipe #sidebar_switcher_toggle { - left: var(--sidebar-width); -} - -#sidebar_main .menu_section { - min-height: 30vh; - padding: 0 10px; -} - -#sidebar_main .menu_section ul:not(.uk-dropdown-nav) > li, #sidebar_main .special_section ul:not(.uk-dropdown-nav) > li { - padding: 5px 0; -} - -#sidebar_main .menu_section ul:not(.uk-dropdown-nav) > li > *, -#sidebar_main .special_section ul:not(.uk-dropdown-nav) > li > a { - font-size: var(--sidebar-font-size); -} - -#sidebar_main .menu_section ul:not(.uk-dropdown-nav) > li > a, -#sidebar_main .special_section ul:not(.uk-dropdown-nav) > li > a { - display: block; - color: rgba(var(--text-color-rgb), 0.8); -} - -#sidebar_main .menu_section ul:not(.uk-dropdown-nav) > li:hover > a, #sidebar_main .special_section ul:not(.uk-dropdown-nav) > li:hover > a { - color: var(--secondary-color); -} - -#sidebar_main .menu_section ul:not(.uk-dropdown-nav) li.uk-active > a, #sidebar_main .special_section ul:not(.uk-dropdown-nav) > li.uk-active > a { - color: var(--primary-color); - font-weight: 700; -} - -#sidebar_switcher_toggle { - top: 50%; - color: var(--secondary-color); - transform: translateY(-50%); - position: fixed; - background: #ffffff; - border: 1px solid var(--text-color); - border-left: 0; - cursor: pointer; - padding: 0 4px; - width: 10px; - height: 66px; - z-index: 981; - -webkit-transition: 0.5s; - -moz-transition: 0.5s; - -ms-transition: 0.5s; - -o-transition: 0.5s; - transition-property: left; -} - -.sidebar_main_swipe #page_content, -.sidebar_main_swipe openaire-user > user > *, -.sidebar_main_swipe openaire-error > * { - padding-left: var(--sidebar-width); - padding-top: var(--header-height); - transition: 0.5s; - -webkit-transition: 0.5s; - -moz-transition: 0.5s; - -ms-transition: 0.5s; - -o-transition: 0.5s; -} - -.sidebar_main_swipe #page_content .message { - padding-left: calc(var(--sidebar-width) - 100px); - padding-right: 20px; - text-align: center; - transition: 0.5s; - -webkit-transition: 0.5s; - -moz-transition: 0.5s; - -ms-transition: 0.5s; - -o-transition: 0.5s; -} - -.sidebar_main_swipe bottom > * { - padding-left: var(--sidebar-width); - transition: 0.5s; - -webkit-transition: 0.5s; - -moz-transition: 0.5s; - -ms-transition: 0.5s; - -o-transition: 0.5s; -} - -/*Sidebar close*/ -.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #page_content, -.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) openaire-user > user > *, -.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) openaire-error > *, -.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) bottom > *{ - padding-left: 0; -} - -.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #sidebar_main #sidebar_content { - display: none; - width: 0; -} - -/*Sidebar mini*/ -.sidebar_main_swipe.sidebar_mini #page_content, -.sidebar_main_swipe.sidebar_mini openaire-user > user > *, -.sidebar_main_swipe.sidebar_mini openaire-error > *, -.sidebar_main_swipe.sidebar_mini bottom > * { - padding-left: var(--sidebar-mini-width); - transition: 0.5s; - -webkit-transition: 0.5s; - -moz-transition: 0.5s; - -ms-transition: 0.5s; - -o-transition: 0.5s; -} - -.sidebar_mini #sidebar_main #sidebar_content { - width: var(--sidebar-mini-width); -} - -#sidebar_main #sidebar_content { - border-right: 1px solid var(--text-color); -} - -#page_content { - min-height: calc(100vh - var(--header-height)); - background-color: var(--background-color); - position: relative; -} - -#page_content .message { - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - position: absolute; -} - -#page_content_header { - position: fixed; - background: var(--background-color); - top: var(--header-height); - left: var(--sidebar-width); - right: 0; - z-index: 980; - padding: 0 90px; - transition-property: width; - transition: 0.5s; - -webkit-transition: 0.5s; - -moz-transition: 0.5s; - -ms-transition: 0.5s; - -o-transition: 0.5s; -} - -.sidebar_mini #page_content_header { - left: var(--sidebar-mini-width); -} - -#page_content_inner { - padding: 50px 90px 90px; -} - -@media only screen and (max-width: 639px){ - :root { - --sidebar-mini-width: 100px; - } - - #page_content_inner { - padding: 50px 45px 90px; - } - - #page_content_header { - padding: 0 45px; - } - - .sidebar_mini #page_content_header { - width: calc(100vw - var(--sidebar-mini-width) - 90px); - } - - .sidebar_main_swipe #page_content .message { - padding-left: var(--sidebar-mini-width); - padding-right: 0; - } -} - -.uk-navbar-center:not(:only-child) { - max-width: 50%; - text-align: center; - padding-left: calc(var(--sidebar-mini-width)/2); -} - -navbar > *, openaire-error > *, openaire-user> user > *, .fs-modal { - background-color: var(--background-color) !important; -} - -.tm-header .uk-navbar-container { - background-color: var(--background-color) !important; - box-shadow: none !important; -} - -#notifications .uk-offcanvas-bar { - top: var(--header-height) !important; -} - -#notifications-switcher #notifications-count { - background-color: var(--secondary-color); -} diff --git a/src/assets/dashboard-theme/tabs-pills.css b/src/assets/dashboard-theme/tabs-pills.css deleted file mode 100644 index 172be38..0000000 --- a/src/assets/dashboard-theme/tabs-pills.css +++ /dev/null @@ -1,86 +0,0 @@ -@media only screen and (max-width: 959px) { - .uk-subnav-pill, .uk-tab { - flex-wrap: nowrap; - overflow-x: auto; - } -} - -.uk-subnav-pill > * > a, .uk-subnav-pill > * > span > a { - color: currentColor !important; - opacity: 0.8; - border-radius: 40px !important; - border: 1px solid currentColor !important; - padding: 6px 18px !important; - line-height: 18px; -} - -.uk-subnav-pill > * > :first-child { - text-transform: none; - font-size: var(--sidebar-font-size); - color: var(--text-color); -} - -.uk-subnav-pill > li { - margin-bottom: 10px; -} - -.uk-subnav-pill > li > a:hover, .uk-subnav-pill > li > span > a:hover { - border-color: var(--secondary-color); - color: var(--secondary-color) !important; - background-color: var(--contrast-color); - opacity: 1; -} - -.uk-subnav-pill > li.uk-active > a, .uk-subnav-pill > li.uk-active > span > a { - opacity: 1; - border-color: var(--primary-color) !important; - color: var(--contrast-color) !important; - background-color: var(--primary-color); - font-weight: bold; -} - -.uk-tab > li > a { - color: rgb(var(--text-color-rgb), 0.8) !important; - font-family: "Open Sans", sans-serif !important; - text-transform: capitalize; -} - -.uk-tab > li > * { - font-size: var(--small-font-size); -} - -.uk-tab > li:hover > a { - color: var(--secondary-color) !important; -} - -.uk-tab > li.uk-active > a { - color: var(--primary-color) !important; - font-weight: 700; -} - -.customTabs.uk-tab > li > a, .customTabs.uk-tab > li.uk-active > a,.customTabs.uk-tab > li > a:focus, .customTabs.uk-tab > li > a:hover { - border: 0 transparent !important; -} - -.uk-tab.customTabs::before { - border-bottom: none !important; -} - -.customTabs.uk-tab.admin > li.uk-active > a .title { - border-bottom: 3px solid var(--portal-main-color); - margin-left: 3px; -} - -.uk-subnav-pill.subCategoriesTabs.admin > li.uk-active > a{ - border: 1px solid var(--primary-color); - background-color: var(--primary-color); -} - -.uk-subnav[visibility=true], .uk-tab[visibility=true] { - margin-left: -50px; -} - -.uk-subnav[visibility=true] > li:not(:first-child):not(:last-child) > :first-child, -.uk-tab[visibility=true] > li:not(:first-child):not(:last-child) { - padding-left: 0; -} diff --git a/src/assets/dashboard-theme/text.css b/src/assets/dashboard-theme/text.css deleted file mode 100644 index df741c7..0000000 --- a/src/assets/dashboard-theme/text.css +++ /dev/null @@ -1,64 +0,0 @@ -:root { - --font-size: 16px; - --text-color: #1A1A1A; - --text-color-rgb: 26,26,26; - --muted-color: #4D4D4D; - --xs-font-size: 12px; - --small-font-size: 14px; - --large-font-size: 18px; -} - -body { - color: var(--text-color); - font-size: var(--font-size); - font-family: "Open Sans", sans-serif; -} - -.landing, new-search-page, search-all { - font-size: var(--small-font-size); -} - -.landing .uk-text-small, new-search-page .uk-text-small, search-all .uk-text-small, .mat-chip .uk-text-small { - font-size: var(--xs-font-size); -} - -.color { - color: var(--text-color) !important; -} - -.uk-text-small, .uk-text-small .mat-option { - font-size: var(--small-font-size); -} - -.uk-text-large { - font-size: var(--large-font-size); -} - -.uk-text-muted { - color: var(--muted-color) !important; -} - -.uk-logo { - font-family: "Roboto", sans-serif; - font-size: 24px; - color: var(--text-color); -} - -@media only screen and (max-width: 639px) { - :root { - --font-size: 14px; - --small-font-size: 12px; - } - - .uk-logo { - font-size: 18px; - } -} - -#notifications .uk-offcanvas-bar .uk-text-primary { - color: var(--theme-primary-color) !important; -} - -#notifications .uk-offcanvas-bar .uk-text-secondary { - color: var(--theme-secondary-color) !important; -} diff --git a/src/assets/dashboard-theme/variables.css b/src/assets/dashboard-theme/variables.css deleted file mode 100644 index 3fe0430..0000000 --- a/src/assets/dashboard-theme/variables.css +++ /dev/null @@ -1,9 +0,0 @@ -:root { - --portal-main-color: var(--monitor-portal-color); - --portal-main-contrast: white; - --portal-dark-color: var(--monitor-portal-lower-tone); - --primary-color: var(--theme-primary-color); - --secondary-color: var(--theme-secondary-color); - --primary-color-rgb: var(--theme-primary-color-rgb); - --secondary-color-rgb: var(--theme-secondary-color-rgb); -}