-
+
{commit.header.summary}
-
+
{commit.header.description}
- Authored by
-
- {commit.header.author.name}
-
+ Authored by {commit.header.author.name}
<{commit.header.author.email}>
{#if commit.header.committer.email != commit.header.author.email}
- Committed by
-
- {commit.header.committer.name}
-
+ Committed by {commit.header.committer.name}
<{commit.header.committer.email}>
@@ -158,8 +156,7 @@
- Commit
- {commit.header.sha1}
+ Commit {commit.header.sha1}
@@ -170,13 +167,9 @@
{#if commit.diff.modified.length > 0}
{commit.diff.modified.length} file(s) changed
-
- with
-
+ with
{commit.stats.additions} additions
-
- and
-
+ and
{commit.stats.deletions} deletions
{/if}
diff --git a/ui/Screen/Project/Issue.svelte b/ui/Screen/Project/Issue.svelte
index e2041a8985..969510b5a9 100644
--- a/ui/Screen/Project/Issue.svelte
+++ b/ui/Screen/Project/Issue.svelte
@@ -159,8 +159,8 @@ Part of #277
{issue.open ? 'Open' : 'Closed'}
- {issue.open ? 'Opened' : 'Closed'} {issue.created_at} by
-
{issue.author.handle}
diff --git a/ui/Screen/Project/Source.svelte b/ui/Screen/Project/Source.svelte
index f39b60c522..581192ee5b 100644
--- a/ui/Screen/Project/Source.svelte
+++ b/ui/Screen/Project/Source.svelte
@@ -309,7 +309,6 @@
-
-
{#if object.info.objectType === ObjectType.Blob}
diff --git a/ui/Screen/ProjectRegistration.svelte b/ui/Screen/ProjectRegistration.svelte
index 9a2438d047..0a6624f7eb 100644
--- a/ui/Screen/ProjectRegistration.svelte
+++ b/ui/Screen/ProjectRegistration.svelte
@@ -90,7 +90,6 @@
-
{#if showRegistrationDetails === true}
Project registration
diff --git a/ui/Screen/Settings.svelte b/ui/Screen/Settings.svelte
index 11dc403163..c7c71aba36 100644
--- a/ui/Screen/Settings.svelte
+++ b/ui/Screen/Settings.svelte
@@ -200,6 +200,5 @@
-
diff --git a/ui/src/hotkeys.ts b/ui/src/hotkeys.ts
new file mode 100644
index 0000000000..e7d4a34c1b
--- /dev/null
+++ b/ui/src/hotkeys.ts
@@ -0,0 +1,15 @@
+import { get, writable } from "svelte/store";
+
+const state = writable(true);
+
+export const areEnabled = (): boolean => {
+ return get(state);
+};
+
+export const enable = (): void => {
+ state.set(true);
+};
+
+export const disable = (): void => {
+ state.set(false);
+};
diff --git a/ui/src/identity.ts b/ui/src/identity.ts
index 820b2fdc35..a71fa778de 100644
--- a/ui/src/identity.ts
+++ b/ui/src/identity.ts
@@ -30,41 +30,25 @@ export const identity = identityStore.readable;
// EVENTS
enum Kind {
- Create = "CREATE",
Fetch = "FETCH",
}
-interface Create extends event.Event
{
- kind: Kind.Create;
- handle: string;
-}
-
interface Fetch extends event.Event {
kind: Kind.Fetch;
urn: string;
}
-type Msg = Create | Fetch;
+type Msg = Fetch;
interface CreateInput {
handle: string;
+ passphrase: string;
}
export const fetch = event.create(Kind.Fetch, update);
function update(msg: Msg): void {
switch (msg.kind) {
- case Kind.Create:
- creationStore.loading();
- api
- .post("identities", {
- handle: msg.handle,
- })
- .then(id => {
- creationStore.success(id);
- })
- .catch(creationStore.error);
- break;
case Kind.Fetch:
identityStore.loading();
api
@@ -75,7 +59,9 @@ function update(msg: Msg): void {
}
}
-export const create = event.create(Kind.Create, update);
+export const createIdentity = (input: CreateInput): Promise => {
+ return api.post("identities", input);
+};
// MOCK
export const fallback = {
diff --git a/ui/src/onboard.ts b/ui/src/onboard.ts
deleted file mode 100644
index d2188e63e6..0000000000
--- a/ui/src/onboard.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { writable } from "svelte/store";
-
-export enum State {
- Welcome = "WELCOME",
- Form = "FORM",
- SuccessView = "SUCCESS_VIEW",
- Complete = "COMPLETE",
-}
-
-export const store = writable(State.Welcome);
diff --git a/ui/src/onboarding.ts b/ui/src/onboarding.ts
new file mode 100644
index 0000000000..41aab47a2d
--- /dev/null
+++ b/ui/src/onboarding.ts
@@ -0,0 +1,24 @@
+import * as validation from "./validation";
+
+export enum State {
+ Welcome = "WELCOME",
+ EnterName = "ENTER_NAME",
+ EnterPassphrase = "ENTER_PASSPHRASE",
+ SuccessView = "SUCCESS_VIEW",
+}
+
+const HANDLE_MATCH = "^[a-z0-9][a-z0-9_-]+$";
+
+const handleConstraints = {
+ presence: {
+ message: "You must provide a handle",
+ allowEmpty: false,
+ },
+ format: {
+ pattern: new RegExp(HANDLE_MATCH, "i"),
+ message: `Handle should match ${HANDLE_MATCH}`,
+ },
+};
+
+export const createHandleValidationStore = (): validation.ValidationStore =>
+ validation.createValidationStore(handleConstraints);
diff --git a/ui/src/path.ts b/ui/src/path.ts
index b20b465477..db27ce1dd5 100644
--- a/ui/src/path.ts
+++ b/ui/src/path.ts
@@ -2,6 +2,7 @@ import { parse, stringify, ParsedQs } from "qs";
import regexparam from "regexparam";
import { RevisionQuery } from "./source";
+export const blank = (): string => "/";
export const settings = (): string => "/settings";
export const discovery = (): string => "/discovery";
@@ -12,7 +13,7 @@ export const profileProjects = (): string => "/profile/projects";
export const profileTracking = (): string => "/profile/tracking";
export const profileWallet = (): string => "/profile/wallet";
export const registerUser = (): string => "/user-registration";
-export const createIdentity = (): string => "/identity/new";
+export const onboarding = (): string => "/onboarding";
export const userProfile = (urn: string): string => `/user/${urn}`;
export const userProfileProjects = (urn: string): string =>
diff --git a/ui/src/urn.ts b/ui/src/urn.ts
new file mode 100644
index 0000000000..b77c1e3593
--- /dev/null
+++ b/ui/src/urn.ts
@@ -0,0 +1,3 @@
+export const shorten = (stringWithUrn: string): string => {
+ return stringWithUrn.replace(/(rad:git:[\w]{3})[\w]{53}([\w]{3})/, "$1…$2");
+};
diff --git a/yarn.lock b/yarn.lock
index 20c42c924c..165a1e7d9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6567,12 +6567,7 @@ prepend-http@^2.0.0:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-prettier-plugin-svelte@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-1.1.0.tgz#e6ec282d8457598b0c02164083b11ad8cb8ab304"
- integrity sha512-wmIggG/ryV0wcmE9D5p+k5TwKDpS2SGKJpF6IV1aYHK7dkBJD+di1w47Ci00DRsI4RrXZRC2Ef37DSyrTb6Zqg==
-
-prettier-plugin-svelte@~1.2.0:
+prettier-plugin-svelte@^1.2.0, prettier-plugin-svelte@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-1.2.0.tgz#64088163656470e7d5c83106aea804a1c2c71efb"
integrity sha512-D6Yh8WIk/8BDtJ6BN5vFMylCcdbiQbB2px5UPIiBCp1MbEqpEbVfWyOJPKnVc0xkvlr2CoCRXJcNbHtnh0JM9w==