[F] Remove problematic App.instance usage and pass in app
This commit is contained in:
@@ -3,7 +3,7 @@ import Course from '@/logic/course';
|
|||||||
import Constants from '@/constants';
|
import Constants from '@/constants';
|
||||||
import LoginUser from '@/logic/login-user';
|
import LoginUser from '@/logic/login-user';
|
||||||
import NavController from '@/logic/nav-controller';
|
import NavController from '@/logic/nav-controller';
|
||||||
import App from '@/components/app/app';
|
import App from '@/components/app/app.ts';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This component is the top navigation bar
|
* This component is the top navigation bar
|
||||||
@@ -11,6 +11,7 @@ import App from '@/components/app/app';
|
|||||||
@Component
|
@Component
|
||||||
export default class Navigation extends Vue
|
export default class Navigation extends Vue
|
||||||
{
|
{
|
||||||
|
@Prop({required: true}) app: App;
|
||||||
@Prop({required: true}) nav: NavController;
|
@Prop({required: true}) nav: NavController;
|
||||||
@Prop({required: true}) courses: Course[];
|
@Prop({required: true}) courses: Course[];
|
||||||
@Prop({required: true}) user: LoginUser;
|
@Prop({required: true}) user: LoginUser;
|
||||||
@@ -137,7 +138,7 @@ export default class Navigation extends Vue
|
|||||||
}
|
}
|
||||||
case 'switch-dark':
|
case 'switch-dark':
|
||||||
{
|
{
|
||||||
App.instance.darkMode = !App.instance.darkMode;
|
this.app.darkMode = !this.app.darkMode;
|
||||||
|
|
||||||
if (this.isDark()) this.$cookies.set('dark', true);
|
if (this.isDark()) this.$cookies.set('dark', true);
|
||||||
else this.$cookies.remove('dark');
|
else this.$cookies.remove('dark');
|
||||||
@@ -149,7 +150,7 @@ export default class Navigation extends Vue
|
|||||||
|
|
||||||
isDark()
|
isDark()
|
||||||
{
|
{
|
||||||
return App.instance.darkMode;
|
return this.app.darkMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
get version() {return Constants.VERSION}
|
get version() {return Constants.VERSION}
|
||||||
|
|||||||
Reference in New Issue
Block a user