-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- re-logical-ify the navigation for blocks / follows / following
- Loading branch information
Showing
15 changed files
with
116 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| {{- $folders := .Folders -}} | ||
|
|
||
| <div class="fullscreen app" hx-get="{{.URL}}" hx-trigger="refreshPage from:window" hx-target="this" hx-swap="outerHTML" hx-push-url="true"> | ||
| <title>{{.BlockCount}} Blocks | {{.DisplayName}}</title> | ||
| <script src="/.templates/profile-default/hyperscript" type="text/hyperscript"></script> | ||
|
|
||
| {{- template "inbox-sidebar" $folders -}} | ||
|
|
||
| <div class="app-content"> | ||
|
|
||
| <div role="tablist" class="underlined space-above space-below" hx-push-url="true"> | ||
| <span role="tab" class="turboclick" hx-get="/@me/following">{{icon "star"}} Following</span> | ||
| <span role="tab" class="turboclick" hx-get="/@me/followers">{{icon "person"}} Followers</span> | ||
| <span role="tab" class="turboclick" aria-selected="true">{{icon "block-fill"}} Blocks</span> | ||
| </div> | ||
|
|
||
| {{- template "blocks-editor" . -}} | ||
| </div> | ||
|
|
||
| </div> |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| {{- $folders := .Folders -}} | ||
|
|
||
| <div class="fullscreen app" hx-get="{{.URL}}" hx-trigger="refreshPage from:window" hx-target="this" hx-swap="outerHTML"> | ||
|
|
||
| <title>{{.FollowerCount}} Followers | {{.DisplayName}}</title> | ||
|
|
||
| {{- template "inbox-sidebar" $folders -}} | ||
|
|
||
| <div class="app-content"> | ||
|
|
||
| <div role="tablist" class="underlined space-above space-below" hx-push-url="true"> | ||
| <span role="tab" class="turboclick" hx-get="/@me/following">{{icon "star"}} Following</span> | ||
| <span role="tab" class="turboclick" aria-selected="true">{{icon "person-fill"}} Followers</span> | ||
| <span role="tab" class="turboclick" hx-get="/@me/blocks">{{icon "block"}} Blocks</span> | ||
| </div> | ||
|
|
||
| {{ .View "followers-list"}} | ||
|
|
||
| </div> | ||
|
|
||
| </div> |
67 changes: 40 additions & 27 deletions
67
_embed/templates/profile-default/inbox-following-list.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,55 @@ | ||
| {{- $following := .Following -}} | ||
|
|
||
| <div class="table"> | ||
| {{- range $following -}} | ||
| <div class="flex-row" style="align-items:center" role="button" hx-push-url="true"> | ||
| <div class="link flex-row" hx-get="/@me/following-add" style="align-items:center" role="button" hx-push-url="false"> | ||
|
|
||
| <div class="flex-row" style="flex-grow:1"> | ||
|
|
||
| <div hx-get="/@me/inbox?folderId={{.FolderID.Hex}}&followingId={{.FollowingID.Hex}}" style="width:3em; height:3em; flex-grow:0; flex-shrink:0;"> | ||
| {{- if ne "" .ImageURL -}} | ||
| <img src="{{.ImageURL}}" class="circle" style="height:3em; width:3em;"/> | ||
| {{- end -}} | ||
| <div style="width:3em; flex-grow:0; flex-shrink:0; text-align:center;"> | ||
| {{icon "add"}} | ||
| </div> | ||
|
|
||
| <!--span class="{{.StatusClass}}">{{icon .Icon}}</span--> | ||
| <div hx-get="/@me/inbox?folderId={{.FolderID.Hex}}&origin.internalId={{.FollowingID.Hex}}" style="flex-grow:1;"> | ||
| <div class="ellipsis-block" style="max-height:1.75em;"> | ||
| {{- if ne "" .Label -}} | ||
| <span class="black bold">{{- .Label -}}</span> | ||
| {{- else -}} | ||
| {{- .URL -}} | ||
| <div style="flex-grow:1; text-align:left;"> | ||
| Follow a Person or Website | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {{- range $following -}} | ||
| <div class="flex-row" style="align-items:center" role="button" hx-push-url="true"> | ||
|
|
||
| <div class="flex-row" style="flex-grow:1"> | ||
|
|
||
| <div hx-get="/@me/inbox?folderId={{.FolderID.Hex}}&followingId={{.FollowingID.Hex}}" style="width:3em; height:3em; flex-grow:0; flex-shrink:0;"> | ||
| {{- if ne "" .ImageURL -}} | ||
| <img src="{{.ImageURL}}" class="circle" style="height:3em; width:3em;"/> | ||
| {{- end -}} | ||
| </div> | ||
| <div class="text-xs text-gray" style="margin:0px;"> | ||
| {{ if eq "SUCCESS" .Status -}} | ||
| {{ icon .Icon }} | ||
| {{ .LastPolled | tinyDate }} | ||
| {{- else if eq "LOADING" .Status -}} | ||
| <span class="green">{{.Status}}</span> | ||
| {{- else -}} | ||
| <span class="red">{{.Status}}</span> | ||
| {{- end -}} | ||
|
|
||
| <!--span class="{{.StatusClass}}">{{icon .Icon}}</span--> | ||
| <div hx-get="/@me/inbox?folderId={{.FolderID.Hex}}&origin.internalId={{.FollowingID.Hex}}" style="flex-grow:1;"> | ||
| <div class="ellipsis-block" style="max-height:1.75em;"> | ||
| {{- if ne "" .Label -}} | ||
| <span class="black bold">{{- .Label -}}</span> | ||
| {{- else -}} | ||
| {{- .URL -}} | ||
| {{- end -}} | ||
| </div> | ||
| <div class="text-xs text-gray" style="margin:0px;"> | ||
| {{ if eq "SUCCESS" .Status -}} | ||
| {{ icon .Icon }} | ||
| {{ .LastPolled | tinyDate }} | ||
| {{- else if eq "LOADING" .Status -}} | ||
| <span class="green">{{.Status}}</span> | ||
| {{- else -}} | ||
| <span class="red">{{.Status}}</span> | ||
| {{- end -}} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="align-right"> | ||
| <button class="text-sm" hx-get="/@me/following-edit?followingId={{.FollowingID.Hex}}">Edit</button> | ||
| <div class="align-right" hx-push-url="false"> | ||
| <button class="text-sm" hx-get="/@me/following-edit?followingId={{.FollowingID.Hex}}">Edit</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {{- end -}} | ||
| {{- end -}} | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,22 @@ | ||
| {{- $folders := .Folders -}} | ||
|
|
||
| <div hx-get="{{.URL}}" hx-trigger="refreshPage from:window" hx-target="this" hx-swap="outerHTML" hx-push-url="true"> | ||
| <div class="fullscreen app" hx-get="{{.URL}}" hx-trigger="refreshPage from:window" hx-target="this" hx-swap="outerHTML" hx-push-url="true"> | ||
| <title>{{.FollowingCount}} Following | {{.DisplayName}}</title> | ||
| <script src="/.templates/user-profile/hyperscript" type="text/hyperscript"></script> | ||
|
|
||
| <div class="app h-card"> | ||
| {{- template "inbox-sidebar" $folders -}} | ||
|
|
||
| {{- template "inbox-sidebar" $folders -}} | ||
| <div class="app-content"> | ||
|
|
||
| <div class="app-content"> | ||
|
|
||
| <div class="text-sm float-right"> | ||
| <button hx-get="/@me/following-add" class="primary">{{icon "add"}} Follow</button> | ||
| </div> | ||
|
|
||
| <h1>Manage Follows</h1> | ||
|
|
||
| {{- template "inbox-following-list" . -}} | ||
|
|
||
| <div role="tablist" class="underlined space-above space-below" hx-push-url="true"> | ||
| <span role="tab" class="turboclick" aria-selected="true">{{icon "star-fill"}} Following</span> | ||
| <span role="tab" class="turboclick" hx-get="/@me/followers">{{icon "person"}} Followers</span> | ||
| <span role="tab" class="turboclick" hx-get="/@me/blocks">{{icon "block"}} Blocks</span> | ||
| </div> | ||
|
|
||
| {{- template "inbox-following-list" . -}} | ||
|
|
||
| </div> | ||
|
|
||
|
|
||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
30 changes: 0 additions & 30 deletions
30
_embed/templates/profile-default/profile-following-list.html
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.