diff --git a/content/_index.md b/content/_index.md index 35f6aae..f6e22a0 100644 --- a/content/_index.md +++ b/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) \ No newline at end of file +Join the [matrix space](https://matrix.to/#/#canada:libresolutions.network) + +{{}} \ No newline at end of file diff --git a/content/about/_index.md b/content/about/_index.md index 2dd2358..fdddb09 100644 --- a/content/about/_index.md +++ b/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) diff --git a/content/bills/_BILL_FORMAT.md b/content/bills/_BILL_FORMAT.md index 402c678..3683632 100644 --- a/content/bills/_BILL_FORMAT.md +++ b/content/bills/_BILL_FORMAT.md @@ -1,10 +1,12 @@ --- title: "Bill Format" +issues: [] draft: True --- ## Legislation +||||| |---|---|---|---| |[Link to Bill]()|[Full Text]()|[Open Partliament]()|[Votes]()| diff --git a/content/bills/c-11.md b/content/bills/c-11.md index caf6379..576493f 100644 --- a/content/bills/c-11.md +++ b/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'] --- diff --git a/content/bills/c-18.md b/content/bills/c-18.md index 05e825e..67fe8a9 100644 --- a/content/bills/c-18.md +++ b/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 diff --git a/content/bills/c-30.md b/content/bills/c-30.md new file mode 100644 index 0000000..9c6a18e --- /dev/null +++ b/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/) \ No newline at end of file diff --git a/content/bills/c-51.md b/content/bills/c-51.md new file mode 100644 index 0000000..b4e2972 --- /dev/null +++ b/content/bills/c-51.md @@ -0,0 +1,10 @@ +--- +title: "C-51" +description: "Anti-terrorism Act, 2015" +draft: true +--- + +{{}} + +### Coverage +- [The Liberals promised to reform Bill C-51. What happened? ](https://openmedia.org/article/item/liberals-promised-reform-bill-c-51-what-happened) \ No newline at end of file diff --git a/content/bills/s-210.md b/content/bills/s-210.md index 15f3a8a..55b0d59 100644 --- a/content/bills/s-210.md +++ b/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" --- {{}} - -## 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/)| diff --git a/content/how/_index.md b/content/how/_index.md index 387804d..1d51ed5 100644 --- a/content/how/_index.md +++ b/content/how/_index.md @@ -1,5 +1,5 @@ --- title: "Get involved" -weight: 2 +weight: 4 --- diff --git a/content/how/getting-started.md b/content/how/getting-started.md index 60b0cb0..adb6e60 100644 --- a/content/how/getting-started.md +++ b/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,36 +20,28 @@ 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) +### 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) + + ### 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. +Video: [Hugo in 100 Seconds](https://youtu.be/0RKpf3rK57I) +--- + +### Matrix Space 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. - -#### 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/) - - ## Cloning the Repository diff --git a/content/how/resources.md b/content/how/resources.md new file mode 100644 index 0000000..0dfc51f --- /dev/null +++ b/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/) + diff --git a/content/how/translate.md b/content/how/translate.md index 40e94d8..fd136ed 100644 --- a/content/how/translate.md +++ b/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. diff --git a/content/issues/censorship/_index.md b/content/issues/censorship/_index.md new file mode 100644 index 0000000..3c79700 --- /dev/null +++ b/content/issues/censorship/_index.md @@ -0,0 +1,5 @@ +--- +title: "Censorship" +--- + +Consensus through force. \ No newline at end of file diff --git a/content/issues/id-verification/_index.md b/content/issues/id-verification/_index.md new file mode 100644 index 0000000..79f3a58 --- /dev/null +++ b/content/issues/id-verification/_index.md @@ -0,0 +1,6 @@ +--- +title: "ID-Verification" +icon: "/icons/id-verification.webp" +--- + +Real-life identity online \ No newline at end of file diff --git a/hugo.toml b/hugo.toml index e6c731a..b17980c 100644 --- a/hugo.toml +++ b/hugo.toml @@ -10,3 +10,6 @@ theme = "justice" languageName = 'Francais' contentDir = 'content-fr' title = "Cyber liberté Canada" +[taxonomies] + issue = 'issues' + session = 'session' \ No newline at end of file diff --git a/layouts/shortcodes/bill-information.html b/layouts/shortcodes/bill-information.html index 7f430b7..2579122 100644 --- a/layouts/shortcodes/bill-information.html +++ b/layouts/shortcodes/bill-information.html @@ -3,7 +3,7 @@ {{ $bill := index $info 0}} {{if $bill.NumberCode }} -

{{$bill.NumberCode}}: {{$bill.ShortTitleEn}}

+

{{$bill.NumberCode}}: {{$bill.ShortTitleEn}}

Status: {{$bill.StatusNameEn}}
as of {{$bill.LatestCompletedBillStageDateTime | time.Format "Jan 02 2006"}} diff --git a/layouts/shortcodes/git-information.html b/layouts/shortcodes/git-information.html new file mode 100644 index 0000000..7ab56e9 --- /dev/null +++ b/layouts/shortcodes/git-information.html @@ -0,0 +1,17 @@ +

Git History

+{{$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 .}} +

{{.pubDate | time.Format "Jan 02 2006"}} - {{.author}} +

+ {{end}} + {{end}} + {{end}} +{{else}} +

No Data

+{{end}} +

Feed

\ No newline at end of file diff --git a/static/icons/id-verification.webp b/static/icons/id-verification.webp new file mode 100644 index 0000000..3f84449 Binary files /dev/null and b/static/icons/id-verification.webp differ diff --git a/upload.sh b/upload.sh index 48d18e7..062d461 100755 --- a/upload.sh +++ b/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 \ No newline at end of file