Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Domain Screen Minor Issues #1257

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/helpers/load.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export enum View {
export function getView(url: URL, route: Page['route'], fallback: View): View {
return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid
? View.Grid
: View.Table ?? fallback;
: (View.Table ?? fallback);
ItzNotABug marked this conversation as resolved.
Show resolved Hide resolved
}

export function getColumns(route: Page['route'], fallback: string[]): string[] {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/layout/unauthenticated.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
export let coupon: Coupon = null;

$: selectedCampaign = campaigns.get(coupon?.campaign ?? campaign);
$: variation = (coupon?.campaign ?? campaign ? selectedCampaign?.template : 'default') as
$: variation = ((coupon?.campaign ?? campaign) ? selectedCampaign?.template : 'default') as
| 'default'
| CampaignData['template'];

Expand Down
8 changes: 6 additions & 2 deletions src/lib/pages/domains/index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@
<TableBody>
{#each rules.rules as domain, i}
<TableRow>
<TableCellLink title="Domain" href={`http://${domain.domain}`} external noStyle>
<TableCellLink
title="Domain"
href={`https://${domain.domain}`}
external
noStyle>
<span class="u-flex u-gap-4 u-cross-center">
<Trim>
<span class="link">{domain.domain}</span>
Expand Down Expand Up @@ -130,7 +134,7 @@
{:else}
<Pill warning>
<span class="icon-clock u-text-color-gray" aria-hidden="true" />
<p class="text">Blocked by verification</p>
<p class="text">blocked by verification</p>
</Pill>
{/if}
</TableCell>
Expand Down
6 changes: 5 additions & 1 deletion src/lib/pages/domains/wizard/retry.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';

let retrying = false;
export let showTitle = true;

const dispatch = createEventDispatcher();

Expand All @@ -36,7 +37,10 @@
}
</script>

<Trim alternativeTrim><b>{$domain.domain}</b></Trim>
{#if showTitle}
<Trim alternativeTrim><b>{$domain.domain}</b></Trim>
{/if}

{#if $domain.status === 'created'}
<Box radius="small">
<div class="u-flex u-gap-8 u-cross-center">
Expand Down
2 changes: 1 addition & 1 deletion src/lib/pages/domains/wizard/step2.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<div class="boxes-wrapper u-margin-block-start-24">
{#if $domain.status === 'created'}
<Retry on:error={onRetryError} />
<Retry on:error={onRetryError} showTitle={false} />
{:else}
<div class="u-flex u-gap-8 u-cross-center">
<span class="icon-check u-color-text-success" aria-hidden="true" />
Expand Down
4 changes: 2 additions & 2 deletions src/lib/stores/feedback.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ export const feedbackData = createFeedbackDataStore();

function createFeedbackStore() {
const { subscribe, update } = writable<Feedback>({
elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) ?? 0 : 0,
visualized: browser ? parseInt(localStorage.getItem('feedbackVisualized')) ?? 0 : 0,
elapsed: browser ? (parseInt(localStorage.getItem('feedbackElapsed')) ?? 0) : 0,
visualized: browser ? (parseInt(localStorage.getItem('feedbackVisualized')) ?? 0) : 0,
notification: false,
type: 'general',
show: false
Expand Down