Merge pull request 'remove search engine listing' (#27) from remove-sxngns into master

Reviewed-on: #27

.gitignore

@@ -1,4 +0,0 @@
-venv
-.vscode
-.env
-__pycache__

api/README.md

@@ -1,28 +0,0 @@
-# Api
-
-## Develop
-
-* Assumes you have `git clone`'d the repositiory.
-
-### Deps and Dev Env
-
-* Developed on `python 3.10.1`
-* Setting up a `venv`
-* ensure `django 4` is installed
-* `cd /api/`
-* `django startproject api`
-* Ensure deps are in order. `pip install -r requirements.txt`
-* `source .env` (called by `settings.py`)
-
-## Config
-
-Primaril refers to the envars and configs defined in `settings.py`.
-
-Such as:
-
-* added library declaration
-* Authentication middleware
-* Storage of static and media files
-* Access origin control
-* Logging
-* etc..

api/api/analytics/.gitignore

@@ -1 +0,0 @@
-__pychache__

api/api/analytics/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

api/api/analytics/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class AnalyticsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'analytics'

api/api/analytics/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

api/api/analytics/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

api/api/analytics/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

api/api/api/asgi.py

@@ -1,16 +0,0 @@
-"""
-ASGI config for api project.
-
-It exposes the ASGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/
-"""
-
-import os
-
-from django.core.asgi import get_asgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'api.settings')
-
-application = get_asgi_application()

api/api/api/settings.py

@@ -1,128 +0,0 @@
-"""
-Django settings for api project.
-
-Generated by 'django-admin startproject' using Django 4.0.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/4.0/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/4.0/ref/settings/
-"""
-
-from pathlib import Path
-
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure-ft@_y6#^c!ianhl7t&$l0-7_j80u1ba-icxszqru1u8q8g^9_*'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
-
-
-# Application definition
-
-INSTALLED_APPS = [
-    'rest_framework',
-    'analytics.apps.AnalyticsConfig',
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-]
-
-MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-]
-
-ROOT_URLCONF = 'api.urls'
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = 'api.wsgi.application'
-
-
-# Database
-# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
-
-
-# Add postgres for PROD and work with sqlite for devenv?
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
-    }
-}
-
-
-# Password validation
-# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/4.0/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'UTC'
-
-USE_I18N = True
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/4.0/howto/static-files/
-
-STATIC_URL = 'static/'
-
-# Default primary key field type
-# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
-
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

api/api/api/urls.py

@@ -1,23 +0,0 @@
-
-"""api URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/4.0/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  path('', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.urls import include, path
-    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
-"""
-from django.contrib import admin
-from django.urls import include, path
-
-urlpatterns = [
-    path('blogs/', include('blogs.urls')),
-    path('admin/', admin.site.urls),
-]

api/api/api/wsgi.py

@@ -1,16 +0,0 @@
-"""
-WSGI config for api project.
-
-It exposes the WSGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/
-"""
-
-import os
-
-from django.core.wsgi import get_wsgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'api.settings')
-
-application = get_wsgi_application()

api/api/blogs/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

api/api/blogs/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class BlogsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'blogs'

api/api/blogs/const.py

@@ -1,5 +0,0 @@
-
-# STATUS = (
-#     (0, "Draft"),
-#     (1, "Published")
-# )

api/api/blogs/models.py

@@ -1,18 +0,0 @@
-from django.db import models
-
-
-# move to `const.py`
-
-STATUS = (
-    (0,"Draft"),
-    (1,"Publish")
-)
-# Create your models here.
-
-class Post(models.Model):
-    title = models.CharField(max_length=200, unique=True)
-    author = models.ForeignKey('user.auth',on_delete=models.CASCADE)
-    updated_on =models.DateTimeField(auto_now= True)
-    created_on = models.DateTimeField(auto_now_add=True)
-    content = models.TextField()
-    status = models.IntegerChoices()

api/api/blogs/permissions.py

@@ -1,6 +0,0 @@
-from rest_framework import permissions
-
-class IsOwnerOrReadOnly(permissions.BasePermission):
-    """
-    Custom permission to only allow owners/authors of the object to edit it.
-    """

api/api/blogs/serializers.py

@@ -1,10 +0,0 @@
-from django.contrib.auth.models import User
-from .models import *
-
-from rest_framework import serializers
-
-class PostSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Post
-        # better to explicitly mention the fields
-        fields = '__all__'

api/api/blogs/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

api/api/blogs/urls.py

@@ -1,6 +0,0 @@
-from django.urls import path
-from . import views
-
-urlpatterns = [
-    path('', views.index, name='index')
-]

api/api/blogs/views.py

@@ -1,19 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-
-from rest_framework import permissions
-from rest_framework import viewsets
-
-from .models import *
-from .serializers import *
-
-
-# Create your views here.
-
-def index(request):
-    return HttpResponse("You're at the Blogs index")
-
-class PostViewSet(viewsets.ModelViewSet):
-    queryset = Post.objects.all()
-    serializer_class = PostSerializer
-    permission_classes = [permissions.IsAuthenticatedOrReadOnly]

api/api/manage.py

@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-"""Django's command-line utility for administrative tasks."""
-import os
-import sys
-
-
-def main():
-    """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'api.settings')
-    try:
-        from django.core.management import execute_from_command_line
-    except ImportError as exc:
-        raise ImportError(
-            "Couldn't import Django. Are you sure it's installed and "
-            "available on your PYTHONPATH environment variable? Did you "
-            "forget to activate a virtual environment?"
-        ) from exc
-    execute_from_command_line(sys.argv)
-
-
-if __name__ == '__main__':
-    main()

api/requirements.txt

@@ -1,5 +0,0 @@
-asgiref==3.4.1
-Django==4.0
-djangorestframework==3.13.1
-pytz==2021.3
-sqlparse==0.4.2

index.html

@@ -28,20 +28,7 @@ There is a focus on supporting <a href="https://en.wikipedia.org/wiki/Free_and_o
 
 You can also visit us over The Onion Routing protocol at <a href="http://qzzf2qcfbhievvs5nzkccuwddroipy62qjocqtmgcgh75vd6w57m7yad.onion">our onion address.</a>
 
-Donts:
+<a href="/rules.html">Rules</a>
-======
-
-    -Repeated harassment of any network user.
-    -Distribution of child pornography.
-    -Dealing of goods and using the network as a space for commericial operations.
-    -Any denial of service against the network or its users.
-    -Use of our network resources or services for malicious intent.
-    -Connecting to the network for any reason using a compromised machine, including as a proxy or loading trojans or bots.
-    -Unwanted advertisement of websites, IRC network, or channels (also known as spamming).
-    -Evading bans, either those placed by network staff or by individual channels.
-    -Impersonation of network staff or services.
-    -Connecting through open proxies.
-    -Any other behavior deemed inappropriate by network staff.
 
 
 Services (Clearnet):
@@ -50,12 +37,8 @@ Services (Clearnet):
 Communications:
 --------------
 
-<a href="/irc.html">IRC</a> | <a href="/xmpp.html">XMPP</a> | <a href="/matrix.html">Matrix</a> | <a href="https://meet.lysergic.dev">Jitsi Video Conferencing </a>
+<a href="/irc.html">IRC</a> | <a href="/xmpp.html">XMPP</a>
 
-Search Engines:
---------------
-
-<a href="https://searx.xkek.net">SearX</a> | <a href="https://yacy.xkek.net">YaCy</a>
 
 Others:
 ------
@@ -71,11 +54,6 @@ Communications:
 
 <a href="/irc.html">IRC</a>
 
-Search Engines:
---------------
-
-<a href="http://searx.bsbvtqi5oq2cqzn32zt4cr2f2z2rwots3dq7gmdcnlyqoxko2wx6reqd.onion/">SearX</a> | <a href="http://yacy.bsbvtqi5oq2cqzn32zt4cr2f2z2rwots3dq7gmdcnlyqoxko2wx6reqd.onion/">YaCy</a>
-
 
 Services (I2P):
 ==============
@@ -88,7 +66,7 @@ Communications:
 
 Contribute:
 ==========
-Check our <a href="git.html">/git</a> info page or head directly to the <a href="https://git.casa/">main repository.</a>
+Check out the <a href="git.html">/git</a> info page or head directly to the <a href="https://git.casa/">main repository.</a>
 
 
 

irc.html

@@ -23,7 +23,7 @@
 
 <a href="/register">Registration</a>
 
-<a href="/kiwi">KiwiIRC Webchat</a> | <a href="/gamja">Gamja Webchat</a> | <a href="/convos">Convos Webchat/Bouncer</a>
+<a href="/kiwi">KiwiIRC Webchat</a> | <a href="/gamja">Gamja Webchat</a>
 
 
 Connection Details:
@@ -48,14 +48,6 @@ you can access the network via
 
 Webchat via Tor is available through the links on the top - KiwiIRC will offer the best experience.
 
-2. I2P
-
-  Guide to setting up i2p <a href="/i2p.html">here</a>
-
-  Use the samle configuration shown above.
-  Destination: fzsgc66e52ve5phrcktrekqtko423ihau42u72v4cfg6bg4osuda.b32.i2p
-  Port:        6668
-  SSL/TLS:     False
 
 Account registration FAQ
 ========================
@@ -73,7 +65,7 @@ Once you register your nick it becomes your account name. It is the name with wh
 
 2. How do I authenticate to my nickname?
 
-You should enable SASL in your client. 
+You should enable SASL in your client.
 
 
  - If your client doesn't support SASL, then update to a good client!

rules.html

@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+<meta charset="UTF-8">
+  <link rel="stylesheet" href="styles.css">
+<title>LibertaCasa - Rules</title>
+</head>
+
+<body>
+<pre>
+┬   ┌┬┐ ┬─┐ ┬─┐ ┬─┐ ┌┐┐ ┬─┐
+│    │  │─│ │─  │┬┘  │  │─┤
+┘─┘ └┴┘ │─┘ ┴─┘ │└┘  ┘  ┘ │
+
+┌─┐ ┬─┐ ┐─┐ ┬─┐
+│   │─┤ └─┐ │─┤
+└─┘ ┘ │ ──┘ ┘ │
+</pre>
+<h3>Rules</h3>
+<pre>
+
+Donts:
+========
+
+  -Repeated harassment of any network user.
+  -Distribution of child pornography.
+  -Dealing of goods and using the network as a space for commericial operations.
+  -Any denial of service against the network or its users.
+  -Use of our network resources or services for malicious intent.
+  -Connecting to the network for any reason using a compromised machine, including as a proxy or loading trojans or bots.
+  -Unwanted advertisement of websites, IRC network, or channels (also known as spamming).
+  -Evading bans, either those placed by network staff or by individual channels.
+  -Impersonation of network staff or services.
+  -Connecting through open proxies.
+  -Any other behavior deemed inappropriate by network staff.
+
+
+
+
+
+
+
+
+
+
+
+<footer>
+  <a href="mailto:hello@liberta.casa"> Contact </a>
+</footer>
+</pre>
+</body>
+</html>

static/matrix.html

@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-<meta charset="UTF-8">
-  <link rel="stylesheet" href="styles.css">
-<title>LibertaCasa</title>
-</head>
-
-<body>
-<pre>
-┬   ┌┬┐ ┬─┐ ┬─┐ ┬─┐ ┌┐┐ ┬─┐
-│    │  │─│ │─  │┬┘  │  │─┤
-┘─┘ └┴┘ │─┘ ┴─┘ │└┘  ┘  ┘ │
-
-┌─┐ ┬─┐ ┐─┐ ┬─┐
-│   │─┤ └─┐ │─┤
-└─┘ ┘ │ ──┘ ┘ │
-</pre>
-<h3>Matrix</h3>
-<pre>
-<a href="https://matrix.org/">What's Matrix (official Website)</a>
-
-Connection Details:
-===================
-
-The only fully featured Matrix client is Element. Our instance is available at <a href="https://element.liberta.casa/">https://element.liberta.casa</a>.
-
-After having created an account in Element, it is possible to connect other Matrix clients using the Homeserver address <code>matrix.liberta.casa</code>.
-
-
-
-
-
-
-
-
-
-
-
-<footer>
-  <a href="mailto:hello@liberta.casa"> Contact </a>
-</footer>
-</pre>
-</body>
-</html>