Commit 57864d4c authored by Vicky Rampin's avatar Vicky Rampin 👽
Browse files

Merge branch 'name' into 'master'

Update Vicky's name

See merge request !15
parents ca248f62 6053fede
Pipeline #253940458 passed with stages
in 1 minute and 34 seconds
......@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [vicky dot steeves at nyu dot edu](mailto:vicky.steeves@nyu.edu). The team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [vicky.rampin@nyu.edu](mailto:vicky.rampin@nyu.edu). The team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
......
MIT License
Copyright (c) 2018 Vicky Steeves
Copyright (c) 2018 Vicky Rampin
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......
......@@ -9,7 +9,7 @@ You can view this website locally once you've cloned this repository by just dou
Here's how to get started via the command line:
<pre><code># clone this repository (you will need git installed for this; you can also download the repo as a .zip)
$ git clone git@gitlab.com:VickySteeves/Women-Leaders-Openness.git
$ git clone git@gitlab.com:VickyRampin/Women-Leaders-Openness.git
# start up a local server
$ python -m SimpleHTTPServer 8000
......@@ -79,7 +79,7 @@ $.when($.get(csv_path)).then(function(data) {
In this case, I am using the same `.csv` file to build the searchable table on the home page and the map by including all the data there. This script loops through the CSV, looks for any information that would go in the popup (row[0] = Name, row[1] = Twitter Handle, row[2]=Affiliation) and places the marker on the map based on the lat (row[3]) and long (row[4]) on the sheet.
#### Building & Deploying Website
I am also using [GitLab](https://about.gitlab.com/) for version control, building the site (using the native [Continuous Integration](https://about.gitlab.com/features/gitlab-ci-cd/)), and serving the website. To do this via GitLab, I need to add a `.gitlab-ci.yml` file to my repository ([here](https://gitlab.com/VickySteeves/Women-Leaders-Openness/blob/master/.gitlab-ci.yml)), which looks like this:
I am also using [GitLab](https://about.gitlab.com/) for version control, building the site (using the native [Continuous Integration](https://about.gitlab.com/features/gitlab-ci-cd/)), and serving the website. To do this via GitLab, I need to add a `.gitlab-ci.yml` file to my repository ([here](https://gitlab.com/VickyRampin/Women-Leaders-Openness/blob/master/.gitlab-ci.yml)), which looks like this:
<pre><code># This file is a template, and might need editing before it works on your project.
# Full project: https://gitlab.com/pages/plain-html
......@@ -109,10 +109,10 @@ pages:
- master
</pre></code>
This builds the website in two stages: test and deploy. During the "test" phase, GitLab deploys a script `checkcsv.py` (found [here](https://gitlab.com/VickySteeves/Women-Leaders-Openness/blob/master/checkcsv.py) in the repo) to basically check I didn't mess up the CSV when I updated it. If that passes, then it'll go onto the "deploy" phase. This actually builds and serves the website to the public.
This builds the website in two stages: test and deploy. During the "test" phase, GitLab deploys a script `checkcsv.py` (found [here](https://gitlab.com/VickyRampin/Women-Leaders-Openness/blob/master/checkcsv.py) in the repo) to basically check I didn't mess up the CSV when I updated it. If that passes, then it'll go onto the "deploy" phase. This actually builds and serves the website to the public.
## Contribute!
If you'd like to contribute, that would be amazing! I will try my best to be on top of merge requests and issues. If you aren't comfortable with coding or git, you can email me ([vicky dot steeves at nyu dot edu](mailto:vicky.steeves@nyu.edu)) changes you'd like to see and I will open an issue for you or, if it's quick enough, make the change and give you attribution on this README.
If you'd like to contribute, that would be amazing! I will try my best to be on top of merge requests and issues. If you aren't comfortable with coding or git, you can email me ([vicky.rampin@nyuedu](mailto:vicky.rampin@nyu.edu)) changes you'd like to see and I will open an issue for you or, if it's quick enough, make the change and give you attribution on this README.
Here are some general instructions to help -- the following was adapted from [ProjectPorcupine's](https://github.com/TeamPorcupine/ProjectPorcupine)'s [CONTRIBUTING.md](https://github.com/TeamPorcupine/ProjectPorcupine/blob/master/CONTRIBUTING.md).
......@@ -125,7 +125,7 @@ Pease follow the [Contributor Covenant](CODE_OF_CONDUCT.md) in all your interact
3. Change into your new project folder.
* From the command line: `cd Women-Leaders-Openness`
4. [optional] Add the upstream repository to your list of remotes.
* From the command line: `git remote add upstream https://@gitlab.com:VickySteeves/Women-Leaders-Openness.git`
* From the command line: `git remote add upstream git@gitlab.com:VickyRampin/Women-Leaders-Openness.git`
5. Create a branch for your new feature.
* From the command line: `git checkout -b my-feature-branch-name`
6. Make your changes.
......@@ -156,4 +156,4 @@ That's it! Thanks for your contribution!
## Contact info
You are welcome to email me at [vicky dot steeves at nyu dot edu](mailto:vicky.steeves@nyu.edu) if you have questions or concerns, or raise an issue on this repository and I will do my best to respond quickly!
You are welcome to email me at [vicky.rampin@nyu.edu](mailto:vicky.rampin@nyu.edu) if you have questions or concerns, or raise an issue on this repository and I will do my best to respond quickly!
......@@ -28,7 +28,7 @@
<li class="active"><a href="#">About the DB</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="https://gitlab.com/VickySteeves/Women-Leaders-Openness">Source Code</a></li>
<li><a href="https://gitlab.com/VickyRampin/Women-Leaders-Openness">Source Code</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</nav><!-- End of Navbar -->
......@@ -50,7 +50,7 @@
<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">I went ahead and blogged about this and created an open list. Add names. You&#39;re welcome. <a href="https://t.co/qFTngfevlI">https://t.co/qFTngfevlI</a> <a href="https://t.co/h8yxcUFChB">https://t.co/h8yxcUFChB</a></p>&mdash; April H. (@AprilHathcock) <a href="https://twitter.com/AprilHathcock/status/877245771216809984">June 20, 2017</a></blockquote><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<p>I'm Vicky Steeves, I'm the Librarian for Research Data Management and Reproducibility at NYU (and I'm also April's mentee!!). I took April's google doc and made this website, transforming the doc into a searchable, sortable list and a map. The data here is licensed as <a href="http://creativecommons.org/publicdomain/mark/1.0/">CC0</a>, and the code is 100% open source and openly licensed. The code is available in a <a href="https://gitlab.com/VickySteeves/Women-Leaders-Openness">Gitlab repository</a> for anyone who would like to report a bug (as an <a href="https://gitlab.com/VickySteeves/Women-Leaders-Openness/issues">issue</a>, please!), make a merge request of any fixes, additions, or deletions, or to integrate into your database of speakers (<a href="https://gitlab.com/VickySteeves/Women-Leaders-Openness/blob/master/data/women-leaders-openness.csv">underlying data</a> is also in Gitlab).</p>
<p>I'm Vicky Rampin, I'm the Librarian for Research Data Management and Reproducibility at NYU (and I'm also April's mentee!!). I took April's google doc and made this website, transforming the doc into a searchable, sortable list and a map. The data here is licensed as <a href="http://creativecommons.org/publicdomain/mark/1.0/">CC0</a>, and the code is 100% open source and openly licensed. The code is available in a <a href="https://gitlab.com/VickyRampin/Women-Leaders-Openness">Gitlab repository</a> for anyone who would like to report a bug (as an <a href="https://gitlab.com/VickyRampin/Women-Leaders-Openness/issues">issue</a>, please!), make a merge request of any fixes, additions, or deletions, or to integrate into your database of speakers (<a href="https://gitlab.com/VickyRampin/Women-Leaders-Openness/blob/master/data/women-leaders-openness.csv">underlying data</a> is also in Gitlab).</p>
</div><!-- /.container -->
......@@ -85,4 +85,4 @@
<!-- End Matomo Code -->
</body>
</html>
\ No newline at end of file
</html>
......@@ -585,7 +585,7 @@ Vanessa Proudman,@SPARC_EU,SPARC Europe,40.7167415,-73.9930003
Verónica Pichardo,@masterpichardo,Universidad Autónoma del Estado de México,19.2849387,-99.6762522
Veronique Kiermer,,PLOS,57.4587077,41.5043994
Vicky Schneider,@MvickySchneider,The University of Melbourne,-37.7963689,144.9611738
Vicky Steeves,@VickySteeves,NYU,40.7295134,-73.9964609
Vicky Rampin,@VickyRampin,NYU,40.7295134,-73.9964609
Victoria Stodden,@victoriastodden,University of Illinois at Urbana-Champaign,40.1019523,-88.2271615
Vika Zafrin,@veek,Boston University,42.3504997,-71.1053991
Virgina Brusa,@virbrussa,Universidad Nacional de Rosario,-32.9502729,-60.636032
......
......@@ -28,7 +28,7 @@
<li><a href="about.html">About the DB</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="https://gitlab.com/VickySteeves/Women-Leaders-Openness">Source Code</a></li>
<li><a href="https://gitlab.com/VickyRampin/Women-Leaders-Openness">Source Code</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</nav><!-- End of Navbar -->
......@@ -100,4 +100,4 @@ $.when($.get(csv_path)).then(function(data) {
<!-- End Matomo Code -->
</body>
</html>
\ No newline at end of file
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment