diff --git a/frontend/package-lock.json b/frontend/package-lock.json deleted file mode 100644 index 322fcae..0000000 --- a/frontend/package-lock.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "requires": true, - "lockfileVersion": 1, - "dependencies": { - "n": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/n/-/n-9.0.0.tgz", - "integrity": "sha512-OZie4DuAZASChFZnIkf5BYEYEhMe6utRTAWM+98aS6N0pRLNxcDEMwxSsy7is98zTlDICcQB2dym+u10pEOtBg==" - }, - "stable": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" - } - } -} diff --git a/frontend/wheretogo/jsconfig.json b/frontend/wheretogo/jsconfig.json index 07b0e39..d675f15 100644 --- a/frontend/wheretogo/jsconfig.json +++ b/frontend/wheretogo/jsconfig.json @@ -5,16 +5,9 @@ "baseUrl": "./", "moduleResolution": "node", "paths": { - "@/*": [ - "src/*" - ] + "@/*": ["src/*"] }, - "lib": [ - "esnext", - "dom", - "dom.iterable", - "scripthost" - ], + "lib": ["esnext", "dom", "dom.iterable", "scripthost"], "jsx": "preserve" } -} \ No newline at end of file +} diff --git a/frontend/wheretogo/package-lock.json b/frontend/wheretogo/package-lock.json index 2b7c9d3..6c4cca8 100644 --- a/frontend/wheretogo/package-lock.json +++ b/frontend/wheretogo/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "dependencies": { "axios": "^0.27.2", + "bootstrap": "^5.2.1", "core-js": "^3.8.3", "vue": "^3.2.13" }, @@ -1942,6 +1943,16 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, + "node_modules/@popperjs/core": { + "version": "2.11.6", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", + "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@sideway/address": { "version": "4.1.4", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", @@ -3648,6 +3659,24 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, + "node_modules/bootstrap": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.1.tgz", + "integrity": "sha512-UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "peerDependencies": { + "@popperjs/core": "^2.11.6" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -12801,6 +12830,12 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, + "@popperjs/core": { + "version": "2.11.6", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", + "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "peer": true + }, "@sideway/address": { "version": "4.1.4", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", @@ -14195,6 +14230,12 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, + "bootstrap": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.1.tgz", + "integrity": "sha512-UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA==", + "requires": {} + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/frontend/wheretogo/package.json b/frontend/wheretogo/package.json index 2691981..68b1b46 100644 --- a/frontend/wheretogo/package.json +++ b/frontend/wheretogo/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "axios": "^0.27.2", + "bootstrap": "^5.2.1", "core-js": "^3.8.3", "vue": "^3.2.13" }, diff --git a/frontend/wheretogo/public/favicon.ico b/frontend/wheretogo/public/favicon.ico index df36fcf..037c4b7 100644 Binary files a/frontend/wheretogo/public/favicon.ico and b/frontend/wheretogo/public/favicon.ico differ diff --git a/frontend/wheretogo/src/App.vue b/frontend/wheretogo/src/App.vue index 150ed14..b3b2949 100644 --- a/frontend/wheretogo/src/App.vue +++ b/frontend/wheretogo/src/App.vue @@ -1,24 +1,11 @@ + - diff --git a/frontend/wheretogo/src/__VLS_options.jsx b/frontend/wheretogo/src/__VLS_options.jsx deleted file mode 100644 index 74c3b9c..0000000 --- a/frontend/wheretogo/src/__VLS_options.jsx +++ /dev/null @@ -1,59 +0,0 @@ -export default (await import('vue')).defineComponent({ -name: "App", -components: { -FacilitiesList, -}, -}); -const __VLS_options = { -...({ -name: "App", -components: { -FacilitiesList, -}, -}), -}; -const __VLS_name = (await import('./__VLS_types.js')).getNameOption({ -name: "App", -components: { -FacilitiesList, -}, -} as const); -function __VLS_template() { -import * as __VLS_types from './__VLS_types.js'; import('./__VLS_types.js'); -let __VLS_ctx!: __VLS_types.PickNotAny<__VLS_Ctx, {}> & InstanceType<__VLS_types.PickNotAny {}>> & {}; -let __VLS_vmUnwrap!: typeof __VLS_options & { components: {}; }; -/* Components */ -let __VLS_otherComponents!: NonNullable & __VLS_types.GlobalComponents & typeof __VLS_vmUnwrap.components & __VLS_types.PickComponents; -let __VLS_selfComponent!: __VLS_types.SelfComponent { $slots: typeof __VLS_slots; })>; -let __VLS_components!: typeof __VLS_otherComponents & Omit; -__VLS_components['/* __VLS_.SearchTexts.Components */']; -({} as __VLS_types.GlobalAttrs)['/* __VLS_.SearchTexts.GlobalAttrs */']; -/* Style Scoped */ -type __VLS_StyleScopedClasses = {}; -let __VLS_styleScopedClasses!: __VLS_StyleScopedClasses | keyof __VLS_StyleScopedClasses | (keyof __VLS_StyleScopedClasses)[]; -/* CSS variable injection */ -/* CSS variable injection end */ -declare const FacilitiesList: __VLS_types.ConvertInvalidJsxElement< -'FacilitiesList' extends keyof typeof __VLS_components ? typeof __VLS_components['FacilitiesList'] : 'FacilitiesList' extends keyof typeof __VLS_ctx ? typeof __VLS_ctx['FacilitiesList'] : unknown>; -__VLS_components.FacilitiesList; -__VLS_ctx.FacilitiesList; -declare const __VLS_0: __VLS_types.ExtractEmit2; -/* Completion: Emits */ -// @ts-ignore -__VLS_0('/* __VLS_.SearchTexts.Completion.Emit.FacilitiesList */'); -/* Completion: Props */ -// @ts-ignore -(); -{ -
; - -{ -; -} -} -if (typeof __VLS_styleScopedClasses === 'object' && !Array.isArray(__VLS_styleScopedClasses)) { -} -declare var __VLS_slots: {}; -return __VLS_slots; -} -let __VLS_component!: typeof import('./App.vue')['default']; diff --git a/frontend/wheretogo/src/assets/logo.png b/frontend/wheretogo/src/assets/logo.png index f3d2503..618ca04 100644 Binary files a/frontend/wheretogo/src/assets/logo.png and b/frontend/wheretogo/src/assets/logo.png differ diff --git a/frontend/wheretogo/src/components/FacilitiesList.vue b/frontend/wheretogo/src/components/FacilitiesList.vue deleted file mode 100644 index c5bcbda..0000000 --- a/frontend/wheretogo/src/components/FacilitiesList.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/wheretogo/src/components/NavigationBar.vue b/frontend/wheretogo/src/components/NavigationBar.vue new file mode 100644 index 0000000..3231cb7 --- /dev/null +++ b/frontend/wheretogo/src/components/NavigationBar.vue @@ -0,0 +1,54 @@ + + + diff --git a/frontend/wheretogo/src/main.js b/frontend/wheretogo/src/main.js index 3af6475..7be07d1 100644 --- a/frontend/wheretogo/src/main.js +++ b/frontend/wheretogo/src/main.js @@ -1,9 +1,15 @@ -import { createApp } from 'vue' -import App from './App.vue' -import axios from 'axios' +import { createApp } from "vue"; +import App from "./App.vue"; +import axios from "axios"; -const app = createApp(App) +import "bootstrap/dist/css/bootstrap.min.css"; -app.config.globalProperties.axios=axios +import NavigationBar from "./components/NavigationBar.vue"; -app.mount('#app') \ No newline at end of file +const app = createApp(App); + +app.config.globalProperties.axios = axios; + +app.component("NavigationBar", NavigationBar); + +app.mount("#app"); diff --git a/frontend/wheretogo/vue.config.js b/frontend/wheretogo/vue.config.js index 534471a..910e297 100644 --- a/frontend/wheretogo/vue.config.js +++ b/frontend/wheretogo/vue.config.js @@ -1,4 +1,4 @@ -import { defineConfig } from '@vue/cli-service' -export default defineConfig({ +const { defineConfig } = require('@vue/cli-service') +module.exports = defineConfig({ transpileDependencies: true })