start activism

.gitattributes

@@ -1,12 +0,0 @@
-*.gif filter=lfs diff=lfs merge=lfs -text
-*.svg filter=lfs diff=lfs merge=lfs -text
-*.webp filter=lfs diff=lfs merge=lfs -text
-*.mp4 filter=lfs diff=lfs merge=lfs -text
-*.webm filter=lfs diff=lfs merge=lfs -text
-*.ogg filter=lfs diff=lfs merge=lfs -text
-*.wav filter=lfs diff=lfs merge=lfs -text
-*.jpg filter=lfs diff=lfs merge=lfs -text
-*.jpeg filter=lfs diff=lfs merge=lfs -text
-*.png filter=lfs diff=lfs merge=lfs -text
-*.mp3 filter=lfs diff=lfs merge=lfs -text
-*.flac filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1,28 +1,32 @@
+########### OTHER
+ktor/src/main/resources/static/
+
+########### ASTRO
+
 # build output
-build/
+astro/dist/
-hosted
 # generated types
-.astro/
+astro/.astro/
 
 # dependencies
-node_modules/
+astro/node_modules/
 
 # logs
-npm-debug.log*
+astro/npm-debug.log*
-yarn-debug.log*
+astro/yarn-debug.log*
-yarn-error.log*
+astro/yarn-error.log*
-pnpm-debug.log*
+astro/pnpm-debug.log*
 
 
 # environment variables
-.env
+astro/.env
-.env.production
+astro/.env.production
 
 # macOS-specific files
-.DS_Store
+astro/.DS_Store
 
 # jetbrains setting folder
-.idea/
+astro/.idea/
 
 
 ########## KTOR
@@ -69,4 +73,3 @@ ktor/.vscode/
 
 ### Mac OS ###
 ktor/.DS_Store
-node_modules

.idea/cat-activity.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CatActivitySettingProjectState">
-    <option name="firstInit" value="false" />
-  </component>
-</project>

.idea/gradle.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$/backend" />
-        <option name="gradleJvm" value="#JAVA_HOME" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$/backend" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/kotlinc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.10" />
-  </component>
-</project>

.idea/ktlint-plugin.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="com.nbadal.ktlint.KtlintProjectSettings">
-    <ktlintMode>DISTRACT_FREE</ktlintMode>
-    <ktlintRulesetVersion>DEFAULT</ktlintRulesetVersion>
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/nelle-observer.iml" filepath="$PROJECT_DIR$/.idea/nelle-observer.iml" />
-    </modules>
-  </component>
-</project>

.idea/nelle-observer.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.idea/workspace.xml

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="760a9925-82ec-41ef-a2fc-c93cffe26f10" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ExternalProjectsData">
-    <projectState path="$PROJECT_DIR$/backend">
-      <ProjectState />
-    </projectState>
-  </component>
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <projects_view>
-          <tree_state>
-            <expand>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="nelleObserverBackend" type="f1a62948:ProjectNode" />
-              </path>
-            </expand>
-            <select />
-          </tree_state>
-        </projects_view>
-      </state>
-    </system>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Kotlin Object" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 5
-}</component>
-  <component name="ProjectId" id="2sZF3crhJT4ZU9STz3WZ0BExxTG" />
-  <component name="ProjectLevelVcsManager">
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Gradle.Build backend.executor&quot;: &quot;Run&quot;,
-    &quot;Ktor.ApplicationKt.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/mnt/samsung-drive/Projects/Websites/nelle-observer/backend/src/main/resources&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;prettierjs.PrettierConfiguration.Package&quot;: &quot;/mnt/samsung-drive/Projects/Websites/nelle-observer/frontend/node_modules/prettier&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.ktlint-plugin&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/home/nelle/.local/share/JetBrains/Toolbox/apps/intellij-idea-ultimate/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
-  }
-}</component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/backend/src/main/resources" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="ApplicationKt" type="KtorApplicationConfigurationType" factoryName="Ktor" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="observer.nelle.nelleObserverBackend.ApplicationKt" />
-      <module name="nelleObserverBackend.main" />
-      <option name="alternativeJrePath" />
-      <option name="alternativeJrePathEnabled" value="false" />
-      <option name="includeProvidedScope" value="false" />
-      <option name="mainClass" value="observer.nelle.nelleObserverBackend.ApplicationKt" />
-      <option name="passParentEnvs" value="true" />
-      <option name="programParameters" />
-      <option name="shortenCommandLine" />
-      <option name="vmParameters" />
-      <option name="workingDirectory" value="$PROJECT_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-  </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-jdk-9823dce3aa75-125ca727e0f0-intellij.indexing.shared.core-IU-243.23654.189" />
-        <option value="bundled-js-predefined-d6986cc7102b-822845ee3bb5-JavaScript-IU-243.23654.189" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="760a9925-82ec-41ef-a2fc-c93cffe26f10" name="Changes" comment="" />
-      <created>1738654991789</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1738654991789</updated>
-      <workItem from="1738654993149" duration="4466000" />
-      <workItem from="1738661811047" duration="5000" />
-      <workItem from="1738665807773" duration="649000" />
-      <workItem from="1738699182798" duration="84000" />
-      <workItem from="1738699273828" duration="8000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="XSLT-Support.FileAssociations.UIState">
-    <expand />
-    <select />
-  </component>
-</project>

README.md

@@ -2,15 +2,22 @@
 
 the source for [nelle.observer](https://nelle.observer)
 
+## quick repo links
+
+[kanban](https://git.nullafati.xyz/limepotato/nelle-observer/projects/1)
+
 ## build/use
 
-There are two code-bases here, astro for the frontend and ktor in the backend.
+There are two code-bases here, Astro for the SSG and ktor for ??, ktor requires you to have built astro already
-why are you building my site ?
 
-### 1. install these
+### Astro
+1. `cd astro/`
+2. `pnpm i`
+3. `pnpm run build`
 
-- bun (or pnpm ig)
+### ktor
-- NodeJS
+1. `cd ktor`
-- JDK 21
+2. `./gradlew`
+3. TODO: FINISH THIS
 
-### 2. run `build.sh`
+## ~~[license](./)~~ TODO

astro/.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+  "recommendations": [
+    "astro-build.astro-vscode",
+        "abusaidm.html-snippets",
+        "ecmel.vscode-html-css",
+        "mblode.pretty-formatter",
+        "formulahendry.auto-close-tag"],
+  "unwantedRecommendations": []
+}

astro/.vscode/launch.json

@@ -2,7 +2,7 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "command": "./node_modules/.bin/astro dev --host",
+      "command": "./node_modules/.bin/astro dev",
       "name": "Development server",
       "request": "launch",
       "type": "node-terminal"

astro/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "kanban"
+    ]
+}

astro/astro.config.mjs

@@ -1,13 +1,15 @@
 import { defineConfig } from "astro/config";
-
 import compressor from "astro-compressor";
+
 import mdx from "@astrojs/mdx";
-import sitemap from "@astrojs/sitemap";
 
 // https://astro.build/config
 export default defineConfig({
   site: "https://nelle.observer",
-  outDir: "./build",
+  outDir: '../ktor/src/main/resources/static/',
-  integrations: [mdx(), compressor(), sitemap()],
+  integrations: [
+    mdx(),
+    compressor(),
+  ],
 });
 // min and compressor always last!

astro/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "nelle.observer",
+  "type": "module",
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "astro dev",
+    "start": "astro dev",
+    "build": "astro check && astro build",
+    "preview": "astro preview",
+    "astro": "astro"
+  },
+  "dependencies": {
+    "@astrojs/check": "^0.9.1",
+    "@astrojs/mdx": "^3.1.3",
+    "@astrojs/rss": "^4.0.7",
+    "astro": "^4.13.1",
+    "astro-compressor": "^0.4.1",
+    "astro-font": "^0.0.81"
+  },
+  "packageManager": "pnpm@9.4.0+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a"
+}

astro/public/assets/images/badges/made-with-astro.svg

@@ -0,0 +1,40 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" enable-background="new 0 0 1200 220" viewBox="0 0 1200 220" width="109">
+  <filter id="star-blur"><feGaussianBlur stdDeviation="3"/></filter>
+  <linearGradient id="a" x1="0" x2="0" y1="0" y2="250%" gradientUnits="userSpaceOnUse">
+    <stop offset="0" stop-color="rgb(15 23 42)"/>
+    <stop offset="1" stop-color="#602199"/>
+  </linearGradient>
+  <path fill="url(#a)" d="M1167 220H33c-18 0-33-15-33-33V33C0 15 15 0 33 0h1134c18 0 33 15 33 33v154c0 18-15 33-33 33z"/>
+  <g fill="#ff9" filter="url(#star-blur)" opacity="0.3">
+    <circle cx="1100" cy="40" r="9"/>
+    <circle cx="92" cy="30" r="4"/>
+    <circle cx="380" cy="110" r="4"/>
+    <circle cx="135" cy="210" r="2"/>
+    <circle cx="540" cy="135" r="2"/>
+    <circle cx="860" cy="95" r="4"/>
+    <circle cx="415" cy="200" r="6"/>
+    <circle cx="1005" cy="5" r="6"/>
+    <circle cx="1095" cy="95" r="4"/>
+    <circle cx="570" cy="10" r="8"/>
+    <circle cx="15" cy="70" r="8"/>
+    <circle cx="695" cy="175" r="8"/>
+    <circle cx="1165" cy="70" r="6"/>
+    <circle cx="340" cy="160" r="8"/>
+  </g>
+  <g stroke="#f0abfc" stroke-width="8" opacity="0.3" transform="rotate(0) scale(0.475)" transform-origin="center">
+    <line x1="-100%" x2="200%" y1="-100%" y2="-100%"/>
+    <line x1="-100%" x2="200%" y1="0%" y2="0%"/>
+    <line x1="-100%" x2="200%" y1="100%" y2="100%"/>
+    <line x1="-100%" x2="200%" y1="200%" y2="200%"/>
+    <line x1="-50%" x2="-50%" y1="-150%" y2="250%"/>
+    <line x1="-25%" x2="-25%" y1="-150%" y2="250%"/>
+    <line x1="0%" x2="0%" y1="-150%" y2="250%"/>
+    <line x1="25%" x2="25%" y1="-150%" y2="250%"/>
+    <line x1="50%" x2="50%" y1="-150%" y2="250%"/>
+    <line x1="75%" x2="75%" y1="-150%" y2="250%"/>
+    <line x1="100%" x2="100%" y1="-150%" y2="250%"/>
+    <line x1="125%" x2="125%" y1="-150%" y2="250%"/>
+    <line x1="150%" x2="150%" y1="-150%" y2="250%"/>
+  </g>
+  <path stroke="#FFF" transform="translate(0 3)" stroke-width="3" fill="#FFF" d="M135 104v1s20 2 20 23c0 18-13 27-36 27H78V58h40c20 0 31 9 31 26 0 16-14 20-14 20zm-17-3c13 0 22-5 22-17s-8-17-22-17H87v34h31zm-31 9v37h32c17 0 27-6 27-19 0-12-8-18-27-18H87zm98 14c0 18 11 24 24 24 16 1 24-10 24-25V87h9v68h-9v-11h-1s-6 12-25 12c-17 0-31-9-31-31V87h9v37zm84-67c4 0 6 2 6 5s-2 5-6 5-6-2-6-5 3-5 6-5zm5 98h-9V87h8v68zm32 0h-9V58h9v97zm27-60h-12v-8h12V72h8v15h26v8h-26v35c0 14 7 19 16 19 8 0 13-4 13-4v8s-5 4-14 4c-13 0-23-8-23-26V95zm131 1h-1l-19 59h-11l-21-68h9l17 60h1l19-60h11l20 60 17-60h9l-20 68h-12l-19-59zm71-39c3 0 5 2 5 5s-2 5-5 5c-4 1-6-2-6-5s2-5 6-5zm4 98h-9V87h9v68zm27-60h-12v-8h12V72h8v15h27v8h-26v35c0 14 6 19 15 19s13-4 13-4v8s-5 4-13 4c-14 0-24-8-24-26V95zm111 24c0-18-11-25-24-25-16 0-24 11-24 25v36h-8V58h8v40h1s6-12 25-12c17 0 31 9 31 31v38h-9v-36zm159 36h-23l-7-17h-46l-7 17h-23l39-97h28l39 97zm-52-75h-2l-15 41h32l-15-41zm106 27c0-3 0-8-13-8-10 0-13 3-13 7 0 11 50-2 50 29 0 15-14 22-36 22s-36-7-36-24v-2h20v2c0 7 5 9 16 9s16-3 16-7c0-14-51 1-51-29 0-14 13-21 34-21s34 7 34 22h-21zm40-5h-10V91l19-19h11v14h22v16h-22v24c0 12 6 14 14 14 6 0 10-2 10-2v16s-5 3-13 3c-20 0-31-9-31-28v-27zm111-17v22s-4-2-12-2c-13 0-20 9-20 20v30h-20V86h20v13h1s6-14 24-14h7zm49 0c23 0 39 13 39 36s-16 36-39 36-40-13-40-36 17-36 40-36zm0 17c-12 0-19 8-19 19 0 10 7 18 19 18s19-8 19-18c0-11-7-19-19-19z"/>
+</svg>