Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
37743c0
Introducing Cover Page (#21)
thisisayush Jan 9, 2017
b142b17
Updated Events and Links
thisisayush Jan 15, 2017
c01fe6a
Remove unnecessary name
mystictot Feb 4, 2017
657a923
Added Animations, Preloader and Team Info (#24)
thisisayush Feb 25, 2017
3b21374
UI Changes (#26)
atb00ker Feb 27, 2017
d8c165b
chore(README): added `ATB00ker` to contributors section
aniketmaithani Feb 27, 2017
581b894
Bug Fixes (#28)
thisisayush Feb 28, 2017
4f177bf
Bug Fixes #2 (#29)
thisisayush Mar 1, 2017
465331a
Event and Team Update (#30)
thisisayush Mar 1, 2017
dfb9701
Images Update (#31)
thisisayush Mar 2, 2017
1419436
DEPARTMENTS PART INCLUDED (#34)
Manas-kashyap Mar 6, 2017
2744760
Bug Fixes
thisisayush Mar 6, 2017
c1ae6b4
Merge pull request #36 from thisisayush/master
thisisayush Mar 6, 2017
49dfa2d
UI and data updates
AniVerma17 Mar 2, 2017
cde8d41
Merge pull request #33 from AnimeshVerma17/master
thisisayush Mar 8, 2017
89a2fc8
UI update patch
AniVerma17 Mar 8, 2017
7071d91
Merge pull request #37 from AnimeshVerma17/master
thisisayush Mar 8, 2017
23b71f7
Features and UI Update.
atb00ker Mar 9, 2017
96093a6
Merge pull request #38 from ATB00ker/master
thisisayush Mar 9, 2017
a147dee
Gradient fix
AniVerma17 Mar 9, 2017
65e7ca7
Merge pull request #39 from AnimeshVerma17/patch-1
thisisayush Mar 11, 2017
ca5a296
Added data-* attributes to nav links (#40)
AniVerma17 Mar 13, 2017
0010b66
chore(css/colors): removed colors.css
aniketmaithani Mar 13, 2017
c476e0a
line ending warning removed
aniketmaithani Mar 13, 2017
00ccea6
CLRF to LF line error rectification
aniketmaithani Mar 13, 2017
d172bfb
Parallax script error fix (#43)
AniVerma17 Mar 14, 2017
1c30080
Added a new section/ UI Changes
atb00ker Mar 13, 2017
9d7eb5c
Merge pull request #41 from ATB00ker/master
thisisayush Mar 14, 2017
8b7a888
Fixed Color Scheme and Various other fixes
thisisayush Mar 14, 2017
2d7fcec
Merge pull request #45 from thisisayush/master
thisisayush Mar 14, 2017
e1b98bd
UI changes
TanyaaCJain Mar 14, 2017
83e1b47
UI changes
TanyaaCJain Mar 14, 2017
78ad84d
(Site Verificiation): Google Site Verification
thisisayush Mar 21, 2017
9203a4a
(Add): Google Analytics Integration
thisisayush Mar 21, 2017
f426d77
Design changes
TanyaaCJain Mar 21, 2017
d3914f9
Merge branch 'patch-1' into master
TanyaaCJain Mar 21, 2017
4e07a35
CSS changes to home and navbar (#47)
parthsharma2 Mar 21, 2017
f8eddeb
Merge pull request #6 from asetalias/master
atb00ker Mar 21, 2017
86e5d65
Changes
atb00ker Mar 21, 2017
f514463
Merge branch 'master' into master
thisisayush Mar 21, 2017
73ac9c9
Merge pull request #46 from thisisayush/master
thisisayush Mar 21, 2017
831bb24
Merge branch 'Tanya-Edit' into Tanya-Edit
atb00ker Mar 21, 2017
6d28fbb
Functional!
atb00ker Mar 22, 2017
b3f9f99
Merge remote-tracking branch 'origin/Tanya-Edit' into Tanya-Edit
atb00ker Mar 22, 2017
ff554ed
--Commit Squash--
atb00ker Mar 22, 2017
f5d1162
-- Update -- Minor Fix!
atb00ker Mar 22, 2017
206452a
Merge pull request #5 from ATB00ker/Tanya-Edit
TanyaaCJain Mar 22, 2017
d575358
Merge remote-tracking branch 'refs/remotes/asetalias/master' into Tan…
atb00ker Mar 22, 2017
4877465
Major Changes
thisisayush Mar 21, 2017
e7bbb9a
(update) Upcoming Webinar (fix) Bug Fixes
thisisayush Mar 23, 2017
b909bc2
Merge pull request #48 from thisisayush/master
thisisayush Mar 23, 2017
db88bd4
(update) Upcoming Webinar (fix) Bug Fixes
thisisayush Mar 23, 2017
60090c6
Merge pull request #6 from ATB00ker/Tanya-Edit
TanyaaCJain Mar 23, 2017
2bd645c
(fix)(update)Updated Webinars/Events | Removed Designations
thisisayush Mar 24, 2017
9754f40
Merge pull request #50 from thisisayush/master
thisisayush Mar 24, 2017
5a3a6c2
Changes @ Upcoming and Webinar section.
vipulgupta2048 Mar 30, 2017
671e670
Merge pull request #52 from vipulgupta2048/master
thisisayush Apr 1, 2017
a38ba60
(Fix) Vipul's photo 404
thisisayush Apr 1, 2017
f67f80d
(fix) Rename to Fix Vipul Photo 404
thisisayush Apr 1, 2017
0731290
Merge pull request #53 from thisisayush/master
thisisayush Apr 1, 2017
ecba80b
List Update
atb00ker Apr 8, 2017
2023f81
Merge pull request #54 from ATB00ker/master
thisisayush Apr 8, 2017
3108c4c
ALiAS reborn UPDATE 2
thisisayush Apr 28, 2017
54d85bf
Merge pull request #55 from thisisayush/master
thisisayush Apr 28, 2017
32879e2
(update) fbgallery.js updated
thisisayush Apr 29, 2017
0c77ad8
Merge pull request #56 from thisisayush/master
thisisayush Apr 29, 2017
3401b6e
(update) Introduction and Implementation of JSON
thisisayush May 11, 2017
60c65ae
Merge pull request #63 from thisisayush/master
thisisayush May 13, 2017
c9d3cfe
(fix) Preloader | MinScreenSizeOverlay
thisisayush May 24, 2017
5f02566
Merge pull request #64 from thisisayush/master
thisisayush May 24, 2017
04c4ea4
Updated Upcoming Event
omi10859 Aug 14, 2017
9de33cf
(update) UI Update
thisisayush Aug 14, 2017
e575374
Merge pull request #65 from thisisayush/master
thisisayush Aug 14, 2017
34c9f9e
Merge pull request #66 from omi10859/master
thisisayush Aug 14, 2017
780823f
Updated Team Details
thisisayush Aug 14, 2017
9e32c0e
Merge pull request #67 from thisisayush/master
thisisayush Aug 14, 2017
1dc7f12
Updated Team Details (Remove)
thisisayush Aug 14, 2017
57ed45b
(fix) Poster Link
thisisayush Aug 14, 2017
79d3a8b
Merge pull request #68 from thisisayush/master
thisisayush Aug 14, 2017
baa33f0
update
TanyaaCJain Aug 14, 2017
282f4e8
update
TanyaaCJain Aug 14, 2017
3007d79
update
TanyaaCJain Aug 14, 2017
d33e0b3
update
TanyaaCJain Aug 14, 2017
0ea7094
[UPDATE] Upcoming event
vipulgupta2048 Aug 24, 2017
67931ae
Merge pull request #71 from vipulgupta2048/master
thisisayush Aug 24, 2017
e738e52
Added Ashish in Team Section
thisisayush Sep 21, 2017
2399f1f
Merge pull request #72 from thisisayush/master
thisisayush Sep 21, 2017
e5e92d2
Move website code to SaticJinja
Sep 28, 2017
18379e3
Merge pull request #73 from thisisayush/master
thisisayush Oct 2, 2017
072f92b
Update Events Section UI
thisisayush Oct 11, 2017
ba27555
Remove Ashish from Team
thisisayush Oct 11, 2017
46b8666
Merge pull request #76 from thisisayush/master
thisisayush Oct 11, 2017
1c364f7
Updated my details and generated the html files using build.py
parthsharma2 Oct 14, 2017
55c5850
Merge pull request #75 from parthsharma2/master
thisisayush Oct 18, 2017
c570544
Updated links for Vipul Gupta
vipulgupta2048 Oct 23, 2017
f8d149b
Merge pull request #77 from vipulgupta2048/master
thisisayush Oct 26, 2017
d0ce89c
Added projects showcase page, and a few bugfixes
AniVerma17 Nov 8, 2017
5dec27e
Merge pull request #79 from AnimeshVerma17/master
thisisayush Nov 10, 2017
70d38c2
Update Requirements
thisisayush Nov 10, 2017
540c2dd
Add Projects Section | Convert JSON Data to Markdown | Bug Fixes
thisisayush Nov 11, 2017
bda3a9a
Merge pull request #80 from thisisayush/master
thisisayush Nov 11, 2017
38cf999
UI updates and bug fixes
AniVerma17 Nov 11, 2017
6222ce1
Merge pull request #81 from AnimeshVerma17/master
thisisayush Nov 19, 2017
accf74d
[Update] Profile links for Omkar yadav
omi10859 Dec 19, 2017
3952e88
Merge pull request #82 from omi10859/master
thisisayush Dec 20, 2017
8edffe0
Update Upcoming Event [18 Jan 2018]
thisisayush Jan 17, 2018
081f75a
Set Default Upcoming Event
thisisayush Jan 22, 2018
3119ad5
(add) HTN Event Details | (fix) Flashbox
thisisayush Feb 8, 2018
22b29a3
Update Upcoming Event
thisisayush Feb 24, 2018
1d180ad
Add Project Community Connect
thisisayush Mar 13, 2018
69752dd
Merge pull request #84 from thisisayush/master
thisisayush Mar 13, 2018
e0b49cb
Add Project Beautiful-Bootstrap
thisisayush Mar 13, 2018
fa19efd
Change 'showcase' to 'title' in Menu
thisisayush Mar 13, 2018
84ec849
Merge pull request #85 from thisisayush/project_beautiful_bootstrap
thisisayush Mar 13, 2018
dd8cdbb
Merge pull request #86 from thisisayush/change_showcase
thisisayush Mar 13, 2018
8dbcb72
Remove GeekBattle Details
thisisayush Mar 13, 2018
cc8a9ee
Merge pull request #87 from thisisayush/remove_geekbattle
thisisayush Mar 13, 2018
24e6b57
Update README.md
aniketmaithani Mar 14, 2018
f28a3d1
Add Project Scrape
thisisayush Mar 16, 2018
8a9579b
Remove Ajay From Team Section (On Request)
thisisayush Mar 16, 2018
cdd7d15
Update Team (Omkar -> Website)
thisisayush Mar 17, 2018
7183c4d
Added Event Raspberry | Changes README.md
vipulgupta2048 Mar 21, 2018
14b1d61
Merge pull request #92 from vipulgupta2048/master
thisisayush Mar 21, 2018
a7ffb0f
Updated UI
TanyaaCJain May 5, 2018
bff45e4
Updated Bootstrap from v3 to v4.1
TanyaaCJain May 13, 2018
b63921f
Divided the css files into fonts, colors, and layout
TanyaaCJain May 13, 2018
8ac9e6e
Add more resources for participate and learn, and solved issue #98
TanyaaCJain May 13, 2018
4fa7492
Updated backgrounds and other images
TanyaaCJain May 13, 2018
0cdfe41
Updated JavaScript of Bootstrap from v3.3 to v4.1
TanyaaCJain May 13, 2018
e1e19dc
Updated Bootstrap changes, UI and UX for ALiAS Website v3
TanyaaCJain May 13, 2018
9c6c096
Resolved conflicts
TanyaaCJain May 13, 2018
984f307
Merge pull request #7 from Tanya-Jain/develop-tanya
TanyaaCJain May 13, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 44 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,57 @@
## ASET-ALIAS
## ALiAS: Amity Linux Assistance Sapience
- The following repo contains the source code for the official website of Amity Linux Assistance Sapience.
- The website is hosted on gh-pages itself.

- This Website uses Staticjinja to build top-level HTML files. Follow Instructions to modify the HTML Files.

## Contribute
- Feel free to open any issue or recommend any changes which you want to see in the website.
- Feel free to open an issue or recommend any changes which you want to see in the website.
- Adhere to the guidelines mentioned below if you want to contribute.


## Guidelines
- Make sure your PR contains `one` logical change only!
- In case there are multiple commit in your PR squash them into one. Ref :
- In case there are multiple commits in your PR squash them into one. Ref :
- `https://makandracards.com/makandra/527-squash-several-git-commits-into-a-single-commit`
- Make sure you update your REMOTE ORIGIN in case you have forked this repo :
- `https://help.github.com/articles/syncing-a-fork/`
- Once you update the forked repo make sure you `rebase` the changes and then open the PR.
- Ref : `http://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository`
- Ref: `http://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository`

## Instructions

### Create and activate a python virtual environment
Create a virtual environment (You may have to run ```pip install venv```)
```
virtualenv VENV_NAME
or
python -m venv VENV_NAME
```
Activate Environment:
Linux:
```
source VENV_NAME/bin/activate
```
Windows:
```
./VENV_NAME/Scripts/activate
```

### Install the requirements
```
pip install -r requirements.txt
```

### Run build.py
Run build.py to automatically build and render top level html files. (Optional: Run SimpleHTTPServer alongside for easy testing)
```
python build.py & python -m SimpleHTTPServer
```

### Make your changes
Don't make any changes to top-level HTML Files. Navigate to ```templates``` folder and make required changes in the required section/module.
StaticJinja will not track any changes made to any javascript/CSS/JSON files. Re-compile build.py to update any changes made to JSON files (no re-compile required in case of js/CSS).

### Preview your result
If you are using SimpleHTTPServer, you can view the changes at localhost:8000. If not, double-clicking the rendered index.html to view the result

## Contributors
- @thisisayush
Expand All @@ -24,3 +60,5 @@
- @ConformalTomb
- @aniketmaithani
- @bhanuvrat
- @ATB00ker
- @vipulgupta2048
85 changes: 85 additions & 0 deletions build.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import json,os,re
from staticjinja import make_site
import markdown
#Path to data folder
data_folder = os.path.abspath(os.path.dirname(__file__)) + '/data'
#Replace // and \ with /
data_folder = re.sub(r"(\/\/){1}|(\\){1}", '/', data_folder)

def convertToHtml(text):
print(text.replace("\\n","\n"))
return markdown.markdown(text.replace("\\n","\n"), output_format="html5").replace('\n', "<br>")

if __name__ == "__main__":
data_home = {}
events = {}
site_meta = {}
webinars = {}
communities = {}
projects = {}
#Open and Read JSON Files
try:
with open(data_folder+'/data-home.json') as json_file:
data_home = json.load(json_file)[0]
with open(data_folder+'/events.json') as json_file:
events = json.load(json_file)
with open(data_folder+'/site-meta.json') as json_file:
site_meta = json.load(json_file)[0]
with open(data_folder+'/webinars.json') as json_file:
webinars = json.load(json_file)
with open(data_folder+'/communities.json') as json_file:
communities = json.load(json_file)
with open(data_folder+'/projects.json') as json_file:
projects = json.load(json_file)
except Exception as e:
print(e.message)
#Convert Markdown to HTML for selected
for event in events:
event['description'] = convertToHtml(event['description'])
data_home['alumni_description'] = convertToHtml(data_home['alumni_description'])

for community in communities:
community['desc'] = convertToHtml(community['desc'])

for project in projects:
project['description'] = convertToHtml(project['description'])

#Create Contexts
context_base = {'contact_links': site_meta['contact_links'],
'join_now_link': site_meta['join_now_link'],
'favicon': site_meta['favicon'],
'logo_dark': site_meta['logo_dark'],
'logo_light': site_meta['logo_light'],
'flashbox': site_meta['flashbox']
}
context_home = {'site_about':data_home['site_about'],
'site_history':data_home['site_history'],
'alumni_description':data_home['alumni_description'],
'services':data_home['services'],
'events': events,
'webinars': webinars,
'open_source_communities': data_home['open_source'],
'eventsP': data_home['eventsP'],
'team': data_home['team'],
'header_class': 'mainHeaderLayout1'
}
context_communities = {
'header_class': 'mainHeaderLayout',
'communities': communities
}
context_gallery = {
'header_class': 'mainHeaderLayout'
}
context_projects = {
'header_class': 'mainHeaderLayout1',
'projects': projects
}
context_home.update(context_base)
context_communities.update(context_base)
context_gallery.update(context_base)
context_projects.update(context_base)
contexts = [('index.html', context_home), ('communities.html', context_communities), ('gallery.html', context_gallery), ('showcase.html', context_projects)]

#StaticJinja
site = make_site(contexts = contexts)
site.render(use_reloader=True)
Loading