Unverified Commit 18d8eeb7 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera
Browse files

fix: adjust code after merge conflct mistakes

parent 5c2f3f27

src/playground/App.vue

+11 −10
Original line number Diff line number Diff line
@@ -2,20 +2,21 @@ 
  <div class="main-wrapper">

    <div class="menu">

      <router-link to="/">Home</router-link>

      <router-link to="/marker">Marker</router-link>

      <router-link to="/rectangle">Rectangle</router-link>

      <router-link to="/polyline">Polyline</router-link>

      <router-link to="/popups">Popups</router-link>

      <router-link to="/tooltips">Tooltips</router-link>

      <router-link to="/circle-marker">CircleMarker</router-link>

      <router-link to="/polygon">Polygon</router-link>

      <router-link to="/circle">Circle</router-link>

      <router-link to="/control-scale">Scale</router-link>

      <router-link to="/circle-marker">CircleMarker</router-link>

      <router-link to="/control-attribution">Attribution</router-link>

      <router-link to="/control-custom-message">Custom Message</router-link>

      <router-link to="/control-layers">Layers</router-link>

      <router-link to="/control-scale">Scale</router-link>

      <router-link to="/control-zoom">Zoom</router-link>

      <router-link to="/control-attribution">Attribution</router-link>

      <router-link to="/geo-json">GeoJSON</router-link>

      <router-link to="/icon">Icon</router-link>

      <router-link to="/control-custom-message">Custom Message</router-link>

      <router-link to="/marker">Marker</router-link>

      <router-link to="/polygon">Polygon</router-link>

      <router-link to="/polyline">Polyline</router-link>

      <router-link to="/popups">Popups</router-link>

      <router-link to="/rectangle">Rectangle</router-link>

      <router-link to="/tooltips">Tooltips</router-link>

    </div>

    <div class="map-wrapper">

      <router-view />

src/playground/index.js

+19 −14
Original line number Diff line number Diff line
@@ -6,31 +6,36 @@ import Home from "./views/Home.vue"; 


const routes = [

  { path: "/", component: Home },

  { path: "/marker", component: () => import("./views/Marker.vue") },

  { path: "/rectangle", component: () => import("./views/Rectangle.vue") },

  { path: "/polyline", component: () => import("./views/Polyline.vue") },

  { path: "/popups", component: () => import("./views/Popups.vue") },

  { path: "/tooltips", component: () => import("./views/Tooltips.vue") },

  { path: "/circle", component: () => import("./views/Circle.vue") },

  {

    path: "/circle-marker",

    component: () => import("./views/CircleMarker.vue"),

  },

  { path: "/polygon", component: () => import("./views/Polygon.vue") },

  { path: "/circle", component: () => import("./views/Circle.vue") },

  {

    path: "/control-scale",

    component: () => import("./views/ControlScale.vue"),

    path: "/control-layers",

    component: () => import("./views/ControlLayers.vue"),

  { path: "/control-zoom", component: () => import("./views/ControlZoom.vue") },

  {

    path: "/control-attribution",

    component: () => import("./views/ControlAttribution.vue"),

  { path: "/icon", component: () => import("./views/Icon.vue") },

  },

  {

    path: "/control-custom-message",

    component: () => import("./views/ControlCustomMessage.vue"),

  },

  {

    path: "/control-layers",

    component: () => import("./views/ControlLayers.vue"),

  },

  {

    path: "/control-scale",

    component: () => import("./views/ControlScale.vue"),

  },

  { path: "/control-zoom", component: () => import("./views/ControlZoom.vue") },

  { path: "/geo-json", component: () => import("./views/GeoJSON.vue") },

  { path: "/icon", component: () => import("./views/Icon.vue") },

  { path: "/marker", component: () => import("./views/Marker.vue") },

  { path: "/polygon", component: () => import("./views/Polygon.vue") },

  { path: "/polyline", component: () => import("./views/Polyline.vue") },

  { path: "/popups", component: () => import("./views/Popups.vue") },

  { path: "/rectangle", component: () => import("./views/Rectangle.vue") },

  { path: "/tooltips", component: () => import("./views/Tooltips.vue") },

];



const router = createRouter({