diff --git a/backend/src/app.js b/backend/src/app.js index 2c442a64..06c32805 100644 --- a/backend/src/app.js +++ b/backend/src/app.js @@ -13,7 +13,7 @@ const districtRouter = require("./routes/district-router"); const downloadRouter = require("./routes/download-router"); const authorityRouter = require("./routes/authority-router"); const offshoreRouter = require("./routes/offshore-router"); -const schoolRouter = require("./routes/school-router"); +//const schoolRouter = require("./routes/school-router"); const app = express(); const publicPath = path.join(__dirname, "public"); @@ -77,7 +77,7 @@ apiRouter.use("/v1/institute", instituteRouter); apiRouter.use("/v1/district", districtRouter); apiRouter.use("/v1/authority", authorityRouter); apiRouter.use("/v1/offshore", offshoreRouter); -apiRouter.use("/v1/school", schoolRouter); +//apiRouter.use("/v1/school", schoolRouter); //Handle 500 error app.use((err, _req, res, next) => { diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css index 350611f4..faca790a 100644 --- a/frontend/src/assets/main.css +++ b/frontend/src/assets/main.css @@ -45,6 +45,9 @@ button.link-btn, .link-btn .v-btn__content { max-width: 1280px; padding: 0 2rem; } +.v-btn-align-left { + justify-content: normal !important; +} @media (hover: hover) { a:hover { background-color: hsla(160, 100%, 37%, 0.2); diff --git a/frontend/src/components/AuthoritySelect.vue b/frontend/src/components/AuthoritySelect.vue index f51ef6e0..923c9722 100644 --- a/frontend/src/components/AuthoritySelect.vue +++ b/frontend/src/components/AuthoritySelect.vue @@ -56,16 +56,16 @@ function downloadAuthorityContacts() { All Independent Schools - Contacts for All Authorities - Mailing for All Authorities diff --git a/frontend/src/components/ContactTypeModel.vue b/frontend/src/components/ContactTypeModel.vue index d3288ed1..4aa2b03d 100644 --- a/frontend/src/components/ContactTypeModel.vue +++ b/frontend/src/components/ContactTypeModel.vue @@ -96,16 +96,18 @@ const searchContact = async () => { block variant="outlined" color="bcGovBlue" - class="text-none text-subtitle-1 my-1" + class="v-btn-align-left text-none text-subtitle-1 my-1" v-bind="props" > View Contacts by Type + Contacts by Type + - Mailing for All Districts Contacts for All Districts +import { useAppStore } from '@/stores/app' +import { ref } from 'vue' + +const appStore = useAppStore() +// used for open and close modal +const dialog = ref(false) +// varibles used for search + + diff --git a/frontend/src/components/OffshoreSelect.vue b/frontend/src/components/OffshoreSelect.vue index f9e3a32f..52493de8 100644 --- a/frontend/src/components/OffshoreSelect.vue +++ b/frontend/src/components/OffshoreSelect.vue @@ -35,16 +35,16 @@ function downloadOffshoreSchoolReps() { View Offshore Schools - Offshore School Info - Offshore School Representatives diff --git a/frontend/src/components/SchoolSelect.vue b/frontend/src/components/SchoolSelect.vue index 57f4f3d6..e78ccb41 100644 --- a/frontend/src/components/SchoolSelect.vue +++ b/frontend/src/components/SchoolSelect.vue @@ -3,6 +3,7 @@ import { ref } from 'vue' import { useAppStore } from '@/stores/app' import router from '@/router' import { useSanitizeURL } from '@/composables/string' +import DownloadSchoolsModal from '@/components/DownloadSchoolsModal.vue' // Type Imports import type { ListSchool } from '@/types/types' @@ -89,17 +90,10 @@ function downloadAllSchoolsMailing() { - - - All Schools Info + - Mailing for All Schools