refactor AGAIN ahhahahaha
This commit is contained in:
parent
30d51e4cf6
commit
150d329086
210 changed files with 243 additions and 12 deletions
19
README.md
19
README.md
|
@ -8,16 +8,15 @@ the source for [nelle.observer](https://nelle.observer)
|
|||
|
||||
## build/use
|
||||
|
||||
There are two code-bases here, Astro for the SSG and ktor for ??, ktor requires you to have built astro already
|
||||
There are two code-bases here, astro for the frontend and ktor in the backend.
|
||||
why are you building my site ?
|
||||
|
||||
### Astro
|
||||
1. `cd astro/`
|
||||
2. `pnpm i`
|
||||
3. `pnpm run build`
|
||||
### Prereqs
|
||||
|
||||
### ktor
|
||||
1. `cd ktor`
|
||||
2. `./gradlew`
|
||||
3. TODO: FINISH THIS
|
||||
- pnpm
|
||||
- NodeJS
|
||||
- JDK 21
|
||||
|
||||
## ~~[license](./)~~ TODO
|
||||
### run `build.sh`
|
||||
|
||||
## [license](./LICENSE.md)
|
||||
|
|
3
backend/.idea/.gitignore
vendored
Normal file
3
backend/.idea/.gitignore
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
1
backend/.idea/.name
Normal file
1
backend/.idea/.name
Normal file
|
@ -0,0 +1 @@
|
|||
nelleObserverBackend
|
8
backend/.idea/cat-activity.xml
Normal file
8
backend/.idea/cat-activity.xml
Normal file
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CatActivitySettingProjectState">
|
||||
<option name="details" value="File" />
|
||||
<option name="enabled" value="true" />
|
||||
<option name="firstInit" value="false" />
|
||||
</component>
|
||||
</project>
|
17
backend/.idea/gradle.xml
Normal file
17
backend/.idea/gradle.xml
Normal file
|
@ -0,0 +1,17 @@
|
|||
<?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$" />
|
||||
<option name="gradleHome" value="/usr/share/java/gradle" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
</set>
|
||||
</option>
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
6
backend/.idea/kotlinc.xml
Normal file
6
backend/.idea/kotlinc.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="KotlinJpsPluginSettings">
|
||||
<option name="version" value="2.0.10" />
|
||||
</component>
|
||||
</project>
|
6
backend/.idea/ktfmt.xml
Normal file
6
backend/.idea/ktfmt.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="KtfmtSettings">
|
||||
<option name="enableKtfmt" value="Enabled" />
|
||||
</component>
|
||||
</project>
|
6
backend/.idea/ktlint-plugin.xml
Normal file
6
backend/.idea/ktlint-plugin.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="KtLint plugin">
|
||||
<ktlintMode>DISTRACT_FREE</ktlintMode>
|
||||
</component>
|
||||
</project>
|
18
backend/.idea/misc.xml
Normal file
18
backend/.idea/misc.xml
Normal file
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DiscordProjectSettings">
|
||||
<option name="show" value="ASK" />
|
||||
<option name="description" value="" />
|
||||
<option name="applicationTheme" value="default" />
|
||||
<option name="iconsTheme" value="default" />
|
||||
<option name="button1Title" value="" />
|
||||
<option name="button1Url" value="" />
|
||||
<option name="button2Title" value="" />
|
||||
<option name="button2Url" value="" />
|
||||
<option name="customApplicationId" value="" />
|
||||
</component>
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
124
backend/.idea/uiDesigner.xml
Normal file
124
backend/.idea/uiDesigner.xml
Normal file
|
@ -0,0 +1,124 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Palette2">
|
||||
<group name="Swing">
|
||||
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||
</item>
|
||||
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||
</item>
|
||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||
</item>
|
||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
|
||||
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||
</item>
|
||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||
<initial-values>
|
||||
<property name="text" value="Button" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||
<initial-values>
|
||||
<property name="text" value="RadioButton" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||
<initial-values>
|
||||
<property name="text" value="CheckBox" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||
<initial-values>
|
||||
<property name="text" value="Label" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||
<preferred-size width="150" height="-1" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||
<preferred-size width="150" height="-1" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||
<preferred-size width="150" height="-1" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||
<preferred-size width="200" height="200" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||
<preferred-size width="200" height="200" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||
</item>
|
||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||
<preferred-size width="-1" height="20" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||
</item>
|
||||
</group>
|
||||
</component>
|
||||
</project>
|
6
backend/.idea/vcs.xml
Normal file
6
backend/.idea/vcs.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
2
backend/README.md
Normal file
2
backend/README.md
Normal file
|
@ -0,0 +1,2 @@
|
|||
# ktor project
|
||||
this is the backend, for api shits, this uh, yheah
|
|
@ -69,8 +69,6 @@ fun Application.configureRouting(client: HttpClient) {
|
|||
|
||||
post("/ntfy") {
|
||||
val formParameters = call.receiveParameters()
|
||||
val username = formParameters["username"].toString()
|
||||
call.respondText("The '$username' account is created")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
34
build.sh
34
build.sh
|
@ -20,17 +20,35 @@ NO_CHOICE="${RED}no choice given, exiting...${RESET}"
|
|||
BUILD_CANCELLED="${YELLOW}canelling build...${RESET}"
|
||||
BUILDING_BACK="${PURPLE}building backend!${RESET}"
|
||||
BUILDING_FRONT="${PURPLE}building static site!${RESET}"
|
||||
FIRST_TIME_Q="${CYAN}first time building backend? ${GREEN}Yes(y) ${RESET}/ ${RED}No(n) ${RESET}/ ${YELLOW}Cancel(c)${RESET}:- "
|
||||
|
||||
read -p "$(echo -e ${FRONTEND_Q})" choice
|
||||
if [ "$choice" = "y" ]; then
|
||||
echo -e "${BUILDING_FRONT}"
|
||||
cd frontend
|
||||
pnpm i
|
||||
pnpm run build
|
||||
cd ../
|
||||
read -p "$(echo -e ${BACKEND_Q})" choice
|
||||
if [ "$choice" = "y" ]; then
|
||||
read -p "$(echo -e ${FIRST_TIME_Q})" choice
|
||||
if [ "$choice" = "y" ]; then
|
||||
echo -e "${BUILDING_BACK}}"
|
||||
cd backend
|
||||
mkdir build
|
||||
mkdir build/libs
|
||||
cp application.yaml build/libs
|
||||
elif [ "$choice" = "n" ]; then
|
||||
echo -e "${EXITING}"
|
||||
elif [ "$choice" = "c" ]; then
|
||||
echo -e "${BUILD_CANCELLED}"
|
||||
else
|
||||
echo -e "${NO_CHOICE}"
|
||||
fi
|
||||
echo -e "${BUILDING_BACK}"
|
||||
cd backend
|
||||
./gradlew shadowJar
|
||||
cd ../
|
||||
systemctl restart nelle-observer-api
|
||||
elif [ "$choice" = "n" ]; then
|
||||
echo -e "${EXITING}"
|
||||
|
@ -42,9 +60,25 @@ if [ "$choice" = "y" ]; then
|
|||
elif [ "$choice" = "n" ]; then
|
||||
read -p "$(echo -e ${BACKEND_Q})" choice
|
||||
if [ "$choice" = "y" ]; then
|
||||
read -p "$(echo -e ${FIRST_TIME_Q})" choice
|
||||
if [ "$choice" = "y" ]; then
|
||||
echo -e "${BUILDING_BACK}}"
|
||||
cd backend
|
||||
mkdir build
|
||||
mkdir build/libs
|
||||
cp application.yaml build/libs
|
||||
elif [ "$choice" = "n" ]; then
|
||||
echo -e "${EXITING}"
|
||||
elif [ "$choice" = "c" ]; then
|
||||
echo -e "${BUILD_CANCELLED}"
|
||||
else
|
||||
echo -e "${NO_CHOICE}"
|
||||
fi
|
||||
|
||||
echo -e "${BUILDING_BACK}}"
|
||||
cd backend
|
||||
./gradlew shadowJar
|
||||
cd ../
|
||||
systemctl restart nelle-observer-api
|
||||
elif [ "$choice" = "n" ]; then
|
||||
echo -e "${EXITING}"
|
||||
|
|
0
.gitattributes → frontend/.gitattributes
vendored
0
.gitattributes → frontend/.gitattributes
vendored
0
.gitignore → frontend/.gitignore
vendored
0
.gitignore → frontend/.gitignore
vendored
3
frontend/README.md
Normal file
3
frontend/README.md
Normal file
|
@ -0,0 +1,3 @@
|
|||
# astro project
|
||||
|
||||
this uses astro, duh, well, you need pnpm for this
|
0
package-lock.json → frontend/package-lock.json
generated
0
package-lock.json → frontend/package-lock.json
generated
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 156 KiB |
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue