large overhaul

1) Git history
2) Remote data feed working!
3) issues taxonomy setup

content/_index.md

@@ -17,4 +17,6 @@ weight: 3
 *Currently, [this project](/about) is in early phases of construction, help is needed to improve faster*! It's a great time to [get involved](/how/getting-started) The goal is to build a world-class resource for Canadians who are eager to help make Canada the **most free country in Cyberspace**. 
 
 Learn how to [get started!](/how/getting-started/)  
-Join the [matrix space](https://matrix.to/#/#canada:libresolutions.network)
+Join the [matrix space](https://matrix.to/#/#canada:libresolutions.network)
+
+{{<git-information>}}

content/about/_index.md

@@ -24,24 +24,6 @@ We support Canadian innovation and creativity and see restrictions on these as i
 
 ---
 
-## Topics
-
-
-### Censorship
-
-
-### Government & Corporate Surveillance
-
-
-### Artificial Intelligence & Machine Learning
-
-
-### Internet Access & Regulation
-
-### Freedom from Digital systems / Privacy Rights
-
----
-
 ### What is the Libre Solutions Network?
 
 The [Libre Solutions Network](https://libresolutions.network) is a passion project of [Gabriel's](/about/contributors/#gabriel)

content/bills/_BILL_FORMAT.md

@@ -1,10 +1,12 @@
 ---
 title: "Bill Format"
+issues: []
 draft: True
 ---
 
 ## Legislation
 
+|||||
 |---|---|---|---|
 |[Link to Bill]()|[Full Text]()|[Open Partliament]()|[Votes]()|
 

content/bills/c-11.md

@@ -2,6 +2,7 @@
 title: "C-11"
 description: "Online Streaming Act"
 link: "https://www.parl.ca/LegisInfo/en/bill/44-1/c-11/"
+issues: ['Censorship']
 ---
 
 

content/bills/c-18.md

@@ -7,17 +7,11 @@ description: "Online News Act"
 
 ## Legislation
 
-||||
+|||||
 |---|---|---|---|
-||[Link to Bill](https://www.parl.ca/LegisInfo/en/bill/44-1/c-18)|[Full Text](https://www.parl.ca/DocumentViewer/en/44-1/bill/C-18/)|[Open Partliament](https://openparliament.ca/bills/44-1/C-18/)|[Votes](https://www.ourcommons.ca/Members/en/votes/44/1/244)|
+|[Link to Bill](https://www.parl.ca/LegisInfo/en/bill/44-1/c-18)|[Full Text](https://www.parl.ca/DocumentViewer/en/44-1/bill/C-18/)|[Open Partliament](https://openparliament.ca/bills/44-1/C-18/)|[Votes](https://www.ourcommons.ca/Members/en/votes/44/1/244)|
 
 
-### Legislation
-[Link to Bill]()
-[Full text](royal-assent)
-[Open Parliament]()
-[Votes]()
-
 
 ### Coverage
 

content/bills/c-30.md

@@ -0,0 +1,8 @@
+---
+title: "C-30 (2012)"
+description: ""
+draft: true
+---
+
+### Coverage 
+[Canadians need proper debate about monitoring of phone and Internet](https://www.theglobeandmail.com/opinion/editorials/canadians-need-proper-debate-about-monitoring-of-phone-and-internet/article12445818/)

content/bills/c-51.md

@@ -0,0 +1,10 @@
+---
+title: "C-51"
+description: "Anti-terrorism Act, 2015"
+draft: true
+---
+
+{{<bill-information "https://www.parl.ca/LegisInfo/en/bill/41-2/c-51/json">}}
+
+### Coverage
+- [The Liberals promised to reform Bill C-51. What happened? ](https://openmedia.org/article/item/liberals-promised-reform-bill-c-51-what-happened)

content/bills/s-210.md

@@ -1,14 +1,13 @@
 ---
 title: "S-210"
 description: "An Act to restrict young persons' online access to sexually explicit material"
+issues: ['ID Verification','Censorship']
+session: "44-1"
 ---
 
 
 {{<bill-information "https://www.parl.ca/LegisInfo/en/bill/44-1/s-210/json">}}
 
-
-## Legislation
-
 ||||
 |---|---|---|
 |[Link to Bill](https://www.parl.ca/LegisInfo/en/bill/44-1/s-210)|[Full Text](https://www.parl.ca/documentviewer/en/44-1/bill/S-210/third-reading)|[Open Partliament](https://openparliament.ca/bills/44-1/S-210/)|

content/how/_index.md

@@ -1,5 +1,5 @@
 ---
 title: "Get involved"
-weight: 2
+weight: 4
 ---
 

content/how/getting-started.md

@@ -4,7 +4,7 @@ description: "Submit your changes today!"
 ---
 
 
-#  Getting Started
+# 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.
 
@@ -20,34 +20,26 @@ 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.  
-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.
+### Markdown 
 
+Markdown is a simple formatting style that allows for simple text to be made into websites and other formats easily. To make your changes you may want to [become familiar with markdown](https://www.markdownguide.org/basic-syntax/). 
 
+Video: [Markdown Crash Course](https://youtu.be/HUBNt18RFbo)
 
-You may also find it helpful to join the [Matrix Space](/how/community)
 
+### Source Files
 
-### Resources
+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.
 
-These are great links to help you research or compile information for making any change.
+Video: [Hugo in 100 Seconds](https://youtu.be/0RKpf3rK57I)
 
-#### Legislation
-- [LEGISinfo](https://www.parl.ca/legisinfo/)
-- [Open Parliament](https://openparliament.ca/)
+---
 
+### Matrix Space
 
-### Coverage
-- [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/)
+You may also find it helpful to join the [Matrix Space](/how/community)
 
 
 

content/how/resources.md

@@ -0,0 +1,23 @@
+---
+title: "Helpful Resources"
+description: ""
+---
+
+### Resources
+
+These are great links to help you research or compile information for making any change.
+
+#### Legislation
+- [LEGISinfo](https://www.parl.ca/legisinfo/)
+- [Open Parliament](https://openparliament.ca/)
+
+
+### Coverage
+- [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/)
+

content/how/translate.md

@@ -6,7 +6,7 @@ description: "Parlez vous francais?"
 
 ## Help translate this site.
 
-This site uses [hugo](https://gohugo.io) 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.  
+This site uses [hugo](https://gohugo.io) 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.
 
 

content/issues/censorship/_index.md

@@ -0,0 +1,5 @@
+---
+title: "Censorship"
+---
+
+Consensus through force.

content/issues/id-verification/_index.md

@@ -0,0 +1,6 @@
+---
+title: "ID-Verification"
+icon: "/icons/id-verification.webp"
+---
+
+Real-life identity online

hugo.toml

@@ -10,3 +10,6 @@ theme = "justice"
     languageName = 'Francais'
     contentDir = 'content-fr'
     title = "Cyber liberté Canada"
+[taxonomies]
+  issue = 'issues'
+  session = 'session'

layouts/shortcodes/bill-information.html

@@ -3,7 +3,7 @@
 {{ $bill := index $info 0}}
 
 {{if $bill.NumberCode }}
-<h2>{{$bill.NumberCode}}: {{$bill.ShortTitleEn}}</h2>
+<h2 style="text-align: center;">{{$bill.NumberCode}}: {{$bill.ShortTitleEn}}</h2>
 <div style="border: 1px solid var(--theme-accent);margin:1rem;padding:0.5rem;">
     <p>
         <strong>Status:</strong> {{$bill.StatusNameEn}} <br>as of {{$bill.LatestCompletedBillStageDateTime | time.Format "Jan 02 2006"}}

layouts/shortcodes/git-information.html

@@ -0,0 +1,17 @@
+<h3>Git History </h3>
+{{$url := "https://code.gabe.rocks/gabriel/cyberfreedom.rss"}}
+{{ with resources.GetRemote $url}}
+    {{with .Err}}
+    {{else}}
+        {{ $data := . | transform.Unmarshal }}
+        {{with $data.channel.item}}
+            {{range first 3 .}}
+                <p><a href="{{.link}}">{{.pubDate | time.Format "Jan 02 2006"}}</a> - {{.author}}
+                </p>
+            {{end}}
+        {{end}}
+    {{end}}
+{{else}}
+<p>No Data</p>
+{{end}}
+<p><a href="https://code.gabe.rocks/gabriel/cyberfreedom.rss">Feed</a></p>

upload.sh

@@ -1,5 +1,6 @@
 #! /bin/sh
 git pull
 git submodule update
+curl "https://code.gabe.rocks/gabriel/cyberfreedom.rss" > data/git-info.xml
 hugo
 rsync -avhzzP --delete public/ vps:/var/www/cyberfreedom.ca