Skip to content

Commit bbb1f6f

Browse files
msm-sardarmsm-sardar
committed
Working on website
1 parent 2b40d4c commit bbb1f6f

File tree

153 files changed

+21631
-735
lines changed

Some content is hidden

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

153 files changed

+21631
-735
lines changed

Diff for: ‎Gemfile

+6
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,9 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
3030

3131

3232
gem "webrick", "~> 1.7"
33+
34+
gem 'bootstrap', '~> 5.1.0'
35+
36+
group :development do
37+
gem 'popper_js', '>= 1.12.3'
38+
end

Diff for: ‎Gemfile.lock

+72-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,43 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4+
actionpack (6.0.4.1)
5+
actionview (= 6.0.4.1)
6+
activesupport (= 6.0.4.1)
7+
rack (~> 2.0, >= 2.0.8)
8+
rack-test (>= 0.6.3)
9+
rails-dom-testing (~> 2.0)
10+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
11+
actionview (6.0.4.1)
12+
activesupport (= 6.0.4.1)
13+
builder (~> 3.1)
14+
erubi (~> 1.4)
15+
rails-dom-testing (~> 2.0)
16+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
17+
activesupport (6.0.4.1)
18+
concurrent-ruby (~> 1.0, >= 1.0.2)
19+
i18n (>= 0.7, < 2)
20+
minitest (~> 5.1)
21+
tzinfo (~> 1.1)
22+
zeitwerk (~> 2.2, >= 2.2.2)
423
addressable (2.8.0)
524
public_suffix (>= 2.0.2, < 5.0)
25+
autoprefixer-rails (10.3.3.0)
26+
execjs (~> 2)
27+
bootstrap (5.1.0)
28+
autoprefixer-rails (>= 9.1.0)
29+
popper_js (>= 2.9.3, < 3)
30+
sassc-rails (>= 2.0.0)
31+
builder (3.2.4)
632
colorator (1.1.0)
733
concurrent-ruby (1.1.9)
34+
crass (1.0.6)
835
em-websocket (0.5.2)
936
eventmachine (>= 0.12.9)
1037
http_parser.rb (~> 0.6.0)
38+
erubi (1.10.0)
1139
eventmachine (1.2.7-x64-mingw32)
40+
execjs (2.8.1)
1241
ffi (1.15.4-x64-mingw32)
1342
forwardable-extended (2.6.0)
1443
http_parser.rb (0.6.0)
@@ -45,14 +74,38 @@ GEM
4574
listen (3.7.0)
4675
rb-fsevent (~> 0.10, >= 0.10.3)
4776
rb-inotify (~> 0.9, >= 0.9.10)
77+
loofah (2.12.0)
78+
crass (~> 1.0.2)
79+
nokogiri (>= 1.5.9)
4880
mercenary (0.4.0)
81+
method_source (1.0.0)
4982
minima (2.5.1)
5083
jekyll (>= 3.5, < 5.0)
5184
jekyll-feed (~> 0.9)
5285
jekyll-seo-tag (~> 2.1)
86+
minitest (5.14.4)
87+
nokogiri (1.12.5-x64-mingw32)
88+
racc (~> 1.4)
5389
pathutil (0.16.2)
5490
forwardable-extended (~> 2.6)
91+
popper_js (2.9.3)
5592
public_suffix (4.0.6)
93+
racc (1.5.2)
94+
rack (2.2.3)
95+
rack-test (1.1.0)
96+
rack (>= 1.0, < 3)
97+
rails-dom-testing (2.0.3)
98+
activesupport (>= 4.2.0)
99+
nokogiri (>= 1.6)
100+
rails-html-sanitizer (1.4.2)
101+
loofah (~> 2.3)
102+
railties (6.0.4.1)
103+
actionpack (= 6.0.4.1)
104+
activesupport (= 6.0.4.1)
105+
method_source
106+
rake (>= 0.8.7)
107+
thor (>= 0.20.3, < 2.0)
108+
rake (13.0.6)
56109
rb-fsevent (0.11.0)
57110
rb-inotify (0.10.1)
58111
ffi (~> 1.0)
@@ -61,28 +114,46 @@ GEM
61114
safe_yaml (1.0.5)
62115
sassc (2.4.0-x64-mingw32)
63116
ffi (~> 1.9)
117+
sassc-rails (2.1.2)
118+
railties (>= 4.0.0)
119+
sassc (>= 2.0)
120+
sprockets (> 3.0)
121+
sprockets-rails
122+
tilt
123+
sprockets (4.0.2)
124+
concurrent-ruby (~> 1.0)
125+
rack (> 1, < 3)
126+
sprockets-rails (3.2.2)
127+
actionpack (>= 4.0)
128+
activesupport (>= 4.0)
129+
sprockets (>= 3.0.0)
64130
terminal-table (2.0.0)
65131
unicode-display_width (~> 1.1, >= 1.1.1)
132+
thor (1.1.0)
66133
thread_safe (0.3.6)
134+
tilt (2.0.10)
67135
tzinfo (1.2.9)
68136
thread_safe (~> 0.1)
69137
tzinfo-data (1.2021.3)
70138
tzinfo (>= 1.0.0)
71139
unicode-display_width (1.8.0)
72140
wdm (0.1.1)
73141
webrick (1.7.0)
142+
zeitwerk (2.4.2)
74143

75144
PLATFORMS
76145
x64-mingw32
77146

78147
DEPENDENCIES
148+
bootstrap (~> 5.1.0)
79149
jekyll (~> 4.2.1)
80150
jekyll-feed (~> 0.12)
81151
minima (~> 2.5)
152+
popper_js (>= 1.12.3)
82153
tzinfo (~> 1.2)
83154
tzinfo-data
84155
wdm (~> 0.1.1)
85156
webrick (~> 1.7)
86157

87158
BUNDLED WITH
88-
2.2.27
159+
2.2.29

Diff for: ‎_config.yml

+6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,18 @@ baseurl: "" # the subpath of your site, e.g. /blog
2828
url: "" # the base hostname & protocol for your site, e.g. http://example.com
2929
twitter_username: mojtaba_sardar
3030
github_username: SwolfPy-Project
31+
youtube_username: UCKj4tnoE-SuInr3UosuewcQ
32+
3133

3234
# Build settings
3335
theme: minima
3436
plugins:
3537
- jekyll-feed
3638

39+
collections:
40+
papers:
41+
people:
42+
3743
# Exclude from processing.
3844
# The following items will not be processed, by default.
3945
# Any item listed under the `exclude:` key here will be automatically added to

Diff for: ‎_includes/disqus_comments.html

-20
This file was deleted.

Diff for: ‎_includes/footer.html

+13-33
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,15 @@
1-
<footer class="site-footer h-card">
2-
<data class="u-url" href="{{ "/" | relative_url }}"></data>
3-
4-
<div class="wrapper">
5-
6-
<h2 class="footer-heading">{{ site.title | escape }}</h2>
7-
8-
<div class="footer-col-wrapper">
9-
<div class="footer-col footer-col-1">
10-
<ul class="contact-list">
11-
<li class="p-name">
12-
{%- if site.author -%}
13-
{{ site.author | escape }}
14-
{%- else -%}
15-
{{ site.title | escape }}
16-
{%- endif -%}
17-
</li>
18-
{%- if site.email -%}
19-
<li><a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a></li>
20-
{%- endif -%}
21-
</ul>
22-
</div>
23-
24-
<div class="footer-col footer-col-2">
25-
{%- include social.html -%}
26-
</div>
27-
28-
<div class="footer-col footer-col-3">
29-
<p>{{- site.description | escape -}}</p>
30-
</div>
1+
<div class="container">
2+
<footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
3+
<data class="u-url" href="{{ "/" | relative_url }}"></data>
4+
<div class="col-md-4 d-flex align-items-center">
5+
<a href="/" class="mb-3 me-2 mb-md-0 text-muted text-decoration-none lh-1">
6+
<svg class="bi" width="30" height="24"><use xlink:href="#bootstrap"></use></svg>
7+
</a>
8+
<span class="text-muted">
9+
Solid Waste Optimization Life-cycle Framework in Python(SwolfPy)
10+
© 2021 North Carolina State University</span>
3111
</div>
3212

33-
</div>
34-
35-
</footer>
13+
{%- include social.html -%}
14+
</footer>
15+
</div>

Diff for: ‎_includes/header.html

+21-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<header class="site-header" role="banner">
1+
<header>
22

3-
<div class="wrapper">
3+
<!-- <div class="wrapper">
44
{%- assign default_paths = site.pages | map: "path" -%}
55
{%- assign page_paths = site.header_pages | default: default_paths -%}
66
<a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
@@ -26,5 +26,24 @@
2626
</div>
2727
</nav>
2828
{%- endif -%}
29+
</div> -->
30+
31+
<div class="container">
32+
<header class="d-flex flex-wrap justify-content-center py-3 mb-4 border-bottom">
33+
<a href="/" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-dark text-decoration-none">
34+
<svg class="bi me-2" width="40" height="32"><use xlink:href="#bootstrap"></use></svg>
35+
<span class="fs-4">SwolfPy</span>
36+
</a>
37+
38+
<ul class="nav nav-pills">
39+
<li class="nav-item"><a href="{{ site.baseurl }}/" class="nav-link active" aria-current="page">Home</a></li>
40+
<li class="nav-item"><a href="{{ site.baseurl }}/people" class="nav-link">People</a></li>
41+
<li class="nav-item"><a href="{{ site.baseurl }}/publications" class="nav-link">Publications</a></li>
42+
<li class="nav-item"><a href="https://swolfpy.readthedocs.io/en/latest/" target="_blank" class="nav-link">Documentation</a></li>
43+
<li class="nav-item"><a href="https://pypi.org/project/swolfpy/" target="_blank" class="nav-link">Download</a></li>
44+
<li class="nav-item"><a href="{{ site.baseurl }}/contact" class="nav-link">Contact</a></li>
45+
</ul>
46+
</header>
2947
</div>
48+
3049
</header>

Diff for: ‎_includes/icon-github.html

-1
This file was deleted.

Diff for: ‎_includes/icon-github.svg

-1
This file was deleted.

Diff for: ‎_includes/icon-twitter.html

-1
This file was deleted.

Diff for: ‎_includes/icon-twitter.svg

-1
This file was deleted.

Diff for: ‎_includes/social.html

+44-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,45 @@
1-
<ul class="social-media-list">
2-
{%- if site.dribbble_username -%}<li><a href="https://dribbble.com/{{ site.dribbble_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#dribbble' | relative_url }}"></use></svg> <span class="username">{{ site.dribbble_username| escape }}</span></a></li>{%- endif -%}
3-
{%- if site.facebook_username -%}<li><a href="https://www.facebook.com/{{ site.facebook_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#facebook' | relative_url }}"></use></svg> <span class="username">{{ site.facebook_username| escape }}</span></a></li>{%- endif -%}
4-
{%- if site.flickr_username -%}<li><a href="https://www.flickr.com/photos/{{ site.flickr_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#flickr' | relative_url }}"></use></svg> <span class="username">{{ site.flickr_username| escape }}</span></a></li>{%- endif -%}
5-
{%- if site.github_username -%}<li><a href="https://github.com/{{ site.github_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#github' | relative_url }}"></use></svg> <span class="username">{{ site.github_username| escape }}</span></a></li>{%- endif -%}
6-
{%- if site.instagram_username -%}<li><a href="https://instagram.com/{{ site.instagram_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#instagram' | relative_url }}"></use></svg> <span class="username">{{ site.instagram_username| escape }}</span></a></li>{%- endif -%}
7-
{%- if site.linkedin_username -%}<li><a href="https://www.linkedin.com/in/{{ site.linkedin_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#linkedin' | relative_url }}"></use></svg> <span class="username">{{ site.linkedin_username| escape }}</span></a></li>{%- endif -%}
8-
{%- if site.pinterest_username -%}<li><a href="https://www.pinterest.com/{{ site.pinterest_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#pinterest' | relative_url }}"></use></svg> <span class="username">{{ site.pinterest_username| escape }}</span></a></li>{%- endif -%}
9-
{%- for mst in site.mastodon -%}{%- if mst.username and mst.instance -%}<li><a href="https://{{ mst.instance| cgi_escape | escape}}/@{{mst.username}}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#mastodon' | relative_url }}"></use></svg> <span class="username">{{ mst.username|escape }}</span></a></li>{%- endif -%}{%- endfor -%}
10-
{%- if site.twitter_username -%}<li><a href="https://www.twitter.com/{{ site.twitter_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#twitter' | relative_url }}"></use></svg> <span class="username">{{ site.twitter_username| escape }}</span></a></li>{%- endif -%}
11-
{%- if site.youtube_username -%}<li><a href="https://youtube.com/{{ site.youtube_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#youtube' | relative_url }}"></use></svg> <span class="username">{{ site.youtube_username| escape }}</span></a></li>{%- endif -%}
12-
{%- if site.googleplus_username -%}<li><a href="https://plus.google.com/{{ site.googleplus_username| escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#googleplus' | relative_url }}"></use></svg> <span class="username">{{ site.googleplus_username| escape }}</span></a></li>{%- endif -%}
13-
{%- if site.rss -%}<li><a href="{{ 'feed.xml' | relative_url }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#rss' | relative_url }}"></use></svg> <span>{{ site.rss | escape }}</span></a></li>{%- endif -%}
1+
<ul class="nav col-md-4 justify-content-end list-unstyled d-flex">
2+
3+
{%- if site.github_username -%}
4+
<li>
5+
<a class="text-muted" href="https://github.com/{{ site.github_username| cgi_escape | escape }}" target="_blank">
6+
<svg class="bi" width="36" height="36"><use xlink:href="{{ '/assets/minima-social-icons.svg#github' | relative_url }}"></use></svg>
7+
</a>
8+
</li>
9+
{%- endif -%}
10+
11+
{%- if site.linkedin_username -%}
12+
<li>
13+
<a class="text-muted" href="https://www.linkedin.com/in/{{ site.linkedin_username| cgi_escape | escape }}" target="_blank">
14+
<svg class="bi" width="36" height="36"><use xlink:href="{{ '/assets/minima-social-icons.svg#linkedin' | relative_url }}"></use></svg>
15+
<!-- <span class="username">{{ site.linkedin_username| escape }}</span> -->
16+
</a>
17+
</li>
18+
{%- endif -%}
19+
20+
{%- if site.twitter_username -%}
21+
<li>
22+
<a class="text-muted" href="https://www.twitter.com/{{ site.twitter_username| cgi_escape | escape }}" target="_blank">
23+
<svg class="bi" width="36" height="36"><use xlink:href="{{ '/assets/minima-social-icons.svg#twitter' | relative_url }}"></use></svg>
24+
<!-- <span class="username">{{ site.twitter_username| escape }}</span> -->
25+
</a>
26+
</li>
27+
{%- endif -%}
28+
29+
{%- if site.youtube_username -%}
30+
<li>
31+
<a class="text-muted" href="https://youtube.com//channel//{{ site.youtube_username| cgi_escape | escape }}" target="_blank">
32+
<svg class="bi" width="36" height="36"><use xlink:href="{{ '/assets/minima-social-icons.svg#youtube' | relative_url }}"></use></svg>
33+
<!-- <span class="username">{{ site.youtube_username| escape }}</span> -->
34+
</a>
35+
</li>
36+
{%- endif -%}
1437
</ul>
38+
39+
40+
41+
42+
43+
<!-- <li class="ms-3"><a class="text-muted" href="#"><svg class="bi" width="24" height="24"><use xlink:href="#twitter"></use></svg></a></li>
44+
<li class="ms-3"><a class="text-muted" href="#"><svg class="bi" width="24" height="24"><use xlink:href="#instagram"></use></svg></a></li>
45+
<li class="ms-3"><a class="text-muted" href="#"><svg class="bi" width="24" height="24"><use xlink:href="#facebook"></use></svg></a></li> -->

0 commit comments

Comments
 (0)