diff --git a/README.md b/README.md index 8f2f4b28..56a95917 100644 --- a/README.md +++ b/README.md @@ -53,9 +53,11 @@ npm install | :open_file_folder: app | Frontend Application | [Link](https://github.com/Duke-MatSci/materialsmine/tree/main/app) | | :open_file_folder: nginx | A proxy server | [Link](https://github.com/Duke-MatSci/materialsmine/tree/main/router) | | :open_file_folder: restfulservice | Backend Server Application | [Link](https://github.com/Duke-MatSci/materialsmine/tree/main/resfulservice) | +| :open_file_folder: services | Managed Services | WIP | | :open_file_folder: whyis | Whyis Application | [Link](https://github.com/Duke-MatSci/materialsmine/tree/main/whyis) | ## :high_brightness: Access services via: -- Frontend: http://localhost:80 -- Resful API: http://localhost:80/api -- Whyis: http://localhost:80/whyis +- Frontend: http://localhost +- Resful API: http://localhost/api +- Managed Services: http://localhost:5050 +- Whyis: http://localhost:8000 diff --git a/app/src/App.vue b/app/src/App.vue index ee6d1cb7..9662a401 100644 --- a/app/src/App.vue +++ b/app/src/App.vue @@ -10,6 +10,9 @@ import Snackbar from '@/components/Snackbar.vue' export default { components: { Snackbar + }, + async created () { + await this.$store.dispatch('auth/tryLogin') } } diff --git a/app/src/assets/css/modules/_pages.scss b/app/src/assets/css/modules/_pages.scss index 24f50300..00bd4d48 100644 --- a/app/src/assets/css/modules/_pages.scss +++ b/app/src/assets/css/modules/_pages.scss @@ -530,3 +530,9 @@ } } + +.spreadsheet_list_form { + .md-chip.md-theme-default .md-icon.md-icon-image svg{ + fill: $primary; + } +} diff --git a/app/src/assets/css/modules/_utility.scss b/app/src/assets/css/modules/_utility.scss index cea63487..7d8496f9 100644 --- a/app/src/assets/css/modules/_utility.scss +++ b/app/src/assets/css/modules/_utility.scss @@ -67,7 +67,7 @@ &--padding { &-zero { - padding: 0; + padding: 0 !important; } &-zero-mobile { @include respond(phone) { @@ -171,20 +171,33 @@ &--color{ &-grey { - color: $primary-grey; + color: $primary-grey !important; } &-grey-sec { - color: $secondary-grey; + color: $secondary-grey !important; } &-primary { - color: $primary; + color: $primary !important; } &-secondary { - color: $secondary; + color: $secondary !important; } &-black { color: $primary-black; } + &-tertiary { + color: $tertiary !important; + & > *, + & .md-button-content { + color: $tertiary !important; + } + } + &-success { + color: green !important; + } + &-error { + color: $error !important; + } } &--font-emph { &-xl { @@ -201,7 +214,7 @@ } &-smm { font-size: 1.3rem; - font-size: 500; + font-weight: 500; } } @@ -402,7 +415,10 @@ color: $primary !important; &_white { - color: $primary-white !important + color: $primary-white !important; + & .md-button-content { + color: $primary-white !important; + } } } &_gridbg { diff --git a/app/src/components/Drawer.vue b/app/src/components/Drawer.vue index fe222620..66ab64b3 100644 --- a/app/src/components/Drawer.vue +++ b/app/src/components/Drawer.vue @@ -47,13 +47,16 @@ - + upload Curate - + + + Upload a Spreadsheet + Fill a Form @@ -61,7 +64,10 @@ Submit SDD - Create new chart + Create New Chart + + + Add Xlsx List Entry @@ -81,15 +87,18 @@ Easy CSV Plotter + + Sparql Query Tool + logout Log out - + login - Login + Login @@ -103,6 +112,11 @@ export default { isAuth: 'auth/isAuthenticated', name: 'auth/displayName' }) + }, + methods: { + login () { + window.location.href = '/secure' + } } } diff --git a/app/src/components/accordion.vue b/app/src/components/accordion.vue index fe0795c8..e85a6484 100644 --- a/app/src/components/accordion.vue +++ b/app/src/components/accordion.vue @@ -1,7 +1,7 @@