Merge branch 'master' of github.com:facade/ignition

freekmurze · freekmurze · commit 2af8a76a7064 · 2019-08-28T10:23:39.000+02:00
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Beyond Code GmbH <hello@beyondco.de>
+Copyright (c) Facade <info@facade.company>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/resources/compiled/ignition.js b/resources/compiled/ignition.js
diff --git a/resources/css/utilities/definition-list.css b/resources/css/utilities/definition-list.css
@@ -34,12 +34,14 @@
 
 @screen sm {
     .definition-list-title {
-        @apply start-2;
+        margin-left: 9.5rem;
     }
 }
 
-.definition-list-items {
-    @apply contents;
+@screen lg {
+    .definition-list-title {
+        margin-left: 15.5rem;
+    }
 }
 
 .definition-label {
diff --git a/resources/js/components/App.vue b/resources/js/components/App.vue
@@ -16,7 +16,6 @@
 import Summary from './Summary.vue';
 import Tabs from './Tabs.vue';
 import Details from './Details.vue';
-import Solutions from './Solutions.vue';
 
 export default {
     props: {
diff --git a/resources/js/components/DebugTimeline/Events/DumpEvent.vue b/resources/js/components/DebugTimeline/Events/DumpEvent.vue
@@ -1,9 +1,6 @@
 <template>
     <div>
-        <DefinitionList>
-            <h3 class="definition-list-title flex justify-start">
-                Dump
-            </h3>
+        <DefinitionList title="Dump">
             <DefinitionListRow label="Content"
                 ><code class="code-block mb-3" v-html="event.label"></code>
             </DefinitionListRow>
diff --git a/resources/js/components/Shared/DefinitionList.vue b/resources/js/components/Shared/DefinitionList.vue
@@ -1,10 +1,12 @@
 <template>
-    <div :class="className" class="definition-list">
+    <div :class="className">
         <h3 v-if="title" class="definition-list-title">{{ title }}</h3>
-        <dl v-if="this.$slots.default" class="definition-list-items">
+        <dl v-if="this.$slots.default" class="definition-list">
             <slot></slot>
         </dl>
-        <div v-if="!this.$slots.default" class="definition-list-empty">—</div>
+        <div v-if="!this.$slots.default" class="definition-list">
+            <div className="definition-list-empty">—</div>
+        </div>
     </div>
 </template>
 
diff --git a/resources/js/components/Shared/ShareButton.vue b/resources/js/components/Shared/ShareButton.vue
@@ -1,37 +1,35 @@
 <template>
-    <div class="contents" @click.stop>
-        <div>
-            <button class="tab" :class="menuVisible ? 'tab-active' : ''" @click="toggleMenu">
-                Share
-                <i class="ml-2 fas fa-share"></i>
-            </button>
-            <div
-                class="dropdown z-10 right-0 top-full bg-gray-700 text-white p-4 overflow-visible"
-                :class="{ hidden: !menuVisible }"
-                @click.stop
-                style="min-width: 18rem; margin-right: -1px"
-            >
-                <div class="flex justify-between">
-                    <h5
-                        class="mb-3 text-left text-gray-500 font-semibold uppercase tracking-wider whitespace-no-wrap"
-                    >
-                        {{ sharedErrorUrls ? 'Shared' : 'Share' }} on Flare
-                    </h5>
-                    <a
-                        class="link-dimmed-invers underline"
-                        target="_blank"
-                        href="https://flareapp.io/docs"
-                        >Flare Docs
-                    </a>
-                </div>
-                <div v-if="sharedErrorUrls">
-                    <ShareLinks
-                        :publicUrl="sharedErrorUrls.public_url"
-                        :ownerUrl="sharedErrorUrls.owner_url"
-                    />
-                </div>
-                <ShareForm v-else @share="shareError" />
+    <div @click.stop>
+        <button class="tab" :class="menuVisible ? 'tab-active' : ''" @click="toggleMenu">
+            Share
+            <i class="ml-2 fas fa-share"></i>
+        </button>
+        <div
+            class="dropdown z-10 right-0 top-full bg-gray-700 text-white p-4 overflow-visible"
+            :class="{ hidden: !menuVisible }"
+            @click.stop
+            style="min-width: 18rem; margin-right: -1px"
+        >
+            <div class="flex justify-between">
+                <h5
+                    class="mb-3 text-left text-gray-500 font-semibold uppercase tracking-wider whitespace-no-wrap"
+                >
+                    {{ sharedErrorUrls ? 'Shared' : 'Share' }} on Flare
+                </h5>
+                <a
+                    class="link-dimmed-invers underline"
+                    target="_blank"
+                    href="https://flareapp.io/docs"
+                    >Flare Docs
+                </a>
             </div>
+            <div v-if="sharedErrorUrls">
+                <ShareLinks
+                    :publicUrl="sharedErrorUrls.public_url"
+                    :ownerUrl="sharedErrorUrls.owner_url"
+                />
+            </div>
+            <ShareForm v-else @share="shareError" />
         </div>
     </div>
 </template>
diff --git a/resources/js/components/Solutions.vue b/resources/js/components/Solutions.vue
diff --git a/resources/js/components/Solutions/Solution.vue b/resources/js/components/Solutions/Solution.vue
diff --git a/resources/js/components/Tabs.vue b/resources/js/components/Tabs.vue
@@ -1,7 +1,7 @@
 <template>
     <nav class="tab-nav">
         <ul class="tab-bar">
-            <li class="contents" v-for="tab in tabs" :key="tab.component">
+            <li v-for="tab in tabs" :key="tab.component">
                 <button
                     class="tab"
                     :class="value.component === tab.component ? 'tab-active' : ''"
diff --git a/src/Actions/ShareReportAction.php b/src/Actions/ShareReportAction.php
@@ -51,8 +51,6 @@ public function filterReport(array $report): array
 
         $report['context'] = $this->filterContextItems($report['context']);
 
-        $report['context']['context']['shared'] = true;
-
         return $report;
     }
 
diff --git a/src/Tabs/Tab.php b/src/Tabs/Tab.php
@@ -26,7 +26,7 @@ public function __construct()
 
     public function name(): string
     {
-        return Str::studly(class_basename(get_called_class()), '-');
+        return Str::studly(class_basename(get_called_class()));
     }
 
     public function component(): string

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 The MIT License (MIT)
 -Copyright (c) Beyond Code GmbH <[email protected]>
 +Copyright (c) Facade <[email protected]>
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,14 @@`
`34`	`34`
`35`	`35`	`@screen sm {`
`36`	`36`	`.definition-list-title {`
`37`		`- @apply start-2;`
	`37`	`+ margin-left: 9.5rem;`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`-.definition-list-items {`
`42`		`- @apply contents;`
	`41`	`+@screen lg {`
	`42`	`+ .definition-list-title {`
	`43`	`+ margin-left: 15.5rem;`
	`44`	`+ }`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`.definition-label {`