Merge pull request 'dev' (#2) from dev into main

Reviewed-on: #2

.env

@@ -1,5 +1,4 @@
 obsidian_vault=/home/venus/Documents/Personal-Wiki
-obsidian_vault_url=git.riverrooks.dev/Personal-Wiki
-OBSIDIAN_VAULT_URL=git.riverrooks.dev/Personal-Wiki
+obsidian_vault_url=https://git.riverrooks.dev/Personal-Wiki
 obsidian_vault_token=bd8cd9301ae2c1c5bacfb3340492acb5e862686a
 

.gitignore

@@ -1,2 +1 @@
 app/__pychache__
-public-vault

Dockerfile

@@ -1,26 +1,13 @@
 FROM python:3.14-slim
 
-#install git
-RUN apt-get update && apt-get install -y \
-    git \
-    && rm -rf /var/lib/apt/lists/*
-#install dependencies
+ARG DEBUG_MODE=0
+ENV FLASK_DEBUG=$DEBUG_MODE
+ENV FLASK_APP=app
+
 RUN mkdir /app
 COPY app/requirements.txt /app
 RUN pip3 install -r /app/requirements.txt
 
-#parse from .env file
-ARG DEBUG_MODE=0
-ARG obsidian_vault=/home/venus/Documents/Personal-Wiki
-ARG OBSIDIAN_VAULT_URL=git.riverrooks.dev/venus/Personal-Wiki
-ARG obsidian_vault_token=bd8cd9301ae2c1c5bacfb3340492acb5e862686a
-
-ENV FLASK_DEBUG=$DEBUG_MODE
-ENV FLASK_APP=app
-# ENV OBSIDIAN_VAULT=$obsidian_vault
-ENV OBSIDIAN_VAULT_URL=$OBSIDIAN_VAULT_URL
-ENV OBSIDIAN_VAULT_TOKEN=$obsidian_vault_token
-
 COPY app /app
 
 ENTRYPOINT ["flask"]

app/__init__.py

@@ -2,25 +2,22 @@ from flask import Flask
 from app import build
 from pathlib import Path
 import markdown
-import os
-from dotenv import load_dotenv
 
 app = Flask(__name__)
 
-PRIVATE_VAULT_DIR = Path("/vault")
-PUBLIC_VAULT_DIR = "/content"
-
-build.obsidian_vault(PRIVATE_VAULT_DIR) # initialize the private obsidian repo
-build.public_vault(PRIVATE_VAULT_DIR, PUBLIC_VAULT_DIR) # initialize the public notes from the private repo
+CONTENT_DIR = Path("/content")
 
 @app.route("/")
 def index():
+    # Write your markdown content
     md_content = "# Welcome to my blog!\nThis is rendered from **Markdown**.\n##[test](http://localhost/test)"
+    # Convert it to HTML
     html_content = markdown.markdown(md_content)
     return html_content
-@app.route("/api/push") #webhook for vault updated
-def
 
-@app.route ("/<filename>") # renders a filename if not otherwise specified
+@app.route ("/<filename>")
 def render_post(filename):
-    return build.html_file(filename, PUBLIC_VAULT_DIR)
+    return build.render_file(filename, CONTENT_DIR)
+    # return "test"
+
+    # return rm(filename)

app/build.py

@@ -2,11 +2,10 @@ from obsidian_parser import Vault
 import shutil
 import markdown
 from pathlib import Path
-import os
 
 
-def html_file(filename, contentPath): #renders markwown from filename 
-    filePath = Path(f"{contentPath}/{filename}.md")
+def render_file(filename: str, contentPath: Path): #renders markwown from filename 
+    filePath = contentPath / f"{filename}.md"
     # 3. Protect against missing files
     if not filePath.is_file():
         return f"<h1>404</h1><p>Could not find {filename}.md in {filePath}</p>", 404
@@ -17,45 +16,24 @@ def html_file(filename, contentPath): #renders markwown from filename
     htmlContent = markdown.markdown(textContent)
     return htmlContent
 
+print("build imported")
+# def clone_gittea_repo(url: str, token: str = "", dest: str): # clone a gittea repo using optional security token into dest dirand return a path to the directory
+    # return dest
 
-def obsidian_vault(dest = "/vault"): # makes sure there is a vault in dest
-    from git import Repo
-    url = os.getenv("OBSIDIAN_VAULT_URL")
-    token = os.getenv("OBSIDIAN_VAULT_TOKEN")
-    if not(token):
-        print ("token not found, cant build vault")
-        raise NameError("tokenNotFound")
-        return 0
+# def public_notes(src: str): # return a list of notes tagged with public from an obsidian directory
+#     # build vault from source
+#     vault = Vault(src)
+#     if vault:
+#         print ("found vault")
+#     else:
+#         print("could not find vault")
+#         return []
 
-    url = f"https://{token}@{url}"
+#     # return a list ofnotes
+#     return vault.get_notes_with_tag("public")
 
-    if os.path.exists(os.path.join(dest, '.git')):
-        #TODO handle merge conflictsjjj
-        print (f"pulling vault from {url} in {dest}")
-        repo = Repo(dest)
-        origin = repo.remotes.origin
-        origin.fetch()
-        origin.pull(strategy_option='theirs')
-        print ("vault updated")
-        return 1
 
-    print (f"building vault from {url} in {dest}")
-    Repo.clone_from(url, dest)
-    print("cloned vault!")
-    return 1
-
-def public_vault(privateVault = "/vault", dest = "/content"): # build the public vault in dest from an obsidian repo in src
-    vault = Vault(privateVault)
-    if not(vault):
-        print("could not find vault")
-        raise NameError("vaultNotFound")
-        return 0
-
-    print(f"valid vault{vault}")
-    
-    publicNotes = vault.get_notes_with_tag("public")
-
-    print(f"publicNotes: {publicNotes}")
-    for note in publicNotes:
-        print(note.title)
-        shutil.copy2(f"{note.path}", dest)
+# def buld_public_vault(src: str, dest: str): # build the public vault in dest from an obsidian repo in src
+#     for note in public_notes(src):
+#         print(note.title)
+#         shutil.copy2(f"{note.path}", dest)

app/requirements.txt

@@ -2,4 +2,4 @@ flask
 markdown
 obsidianmd-parser
 GitPython
-python-dotenv
+py-gitea

compose.yml

@@ -3,11 +3,12 @@ services:
     build: 
       args:
         - DEBUG_MODE=1
-        - obsidian_vault_url=https://git.riverrooks.dev/Personal-Wiki
-        - obsidian_vault_token=bd8cd9301ae2c1c5bacfb3340492acb5e862686a
-
     ports:
       - '80:80'
     volumes:
-      - ./content:/content #public
-      - ./public-vault:/vault #private
+      - ./content:/content
+  # public_vault_builder:
+  #   build:
+  #     context: public_vault_builder
+  #   volumes: 
+  #     - ./public_vault:/content

content/Cyber-Crime.md

@@ -1,75 +0,0 @@
-#public 
-- **Cyber Crime**: Use computer/digital device to further illegal ends
-> "nothings black and white in what we do, everything's got some gray"
-## Types of crime
- - **Crimes Against People**: A digital crime where the victim is a person
- - **Crimes Against Property**: A digital crime that damages, or illegally interacts with property
- - **Crimes Against Government**: A digital crime to  undermine the efficacy of a government
-> Life is not Black and White, Consider what the greatest impact is
-
-| Crime             | category  |
-| ---               | ---       |
-| Harrassement      | People    |
-| Stalking          | People    |
-| Credit Card fraud | People    |
-| Id theft          | People    |
-| DOS attack        | Property  |
-| Hacking           | Property  |
-| Vandalism         | Property  |
-| Cyber Warfare     | Government|
-| Cyber Terrorism   | Government|
-
- > Online Harassment is a growing field, stalking, bullying, doxing, etc.
-
->  Modern wars be started with infrastructure hacks, Power grid hacks of Ukraine, Iran, Etc.
-
-### Cyber-stalking and bullying
- - **Cyber Bulling**: People attacking reputation and self esteem of other people trough online means like social media campaigns.
- - **Cyber Stalking**: Stalking someone through their online footprint. Often to find information with which to exploit the victim.
-> Typically older person stalking a younger person. As opposed to bullying, which is usually across the same age
-### Cyber Terrorism
- - **Cyber Terrorism**: Politically motivated attacks on major infrastructure Money can be a factor, but usually the political is the primary motivation
-    - Instill fear in a society to elicit some reaction
-    - financial/reputation gain
-    - revenge 
-    - etc.
-
-## Examples
-Stux-Net
-Nation-state attacks on power grids before Wars
-
-- **Sneaker Net**: Moving information across barriers physicality
-> proving an attack is one of the hardest questions to answer
-# U.S. National cyber strategy
- - **U.S. National cyber strategy**: anually updated policy document from the white house detailing the national cyber objectives
-
-> it has been similar last few years
-
- - promote American people
- - promoting American prosperity
- - preserve peace through strength
-	- deterrent
- - advanced American cyber influence
-	- strong alliances
-	- promote international policies
- - Shaping adversary behavior
- - regulatory environment
- - Federal government security
- - criticial infrastructure security
- - cyber skills workforce gap
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

content/Website Tutorial.md

@@ -1,82 +0,0 @@
----
-tags:
-  - public
-  - notes
-  - tutorial
-  - code
-  - project
-  - blog
----
-# So you need a website
-## Overview
-1.  How do websites work
-2. 3 things that you need
-3. What are your options
-	1. Premium
-	2. Custom
-	3. DIY
-		1. Registering a domain
-			1. What is DNS
-			2. Picking a domain
-			3. setting up a registrar
-		2. Building a frontend
-			1. Chat GPT
-			2. DeepSite
-			3. DIY options
-			4. UX and frontend resources
-		3. Setting up GH pages
-			1. GH account
-			2. Set up New Repo
-			3. Importing Code
-			4. Setting the DNS
-## how do websites work
-There are 3 main elements of the internet: your computer, the website's code, and the path between the two. 
-You can download [this page]() and open it in your computer. Notice how your browser's address doesn't say "Https://%url%" but instead shows a file location on your own machine. 
-The internet is the same phenomenon, but between multiple computers. URL, (the technical name for a link, or website address) simply stands for Universal Resource Locator and is just a way of telling your computer how to access a file on someone else's computer.*
-There are lots of complicated standards for how computers actually talk to each other. The most relevant here is DNS, which stands for Domain Name System. It is how we assign internet-connected computers (called servers) with human readable names. There are special DNS servers which are responsible for telling your computer where in the world a specific website is stored.
-A URL, a frontend, and server to host it are all that you need to create a website. I will explain how to simply and affordably (or even for free) set up each of these elements.  
-
- *url's can end in [.pdf](example), [.jpg](example), or other file extensions. Just like files on your computer.* 
-## What do you need
-### A URL
-Simply a link that is going to point to your website. You can buy one from a domain registrar and configure it in just a few minutes.
-### A Website file to display
-This is what people will see when they visit your website.
-### A computer to display it on
-There are myriad ways to accomplish this from renting a server from someone, to putting on in your house, to taking advantage of already free web hosting tools. I'm going to show you how to use GitHub's* free hosting service
-
-*GitHub is owned by Microsoft and is the largest code distribution and hosting service. Most companies and developers rely on it's services daily.* 
-
-## Getting A Domain
-The process of registering a domain takes only a few minutes, and a couple of steps.
-
-There are a number of websites that control who has access to websites, and which servers they point to. They are all basically the same. I've picked out [namecheap](https://namecheap.com) for this tutorial.
-
-To register a domain just head over to their site, find a domain that you want, and purchase it. Watch out for these:
-1. First year prices are often discounted. Watch for a renewal rate.
-2. Save your password somewhere. You will hopefully have this website for a long time, and you may have someone else manage it for you eventually.
-3. Marketable domains are often short and easy to spell. Imagine verbally telling someone how to visit the website.
-
-Make sure to verify your email and save your login information, as we will be needing to log back in shortly.
-
-### Building a frontend
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

content/test.md

@@ -1,11 +1,3 @@
----
-public: "true"
-tags:
-  - public
----
 # This is a test
 and this is p
-[https://localhost/test]()
-[asd](https://localhost/test)
-
-
+*italics*