diff --git a/routes/_components/AccountsListPage.html b/routes/_components/AccountsListPage.html index 77a79ae5..73681a10 100644 --- a/routes/_components/AccountsListPage.html +++ b/routes/_components/AccountsListPage.html @@ -11,7 +11,6 @@ \ No newline at end of file diff --git a/routes/_pages/blocked.html b/routes/_pages/blocked.html new file mode 100644 index 00000000..97641ff8 --- /dev/null +++ b/routes/_pages/blocked.html @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/routes/_pages/community/index.html b/routes/_pages/community/index.html new file mode 100644 index 00000000..6bcbe117 --- /dev/null +++ b/routes/_pages/community/index.html @@ -0,0 +1,105 @@ +{{#if $isUserLoggedIn}} +
+ +

+ Timelines +

+ + + + + + + + {{#if $lists.length}} + +

+ Lists +

+ + + {{#each $lists as list}} + + {{/each}} + + + {{/if}} + +

+ Instance settings +

+ + + + + + + +
+{{else}} + + +

Community

+ +

Community options appear here when logged in.

+
+
+{{/if}} + + \ No newline at end of file diff --git a/routes/_pages/favorites.html b/routes/_pages/favorites.html new file mode 100644 index 00000000..0b755d27 --- /dev/null +++ b/routes/_pages/favorites.html @@ -0,0 +1,31 @@ +{{#if $isUserLoggedIn}} +{{#if $pinnedPage !== '/favorites'}} + +{{/if}} + +{{else}} + + +

Favorites

+ +

Your favorites will appear here when logged in.

+
+
+{{/if}} + \ No newline at end of file diff --git a/routes/_pages/federated.html b/routes/_pages/federated.html new file mode 100644 index 00000000..a3b95a8e --- /dev/null +++ b/routes/_pages/federated.html @@ -0,0 +1,31 @@ +{{#if $isUserLoggedIn}} +{{#if $pinnedPage !== '/federated'}} + +{{/if}} + +{{else}} + + +

Federated

+ +

Your federated timeline will appear here when logged in.

+
+
+{{/if}} + \ No newline at end of file diff --git a/routes/_pages/index.html b/routes/_pages/index.html new file mode 100644 index 00000000..0720f181 --- /dev/null +++ b/routes/_pages/index.html @@ -0,0 +1,25 @@ +{{#if $isUserLoggedIn}} + {{#if $currentVerifyCredentials}} + + {{/if}} + +{{else}} + +{{/if}} + + \ No newline at end of file diff --git a/routes/_pages/lists/[listId].html b/routes/_pages/lists/[listId].html new file mode 100644 index 00000000..7006ead9 --- /dev/null +++ b/routes/_pages/lists/[listId].html @@ -0,0 +1,35 @@ +{{#if $isUserLoggedIn}} +{{#if $pinnedPage !== `/lists/${params.listId}`}} + +{{/if}} + +{{else}} + + +

List

+ +

A list will appear here when logged in.

+
+
+{{/if}} + \ No newline at end of file diff --git a/routes/_pages/local.html b/routes/_pages/local.html new file mode 100644 index 00000000..03f78891 --- /dev/null +++ b/routes/_pages/local.html @@ -0,0 +1,31 @@ +{{#if $isUserLoggedIn}} +{{#if $pinnedPage !== '/local'}} + +{{/if}} + +{{else}} + + +

Local

+ +

Your local timeline will appear here when logged in.

+
+
+{{/if}} + \ No newline at end of file diff --git a/routes/_pages/muted.html b/routes/_pages/muted.html new file mode 100644 index 00000000..58d115c5 --- /dev/null +++ b/routes/_pages/muted.html @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/routes/_pages/notifications.html b/routes/_pages/notifications.html new file mode 100644 index 00000000..6587ee33 --- /dev/null +++ b/routes/_pages/notifications.html @@ -0,0 +1,26 @@ +{{#if $isUserLoggedIn}} + +{{else}} + + +

Notifications

+ +

Your notifications will appear here when logged in.

+
+
+{{/if}} + \ No newline at end of file diff --git a/routes/_pages/pinned.html b/routes/_pages/pinned.html new file mode 100644 index 00000000..698ddeaa --- /dev/null +++ b/routes/_pages/pinned.html @@ -0,0 +1,66 @@ + +
+ {{#if loading}} + + {{elseif statuses && statuses.length}} +
    + {{#each statuses as status, index}} + + {{/each}} +
+ {{/if}} +
+ + \ No newline at end of file diff --git a/routes/_pages/search.html b/routes/_pages/search.html new file mode 100644 index 00000000..d0174610 --- /dev/null +++ b/routes/_pages/search.html @@ -0,0 +1,39 @@ +{{#if $isUserLoggedIn}} +
+ +
+{{else}} + + +

Search

+ +

You can search once logged in to an instance.

+
+
+{{/if}} + + \ No newline at end of file diff --git a/routes/_pages/settings/about.html b/routes/_pages/settings/about.html new file mode 100644 index 00000000..733cb002 --- /dev/null +++ b/routes/_pages/settings/about.html @@ -0,0 +1,24 @@ + +

About Pinafore

+ +

+ Pinafore is free and open-source software + created by Nolan Lawson and distributed under the + GNU Affero General Public License. +

+ +

Icons provided by Font Awesome.

+ +

Logo thanks to "sailboat" by Gregor Cresnar from the Noun Project.

+
+ \ No newline at end of file diff --git a/routes/_pages/settings/general.html b/routes/_pages/settings/general.html new file mode 100644 index 00000000..ba8d8ad0 --- /dev/null +++ b/routes/_pages/settings/general.html @@ -0,0 +1,41 @@ + +

General Settings

+ +

UI Settings

+
+
+ + +
+
+ + +
+
+ +
+ + \ No newline at end of file diff --git a/routes/_pages/settings/index.html b/routes/_pages/settings/index.html new file mode 100644 index 00000000..222bd710 --- /dev/null +++ b/routes/_pages/settings/index.html @@ -0,0 +1,23 @@ + +

Settings

+ + + + + + + +
+ \ No newline at end of file diff --git a/routes/_pages/settings/instances/[instanceName].html b/routes/_pages/settings/instances/[instanceName].html new file mode 100644 index 00000000..ac484903 --- /dev/null +++ b/routes/_pages/settings/instances/[instanceName].html @@ -0,0 +1,151 @@ + +

{{params.instanceName}}

+ + {{#if verifyCredentials}} +

Logged in as:

+
+ + + {{'@' + verifyCredentials.acct}} + + {{verifyCredentials.display_name || verifyCredentials.acct}} +
+

Theme:

+
+ {{#each themes as theme}} +
+ + +
+ {{/each}} +
+ +
+ {{#if $loggedInInstancesInOrder.length > 1 && $currentInstance !== params.instanceName}} + + {{/if}} + +
+ {{/if}} +
+ + \ No newline at end of file diff --git a/routes/_pages/settings/instances/add.html b/routes/_pages/settings/instances/add.html new file mode 100644 index 00000000..7ed2b123 --- /dev/null +++ b/routes/_pages/settings/instances/add.html @@ -0,0 +1,90 @@ + +

Add an Instance

+ + {{#if $isUserLoggedIn}} +

Connect to an instance to log in.

+ {{else}} +

Log in to an instance to use Pinafore.

+ {{/if}} + +
+ + {{#if $logInToInstanceError && $logInToInstanceErrorForText === $instanceNameInSearch}} + + {{/if}} + + + + + + +
+ + {{#if !$isUserLoggedIn}} +

Don't have an instance? Join Mastodon!

+ {{/if}} +
+ + \ No newline at end of file diff --git a/routes/_pages/settings/instances/index.html b/routes/_pages/settings/instances/index.html new file mode 100644 index 00000000..39799403 --- /dev/null +++ b/routes/_pages/settings/instances/index.html @@ -0,0 +1,35 @@ + +

Instances

+ + {{#if $isUserLoggedIn}} +

Instances you've logged in to:

+ + {{#each $loggedInInstancesAsList as instance}} + + {{/each}} + +

Add another instance

+ {{else}} +

You're not logged in to any instances.

+

Log in to an instance to start using Pinafore.

+ {{/if}} +
+ \ No newline at end of file diff --git a/routes/_pages/statuses/[statusId]/favorites.html b/routes/_pages/statuses/[statusId]/favorites.html new file mode 100644 index 00000000..01183f26 --- /dev/null +++ b/routes/_pages/statuses/[statusId]/favorites.html @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/routes/_pages/statuses/[statusId]/index.html b/routes/_pages/statuses/[statusId]/index.html new file mode 100644 index 00000000..c9435aea --- /dev/null +++ b/routes/_pages/statuses/[statusId]/index.html @@ -0,0 +1,29 @@ +{{#if $isUserLoggedIn}} + + +{{else}} + + +

Status

+ +

A status thread will appear here when logged in.

+
+
+{{/if}} + \ No newline at end of file diff --git a/routes/_pages/statuses/[statusId]/reblogs.html b/routes/_pages/statuses/[statusId]/reblogs.html new file mode 100644 index 00000000..9a6fb3e5 --- /dev/null +++ b/routes/_pages/statuses/[statusId]/reblogs.html @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/routes/_pages/statuses/[statusId]/reply.html b/routes/_pages/statuses/[statusId]/reply.html new file mode 100644 index 00000000..8051cbe4 --- /dev/null +++ b/routes/_pages/statuses/[statusId]/reply.html @@ -0,0 +1,44 @@ + +
+ {{#if status}} + + + {{else}} + + {{/if}} +
+ + \ No newline at end of file diff --git a/routes/_pages/tags/[tagName].html b/routes/_pages/tags/[tagName].html new file mode 100644 index 00000000..378101d6 --- /dev/null +++ b/routes/_pages/tags/[tagName].html @@ -0,0 +1,29 @@ +{{#if $isUserLoggedIn}} + + +{{else}} + + +

#{{params.tagName}}

+ +

A hashtag timeline will appear here when logged in.

+
+
+{{/if}} + \ No newline at end of file diff --git a/routes/accounts/[accountId].html b/routes/accounts/[accountId].html index 51d8d632..b552dad7 100644 --- a/routes/accounts/[accountId].html +++ b/routes/accounts/[accountId].html @@ -1,64 +1,21 @@ <:Head> Pinafore – {{profileName}} - - {{#if $isUserLoggedIn}} - - {{#if $currentAccountProfile}} - - {{/if}} - - - {{else}} - - -

Profile

- -

A user timeline will appear here when logged in.

-
-
- {{/if}} +
\ No newline at end of file diff --git a/routes/blocked.html b/routes/blocked.html index c324799c..43b038a8 100644 --- a/routes/blocked.html +++ b/routes/blocked.html @@ -1,28 +1,21 @@ <:Head> Pinafore – Blocked users - - - + \ No newline at end of file diff --git a/routes/community/index.html b/routes/community/index.html index 0af34812..c0b708be 100644 --- a/routes/community/index.html +++ b/routes/community/index.html @@ -1,111 +1,21 @@ <:Head> Pinafore – Community - - {{#if $isUserLoggedIn}} -
- -

- Timelines -

- - - - - - - - {{#if $lists.length}} - -

- Lists -

- - - {{#each $lists as list}} - - {{/each}} - - - {{/if}} - -

- Instance settings -

- - - - - - - -
- {{else}} - - -

Community

- -

Community options appear here when logged in.

-
-
- {{/if}} +
- \ No newline at end of file diff --git a/routes/favorites.html b/routes/favorites.html index 15430260..166e9f3d 100644 --- a/routes/favorites.html +++ b/routes/favorites.html @@ -1,40 +1,21 @@ <:Head> Pinafore – Favorites - - {{#if $isUserLoggedIn}} - {{#if $pinnedPage !== '/favorites'}} - - {{/if}} - - {{else}} - - -

Favorites

- -

Your favorites will appear here when logged in.

-
-
- {{/if}} +
- \ No newline at end of file diff --git a/routes/federated.html b/routes/federated.html index 4b464c71..8bce6354 100644 --- a/routes/federated.html +++ b/routes/federated.html @@ -1,40 +1,21 @@ <:Head> Pinafore – Federated - - {{#if $isUserLoggedIn}} - {{#if $pinnedPage !== '/federated'}} - - {{/if}} - - {{else}} - - -

Federated

- -

Your federated timeline will appear here when logged in.

-
-
- {{/if}} +
- \ No newline at end of file diff --git a/routes/index.html b/routes/index.html index 3e9a6a36..44152c1a 100644 --- a/routes/index.html +++ b/routes/index.html @@ -1,35 +1,21 @@ <:Head> Pinafore – Home - - {{#if $isUserLoggedIn}} - {{#if $currentVerifyCredentials}} - - {{/if}} - - {{else}} - - {{/if}} + - - - \ No newline at end of file + export default { + components: { + Layout, + LazyPage + }, + data: () => ({ + pageComponent + }) + } + \ No newline at end of file diff --git a/routes/lists/[listId].html b/routes/lists/[listId].html index 60f4e499..b7b5336f 100644 --- a/routes/lists/[listId].html +++ b/routes/lists/[listId].html @@ -1,43 +1,21 @@ <:Head> Pinafore – {{listTitle}} - - {{#if $isUserLoggedIn}} - {{#if $pinnedPage !== `/lists/${params.listId}`}} - - {{/if}} - - {{else}} - - -

List

- -

A list will appear here when logged in.

-
-
- {{/if}} +
\ No newline at end of file diff --git a/routes/local.html b/routes/local.html index 685b766c..07ee50de 100644 --- a/routes/local.html +++ b/routes/local.html @@ -1,40 +1,21 @@ <:Head> Pinafore – Local - - {{#if $isUserLoggedIn}} - {{#if $pinnedPage !== '/local'}} - - {{/if}} - - {{else}} - - -

Local

- -

Your local timeline will appear here when logged in.

-
-
- {{/if}} +
- \ No newline at end of file diff --git a/routes/muted.html b/routes/muted.html index 2c2b9d4f..4f47e60f 100644 --- a/routes/muted.html +++ b/routes/muted.html @@ -1,28 +1,21 @@ <:Head> Pinafore – Muted users - - - + \ No newline at end of file diff --git a/routes/notifications.html b/routes/notifications.html index c7cd9c10..cd13cb45 100644 --- a/routes/notifications.html +++ b/routes/notifications.html @@ -1,35 +1,21 @@ <:Head> Pinafore – Notifications - - {{#if $isUserLoggedIn}} - - {{else}} - - -

Notifications

- -

Your notifications will appear here when logged in.

-
-
- {{/if}} +
- \ No newline at end of file diff --git a/routes/pinned.html b/routes/pinned.html index 60239eff..a3889596 100644 --- a/routes/pinned.html +++ b/routes/pinned.html @@ -1,75 +1,21 @@ <:Head> Pinafore – Pinned toots - - -
- {{#if loading}} - - {{elseif statuses && statuses.length}} -
    - {{#each statuses as status, index}} - - {{/each}} -
- {{/if}} -
+
- \ No newline at end of file diff --git a/routes/search.html b/routes/search.html index d3a4830d..ba191350 100644 --- a/routes/search.html +++ b/routes/search.html @@ -1,48 +1,21 @@ <:Head> Pinafore – Search - - {{#if $isUserLoggedIn}} -
- -
- {{else}} - - -

Search

- -

You can search once logged in to an instance.

-
-
- {{/if}} +
- \ No newline at end of file diff --git a/routes/settings/about.html b/routes/settings/about.html index 8790444b..a994f059 100644 --- a/routes/settings/about.html +++ b/routes/settings/about.html @@ -1,33 +1,21 @@ <:Head> Pinafore – About - - -

About Pinafore

- -

- Pinafore is free and open-source software - created by Nolan Lawson and distributed under the - GNU Affero General Public License. -

- -

Icons provided by Font Awesome.

- -

Logo thanks to "sailboat" by Gregor Cresnar from the Noun Project.

-
+
- \ No newline at end of file diff --git a/routes/settings/general.html b/routes/settings/general.html index 63c36722..95994b7a 100644 --- a/routes/settings/general.html +++ b/routes/settings/general.html @@ -1,50 +1,21 @@ <:Head> Pinafore – General Settings - - -

General Settings

- -

UI Settings

-
-
- - -
-
- - -
-
- -
+
- - \ No newline at end of file diff --git a/routes/settings/index.html b/routes/settings/index.html index 50ade4d7..5319673f 100644 --- a/routes/settings/index.html +++ b/routes/settings/index.html @@ -1,31 +1,21 @@ <:Head> Pinafore – Settings - - -

Settings

- - - - - - - -
+
\ No newline at end of file diff --git a/routes/settings/instances/[instanceName].html b/routes/settings/instances/[instanceName].html index 3d455479..e978e574 100644 --- a/routes/settings/instances/[instanceName].html +++ b/routes/settings/instances/[instanceName].html @@ -1,159 +1,21 @@ <:Head> Pinafore – {{params.instanceName}} - - -

{{params.instanceName}}

- - {{#if verifyCredentials}} -

Logged in as:

-
- - - {{'@' + verifyCredentials.acct}} - - {{verifyCredentials.display_name || verifyCredentials.acct}} -
-

Theme:

-
- {{#each themes as theme}} -
- - -
- {{/each}} -
- -
- {{#if $loggedInInstancesInOrder.length > 1 && $currentInstance !== params.instanceName}} - - {{/if}} - -
- {{/if}} -
+
- \ No newline at end of file diff --git a/routes/settings/instances/add.html b/routes/settings/instances/add.html index d6b1b122..f8beca49 100644 --- a/routes/settings/instances/add.html +++ b/routes/settings/instances/add.html @@ -1,98 +1,21 @@ <:Head> Pinafore – Add an Instance - - -

Add an Instance

- - {{#if $isUserLoggedIn}} -

Connect to an instance to log in.

- {{else}} -

Log in to an instance to use Pinafore.

- {{/if}} - -
- - {{#if $logInToInstanceError && $logInToInstanceErrorForText === $instanceNameInSearch}} - - {{/if}} - - - - - - -
- - {{#if !$isUserLoggedIn}} -

Don't have an instance? Join Mastodon!

- {{/if}} -
+
- \ No newline at end of file diff --git a/routes/settings/instances/index.html b/routes/settings/instances/index.html index 7d5d21be..162ce6ba 100644 --- a/routes/settings/instances/index.html +++ b/routes/settings/instances/index.html @@ -1,43 +1,21 @@ <:Head> Pinafore – Instances - - -

Instances

- - {{#if $isUserLoggedIn}} -

Instances you've logged in to:

- - {{#each $loggedInInstancesAsList as instance}} - - {{/each}} - -

Add another instance

- {{else}} -

You're not logged in to any instances.

-

Log in to an instance to start using Pinafore.

- {{/if}} -
+
\ No newline at end of file diff --git a/routes/statuses/[statusId]/favorites.html b/routes/statuses/[statusId]/favorites.html index 8bf0df8c..b7daf207 100644 --- a/routes/statuses/[statusId]/favorites.html +++ b/routes/statuses/[statusId]/favorites.html @@ -1,28 +1,21 @@ <:Head> Pinafore – Favorites - - - + \ No newline at end of file diff --git a/routes/statuses/[statusId]/index.html b/routes/statuses/[statusId]/index.html index 04916ed7..c2215f62 100644 --- a/routes/statuses/[statusId]/index.html +++ b/routes/statuses/[statusId]/index.html @@ -1,37 +1,21 @@ <:Head> Pinafore – Status - - {{#if $isUserLoggedIn}} - - - {{else}} - - -

Status

- -

A status thread will appear here when logged in.

-
-
- {{/if}} +
\ No newline at end of file diff --git a/routes/statuses/[statusId]/reblogs.html b/routes/statuses/[statusId]/reblogs.html index 4a8b5890..41668ecf 100644 --- a/routes/statuses/[statusId]/reblogs.html +++ b/routes/statuses/[statusId]/reblogs.html @@ -1,28 +1,21 @@ <:Head> Pinafore – Reblogs - - - + \ No newline at end of file diff --git a/routes/statuses/[statusId]/reply.html b/routes/statuses/[statusId]/reply.html index ba4302c8..0a58d92c 100644 --- a/routes/statuses/[statusId]/reply.html +++ b/routes/statuses/[statusId]/reply.html @@ -1,53 +1,21 @@ <:Head> Pinafore – Reply - - -
- {{#if status}} - - - {{else}} - - {{/if}} -
+
- \ No newline at end of file diff --git a/routes/tags/[tagName].html b/routes/tags/[tagName].html index ba3c03fa..8e99862e 100644 --- a/routes/tags/[tagName].html +++ b/routes/tags/[tagName].html @@ -1,37 +1,21 @@ <:Head> Pinafore – #{{params.tagName}} - - {{#if $isUserLoggedIn}} - - - {{else}} - - -

#{{params.tagName}}

- -

A hashtag timeline will appear here when logged in.

-
-
- {{/if}} +
\ No newline at end of file diff --git a/scss/global.scss b/scss/global.scss index 12857a7e..6d9cae8f 100644 --- a/scss/global.scss +++ b/scss/global.scss @@ -37,6 +37,7 @@ main { background: var(--main-bg); border: 1px solid var(--main-border); border-radius: 1px; + min-height: 60vh; @media (max-width: 767px) { margin: 5px auto 15px; } diff --git a/templates/2xx.html b/templates/2xx.html index 12c28ad8..a0cbb3fb 100644 --- a/templates/2xx.html +++ b/templates/2xx.html @@ -11,7 +11,7 @@