From d8ead05309a59525bf87e5a9659ac91e2ab92f86 Mon Sep 17 00:00:00 2001 From: Tyler Brown Cifu Shuster Date: Fri, 14 Aug 2020 15:04:38 -0700 Subject: [PATCH 1/2] interface: adds absolute path resolution to imports --- pkg/interface/.babelrc | 14 ++++++++++ pkg/interface/package-lock.json | Bin 458814 -> 459438 bytes pkg/interface/package.json | 1 + pkg/interface/src/logic/api/base.ts | 2 +- pkg/interface/src/logic/api/chat.ts | 4 +-- pkg/interface/src/logic/api/contacts.ts | 6 ++-- pkg/interface/src/logic/api/global.ts | 2 +- pkg/interface/src/logic/api/groups.ts | 4 +-- pkg/interface/src/logic/api/invite.ts | 2 +- pkg/interface/src/logic/api/links.ts | 2 +- pkg/interface/src/logic/api/metadata.ts | 2 +- pkg/interface/src/logic/api/publish.ts | 6 ++-- pkg/interface/src/logic/lib/group.ts | 4 +-- .../src/logic/reducers/chat-update.ts | 6 ++-- .../src/logic/reducers/connection.ts | 2 +- .../src/logic/reducers/contact-update.ts | 4 +-- .../src/logic/reducers/group-update.ts | 6 ++-- .../src/logic/reducers/invite-update.ts | 4 +-- .../src/logic/reducers/launch-update.ts | 4 +-- .../src/logic/reducers/link-update.ts | 2 +- .../src/logic/reducers/listen-update.ts | 4 +-- pkg/interface/src/logic/reducers/local.ts | 4 +-- .../src/logic/reducers/metadata-update.ts | 4 +-- .../src/logic/reducers/permission-update.ts | 4 +-- .../src/logic/reducers/publish-response.ts | 2 +- .../src/logic/reducers/publish-update.ts | 6 ++-- pkg/interface/src/logic/reducers/s3-update.ts | 4 +-- pkg/interface/src/logic/store/store.ts | 2 +- pkg/interface/src/logic/store/type.ts | 26 +++++++++--------- pkg/interface/src/logic/subscription/base.ts | 2 +- .../src/logic/subscription/global.ts | 2 +- pkg/interface/src/views/App.js | 10 +++---- pkg/interface/src/views/apps/chat/app.tsx | 10 +++---- .../src/views/apps/chat/components/chat.tsx | 18 ++++++------ .../src/views/apps/chat/components/join.js | 2 +- .../apps/chat/components/lib/chat-header.js | 4 +-- .../apps/chat/components/lib/chat-input.js | 4 +-- .../components/lib/chat-scroll-container.js | 2 +- .../chat/components/lib/groupify-button.js | 4 +-- .../chat/components/lib/invite-element.js | 4 +-- .../views/apps/chat/components/lib/message.js | 2 +- .../chat/components/lib/metadata-color.js | 2 +- .../chat/components/lib/metadata-settings.js | 2 +- .../apps/chat/components/lib/overlay-sigil.js | 2 +- .../chat/components/lib/profile-overlay.js | 4 +-- .../apps/chat/components/lib/s3-upload.js | 2 +- .../src/views/apps/chat/components/new-dm.js | 6 ++-- .../src/views/apps/chat/components/new.js | 6 ++-- .../views/apps/chat/components/settings.js | 6 ++-- .../src/views/apps/chat/components/sidebar.js | 4 +-- .../views/apps/chat/components/skeleton.js | 2 +- .../src/views/apps/dojo/components/input.js | 4 +-- pkg/interface/src/views/apps/groups/app.tsx | 8 +++--- .../src/views/apps/groups/components/join.js | 2 +- .../groups/components/lib/add-contact.tsx | 10 +++---- .../groups/components/lib/contact-card.js | 6 ++-- .../groups/components/lib/contact-item.js | 4 +-- .../groups/components/lib/contact-sidebar.tsx | 16 +++++------ .../groups/components/lib/group-detail.js | 10 +++---- .../groups/components/lib/group-sidebar.js | 6 ++-- .../apps/groups/components/lib/s3-upload.js | 2 +- .../src/views/apps/groups/components/new.tsx | 14 +++++----- .../views/apps/groups/components/skeleton.js | 2 +- .../apps/launch/components/tiles/basic.js | 2 +- pkg/interface/src/views/apps/links/app.js | 2 +- .../links/components/lib/channel-sidebar.js | 4 +-- .../links/components/lib/channels-item.js | 2 +- .../apps/links/components/lib/comment-item.js | 4 +-- .../components/lib/comments-pagination.js | 2 +- .../apps/links/components/lib/comments.js | 2 +- .../links/components/lib/invite-element.js | 4 +-- .../components/lib/link-detail-preview.js | 2 +- .../apps/links/components/lib/link-item.js | 4 +-- .../apps/links/components/lib/link-submit.js | 2 +- .../apps/links/components/lib/links-tabbar.js | 2 +- .../links/components/lib/member-element.js | 4 +-- .../apps/links/components/lib/pagination.js | 2 +- .../src/views/apps/links/components/link.js | 6 ++-- .../views/apps/links/components/links-list.js | 4 +-- .../src/views/apps/links/components/member.js | 6 ++-- .../src/views/apps/links/components/new.js | 6 ++-- .../views/apps/links/components/settings.js | 6 ++-- .../views/apps/links/components/skeleton.js | 2 +- .../publish/components/lib/comment-item.js | 4 +-- .../apps/publish/components/lib/comments.js | 4 +-- .../apps/publish/components/lib/edit-post.js | 6 ++-- .../views/apps/publish/components/lib/join.js | 2 +- .../apps/publish/components/lib/new-post.js | 6 ++-- .../views/apps/publish/components/lib/new.js | 6 ++-- .../views/apps/publish/components/lib/note.js | 6 ++-- .../publish/components/lib/notebook-posts.js | 2 +- .../apps/publish/components/lib/notebook.js | 6 ++-- .../apps/publish/components/lib/settings.js | 6 ++-- .../apps/publish/components/lib/sidebar.js | 4 +-- .../publish/components/lib/subscribers.js | 4 +-- .../views/apps/publish/components/skeleton.js | 2 +- pkg/interface/src/views/components/Group.tsx | 12 ++++---- .../src/views/components/InviteSearch.tsx | 10 +++---- pkg/interface/src/views/components/Omnibox.js | 4 +-- .../src/views/components/OmniboxResult.js | 2 +- .../src/views/components/SidebarInvite.tsx | 2 +- 101 files changed, 244 insertions(+), 229 deletions(-) create mode 100644 pkg/interface/.babelrc diff --git a/pkg/interface/.babelrc b/pkg/interface/.babelrc new file mode 100644 index 000000000..79bef5613 --- /dev/null +++ b/pkg/interface/.babelrc @@ -0,0 +1,14 @@ +{ + "plugins": [ + [ + "babel-plugin-root-import", + { + "paths": [ + { + "rootPathSuffix": "./src" + } + ] + } + ] + ] +} \ No newline at end of file diff --git a/pkg/interface/package-lock.json b/pkg/interface/package-lock.json index c3f717ee9f9f7ff6afa67960c4f8c67b7db1dfcf..876bcf0cc0e7c79dec300e2fed25b96bc6032fc2 100644 GIT binary patch delta 352 zcmdnjAhWJjreO=#YFyG89%hXZdDI_Y;)z{I?Kg=}KExj_zFu*gT zDBr8FaC+keMl;spoW$ac>4hrH!qXSzF!4_3o5sjCU9yZ-y1j2EBM>tIG4uAmnJh0` znG%bq2O2QSOc!uwHRcBC13Dk1fBHjt7R}If%Rs}7#MGopV>AEY;F9trle`jVcX#(h z@8ZO;;H*G1i!`T-{J`YWk{r{tV8gP~NJ9$`4t|`RN71BS+|$Uvz>eZ0Qr4+Z2$lO delta 44 ycmZ42DzmRareO { diff --git a/pkg/interface/src/logic/api/chat.ts b/pkg/interface/src/logic/api/chat.ts index 3e5f98960..bd16529cf 100644 --- a/pkg/interface/src/logic/api/chat.ts +++ b/pkg/interface/src/logic/api/chat.ts @@ -1,7 +1,7 @@ import BaseApi from './base'; import { uuid } from '../lib/util'; -import { Letter, ChatAction, Envelope } from '../types/chat-update'; -import { Patp, Path, PatpNoSig } from '../types/noun'; +import { Letter, ChatAction, Envelope } from '~/types/chat-update'; +import { Patp, Path, PatpNoSig } from '~/types/noun'; import { StoreState } from '../store/type'; import BaseStore from '../store/base'; diff --git a/pkg/interface/src/logic/api/contacts.ts b/pkg/interface/src/logic/api/contacts.ts index 066a0a534..27f8faf25 100644 --- a/pkg/interface/src/logic/api/contacts.ts +++ b/pkg/interface/src/logic/api/contacts.ts @@ -1,8 +1,8 @@ import BaseApi from './base'; import { StoreState } from '../store/type'; -import { Patp, Path, Enc } from '../types/noun'; -import { Contact, ContactEdit } from '../types/contact-update'; -import { GroupPolicy, Resource } from '../types/group-update'; +import { Patp, Path, Enc } from '~/types/noun'; +import { Contact, ContactEdit } from '~/types/contact-update'; +import { GroupPolicy, Resource } from '~/types/group-update'; export default class ContactsApi extends BaseApi { create( diff --git a/pkg/interface/src/logic/api/global.ts b/pkg/interface/src/logic/api/global.ts index 9a06e48b5..f30f53026 100644 --- a/pkg/interface/src/logic/api/global.ts +++ b/pkg/interface/src/logic/api/global.ts @@ -1,4 +1,4 @@ -import { Patp } from '../types/noun'; +import { Patp } from '~/types/noun'; import BaseApi from './base'; import ChatApi from './chat'; import { StoreState } from '../store/type'; diff --git a/pkg/interface/src/logic/api/groups.ts b/pkg/interface/src/logic/api/groups.ts index a4fff41a2..60f98aef8 100644 --- a/pkg/interface/src/logic/api/groups.ts +++ b/pkg/interface/src/logic/api/groups.ts @@ -1,13 +1,13 @@ import BaseApi from './base'; import { StoreState } from '../store/type'; -import { Path, Patp, Enc } from '../types/noun'; +import { Path, Patp, Enc } from '~/types/noun'; import { GroupAction, GroupPolicy, Resource, Tag, GroupPolicyDiff, -} from '../types/group-update'; +} from '~/types/group-update'; export default class GroupsApi extends BaseApi { remove(resource: Resource, ships: Patp[]) { diff --git a/pkg/interface/src/logic/api/invite.ts b/pkg/interface/src/logic/api/invite.ts index 0e81ffec3..432a266bc 100644 --- a/pkg/interface/src/logic/api/invite.ts +++ b/pkg/interface/src/logic/api/invite.ts @@ -1,6 +1,6 @@ import BaseApi from "./base"; import { StoreState } from "../store/type"; -import { Serial, Path } from "../types/noun"; +import { Serial, Path } from "~/types/noun"; export default class InviteApi extends BaseApi { accept(app: Path, uid: Serial) { diff --git a/pkg/interface/src/logic/api/links.ts b/pkg/interface/src/logic/api/links.ts index de4af1e90..bb6e5812c 100644 --- a/pkg/interface/src/logic/api/links.ts +++ b/pkg/interface/src/logic/api/links.ts @@ -2,7 +2,7 @@ import { stringToTa } from '../lib/util'; import BaseApi from './base'; import { StoreState } from '../store/type'; -import { Path } from '../types/noun'; +import { Path } from '~/types/noun'; export default class LinksApi extends BaseApi { diff --git a/pkg/interface/src/logic/api/metadata.ts b/pkg/interface/src/logic/api/metadata.ts index 723abb9b1..216485ec6 100644 --- a/pkg/interface/src/logic/api/metadata.ts +++ b/pkg/interface/src/logic/api/metadata.ts @@ -1,7 +1,7 @@ import BaseApi from './base'; import { StoreState } from '../store/type'; -import { Path, Patp } from '../types/noun'; +import { Path, Patp } from '~/types/noun'; export default class MetadataApi extends BaseApi { diff --git a/pkg/interface/src/logic/api/publish.ts b/pkg/interface/src/logic/api/publish.ts index 4b60e66a1..ced75c480 100644 --- a/pkg/interface/src/logic/api/publish.ts +++ b/pkg/interface/src/logic/api/publish.ts @@ -1,7 +1,7 @@ import BaseApi from './base'; -import { PublishResponse } from '../types/publish-response'; -import { PatpNoSig } from '../types/noun'; -import { BookId, NoteId } from '../types/publish-update'; +import { PublishResponse } from '~/types/publish-response'; +import { PatpNoSig } from '~/types/noun'; +import { BookId, NoteId } from '~/types/publish-update'; export default class PublishApi extends BaseApi { handleEvent(data: PublishResponse) { diff --git a/pkg/interface/src/logic/lib/group.ts b/pkg/interface/src/logic/lib/group.ts index 2078ed368..64b035b51 100644 --- a/pkg/interface/src/logic/lib/group.ts +++ b/pkg/interface/src/logic/lib/group.ts @@ -1,5 +1,5 @@ -import { roleTags, RoleTags, Group, Resource } from '../../types/group-update'; -import { PatpNoSig, Path } from '../../types/noun'; +import { roleTags, RoleTags, Group, Resource } from '~/types/group-update'; +import { PatpNoSig, Path } from '~/types/noun'; export function roleForShip(group: Group, ship: PatpNoSig): RoleTags | undefined { diff --git a/pkg/interface/src/logic/reducers/chat-update.ts b/pkg/interface/src/logic/reducers/chat-update.ts index 5efe9cc23..292175038 100644 --- a/pkg/interface/src/logic/reducers/chat-update.ts +++ b/pkg/interface/src/logic/reducers/chat-update.ts @@ -1,8 +1,8 @@ import _ from 'lodash'; import { StoreState } from '../../../store/type'; -import { Cage } from '../../types/cage'; -import { ChatUpdate } from '../../types/chat-update'; -import { ChatHookUpdate } from '../../types/chat-hook-update'; +import { Cage } from '~/types/cage'; +import { ChatUpdate } from '~/types/chat-update'; +import { ChatHookUpdate } from '~/types/chat-hook-update'; type ChatState = Pick; diff --git a/pkg/interface/src/logic/reducers/connection.ts b/pkg/interface/src/logic/reducers/connection.ts index cc0aba6f0..958465433 100644 --- a/pkg/interface/src/logic/reducers/connection.ts +++ b/pkg/interface/src/logic/reducers/connection.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { Cage } from '../../types/cage'; +import { Cage } from '~/types/cage'; type LocalState = Pick; diff --git a/pkg/interface/src/logic/reducers/contact-update.ts b/pkg/interface/src/logic/reducers/contact-update.ts index c559d7b7e..88a527ed1 100644 --- a/pkg/interface/src/logic/reducers/contact-update.ts +++ b/pkg/interface/src/logic/reducers/contact-update.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { Cage } from '../../types/cage'; -import { ContactUpdate } from '../../types/contact-update'; +import { Cage } from '~/types/cage'; +import { ContactUpdate } from '~/types/contact-update'; type ContactState = Pick; diff --git a/pkg/interface/src/logic/reducers/group-update.ts b/pkg/interface/src/logic/reducers/group-update.ts index 1f584cbf1..09adb35b2 100644 --- a/pkg/interface/src/logic/reducers/group-update.ts +++ b/pkg/interface/src/logic/reducers/group-update.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { Cage } from '../../types/cage'; +import { Cage } from '~/types/cage'; import { GroupUpdate, Group, @@ -11,8 +11,8 @@ import { OpenPolicy, InvitePolicyDiff, InvitePolicy, -} from '../../types/group-update'; -import { Enc, PatpNoSig } from '../../types/noun'; +} from '~/types/group-update'; +import { Enc, PatpNoSig } from '~/types/noun'; import { resourceAsPath } from '../lib/util'; type GroupState = Pick; diff --git a/pkg/interface/src/logic/reducers/invite-update.ts b/pkg/interface/src/logic/reducers/invite-update.ts index 512e21b7f..bdeba0e4f 100644 --- a/pkg/interface/src/logic/reducers/invite-update.ts +++ b/pkg/interface/src/logic/reducers/invite-update.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { Cage } from '../../types/cage'; -import { InviteUpdate } from '../../types/invite-update'; +import { Cage } from '~/types/cage'; +import { InviteUpdate } from '~/types/invite-update'; type InviteState = Pick; diff --git a/pkg/interface/src/logic/reducers/launch-update.ts b/pkg/interface/src/logic/reducers/launch-update.ts index 96e968020..d05145d78 100644 --- a/pkg/interface/src/logic/reducers/launch-update.ts +++ b/pkg/interface/src/logic/reducers/launch-update.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import { LaunchUpdate } from '../../types/launch-update'; -import { Cage } from '../../types/cage'; +import { LaunchUpdate } from '~/types/launch-update'; +import { Cage } from '~/types/cage'; import { StoreState } from '../../store/type'; type LaunchState = Pick; diff --git a/pkg/interface/src/logic/reducers/link-update.ts b/pkg/interface/src/logic/reducers/link-update.ts index 394c471a0..4d1db58ed 100644 --- a/pkg/interface/src/logic/reducers/link-update.ts +++ b/pkg/interface/src/logic/reducers/link-update.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { LinkUpdate, Pagination } from '../../types/link-update'; +import { LinkUpdate, Pagination } from '~/types/link-update'; // page size as expected from link-view. // must change in parallel with the +page-size in /app/link-view to diff --git a/pkg/interface/src/logic/reducers/listen-update.ts b/pkg/interface/src/logic/reducers/listen-update.ts index f823543cc..39e778da9 100644 --- a/pkg/interface/src/logic/reducers/listen-update.ts +++ b/pkg/interface/src/logic/reducers/listen-update.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { Cage } from '../../types/cage'; -import { LinkListenUpdate } from '../../types/link-listen-update'; +import { Cage } from '~/types/cage'; +import { LinkListenUpdate } from '~/types/link-listen-update'; type LinkListenState = Pick; diff --git a/pkg/interface/src/logic/reducers/local.ts b/pkg/interface/src/logic/reducers/local.ts index 6d1dcf793..650c71a98 100644 --- a/pkg/interface/src/logic/reducers/local.ts +++ b/pkg/interface/src/logic/reducers/local.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { Cage } from '../../types/cage'; -import { LocalUpdate } from '../../types/local-update'; +import { Cage } from '~/types/cage'; +import { LocalUpdate } from '~/types/local-update'; type LocalState = Pick; diff --git a/pkg/interface/src/logic/reducers/metadata-update.ts b/pkg/interface/src/logic/reducers/metadata-update.ts index 94b7e7953..99946665a 100644 --- a/pkg/interface/src/logic/reducers/metadata-update.ts +++ b/pkg/interface/src/logic/reducers/metadata-update.ts @@ -2,8 +2,8 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { MetadataUpdate } from '../../types/metadata-update'; -import { Cage } from '../../types/cage'; +import { MetadataUpdate } from '~/types/metadata-update'; +import { Cage } from '~/types/cage'; type MetadataState = Pick; diff --git a/pkg/interface/src/logic/reducers/permission-update.ts b/pkg/interface/src/logic/reducers/permission-update.ts index 7d3ed4865..0d3dd438f 100644 --- a/pkg/interface/src/logic/reducers/permission-update.ts +++ b/pkg/interface/src/logic/reducers/permission-update.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { Cage } from '../../types/cage'; -import { PermissionUpdate } from '../../types/permission-update'; +import { Cage } from '~/types/cage'; +import { PermissionUpdate } from '~/types/permission-update'; type PermissionState = Pick; diff --git a/pkg/interface/src/logic/reducers/publish-response.ts b/pkg/interface/src/logic/reducers/publish-response.ts index 57ed8446c..a1cfb85ae 100644 --- a/pkg/interface/src/logic/reducers/publish-response.ts +++ b/pkg/interface/src/logic/reducers/publish-response.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { Cage } from '../../types/cage'; +import { Cage } from '~/types/cage'; type PublishState = Pick; diff --git a/pkg/interface/src/logic/reducers/publish-update.ts b/pkg/interface/src/logic/reducers/publish-update.ts index 25ea071b9..3be297737 100644 --- a/pkg/interface/src/logic/reducers/publish-update.ts +++ b/pkg/interface/src/logic/reducers/publish-update.ts @@ -1,9 +1,9 @@ import _ from 'lodash'; -import { PublishUpdate } from '../../types/publish-update'; -import { Cage } from '../../types/cage'; +import { PublishUpdate } from '~/types/publish-update'; +import { Cage } from '~/types/cage'; import { StoreState } from '../../store/type'; -import { getTagFromFrond } from '../../types/noun'; +import { getTagFromFrond } from '~/types/noun'; type PublishState = Pick; diff --git a/pkg/interface/src/logic/reducers/s3-update.ts b/pkg/interface/src/logic/reducers/s3-update.ts index 4d454ba40..0a4741cc7 100644 --- a/pkg/interface/src/logic/reducers/s3-update.ts +++ b/pkg/interface/src/logic/reducers/s3-update.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { StoreState } from '../../store/type'; -import { Cage } from '../../types/cage'; -import { S3Update } from '../../types/s3-update'; +import { Cage } from '~/types/cage'; +import { S3Update } from '~/types/s3-update'; type S3State = Pick; diff --git a/pkg/interface/src/logic/store/store.ts b/pkg/interface/src/logic/store/store.ts index bc840f085..51d5ba7c3 100644 --- a/pkg/interface/src/logic/store/store.ts +++ b/pkg/interface/src/logic/store/store.ts @@ -5,7 +5,7 @@ import LocalReducer from '../reducers/local'; import ChatReducer from '../reducers/chat-update'; import { StoreState } from './type'; -import { Cage } from '../types/cage'; +import { Cage } from '~/types/cage'; import ContactReducer from '../reducers/contact-update'; import LinkUpdateReducer from '../reducers/link-update'; import S3Reducer from '../reducers/s3-update'; diff --git a/pkg/interface/src/logic/store/type.ts b/pkg/interface/src/logic/store/type.ts index 6ff247105..f8d6359dc 100644 --- a/pkg/interface/src/logic/store/type.ts +++ b/pkg/interface/src/logic/store/type.ts @@ -1,16 +1,16 @@ -import { Inbox, Envelope } from '../types/chat-update'; -import { ChatHookUpdate } from '../types/chat-hook-update'; -import { Path } from '../types/noun'; -import { Invites } from '../types/invite-update'; -import { Associations } from '../types/metadata-update'; -import { Rolodex } from '../types/contact-update'; -import { Notebooks } from '../types/publish-update'; -import { Groups } from '../types/group-update'; -import { S3State } from '../types/s3-update'; -import { Permissions } from '../types/permission-update'; -import { LaunchState, WeatherState } from '../types/launch-update'; -import { LinkComments, LinkCollections, LinkSeen } from '../types/link-update'; -import { ConnectionStatus } from '../types/connection'; +import { Inbox, Envelope } from '~/types/chat-update'; +import { ChatHookUpdate } from '~/types/chat-hook-update'; +import { Path } from '~/types/noun'; +import { Invites } from '~/types/invite-update'; +import { Associations } from '~/types/metadata-update'; +import { Rolodex } from '~/types/contact-update'; +import { Notebooks } from '~/types/publish-update'; +import { Groups } from '~/types/group-update'; +import { S3State } from '~/types/s3-update'; +import { Permissions } from '~/types/permission-update'; +import { LaunchState, WeatherState } from '~/types/launch-update'; +import { LinkComments, LinkCollections, LinkSeen } from '~/types/link-update'; +import { ConnectionStatus } from '~/types/connection'; export interface StoreState { // local state diff --git a/pkg/interface/src/logic/subscription/base.ts b/pkg/interface/src/logic/subscription/base.ts index d53e2acb1..481c014b0 100644 --- a/pkg/interface/src/logic/subscription/base.ts +++ b/pkg/interface/src/logic/subscription/base.ts @@ -1,6 +1,6 @@ import BaseStore from "../store/base"; import BaseApi from "../api/base"; -import { Path } from "../types/noun"; +import { Path } from "~/types/noun"; export default class BaseSubscription { private errorCount = 0; diff --git a/pkg/interface/src/logic/subscription/global.ts b/pkg/interface/src/logic/subscription/global.ts index 20760d725..6a3bb3701 100644 --- a/pkg/interface/src/logic/subscription/global.ts +++ b/pkg/interface/src/logic/subscription/global.ts @@ -1,6 +1,6 @@ import BaseSubscription from './base'; import { StoreState } from '../store/type'; -import { Path } from '../types/noun'; +import { Path } from '~/types/noun'; import _ from 'lodash'; diff --git a/pkg/interface/src/views/App.js b/pkg/interface/src/views/App.js index ba9e816d2..cbd4aab0a 100644 --- a/pkg/interface/src/views/App.js +++ b/pkg/interface/src/views/App.js @@ -18,11 +18,11 @@ import StatusBar from './components/StatusBar'; import Omnibox from './components/Omnibox'; import ErrorComponent from './components/Error'; -import GlobalStore from '../logic/store/store'; -import GlobalSubscription from '../logic/subscription/global'; -import GlobalApi from '../logic/api/global'; -import { uxToHex } from '../logic/lib/util'; -import { Sigil } from '../logic/lib/sigil'; +import GlobalStore from '~/logic/store/store'; +import GlobalSubscription from '~/logic/subscription/global'; +import GlobalApi from '~/logic/api/global'; +import { uxToHex } from '~/logic/lib/util'; +import { Sigil } from '~/logic/lib/sigil'; const Root = styled.div` font-family: ${p => p.theme.fonts.sans}; diff --git a/pkg/interface/src/views/apps/chat/app.tsx b/pkg/interface/src/views/apps/chat/app.tsx index ea8e97ad0..7f7239ee6 100644 --- a/pkg/interface/src/views/apps/chat/app.tsx +++ b/pkg/interface/src/views/apps/chat/app.tsx @@ -11,11 +11,11 @@ import { SettingsScreen } from './components/settings'; import { NewScreen } from './components/new'; import { JoinScreen } from './components/join'; import { NewDmScreen } from './components/new-dm'; -import { PatpNoSig } from '../../../types/noun'; -import GlobalApi from '../../logic/api/global'; -import { StoreState } from '../../logic/store/type'; -import GlobalSubscription from '../../logic/subscription/global'; -import {groupBunts} from '../../../types/group-update'; +import { PatpNoSig } from '~/types/noun'; +import GlobalApi from '~/logic/api/global'; +import { StoreState } from '~/logic/store/type'; +import GlobalSubscription from '~/logic/subscription/global'; +import {groupBunts} from '~/types/group-update'; type ChatAppProps = StoreState & { ship: PatpNoSig; diff --git a/pkg/interface/src/views/apps/chat/components/chat.tsx b/pkg/interface/src/views/apps/chat/components/chat.tsx index 46da1a334..ab9a4da13 100644 --- a/pkg/interface/src/views/apps/chat/components/chat.tsx +++ b/pkg/interface/src/views/apps/chat/components/chat.tsx @@ -6,15 +6,15 @@ import { Link, RouteComponentProps } from "react-router-dom"; import { ChatWindow } from './lib/chat-window'; import { ChatHeader } from './lib/chat-header'; import { ChatInput } from "./lib/chat-input"; -import { deSig } from "../../../../logic/lib/util"; -import { ChatHookUpdate } from "../../../../types/chat-hook-update"; -import ChatApi from "../../../../logic/api/chat"; -import { Inbox, Envelope } from "../../../../types/chat-update"; -import { Contacts } from "../../../../types/contact-update"; -import { Path, Patp } from "../../../../types/noun"; -import GlobalApi from "../../../../logic/api/global"; -import { Association } from "../../../../types/metadata-update"; -import {Group} from "../../../../types/group-update"; +import { deSig } from "~/logic/lib/util"; +import { ChatHookUpdate } from "~/types/chat-hook-update"; +import ChatApi from "~/logic/api/chat"; +import { Inbox, Envelope } from "~/types/chat-update"; +import { Contacts } from "~/types/contact-update"; +import { Path, Patp } from "~/types/noun"; +import GlobalApi from "~/logic/api/global"; +import { Association } from "~/types/metadata-update"; +import {Group} from "~/types/group-update"; type ChatScreenProps = RouteComponentProps<{ diff --git a/pkg/interface/src/views/apps/chat/components/join.js b/pkg/interface/src/views/apps/chat/components/join.js index 5d441ef87..6aa4845e8 100644 --- a/pkg/interface/src/views/apps/chat/components/join.js +++ b/pkg/interface/src/views/apps/chat/components/join.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { Spinner } from '../../../components/Spinner'; +import { Spinner } from '~/views/components/Spinner'; import urbitOb from 'urbit-ob'; export class JoinScreen extends Component { diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-header.js b/pkg/interface/src/views/apps/chat/components/lib/chat-header.js index ae503ee09..df43d08ac 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/chat-header.js +++ b/pkg/interface/src/views/apps/chat/components/lib/chat-header.js @@ -2,8 +2,8 @@ import React, { Component, Fragment } from "react"; import { Link } from "react-router-dom"; import { ChatTabBar } from "./chat-tabbar"; -import { SidebarSwitcher } from "../../../../components/SidebarSwitch"; -import { deSig } from "../../../../../logic/lib/util"; +import { SidebarSwitcher } from "~/views/components/SidebarSwitch"; +import { deSig } from "~/logic/lib/util"; export const ChatHeader = (props) => { diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-input.js b/pkg/interface/src/views/apps/chat/components/lib/chat-input.js index c18beb8d9..4e49680a1 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/chat-input.js +++ b/pkg/interface/src/views/apps/chat/components/lib/chat-input.js @@ -2,8 +2,8 @@ import React, { Component } from 'react'; import ChatEditor from './chat-editor'; import { S3Upload } from './s3-upload' ; -import { uxToHex } from '../../../../../logic/lib/util'; -import { Sigil } from '../../../../../logic/lib/sigil'; +import { uxToHex } from '~/logic/lib/util'; +import { Sigil } from '~/logic/lib/sigil'; const URL_REGEX = new RegExp(String(/^((\w+:\/\/)[-a-zA-Z0-9:@;?&=\/%\+\.\*!'\(\),\$_\{\}\^~\[\]`#|]+)/.source)); diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-scroll-container.js b/pkg/interface/src/views/apps/chat/components/lib/chat-scroll-container.js index a0a531feb..74580f995 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/chat-scroll-container.js +++ b/pkg/interface/src/views/apps/chat/components/lib/chat-scroll-container.js @@ -1,6 +1,6 @@ import React, { Component, Fragment } from "react"; -import { scrollIsAtTop, scrollIsAtBottom } from "../../../../../logic/lib/util"; +import { scrollIsAtTop, scrollIsAtBottom } from "~/logic/lib/util"; // Restore chat position on FF when new messages come in const recalculateScrollTop = (lastScrollHeight, scrollContainer) => { diff --git a/pkg/interface/src/views/apps/chat/components/lib/groupify-button.js b/pkg/interface/src/views/apps/chat/components/lib/groupify-button.js index 786c5d9a3..86cb34a75 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/groupify-button.js +++ b/pkg/interface/src/views/apps/chat/components/lib/groupify-button.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import Toggle from '../../../../components/toggle'; -import { InviteSearch } from '../../../../components/InviteSearch'; +import Toggle from '~/views/components/toggle'; +import { InviteSearch } from '~/views/components/InviteSearch'; export class GroupifyButton extends Component { diff --git a/pkg/interface/src/views/apps/chat/components/lib/invite-element.js b/pkg/interface/src/views/apps/chat/components/lib/invite-element.js index d3f88e79e..fe9edbd04 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/invite-element.js +++ b/pkg/interface/src/views/apps/chat/components/lib/invite-element.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { InviteSearch } from '../../../../components/InviteSearch'; -import { Spinner } from '../../../../components/Spinner'; +import { InviteSearch } from '~/views/components/InviteSearch'; +import { Spinner } from '~/views/components/Spinner'; export class InviteElement extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/chat/components/lib/message.js b/pkg/interface/src/views/apps/chat/components/lib/message.js index 4958490bb..461423db7 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/message.js +++ b/pkg/interface/src/views/apps/chat/components/lib/message.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { OverlaySigil } from './overlay-sigil'; import MessageContent from './message-content'; -import { uxToHex, cite, writeText } from '../../../../../logic/lib/util'; +import { uxToHex, cite, writeText } from '~/logic/lib/util'; import moment from 'moment'; diff --git a/pkg/interface/src/views/apps/chat/components/lib/metadata-color.js b/pkg/interface/src/views/apps/chat/components/lib/metadata-color.js index 82c30563f..35ca0d425 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/metadata-color.js +++ b/pkg/interface/src/views/apps/chat/components/lib/metadata-color.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { uxToHex } from '../../../../../logic/lib/util'; +import { uxToHex } from '~/logic/lib/util'; export class MetadataColor extends Component { diff --git a/pkg/interface/src/views/apps/chat/components/lib/metadata-settings.js b/pkg/interface/src/views/apps/chat/components/lib/metadata-settings.js index f396e5fd7..942135cfc 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/metadata-settings.js +++ b/pkg/interface/src/views/apps/chat/components/lib/metadata-settings.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { MetadataColor } from './metadata-color'; import { MetadataInput } from './metadata-input'; -import { uxToHex } from '../../../../../logic/lib/util'; +import { uxToHex } from '~/logic/lib/util'; export const MetadataSettings = (props) => { diff --git a/pkg/interface/src/views/apps/chat/components/lib/overlay-sigil.js b/pkg/interface/src/views/apps/chat/components/lib/overlay-sigil.js index 523835b04..4a7990822 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/overlay-sigil.js +++ b/pkg/interface/src/views/apps/chat/components/lib/overlay-sigil.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Sigil } from '../../../../../logic/lib/sigil'; +import { Sigil } from '~/logic/lib/sigil'; import { ProfileOverlay, OVERLAY_HEIGHT diff --git a/pkg/interface/src/views/apps/chat/components/lib/profile-overlay.js b/pkg/interface/src/views/apps/chat/components/lib/profile-overlay.js index 5168049bc..d05108278 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/profile-overlay.js +++ b/pkg/interface/src/views/apps/chat/components/lib/profile-overlay.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { cite } from '../../../../../logic/lib/util'; -import { Sigil } from '../../../../../logic/lib/sigil'; +import { cite } from '~/logic/lib/util'; +import { Sigil } from '~/logic/lib/sigil'; export const OVERLAY_HEIGHT = 250; diff --git a/pkg/interface/src/views/apps/chat/components/lib/s3-upload.js b/pkg/interface/src/views/apps/chat/components/lib/s3-upload.js index c6361168e..b497413cf 100644 --- a/pkg/interface/src/views/apps/chat/components/lib/s3-upload.js +++ b/pkg/interface/src/views/apps/chat/components/lib/s3-upload.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import S3Client from '../../../../../logic/lib/s3'; +import S3Client from '~/logic/lib/s3'; export class S3Upload extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/chat/components/new-dm.js b/pkg/interface/src/views/apps/chat/components/new-dm.js index ef9979394..5e69eaa6f 100644 --- a/pkg/interface/src/views/apps/chat/components/new-dm.js +++ b/pkg/interface/src/views/apps/chat/components/new-dm.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; -import { Spinner } from '../../../components/Spinner'; +import { Spinner } from '~/views/components/Spinner'; import { Link } from 'react-router-dom'; -import { InviteSearch } from '../../../components/InviteSearch'; +import { InviteSearch } from '~/views/components/InviteSearch'; import urbitOb from 'urbit-ob'; -import { deSig } from '../../../../logic/lib/util'; +import { deSig } from '~/logic/lib/util'; export class NewDmScreen extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/chat/components/new.js b/pkg/interface/src/views/apps/chat/components/new.js index 15311206d..7464bbe8e 100644 --- a/pkg/interface/src/views/apps/chat/components/new.js +++ b/pkg/interface/src/views/apps/chat/components/new.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; -import { InviteSearch } from '../../../components/InviteSearch'; -import { Spinner } from '../../../components/Spinner'; +import { InviteSearch } from '~/views/components/InviteSearch'; +import { Spinner } from '~/views/components/Spinner'; import { Link } from 'react-router-dom'; -import { deSig } from '../../../../logic/lib/util'; +import { deSig } from '~/logic/lib/util'; export class NewScreen extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/chat/components/settings.js b/pkg/interface/src/views/apps/chat/components/settings.js index ea78bfa07..9b1b33936 100644 --- a/pkg/interface/src/views/apps/chat/components/settings.js +++ b/pkg/interface/src/views/apps/chat/components/settings.js @@ -1,14 +1,14 @@ import React, { Component, Fragment } from 'react'; -import { deSig } from '../../../../logic/lib/util'; +import { deSig } from '~/logic/lib/util'; import { Link } from 'react-router-dom'; import { ChatHeader } from './lib/chat-header'; import { MetadataSettings } from './lib/metadata-settings'; import { DeleteButton } from './lib/delete-button'; import { GroupifyButton } from './lib/groupify-button'; -import { Spinner } from '../../../components/Spinner'; +import { Spinner } from '~/views/components/Spinner'; import { ChatTabBar } from './lib/chat-tabbar'; -import SidebarSwitcher from '../../../components/SidebarSwitch'; +import SidebarSwitcher from '~/views/components/SidebarSwitch'; export class SettingsScreen extends Component { diff --git a/pkg/interface/src/views/apps/chat/components/sidebar.js b/pkg/interface/src/views/apps/chat/components/sidebar.js index 39f191990..bd7f3dce0 100644 --- a/pkg/interface/src/views/apps/chat/components/sidebar.js +++ b/pkg/interface/src/views/apps/chat/components/sidebar.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; import Welcome from './lib/welcome'; -import { alphabetiseAssociations } from '../../../../logic/lib/util'; -import SidebarInvite from '../../../components/SidebarInvite'; +import { alphabetiseAssociations } from '~/logic/lib/util'; +import SidebarInvite from '~/views/components/SidebarInvite'; import { GroupItem } from './lib/group-item'; export class Sidebar extends Component { diff --git a/pkg/interface/src/views/apps/chat/components/skeleton.js b/pkg/interface/src/views/apps/chat/components/skeleton.js index 8fa175712..d5678ff42 100644 --- a/pkg/interface/src/views/apps/chat/components/skeleton.js +++ b/pkg/interface/src/views/apps/chat/components/skeleton.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import classnames from 'classnames'; import { Link } from 'react-router-dom'; -import ErrorBoundary from '../../../components/ErrorBoundary'; +import ErrorBoundary from '~/views/components/ErrorBoundary'; export class Skeleton extends Component { render() { diff --git a/pkg/interface/src/views/apps/dojo/components/input.js b/pkg/interface/src/views/apps/dojo/components/input.js index 4bde441c8..51761ba21 100644 --- a/pkg/interface/src/views/apps/dojo/components/input.js +++ b/pkg/interface/src/views/apps/dojo/components/input.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { cite } from '../../../../logic/lib/util'; -import { Spinner } from '../../../components/Spinner'; +import { cite } from '~/logic/lib/util'; +import { Spinner } from '~/views/components/Spinner'; export class Input extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/groups/app.tsx b/pkg/interface/src/views/apps/groups/app.tsx index 7ef051119..5e73f024b 100644 --- a/pkg/interface/src/views/apps/groups/app.tsx +++ b/pkg/interface/src/views/apps/groups/app.tsx @@ -11,10 +11,10 @@ import { AddScreen } from './components/lib/add-contact'; import { JoinScreen } from './components/join'; import GroupDetail from './components/lib/group-detail'; -import { PatpNoSig } from '../../../types/noun'; -import GlobalApi from '../../../logic/api/global'; -import { StoreState } from '../../../logic/store/type'; -import GlobalSubscription from '../../../logic/subscription/global'; +import { PatpNoSig } from '~/types/noun'; +import GlobalApi from '~/logic/api/global'; +import { StoreState } from '~/logic/store/type'; +import GlobalSubscription from '~/logic/subscription/global'; type GroupsAppProps = StoreState & { diff --git a/pkg/interface/src/views/apps/groups/components/join.js b/pkg/interface/src/views/apps/groups/components/join.js index 2db84d1c4..82b5016cf 100644 --- a/pkg/interface/src/views/apps/groups/components/join.js +++ b/pkg/interface/src/views/apps/groups/components/join.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { Spinner } from '../../../components/Spinner'; +import { Spinner } from '~/views/components/Spinner'; import urbitOb from 'urbit-ob'; export class JoinScreen extends Component { diff --git a/pkg/interface/src/views/apps/groups/components/lib/add-contact.tsx b/pkg/interface/src/views/apps/groups/components/lib/add-contact.tsx index 8132ca164..3a31bd935 100644 --- a/pkg/interface/src/views/apps/groups/components/lib/add-contact.tsx +++ b/pkg/interface/src/views/apps/groups/components/lib/add-contact.tsx @@ -1,12 +1,12 @@ import React, { Component } from 'react'; import _ from 'lodash'; import { Link } from 'react-router-dom'; -import { InviteSearch, Invites } from '../../../../components/InviteSearch'; -import { Spinner } from '../../../../components/Spinner'; +import { InviteSearch, Invites } from '~/views/components/InviteSearch'; +import { Spinner } from '~/views/components/Spinner'; import { uuid } from '../../../../lib/util'; -import { Groups } from '../../../../types/group-update'; -import { Rolodex } from '../../../../types/contact-update'; -import { Path } from '../../../../types/noun'; +import { Groups } from '~/types/group-update'; +import { Rolodex } from '~/types/contact-update'; +import { Path } from '~/types/noun'; import GlobalApi from '../../../../api/global'; import { History } from 'history'; diff --git a/pkg/interface/src/views/apps/groups/components/lib/contact-card.js b/pkg/interface/src/views/apps/groups/components/lib/contact-card.js index 9782f89ac..572f2f2f0 100644 --- a/pkg/interface/src/views/apps/groups/components/lib/contact-card.js +++ b/pkg/interface/src/views/apps/groups/components/lib/contact-card.js @@ -1,10 +1,10 @@ import React, { Component } from 'react'; -import { Sigil } from '../../../../../logic/lib/sigil'; +import { Sigil } from '~/logic/lib/sigil'; import { Link } from 'react-router-dom'; import { EditElement } from './edit-element'; -import { Spinner } from '../../../../components/Spinner'; -import { uxToHex } from '../../../../../logic/lib/util'; +import { Spinner } from '~/views/components/Spinner'; +import { uxToHex } from '~/logic/lib/util'; import { S3Upload } from './s3-upload'; export class ContactCard extends Component { diff --git a/pkg/interface/src/views/apps/groups/components/lib/contact-item.js b/pkg/interface/src/views/apps/groups/components/lib/contact-item.js index 35e3a6a54..fad0e5d75 100644 --- a/pkg/interface/src/views/apps/groups/components/lib/contact-item.js +++ b/pkg/interface/src/views/apps/groups/components/lib/contact-item.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { Sigil } from '../../../../../logic/lib/sigil'; -import { uxToHex, cite } from '../../../../../logic/lib/util'; +import { Sigil } from '~/logic/lib/sigil'; +import { uxToHex, cite } from '~/logic/lib/util'; export class ContactItem extends Component { render() { diff --git a/pkg/interface/src/views/apps/groups/components/lib/contact-sidebar.tsx b/pkg/interface/src/views/apps/groups/components/lib/contact-sidebar.tsx index d8445b708..f337efee5 100644 --- a/pkg/interface/src/views/apps/groups/components/lib/contact-sidebar.tsx +++ b/pkg/interface/src/views/apps/groups/components/lib/contact-sidebar.tsx @@ -4,14 +4,14 @@ import { FixedSizeList as List } from 'react-window'; import { ContactItem } from './contact-item'; import { ShareSheet } from './share-sheet'; -import { Sigil } from '../../../../../logic/lib/sigil'; -import { Spinner } from '../../../../components/Spinner'; -import { cite } from '../../../../../logic/lib/util'; -import { roleForShip, resourceFromPath } from '../../../../../logic/lib/group'; -import { Path, PatpNoSig } from '../../../../../types/noun'; -import { Rolodex, Contacts, Contact } from '../../../../../types/contact-update'; -import { Groups, Group } from '../../../../../types/group-update'; -import GlobalApi from '../../../../../logic/api/global'; +import { Sigil } from '~/logic/lib/sigil'; +import { Spinner } from '~/views/components/Spinner'; +import { cite } from '~/logic/lib/util'; +import { roleForShip, resourceFromPath } from '~/logic/lib/group'; +import { Path, PatpNoSig } from '~/types/noun'; +import { Rolodex, Contacts, Contact } from '~/types/contact-update'; +import { Groups, Group } from '~/types/group-update'; +import GlobalApi from '~/logic/api/global'; interface ContactSidebarProps { activeDrawer: 'contacts' | 'detail' | 'rightPanel'; diff --git a/pkg/interface/src/views/apps/groups/components/lib/group-detail.js b/pkg/interface/src/views/apps/groups/components/lib/group-detail.js index 17bdeaf25..0fb197aa7 100644 --- a/pkg/interface/src/views/apps/groups/components/lib/group-detail.js +++ b/pkg/interface/src/views/apps/groups/components/lib/group-detail.js @@ -1,11 +1,11 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { Spinner } from '../../../../components/Spinner'; -import { Toggle } from '../../../../components/toggle'; -import { GroupView } from '../../../../components/Group'; +import { Spinner } from '~/views/components/Spinner'; +import { Toggle } from '~/views/components/toggle'; +import { GroupView } from '~/views/components/Group'; -import { deSig, uxToHex, writeText } from '../../../../../logic/lib/util'; -import { roleForShip, resourceFromPath } from '../../../../../logic/lib/group'; +import { deSig, uxToHex, writeText } from '~/logic/lib/util'; +import { roleForShip, resourceFromPath } from '~/logic/lib/group'; export class GroupDetail extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/groups/components/lib/group-sidebar.js b/pkg/interface/src/views/apps/groups/components/lib/group-sidebar.js index 4c6cbe5a1..e4d0ccf79 100644 --- a/pkg/interface/src/views/apps/groups/components/lib/group-sidebar.js +++ b/pkg/interface/src/views/apps/groups/components/lib/group-sidebar.js @@ -2,11 +2,11 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; import { GroupItem } from './group-item'; -import SidebarInvite from '../../../../components/SidebarInvite'; +import SidebarInvite from '~/views/components/SidebarInvite'; import { Welcome } from './welcome'; -import { cite } from '../../../../../logic/lib/util'; -import { Sigil } from '../../../../../logic/lib/sigil'; +import { cite } from '~/logic/lib/util'; +import { Sigil } from '~/logic/lib/sigil'; export class GroupSidebar extends Component { diff --git a/pkg/interface/src/views/apps/groups/components/lib/s3-upload.js b/pkg/interface/src/views/apps/groups/components/lib/s3-upload.js index 1231aa435..b94b14728 100644 --- a/pkg/interface/src/views/apps/groups/components/lib/s3-upload.js +++ b/pkg/interface/src/views/apps/groups/components/lib/s3-upload.js @@ -1,5 +1,5 @@ import React, { Component } from 'react' -import S3Client from '../../../../../logic/lib/s3'; +import S3Client from '~/logic/lib/s3'; export class S3Upload extends Component { diff --git a/pkg/interface/src/views/apps/groups/components/new.tsx b/pkg/interface/src/views/apps/groups/components/new.tsx index 4e16c69fb..528794737 100644 --- a/pkg/interface/src/views/apps/groups/components/new.tsx +++ b/pkg/interface/src/views/apps/groups/components/new.tsx @@ -1,15 +1,15 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { InviteSearch, Invites } from '../../../components/InviteSearch'; -import { Spinner } from '../../../components/Spinner'; -import { Toggle } from '../../../components/toggle'; +import { InviteSearch, Invites } from '~/views/components/InviteSearch'; +import { Spinner } from '~/views/components/Spinner'; +import { Toggle } from '~/views/components/toggle'; import { RouteComponentProps } from 'react-router-dom'; -import { Groups, GroupPolicy, Resource } from '../../../../types/group-update'; -import { Contacts, Rolodex } from '../../../../types/contact-update'; -import GlobalApi from '../../../../logic/api/global'; -import { Patp, PatpNoSig, Enc } from '../../../../types/noun'; +import { Groups, GroupPolicy, Resource } from '~/types/group-update'; +import { Contacts, Rolodex } from '~/types/contact-update'; +import GlobalApi from '~/logic/api/global'; +import { Patp, PatpNoSig, Enc } from '~/types/noun'; type NewScreenProps = Pick & { groups: Groups; diff --git a/pkg/interface/src/views/apps/groups/components/skeleton.js b/pkg/interface/src/views/apps/groups/components/skeleton.js index a3118703e..08e006869 100644 --- a/pkg/interface/src/views/apps/groups/components/skeleton.js +++ b/pkg/interface/src/views/apps/groups/components/skeleton.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { GroupSidebar } from './lib/group-sidebar'; -import ErrorBoundary from '../../../components/ErrorBoundary'; +import ErrorBoundary from '~/views/components/ErrorBoundary'; export class Skeleton extends Component { render() { diff --git a/pkg/interface/src/views/apps/launch/components/tiles/basic.js b/pkg/interface/src/views/apps/launch/components/tiles/basic.js index d091e4193..ff3701138 100644 --- a/pkg/interface/src/views/apps/launch/components/tiles/basic.js +++ b/pkg/interface/src/views/apps/launch/components/tiles/basic.js @@ -1,7 +1,7 @@ import React from 'react'; import classnames from 'classnames'; import { Link } from 'react-router-dom'; -import defaultApps from '../../../../../logic/lib/default-apps'; +import defaultApps from '~/logic/lib/default-apps'; import Tile from './tile'; diff --git a/pkg/interface/src/views/apps/links/app.js b/pkg/interface/src/views/apps/links/app.js index baa7629d8..983b15b67 100644 --- a/pkg/interface/src/views/apps/links/app.js +++ b/pkg/interface/src/views/apps/links/app.js @@ -16,7 +16,7 @@ import { makeRoutePath, amOwnerOfGroup, base64urlDecode -} from '../../../logic/lib/util'; +} from '~/logic/lib/util'; export class LinksApp extends Component { diff --git a/pkg/interface/src/views/apps/links/components/lib/channel-sidebar.js b/pkg/interface/src/views/apps/links/components/lib/channel-sidebar.js index 2d1a82fd4..6b36e9115 100644 --- a/pkg/interface/src/views/apps/links/components/lib/channel-sidebar.js +++ b/pkg/interface/src/views/apps/links/components/lib/channel-sidebar.js @@ -2,9 +2,9 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; import { GroupItem } from './group-item'; -import SidebarInvite from '../../../../components/SidebarInvite'; +import SidebarInvite from '~/views/components/SidebarInvite'; import { Welcome } from './welcome'; -import { alphabetiseAssociations } from '../../../../../logic/lib/util'; +import { alphabetiseAssociations } from '~/logic/lib/util'; export class ChannelsSidebar extends Component { // drawer to the left diff --git a/pkg/interface/src/views/apps/links/components/lib/channels-item.js b/pkg/interface/src/views/apps/links/components/lib/channels-item.js index fce816b73..735cc79e8 100644 --- a/pkg/interface/src/views/apps/links/components/lib/channels-item.js +++ b/pkg/interface/src/views/apps/links/components/lib/channels-item.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { makeRoutePath } from '../../../../../logic/lib/util'; +import { makeRoutePath } from '~/logic/lib/util'; export class ChannelsItem extends Component { render() { diff --git a/pkg/interface/src/views/apps/links/components/lib/comment-item.js b/pkg/interface/src/views/apps/links/components/lib/comment-item.js index 3ef26e5fd..4693c5f61 100644 --- a/pkg/interface/src/views/apps/links/components/lib/comment-item.js +++ b/pkg/interface/src/views/apps/links/components/lib/comment-item.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { Sigil } from '../../../../../logic/lib/sigil'; -import { cite } from '../../../../../logic/lib/util'; +import { Sigil } from '~/logic/lib/sigil'; +import { cite } from '~/logic/lib/util'; import moment from 'moment'; export class CommentItem extends Component { diff --git a/pkg/interface/src/views/apps/links/components/lib/comments-pagination.js b/pkg/interface/src/views/apps/links/components/lib/comments-pagination.js index 552d9d1c6..825c425b7 100644 --- a/pkg/interface/src/views/apps/links/components/lib/comments-pagination.js +++ b/pkg/interface/src/views/apps/links/components/lib/comments-pagination.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { makeRoutePath } from '../../../../../logic/lib/util'; +import { makeRoutePath } from '~/logic/lib/util'; export class CommentsPagination extends Component { render() { diff --git a/pkg/interface/src/views/apps/links/components/lib/comments.js b/pkg/interface/src/views/apps/links/components/lib/comments.js index a62c2074f..b6a55daa4 100644 --- a/pkg/interface/src/views/apps/links/components/lib/comments.js +++ b/pkg/interface/src/views/apps/links/components/lib/comments.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { CommentItem } from './comment-item'; import { CommentsPagination } from './comments-pagination'; -import { getContactDetails } from '../../../../../logic/lib/util'; +import { getContactDetails } from '~/logic/lib/util'; export class Comments extends Component { constructor(props) { super(props); diff --git a/pkg/interface/src/views/apps/links/components/lib/invite-element.js b/pkg/interface/src/views/apps/links/components/lib/invite-element.js index 94da5d575..297f69359 100644 --- a/pkg/interface/src/views/apps/links/components/lib/invite-element.js +++ b/pkg/interface/src/views/apps/links/components/lib/invite-element.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { InviteSearch } from '../../../../components/InviteSearch'; -import { Spinner } from '../../../../components/Spinner'; +import { InviteSearch } from '~/views/components/InviteSearch'; +import { Spinner } from '~/views/components/Spinner'; export class InviteElement extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/links/components/lib/link-detail-preview.js b/pkg/interface/src/views/apps/links/components/lib/link-detail-preview.js index 316d39a73..712870cb8 100644 --- a/pkg/interface/src/views/apps/links/components/lib/link-detail-preview.js +++ b/pkg/interface/src/views/apps/links/components/lib/link-detail-preview.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { cite } from '../../../../../logic/lib/util'; +import { cite } from '~/logic/lib/util'; import moment from 'moment'; export class LinkPreview extends Component { diff --git a/pkg/interface/src/views/apps/links/components/lib/link-item.js b/pkg/interface/src/views/apps/links/components/lib/link-item.js index a67552714..fce08e7b7 100644 --- a/pkg/interface/src/views/apps/links/components/lib/link-item.js +++ b/pkg/interface/src/views/apps/links/components/lib/link-item.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; import moment from 'moment'; -import { Sigil } from '../../../../../logic/lib/sigil'; +import { Sigil } from '~/logic/lib/sigil'; import { Link } from 'react-router-dom'; -import { makeRoutePath, cite } from '../../../../../logic/lib/util'; +import { makeRoutePath, cite } from '~/logic/lib/util'; export class LinkItem extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/links/components/lib/link-submit.js b/pkg/interface/src/views/apps/links/components/lib/link-submit.js index 36a5078db..fd132571e 100644 --- a/pkg/interface/src/views/apps/links/components/lib/link-submit.js +++ b/pkg/interface/src/views/apps/links/components/lib/link-submit.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Spinner } from '../../../../components/Spinner'; +import { Spinner } from '~/views/components/Spinner'; export class LinkSubmit extends Component { constructor() { diff --git a/pkg/interface/src/views/apps/links/components/lib/links-tabbar.js b/pkg/interface/src/views/apps/links/components/lib/links-tabbar.js index 31ed9833c..16a506d1f 100644 --- a/pkg/interface/src/views/apps/links/components/lib/links-tabbar.js +++ b/pkg/interface/src/views/apps/links/components/lib/links-tabbar.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { makeRoutePath } from '../../../../../logic/lib/util'; +import { makeRoutePath } from '~/logic/lib/util'; export class LinksTabBar extends Component { render() { diff --git a/pkg/interface/src/views/apps/links/components/lib/member-element.js b/pkg/interface/src/views/apps/links/components/lib/member-element.js index 2bc81f93b..9828d3bf4 100644 --- a/pkg/interface/src/views/apps/links/components/lib/member-element.js +++ b/pkg/interface/src/views/apps/links/components/lib/member-element.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { Sigil } from '../../../../../logic/lib/sigil'; -import { uxToHex, cite } from '../../../../../logic/lib/util'; +import { Sigil } from '~/logic/lib/sigil'; +import { uxToHex, cite } from '~/logic/lib/util'; export class MemberElement extends Component { onRemove() { const { props } = this; diff --git a/pkg/interface/src/views/apps/links/components/lib/pagination.js b/pkg/interface/src/views/apps/links/components/lib/pagination.js index a8664787e..29f821453 100644 --- a/pkg/interface/src/views/apps/links/components/lib/pagination.js +++ b/pkg/interface/src/views/apps/links/components/lib/pagination.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { makeRoutePath } from '../../../../../logic/lib/util'; +import { makeRoutePath } from '~/logic/lib/util'; export class Pagination extends Component { render() { diff --git a/pkg/interface/src/views/apps/links/components/link.js b/pkg/interface/src/views/apps/links/components/link.js index 6d557cc78..a9e1c57db 100644 --- a/pkg/interface/src/views/apps/links/components/link.js +++ b/pkg/interface/src/views/apps/links/components/link.js @@ -1,12 +1,12 @@ import React, { Component } from 'react'; import { LinksTabBar } from './lib/links-tabbar'; import { LinkPreview } from './lib/link-detail-preview'; -import { SidebarSwitcher } from '../../../components/SidebarSwitch'; +import { SidebarSwitcher } from '~/views/components/SidebarSwitch'; import { Link } from 'react-router-dom'; import { Comments } from './lib/comments'; -import { Spinner } from '../../../components/Spinner'; +import { Spinner } from '~/views/components/Spinner'; import { LoadingScreen } from './loading'; -import { makeRoutePath, getContactDetails } from '../../../../logic/lib/util'; +import { makeRoutePath, getContactDetails } from '~/logic/lib/util'; import CommentItem from './lib/comment-item'; export class LinkDetail extends Component { diff --git a/pkg/interface/src/views/apps/links/components/links-list.js b/pkg/interface/src/views/apps/links/components/links-list.js index bdb0ee627..577b3ee05 100644 --- a/pkg/interface/src/views/apps/links/components/links-list.js +++ b/pkg/interface/src/views/apps/links/components/links-list.js @@ -3,13 +3,13 @@ import React, { Component } from 'react'; import { LoadingScreen } from './loading'; import { MessageScreen } from './lib/message-screen'; import { LinksTabBar } from './lib/links-tabbar'; -import { SidebarSwitcher } from '../../../components/SidebarSwitch'; +import { SidebarSwitcher } from '~/views/components/SidebarSwitch'; import { Link } from 'react-router-dom'; import { LinkItem } from './lib/link-item'; import { LinkSubmit } from './lib/link-submit'; import { Pagination } from './lib/pagination'; -import { makeRoutePath, getContactDetails } from '../../../../logic/lib/util'; +import { makeRoutePath, getContactDetails } from '~/logic/lib/util'; export class Links extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/links/components/member.js b/pkg/interface/src/views/apps/links/components/member.js index 74966fe71..52bd2b137 100644 --- a/pkg/interface/src/views/apps/links/components/member.js +++ b/pkg/interface/src/views/apps/links/components/member.js @@ -5,9 +5,9 @@ import { Link } from 'react-router-dom'; import { LoadingScreen } from './loading'; import { LinksTabBar } from './lib/links-tabbar'; import { MemberElement } from './lib/member-element'; -import { SidebarSwitcher } from '../../../components/SidebarSwitch'; -import { makeRoutePath } from '../../../../logic/lib/util'; -import { GroupView } from '../../../components/Group'; +import { SidebarSwitcher } from '~/views/components/SidebarSwitch'; +import { makeRoutePath } from '~/logic/lib/util'; +import { GroupView } from '~/views/components/Group'; export class MemberScreen extends Component { render() { diff --git a/pkg/interface/src/views/apps/links/components/new.js b/pkg/interface/src/views/apps/links/components/new.js index a73f12b77..3d32dff26 100644 --- a/pkg/interface/src/views/apps/links/components/new.js +++ b/pkg/interface/src/views/apps/links/components/new.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; -import { InviteSearch } from '../../../components/InviteSearch'; -import { Spinner } from '../../../components/Spinner'; +import { InviteSearch } from '~/views/components/InviteSearch'; +import { Spinner } from '~/views/components/Spinner'; import { Link } from 'react-router-dom'; -import { makeRoutePath, deSig } from '../../../../logic/lib/util'; +import { makeRoutePath, deSig } from '~/logic/lib/util'; import urbitOb from 'urbit-ob'; export class NewScreen extends Component { diff --git a/pkg/interface/src/views/apps/links/components/settings.js b/pkg/interface/src/views/apps/links/components/settings.js index 1e0b7516e..8d0153e46 100644 --- a/pkg/interface/src/views/apps/links/components/settings.js +++ b/pkg/interface/src/views/apps/links/components/settings.js @@ -1,12 +1,12 @@ import React, { Component } from 'react'; -import { uxToHex, makeRoutePath } from '../../../../logic/lib/util'; +import { uxToHex, makeRoutePath } from '~/logic/lib/util'; import { Link } from 'react-router-dom'; import { LoadingScreen } from './loading'; -import { Spinner } from '../../../components/Spinner'; +import { Spinner } from '~/views/components/Spinner'; import { LinksTabBar } from './lib/links-tabbar'; -import SidebarSwitcher from '../../../components/SidebarSwitch'; +import SidebarSwitcher from '~/views/components/SidebarSwitch'; export class SettingsScreen extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/links/components/skeleton.js b/pkg/interface/src/views/apps/links/components/skeleton.js index 24fed35e6..b6ff5a166 100644 --- a/pkg/interface/src/views/apps/links/components/skeleton.js +++ b/pkg/interface/src/views/apps/links/components/skeleton.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { ChannelsSidebar } from './lib/channel-sidebar'; -import ErrorBoundary from '../../../components/ErrorBoundary'; +import ErrorBoundary from '~/views/components/ErrorBoundary'; export class Skeleton extends Component { render() { diff --git a/pkg/interface/src/views/apps/publish/components/lib/comment-item.js b/pkg/interface/src/views/apps/publish/components/lib/comment-item.js index befdd5939..dfd4b43ca 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/comment-item.js +++ b/pkg/interface/src/views/apps/publish/components/lib/comment-item.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; import moment from 'moment'; -import { Sigil } from '../../../../../logic/lib/sigil'; +import { Sigil } from '~/logic/lib/sigil'; import CommentInput from './comment-input'; -import { uxToHex, cite } from '../../../../../logic/lib/util'; +import { uxToHex, cite } from '~/logic/lib/util'; export class CommentItem extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/publish/components/lib/comments.js b/pkg/interface/src/views/apps/publish/components/lib/comments.js index 9bce9eb92..fbbe9011f 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/comments.js +++ b/pkg/interface/src/views/apps/publish/components/lib/comments.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; import { CommentItem } from './comment-item'; import CommentInput from './comment-input'; -import { dateToDa } from '../../../../../logic/lib/util'; -import { Spinner } from '../../../../components/Spinner'; +import { dateToDa } from '~/logic/lib/util'; +import { Spinner } from '~/views/components/Spinner'; export class Comments extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/publish/components/lib/edit-post.js b/pkg/interface/src/views/apps/publish/components/lib/edit-post.js index 4041ca900..a259bbda3 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/edit-post.js +++ b/pkg/interface/src/views/apps/publish/components/lib/edit-post.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; -import { SidebarSwitcher } from '../../../../components/SidebarSwitch'; -import { Spinner } from '../../../../components/Spinner'; +import { SidebarSwitcher } from '~/views/components/SidebarSwitch'; +import { Spinner } from '~/views/components/Spinner'; import { Link } from 'react-router-dom'; import { Controlled as CodeMirror } from 'react-codemirror2'; -import { dateToDa } from '../../../../../logic/lib/util'; +import { dateToDa } from '~/logic/lib/util'; import 'codemirror/mode/markdown/markdown'; diff --git a/pkg/interface/src/views/apps/publish/components/lib/join.js b/pkg/interface/src/views/apps/publish/components/lib/join.js index 3dfad2aa1..0269c5d51 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/join.js +++ b/pkg/interface/src/views/apps/publish/components/lib/join.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { Spinner } from '../../../../components/Spinner'; +import { Spinner } from '~/views/components/Spinner'; import urbitOb from 'urbit-ob'; export class JoinScreen extends Component { diff --git a/pkg/interface/src/views/apps/publish/components/lib/new-post.js b/pkg/interface/src/views/apps/publish/components/lib/new-post.js index 52a61e79c..68e6f15ea 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/new-post.js +++ b/pkg/interface/src/views/apps/publish/components/lib/new-post.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; -import { SidebarSwitcher } from '../../../../components/SidebarSwitch'; -import { Spinner } from '../../../../components/Spinner'; +import { SidebarSwitcher } from '~/views/components/SidebarSwitch'; +import { Spinner } from '~/views/components/Spinner'; import { Link } from 'react-router-dom'; import { Controlled as CodeMirror } from 'react-codemirror2'; -import { dateToDa, stringToSymbol } from '../../../../../logic/lib/util'; +import { dateToDa, stringToSymbol } from '~/logic/lib/util'; import 'codemirror/mode/markdown/markdown'; diff --git a/pkg/interface/src/views/apps/publish/components/lib/new.js b/pkg/interface/src/views/apps/publish/components/lib/new.js index aa3980e16..800a48356 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/new.js +++ b/pkg/interface/src/views/apps/publish/components/lib/new.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; -import { InviteSearch } from '../../../../components/InviteSearch'; -import { Spinner } from '../../../../components/Spinner'; +import { InviteSearch } from '~/views/components/InviteSearch'; +import { Spinner } from '~/views/components/Spinner'; import { Link } from 'react-router-dom'; -import { stringToSymbol } from '../../../../../logic/lib/util'; +import { stringToSymbol } from '~/logic/lib/util'; export class NewScreen extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/publish/components/lib/note.js b/pkg/interface/src/views/apps/publish/components/lib/note.js index 7dd52c475..ec2c4ec86 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/note.js +++ b/pkg/interface/src/views/apps/publish/components/lib/note.js @@ -1,12 +1,12 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { SidebarSwitcher } from '../../../../components/SidebarSwitch'; -import { Spinner } from '../../../../components/Spinner'; +import { SidebarSwitcher } from '~/views/components/SidebarSwitch'; +import { Spinner } from '~/views/components/Spinner'; import { Comments } from './comments'; import { NoteNavigation } from './note-navigation'; import moment from 'moment'; import ReactMarkdown from 'react-markdown'; -import { cite } from '../../../../../logic/lib/util'; +import { cite } from '~/logic/lib/util'; export class Note extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/publish/components/lib/notebook-posts.js b/pkg/interface/src/views/apps/publish/components/lib/notebook-posts.js index d068ec358..3061d12f2 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/notebook-posts.js +++ b/pkg/interface/src/views/apps/publish/components/lib/notebook-posts.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import moment from 'moment'; import { Link } from 'react-router-dom'; import ReactMarkdown from 'react-markdown'; -import { cite } from '../../../../../logic/lib/util'; +import { cite } from '~/logic/lib/util'; export class NotebookPosts extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/publish/components/lib/notebook.js b/pkg/interface/src/views/apps/publish/components/lib/notebook.js index 06a004659..289f50c20 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/notebook.js +++ b/pkg/interface/src/views/apps/publish/components/lib/notebook.js @@ -1,11 +1,11 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { SidebarSwitcher } from '../../../../components/SidebarSwitch'; +import { SidebarSwitcher } from '~/views/components/SidebarSwitch'; import { NotebookPosts } from './notebook-posts'; import { Subscribers } from './subscribers'; import { Settings } from './settings'; -import { cite } from '../../../../../logic/lib/util'; -import { roleForShip } from '../../../../../logic/lib/group'; +import { cite } from '~/logic/lib/util'; +import { roleForShip } from '~/logic/lib/group'; export class Notebook extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/publish/components/lib/settings.js b/pkg/interface/src/views/apps/publish/components/lib/settings.js index fa13197e5..1149ec350 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/settings.js +++ b/pkg/interface/src/views/apps/publish/components/lib/settings.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; -import { Spinner } from '../../../../components/Spinner'; -import { InviteSearch } from '../../../../components/InviteSearch'; -import Toggle from '../../../../components/toggle'; +import { Spinner } from '~/views/components/Spinner'; +import { InviteSearch } from '~/views/components/InviteSearch'; +import Toggle from '~/views/components/toggle'; export class Settings extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/publish/components/lib/sidebar.js b/pkg/interface/src/views/apps/publish/components/lib/sidebar.js index c48b39763..b7e06eda2 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/sidebar.js +++ b/pkg/interface/src/views/apps/publish/components/lib/sidebar.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import SidebarInvite from '../../../../components/SidebarInvite'; +import SidebarInvite from '~/views/components/SidebarInvite'; import { Welcome } from './welcome'; import { GroupItem } from './group-item'; -import { alphabetiseAssociations } from '../../../../../logic/lib/util'; +import { alphabetiseAssociations } from '~/logic/lib/util'; export class Sidebar extends Component { render() { diff --git a/pkg/interface/src/views/apps/publish/components/lib/subscribers.js b/pkg/interface/src/views/apps/publish/components/lib/subscribers.js index ede8b81a9..1a3f25ca0 100644 --- a/pkg/interface/src/views/apps/publish/components/lib/subscribers.js +++ b/pkg/interface/src/views/apps/publish/components/lib/subscribers.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { GroupView } from '../../../../components/Group'; -import { resourceFromPath } from '../../../../../logic/lib/group'; +import { GroupView } from '~/views/components/Group'; +import { resourceFromPath } from '~/logic/lib/group'; export class Subscribers extends Component { constructor(props) { diff --git a/pkg/interface/src/views/apps/publish/components/skeleton.js b/pkg/interface/src/views/apps/publish/components/skeleton.js index ec87a98a9..e3c15bc13 100644 --- a/pkg/interface/src/views/apps/publish/components/skeleton.js +++ b/pkg/interface/src/views/apps/publish/components/skeleton.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Sidebar } from './lib/sidebar'; -import ErrorBoundary from '../../../components/ErrorBoundary'; +import ErrorBoundary from '~/views/components/ErrorBoundary'; export class Skeleton extends Component { render() { diff --git a/pkg/interface/src/views/components/Group.tsx b/pkg/interface/src/views/components/Group.tsx index 76d41651e..82b977840 100644 --- a/pkg/interface/src/views/components/Group.tsx +++ b/pkg/interface/src/views/components/Group.tsx @@ -3,22 +3,22 @@ import _, { capitalize } from 'lodash'; import { FixedSizeList as List } from 'react-window'; import { Dropdown } from '../apps/publish/components/lib/dropdown'; -import { cite, deSig } from '../../logic/lib/util'; -import { roleForShip, resourceFromPath } from '../../logic/lib/group'; +import { cite, deSig } from '~/logic/lib/util'; +import { roleForShip, resourceFromPath } from '~/logic/lib/group'; import { Group, InvitePolicy, OpenPolicy, roleTags, Groups, -} from '../../types/group-update'; -import { Path, PatpNoSig, Patp } from '../../types/noun'; +} from '~/types/group-update'; +import { Path, PatpNoSig, Patp } from '~/types/noun'; import GlobalApi from '../api/global'; import { Menu, MenuButton, MenuList, MenuItem } from '@tlon/indigo-react'; import InviteSearch, { Invites } from './InviteSearch'; import { Spinner } from './Spinner'; -import { Rolodex } from '../../types/contact-update'; -import { Associations } from '../../types/metadata-update'; +import { Rolodex } from '~/types/contact-update'; +import { Associations } from '~/types/metadata-update'; class GroupMember extends Component<{ ship: Patp; options: any[] }, {}> { render() { diff --git a/pkg/interface/src/views/components/InviteSearch.tsx b/pkg/interface/src/views/components/InviteSearch.tsx index 9502693f2..0bbdfe554 100644 --- a/pkg/interface/src/views/components/InviteSearch.tsx +++ b/pkg/interface/src/views/components/InviteSearch.tsx @@ -2,11 +2,11 @@ import React, { Component, createRef } from 'react'; import _ from 'lodash'; import Mousetrap from 'mousetrap'; import urbitOb from 'urbit-ob'; -import { Sigil } from '../../logic/lib/sigil'; -import { PatpNoSig, Path } from '../../types/noun'; -import { Groups} from '../../types/group-update'; -import { Rolodex, Contact } from '../../types/contact-update'; -import { Associations } from '../../types/metadata-update'; +import { Sigil } from '~/logic/lib/sigil'; +import { PatpNoSig, Path } from '~/types/noun'; +import { Groups} from '~/types/group-update'; +import { Rolodex, Contact } from '~/types/contact-update'; +import { Associations } from '~/types/metadata-update'; export interface Invites { ships: PatpNoSig[]; diff --git a/pkg/interface/src/views/components/Omnibox.js b/pkg/interface/src/views/components/Omnibox.js index ced7e11a9..cf88f10d2 100644 --- a/pkg/interface/src/views/components/Omnibox.js +++ b/pkg/interface/src/views/components/Omnibox.js @@ -1,12 +1,12 @@ import React, { Component } from 'react'; import { withRouter } from 'react-router-dom'; import { Box, Row, Rule, Text } from '@tlon/indigo-react'; -import index from '../../logic/lib/omnibox'; +import index from '~/logic/lib/omnibox'; import Mousetrap from 'mousetrap'; import OmniboxInput from './OmniboxInput'; import OmniboxResult from './OmniboxResult'; -import { cite } from '../../logic/lib/util'; +import { cite } from '~/logic/lib/util'; export class Omnibox extends Component { constructor(props) { diff --git a/pkg/interface/src/views/components/OmniboxResult.js b/pkg/interface/src/views/components/OmniboxResult.js index 83e3cc3f8..589ab12b7 100644 --- a/pkg/interface/src/views/components/OmniboxResult.js +++ b/pkg/interface/src/views/components/OmniboxResult.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Row, Icon, Text } from '@tlon/indigo-react'; -import defaultApps from '../../logic/lib/default-apps'; +import defaultApps from '~/logic/lib/default-apps'; export class OmniboxResult extends Component { constructor(props) { diff --git a/pkg/interface/src/views/components/SidebarInvite.tsx b/pkg/interface/src/views/components/SidebarInvite.tsx index 15ffa4730..eb57b9731 100644 --- a/pkg/interface/src/views/components/SidebarInvite.tsx +++ b/pkg/interface/src/views/components/SidebarInvite.tsx @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Invite } from '../types/invite-update'; +import { Invite } from '~/types/invite-update'; export class SidebarInvite extends Component<{invite: Invite, onAccept: Function, onDecline: Function}, {}> { render() { From 017749b8cfc55e4e461be3275579f7e72d9fc610 Mon Sep 17 00:00:00 2001 From: Tyler Brown Cifu Shuster Date: Sat, 15 Aug 2020 15:28:33 -0700 Subject: [PATCH 2/2] interface: updated tsconfig.json --- pkg/interface/tsconfig.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/interface/tsconfig.json b/pkg/interface/tsconfig.json index 5ec2a3e51..b8fc52a6c 100644 --- a/pkg/interface/tsconfig.json +++ b/pkg/interface/tsconfig.json @@ -12,7 +12,11 @@ "target": "es2015", "module": "es2015", "strict": true, - "jsx": "react" + "jsx": "react", + "baseUrl": ".", + "paths": { + "~/*": ["src/*"] + } }, "include": [ "src/**/*"