forked from nbsp/welcome
copyedits
This commit is contained in:
vilmibm
parent
6ed2f36928
commit
d9fcdc63ba
@ -21,11 +21,11 @@ func (view *Editor) Draw(state *ui.State) (row int) {
|
||||
_, row = win.Wrap(
|
||||
vaxis.Segment{Text: `──── editing your homepage ────
|
||||
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `nice work! you'll get used to the shell in no time. one of the main things you're going to do in town is editing text files. the program we use to do this is aptly called an `},
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `yeah buddy! Welcome to shell. One of the main things you're going to do in town is editing text files. The program we use to do this is aptly called an `},
|
||||
vaxis.Segment{Text: "editor", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: `.
|
||||
|
||||
take your homepage, for example:
|
||||
Take your homepage, for example:
|
||||
`},
|
||||
vaxis.Segment{Text: fmt.Sprintf("https://tilde.town/~%s", user.Username),
|
||||
Style: vaxis.Style{
|
||||
@ -34,19 +34,19 @@ take your homepage, for example:
|
||||
},
|
||||
},
|
||||
vaxis.Segment{Text: `
|
||||
looks pretty barren, doesn't it? let's edit it to add some more words.
|
||||
looks barren, doesn't it? Let's edit it to add some more words.
|
||||
|
||||
type `},
|
||||
Type `},
|
||||
vaxis.Segment{Text: "micro public_html/index.html", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: ` to open micro, our text editor of choice. in it, make some changes, and press `},
|
||||
vaxis.Segment{Text: ` and hit Enter to open micro, our text editor of choice. In it, make some changes, and press `},
|
||||
vaxis.Segment{Text: "Ctrl+S", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: ` to save and look at the changes in your browser. press `},
|
||||
vaxis.Segment{Text: ` to save. Refresh your homepage in your browser to see your changes. Press `},
|
||||
vaxis.Segment{Text: "Ctrl+Q", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: ` to save and exit micro.
|
||||
|
||||
like before, when you're done, type `},
|
||||
Like before, when you're done, type `},
|
||||
vaxis.Segment{Text: "exit", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: ` in your shell to continue.`},
|
||||
vaxis.Segment{Text: ` in your shell and hit Enter to continue.`},
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
@ -19,9 +19,9 @@ func (view *Help) Event(state *ui.State, event vaxis.Event) (processed bool) {
|
||||
win.Wrap(
|
||||
vaxis.Segment{Text: `──── links, help, & goodbye ────
|
||||
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `good job on getting all the way through this tutorial! while there's a lot of things you can do in town, the tools you just received should help you traverse the land and get further help if you need it.
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `You've completed the tutorial~ While there's a lot of things you can do in town, the tools you just received should help you traverse the land and get further help if you need it.
|
||||
|
||||
• to join our chatroom and ask for help or just say hi, run `},
|
||||
• to join our chat room and ask for help or just say hi, run `},
|
||||
vaxis.Segment{Text: "town chat", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: `
|
||||
• run `},
|
||||
|
||||
@ -20,12 +20,12 @@ func (view *Introduction) Event(state *ui.State, event vaxis.Event) (processed b
|
||||
win := state.Window().New(0, 0, 80, state.Window().Height)
|
||||
win.Wrap(vaxis.Segment{Text: `──── welcome to tilde town ────
|
||||
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `welcome to tilde town! we're glad you're here.
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `Welcome to tilde town! we're glad you're here.
|
||||
|
||||
this short tutorial will help you get accustomed to the terminal — the text-based user interface that you will do most of your interacting with town on. if you're here, this means you've successfully connected to town over ssh — good job! you can handle the rest. i believe in you <3
|
||||
This short tutorial will help you get accustomed to the TERMINAL: the text-based user interface that you need for interacting with tilde.town. If you're here, this means you've successfully connected to town over ssh. Excellent work <3
|
||||
|
||||
please make sure your terminal window is decently tall, otherwise some stuff may get cut off.
|
||||
Please make sure your terminal window is decently tall, otherwise some stuff may get cut off.
|
||||
|
||||
press Enter to continue to the next page. if you know what you're doing, you can press Ctrl+C or Ctrl+D at any point to exit to a shell.`})
|
||||
Press Enter to continue to the next page. If you want to skip this tutorial you can press Ctrl+C or Ctrl+D at any point to exit to a shell.`})
|
||||
return
|
||||
}
|
||||
|
||||
@ -81,25 +81,25 @@ func (view *Settings) Event(state *ui.State, event vaxis.Event) (processed bool)
|
||||
win := state.Window().New(0, 0, 80, state.Window().Height)
|
||||
_, q1 := win.Wrap(vaxis.Segment{Text: `──── initial settings ────
|
||||
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `let's get you set up with some useful settings. you can press ↑ or ↓ to move between the inputs. feel free to leave any of them empty! you can always set them later, or leave them unset.
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `On this screen we can configure some useful settings. You can press ↑ or ↓ to move between the inputs. Feel free to leave any of them empty. You can always set them later, or leave them unset. It won't break anything.
|
||||
|
||||
1. `}, vaxis.Segment{Text: "what are your pronouns?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` this is useful information for folks to be able to refer to you in the third person. common pronoun sets are he/him, she/her, and they/them.
|
||||
1. `}, vaxis.Segment{Text: "What are your pronouns?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` This helps others refer to you in the third person. Common pronoun sets are he/him, she/her, and they/them.
|
||||
|
||||
>`})
|
||||
_, q2 := win.New(0, q1, 80, state.Window().Height).Wrap(vaxis.Segment{Text: `
|
||||
|
||||
2. `}, vaxis.Segment{Text: "when's your birthday?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` this will show up in certain places, so people can wish you a happy birthday :) format is MM/DD.
|
||||
2. `}, vaxis.Segment{Text: "When's your birthday?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` This will show up around the server so people can wish you a happy birthday :) Format is MM/DD.
|
||||
|
||||
>`})
|
||||
|
||||
_, q3 := win.New(0, q1+q2, 80, state.Window().Height).Wrap(vaxis.Segment{Text: `
|
||||
|
||||
3. `}, vaxis.Segment{Text: "what's your timezone?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` this will change all times you view in town to your local timezone, so you don't have to convert from utc in your head. just start typing your continent and a big city in your area.
|
||||
3. `}, vaxis.Segment{Text: "What's your timezone?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` This will change all times you view in town to your local timezone, so you don't have to convert from UTC in your head (if you don't want to). Just start typing your continent and a big city in your area.
|
||||
|
||||
>
|
||||
|
||||
`},
|
||||
vaxis.Segment{Text: " press Enter to continue ", Style: vaxis.Style{Attribute: enterStyle}},
|
||||
vaxis.Segment{Text: " Press Enter to continue ", Style: vaxis.Style{Attribute: enterStyle}},
|
||||
)
|
||||
|
||||
if q1+q2+q3 < win.Height {
|
||||
@ -119,21 +119,21 @@ func (view *Settings) Event(state *ui.State, event vaxis.Event) (processed bool)
|
||||
case 0:
|
||||
win.Wrap(vaxis.Segment{Text: `──── initial settings ────
|
||||
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `let's get you set up with some useful settings. you can press ↑ or ↓ to move between the inputs. feel free to leave any of them empty! you can always set them later, or leave them unset.`})
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `On this screen we can configure some useful settings. You can press ↑ or ↓ to move between the inputs. Feel free to leave any of them empty. You can always set them later, or leave them unset. It won't break anything.`})
|
||||
case 1:
|
||||
_, h := win.Wrap(vaxis.Segment{Text: `1. `}, vaxis.Segment{Text: "what are your pronouns?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` this is useful information for folks to be able to refer to you in the third person. common pronoun sets are he/him, she/her, and they/them.
|
||||
_, h := win.Wrap(vaxis.Segment{Text: `1. `}, vaxis.Segment{Text: "What are your pronouns?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` This helps others refer to you in the third person. Common pronoun sets are he/him, she/her, and they/them.
|
||||
|
||||
>`})
|
||||
view.inputs[0].Draw(vaxis.Window{win.Vx, &win, 5, h, int(math.Min(73.0, float64(win.Width)-7)), 1})
|
||||
win.SetStyle(3, h, vaxis.Style{Attribute: vaxis.AttrReverse})
|
||||
case 2:
|
||||
_, h := win.Wrap(vaxis.Segment{Text: `2. `}, vaxis.Segment{Text: "when's your birthday?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` this will show up in certain places, so people can wish you a happy birthday :) format is MM/DD.
|
||||
_, h := win.Wrap(vaxis.Segment{Text: `2. `}, vaxis.Segment{Text: "When's your birthday?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` This will show up around the server so people can wish you a happy birthday :) Format is MM/DD.
|
||||
|
||||
>`})
|
||||
view.inputs[1].Draw(vaxis.Window{win.Vx, &win, 5, h, int(math.Min(73.0, float64(win.Width)-7)), 1})
|
||||
win.SetStyle(3, h, vaxis.Style{Attribute: vaxis.AttrReverse})
|
||||
case 3:
|
||||
_, h := win.Wrap(vaxis.Segment{Text: `3. `}, vaxis.Segment{Text: "what's your timezone?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` this will change all times you view in town to your local timezone, so you don't have to convert from utc in your head. just start typing your continent and a big city in your area.
|
||||
_, h := win.Wrap(vaxis.Segment{Text: `3. `}, vaxis.Segment{Text: "What's your timezone?", Style: vaxis.Style{Foreground: vaxis.IndexColor(1)}}, vaxis.Segment{Text: ` This will change all times you view in town to your local timezone, so you don't have to convert from UTC in your head (if you don't want to). Just start typing your continent and a big city in your area.
|
||||
|
||||
>`})
|
||||
view.inputs[2].Draw(vaxis.Window{win.Vx, &win, 5, h, int(math.Min(73.0, float64(win.Width)-7)), 1})
|
||||
|
||||
26
app/shell.go
26
app/shell.go
@ -20,32 +20,32 @@ func (view *Shell) Draw(state *ui.State) (row int) {
|
||||
|
||||
_, row = win.Wrap(vaxis.Segment{Text: `──── using the shell ────
|
||||
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `as mentioned before, interaction with stuff on tilde town is done primarily via the `},
|
||||
vaxis.Segment{Text: "terminal", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: `. good news, you've been using the terminal this whole time! it's the text application with which you've been talking to the server so far.
|
||||
`, Style: vaxis.Style{Foreground: vaxis.IndexColor(5)}}, vaxis.Segment{Text: `Interaction with tilde town is done primarily via the `},
|
||||
vaxis.Segment{Text: "TERMINAL", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: `. Good news...you've been using the TERMINAL this whole time!
|
||||
|
||||
the method of navigation between programs inside our shared computer, however, is called a `},
|
||||
The tool we use to navigate between programs *within* the terminal, however, is called a `},
|
||||
vaxis.Segment{Text: "shell", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: `. it's an interface that takes in commands, like "open a text editor" or "show me my flower", in a language that doesn't take too long to get used to. the most popular shell is called `},
|
||||
vaxis.Segment{Text: `. It's an interface that accepts commands, like "open a text editor" or "show me my flower", in a special language. the most popular shell is called `},
|
||||
vaxis.Segment{Text: "bash", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: `, and while there are more, there's no reason to switch unless you're looking for something different.
|
||||
vaxis.Segment{Text: `, and while there are more, there's no reason to switch unless you're looking for adventure.
|
||||
|
||||
below is a terminal session. here are some commands for you to try out:
|
||||
below is a shell prompt. Here are some shell commands for you to try out; type them and hit Enter to run them:
|
||||
• `},
|
||||
vaxis.Segment{Text: "ls", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: " lists the contents of a folder\n• "},
|
||||
vaxis.Segment{Text: " list the contents of a folder\n• "},
|
||||
vaxis.Segment{Text: "cd", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: " goes into a folder\n• "},
|
||||
vaxis.Segment{Text: " change (move) into a directory (folder)\n• "},
|
||||
vaxis.Segment{Text: "mkdir", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: " makes a new folder with a given name\n• "},
|
||||
vaxis.Segment{Text: " make a new directory (folder) with a given name\n• "},
|
||||
vaxis.Segment{Text: "cat", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: " outputs the contents of a file (try running "},
|
||||
vaxis.Segment{Text: " output the contents of a file (try running "},
|
||||
vaxis.Segment{Text: "cat welcome_" + user.Username + ".txt", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: "!)\n• "},
|
||||
vaxis.Segment{Text: "echo", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: " makes the shell repeat what you say to it\ntype "},
|
||||
vaxis.Segment{Text: " make the shell repeat what you say to it\ntype "},
|
||||
vaxis.Segment{Text: "exit", Style: vaxis.Style{Foreground: vaxis.IndexColor(3)}},
|
||||
vaxis.Segment{Text: ` to continue the tutorial, whenever you're ready.`},
|
||||
vaxis.Segment{Text: ` and hit Enter to continue the tutorial, whenever you're ready.`},
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user