Merge pull request #970 from CSCfi/bugfix/misconfigured-components

Fix missing footer and language-selector component setup

Author: csc-felipe

CHANGELOG.md

@@ -56,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix missing footer and language-selector component setup
 - Use oidc login Keystone provider for automatically forwarded SSO in oidc return
 - (GH #851) Kill upload sessions upon finishing uploads to allow reuploading same files in all cases
 - (GH #884) Fixed multiple bugs

swift_browser_ui_frontend/src/entries/badrequest.js

@@ -10,6 +10,7 @@ import cModel from "@/common/csc-ui.js";
 import { applyPolyfills, defineCustomElements } from "csc-ui/dist/loader";
 import { vControlV2 } from "csc-ui-vue-directive";
 
+import CFooter from "@/components/CFooter.vue";
 import LanguageSelector from "@/components/CLanguageSelector.vue";
 
 // Import project css
@@ -36,6 +37,7 @@ new Vue({
   name: "BadRequest",
   i18n,
   components: {
+    CFooter,
     LanguageSelector,
   },
   data: {

swift_browser_ui_frontend/src/entries/forbid.js

@@ -10,6 +10,7 @@ import cModel from "@/common/csc-ui.js";
 import { applyPolyfills, defineCustomElements } from "csc-ui/dist/loader";
 import { vControlV2 } from "csc-ui-vue-directive";
 
+import CFooter from "@/components/CFooter.vue";
 import LanguageSelector from "@/components/CLanguageSelector.vue";
 
 // Import project css
@@ -36,6 +37,7 @@ new Vue({
   name: "ForbiddenPage",
   i18n,
   components: {
+    CFooter,
     LanguageSelector,
   },
   data: {

swift_browser_ui_frontend/src/entries/index.js

@@ -10,6 +10,7 @@ import cModel from "@/common/csc-ui.js";
 import { applyPolyfills, defineCustomElements } from "csc-ui/dist/loader";
 import { vControlV2 } from "csc-ui-vue-directive";
 
+import CFooter from "@/components/CFooter.vue";
 import LanguageSelector from "@/components/CLanguageSelector.vue";
 
 // Import project css
@@ -36,6 +37,7 @@ new Vue({
   name: "IndexPage",
   i18n,
   components: {
+    CFooter,
     LanguageSelector,
   },
   data: {

swift_browser_ui_frontend/src/entries/index_oidc.js

@@ -9,8 +9,12 @@ import checkIDB from "@/common/idb_support";
 import cModel from "@/common/csc-ui.js";
 
 import { applyPolyfills, defineCustomElements } from "csc-ui/dist/loader";
+import { vControlV2 } from "csc-ui-vue-directive";
 import VueI18n from "vue-i18n";
 
+import CFooter from "@/components/CFooter.vue";
+import LanguageSelector from "@/components/CLanguageSelector.vue";
+
 // Import project css
 import "@/css/prod.scss";
 
@@ -22,7 +26,8 @@ applyPolyfills().then(() => {
 });
 
 Vue.use(VueI18n);
-
+Vue.directive("control", vControlV2);
+Vue.directive("csc-model", cModel);
 
 const i18n = new VueI18n({
   locale: getLangCookie(),
@@ -31,6 +36,10 @@ const i18n = new VueI18n({
 
 new Vue ({
   i18n,
+  components: {
+    CFooter,
+    LanguageSelector,
+  },
   data: {
     loading: false,
     idb: true,
@@ -57,6 +66,3 @@ new Vue ({
   },
   ...App,
 }).$mount("#app");
-
-
-Vue.directive("csc-model", cModel);

swift_browser_ui_frontend/src/entries/loginpassword.js

@@ -5,6 +5,7 @@ import VueI18n from "vue-i18n";
 import getLangCookie from "@/common/conv";
 import translations from "@/common/lang";
 
+import CFooter from "@/components/CFooter.vue";
 import cModel from "@/common/csc-ui.js";
 
 import { applyPolyfills, defineCustomElements } from "csc-ui/dist/loader";
@@ -36,6 +37,7 @@ new Vue({
   name: "LoginPassword",
   i18n,
   components: {
+    CFooter,
     LanguageSelector,
   },
   data: {

swift_browser_ui_frontend/src/entries/notfound.js

@@ -10,6 +10,7 @@ import cModel from "@/common/csc-ui.js";
 import { applyPolyfills, defineCustomElements } from "csc-ui/dist/loader";
 import { vControlV2 } from "csc-ui-vue-directive";
 
+import CFooter from "@/components/CFooter.vue";
 import LanguageSelector from "@/components/CLanguageSelector.vue";
 
 // Import project css
@@ -36,6 +37,7 @@ new Vue({
   name: "NotfoundPage",
   i18n,
   components: {
+    CFooter,
     LanguageSelector,
   },
   data: {

swift_browser_ui_frontend/src/entries/uidown.js

@@ -10,6 +10,7 @@ import cModel from "@/common/csc-ui.js";
 import { applyPolyfills, defineCustomElements } from "csc-ui/dist/loader";
 import { vControlV2 } from "csc-ui-vue-directive";
 
+import CFooter from "@/components/CFooter.vue";
 import LanguageSelector from "@/components/CLanguageSelector.vue";
 
 // Import project css
@@ -36,6 +37,7 @@ new Vue({
   name: "ServiceUnavailable",
   i18n,
   components: {
+    CFooter,
     LanguageSelector,
   },
   data: {

swift_browser_ui_frontend/src/entries/unauth.js

@@ -9,6 +9,7 @@ import cModel from "@/common/csc-ui.js";
 
 import { applyPolyfills, defineCustomElements } from "csc-ui/dist/loader";
 
+import CFooter from "@/components/CFooter.vue";
 import LanguageSelector from "@/components/CLanguageSelector.vue";
 import { vControlV2 } from "csc-ui-vue-directive";
 
@@ -36,6 +37,7 @@ new Vue({
   name: "UnauthorizedPage",
   i18n,
   components: {
+    CFooter,
     LanguageSelector,
   },
   data: {

swift_browser_ui_frontend/src/pages/IndexOIDCPage.vue

@@ -4,6 +4,7 @@
       <c-csc-logo />
       {{ $t('message.program_name') }}
       <c-spacer />
+      <LanguageSelector />
     </c-toolbar>
     <c-row>
       <c-flex>
@@ -39,6 +40,7 @@
         </c-container>
       </c-flex>
     </c-row>
+    <CFooter />
   </c-main>
 </template>