Skip to content

Commit

Permalink
thatvegandev
Browse files Browse the repository at this point in the history
  • Loading branch information
coloradocolby committed Jun 13, 2022
1 parent 6fd4ae0 commit 9942711
Show file tree
Hide file tree
Showing 19 changed files with 64 additions and 66 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting me directly at coloradocolby@gmail.com. All complaints
reported by contacting me directly at thatvegandev@gmail.com. All complaints
will be reviewed and investigated and will result in a response that is deemed
necessary and appropriate to the circumstances. The project team is obligated
to maintain confidentiality with regard to the reporter of an incident. Further
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ merge of your pull request!
<!-- to check an item, place an "x" in the box like so: "- [x] Documentation" -->

- [ ] `Allow edits from maintainers` option checked
- [ ] Branch name is prefixed with `[your_username]/` (ex. `coloradocolby/featureX`)
- [ ] Branch name is prefixed with `[your_username]/` (ex. `thatvegandev/featureX`)
- [ ] Documentation added
- [ ] Tests added
- [ ] No failing actions
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
*.log
gh-eco
dist
coverage.out
coverage.out
.DS_Store
24 changes: 11 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
🦎 gh extension to explore the ecosystem

[![GitHub Go
Workflow](https://github.com/coloradocolby/gh-eco/actions/workflows/ci.yml/badge.svg)](https://github.com/coloradocolby/gh-eco/actions/workflows/ci.yml)
Workflow](https://github.com/thatvegandev/gh-eco/actions/workflows/ci.yml/badge.svg)](https://github.com/thatvegandev/gh-eco/actions/workflows/ci.yml)
[![License](https://img.shields.io/badge/License-MIT-default.svg)](./LICENSE.md) [![Github
Stars](https://img.shields.io/github/stars/coloradocolby/gh-eco)](https://github.com/coloradocolby/gh-eco/stargazers)
Stars](https://img.shields.io/github/stars/thatvegandev/gh-eco)](https://github.com/thatvegandev/gh-eco/stargazers)

![demo](./assets/demo.gif)
![demo](https://github.com/coloradocolby/assets/raw/main/gh-eco/demo.gif)

## Installation

Expand All @@ -18,7 +18,7 @@ Stars](https://img.shields.io/github/stars/coloradocolby/gh-eco)](https://github
2. Install this extension:

```sh
gh extension install coloradocolby/gh-eco
gh extension install thatvegandev/gh-eco
```

<details>
Expand All @@ -30,10 +30,10 @@ Stars](https://img.shields.io/github/stars/coloradocolby/gh-eco)](https://github

```sh
# git
git clone https://github.com/coloradocolby/gh-eco
git clone https://github.com/thatvegandev/gh-eco

# GitHub CLI
gh repo clone coloradocolby/gh-eco
gh repo clone thatvegandev/gh-eco
```

2. `cd` into it
Expand Down Expand Up @@ -121,9 +121,9 @@ this please feel free to open an issue / pull request and start the discussion!
All contributions are greatly appreciated!

If you have a suggestion that would make `gh-eco` better, please fork the repo and create a [pull
request](https://github.com/coloradocolby/gh-eco/pulls) or open an issue.
request](https://github.com/thatvegandev/gh-eco/pulls) or open an issue.

See the [open issues](https://github.com/coloradocolby/gh-eco/issues) for a full list of proposed
See the [open issues](https://github.com/thatvegandev/gh-eco/issues) for a full list of proposed
features (and known bugs).

## License
Expand All @@ -139,8 +139,6 @@ Check out these amazing projects that inspired `gh-eco`!

## Follow

[![github](https://img.shields.io/github/followers/coloradocolby?style=social)](https://github.com/coloradocolby)

[![twitter](https://img.shields.io/twitter/follow/coloradocolby?color=white&style=social)](https://twitter.com/coloradocolby)

[![youtube](https://img.shields.io/youtube/channel/subscribers/UCEDfokz6igeN4bX7Whq49-g?style=social)](https://youtube.com/user/coloradocolby)
[![github](https://img.shields.io/github/followers/thatvegandev?style=social)](https://github.com/thatvegandev)
[![twitter](https://img.shields.io/twitter/follow/thatvegandev?color=white&style=social)](https://twitter.com/thatvegandev)
[![youtube](https://img.shields.io/youtube/channel/subscribers/UCEDfokz6igeN4bX7Whq49-g?style=social)](https://youtube.com/user/thatvegandev)
8 changes: 4 additions & 4 deletions api/github/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (

tea "github.com/charmbracelet/bubbletea"
"github.com/cli/go-gh"
"github.com/coloradocolby/gh-eco/api/github/mutations"
"github.com/coloradocolby/gh-eco/api/github/queries"
"github.com/coloradocolby/gh-eco/ui/commands"
"github.com/coloradocolby/gh-eco/utils"
graphql "github.com/shurcooL/graphql"
"github.com/thatvegandev/gh-eco/api/github/mutations"
"github.com/thatvegandev/gh-eco/api/github/queries"
"github.com/thatvegandev/gh-eco/ui/commands"
"github.com/thatvegandev/gh-eco/utils"
)

const GH_ECO_REPO_ID string = "R_kgDOHVAImQ"
Expand Down
Binary file removed assets/demo.gif
Binary file not shown.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/coloradocolby/gh-eco
module github.com/thatvegandev/gh-eco

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"log"

tea "github.com/charmbracelet/bubbletea"
"github.com/coloradocolby/gh-eco/ui"
"github.com/thatvegandev/gh-eco/ui"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion ui/commands/commands.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commands

import "github.com/coloradocolby/gh-eco/ui/models"
import "github.com/thatvegandev/gh-eco/ui/models"

type FocusChange struct{}

Expand Down
4 changes: 2 additions & 2 deletions ui/components/graph/graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strings"

"github.com/charmbracelet/lipgloss"
"github.com/coloradocolby/gh-eco/ui/models"
"github.com/coloradocolby/gh-eco/utils"
"github.com/thatvegandev/gh-eco/ui/models"
"github.com/thatvegandev/gh-eco/utils"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions ui/components/help/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"github.com/charmbracelet/bubbles/key"
tea "github.com/charmbracelet/bubbletea"

"github.com/coloradocolby/gh-eco/ui/context"
"github.com/coloradocolby/gh-eco/utils"
"github.com/thatvegandev/gh-eco/ui/context"
"github.com/thatvegandev/gh-eco/utils"
)

type Model struct {
Expand Down
8 changes: 4 additions & 4 deletions ui/components/markdown/markdown.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"strings"

"github.com/coloradocolby/gh-eco/ui/commands"
"github.com/coloradocolby/gh-eco/ui/context"
"github.com/coloradocolby/gh-eco/ui/styles"
"github.com/coloradocolby/gh-eco/utils"
"github.com/thatvegandev/gh-eco/ui/commands"
"github.com/thatvegandev/gh-eco/ui/context"
"github.com/thatvegandev/gh-eco/ui/styles"
"github.com/thatvegandev/gh-eco/utils"

"github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea"
Expand Down
6 changes: 3 additions & 3 deletions ui/components/message/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"

"github.com/coloradocolby/gh-eco/ui/commands"
"github.com/coloradocolby/gh-eco/ui/context"
"github.com/coloradocolby/gh-eco/utils"
"github.com/thatvegandev/gh-eco/ui/commands"
"github.com/thatvegandev/gh-eco/ui/context"
"github.com/thatvegandev/gh-eco/utils"
)

type Model struct {
Expand Down
10 changes: 5 additions & 5 deletions ui/components/repo/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"strings"

"github.com/charmbracelet/lipgloss"
"github.com/coloradocolby/gh-eco/ui/context"
"github.com/coloradocolby/gh-eco/ui/models"
"github.com/coloradocolby/gh-eco/ui/styles"
"github.com/coloradocolby/gh-eco/utils"
"github.com/thatvegandev/gh-eco/ui/context"
"github.com/thatvegandev/gh-eco/ui/models"
"github.com/thatvegandev/gh-eco/ui/styles"
"github.com/thatvegandev/gh-eco/utils"
)

func buildRepoDisplay(repo models.Repo, width int, isFocused bool, viewerHasStarred bool) string {
Expand Down Expand Up @@ -65,5 +65,5 @@ func BuildPinnedRepoDisplay(repos []models.Repo, ctx *context.ProgramContext) st
}
}

return lipgloss.JoinHorizontal(lipgloss.Top, lc.String(), rc.String())
return lipgloss.JoinVertical(lipgloss.Top, lc.String(), rc.String())
}
10 changes: 5 additions & 5 deletions ui/components/search/search.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
"github.com/coloradocolby/gh-eco/api/github"
"github.com/coloradocolby/gh-eco/ui/commands"
"github.com/coloradocolby/gh-eco/ui/components/spinner"
"github.com/coloradocolby/gh-eco/ui/context"
"github.com/coloradocolby/gh-eco/utils"
"github.com/thatvegandev/gh-eco/api/github"
"github.com/thatvegandev/gh-eco/ui/commands"
"github.com/thatvegandev/gh-eco/ui/components/spinner"
"github.com/thatvegandev/gh-eco/ui/context"
"github.com/thatvegandev/gh-eco/utils"
)

type Model struct {
Expand Down
19 changes: 9 additions & 10 deletions ui/components/user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ import (

tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
"github.com/coloradocolby/gh-eco/ui/commands"
"github.com/coloradocolby/gh-eco/ui/components/graph"
"github.com/coloradocolby/gh-eco/ui/components/repo"
"github.com/coloradocolby/gh-eco/ui/context"
"github.com/coloradocolby/gh-eco/ui/models"
"github.com/coloradocolby/gh-eco/ui/styles"
"github.com/coloradocolby/gh-eco/utils"
"github.com/thatvegandev/gh-eco/ui/commands"
"github.com/thatvegandev/gh-eco/ui/components/repo"
"github.com/thatvegandev/gh-eco/ui/context"
"github.com/thatvegandev/gh-eco/ui/models"
"github.com/thatvegandev/gh-eco/ui/styles"
"github.com/thatvegandev/gh-eco/utils"
"golang.org/x/term"
)

Expand Down Expand Up @@ -167,9 +166,9 @@ func (m *Model) buildDisplay() {

w(utils.GetNewLines(1))

w(lipgloss.NewStyle().
Align(lipgloss.Left).
Render(graph.BuildGraphDisplay(u.ActivityGraph.Weeks)))
// w(lipgloss.NewStyle().
// Align(lipgloss.Left).
// Render(graph.BuildGraphDisplay(u.ActivityGraph.Weeks)))

w(utils.GetNewLines(2))

Expand Down
2 changes: 1 addition & 1 deletion ui/context/context.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package context

import "github.com/coloradocolby/gh-eco/ui/models"
import "github.com/thatvegandev/gh-eco/ui/models"

type Mode int

Expand Down
18 changes: 9 additions & 9 deletions ui/ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"

"github.com/coloradocolby/gh-eco/api/github"
"github.com/coloradocolby/gh-eco/ui/commands"
"github.com/coloradocolby/gh-eco/ui/components/help"
"github.com/coloradocolby/gh-eco/ui/components/markdown"
"github.com/coloradocolby/gh-eco/ui/components/message"
"github.com/coloradocolby/gh-eco/ui/components/search"
"github.com/coloradocolby/gh-eco/ui/components/user"
"github.com/coloradocolby/gh-eco/ui/context"
"github.com/coloradocolby/gh-eco/utils"
"github.com/thatvegandev/gh-eco/api/github"
"github.com/thatvegandev/gh-eco/ui/commands"
"github.com/thatvegandev/gh-eco/ui/components/help"
"github.com/thatvegandev/gh-eco/ui/components/markdown"
"github.com/thatvegandev/gh-eco/ui/components/message"
"github.com/thatvegandev/gh-eco/ui/components/search"
"github.com/thatvegandev/gh-eco/ui/components/user"
"github.com/thatvegandev/gh-eco/ui/context"
"github.com/thatvegandev/gh-eco/utils"
)

type Model struct {
Expand Down
4 changes: 2 additions & 2 deletions utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"unicode"

"github.com/coloradocolby/gh-eco/api/github/queries"
"github.com/coloradocolby/gh-eco/ui/models"
"github.com/thatvegandev/gh-eco/api/github/queries"
"github.com/thatvegandev/gh-eco/ui/models"
)

func TruncateText(str string, max int) string {
Expand Down

0 comments on commit 9942711

Please sign in to comment.