Merge branch 'main' of github.com:nagisa77/OpenIsle

open-isle-cli/src/App.vue

@@ -1,17 +1,43 @@
 <template>
-  <div>
-    <h1>Open Isle CLI</h1>
+  <div id="app">
+    <HeaderComponent @toggle-menu="menuVisible = !menuVisible" />
+    <MenuComponent :visible="menuVisible" />
+    <div class="content" :class="{ 'with-menu': menuVisible }">
+      <router-view />
+    </div>
   </div>
 </template>
 
 <script>
+import HeaderComponent from './components/HeaderComponent.vue'
+import MenuComponent from './components/MenuComponent.vue'
 
 export default {
   name: 'App',
-
+  components: { HeaderComponent, MenuComponent },
+  data() {
+    return { menuVisible: true }
+  }
 }
 </script>
 
 <style>
+<<<<<<< HEAD
 
+=======
+#app {
+  font-family: Avenir, Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  color: #2c3e50;
+}
+.content {
+  margin-left: 0;
+  transition: margin-left 0.3s ease;
+  padding-top: 60px;
+}
+.content.with-menu {
+  margin-left: 200px;
+}
+>>>>>>> 09bbafa1912b3a87115018c72230fd57e8d08aff
 </style>