Skip to content

Commit 4f2d3dc

Browse files
Update README + Add VIM temporary files to .gitignore (#87)
* Update README * Add VIM tmp/backup files to gitignore * Fix code samples * Rm steps for running build.sh and added step for updating submodules if viewing changes locally
1 parent 8506ffc commit 4f2d3dc

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@ static/
77

88
# Asciidoctor
99
.asciidoctor/
10+
11+
# VIM
12+
*.swp
13+
*.swo
14+
*~
15+

README.adoc

+24-27
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,51 @@ endif::[]
1111
https://learnteachcode.org/code-coffee-compendium/home/
1212

1313
== Introduction
14-
Welcome to the LearnTeachCode Code & Coffee Compendium Github Repository! Maintained by the Baldwin Park & El Sereno/Alhambra study group, this repository hosts the source code for https://learnteachcode.org/code-coffee-compendium/[code-coffee-compendium] resource site.
14+
Welcome to the LearnTeachCode Code & Coffee Compendium Github Repository! Maintained by the Code & Coffee Office Hours study group, this repository hosts the source code for https://learnteachcode.org/code-coffee-compendium/[code-coffee-compendium] resource site.
1515

1616
This site was generated using https://asciidoctor.org/[Asciidoctor] - a static-site generator for the https://asciidoctor.org/docs/asciidoc-syntax-quick-reference[AsciiDoc] markup language.
1717

1818
Want extra coding help? Join our https://learnteachcode.org/slack[Slack group].
1919

2020
== Contributing
21-
Contributors are welcome to fork this repository and make changes. Please submit a Pull Request with your changes to be reviewed by a repository owner.
21+
Contributors are welcome to fork this repository and make changes. Please submit a Pull Request (PR) with your changes to be reviewed by a repository owner.
2222

2323
_Not sure where to start?_ There are a number of issues that you can work on. https://github.com/LearnTeachCode/code-coffee-compendium/issues/[Find them here.]
2424

2525

2626
== Dependencies
2727
This project has a number of dependencies that must be met before running on your machine.
2828

29-
1. _Download https://www.ruby-lang.org/en/[Ruby 2.4+]_
30-
2. _Clone or download this repository to your machine._
31-
3. _Open a terminal window. Change your current directory to the cloned project directory._
32-
4. _Install the package bundle by running the following command in the terminal window:_
29+
1. Docker
30+
2. Git (for contributors, quicker access to the repository source code)
31+
3. A Bash terminal (standard terminal environment for *nix and macOS).
3332

34-
----
35-
gem install bundler:2.1.4
36-
bundle install
37-
----
33+
NOTE: To Windows users: Windows Command Prompt will not satisfy this dependency. Instead, you can use PowerShell or another Bash terminal (like Git Bash for example).
3834

39-
This project also uses PlantUML to generate diagrams. https://plantuml.com/download[Download PlantUML here.]
35+
== Viewing the site through a local web server
36+
CAUTION: Please make sure you have all required dependencies before continuing.
4037

41-
NOTE: In addition to PlantUML, you will need GraphViz to display the sitemap diagram. https://www.graphviz.org/download/[Download GraphViz here.]
38+
There may be situations where you want to view the site locally through a local web server. In this case, you should run `serve.sh`. For example, type the following command in the project directory:
4239

43-
== Viewing the Site Locally
44-
CAUTION: Please make sure you have all required dependencies before continuing.
40+
. _Clone or download this repository to your machine._
41+
. _Open a terminal window. Change your current directory to the cloned project directory._
42+
. _Using a Bash terminal, type the following command to update all dependent submodules:_
4543

46-
1. _Clone or download this repository to your machine._
47-
2. _Open a terminal window. Change your current directory to the cloned project directory._
48-
3. _Inside of your terminal, type the following command:_
44+
[source]
45+
git submodule update --init --recursive
4946

50-
----
51-
ruby convert.rb
52-
----
47+
[start=4]
48+
. _Next, type the following command:_
49+
50+
[source]
51+
sh serve.sh
5352

54-
NOTE: The convert.rb script will convert the .adoc files inside of the project directory into .html files that can be viewed in a web brower. You may see a few warnings appear in the terminal window after running this script. In most cases, it's fine to ignore them. If you have a concern, https://github.com/LearnTeachCode/code-coffee-compendium/issues/new?assignees=&labels=&template=feature_request.md&title=[please submit an issue.]
53+
NOTE: If you receive a permissions error on *nix or macOS, prepend _sudo_ to the command. For example, type the following command:
5554

56-
Double-click on the index.html file that was generated in the project directory to view the site in a web browser.
55+
[source]
56+
sudo sh serve.sh
5757

58-
== Previewing Changes
59-
If you are a contributor, you can view any changes you have made to the site on your machine by running the following command inside of a terminal window:
58+
After running the `serve.sh` script, you can access the site through your web browser through this URL: http://localhost:1313/code-coffee-compendium/home
6059

61-
----
62-
ruby convert.rb
63-
----
60+
You can stop the local web server by pressing CTRL + C in the Bash terminal where you ran the `serve.sh` script.
6461

0 commit comments

Comments
 (0)