reciproka/reciproka-web
1
0
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

Merge branch 'reciproka-migration' into consensus

Browse source 
resolves #3
This commit is contained in:
Fiscal Velvet Poet 2024-01-10 01:52:12 +10:00
parent ada25c081f 191efc3a47
commit 158693611c
Signed by: fiscalvelvetpoet
GPG key ID: D8EBFD58B023BD47
16 changed files with 51 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LICENSE
View file

@ -1,7 +1,7 @@
ANARCHIST LICENSE
Version 1.0, 1 May, 2021
Copyright © 2023 JFDI Collective
Copyright © 2024 Reciproka Kolektivo
This is Anarchist software, released for free use by individuals and
organizations that do not operate by capitalist principles.

10
README.rst
View file

@ -1,10 +1,10 @@
JFDIC Web
=========
Reciproka Web
=============
Website configuration for the `JFDI Collective`_.
Website configuration for the `Reciproka Kolektivo`_.
The canonical home for this repo is
https://source.jfdic.org/jfdic/jfdic-web
https://reciproka.dev/reciproka/reciproka-web
.. _NixOps: https://nixos.org/nixops
.. _JFDI Collective: https://jfdic.org/
.. _Reciproka Kolektivo: https://reciproka.co/

2
css/jfdic.css → css/reciproka.css
View file

@ -1,5 +1,5 @@
/*
* JFDIC theme
* Reciproka Kolektivo theme
*/
/*

6
default.nix
View file

@ -5,10 +5,10 @@ let
pkgs.haskellPackages
else
pkgs.haskell.packages.${compiler};
jfdic-org = haskellPackages.callPackage ./jfdic-web.nix { };
reciproka-co = haskellPackages.callPackage ./reciproka-web.nix { };
in nixpkgs.stdenv.mkDerivation {
name = "jfdic-org-website";
buildInputs = [ jfdic-org ];
name = "reciproka-co-website";
buildInputs = [ reciproka-co ];
src = ./.;
buildPhase = ''
echo "Setting LC_ALL to C.UTF-8 to avoid invalid byte sequence."

0
images/jfdic-logo.png → images/reciproka-logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

2
index.rst
View file

@ -1,5 +1,5 @@
---
title: JFDI Collective
title: Reciproka Kolektivo
---
Welcome. We just do things.

2
pages/Contact.rst
View file

@ -2,4 +2,4 @@
title: Contact
---
You can contact the JFDI collective via our Matrix room.
You can contact Reciproka Kolektivo via our Matrix room.

22
posts/2021-11-03-welcome-to-reciproka-kolektivo.rst Normal file
View file

@ -0,0 +1,22 @@
---
title: Welcome to Reciproka Kolektivo
author: la kolektivo
tags:
---
Reciproka Kolektivo is a non-hierarchical non-profit venture aimed at
delivering net access to anarchists, indigenous, greens, gays, feminists,
activists and other interested persons or groups.
Established with visions of freedom, independence and privacy in mind, the
Reciproka Kolektivo acknowledges that issues of privacy, access and equity to
technology are crucial for those who feel they need and want to connect with
the world.
A strong individual or group presence on the net can be used as an effective
means of communication, debate and solidarity. The Reciproka Kolektivo aims to
encourage all who wish to learn and develop skills in information technology
and new media and to understand their processes.
Our hosting services are ramping up and we look forward to offering a complete
suit of privacy respecting services for you fairly soon :-)

21
posts/2021-11-03-welcome-to-the-jfdi-collective.rst
View file

@ -1,21 +0,0 @@
---
title: Welcome to the JFDI Collective
author: the collective
tags: jfdi
---
JFDIC is a non-hierarchical non-profit venture aimed at delivering net access to
anarchists, indigenous, greens, gays, feminists, activists and other interested
persons or groups.
Established with visions of freedom, independence and privacy in mind, the JFDIC
acknowledges that issues of privacy, access and equity to technology are crucial
for those who feel they need and want to connect with the world.
A strong individual or group presence on the net can be used as an effective
means of communication, debate and solidarity. The JFDIC aims to encourage all
who wish to learn and develop skills in information technology and new media and
to understand their processes.
Our hosting services are ramping up and we look forward to offering a complete
suit of privacy respecting services for you fairly soon :-)

2
jfdic-web.cabal → reciproka-web.cabal
View file

@ -1,4 +1,4 @@
name: jfdic-web
name: reciproka-web
version: 0.1.0.0
build-type: Simple
cabal-version: >= 1.10

2
jfdic-web.nix → reciproka-web.nix
View file

@ -1,6 +1,6 @@
{ mkDerivation, base, hakyll, stdenv }:
mkDerivation {
pname = "jfdic-web";
pname = "reciproka-web";
version = "0.1.0.0";
src = ./.;
isLibrary = false;

4
release.nix
View file

@ -12,13 +12,13 @@ let
(flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ])
];
jfdic-web = hpNew.callCabal2nix "jfdic-web" ./. { };
reciproka-web = hpNew.callCabal2nix "reciproka-web" ./. { };
niv = import sources.niv { };
};
};
project = haskellPackages.jfdic-web;
project = haskellPackages.reciproka-web;
in {
project = project;

20
site.hs
View file

@ -118,11 +118,11 @@ postsPageId n = fromFilePath $ if (n == 1) then "index.html" else show n ++ "/in
feedConfig :: FeedConfiguration
feedConfig = FeedConfiguration
{ feedTitle = "JFDI Collective"
{ feedTitle = "Reciproka Kolektivo"
, feedDescription = "liberation, autonomy, privacy"
, feedAuthorName = "JFDI Collective"
, feedAuthorEmail = "collective@jfdic.org"
, feedRoot = "https://jfdic.org"
, feedAuthorName = "Reciproka Kolektivo"
, feedAuthorEmail = "collective@reciproka.co"
, feedRoot = "https://reciproka.co"
}
--------------------------------------------------------------------------------
@ -130,16 +130,16 @@ feedConfig = FeedConfiguration
siteCtx :: Context String
siteCtx =
baseCtx `mappend`
constField "site_description" "JFDI Collective" `mappend`
constField "site-url" "https://jfdic.org" `mappend`
constField "site_description" "Reciproka Kolektivo" `mappend`
constField "site-url" "https://reciproka.co" `mappend`
constField "tagline" "liberation, autonomy, privacy" `mappend`
constField "site-title" "JFDI Collective" `mappend`
constField "copy-year" "2023" `mappend`
constField "github-repo" "https://source.jfdic.org/jfdic/jfdic-web" `mappend`
constField "site-title" "Reciproka Kolektivo" `mappend`
constField "copy-year" "2024" `mappend`
constField "github-repo" "https://reciproka.dev/reciproka/reciproka-web" `mappend`
defaultContext
baseCtx =
constField "baseurl" "https://jfdic.org"
constField "baseurl" "https://reciproka.co"
--------------------------------------------------------------------------------

2
templates/default.html
View file

@ -13,7 +13,7 @@
<div class="masthead">
<div class="container">
<h3 class="masthead-title">
<img src="$baseurl$/images/jfdic-logo.png" class=logo style="display: inline;"/>
<img src="$baseurl$/images/reciproka-logo.png" class=logo style="display: inline;"/>
<a href="$baseurl$" title="Home">$site-title$</a>
<small>$tagline$</small>
</h3>

2
templates/head.html
View file

@ -22,7 +22,7 @@
<link rel="stylesheet" href="$baseurl$/css/base.css">
<link rel="stylesheet" href="$baseurl$/css/syntax.css">
<link rel="stylesheet" href="$baseurl$/css/jfdic.css">
<link rel="stylesheet" href="$baseurl$/css/reciproka.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
<!---

2
templates/sidebar.html
View file

@ -30,7 +30,7 @@
&copy; $copy-year$. All rights reserved.
</p>
<p>
<img src="$baseurl$/images/jfdic-logo.png" class=logo style="display: inline;"/>
<img src="$baseurl$/images/reciproka-logo.png" class=logo style="display: inline;"/>
Site created with
<a href="https://jaspervdj.be/hakyll">Hakyll</a>.
</p>