Merge commit 'FETCH_HEAD'

This commit is contained in:
mtgmonkey 2025-04-25 04:29:28 -04:00
commit 23f7160a5d
6 changed files with 8 additions and 9750 deletions

View file

@ -1,6 +1,7 @@
all: frontend backend all: frontend backend
produce: frontend-produce backend produce: frontend-produce backend
echo REMEMBER to RESTART elmskell.service TO UPDATE SITE IN PLACE
run: run:
stack exec ~/.local/bin/hs-server-exe stack exec ~/.local/bin/hs-server-exe
@ -12,7 +13,7 @@ frontend: frontend-format
cd frontend && elm make src/Main.elm --output=../assets/js/main.js cd frontend && elm make src/Main.elm --output=../assets/js/main.js
frontend-produce: frontend-format frontend-produce: frontend-format
cd frontend && elm make src/Main.elm --optimize --output=../assets/js/main cd frontend && elm make src/Main.elm --optimize --output=../assets/js/main.js
uglifyjs assets/js/main.js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output assets/js/main.js uglifyjs assets/js/main.js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output assets/js/main.js
frontend-format: frontend-format:
@ -22,4 +23,4 @@ clean:
touch assets/js/main.js touch assets/js/main.js
rm assets/js/main.js rm assets/js/main.js
.PHONY: all produce run backend frontend frontend-produce frontend-format clean .PHONY: all produce run start backend frontend frontend-produce frontend-format clean

File diff suppressed because one or more lines are too long

View file

@ -26,7 +26,7 @@ index compiledElmApp = renderHtml $ do
-- CONF -- CONF
port :: Port port :: Port
port = 3000 port = 8080
adminContact :: String adminContact :: String
adminContact = "[Matrix] @mtgmonkey:calitabby.net" adminContact = "[Matrix] @mtgmonkey:calitabby.net"
@ -38,7 +38,7 @@ boilerplateJsFile :: AssetPath
boilerplateJsFile = "/js/init.js" boilerplateJsFile = "/js/init.js"
assetsFolder :: FilePath assetsFolder :: FilePath
assetsFolder = "./assets" assetsFolder = "/home/mtgmonkey/elmskell/assets"
-- MAIN -- MAIN
main :: IO () main :: IO ()
@ -78,7 +78,7 @@ main = do
serverErrorReadFile :: E.IOException -> Js serverErrorReadFile :: E.IOException -> Js
serverErrorReadFile e = H.toHtml $ "document.getElementById('body').innerHTML='Server-side error occurred: " serverErrorReadFile e = H.toHtml $ "document.getElementById('body').innerHTML='Server-side error occurred: "
++ (show e) ++ (show e)
++ "; report htis to a site administrator: " ++ "; report this to a site administrator: "
++ adminContact ++ adminContact
++ "';" ++ "';"

Binary file not shown.

Binary file not shown.

View file

@ -66,7 +66,7 @@ init : E.Value -> Url.Url -> Nav.Key -> ( Model, Cmd Msg )
init flags url key = init flags url key =
let let
initContent = initContent =
[ text "Welcome to my website!" [ text "Welcome to my website! Pardon the alpha quality for the time being"
, text "\nRun `help` to get started" , text "\nRun `help` to get started"
] ]