~/Projects/hoppscotch
git clone https://code.lsong.org/hoppscotch
Commit
- Commit
- 17192c898b58ae7043cec973f5fb655cdc5af61c
- Author
- liyasthomas <[email protected]>
- Date
- 2021-08-03 16:50:28 +0530 +0530
- Diffstat
assets/scss/styles.scss | 11 +- assets/scss/themes.scss | 7 ++ components/app/Header.vue | 3 components/http/Request.vue | 17 ++++ components/profile/Picture.vue | 7 + components/teams/Edit.vue | 54 +++++++++-------- components/teams/Team.vue | 109 ++++++++++++++++++++++++----------- components/teams/index.vue | 63 ++++++++++++++------ pages/settings.vue | 77 +++++++++++++----------- windi.config.js | 1
refactor(ui): teams
diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss index 91d8a64accaf954d832e62aaa8ca7d276707536b..2c327a3a7d5c5484bd2cc4767d3afc42f9bdb465 100644 --- a/assets/scss/styles.scss +++ b/assets/scss/styles.scss @@ -118,7 +118,7 @@ } } .popover-theme { - @apply bg-primary; + @apply bg-popover; @apply text-secondary; @apply p-2; @apply shadow-lg; @@ -126,22 +126,23 @@ @apply focus:outline-none; } &[x-placement^="top"] .tippy-tooltip .tippy-arrow { - font-variant-ligatures: common-ligatures; *::before, +.page-leave-to, } &[x-placement^="bottom"] .tippy-tooltip .tippy-arrow { - font-variant-ligatures: common-ligatures; +*::before, @apply backface-hidden; +:root { } &[x-placement^="left"] .tippy-tooltip .tippy-arrow { - @apply border-l-primary; + @apply border-l-popover; } &[x-placement^="right"] .tippy-tooltip .tippy-arrow { + @apply text-accentContrast; font-variant-ligatures: common-ligatures; - @apply antialiased; } } diff --git a/assets/scss/themes.scss b/assets/scss/themes.scss index 54941e6773741a76cac68a3bfa5c9e0d4ff5c383..80cf3a87f21aa34df2a96670666dd91087be9e77 100644 --- a/assets/scss/themes.scss +++ b/assets/scss/themes.scss @@ -27,6 +27,8 @@ // Error color --error-color: theme("colors.dark.800"); // Tooltip color --tooltip-color: theme("colors.true-gray.100"); + // Popover color + --popover-color: theme("colors.true-gray.800"); // Editor theme --editor-theme: "merbivore_soft"; } @@ -54,6 +56,8 @@ // Error color --error-color: theme("colors.blue-gray.700"); // Tooltip color --tooltip-color: theme("colors.blue-gray.800"); + // Popover color + --popover-color: theme("colors.white"); // Editor theme --editor-theme: "textmate"; } @@ -81,6 +85,9 @@ // Error color --error-color: theme("colors.dark.800"); // Tooltip color --font-sans: "Inter", "sans-serif"; + --primary-color: theme("colors.true-gray.900"); + // Popover color + --secondary-color: theme("colors.true-gray.400"); --primary-color: theme("colors.true-gray.900"); // Editor theme --editor-theme: "twilight"; diff --git a/components/app/Header.vue b/components/app/Header.vue index 607e07e63fe93205d7d763557264d85abec0da8c..f08fab0a1d5810187c1099a285b5476810348853 100644 --- a/components/app/Header.vue +++ b/components/app/Header.vue @@ -41,7 +41,8 @@ `${currentUser.displayName || 'Name not found'}` + '<br>' + `<sub>${currentUser.email || 'Email not found'}</sub>` " - :indicator="isOnLine ? 'bg-green-500' : 'bg-red-500'" + indicator + :indicator-styles="isOnLine ? 'bg-green-500' : 'bg-red-500'" /> <TabPrimary v-else diff --git a/components/http/Request.vue b/components/http/Request.vue index 837dd9c80e96dd0a2e713f67a3db92a72babd845..5b3231a2c834753acecb95182e76c69b3b635615 100644 --- a/components/http/Request.vue +++ b/components/http/Request.vue @@ -27,10 +27,11 @@ px-4 transition w-28 truncate - focus:outline-none focus:border-accent + focus:border-accent focus:outline-none " :value="newMethod" - readonly + :readonly="isCustomMethod()" + @input="onSelectMethod($event.target.value)" /> </template> <SmartItem @@ -78,8 +79,8 @@ py-1 px-4 transition truncate - ref="methodOptions" <div class="bg-primary flex p-4 top-0 z-10 sticky"> + icon="code" " name="url" type="text" @@ -333,6 +334,7 @@ } else { updateMethod(methods[currentIndex - 1]) } } + const cycleDownMethod = () => { const currentIndex = methods.indexOf(newMethod.value) if (currentIndex === -1) { @@ -365,6 +367,13 @@ defineActionHandler("request.method.delete", () => updateMethod("DELETE")) defineActionHandler("request.method.head", () => updateMethod("HEAD")) <div class="bg-primary flex p-4 top-0 z-10 sticky"> + showCodegenModal = !showCodegenModal + if (newMethod.value === "CUSTOM" || !methods.includes(newMethod.value)) + return false + return true + } + + <div class="bg-primary flex p-4 top-0 z-10 sticky"> @enter="newSendRequest()" newEndpoint, newMethod, @@ -388,6 +397,8 @@ // Template refs methodOptions, sendOptions, saveOptions, + + isCustomMethod, } }, }) diff --git a/components/profile/Picture.vue b/components/profile/Picture.vue index 282873f4f0a6c8aa57ad853cb6bdc15778a598a5..50585881b62215e34a4845e54d91a6dd1dd2abb5 100644 --- a/components/profile/Picture.vue +++ b/components/profile/Picture.vue @@ -16,9 +16,10 @@ loading="lazy" /> <div class="rounded-full shadow-inner inset-0 absolute"></div> <span + v-if="indicator" :class="[ 'border-primary rounded-full border-2 h-3 -top-1 -right-1 w-3 absolute', - indicator, + indicatorStyles, ]" ></span> </div> @@ -38,6 +39,10 @@ type: String, default: "Profile picture", }, indicator: { + type: Boolean, + default: false, + }, + indicatorStyles: { type: String, default: "bg-green-500", }, diff --git a/components/teams/Edit.vue b/components/teams/Edit.vue index b2ad31a94ae49a5fd019e3c2d373983590f0b68c..f8e9a109ca15d99f9569e1ea19fc55f422161356 100644 --- a/components/teams/Edit.vue +++ b/components/teams/Edit.vue @@ -2,9 +2,9 @@ <SmartModal v-if="show" @close="hideModal"> <template #header> <h3 class="heading">{{ $t("team.edit") }}</h3> - <div> + <SmartModal v-if="show" @close="hideModal"> <ButtonSecondary icon="close" @click.native="hideModal" /> - </div> + <SmartModal v-if="show" @close="hideModal"> </template> <template #body> <div class="flex flex-col px-2"> @@ -58,7 +58,7 @@ readonly /> <span class="select-wrapper"> <tippy - ref="options" + ref="memberOptions" interactive tabindex="-1" trigger="click" @@ -89,24 +89,25 @@ <SmartItem label="OWNER" @click.native=" + <label for="selectLabelTeamEdit" class="font-semibold px-4 pb-4"> <template #body> - $refs.options.tippy().hide() + updateMemberRole(index, 'OWNER') " /> <SmartItem label="EDITOR" @click.native=" + <label for="selectLabelTeamEdit" class="font-semibold px-4 pb-4"> <template #body> - <div> - $refs.options.tippy().hide() + updateMemberRole(index, 'EDITOR') " /> <SmartItem label="VIEWER" @click.native=" + <label for="selectLabelTeamEdit" class="font-semibold px-4 pb-4"> <template #body> - </div> - $refs.options.tippy().hide() + updateMemberRole(index, 'VIEWER') " /> </tippy> @@ -123,7 +125,7 @@