Working on the Topology interface

Baudin999 · Dec 23, 2019 · cf06607 · cf06607
1 parent 3c439ca
commit cf06607
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 26 deletions.
diff --git a/CLI/wwwroot/build/bundle.css b/CLI/wwwroot/build/bundle.css
diff --git a/CLI/wwwroot/build/bundle.css.map b/CLI/wwwroot/build/bundle.css.map
diff --git a/CLI/wwwroot/build/bundle.js b/CLI/wwwroot/build/bundle.js
diff --git a/CLI/wwwroot/build/bundle.js.map b/CLI/wwwroot/build/bundle.js.map
diff --git a/CLI/wwwroot/global.css b/CLI/wwwroot/global.css
@@ -25,7 +25,7 @@ body {
     }
 
 h1.title {
-    color: #350c1c;
+    color: #ff3e00;
     text-transform: uppercase;
     font-size: 3em;
     font-weight: 100;

diff --git a/CLI/wwwroot/logo.jpg b/CLI/wwwroot/logo.jpg
diff --git a/Mapper.Application/DescriptionMapper.cs b/Mapper.Application/DescriptionMapper.cs
@@ -30,15 +30,18 @@ public override IEnumerable<Descriptor> VisitASTType(ASTType astType) {
 
             foreach (var field in astType.Fields)
             {
-                yield return new Descriptor(field.Name)
+                if (field.Module == ModuleName)
                 {
-                    Module = ModuleName,
-                    Name = field.Name,
-                    Description = MapAnnotations(field.Annotations),
-                    Parent = astType.Name,
-                    Type = MapTypes(field.Types),
-                    DescriptorType = DescriptorType.Field.ToString("g")
-                };
+                    yield return new Descriptor(field.Name)
+                    {
+                        Module = ModuleName,
+                        Name = field.Name,
+                        Description = MapAnnotations(field.Annotations),
+                        Parent = astType.Name,
+                        Type = MapTypes(field.Types),
+                        DescriptorType = DescriptorType.Field.ToString("g")
+                    };
+                }
             }
         }
 

diff --git a/web/src/Editor.svelte b/web/src/Editor.svelte
@@ -88,6 +88,8 @@
         theme: "carlangTheme",
         scrollBeyondLastLine: false,
         roundedSelection: true,
+        wordWrapColumn: 120,
+        wordWrap: "on",
         minimap: {
           enabled: false
         }

diff --git a/web/src/Home.svelte b/web/src/Home.svelte
@@ -53,17 +53,26 @@
     overflow: auto;
     height: 400px;
   }
+  .logo {
+    /*position: fixed;
+    top: 0;
+    left: 0; 
+    width: 100%;
+    height: 100%;
+    max-height: 100%;
+    background-image: url("/logo.jpg");
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+    opacity: 0.6;
+    z-index: -2; */
+  }
 </style>
 
+<div class="logo" />
 <div class="content--center">
   <h1 class="title">Welcome to ZDragon!</h1>
-  <p>
-    Visit
-    <a href="https://zdragon.nl" target="_blank" rel="noopener noreferrer">
-      ZDragon.nl
-    </a>
-    to learn more about zdragon!
-  </p>
 
   <div>
     <h2>Search your models:</h2>

diff --git a/web/src/ModuleTopology.svelte b/web/src/ModuleTopology.svelte
@@ -21,7 +21,9 @@
       let [n, ...rest] = params.nodes;
       let node = topology.nodes.find(node => node.id === n);
       if (node && node.module) {
-        navigator.preview(node.module);
+        navigator.edit(node.module);
+      } else {
+        // change the node color
       }
     });
   };

diff --git a/web/src/SearchResult.svelte b/web/src/SearchResult.svelte
@@ -38,6 +38,7 @@
     margin-bottom: 1rem;
     margin-left: 50%;
     transform: translateX(-50%);
+    background: white;
   }
   .descriptor:hover {
     cursor: pointer;