Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge baseurl fixes #11

Open
wants to merge 120 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
3dac3ad
make maps available as standalone includes
senderle May 5, 2021
b968a53
add project gitignore
senderle May 5, 2021
696000c
remove folders that were accidentally copied into jekyll
senderle May 5, 2021
0cb1ba9
rebuild site without extra docs
senderle May 5, 2021
3148c0e
splitting protest + country map into 2 separate pages
May 5, 2021
3b9245a
move countries to a separate folder to decrease clutter in root direc…
senderle May 5, 2021
7630417
moving css fixes over
May 10, 2021
1b39053
fontawesome added to head include
May 10, 2021
d48afbc
map selection tweaks
May 10, 2021
6d23760
build rough template of protest pages
senderle May 14, 2021
d4ff860
landing page layout + create methodology page
May 17, 2021
c58afc9
latest build
senderle May 17, 2021
004707a
add base layouts for overriding and remove post
senderle May 17, 2021
a42549c
wipe current build and add layouts
senderle May 17, 2021
89cdf3e
force docs folder to exist
senderle May 17, 2021
666444a
wipe currenrt build and force docs to exist
senderle May 17, 2021
04ea67b
Merge branch 'cassandra-spa' into scott-spa
senderle May 17, 2021
ca23fd6
added methodology pg
May 17, 2021
4693769
Merge branch 'cassandra-spa' of https://github.com/chradil/spa into c…
senderle May 17, 2021
d517b8c
Merge branch 'cassandra-spa' into scott-spa
senderle May 17, 2021
36b2820
try moving jekyll to docs
senderle May 18, 2021
e75a4d7
map rebuild
senderle May 18, 2021
9bc6660
update config with full https
senderle May 18, 2021
a16a167
only update map build when changes detected post-startup
senderle May 18, 2021
d58f298
fix config
May 19, 2021
f59b8fe
fix config
May 19, 2021
6a4fc74
fix config
May 19, 2021
5c3589d
fix gitness
May 19, 2021
d187a72
fix gitness
May 19, 2021
72bf719
css changes + map zoom
May 21, 2021
56b58e3
more css on protest map
May 21, 2021
3d4624f
updating maps etc
May 25, 2021
7d66009
starting css changes on indiv protest pages
May 26, 2021
c2b229b
moar indiv protest css
May 26, 2021
8e92322
select filters using fragments
senderle Jun 4, 2021
5324b5c
rebuild maps, initial png export
senderle Jun 4, 2021
acbb0fc
temporarily disable export png
senderle Jun 4, 2021
7a48ef2
use correct jekyll build location
senderle Jun 4, 2021
0f090fc
correctly map docs folder in compose file
senderle Jun 5, 2021
0f50181
change protest glyph line width on hover
senderle Jun 5, 2021
94fca64
use purple fill color on hover
senderle Jun 5, 2021
1fdad0b
rebuild map
senderle Jun 5, 2021
57361ba
add protest thumbnail generation and thumbnails
senderle Jun 7, 2021
91c01f0
add protest images to protest layout
senderle Jun 7, 2021
9726e36
use correct braces for protest image url
senderle Jun 7, 2021
32b2440
use correct path for protest images
senderle Jun 7, 2021
511c6da
no need for csv data for now
senderle Jun 7, 2021
56dabae
add links from protest pages to protest map
senderle Jun 8, 2021
63abd4e
methodology, about, graphic updates to landing pg
Jun 9, 2021
062a1ed
about, methodology, landing pg graphic design
Jun 9, 2021
6724dc8
ongoing layout fixes, new copy
Jun 17, 2021
cad7a1d
Merge branch 'scott-spa' into cassandra-spa
Jun 17, 2021
a6c3432
merge cassandra + scott changes
Jun 17, 2021
c6c423a
ongoing layout fixes
Jun 17, 2021
6ff7126
fix hyphen-related filter bug
senderle Jun 24, 2021
7cd4bec
add basic version of protest list
senderle Jun 24, 2021
f52470f
mobile responsiveness???? /sob
Jun 25, 2021
d925dbe
Merge branch 'scott-spa' into cassandra-spa
Jun 25, 2021
5d6baa6
fix images on mobile + safari
Jun 29, 2021
956530c
mobile responsive country pgs
Jun 30, 2021
39d0de9
mobile margins
Jun 30, 2021
7b0ac6d
mobile fixes etc
Jul 9, 2021
aee52b7
footer, adding images, protest list overflow + clickability
Jul 15, 2021
e3b5804
image attribution
Jul 16, 2021
837168f
unbreak map.py
senderle Jul 16, 2021
e976f28
update line graphs and fix map.py execute bug
senderle Jul 21, 2021
d4f135c
remove jekyll folder
senderle Jul 21, 2021
44d29ef
turn off incremental building and fix hover problem
senderle Jul 21, 2021
712e9bb
fix Several Bad Things
Jul 21, 2021
71ea2d7
Merge branch 'cassandra-spa' into scott-spa
senderle Jul 21, 2021
074dd39
fixed map size etc
Jul 26, 2021
08c52ee
try to force re-rendering of index and protest maps
senderle Jul 26, 2021
4b91c22
fix location div
Jul 26, 2021
b94a39b
fix delay D:
Jul 26, 2021
6141eb8
update protest data with latest changes
senderle Jul 28, 2021
229f164
render new includes
senderle Jul 28, 2021
70691d3
fix protest link; needed spa prefix
senderle Jul 30, 2021
f24b506
Merge branch 'scott-spa'
senderle Jul 30, 2021
5b124f5
build new protest map
senderle Jul 31, 2021
50c7f0e
ongoing css fixes; prepping to add more mobile capability
Aug 2, 2021
0deb534
add dropdown icon
Aug 3, 2021
19391b7
render all protests
senderle Aug 3, 2021
ea65113
add country list for mobile to homepage
Aug 3, 2021
7a9dba2
post krystal fixes
Aug 11, 2021
c5ed2c6
more krystal changes
Aug 11, 2021
9ea4ec3
responsive menu color on homepg
Aug 11, 2021
67d4582
use unique id as filename, permalink
senderle Aug 12, 2021
4062397
fix bizarre markdown bug and add warning, explanation
senderle Aug 13, 2021
15c037d
Merge branch 'cassandra-spa' into scott-spa
senderle Aug 13, 2021
502843f
render latest version of maps
senderle Aug 13, 2021
61aa33c
fix hover styling
senderle Aug 13, 2021
bcb2188
mobile map (still returning errors)
Aug 19, 2021
3057e04
mobile map div now works
Aug 20, 2021
27f6db2
working div for mobile version
Aug 23, 2021
093e172
mobile css fixes
Aug 26, 2021
7d77f0a
mobile etc
Aug 26, 2021
66acbda
css resize dropdowns for mobile
Aug 26, 2021
fad2662
styling elements for mob
Aug 26, 2021
70aeb7d
re-style homepage mobile
Aug 27, 2021
e7d0b65
more homepg css
Aug 27, 2021
6e47b79
mobile styling
Aug 27, 2021
e49958c
add comments to map.py
senderle Aug 30, 2021
9ca7dea
update protests.csv
senderle Aug 30, 2021
9986d1d
fix protest result css
Aug 30, 2021
e5eb93b
fix country list links on mobile
Aug 30, 2021
2315ae0
add contextual information to mobile protest map pg
Aug 30, 2021
6f3cf84
Create .DS_Store
chradil Oct 13, 2021
c3494fb
generate protest pgs
chradil Oct 13, 2021
8d2562e
all protests generated
chradil Oct 15, 2021
7b8e176
Ensure services always restart
lts-andrewnk Dec 6, 2021
558c9d3
Run the project without a subpath
lts-andrewnk Dec 6, 2021
20c8978
Merge pull request #9 from lts-andrewnk/feature/deployment_updates
chradil Dec 8, 2021
856f700
merge aug30 changes from scott
Dec 9, 2021
026d009
scott comment
Dec 9, 2021
e905978
up to date with scott now hopefully
Dec 9, 2021
e771095
clean datasheet
Dec 16, 2021
ada81f5
cleaned protest datasheet
Dec 16, 2021
ae24fa9
fixing baseurl
Jan 28, 2022
6c49680
color changes
Jan 28, 2022
87b6de1
Update country.html
Feb 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file added .DS_Store
Binary file not shown.
141 changes: 141 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# Numpy data
*.npz

###########################
#
# Project-specific settings
#

map-country-standalone.html
map-protest-standalone.html
map-tab-standalone.html
1,137 changes: 0 additions & 1,137 deletions data_to_map/data/protests-orig-2020-09-07.csv

This file was deleted.

2,248 changes: 1,113 additions & 1,135 deletions data_to_map/data/protests.csv

Large diffs are not rendered by default.

Loading