Skip to content

Commit d2654f7

Browse files
committed
updating readme, in progress
1 parent 091a135 commit d2654f7

File tree

11 files changed

+87
-200
lines changed

11 files changed

+87
-200
lines changed

.all-contributorsrc

Lines changed: 0 additions & 44 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

FAQ.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
# Frequently Asked Questions
22

3-
#### Visualize website locally without rebuilding from scratch every time
4-
todo: more explanation
5-
```
6-
sudo apt update
7-
sudo apt install bundler
8-
sudo apt-get install ruby-full
9-
sudo apt-get install imagemagick libmagickcore-dev libmagickwand-dev
10-
bundle install
11-
bundle exec jekyll serve
12-
```
13-
143
#### After I create a new repository from this template and setup the repo, I get a deployment error. Isn't the website supposed to correctly deploy automatically?
154

165
Yes, if you are using release `v0.3.5` or later, the website will automatically and correctly re-deploy right after your first commit. Please make some changes (e.g., change your website info in `_config.yml`), commit, and push. Make sure to follow [deployment instructions](https://github.com/alshedivat/al-folio#deployment). (Relevant issue: [209](https://github.com/alshedivat/al-folio/issues/209#issuecomment-798849211).)

README.md

Lines changed: 77 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,71 @@
1717

1818
## Making simple edits
1919

20-
If you are making simple edits and do not need to visualize the changes (locally on your own machine) before making the changes public, go ahead and directly edit the relevant files either directly in [https://github.com/caltech-netlab] or in your local repository and push the changes to github.
20+
If you are making simple edits and do not need to visualize the changes (locally on your own machine) before making the changes public, you may directly edit the relevant files either directly in [https://github.com/caltech-netlab] or in your local cloned repository and then push the changes to github.
2121

22-
## Some references
22+
If you would like to visualize the changes locally, see [Installing](#installing).
2323

24-
Check out [this tutorial](https://www.taniarascia.com/make-a-static-website-with-jekyll/) to learn more about Jekyll. Why Jekyll? Read [Andrej Karpathy's blog post](https://karpathy.github.io/2014/07/01/switching-to-jekyll/). Some other original references: [INSTALL.md](INSTALL.md), [CUSTOMIZE.md](CUSTOMIZE.md).
24+
## Modifying site content
2525

26-
## Installing
26+
### Research
2727

28-
### Local setup on Windows 10/11
28+
This Jekyll theme implements `collections` to let you break up your work into categories. The theme comes with two default collections, `news` and `projects`. We only use the `projects` collection to create our research page. The overview of research is edited in the [\_pages/projects.md](_pages/projects.md), and the other four subsections are located in the [\_projects](_projects) folder. The contents of research are written using only HTML.
2929

30-
First, install [Git](https://git-scm.com/), [Visual Studio Code](https://code.visualstudio.com/download), and [Windows Subsystem for Linux (WSL)](https://learn.microsoft.com/en-us/windows/wsl/install). For WSL, choosing the distribution of Ubuntu is fine. You can use any terminal and run the following command:
30+
Additionally, if you want to create new collections, edit the collections in the [\_config.yml](_config.yml) and create a corresponding folder and a landing page in the [\_pages](_pages) folder.
3131

32-
```shell
33-
bash
32+
```bash
33+
$ #adding Links:
34+
<a href='Link Goes Here'><b>Optimal placement of energy storage in distribution networks</b></a>
35+
$ #adding Titles:
36+
<div style="margin-bottom: 12px;"><font size='5.5' id = "applications">Applications</font></div>
37+
$ #adding Figure:
38+
<div style="text-align:center;">
39+
<figure>
40+
<img src="..\..\assets\img\research\power-systems-steady-state\injection_charging.png" style="width: 60%; height: auto;">
41+
<figcaption>Figure 3: An example of a typical charging and discharging curve</figcaption>
42+
</figure>
43+
</div>
44+
$ #adding Bullet Points:
45+
- content
46+
```
47+
---
48+
49+
### People
50+
51+
You can show each member's short bio and profile picture on the people page. There are three steps. First, add the profile picture in the [assets/img/people/](assets/img/people/) directory. Then, store the short bio in a `.md` file in the [\_pages/descriptions/](_pages/descriptions/) directory. Finally, you can add the member information under the appropriate category in the [\_pages/profiles.md](_pages/profiles.md).
52+
```bash
53+
- align: left
54+
image: faculty/steven-low-canonical.jpg
55+
content: descriptions/about_steven-low.md (add to descriptions file an md file and route it)
56+
role: CurrentGradStudent/Faculty/CurrentVisitingStudent/CaltechFacultyCollaborator/Admin/PreviousPostdoc/PreviousGrad/PreviousVisitingFaculty/PreviousVisitingStudent
57+
image_circular: false # crops the image to make it circular
58+
more_info: >
59+
<p>Steven H. Low</p>
60+
<a href = "http://netlab.caltech.edu/assets/documents/LowCV.pdf"><b>CV</font></b></a>
61+
lineBreak: (This is optional and used for styling to make sure everything is aligned) add '<br>' to add one line vertically
3462
```
63+
---
64+
65+
### Publications
3566

36-
to start WSL. Then, install [Node.js](https://learn.microsoft.com/en-us/windows/dev-environment/javascript/nodejs-on-wsl), [ImageMagick](https://learnubuntu.com/install-imagemagick/) and [Ruby & Jekyll](https://jekyllrb.com/docs/installation/windows/). After finishing the above installations, you can create a new Jekyll site and make it available on a local server, to determine if it works. Some commands you need can be seen [here](https://jekyllrb.com/docs/). Note that if you encounter any errors during the process, you can find some solutions on Google.
67+
The publications page is generated automatically from your BibTex bibliography. Simply edit the [\_bibliography/papers.bib](_bibliography/papers.bib). By default, the publications will be sorted by year, with the most recent displayed first. You can change this behavior and more in the `Jekyll Scholar` section in the [\_config.yml](_config.yml). Additionally, if you want to customize the look of the publications page, you can edit the [\_pages/publications.md](_pages/publications.md).
68+
69+
You just need to add some specific fields, as shown in the [\_bibliography/papers.bib](_bibliography/papers.bib). More supported fields can be found [here](https://github.com/alshedivat/al-folio).
3770

3871
---
3972

40-
### Local setup on Mac
73+
### Presentations
74+
75+
The presentations page includes two parts, talks and misc writings, written using only HTML. If you have a new item to add, copy any existing item in [\_pages/presentations.md](_pages/presentations.md) and replace the key information in it.
76+
77+
---
78+
79+
### Theming
80+
81+
A variety of beautiful theme colors have been selected for you to choose from. The default is purple, but you can quickly change it by editing the `--global-theme-color` variable in the `_sass/_themes.scss` file. Other color variables are listed there as well. The stock theme color options available can be found at [\_sass/\_variables.scss](_sass/_variables.scss). You can also add your own colors to this file assigning each a name for ease of use across the template.
82+
83+
## Installing
84+
4185
#### Local setup using Docker (Recommended)
4286

4387
Using Docker to install Jekyll and Ruby dependencies is the easiest way.
@@ -58,65 +102,50 @@ Now, feel free to customize the theme however you like (don't forget to change t
58102

59103
> Beta: You can also use the slimmed docker image with a size below 100MBs and exact same functionality. Just use `docker compose up -f docker-compose-slim.yml`
60104
61-
#### Build your own docker image
105+
## Local Setup (Legacy, linux)
62106

63-
> Note: this approach is only necessary if you would like to build an older or very custom version of al-folio.
107+
For Windows, first install [Windows Subsystem for Linux (WSL)](https://learn.microsoft.com/en-us/windows/wsl/install). For WSL, choosing the distribution of Ubuntu is fine.
64108

65-
Build and run a new docker image using:
66109

67-
```bash
68-
$ docker compose up --build
69-
```
70-
71-
> If you want to update jekyll, install new ruby packages, etc., all you have to do is build the image again using `--force-recreate` argument at the end of the previous command! It will download Ruby and Jekyll and install all Ruby packages again from scratch.
72-
73-
If you want to use a specific docker version, you can do so by changing `latest` tag to `your_version` in `docker-compose.yaml`. For example, you might have created your website on `v0.10.0` and you want to stick with that.
74-
75-
#### Local Setup (Legacy)
110+
[This blog post](https://george-gca.github.io/blog/2022/running-local-al-folio/) by one of the community members is a helpful guide.
76111

77-
For a hands-on walkthrough of running al-folio locally without using Docker, check out [this cool blog post](https://george-gca.github.io/blog/2022/running-local-al-folio/) by one of the community members!
112+
Install [Ruby](https://www.ruby-lang.org/en/downloads/) and [Bundler](https://bundler.io/) (_hint: for ease of managing ruby gems, consider using [rbenv](https://github.com/rbenv/rbenv)_). Install [Python](https://www.python.org/) and [pip](https://pypi.org/project/pip/) (_hint: for ease of managing python packages, consider using a virtual environment, like [venv](https://docs.python.org/pt-br/3/library/venv.html) or [conda](https://docs.conda.io/en/latest/)_).
78113

79-
Assuming you have [Ruby](https://www.ruby-lang.org/en/downloads/) and [Bundler](https://bundler.io/) installed on your system (_hint: for ease of managing ruby gems, consider using [rbenv](https://github.com/rbenv/rbenv)_), and also [Python](https://www.python.org/) and [pip](https://pypi.org/project/pip/) (_hint: for ease of managing python packages, consider using a virtual environment, like [venv](https://docs.python.org/pt-br/3/library/venv.html) or [conda](https://docs.conda.io/en/latest/)_).
80-
81-
```bash
82-
$ bundle install
83-
# assuming pip is your Python package manager
84-
$ pip install jupyter
85-
$ bundle exec jekyll serve --lsi
114+
Then run
115+
```
116+
sudo apt update
117+
sudo apt install bundler
118+
sudo apt-get install ruby-full
119+
sudo apt-get install imagemagick libmagickcore-dev libmagickwand-dev
120+
bundle install
121+
bundle exec jekyll serve --lsi
86122
```
87123

88124
To see the template running, open your browser and go to `http://localhost:4000`. You should see a copy of the theme's [demo website](https://alshedivat.github.io/al-folio/). Now, feel free to customize the theme however you like. After you are done, remember to **commit** your final changes.
89125

90-
---
91-
92-
### Git commands
93126

94-
When you make some major changes to the website, you can follow these steps:
95-
96-
1. Clone the repository to local.
97-
```
98-
git clone [url]
99-
```
100-
![URL](readme_preview/URL.png)
127+
### Basic Git usage
101128

102-
2. Check whether the local repository is up to date before each change.
129+
#### First-time setup
130+
Clone the repository to local.
103131
```
104-
git remote show origin
132+
git clone https://github.com/caltech-netlab/netlab-website
105133
```
106134

107-
3. If not, fetch and merge changes to your local directory.
135+
Before beginning your modification or update, run
108136
```
109137
git pull
110138
```
139+
which pulls any updates from the remote to your local machine.
111140

112-
4. After making changes, push them to the remote repository.
141+
When you are done making major changes to the website, you can follow these steps:
113142
```
114-
git add .
143+
git add -A
115144
git commit -m "[Descriptions of your changes]"
116145
git push -u origin master
117146
```
118147

119-
#### Deployment
148+
## Deployment (Netlify)
120149
1. Run this once it is working locally the way you would like
121150
```bash
122151
$ bundle exec jekyll build --lsi
@@ -144,64 +173,10 @@ $ git push -u origin main
144173

145174
7. Push github repo to Netlify following instructions on page
146175

147-
## Instructions
148-
149-
### Research
150-
151-
This Jekyll theme implements `collections` to let you break up your work into categories. The theme comes with two default collections, `news` and `projects`. We only use the `projects` collection to create our research page. The overview of research is edited in the [\_pages/projects.md](_pages/projects.md), and the other four subsections are located in the [\_projects](_projects) folder. The contents of research are written using only HTML.
152-
153-
Additionally, if you want to create new collections, edit the collections in the [\_config.yml](_config.yml) and create a corresponding folder and a landing page in the [\_pages](_pages) folder.
154-
155-
```bash
156-
$ #adding Links:
157-
<a href='Link Goes Here'><b>Optimal placement of energy storage in distribution networks</b></a>
158-
$ #adding Titles:
159-
<div style="margin-bottom: 12px;"><font size='5.5' id = "applications">Applications</font></div>
160-
$ #adding Figure:
161-
<div style="text-align:center;">
162-
<figure>
163-
<img src="..\..\assets\img\research\power-systems-steady-state\injection_charging.png" style="width: 60%; height: auto;">
164-
<figcaption>Figure 3: An example of a typical charging and discharging curve</figcaption>
165-
</figure>
166-
</div>
167-
$ #adding Bullet Points:
168-
- content
169-
```
170-
---
171-
172-
### People
173-
174-
You can show each member's short bio and profile picture on the people page. There are three steps. First, add the profile picture in the [assets/img/people/](assets/img/people/) directory. Then, store the short bio in a `.md` file in the [\_pages/descriptions/](_pages/descriptions/) directory. Finally, you can add the member information under the appropriate category in the [\_pages/profiles.md](_pages/profiles.md).
175-
```bash
176-
- align: left
177-
image: faculty/steven-low-canonical.jpg
178-
content: descriptions/about_steven-low.md (add to descriptions file an md file and route it)
179-
role: CurrentGradStudent/Faculty/CurrentVisitingStudent/CaltechFacultyCollaborator/Admin/PreviousPostdoc/PreviousGrad/PreviousVisitingFaculty/PreviousVisitingStudent
180-
image_circular: false # crops the image to make it circular
181-
more_info: >
182-
<p>Steven H. Low</p>
183-
<a href = "http://netlab.caltech.edu/assets/documents/LowCV.pdf"><b>CV</font></b></a>
184-
lineBreak: (This is optional and used for styling to make sure everything is aligned) add '<br>' to add one line vertically
185-
```
186-
---
187-
188-
### Publications
189176

190-
The publications page is generated automatically from your BibTex bibliography. Simply edit the [\_bibliography/papers.bib](_bibliography/papers.bib). By default, the publications will be sorted by year, with the most recent displayed first. You can change this behavior and more in the `Jekyll Scholar` section in the [\_config.yml](_config.yml). Additionally, if you want to customize the look of the publications page, you can edit the [\_pages/publications.md](_pages/publications.md).
191-
192-
You just need to add some specific fields, as shown in the [\_bibliography/papers.bib](_bibliography/papers.bib). More supported fields can be found [here](https://github.com/alshedivat/al-folio).
193-
194-
---
195-
196-
### Presentations
197-
198-
The presentations page includes two parts, talks and misc writings, written using only HTML. If you have a new item to add, copy any existing item in [\_pages/presentations.md](_pages/presentations.md) and replace the key information in it.
199-
200-
---
201-
202-
### Theming
177+
## Some references
203178

204-
A variety of beautiful theme colors have been selected for you to choose from. The default is purple, but you can quickly change it by editing the `--global-theme-color` variable in the `_sass/_themes.scss` file. Other color variables are listed there as well. The stock theme color options available can be found at [\_sass/\_variables.scss](_sass/_variables.scss). You can also add your own colors to this file assigning each a name for ease of use across the template.
179+
Check out [this tutorial](https://www.taniarascia.com/make-a-static-website-with-jekyll/) to learn more about Jekyll. Why Jekyll? Read [Andrej Karpathy's blog post](https://karpathy.github.io/2014/07/01/switching-to-jekyll/). Some other original references: [INSTALL.md](INSTALL.md), [CUSTOMIZE.md](CUSTOMIZE.md).
205180

206181
## FAQ
207182

_includes/projects.liquid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
%}
1313
{% endif %}
1414
<div class="card-body">
15-
<h2 class="card-title">{{ project.title }}</h2>
15+
<h5 class="card-title">{{ project.title }}</h5>
1616
<p class="card-text">{{ project.description }}</p>
1717
<div class="row ml-1 mr-1 p-0">
1818
{% if project.github %}

_includes/projects_horizontal.liquid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{% endif %}
1010
<div class="{% if project.img %}col-md-6{% else %}col-md-12{% endif %}">
1111
<div class="card-body">
12-
<h3 class="card-title text-lowercase">{{ project.title }}</h3>
12+
<h5 class="card-title text-lowercase">{{ project.title }}</h5>
1313
<p class="card-text">{{ project.description }}</p>
1414
<div class="row ml-1 mr-1 p-0">
1515
{% if project.github %}

_projects/part_1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: page
3-
title: RESEARCH
4-
description: Power Systems – Steady State
3+
title: Power Systems – Steady State
4+
description:
55
img: assets/img/research/part_1.png
66
importance: 1
77
category: work

_projects/part_2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: page
3-
title: RESEARCH
4-
description: Power Systems – Dynamics
3+
title: Power Systems – Dynamics
4+
description:
55
img: assets/img/research/part_2.png
66
importance: 2
77
category: work

_projects/part_3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: page
3-
title: RESEARCH
4-
description: Electric Vehicles
3+
title: Electric Vehicles
4+
description:
55
img: assets/img/research/part_3.png
66
importance: 3
77
category:

_projects/part_4.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: page
3-
title: RESEARCH
4-
description: Communication Networks
3+
title: Communication Networks
4+
description:
55
img: assets/img/research/part_4.png
66
importance: 4
77
category:

0 commit comments

Comments
 (0)