Skip to content

Commit

Permalink
Update to new user name
Browse files Browse the repository at this point in the history
  • Loading branch information
strang1ato committed Apr 29, 2021
1 parent 2260e3b commit 6e29ae1
Show file tree
Hide file tree
Showing 57 changed files with 2,474 additions and 182 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div align="center">
<p>Terminal based, inspired by vi/vim time blocking tool</p>
<br>
<a href="https://goreportcard.com/report/github.com/oltarzewskik/tibivi">
<img src="https://goreportcard.com/badge/github.com/oltarzewskik/tibivi">
<a href="https://goreportcard.com/report/github.com/strang1ato/tibivi">
<img src="https://goreportcard.com/badge/github.com/strang1ato/tibivi">
</a>
<a href="http://makeapullrequest.com">
<img src="https://img.shields.io/badge/PRs-welcome-brightgreen">
</a>
<a href="https://github.com/oltarzewskik/tibivi/blob/master/LICENSE">
<a href="https://github.com/strang1ato/tibivi/blob/master/LICENSE">
<img src="https://img.shields.io/badge/license-MIT-brightgreen">
</a>
<br>
Expand Down Expand Up @@ -52,12 +52,12 @@

Make sure you have Go 1.14 installed and `$GOPATH/bin` added to `$PATH`, then execute:
```bash
go get -u github.com/oltarzewskik/tibivi
go get -u github.com/strang1ato/tibivi
```

### Binary

Download latest binary from [releases](https://github.com/oltarzewskik/tibivi/releases)
Download latest binary from [releases](https://github.com/strang1ato/tibivi/releases)

then make file executable by for example:
```bash
Expand Down
14 changes: 7 additions & 7 deletions cmd/tibivi.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package cmd

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/config"
"github.com/oltarzewskik/tibivi/pkg/keybindings"
"github.com/oltarzewskik/tibivi/pkg/layout"
"github.com/oltarzewskik/tibivi/pkg/layout/utils"
"github.com/oltarzewskik/tibivi/pkg/schedule"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/config"
"github.com/strang1ato/tibivi/pkg/keybindings"
"github.com/strang1ato/tibivi/pkg/layout"
"github.com/strang1ato/tibivi/pkg/layout/utils"
"github.com/strang1ato/tibivi/pkg/schedule"
)

// Run runs Tibivi
Expand Down
9 changes: 5 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
module github.com/oltarzewskik/tibivi
module github.com/strang1ato/tibivi

go 1.14

require (
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect
github.com/oltarzewskik/tibivi-gocui v0.0.1
github.com/mattn/go-runewidth v0.0.12 // indirect
github.com/nsf/termbox-go v1.1.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/strang1ato/tibivi-gocui v0.0.1
)
9 changes: 9 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow=
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/nsf/termbox-go v0.0.0-20200204031403-4d2b513ad8be h1:yzmWtPyxEUIKdZg4RcPq64MfS8NA6A5fNOJgYhpR9EQ=
github.com/nsf/termbox-go v0.0.0-20200204031403-4d2b513ad8be/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 h1:lh3PyZvY+B9nFliSGTn5uFuqQQJGuNrD0MLCokv09ag=
github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
github.com/nsf/termbox-go v1.1.0 h1:R+GIXVMaDxDQ2VHem5vO5h0mI8ZxLECTUNw1ZzXODzI=
github.com/nsf/termbox-go v1.1.0/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
github.com/oltarzewskik/gocui v0.1.1 h1:fNZdVA/Cu3MLxncmGs0Jl1oPoJGvdlBsZFr+lLdU7NE=
github.com/oltarzewskik/gocui v0.1.1/go.mod h1:VDluuQmfiB7LB0qPNsFbSxbg3jSRVHyGIm9SvATRzuQ=
github.com/oltarzewskik/gocui v0.1.2 h1:bVEDXU4AyUZR35ZzWcSiYJ4x4WV0YAsoMWSZ+rFogpk=
github.com/oltarzewskik/gocui v0.1.2/go.mod h1:VDluuQmfiB7LB0qPNsFbSxbg3jSRVHyGIm9SvATRzuQ=
github.com/oltarzewskik/tibivi-gocui v0.0.1 h1:iBAqfPbr4lgHPyS0iD1Wig7Fz72GPCwXm9U06ukNKtU=
github.com/oltarzewskik/tibivi-gocui v0.0.1/go.mod h1:IyAoBPywG+Y2r1cynIMDAoR25KKEGhVbzIAB+P9+wtk=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/strang1ato/tibivi-gocui v0.0.1 h1:SMsNSTIqJny/Hq7vkd8n0pkLS37kPBJ9nOQJ2kax8sM=
github.com/strang1ato/tibivi-gocui v0.0.1/go.mod h1:MOCfJVLtg2//MGV4m24SNpqj9CFdL3AToGJqBoUSxp4=
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"log"

"github.com/oltarzewskik/tibivi/cmd"
"github.com/strang1ato/tibivi/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/actions/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"os"

"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
)

// Quit closes tibivi if schedule wasn't changed
Expand Down
6 changes: 3 additions & 3 deletions pkg/bar/bar.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/actions"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/actions"
"github.com/strang1ato/tibivi/pkg/common"
)

// SetBar setups "bar" and ":" views
Expand Down
6 changes: 3 additions & 3 deletions pkg/bar/keybindings.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package bar

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/keybindings/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/keybindings/utils"
)

// Keybindings sets keybindings for bar
Expand Down
8 changes: 4 additions & 4 deletions pkg/block/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"errors"
"strings"

"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/datatypes"
"github.com/oltarzewskik/tibivi/pkg/schedule"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/datatypes"
"github.com/strang1ato/tibivi/pkg/schedule"
)

var addingBlock bool
Expand Down
10 changes: 5 additions & 5 deletions pkg/block/form.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package block
import (
"fmt"

"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/keybindings/utils"
"github.com/oltarzewskik/tibivi/pkg/layout/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/keybindings/utils"
"github.com/strang1ato/tibivi/pkg/layout/utils"
)

var (
Expand Down Expand Up @@ -109,7 +109,7 @@ func formInsertMode(g *gocui.Gui, v *gocui.View) error {
common.G.Cursor = true
for _, name := range formFields {
block := common.Views.Block[name]
bufferLen := len(block.Buffer())-1
bufferLen := len(block.Buffer()) - 1
block.Editable = true
block.SetCursor(0, 0)
if name == "formDescription" {
Expand Down
6 changes: 3 additions & 3 deletions pkg/block/keybindings.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package block

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/keybindings/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/keybindings/utils"
)

// Keybindings sets keybindings for add/modify/remove block
Expand Down
8 changes: 4 additions & 4 deletions pkg/block/modify.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package block
import (
"fmt"

"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/layout/utils"
"github.com/oltarzewskik/tibivi/pkg/schedule"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/layout/utils"
"github.com/strang1ato/tibivi/pkg/schedule"
)

// SelectBlockForMod selects block for modification
Expand Down
6 changes: 3 additions & 3 deletions pkg/block/remove.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package block

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/layout/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/layout/utils"
)

// SelectBlockForRemove selects block for remove
Expand Down
6 changes: 3 additions & 3 deletions pkg/block/selection.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package block

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/layout/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/layout/utils"
)

// selectNextBlock selects next block
Expand Down
8 changes: 4 additions & 4 deletions pkg/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package common
import (
"os"

"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/commands"
"github.com/oltarzewskik/tibivi/pkg/datatypes"
"github.com/oltarzewskik/tibivi/pkg/views"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/commands"
"github.com/strang1ato/tibivi/pkg/datatypes"
"github.com/strang1ato/tibivi/pkg/views"
)

// Declare variables used by multiple packages
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package config
import (
"os"

"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/common"
)

// CreateDotTibivi creates tibivi's dotfolder with its files if they don't exist
Expand Down
8 changes: 4 additions & 4 deletions pkg/days/days.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package days

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/days/utils"
"github.com/oltarzewskik/tibivi/pkg/layout/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/days/utils"
"github.com/strang1ato/tibivi/pkg/layout/utils"
)

// SetDayView setups day of the week view
Expand Down
6 changes: 3 additions & 3 deletions pkg/days/keybindings.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package days

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/keybindings/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/keybindings/utils"
)

// Keybindings sets keybindings for menu
Expand Down
4 changes: 2 additions & 2 deletions pkg/days/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"unicode/utf8"

"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/datatypes"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/datatypes"
)

// SetDayViewContent sets content of day view
Expand Down
14 changes: 7 additions & 7 deletions pkg/keybindings/keybindings.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package keybindings

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/actions"
"github.com/oltarzewskik/tibivi/pkg/bar"
"github.com/oltarzewskik/tibivi/pkg/block"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/days"
"github.com/oltarzewskik/tibivi/pkg/menu"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/actions"
"github.com/strang1ato/tibivi/pkg/bar"
"github.com/strang1ato/tibivi/pkg/block"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/days"
"github.com/strang1ato/tibivi/pkg/menu"
)

// Keybindings create keyboard keybindings
Expand Down
4 changes: 2 additions & 2 deletions pkg/keybindings/utils/utils.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package keybindings_utils

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
)

// SetViewsKeybinding sets keybinding to set of views
Expand Down
10 changes: 5 additions & 5 deletions pkg/layout/layout.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package layout

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/bar"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/days"
"github.com/oltarzewskik/tibivi/pkg/days/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/bar"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/days"
"github.com/strang1ato/tibivi/pkg/days/utils"
)

// Layout setups CUI layout
Expand Down
8 changes: 4 additions & 4 deletions pkg/layout/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"sync"
"time"

"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/commands"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/days/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/commands"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/days/utils"
)

// UpdateLayout updates layout
Expand Down
6 changes: 3 additions & 3 deletions pkg/menu/keybindings.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package menu

import (
"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/keybindings/utils"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/keybindings/utils"
)

// Keybindings sets keybindings for menu
Expand Down
6 changes: 3 additions & 3 deletions pkg/menu/menu.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package menu
import (
"fmt"

"github.com/oltarzewskik/tibivi-gocui"
"github.com/oltarzewskik/tibivi/pkg/block"
"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/strang1ato/tibivi-gocui"
"github.com/strang1ato/tibivi/pkg/block"
"github.com/strang1ato/tibivi/pkg/common"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions pkg/schedule/schedule.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strconv"
"strings"

"github.com/oltarzewskik/tibivi/pkg/common"
"github.com/oltarzewskik/tibivi/pkg/datatypes"
"github.com/strang1ato/tibivi/pkg/common"
"github.com/strang1ato/tibivi/pkg/datatypes"
)

// SetSchedule supplies `Schedule` with data from datafiles
Expand Down

0 comments on commit 6e29ae1

Please sign in to comment.