Merge branch 'main' into 'main'

#16 Создана страница для неавторизованных с отдельным Layout и функцианалом кнопки See merge request teknokomo/universo-monorepo!10

Merge branch 'main' into 'main'
#16 Создана страница для неавторизованных с отдельным Layout и функцианалом кнопки See merge request teknokomo/universo-monorepo!10
cc116a26 · Anton Medvedev · df235a56 · 724911b3 · cc116a26 · cc116a26
--- a/package-lock.json
+++ b/package-lock.json
+{
+  "name": "universo-monorepo",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
--- a/universo-frontend/src/layouts/MainLayout.vue
+++ b/universo-frontend/src/layouts/MainLayout.vue
@@ -47,12 +47,6 @@ const linksList = [
    icon: 'school',
    link: '/phaser'
  },
-  {
-    title: 'Страница для неавторизованных',
-    caption: 'Страница',
-    icon: 'school',
-    link: ''
-  },
  {
    title: 'Страница для авторизованных',
    caption: 'Страница',

--- a/universo-frontend/src/layouts/StartLayout.vue
+++ b/universo-frontend/src/layouts/StartLayout.vue
+<template>
+    <q-layout view="hHh lpR fFf">
+      <q-header elevated class="bg-primary text-white">
+        <q-toolbar>
+          <q-btn
+           dense flat round icon="menu" @click="toggleLeftDrawer" />
+  
+  
+          <q-toolbar-title>
+            Universo
+          </q-toolbar-title>
+  
+  
+        </q-toolbar>
+      </q-header>
+  
+      <!-- <q-drawer
+        v-model="leftDrawerOpen"
+        show-if-above
+        side="left"
+      >
+        <q-list>
+  
+  
+          <EssentialLink
+            v-for="link in essentialLinks"
+            :key="link.title"
+            v-bind="link"
+          />
+        </q-list>
+      </q-drawer> -->
+  
+      <q-page-container>
+        <router-view />
+      </q-page-container>
+    </q-layout>
+  </template>
+  <script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import EssentialLink from 'components/EssentialLink.vue';
+  
+  const linksList = [
+ 
+    {
+      title: 'Страница для неавторизованных',
+      caption: 'Страница',
+      icon: 'school',
+      link: 'http://localhost:9000/start'
+    },
+    
+  
+  ];
+  
+  export default defineComponent({
+    name: 'StartLayout',
+  
+    components: {
+      // EssentialLink
+    },
+  
+    setup () {
+      const leftDrawerOpen = ref(false)
+  
+      return {
+        essentialLinks: linksList,
+        leftDrawerOpen,
+        toggleLeftDrawer () {
+          leftDrawerOpen.value = !leftDrawerOpen.value
+        }
+      }
+    }
+  });
+  </script>
+  
\ Нет новой строки в конце файла
--- a/universo-frontend/src/pages/IndexPage.vue
+++ b/universo-frontend/src/pages/IndexPage.vue
@@ -8,7 +8,8 @@
      fit="contain"
    />

-    <q-btn color="white" text-color="black" label="В будущее" />
+    <q-btn color="white"  text-color="#00000000" @click="$router.push({ name: 'PhaserTest' })">В БУДУЩЕЕ</q-btn>
+

    <span class="page-text02">
      Погрузитесь через РВМ Универсо
@@ -33,9 +34,8 @@ export default {
  name: "NotAuth",
  props: {},
  
-  
-
  data() {
+    
    return {
      banners: [
        {
@@ -70,14 +70,14 @@ export default {
  max-height: 25vh;
  max-width: 25vw;
  justify-self: center;
-  margin-bottom: 75px; /* Add a 150px margin at the bottom */
+  margin-bottom: 60px; /* Add a 150px margin at the bottom */
 margin-top: 50px;
 }

 .page-text02 {
  font-size: 32px;
-  margin-bottom: 150px; /* Add a 150px margin at the bottom */
-  margin-top: 100px;
+  margin-bottom: 133px; /* Add a 150px margin at the bottom */
+  margin-top: 60px;
  color: aliceblue;
 }
 </style>
--- a/universo-frontend/src/router/routes.ts
+++ b/universo-frontend/src/router/routes.ts
@@ -3,21 +3,35 @@ import { RouteRecordRaw } from 'vue-router';
 const routes: RouteRecordRaw[] = [
  {
    path: '/',
-    component: () => import('layouts/MainLayout.vue'),
+    component: () => import('layouts/StartLayout.vue'),
    children: [
      { path: '', component: () => import('pages/IndexPage.vue') },
-      {path: '/user', component: () => import('pages/UserProfile.vue')},
-      {path: '/phaser', component: () => import('pages/PhaserTest.vue')},
-      {path: '/register',component: () => import('pages/RegistrationPage.vue'), },
-      { path: '/zareg',component: () => import('pages/RegistrStr.vue'), },
    ],
  },
-
-
+  {
+    path: '/test',
+    component: () => import('layouts/MainLayout.vue'),
+    children: [
+      // { path: '', component: () => import('pages/IndexPage.vue') },
+      { path: '/user', component: () => import('pages/UserProfile.vue') },
+      { path: '/phaser', component: () => import('pages/PhaserTest.vue') },
+      { path: '/register', component: () => import('pages/RegistrationPage.vue') },
+      { path: '/zareg', component: () => import('pages/RegistrStr.vue') },
+      { path: '/user', name: 'PhaserTest', component: () => import('pages/UserProfile.vue') }
+     
+    ],
+  },
+  
  {
    path: '/:catchAll(.*)*',
    component: () => import('pages/ErrorNotFound.vue'),
  },
+  // {
+  //   path: '/user',
+  //   name: 'PhaserTest',
+  //   component: () => import('pages/UserProfile.vue')
+  // }
+  
 ];

-export default routes;
+export default routes;
\ Нет новой строки в конце файла