Organizing files a bit

src/App.svelte

@@ -24,43 +24,43 @@
   import {loadAppData} from "src/app"
   import alerts from "src/app/alerts"
   import {modal, routes, menuIsOpen, logUsage} from "src/app/ui"
-  import RelayCard from "src/partials/RelayCard.svelte"
+  import AddRelay from "src/views/relays/AddRelay.svelte"
+  import Alerts from "src/views/alerts/Alerts.svelte"
   import Anchor from 'src/partials/Anchor.svelte'
+  import Bech32Entity from "src/views/Bech32Entity.svelte"
+  import ChatDetail from "src/views/chat/ChatDetail.svelte"
+  import ChatEdit from "src/views/chat/ChatEdit.svelte"
+  import ChatList from "src/views/chat/ChatList.svelte"
+  import ConnectUser from "src/views/login/ConnectUser.svelte"
   import Content from 'src/partials/Content.svelte'
+  import Debug from "src/views/Debug.svelte"
   import EnsureData from 'src/partials/EnsureData.svelte'
+  import Keys from "src/views/Keys.svelte"
+  import Login from "src/views/login/Login.svelte"
+  import Logout from "src/views/login/Logout.svelte"
+  import MessagesDetail from "src/views/messages/MessagesDetail.svelte"
+  import MessagesList from "src/views/messages/MessagesList.svelte"
   import Modal from 'src/partials/Modal.svelte'
-  import SideNav from 'src/partials/SideNav.svelte'
+  import NotFound from "src/views/NotFound.svelte"
+  import NoteCreate from "src/views/notes/NoteCreate.svelte"
+  import NoteDetail from "src/views/notes/NoteDetail.svelte"
+  import NotesList from "src/views/notes/NotesList.svelte"
+  import PersonDetail from "src/views/person/PersonDetail.svelte"
+  import PersonList from "src/views/person/PersonList.svelte"
+  import PersonSettings from "src/views/person/PersonSettings.svelte"
+  import PersonShare from "src/views/person/PersonShare.svelte"
+  import PrivKeyLogin from "src/views/login/PrivKeyLogin.svelte"
+  import Profile from "src/views/Profile.svelte"
+  import PubKeyLogin from "src/views/login/PubKeyLogin.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
+  import RelayList from "src/views/relays/RelayList.svelte"
+  import Search from "src/views/search/Search.svelte"
+  import Settings from "src/views/Settings.svelte"
+  import SideNav from 'src/views/SideNav.svelte'
+  import SignUp from "src/views/login/SignUp.svelte"
   import Spinner from 'src/partials/Spinner.svelte'
-  import Toast from 'src/partials/Toast.svelte'
-  import TopNav from 'src/partials/TopNav.svelte'
-  import ChatEdit from "src/views/ChatEdit.svelte"
-  import NoteCreate from "src/views/NoteCreate.svelte"
-  import NoteDetail from "src/views/NoteDetail.svelte"
-  import PersonList from "src/views/PersonList.svelte"
-  import PersonSettings from "src/views/PersonSettings.svelte"
-  import PersonShare from "src/views/PersonShare.svelte"
-  import PrivKeyLogin from "src/views/PrivKeyLogin.svelte"
-  import PubKeyLogin from "src/views/PubKeyLogin.svelte"
-  import ConnectUser from "src/views/ConnectUser.svelte"
-  import SignUp from "src/views/SignUp.svelte"
-  import AddRelay from "src/routes/AddRelay.svelte"
-  import Alerts from "src/routes/Alerts.svelte"
-  import Bech32Entity from "src/routes/Bech32Entity.svelte"
-  import ChatList from "src/routes/ChatList.svelte"
-  import ChatDetail from "src/routes/ChatDetail.svelte"
-  import MessagesList from "src/routes/MessagesList.svelte"
-  import MessagesDetail from "src/routes/MessagesDetail.svelte"
-  import Debug from "src/routes/Debug.svelte"
-  import Keys from "src/routes/Keys.svelte"
-  import Login from "src/routes/Login.svelte"
-  import Logout from "src/routes/Logout.svelte"
-  import NotFound from "src/routes/NotFound.svelte"
-  import Notes from "src/routes/Notes.svelte"
-  import Person from "src/routes/Person.svelte"
-  import Profile from "src/routes/Profile.svelte"
-  import RelayList from "src/routes/RelayList.svelte"
-  import Search from "src/routes/Search.svelte"
-  import Settings from "src/routes/Settings.svelte"
+  import Toast from 'src/views/Toast.svelte'
+  import TopNav from 'src/views/TopNav.svelte'
 
   Object.assign(window, {cmd, database, user, keys, network, pool, sync})
 
@@ -179,12 +179,12 @@
       </Route>
       <Route path="/notes/:activeTab" let:params>
         <EnsureData>
-          <Notes activeTab={params.activeTab} />
+          <NotesList activeTab={params.activeTab} />
         </EnsureData>
       </Route>
       <Route path="/people/:npub/:activeTab" let:params>
         {#key params.npub}
-        <Person npub={params.npub} activeTab={params.activeTab} />
+        <PersonDetail npub={params.npub} activeTab={params.activeTab} />
         {/key}
       </Route>
       <Route path="/chat" component={ChatList} />

src/partials/EnsureData.svelte

@@ -2,10 +2,10 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
   import Modal from "src/partials/Modal.svelte"
-  import RelayCard from "src/partials/RelayCard.svelte"
-  import PersonInfo from "src/partials/PersonInfo.svelte"
-  import RelaySearch from "src/partials/RelaySearch.svelte"
-  import SearchPeople from "src/views/SearchPeople.svelte"
+  import PersonInfo from "src/views/person/PersonInfo.svelte"
+  import RelaySearch from "src/views/relays/RelaySearch.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
+  import SearchPeople from "src/views/search/SearchPeople.svelte"
   import database from 'src/agent/database'
   import user from 'src/agent/user'
 

src/views/Bech32Entity.svelte

@@ -3,8 +3,8 @@
   import {onMount} from 'svelte'
   import {nip19} from 'nostr-tools'
   import Content from 'src/partials/Content.svelte'
-  import NoteDetail from 'src/views/NoteDetail.svelte'
-  import Person from 'src/routes/Person.svelte'
+  import NoteDetail from 'src/views/notes/NoteDetail.svelte'
+  import Person from 'src/views/person/PersonDetail.svelte'
   import {getUserReadRelays} from 'src/agent/relays'
 
   export let entity

src/views/alerts/Alerts.svelte

@@ -9,7 +9,7 @@
   import Content from 'src/partials/Content.svelte'
   import Anchor from 'src/partials/Anchor.svelte'
   import ImageCircle from "src/partials/ImageCircle.svelte"
-  import Alert from 'src/partials/Alert.svelte'
+  import Alert from 'src/views/alerts/Alert.svelte'
   import database from 'src/agent/database'
   import {lastChecked} from 'src/app/alerts'
   import {modal, routes} from 'src/app/ui'

src/views/chat/ChatList.svelte

@@ -1,10 +1,10 @@
 <script>
   import {onMount} from 'svelte'
   import {fuzzy} from "src/util/misc"
-  import ChatListItem from "src/partials/ChatListItem.svelte"
   import Input from "src/partials/Input.svelte"
   import Content from "src/partials/Content.svelte"
   import Anchor from "src/partials/Anchor.svelte"
+  import ChatListItem from "src/views/chat/ChatListItem.svelte"
   import database from 'src/agent/database'
   import network from 'src/agent/network'
   import {getUserReadRelays} from 'src/agent/relays'

src/views/login/ConnectUser.svelte

@@ -9,7 +9,7 @@
   import Spinner from 'src/partials/Spinner.svelte'
   import Input from 'src/partials/Input.svelte'
   import Heading from 'src/partials/Heading.svelte'
-  import RelayCardSimple from 'src/partials/RelayCardSimple.svelte'
+  import RelayCardSimple from 'src/views/relays/RelayCardSimple.svelte'
   import Anchor from 'src/partials/Anchor.svelte'
   import Modal from 'src/partials/Modal.svelte'
   import {getUserReadRelays} from 'src/agent/relays'

src/views/messages/MessagesList.svelte

@@ -1,9 +1,9 @@
 <script>
   import {sortBy} from 'ramda'
   import {toTitle} from 'hurdak/lib/hurdak'
-  import Content from "src/partials/Content.svelte"
-  import MessagesListItem from "src/partials/MessagesListItem.svelte"
   import Tabs from "src/partials/Tabs.svelte"
+  import Content from "src/partials/Content.svelte"
+  import MessagesListItem from "src/views/messages/MessagesListItem.svelte"
   import database from 'src/agent/database'
 
   let activeTab = 'messages'

src/views/messages/MessagesListItem.svelte

@@ -9,7 +9,6 @@
 
   export let contact
 
-  console.log(contact, $lastChecked[contact.pubkey])
   const newMessages = contact.lastMessage > $lastChecked[contact.pubkey]
   const person = database.getPersonWithFallback(contact.pubkey)
   const enter = () => navigate(`/messages/${nip19.npubEncode(contact.pubkey)}`)

src/views/notes/Feed.svelte

@@ -7,7 +7,7 @@
   import {asDisplayEvent, Tags} from 'src/util/nostr'
   import Spinner from 'src/partials/Spinner.svelte'
   import Content from 'src/partials/Content.svelte'
-  import Note from "src/partials/Note.svelte"
+  import Note from "src/views/notes/Note.svelte"
   import user from 'src/agent/user'
   import network from 'src/agent/network'
   import {modal} from "src/app/ui"

src/views/notes/Follows.svelte

@@ -1,6 +1,6 @@
 <script>
   import {shuffle} from 'src/util/misc'
-  import Notes from "src/partials/Notes.svelte"
+  import Notes from "src/views/notes/Feed.svelte"
   import {getUserFollows} from 'src/agent/social'
   import {sampleRelays, getAllPubkeyWriteRelays} from 'src/agent/relays'
 

src/views/notes/Network.svelte

@@ -1,6 +1,6 @@
 <script>
   import {shuffle} from 'src/util/misc'
-  import Notes from "src/partials/Notes.svelte"
+  import Notes from "src/views/notes/Feed.svelte"
   import {getUserNetwork} from 'src/agent/social'
   import {sampleRelays, getAllPubkeyWriteRelays} from 'src/agent/relays'
 

src/views/notes/NoteCreate.svelte

@@ -9,7 +9,7 @@
   import Button from "src/partials/Button.svelte"
   import Compose from "src/partials/Compose.svelte"
   import Input from "src/partials/Input.svelte"
-  import RelayCardSimple from "src/partials/RelayCardSimple.svelte"
+  import RelayCardSimple from "src/views/relays/RelayCardSimple.svelte"
   import Content from "src/partials/Content.svelte"
   import Modal from "src/partials/Modal.svelte"
   import Heading from 'src/partials/Heading.svelte'

src/views/notes/NoteDetail.svelte

@@ -5,9 +5,9 @@
   import {first} from 'hurdak/lib/hurdak'
   import {log} from 'src/util/logger'
   import {asDisplayEvent} from 'src/util/nostr'
-  import Note from 'src/partials/Note.svelte'
   import Content from 'src/partials/Content.svelte'
   import Spinner from 'src/partials/Spinner.svelte'
+  import Note from 'src/views/notes/Note.svelte'
   import network from 'src/agent/network'
   import {sampleRelays} from 'src/agent/relays'
 

src/views/notes/NotesList.svelte

@@ -2,8 +2,8 @@
   import {navigate} from 'svelte-routing'
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
-  import NewNoteButton from "src/partials/NewNoteButton.svelte"
   import Tabs from "src/partials/Tabs.svelte"
+  import NewNoteButton from "src/views/notes/NewNoteButton.svelte"
   import Follows from "src/views/notes/Follows.svelte"
   import Network from "src/views/notes/Network.svelte"
   import user from 'src/agent/user'

src/views/person/Likes.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Notes from "src/partials/Notes.svelte"
+  import Notes from "src/views/notes/Feed.svelte"
   import {sampleRelays, getPubkeyWriteRelays} from 'src/agent/relays'
 
   export let pubkey

src/views/person/Notes.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Notes from "src/partials/Notes.svelte"
+  import Notes from "src/views/notes/Feed.svelte"
   import {sampleRelays, getPubkeyWriteRelays} from 'src/agent/relays'
 
   export let pubkey

src/views/person/PersonDetail.svelte

@@ -9,9 +9,9 @@
   import {displayPerson, Tags, toHex} from 'src/util/nostr'
   import Tabs from "src/partials/Tabs.svelte"
   import Content from "src/partials/Content.svelte"
-  import NewNoteButton from "src/partials/NewNoteButton.svelte"
   import Anchor from "src/partials/Anchor.svelte"
   import Spinner from "src/partials/Spinner.svelte"
+  import NewNoteButton from "src/views/notes/NewNoteButton.svelte"
   import Notes from "src/views/person/Notes.svelte"
   import Likes from "src/views/person/Likes.svelte"
   import Relays from "src/views/person/Relays.svelte"

src/views/person/PersonList.svelte

@@ -1,6 +1,6 @@
 <script type="ts">
   import Content from 'src/partials/Content.svelte'
-  import PersonInfo from 'src/partials/PersonInfo.svelte'
+  import PersonInfo from 'src/views/person/PersonInfo.svelte'
   import database from 'src/agent/database'
   import network from 'src/agent/network'
 

src/views/person/Relays.svelte

@@ -1,7 +1,7 @@
 <script>
   import {fly} from 'svelte/transition'
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/partials/RelayCard.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
 
   export let person
 </script>

src/views/relays/RelayList.svelte

@@ -1,9 +1,9 @@
 <script>
   import {fly} from 'svelte/transition'
   import Anchor from "src/partials/Anchor.svelte"
-  import RelaySearch from "src/partials/RelaySearch.svelte"
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/partials/RelayCard.svelte"
+  import RelaySearch from "src/views/relays/RelaySearch.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
   import user from "src/agent/user"
   import {modal} from "src/app/ui"
 

src/views/relays/RelaySearch.svelte

@@ -2,7 +2,7 @@
   import {pluck} from 'ramda'
   import {fuzzy} from "src/util/misc"
   import Input from "src/partials/Input.svelte"
-  import RelayCard from "src/partials/RelayCard.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
   import database from 'src/agent/database'
   import user from "src/agent/user"
 

src/views/search/Search.svelte

@@ -2,8 +2,8 @@
   import {navigate} from 'svelte-routing'
   import Content from 'src/partials/Content.svelte'
   import Tabs from 'src/partials/Tabs.svelte'
-  import SearchPeople from 'src/views/SearchPeople.svelte'
-  import Scan from 'src/views/Scan.svelte'
+  import SearchPeople from 'src/views/search/SearchPeople.svelte'
+  import Scan from 'src/views/search/Scan.svelte'
 
   export let activeTab
 

src/views/search/SearchPeople.svelte

@@ -3,7 +3,7 @@
   import {personKinds} from "src/util/nostr"
   import Input from "src/partials/Input.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import PersonInfo from 'src/partials/PersonInfo.svelte'
+  import PersonInfo from 'src/views/person/PersonInfo.svelte'
   import {getUserReadRelays} from 'src/agent/relays'
   import database from 'src/agent/database'
   import network from 'src/agent/network'