diff --git a/src/App.vue b/src/App.vue
index 553a072..ce01029 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,47 +7,48 @@ import { MathPage } from "./support/page";
import { onMounted, ref } from "vue";
import { checkLoggedIn, loggedOut, loggedIn } from "./support/auth";
import router from "./router";
+import { Dark } from "quasar";
(window as any).Stmt = MathStatement;
(window as any).Pg = MathPage;
-const status = ref(checkLoggedIn())
-
-; (async () => {
- const response = await fetch('/api/login/status/', {
- method: 'GET',
- headers: {
- 'Accept': 'application/json',
- },
- })
- const res = (await response.json()) as unknown as any
- if (res.data.hasUser) {
- loggedIn()
- }
- status.value = checkLoggedIn()
- })()
+const status = ref(checkLoggedIn());
+(async () => {
+ const response = await fetch("/api/login/status/", {
+ method: "GET",
+ headers: {
+ Accept: "application/json",
+ },
+ });
+ const res = ((await response.json()) as unknown) as any;
+ if (res.data.hasUser) {
+ loggedIn();
+ }
+ status.value = checkLoggedIn();
+})();
onMounted(() => {
- status.value = checkLoggedIn()
- console.log(status.value)
-})
+ status.value = checkLoggedIn();
+ console.log(status.value);
+});
router.afterEach(() => {
- status.value = checkLoggedIn()
- console.log(status.value)
-})
+ status.value = checkLoggedIn();
+ console.log(status.value);
+});
const logout = async () => {
- const response = await fetch('/api/logout/', {
- method: 'POST',
+ const response = await fetch("/api/logout/", {
+ method: "POST",
headers: {
- 'Accept': 'application/json',
+ Accept: "application/json",
},
- })
- loggedOut()
- status.value = checkLoggedIn()
- router.push({path: '/'})
-}
+ });
+ loggedOut();
+ status.value = checkLoggedIn();
+ router.push({ path: "/" });
+};
+Dark.set(true)
@@ -56,20 +57,22 @@ const logout = async () => {
-
-
-
- 
+
+ 
- Title
+
+ Crystal Math Worktable
+
+
+
-
-
-
-
-
+
@@ -79,11 +82,8 @@ const logout = async () => {
diff --git a/src/assets/l2.svg b/src/assets/l2.svg
index c89a3e5..f45c422 100644
--- a/src/assets/l2.svg
+++ b/src/assets/l2.svg
@@ -51,7 +51,7 @@
style="fill:#550000">
C
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:969.291px;font-family:'Cinzel Decorative';-inkscape-font-specification:'Cinzel Decorative';fill:#ffffff;stroke-width:0;stroke:#ffffff;stroke-opacity:1;stroke-dasharray:none">C
M
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Cinzel Decorative';-inkscape-font-specification:'Cinzel Decorative Bold';fill:#ffffff;stroke-width:0;stroke:#ffffff;stroke-opacity:1;stroke-dasharray:none">M
diff --git a/src/main.ts b/src/main.ts
index 7f03814..5ce924a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -12,7 +12,7 @@ import router from './router'
App UI
--------------------------------------------------
*/
-import { Quasar } from 'quasar'
+import { Dark, Quasar } from 'quasar'
// Import icon libraries
import '@quasar/extras/roboto-font-latin-ext/roboto-font-latin-ext.css'
@@ -46,7 +46,21 @@ import App from './App.vue'
const app = createApp(App)
app.use(Quasar, {
- plugins: {}, // import Quasar plugins and add here
+ plugins: {Dark}, // import Quasar plugins and add here
+ config: {
+ brand: {
+ primary: '#553564',
+ secondary: '#c1eeff',
+ accent: '#9C27B0',
+
+ dark: '#1d1d1d',
+
+ positive: '#21BA45',
+ negative: '#C10015',
+ info: '#31CCEC',
+ warning: '#F2C037',
+ },
+ },
})
app.use(router)
diff --git a/src/pages/Editor.vue b/src/pages/Editor.vue
index cc82442..8ae2c0b 100644
--- a/src/pages/Editor.vue
+++ b/src/pages/Editor.vue
@@ -15,12 +15,16 @@ import { stepX, stepY } from '../support/const'
import { checkLoggedIn, loggedOut } from '../support/auth'
import router from '../router'
+
const math = new MathPage(uuidv4());
const statements = ref([]);
const evaluation = ref();
const statementsKey = ref(uuidv4());
const leftDrawerOpen = ref(false);
+
+
+
const variableListingColumns = [
{
name: 'name',
@@ -34,6 +38,7 @@ const variableListingColumns = [
label: 'Value',
},
]
+
const stmOnControlledDragStop = (stmt: MathStatement) => (e: { event: MouseEvent, data: { x: number, y: number } }) => {
console.log(e)
diff --git a/src/quasar-variables.sass b/src/quasar-variables.sass
index 1994d16..edc3022 100644
--- a/src/quasar-variables.sass
+++ b/src/quasar-variables.sass
@@ -1,8 +1,10 @@
-$primary : #1976D2
+$primary : #553564
$secondary : #26A69A
$accent : #9C27B0
$dark : #1D1D1D
+// $dark-page: #333333;
+
$positive : #21BA45
$negative : #C10015