add more stuff

content/_index.md

@@ -4,7 +4,7 @@ weight: 3
 ---
 
 
-Learn how to [get started](/how/getting-started/)
+Learn how to [get started!](/how/getting-started/)
 
 ### Resources
 
@@ -21,11 +21,10 @@ Learn how to [get started](/how/getting-started/)
 - ✅ 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
-- ✅ Setup Github push
-- Setup Github pull
-- Test Github submission
 

content/about/_index.md

@@ -4,7 +4,7 @@ weight: 10
 ---
 
 Whatever this site **is**, it is bound to change as others get involved and participate. The following is merely the initial vision initiated by [Gabriel](/about/contributors/#gabriel).  
-As of now, Cyber Freedom Canada is a website for individuals to voice their disapproval of Canadian legislation that harms their digital autonomy.
+As of now, Cyber Freedom Canada is a website for individuals to track and understand Canadian legislation that harms their digital autonomy. This site is generated from source files at Gabriel's [code forge](https://code.gabe.rocks/gabriel/cyberfreedom)
 
 # Vision
 
@@ -22,16 +22,25 @@ We support Canadian innovation and creativity and see restrictions on these as i
 2. Critique Canadian Bills that impose censorship, surveillance, or otherwise put governments and corporations in a position of power over the digital lives of Canadians.
 3. (*Eventually*) Draft alternative proposals to harmful legislation and regulation that protect the fundamental rights of Canadians.
 
+---
 
-### Topics
+## Topics
-
-#### Artificial Intelligence and Machine Learning
 
 
-#### Surveillance
+### Censorship
 
 
-#### 
+### Government & Corporate Surveillance
+
+
+### Artificial Intelligence & Machine Learning
+
+
+### Internet Access & Regulation
+
+### Freedom from Digital systems / Privacy Rights
+
+---
 
 ### What is the Libre Solutions Network?
 

content/about/contributors.md

@@ -1,5 +1,6 @@
 ---
 title: "Contributors"
+weight: 5
 ---
 
 ## Gabriel 

content/about/rules.md

@@ -0,0 +1,14 @@
+---
+title: "Rules"
+weight: 1 
+---
+
+# Rules
+
+Canadian Cyber Freedom is intended as a resource to help Canadians maximize their digital autonomy. Contributions that aren't in alignment with this goal may be refused, changed, or even reversed. This resource is to help constituents understand how bills and legislators impact their digital autonomy, not for other purposes. This is not a political discussion forum, comments about bills or legislators unrelated to digital privacy, autonomy, and rights will not be accepted. This site explicitly advocates in favor of privacy and digital empowerment of Canadians, and explicitly against censorship and surveillance both private and public. As such, those across the political spectrum deserve to be recognized, regardless of their stance(s) on other issues.
+
+
+By submitting a change you agree that your changes are your work and your work alone, once your changes are accepted they will be licensed as [CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0) as Cyber Freedom Canada. In the future, credit for individual commits will be listed in the [contributors](../contributors) section. Use of automated chat bots to create material is highly discouraged. Those who repeatedly submit changes that aren't their own original work will be ignored and/or removed from the project.
+
+
+Cyberfreedom.ca is not required to accept any particular change, and profanity and inflammatory rhetoric is explicitly unwelcome. This resource is intended for all who reside in Canada regardless of their background, social status, or any other incidental attribute. These rules are likely to be updated as the project grows. 

content/about/why-git.md

@@ -0,0 +1,20 @@
+---
+title: "Why Git?"
+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.
+
+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.
+
+## 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

content/bills/_BILL_FORMAT.md

@@ -0,0 +1,15 @@
+---
+title: "Bill Format"
+draft: True
+---
+
+# Bill
+
+Link to bill: 
+
+## Description
+
+## Coverage
+
+## Criticism
+

content/bills/c-11.md

@@ -3,3 +3,9 @@ title: "C-11"
 ---
 
 # C-11
+
+[Link to Bill](https://www.parl.ca/LegisInfo/en/bill/44-1/c-11)   
+[Full text](https://www.parl.ca/DocumentViewer/en/44-1/bill/C-11/royal-assent)
+
+## Description
+

content/bills/c-18.md

@@ -0,0 +1,5 @@
+---
+title: "C-18"
+---
+
+# C-18

content/bills/c-27.md

@@ -0,0 +1,5 @@
+---
+title: "C-27"
+---
+
+# C-27

content/how/getting-started.md

@@ -2,7 +2,59 @@
 title: "Getting Started"
 ---
 
-# How to get setup to make changes
+
+#  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.
+
+## Concepts
+
+### Git
+
+[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)
+
+### Source Files
+
+Files that are put into a process that creates some product.  
+In this case, the source filed are used with [hugo](https://gohugo.io/) to generate this website.  
+Programmers use source code to compile programs, and the possibilities are endless.
+
+
+## Cloning the Repository
+
+The source files for this site live in [this repository](https://code.gabe.rocks/gabriel/cyberfreedom).
+
+You can clone the repository using the following command:
+
+```bash
+git clone https://code.gabe.rocks/gabriel/cyberfreedom.git
+```
+
+This will place the source files into a folder.
+
+Or you can download a .zip of the files at: https://code.gabe.rocks/gabriel/cyberfreedom/archive/main.zip
+
+### Github
+
+1. Create or Sign in to your account with Github
+2. [Import](https://github.com/new/import) the repository with this clone URL: `https://code.gabe.rocks/gabriel/cyberfreedom.git` and give it a name of your choosing.
+3. Hit "Begin Import"
+
+
+## Making Changes
+
+The beauty of git is that you can use simple tools! If you prefer a simple text editor like notepad, or want to use a code-editor with built-in git features it's entirely up to you!
+
+### Staying up to date
+
+Ensure you run `git pull` once in a while to make sure you have the latest changes.
+
+## Using Git
+
+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 
 
@@ -13,3 +65,7 @@ title: "Getting Started"
     - Github
     - Gitlab
     - Directly
+
+## Getting your changes on the Site
+
+

content/how/translate.md

@@ -2,6 +2,11 @@
 title: "Translation"
 ---
 
+
 Help translate this site.
 
-This site uses Hugo and its [multilingual support.](https://gohugo.io/content-management/multilingual/). Meaning that each page has its own **.md** file for english, and **.fr.md** file for french. It would be a huge help if someone with strong bilingual skills would be willing to keep changes in sync.
+This site uses Hugo and its [multilingual support.](https://gohugo.io/content-management/multilingual/). Meaning that each page has its own **.md** file for english, and **.fr.md** file for french.  
+It would be a huge help if someone with strong bilingual skills would be willing to keep changes in sync.
+
+
+See [Getting Started](../getting-started)

content/how/update-proposal.md

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

hugo.toml

@@ -1,5 +1,5 @@
 baseURL = 'https://cyberfreedom.ca'
-title = 'Cyber Freedom Canada'
+title = 'Canadian Cyber Freedom'
 theme = "justice"
 [languages]
   [languages.en]
@@ -9,4 +9,4 @@ theme = "justice"
     languageCode = 'fr-ca'
     languageName = 'Francais'
     contentDir = 'content-fr'
-    title = "Cyberliberté Canada"
+    title = "Cyber liberté Canada"

layouts/partials/footer.html

@@ -1,5 +1,8 @@
-<footer>
+<footer style="justify-content: center; padding:5px;">
-    <p>Canadian Cyber Freedom © 2024 is licensed under <a href="http://creativecommons.org/licenses/by-sa/4.0">CC-BY-SA 4.0</a> - Theme by Gabriel - Cyberfreedom.ca is a <a href="https://libresolutions.network">Libre Solutions Network</a> Project<br> This
+    <p style="margin:15px;">Canadian Cyber Freedom © 2024 is licensed under <a href="http://creativecommons.org/licenses/by-sa/4.0">CC-BY-SA 4.0</a>
-        resource is for educational purposes primarily intended for constituents, nothing on this site constitutes legal advice, nor is suitable for regulatory compliance.
+    </p>
+    <a style="margin-left:5rem;margin-right:5rem;" href="https://libresolutions.network"><strong>Libre Solutions Network</strong></a>
+    <p style="margin:15px;">
+        This site is a resource for educational purposes for constituents.<br> Nothing on this site constitutes legal advice, nor is suitable for regulatory compliance.
     </p>
 </footer>

layouts/partials/header.html

@@ -2,11 +2,18 @@
     <a href='{{if eq "fr" .Language.Lang }}/{{.Language.Lang}}{{end}}/'><img src="/logo.webp" style="max-height:5rem;"></a>
     <h1>{{.Site.Title}}</h1>
     <nav>
-        {{ partial "language-picker" .}}
+        <a href='{{if eq "fr" .Language.Lang }}/{{.Language.Lang}}{{end}}/'>
-    </nav>
+            {{if eq "fr" .Language.Lang}}
-    <nav>{{ range .Site.Sections.ByWeight}}
+            <h2>Acceuil</h2>
+            {{else}}
+            <h2>Home</h2>
+            {{end}}
+        </a> {{ range .Site.Sections.ByWeight}}
         <a href="{{.Permalink}}">
             <h2>{{.Title}}</h2>
         </a> {{end}}
     </nav>
+    <nav>
+        {{ partial "language-picker" .}}
+    </nav>
 </header>

layouts/shortcodes/test.html

@@ -0,0 +1 @@
+<p>Ayy lmao</p>

themes/justice

@@ -1 +1 @@
-Subproject commit f2f27979215b9406d8a04f39214b5f844b80e312
+Subproject commit fd7a7c3829a36ff209855c316242f7458a963c49