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.

Sign up for GitHub

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

Jump to bottom

remove extra buttons that got added in during merge conflict resolution #746

Merged
merged 10 commits into from
Dec 27, 2022
Merged

remove extra buttons that got added in during merge conflict resolution #746

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3463738
Add transitions to event items
JustinStitt Sep 7, 2022
6617096
Add transitions to event items
JustinStitt Sep 7, 2022
b254b84
Support for non-javascript users
JustinStitt Sep 7, 2022
d7153c2
Ran `npm run all`
EthanThatOneKid Oct 4, 2022
2eef12e
fix event transitions fr
jaasonw Dec 26, 2022
856c8fc
Merge branch 'main' into event-transitions
jaasonw Dec 27, 2022
55843f0
remove lockfile
jaasonw Dec 27, 2022
3921b47
remove buttons that got added back in during merge conflict resolution
jaasonw Dec 27, 2022
cda511b
Merge branch 'main' into event-transitions
jaasonw Dec 27, 2022
7171cd1
formt
jaasonw Dec 27, 2022
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
60 changes: 0 additions & 60 deletions src/routes/(site)/events/event.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<script lang="ts">
import { onMount } from 'svelte';
import type { ClubEvent } from '$lib/public/events/event';
import { copy } from '$lib/public/copy/copy';
import BwIcon from '$lib/components/bw-icon/bw-icon.svelte';
import EventSummary from './event-summary.svelte';

export let info: ClubEvent;
Expand Down Expand Up @@ -84,64 +82,6 @@
{#if shown}
<EventSummary {info} />
{/if}

<div class="event-actionbar">
<button
class="action-item"
title="Copy event link"
on:click={() =>
copy(
info.selfLink,
'Copied event link to clipboard!',
'Failed to copy event link to clipboard!',
info.team.id
)}
>
<BwIcon src="/assets/svg/copy-link.svg" alt="copy link" />
</button>

<button
class="action-item"
title="Copy event summary"
on:click={() =>
copy(
info.summary,
'Copied event summary to clipboard!',
'Failed to copy event summary to clipboard!',
info.team.id
)}
>
<BwIcon src="/assets/svg/copy-text.svg" alt="Copy event summary" />
</button>

<button
class="action-item"
title="Copy Google Calendar link"
on:click={() =>
copy(
info.calendarLinks.google,
'Copied Google Calendar link to clipboard!',
'Failed to copy Google Calendar link to clipboard!',
info.team.id
)}
>
<BwIcon src="/assets/svg/calendar-google.svg" alt="Copy Google Calendar link" />
</button>

<button
class="action-item"
title="Copy Microsoft Outlook calendar link"
on:click={() =>
copy(
info.calendarLinks.outlook,
'Copied Microsoft Outlook calendar link to clipboard!',
'Failed to copy Microsoft Outlook calendar link to clipboard!',
info.team.id
)}
>
<BwIcon src="/assets/svg/calendar-outlook.svg" alt="Copy Outlook Calendar link" />
</button>
</div>
</details>
</div>

Expand Down