coracle-social · ticruz38 · Nov 4, 2024 · Nov 2, 2024 · Nov 2, 2024
diff --git a/src/app/App.svelte b/src/app/App.svelte
@@ -34,13 +34,7 @@
   import FeedCreate from "src/app/views/FeedCreate.svelte"
   import FeedEdit from "src/app/views/FeedEdit.svelte"
   import FeedList from "src/app/views/FeedList.svelte"
-  import GroupCreate from "src/app/views/GroupCreate.svelte"
-  import GroupDelete from "src/app/views/GroupDelete.svelte"
-  import GroupDetail from "src/app/views/GroupDetail.svelte"
-  import GroupEdit from "src/app/views/GroupEdit.svelte"
-  import GroupInfo from "src/app/views/GroupInfo.svelte"
   import GroupList from "src/app/views/GroupList.svelte"
-  import GroupRotate from "src/app/views/GroupRotate.svelte"
   import Help from "src/app/views/Help.svelte"
   import Home from "src/app/views/Home.svelte"
   import InviteAccept from "src/app/views/InviteAccept.svelte"
@@ -51,13 +45,10 @@
   import ListEdit from "src/app/views/ListEdit.svelte"
   import ListList from "src/app/views/ListList.svelte"
   import ListSelect from "src/app/views/ListSelect.svelte"
-  import ListingDelete from "src/app/views/ListingDelete.svelte"
-  import ListingEdit from "src/app/views/ListingEdit.svelte"
   import Login from "src/app/views/Login.svelte"
   import LoginBunker from "src/app/views/LoginBunker.svelte"
   import LoginConnect from "src/app/views/LoginConnect.svelte"
   import Logout from "src/app/views/Logout.svelte"
-  import Market from "src/app/views/Market.svelte"
   import MediaDetail from "src/app/views/MediaDetail.svelte"
   import NoteCreate from "src/app/views/NoteCreate.svelte"
   import NoteDelete from "src/app/views/NoteDelete.svelte"
@@ -141,55 +132,6 @@
   })
 
   router.register("/groups", GroupList)
-  router.register("/groups/new", GroupCreate, {
-    requireSigner: true,
-  })
-  router.register("/groups/:address/edit", GroupEdit, {
-    requireSigner: true,
-    serializers: {
-      address: asNaddr("address"),
-    },
-  })
-  router.register("/groups/:address/delete", GroupDelete, {
-    requireSigner: true,
-    serializers: {
-      address: asNaddr("address"),
-    },
-  })
-  router.register("/groups/:address/info", GroupInfo, {
-    serializers: {
-      address: asNaddr("address"),
-    },
-  })
-  router.register(
-    "/groups/:address/invite-admin",
-    import("src/app/views/GroupInviteAdmin.svelte"),
-    {
-      serializers: {
-        address: asNaddr("address"),
-      },
-    },
-  )
-  router.register("/groups/:address/rotate", GroupRotate, {
-    requireSigner: true,
-    serializers: {
-      address: asNaddr("address"),
-      addMembers: asCsv("addMembers"),
-      removeMembers: asCsv("removeMembers"),
-    },
-  })
-  router.register("/groups/:address/:activeTab", GroupDetail, {
-    serializers: {
-      address: asNaddr("address"),
-      claim: asString("claim"),
-    },
-  })
-  router.register("/groups/:address", GroupDetail, {
-    serializers: {
-      address: asNaddr("address"),
-      claim: asString("claim"),
-    },
-  })
 
   router.register("/help/:topic", Help)
 
@@ -241,20 +183,6 @@
   })
   router.register("/logout", Logout)
 
-  router.register("/listings", Market)
-  router.register("/listings/:address/edit", ListingEdit, {
-    requireSigner: true,
-    serializers: {
-      address: asNaddr("address"),
-    },
-  })
-  router.register("/listings/:address/delete", ListingDelete, {
-    requireSigner: true,
-    serializers: {
-      address: asNaddr("address"),
-    },
-  })
-
   router.register("/media/:url", MediaDetail, {
     serializers: {
       url: asUrlComponent("url"),

diff --git a/src/app/MenuDesktop.svelte b/src/app/MenuDesktop.svelte
@@ -109,16 +109,9 @@
       {/if}
     </div>
   </MenuDesktopItem>
-  <MenuDesktopItem path="/events" isActive={$page?.path.startsWith("/events")}
-    >Calendar</MenuDesktopItem>
-  {#if env.ENABLE_MARKET}
-    <MenuDesktopItem path="/listings" isActive={$page?.path.startsWith("/listings")}
-      >Market</MenuDesktopItem>
-  {/if}
-  {#if !env.FORCE_GROUP}
-    <MenuDesktopItem path="/groups" isActive={$page?.path.startsWith("/groups")}
-      >Groups</MenuDesktopItem>
-  {/if}
+  <MenuDesktopItem modal path="/groups">
+    Groups
+  </MenuDesktopItem>
   <FlexColumn small class="absolute bottom-0 w-72">
     <Anchor
       class="staatliches px-8 text-tinted-400 hover:text-tinted-100"

diff --git a/src/app/MenuMobile.svelte b/src/app/MenuMobile.svelte
@@ -26,10 +26,6 @@
     subMenu = name
   }
 
-  const openCommunity = e => {
-    setSubMenu("community")
-  }
-
   const openSettings = e => {
     setSubMenu("settings")
   }
@@ -94,20 +90,9 @@
           {/if}
         </div>
       </MenuMobileItem>
-      {#if env.FORCE_GROUP}
-        <MenuMobileItem href="/events" on:click={closeMenu}>
-          <i class="fa fa-calendar-days" /> Calendar
-        </MenuMobileItem>
-        {#if env.ENABLE_MARKET}
-          <MenuMobileItem href="/listings" on:click={closeMenu}>
-            <i class="fa fa-store" /> Market
-          </MenuMobileItem>
-        {/if}
-      {:else}
-        <MenuMobileItem stopPropagation on:click={openCommunity}>
-          <i class="fa fa-people-pulling" /> Community
-        </MenuMobileItem>
-      {/if}
+      <MenuMobileItem modal href="/groups" on:click={closeMenu}>
+        <i class="fa fa-circle-nodes" /> Groups
+      </MenuMobileItem>
       <MenuMobileItem disabled={!$signer} href="/channels" on:click={closeMenu}>
         <i class="fa fa-message" />
         <div class="relative inline-block">
@@ -130,27 +115,6 @@
   </SliderMenu>
 {/if}
 
-{#if subMenu === "community"}
-  <SliderMenu onEscape={closeSubMenu}>
-    <p class="staatliches mb-8 text-center text-3xl">Community</p>
-    <div class="staatliches m-auto grid grid-cols-2 gap-3">
-      <MenuMobileItem href="/events" on:click={closeMenu}>
-        <i class="fa fa-calendar-days" /> Calendar
-      </MenuMobileItem>
-      {#if env.ENABLE_MARKET}
-        <MenuMobileItem href="/listings" on:click={closeMenu}>
-          <i class="fa fa-store" /> Market
-        </MenuMobileItem>
-      {/if}
-      {#if !env.FORCE_GROUP}
-        <MenuMobileItem href="/groups" on:click={closeMenu}>
-          <i class="fa fa-circle-nodes" /> Groups
-        </MenuMobileItem>
-      {/if}
-    </div>
-  </SliderMenu>
-{/if}
-
 {#if subMenu === "settings"}
   <SliderMenu onEscape={closeSubMenu}>
     <p class="staatliches mb-8 text-center text-3xl">Settings</p>

diff --git a/src/app/views/GroupList.svelte b/src/app/views/GroupList.svelte
@@ -1,95 +1,18 @@
-<script>
-  import {onMount} from "svelte"
-  import {filter, reject} from "ramda"
-  import {derived} from "svelte/store"
-  import {ctx, shuffle} from "@welshman/lib"
-  import {GROUP, COMMUNITY, COMMUNITIES, getAddress, getIdFilters} from "@welshman/util"
-  import {pubkey} from "@welshman/app"
-  import {createScroller} from "src/util/misc"
+<script lang="ts">
+  import {appName} from "src/partials/state"
   import Anchor from "src/partials/Anchor.svelte"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import Input from "src/partials/Input.svelte"
-  import GroupListItem from "src/app/shared/GroupListItem.svelte"
-  import {
-    load,
-    groups,
-    userIsGroupMember,
-    communityListsByAddress,
-    groupMetaSearch,
-    groupMeta,
-    userFollows,
-    addSinceToFilter,
-  } from "src/engine"
-
-  const loadMore = async () => {
-    limit += 20
-  }
-
-  const userIsMember = meta => $userIsGroupMember(getAddress(meta.event), true)
-
-  const userGroupMeta = derived(groupMeta, filter(userIsMember))
-
-  let q = ""
-  let limit = 20
-  let element = null
-
-  $: otherGroupMeta = reject(userIsMember, $groupMetaSearch.searchOptions(q)).slice(0, limit)
-
-  document.title = "Groups"
-
-  onMount(() => {
-    const scroller = createScroller(loadMore, {element})
-    const communityAddrs = Array.from($communityListsByAddress.keys()).filter(
-      a => !groups.key(a).get()?.meta,
-    )
-
-    if ($pubkey) {
-      load({
-        skipCache: true,
-        forcePlatform: false,
-        filters: [
-          addSinceToFilter({kinds: [COMMUNITIES], authors: [$pubkey, ...Array.from($userFollows)]}),
-        ],
-      })
-    }
-
-    load({
-      skipCache: true,
-      relays: ctx.app.router.User().getUrls(),
-      filters: [{kinds: [GROUP, COMMUNITY], limit: 1000 - communityAddrs.length}],
-    })
-
-    load({
-      skipCache: true,
-      forcePlatform: false,
-      relays: ctx.app.router.User().getUrls(),
-      filters: getIdFilters(shuffle(communityAddrs).slice(0, 1000)),
-    })
-
-    return () => scroller.stop()
-  })
+  import Media from "src/partials/Media.svelte"
+  import Modal from "src/partials/Modal.svelte"
 </script>
 
-<FlexColumn bind:element>
-  <div class="flex justify-between">
-    <div class="flex items-center gap-2">
-      <i class="fa fa-circle-nodes fa-lg" />
-      <h2 class="staatliches text-2xl">Your groups</h2>
-    </div>
-    <Anchor modal button accent href="/groups/new">
-      <i class="fa-solid fa-plus" /> Create
-    </Anchor>
-  </div>
-  {#each $userGroupMeta as meta (meta.event.id)}
-    <GroupListItem address={getAddress(meta.event)} />
-  {:else}
-    <p class="text-center py-8">You haven't yet joined any groups.</p>
-  {/each}
-  <div class="mb-2 border-b border-solid border-neutral-600 pt-2" />
-  <Input bind:value={q} type="text" class="flex-grow" placeholder="Search groups">
-    <i slot="before" class="fa-solid fa-search" />
-  </Input>
-  {#each otherGroupMeta as meta (meta.event.id)}
-    <GroupListItem address={getAddress(meta.event)} />
-  {/each}
-</FlexColumn>
+<div class="flex gap-3">
+  <p class="text-2xl font-bold">Groups are going away!</p>
+</div>
+<p>
+  You can still access your groups at <strong>groups.coracle.social</strong>,
+  or you can try our new relay-based groups client at <strong>flotilla.social</strong>.
+</p>
+<div class="flex justify-end gap-2">
+  <Anchor external button href="https://groups.coracle.social">Continue to Groups</Anchor>
+  <Anchor external button accent href="https://flotilla.social">Try Flotilla</Anchor>
+</div>
diff --git a/src/app/views/ListingDelete.svelte b/src/app/views/ListingDelete.svelte