btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge pull request #636 from liyasthomas/refactor/ui

Browse Source 
Refactor/ui
This commit is contained in:
Liyas Thomas
2020-03-03 18:51:30 +05:30
committed by GitHub
parent f564ca1eb5 3afdce151b
commit 1f43a68612
27 changed files with 176 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/collections/addCollection.vue
View File

@@ -50,7 +50,7 @@ export default {
show: Boolean,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
data() {
return {

2
components/collections/addFolder.vue
View File

@@ -50,7 +50,7 @@ export default {
collectionIndex: Number,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
data() {
return {

2
components/collections/editCollection.vue
View File

@@ -50,7 +50,7 @@ export default {
editingCollectionIndex: Number,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
data() {
return {

2
components/collections/editFolder.vue
View File

@@ -47,7 +47,7 @@ export default {
folderIndex: Number,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
data() {
return {

2
components/collections/editRequest.vue
View File

@@ -78,7 +78,7 @@ export default {
requestIndex: Number,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
data() {
return {

2
components/collections/importExportCollections.vue
View File

@@ -88,7 +88,7 @@ export default {
show: Boolean,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
computed: {
collectionJson() {

2
components/collections/index.vue
View File

@@ -113,7 +113,7 @@ import { fb } from "../../functions/fb"
export default {
components: {
collection,
"pw-section": () => import("../section"),
"pw-section": () => import("../layout/section"),
addCollection: () => import("./addCollection"),
addFolder: () => import("./addFolder"),
editCollection: () => import("./editCollection"),

2
components/collections/saveRequestAs.vue
View File

@@ -86,7 +86,7 @@ export default {
editingRequest: Object,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
data() {
return {

2
components/environments/addEnvironment.vue
View File

@@ -50,7 +50,7 @@ export default {
show: Boolean,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
data() {
return {

2
components/environments/editEnvironment.vue
View File

@@ -126,7 +126,7 @@ export default {
editingEnvironmentIndex: Number,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
data() {
return {

2
components/environments/importExportEnvironment.vue
View File

@@ -88,7 +88,7 @@ export default {
show: Boolean,
},
components: {
modal: () => import("../../components/modal"),
modal: () => import("../../components/ui/modal"),
},
computed: {
environmentJson() {

2
components/environments/index.vue
View File

@@ -71,7 +71,7 @@ const updateOnLocalStorage = (propertyName, property) =>
export default {
components: {
environment,
"pw-section": () => import("../section"),
"pw-section": () => import("../layout/section"),
addEnvironment: () => import("./addEnvironment"),
editEnvironment: () => import("./editEnvironment"),
importExportEnvironment: () => import("./importExportEnvironment"),

128
components/layout/contributors.vue Normal file
View File

@@ -0,0 +1,128 @@
<template>
<div>
<p class="info">
{{ $t("donate_info1") }}
</p>
<p class="info">
{{ $t("donate_info2") }}
</p>
<div>
<a
href="https://opencollective.com/postwoman"
target="_blank"
rel="noopener"
v-tooltip.right="$t('one_time_recurring')"
>
<button class="icon">
<i class="material-icons">donut_large</i>
<span>{{ $t("open_collective") }}</span>
</button>
</a>
</div>
<div>
<a
href="https://www.paypal.me/liyascthomas"
target="_blank"
rel="noopener"
v-tooltip.right="$t('one_time')"
>
<button class="icon">
<i class="material-icons">payment</i>
<span>{{ $t("paypal") }}</span>
</button>
</a>
</div>
<div>
<a
href="https://www.patreon.com/liyasthomas"
target="_blank"
rel="noopener"
v-tooltip.right="$t('recurring')"
>
<button class="icon">
<i class="material-icons">local_parking</i>
<span>{{ $t("patreon") }}</span>
</button>
</a>
</div>
<hr />
<h3 class="title">Financial Contributors</h3>
<p class="info">
Become a financial contributor and help us sustain our community.
<a class="link" href="https://opencollective.com/postwoman/contribute">[Contribute]</a>.
</p>
<h3 class="title">Organizations</h3>
<p class="info">
Support this project with your organization. Your logo will show up here with a link to your
website.
<a class="link" href="https://opencollective.com/postwoman/contribute">[Contribute]</a>.
</p>
<div class="contributors">
<a href="https://opencollective.com/postwoman/organization/0/website">
<img src="https://opencollective.com/postwoman/organization/0/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/1/website">
<img src="https://opencollective.com/postwoman/organization/1/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/2/website">
<img src="https://opencollective.com/postwoman/organization/2/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/3/website">
<img src="https://opencollective.com/postwoman/organization/3/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/4/website">
<img src="https://opencollective.com/postwoman/organization/4/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/5/website">
<img src="https://opencollective.com/postwoman/organization/5/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/6/website">
<img src="https://opencollective.com/postwoman/organization/6/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/7/website">
<img src="https://opencollective.com/postwoman/organization/7/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/8/website">
<img src="https://opencollective.com/postwoman/organization/8/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/9/website">
<img src="https://opencollective.com/postwoman/organization/9/avatar.svg" />
</a>
</div>
<h3 class="title">Individuals</h3>
<p class="info">
Support this project with your organization. Your logo will show up here with a link to your
website.
<a class="link" href="https://opencollective.com/postwoman/contribute">[Contribute]</a>.
</p>
<div class="contributors">
<a href="https://opencollective.com/postwoman">
<img src="https://opencollective.com/postwoman/individuals.svg" />
</a>
</div>
<h3 class="title">Code Contributors</h3>
<p class="info">
This project exists thanks to all the people who contribute.
</p>
<div class="contributors">
<a href="https://github.com/liyasthomas/postwoman/graphs/contributors">
<img src="https://opencollective.com/postwoman/contributors.svg" />
</a>
</div>
</div>
</template>
<style scoped lang="scss">
.contributors {
display: flex;
flex-flow: row nowrap;
overflow: auto;
padding: 8px 0;
margin: 8px 0;
max-width: calc(100vw - 72px);
}
</style>
<script>
export default {}
</script>

6
components/history.vue → components/layout/history.vue
View File

@@ -320,15 +320,15 @@ ol {
</style>
<script>
import { findStatusGroup } from "../pages/index"
import { fb } from "../functions/fb"
import { findStatusGroup } from "../../pages/index"
import { fb } from "../../functions/fb"
const updateOnLocalStorage = (propertyName, property) =>
window.localStorage.setItem(propertyName, JSON.stringify(property))
export default {
components: {
"pw-section": () => import("./section"),
"pw-section": () => import("../layout/section"),
VirtualList: () => import("vue-virtual-scroll-list"),
},
data() {

0
components/logo.vue → components/layout/logo.vue
View File

0
components/section.vue → components/layout/section.vue
View File

4
components/ace-editor.vue → components/ui/ace-editor.vue
View File

@@ -23,8 +23,8 @@ const DEFAULT_THEME = "twilight"
import ace from "ace-builds"
import "ace-builds/webpack-resolver"
import jsonParse from "../functions/jsonParse"
import debounce from "../functions/utils/debounce"
import jsonParse from "../../functions/jsonParse"
import debounce from "../../functions/utils/debounce"
export default {
props: {

0
components/autocomplete.vue → components/ui/autocomplete.vue
View File

0
components/modal.vue → components/ui/modal.vue
View File

0
components/toggle.vue → components/ui/toggle.vue
View File

123
layouts/default.vue
View File

@@ -580,115 +580,7 @@
</ul>
</div>
<div slot="body">
<p class="info">
{{ $t("donate_info1") }}
</p>
<p class="info">
{{ $t("donate_info2") }}
</p>
<div>
<a
href="https://opencollective.com/postwoman"
target="_blank"
rel="noopener"
v-tooltip.right="$t('one_time_recurring')"
>
<button class="icon">
<i class="material-icons">donut_large</i>
<span>{{ $t("open_collective") }}</span>
</button>
</a>
</div>
<div>
<a
href="https://www.paypal.me/liyascthomas"
target="_blank"
rel="noopener"
v-tooltip.right="$t('one_time')"
>
<button class="icon">
<i class="material-icons">payment</i>
<span>{{ $t("paypal") }}</span>
</button>
</a>
</div>
<div>
<a
href="https://www.patreon.com/liyasthomas"
target="_blank"
rel="noopener"
v-tooltip.right="$t('recurring')"
>
<button class="icon">
<i class="material-icons">local_parking</i>
<span>{{ $t("patreon") }}</span>
</button>
</a>
</div>
<hr />
<h3 class="title">Financial Contributors</h3>
<p class="info">
Become a financial contributor and help us sustain our community.
<a class="link" href="https://opencollective.com/postwoman/contribute">[Contribute]</a>.
</p>
<h3 class="title">Organizations</h3>
<p class="info">
Support this project with your organization. Your logo will show up here with a link to
your website.
<a class="link" href="https://opencollective.com/postwoman/contribute">[Contribute]</a>.
</p>
<div class="sponors">
<a href="https://opencollective.com/postwoman/organization/0/website">
<img src="https://opencollective.com/postwoman/organization/0/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/1/website">
<img src="https://opencollective.com/postwoman/organization/1/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/2/website">
<img src="https://opencollective.com/postwoman/organization/2/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/3/website">
<img src="https://opencollective.com/postwoman/organization/3/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/4/website">
<img src="https://opencollective.com/postwoman/organization/4/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/5/website">
<img src="https://opencollective.com/postwoman/organization/5/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/6/website">
<img src="https://opencollective.com/postwoman/organization/6/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/7/website">
<img src="https://opencollective.com/postwoman/organization/7/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/8/website">
<img src="https://opencollective.com/postwoman/organization/8/avatar.svg" />
</a>
<a href="https://opencollective.com/postwoman/organization/9/website">
<img src="https://opencollective.com/postwoman/organization/9/avatar.svg" />
</a>
</div>
<h3 class="title">Individuals</h3>
<p class="info">
Support this project with your organization. Your logo will show up here with a link to
your website.
<a class="link" href="https://opencollective.com/postwoman/contribute">[Contribute]</a>.
</p>
<div class="sponors">
<a href="https://opencollective.com/postwoman">
<img src="https://opencollective.com/postwoman/individuals.svg" />
</a>
</div>
<h3 class="title">Code Contributors</h3>
<p class="info">
This project exists thanks to all the people who contribute.
</p>
<div class="sponors">
<a href="https://github.com/liyasthomas/postwoman/graphs/contributors">
<img src="https://opencollective.com/postwoman/contributors.svg" />
</a>
</div>
<contributors />
</div>
<div slot="footer"></div>
</modal>
@@ -699,14 +591,6 @@
.footer-link {
margin: 8px 16px;
}
.sponors {
display: flex;
flex-flow: row nowrap;
overflow: auto;
padding: 8px 0;
margin: 8px 0;
max-width: calc(100vw - 72px);
}
</style>
<script>
@@ -720,9 +604,10 @@ import { fb } from "../functions/fb"
export default {
components: {
logo: () => import("../components/logo"),
modal: () => import("../components/modal"),
logo: () => import("../components/layout/logo"),
modal: () => import("../components/ui/modal"),
login: () => import("../components/firebase/login"),
contributors: () => import("../components/layout/contributors"),
},
methods: {

4
pages/doc.vue
View File

@@ -302,11 +302,11 @@
</style>
<script>
import AceEditor from "../components/ace-editor"
import AceEditor from "../components/ui/ace-editor"
export default {
components: {
"pw-section": () => import("../components/section"),
"pw-section": () => import("../components/layout/section"),
Editor: AceEditor,
},

6
pages/graphql.vue
View File

@@ -351,7 +351,7 @@ import axios from "axios"
import * as gql from "graphql"
import textareaAutoHeight from "../directives/textareaAutoHeight"
import { commonHeaders } from "../functions/headers"
import AceEditor from "../components/ace-editor"
import AceEditor from "../components/ui/ace-editor"
import QueryEditor from "../components/graphql/queryeditor"
import { getPlatformSpecialKey } from "~/functions/platformutils"
import { sendNetworkRequest } from "../functions/network"
@@ -361,10 +361,10 @@ export default {
textareaAutoHeight,
},
components: {
"pw-section": () => import("../components/section"),
"pw-section": () => import("../components/layout/section"),
"gql-field": () => import("../components/graphql/field"),
"gql-type": () => import("../components/graphql/type"),
autocomplete: () => import("../components/autocomplete"),
autocomplete: () => import("../components/ui/autocomplete"),
Editor: AceEditor,
QueryEditor: QueryEditor,
},

12
pages/index.vue
View File

@@ -1301,7 +1301,7 @@
</template>
<script>
import section from "../components/section"
import section from "../components/layout/section"
import url from "url"
import querystring from "querystring"
import { commonHeaders } from "../functions/headers"
@@ -1310,7 +1310,7 @@ import parseCurlCommand from "../assets/js/curlparser.js"
import getEnvironmentVariablesFromScript from "../functions/preRequest"
import runTestScriptWithVariables from "../functions/postwomanTesting"
import parseTemplateString from "../functions/templating"
import AceEditor from "../components/ace-editor"
import AceEditor from "../components/ui/ace-editor"
import { tokenRequest, oauthRedirect } from "../assets/js/oauth"
import { sendNetworkRequest } from "../functions/network"
import { fb } from "../functions/fb"
@@ -1370,10 +1370,10 @@ export default {
},
components: {
"pw-section": section,
"pw-toggle": () => import("../components/toggle"),
"pw-modal": () => import("../components/modal"),
history: () => import("../components/history"),
autocomplete: () => import("../components/autocomplete"),
"pw-toggle": () => import("../components/ui/toggle"),
"pw-modal": () => import("../components/ui/modal"),
history: () => import("../components/layout/history"),
autocomplete: () => import("../components/ui/autocomplete"),
collections: () => import("../components/collections"),
saveRequestAs: () => import("../components/collections/saveRequestAs"),
Editor: AceEditor,

10
pages/index.vue.orig
View File

@@ -1451,7 +1451,7 @@
</template>
<script>
import section from "../components/section"
import section from "../components/layout/section"
import url from "url"
import querystring from "querystring"
import { commonHeaders } from "../functions/headers"
@@ -1460,7 +1460,7 @@ import parseCurlCommand from "../assets/js/curlparser.js"
import getEnvironmentVariablesFromScript from "../functions/preRequest"
import runTestScriptWithVariables from "../functions/postwomanTesting"
import parseTemplateString from "../functions/templating"
import AceEditor from "../components/ace-editor"
import AceEditor from "../components/ui/ace-editor"
import { tokenRequest, oauthRedirect } from "../assets/js/oauth"
import { sendNetworkRequest } from "../functions/network"
import { fb } from "../functions/fb"
@@ -1524,9 +1524,9 @@ export default {
components: {
"pw-section": section,
"pw-toggle": () => import("../components/toggle"),
"pw-modal": () => import("../components/modal"),
history: () => import("../components/history"),
autocomplete: () => import("../components/autocomplete"),
"pw-modal": () => import("../components/ui/modal"),
history: () => import("../components/layout/history"),
autocomplete: () => import("../components/ui/autocomplete"),
collections: () => import("../components/collections"),
saveRequestAs: () => import("../components/collections/saveRequestAs"),
Editor: AceEditor,

2
pages/realtime.vue
View File

@@ -168,7 +168,7 @@ div.log {
<script>
export default {
components: {
"pw-section": () => import("../components/section"),
"pw-section": () => import("../components/layout/section"),
},
data() {
return {

17
pages/settings.vue
View File

@@ -211,8 +211,10 @@
class="link"
href="https://apollosoftware.xyz/legal/postwoman"
target="_blank"
rel="noopener">
{{ $t("apollosw_privacy_policy") }} </a>.
rel="noopener"
>
{{ $t("apollosw_privacy_policy") }} </a
>.
</p>
</li>
</ul>
@@ -243,8 +245,8 @@ import { fb } from "../functions/fb"
export default {
components: {
"pw-section": () => import("../components/section"),
"pw-toggle": () => import("../components/toggle"),
"pw-section": () => import("../components/layout/section"),
"pw-toggle": () => import("../components/ui/toggle"),
swatch: () => import("../components/settings/swatch"),
},
@@ -341,7 +343,8 @@ export default {
FRAME_COLORS_ENABLED: this.$store.state.postwoman.settings.FRAME_COLORS_ENABLED || false,
PROXY_ENABLED: this.$store.state.postwoman.settings.PROXY_ENABLED || false,
PROXY_URL: this.$store.state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
PROXY_URL:
this.$store.state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "",
EXTENSIONS_ENABLED:
@@ -641,8 +644,8 @@ export default {
fb.writeSettings("syncEnvironments", true)
},
resetProxy({ target }) {
this.settings.PROXY_URL = `https://postwoman.apollosoftware.xyz/`;
target.innerHTML = this.doneButton;
this.settings.PROXY_URL = `https://postwoman.apollosoftware.xyz/`
target.innerHTML = this.doneButton
this.$toast.info(this.$t("cleared"), {
icon: "clear_all",
})