Skip to content

Commit b37ee11

Browse files
Merge branch 'LCNS-SJTU:master' into master
2 parents 55121a9 + 1c31dad commit b37ee11

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1132
-536
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Docker Image CI (Upload Tag)
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*'
7+
8+
jobs:
9+
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
- name: Buildx
18+
uses: docker/setup-buildx-action@v1
19+
20+
-
21+
name: Docker meta
22+
id: meta
23+
uses: docker/metadata-action@v4
24+
with:
25+
images: amirpourmand/al-folio
26+
27+
- name: Login
28+
uses: docker/login-action@v1
29+
with:
30+
username: ${{ secrets.DOCKER_USERNAME }}
31+
password: ${{ secrets.DOCKER_PASSWORD }}
32+
33+
- name: Build and push
34+
uses: docker/build-push-action@v3
35+
with:
36+
context: .
37+
push: ${{ github.event_name != 'pull_request' }}
38+
tags: ${{ steps.meta.outputs.tags }}
39+
labels: ${{ steps.meta.outputs.labels }}
40+

.github/workflows/deploy-image.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Docker Image CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
7+
jobs:
8+
9+
build:
10+
11+
runs-on: ubuntu-latest
12+
if: github.repository_owner == 'alshedivat'
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
- name: Buildx
18+
uses: docker/setup-buildx-action@v1
19+
20+
- name: Login
21+
uses: docker/login-action@v1
22+
with:
23+
username: ${{ secrets.DOCKER_USERNAME }}
24+
password: ${{ secrets.DOCKER_PASSWORD }}
25+
26+
- name: Build and push
27+
uses: docker/build-push-action@v2
28+
with:
29+
context: .
30+
push: true
31+
tags: amirpourmand/al-folio

.github/workflows/deploy.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy
1+
name: deploy
22

33
on:
44
push:
@@ -15,23 +15,14 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919
- name: Setup Ruby
2020
uses: ruby/setup-ruby@v1
2121
with:
2222
ruby-version: '3.0.2'
23-
- name: Enable bundler cache
24-
uses: actions/cache@v2
25-
with:
26-
path: vendor/bundle
27-
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
28-
restore-keys: |
29-
${{ runner.os }}-gems-
23+
bundler-cache: true
3024
- name: Install deps
3125
run: |
32-
gem install bundler
33-
bundle config path vendor/bundle
34-
bundle install --jobs 4 --retry 3
3526
npm install -g mermaid.cli
3627
- name: Setup deploy options
3728
id: setup

.travis.yml

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

Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM jekyll/jekyll
2+
Label MAINTAINER Amir Pourmand
3+
#install imagemagick tool for convert command
4+
RUN apk add --no-cache --virtual .build-deps \
5+
libxml2-dev \
6+
shadow \
7+
autoconf \
8+
g++ \
9+
make \
10+
&& apk add --no-cache imagemagick-dev imagemagick
11+
WORKDIR /srv/jekyll
12+
ADD Gemfile /srv/jekyll/
13+
RUN bundle install

Gemfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ group :jekyll_plugins do
55
gem 'jekyll-diagrams'
66
gem 'jekyll-email-protect'
77
gem 'jekyll-feed'
8-
gem 'jekyll-github-metadata'
98
gem 'jekyll-imagemagick'
9+
gem 'jekyll-minifier'
1010
gem 'jekyll-paginate-v2'
1111
gem 'jekyll-scholar'
1212
gem 'jekyll-sitemap'
1313
gem 'jekyll-target-blank'
1414
gem 'jekyll-twitter-plugin'
1515
gem 'jemoji'
16+
gem 'mini_racer'
1617
gem 'unicode_utils'
1718
gem 'webrick'
18-
gem 'htmlcompressor'
19-
gem 'htmlbeautifier'
19+
end
20+
group :other_plugins do
21+
gem 'httparty'
22+
gem 'feedjira'
2023
end

README.md

Lines changed: 59 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,65 @@ Website is powered by [Jekyll](https://jekyllrb.com/) with [al-folio](https://gi
99

1010
## Getting started
1111

12-
For more about how to use Jekyll, check out [this tutorial](https://www.taniarascia.com/make-a-static-website-with-jekyll/).
12+
### Local setup
13+
Want to learn more about Jekyll? Check out [this tutorial](https://www.taniarascia.com/make-a-static-website-with-jekyll/).
14+
Why Jekyll? Read [Andrej Karpathy's blog post](https://karpathy.github.io/2014/07/01/switching-to-jekyll/)!
15+
1316

1417
### Installation
1518

16-
Please install Ruby, Bundler and Jekyll with the help of [link](https://jekyllrb.com/docs/installation/) here on your system.
17-
### Local setup
19+
For a hands-on walkthrough of al-folio installation, check out [this cool video tutorial](https://www.youtube.com/watch?v=g6AJ9qPPoyc) by one of the community members! 🎬 🍿
20+
21+
---
22+
23+
#### Local setup using Docker (Recommended on Windows)
24+
25+
You need to take the following steps to get `al-folio` up and running in your local machine:
26+
27+
- First, [install docker](https://docs.docker.com/get-docker/)
28+
- Then, clone this repository to your machine:
29+
30+
```bash
31+
$ git clone git@github.com:<your-username>/<your-repo-name>.git
32+
$ cd <your-repo-name>
33+
```
34+
35+
Finally, run the following command that will pull a pre-built image from DockerHub and will run your website.
36+
37+
```bash
38+
$ ./bin/dockerhub_run.sh
39+
```
40+
41+
Note that when you run it for the first time, it will download a docker image of size 300MB or so.
42+
43+
Now, feel free to customize the theme however you like (don't forget to change the name!). After you are done, you can use the same command (`bin/dockerhub_run.sh`) to render the webpage with all you changes. Also, make sure to commit your final changes.
44+
45+
<details><summary>(click to expand) <strong>Build your own docker image (more advanced):</strong></summary>
46+
47+
> Note: this approach is only necessary if you would like to build an older or very custom version of al-folio.
48+
49+
First, download the necessary modules and install them into a docker image called `al-folio:Dockerfile` (this command will build an image which is used to run your website afterwards. Note that you only need to do this step once. After you have the image, you no longer need to do this anymore):
50+
51+
52+
```bash
53+
$ ./bin/docker_build_image.sh
54+
```
55+
56+
Run the website!
57+
58+
```bash
59+
$ ./bin/docker_run.sh
60+
```
61+
62+
> To change port number, you can edit `docker_run.sh` file.
63+
64+
> If you want to update jekyll, install new ruby packages, etc., all you have to do is build the image again using `docker_build_image.sh`! It will download ruby and jekyll and install all ruby packages again from scratch.
65+
66+
</details>
67+
68+
---
69+
70+
#### Local Setup (Standard)
1871

1972
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)*), first [fork](https://guides.github.com/activities/forking/) the repo from `github.com:LCNS-SJTU/lcns-sjtu.github.io` to `github.com:<your-username>/<your-repo-name>` and do the following:
2073

@@ -45,11 +98,11 @@ Check [here](docs/people.md) for docs about adding new profiles of group members
4598

4699
Check [here](docs/publications.md) for docs about adding new bib items.
47100

48-
49101
---
102+
50103
## TODO
51104

52-
- [ ] Add tutorial for openning a pull-request.
105+
- [x] Add tutorial for openning a pull-request.
106+
- [x] Add profile avatars for rest of group members.
53107
- [ ] Finish the resource page.
54-
- [ ] Add profile avatars for rest of group members.
55108
- [ ] Create project page.

_bibliography/papers.bib

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@
33
44
@string{aps = {American Physical Society,}}
55
6+
@article{Qian2022111111,
7+
title = {A striatal SOM-driven ChAT-iMSN loop generates beta oscillations and produces motor deficits},
8+
journal = {Cell Reports},
9+
volume = {40},
10+
number = {3},
11+
pages = {111111},
12+
year = {2022},
13+
issn = {2211-1247},
14+
doi = {https://doi.org/10.1016/j.celrep.2022.111111},
15+
html = {https://www.sciencedirect.com/science/article/pii/S2211124722009172},
16+
author = {Dandan Qian and Wei Li and Jinwen Xue and Yi Wu and Ziling Wang and Tao Shi and Songting Li and Jingxuan Yang and Shi Qiu and Shaoli Wang and Yousheng Shu and Liang Chen and Qiao Wang and Ti-Fei Yuan and Douglas Zhou and Wei Lu},
17+
keywords = {striatum, SNc, SOM cells, ChAT cells, beta oscillations},
18+
abstract = {Summary
19+
Enhanced beta oscillations within the cortico-basal ganglia-thalamic (CBT) network are correlated with motor deficits in Parkinson’s disease (PD), whose generation has been associated recently with amplified network dynamics in the striatum. However, how distinct striatal cell subtypes interact to orchestrate beta oscillations remains largely unknown. Here, we show that optogenetic suppression of dopaminergic control over the dorsal striatum (DS) elevates the power of local field potentials (LFPs) selectively at beta band (12–25 Hz), accompanied by impairments in locomotion. The amplified beta power originates from a striatal loop driven by somatostatin-expressing (SOM) interneurons and constituted by choline acetyltransferase (ChAT)-expressing interneurons and dopamine D2 receptor (D2R)-expressing medium spiny neurons (iMSNs). Moreover, closed-loop intervention selectively targeting striatal iMSNs or ChATs diminishes beta oscillations and restores motor function. Thus, we reveal a striatal microcircuit motif that underlies beta oscillation generation and accompanied motor deficits upon perturbation of dopaminergic control over the striatum.},
20+
bibtex_show = {true},
21+
}
22+
623
@article{Song2021,
724
abbr = {Cereb. Cortex},
825
bibtex_show={true},

0 commit comments

Comments
 (0)