minor overhaul

main
Gabriel 6 months ago
parent 2f8de3e8eb
commit 90f9c855ac

@ -11,3 +11,11 @@ A beehive is our friendly term for a git repository that organizes valuable info
Canadian Cyber Freedom is licensed under [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/?ref=chooser-v1)
Canadian Cyber Freedom is a [Libre Solutions Network](https://libresolutions.network/) project.
### To Do:
- Update Shortcodes
- Document making changes
- Improve list template
- Create git demo videos
- Get & Teach one or two volunteers

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 11 KiB

@ -1,30 +1,20 @@
---
title: 'Canadian Cyber Freedom'
description: "A collaborative information resource for Canadian constituents"
weight: 3
---
## Are You?
Learn how to [get started!](/how/getting-started/)
- Sick of digital surveillance and censorship in Canada?
- Concerned about the erasure of privacy rights in the face of corporate control, and artificial intelligence?
- Want elected officials to start representing Canadians digital rights, instead of special interests and public-private-partnerships?
- Motivated to help build a world-class resource for canadians to inform their communities, candidates, and officials?
- Not sure where to start?
### Resources
### You've come to the right place!
- [LEGISinfo](https://www.parl.ca/legisinfo/)
- [Justice Centre for Constitutional Freedoms](https://www.jccf.ca/)
- [Michael Geist](https://www.michaelgeist.ca/)
- [CCLA](https://ccla.org/our-work/privacy/)
- [Reclaim the Net](https://reclaimthenet.org/)
- [The Citizen Lab](https://citizenlab.ca/)
- [Electronic Frontier Foundation](https://eff.org)
- [Open Media](https://openmedia.org/)
### To Do:
- ✅ Properly setup repository
- ✅ Test Webhook once more with feeling
- ✅ Separate theme
- ✅ Test Git push
- ✅ Test Git pull
- Write how-tos
- Create demo videos
- Update shortcodes & partials
- RSS Feeds
*Currently, this project is in early phases of construction, help is needed to improve faster*.
Learn how to [get started!](/how/getting-started/)
Join the [matrix space](https://matrix.to/#/#canada:libresolutions.network)

@ -5,16 +5,31 @@ weight: 10
# Why Git?
## Decentralization
While Gabriel controls the **cyberfreedom.ca** domain name, anyone is able to fork the project for their own needs and/or publish their own changes. Licensed under [Creative Commons Attribution-ShareAlike 4.0 International](http://creativecommons.org/licenses/by-sa/4.0), only attribution is needed.
If this model proves successful, it's not difficult for a foreign project leader to fork the project for a different country's needs, reducing repetitive work. The very reason this project exists is because Gabriel believes that this skill would be a game-changer for citizen engagement if people learned to pool effort and resources in this kind of model.
## Benefits
### Anti-Fragile Information Sharing
With copies of the site being distributed among contributors there really isn't a single-point of failure. Ideally, this means that the project can live on even if this particular attempt fails. In addition to this, changes can be submitted anonymously with as much or as little about the author recorded as desired.
If this model proves successful, it's not difficult for a foreign project leader to fork the project for a different country's needs, reducing repetitive work.
### Highly Scalable
The more people who get involved, the more can get done quickly. This method of collaboration can easily outpace legislation it's aimed at opposing.
## Source Control
### Optimal Trust
You may want the ability for people to contribute without necessarily trusting them with keys to the kingdom. Using git allows you to pull changes from anyone without having to give them control over your project.
Once you do want to trust collaborators to help you manage the project, its as simple as creating an account on your forge for them, and setting up permissions to the repository.
### Source Control
It's nice to be able to track changes or even reverse mistakes. Git is built for managing changes which makes it the perfect tool for collaboration. Contributions also allow for attribution on a
## Division of Labor
### Division of Labor
Git allows for people with specialized skills to focus specifically on the improvements they want to make. After being setup to use git, people no longer need to learn new systems or use different tools to do what they're familiar with.

@ -0,0 +1,20 @@
---
title: "Join the Community"
description: "Get invovled in Canadian Cyber Freedom"
---
{{<image src="/images/join-matrix.png" href="https://matrix.to/#/#canada:libresolutions.network">}}
In the spirit of embracing decentralized alternatives, the Canadian Cyber Freedom community provides a [Matrix Space](https://matrix.to/#/#canada:libresolutions.network) for the purposes of contributing to the site, making suggestions, or asking for help. Just be aware that the [rules](/about/rules/) apply to the space as well as the project itself.
## What is Matrix?
Matrix is a federated chat protocol.
To join the space, you'll need to either [join a server](https://servers.joinmatrix.org/) or [host your own!](https://matrix.org/ecosystem/servers/)
### Videos:
- [Introduction to Element (with Matrix)](https://youtu.be/YjLb3e8x7hs)
- [What Is Matrix: Why You Should Be Using It](https://youtu.be/6rM2elV8pGY)
- [Secure collaboration](https://youtu.be/nM8OLQF0plQ)

@ -1,5 +1,6 @@
---
title: "Getting Started"
description: "Submit your changes today!"
---
@ -7,6 +8,9 @@ title: "Getting Started"
If you're interested in making changes please see the [rules](/about/rules/) and ensure they are in alignment with what you hope to share.
### Need Help?
The best way to get in touch is to join the [Matrix Space](/how/community)
## Concepts
### Git
@ -14,6 +18,8 @@ If you're interested in making changes please see the [rules](/about/rules/) and
[Git](https://git-scm.com/) is a distributed version control system that allows for tracking and managing changes to text files.
To understand why git is necessary take a look at: [Why git?](/about/why-git)
Video: [Git Explained in 100 Seconds](https://youtu.be/hwP7WQkmECE)
### Source Files
Files that are put into a process that creates some product.
@ -21,6 +27,25 @@ In this case, the source filed are used with [hugo](https://gohugo.io/) to gener
Programmers use source code to compile programs, and the possibilities are endless.
You may also find it helpful to join the [Matrix Space](/how/community)
### Resources
These are great links to help you research or compile information for making any change.
- [LEGISinfo](https://www.parl.ca/legisinfo/)
- [Justice Centre for Constitutional Freedoms](https://www.jccf.ca/)
- [Michael Geist](https://www.michaelgeist.ca/)
- [CCLA](https://ccla.org/our-work/privacy/)
- [Reclaim the Net](https://reclaimthenet.org/)
- [The Citizen Lab](https://citizenlab.ca/)
- [Electronic Frontier Foundation](https://eff.org)
- [Open Media](https://openmedia.org/)
## Cloning the Repository
The source files for this site live in [this repository](https://code.gabe.rocks/gabriel/cyberfreedom).
@ -50,20 +75,28 @@ Ensure you run `git pull` once in a while to make sure you have the latest chang
## Using Git
*Before you start tracking your changes make sure you've configured contributions in your name.
Be sure to [configure](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) your username and email correctly before submitting changes.*
After you've made some changes, you'll want to keep track of them. A set of changes is called a **commit**. To create a commit you'll use your git tools, or using the terminal write `git commit -m ` with a short message after a space. Some tools will automatically track files and stage the changes for you, if you're creating a new fille you'll want to make sure it's added to the commit with `git add ` and then the filename both of these commands require a space before you add your message or file.
## Publishing Your Changes
1. Fork the Repository
Once you've made changes you'd like to see made, you'll want to publish them so that they can be **pulled**. You can use a git hosting provider like Github, Codeberg, or Gitlab, or even [host your own](https://forgejo.org/).
The Github repository is [here](https://code.gabe.rocks/gabriel/cyberfreedom)
2. Make your Changes
3. Publish your changes
The magic of using git is that this particular step is optional, you also have the ability to send the changes directly.
- Github
- Gitlab
- Directly
*More instructions on both of these steps is to follow*
## Getting your changes on the Site
Once you've prepared your changes, you'll have to inform Gabriel of where they are or send them directly. Once your changes are accepted, you'll be informed when they are live.
## How to Get in Touch with Gabriel
|||
|---|---|
|Matrix|@gabriel:libresolutions.network|
|email|gabriel@libresolutions.network|
|xmpp|[gabeg@member.fsf.org](xmpp:gabeg@member.fsf.org?omemo-sid-697415616=bd413120099646998a6aaf36152c72ae2a731fce3123750f2a9832291f5cb95d&omemo-sid-1610051618=5d377dbee263616e103eec6ebaed62e2edb4e30abdbdb9cc7790415e75df2816)|

@ -1,5 +1,6 @@
---
title: "Translation"
description: "Parlez vous francais?"
---

@ -1,5 +1,6 @@
---
title: "Update a Bill"
draft: true
---
# How do I update a bill?

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Loading…
Cancel
Save