Skip to content

Feature: add events page #365

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

Merged
merged 34 commits into from
Mar 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b2e17ff
display events (dummy data)
terichadbourne Jan 28, 2020
1d6692c
improved styling for event cards
terichadbourne Jan 30, 2020
8d70f4e
fix: some ui tweaks for the event cards
zebateira Jan 30, 2020
f38a34f
hide chapters page and update wording re event model
terichadbourne Jan 30, 2020
4b9e4a2
placeholders if no events in list
terichadbourne Jan 30, 2020
424b708
allow both group and co-location simultaneously
terichadbourne Jan 31, 2020
8639ce6
text edits
terichadbourne Feb 3, 2020
941be68
Merge branch 'code' into feat/events
terichadbourne Feb 3, 2020
ea0ebef
merge contributor changes from code branch
terichadbourne Feb 3, 2020
f30194f
feat: fetch events data from google spreadsheet
zebateira Jan 29, 2020
0caf748
Merge feat/events-data-fetch into feat/events
zebateira Feb 5, 2020
4d03679
Merge origin/code into feat/events
zebateira Feb 5, 2020
89831ff
chore: refactor event cards to use <Card /> component
zebateira Feb 6, 2020
cefb984
fix: some data model changes - approved and name
zebateira Feb 6, 2020
06c75cb
chore: add documentation for the build scripts
zebateira Feb 6, 2020
888487e
chore: update docs - should mention to save the env vars in travis
zebateira Feb 6, 2020
785aa14
clarify scripts readme
terichadbourne Feb 11, 2020
a107062
add'l wording tweaks to readmes
terichadbourne Feb 11, 2020
4e63797
refactor and allow display of redacted past events
terichadbourne Feb 12, 2020
07505c0
display up to 4 upcoming evnets on homepage
terichadbourne Feb 12, 2020
4f7723a
fix: lint issue
zebateira Feb 12, 2020
502ca54
remove option to show fewer past events
terichadbourne Feb 12, 2020
ec01f07
appease linter
terichadbourne Feb 12, 2020
fb53c59
feat: add table to logging on the build data script
zebateira Feb 13, 2020
c6b28a1
feat: whitelist properties to be saved on the events.json file
zebateira Feb 13, 2020
aee4648
Merge code into feat/events
zebateira Feb 14, 2020
ab0252b
typo fix and events update
terichadbourne Feb 27, 2020
0a651aa
Merge branch 'code' into feat/events
terichadbourne Mar 9, 2020
091e177
fix typo
terichadbourne Mar 9, 2020
d682c4e
add region and display CoC conditionally
terichadbourne Mar 9, 2020
d4e9115
only production events
terichadbourne Mar 9, 2020
9c4f4e5
update build logs
terichadbourne Mar 9, 2020
67d4ca7
update wording when no local events
terichadbourne Mar 9, 2020
60bef0d
fix(data): fix data parser to comply with latest changes.
zebateira Mar 10, 2020
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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cache:
install:
- npm ci
script:
- npm run scripts:build:data
- npm run build
- npm run cy:serve &
- npm run cy:run
Expand Down
19 changes: 10 additions & 9 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

Note that each ProtoSchool [chapter](https://proto.school/chapters) also maintains
its own Code of Conduct. Please visit your chapter's website or repository to view
additional policies that may apply to its events, website, and repos.
Note that each ProtoSchool event also maintains its own Code of Conduct, which is
linked from our [event listings](https://proto.school/#/events). Please refer to
the local event organizer's Code of Conduct for additional policies that may apply
to its events, website, and/or GitHub repos.

## Enforcement

Expand All @@ -69,12 +70,12 @@ 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.

Please note that each ProtoSchool [chapter](https://proto.school/chapters)
maintains its own Code of Conduct with additional guidance for local events and
chapter repositories. To report instances of abusive, harassing, or
otherwise unacceptable behavior that have occured within chapter events or repos,
please reach out to your local chapter leadership using the contact information
provided in their chapter CoC.
Please note that the organizers of each local ProtoSchool [event](https://proto.school/#/events)
maintain their own Code of Conduct with additional guidance for local events and
any related websites or repositories. To report instances of abusive, harassing, or
otherwise unacceptable behavior that have occured within local events or repos,
please reach out to your local leadership team using the contact information
provided in their CoC.

## Attribution

Expand Down
2 changes: 1 addition & 1 deletion DESIGNING_TUTORIALS.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Before you build your tutorial, you'll need to have reviewed this guide and open

### ProtoSchool's guiding principles

In our roadmap repo, we've documented the [guiding principles](https://github.com/protoschool/roadmap#guiding-principles) of the ProtoSchool project, which we apply to both our online tutorials and local chapter events. Here are some key highlights that apply directly to tutorial development:
In our roadmap repo, we've documented the [guiding principles](https://github.com/protoschool/roadmap#guiding-principles) of the ProtoSchool project, which we apply to both our online tutorials and local events. Here are some key highlights that apply directly to tutorial development:

- ProtoSchool’s self-paced online tutorials are **beginner-friendly**. (Advanced content is presented only when we have intermediate content in place to provide **scaffolding** that bridges the content gap.)
- ProtoSchool offers a **cohesive** and **consistently-formatted** set of tutorials for learning about the decentralized web. (It doesn’t serve as a catch-all for all formats of educational content.)
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# ProtoSchool

ProtoSchool is an educational community that teaches decentralized web protocols and tools
through online tutorials and local chapter events.
through online tutorials and local events.

This repository is for the main ProtoSchool website, hosted at https://proto.school, where you can
explore our self-guided interactive tutorials.

For information on local chapter organizing, please visit our [organizing repo](https://github.com/protoschool/organizing).
For information on hosting local events, please visit our [organizing repo](https://github.com/protoschool/organizing).

For the project roadmap, objectives, and archived meeting notes, please visit our [roadmap repo](https://github.com/protoschool/roadmap).

Expand Down Expand Up @@ -40,6 +40,10 @@ $ npm run serve

View the site on localhost at: http://localhost:3000/#/

## Managing remote data

Some data, such as the events list, is pulled at build-time from remote sources using Node.js scripts. Please check the documentation [here](scripts/README.md) for further details.

## License

ProtoSchool is licensed under the Apache-2.0 and MIT licenses. See [LICENSE.md](https://github.com/protoschool/protoschool.github.io/blob/master/LICENSE.md) for further detail.
Loading