Skip to content

Commit 84c9c66

Browse files
committed
Can't remember what I've been doing
1 parent a34205d commit 84c9c66

File tree

5 files changed

+12
-27
lines changed

5 files changed

+12
-27
lines changed

src/Frontend.elm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ contentView model =
904904
adminWorldsListView model.adminNewWorldName model.adminNewWorldFast data
905905

906906
AdminWorldActivity worldName ->
907-
adminWorldActivityView model.lastTenToBackendMsgs model.zone worldName data
907+
adminWorldActivityView model.lastTenToBackendMsgs worldName data
908908

909909
AdminWorldHiscores worldName ->
910910
adminWorldHiscoresView worldName data
@@ -4393,16 +4393,16 @@ adminWorldsListView newWorldName newWorldFast data =
43934393
]
43944394

43954395

4396-
adminWorldActivityView : List ( PlayerName, World.Name, ToBackend ) -> Time.Zone -> World.Name -> AdminData -> List (Html FrontendMsg)
4397-
adminWorldActivityView lastTenToBackendMsgs zone worldName data =
4396+
adminWorldActivityView : List ( PlayerName, World.Name, ToBackend ) -> World.Name -> AdminData -> List (Html FrontendMsg)
4397+
adminWorldActivityView lastTenToBackendMsgs worldName data =
43984398
case Dict.get worldName data.worlds of
43994399
Nothing ->
44004400
contentUnavailableView <|
44014401
"World '"
44024402
++ worldName
44034403
++ "' not found"
44044404

4405-
Just world ->
4405+
Just _ ->
44064406
[ pageTitleView <| "Admin :: World: " ++ worldName ++ " - Activity"
44074407
, H.h3 [] [ H.text "Last 10 messages" ]
44084408
, H.table [ HA.id "admin-last-ten-msgs-table" ]

src/Frontend/Route.elm

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ module Frontend.Route exposing
1010
, toString
1111
)
1212

13-
import Data.Barter as Barter
14-
import Data.Fight as Fight
15-
import Data.Message as Message exposing (Message)
13+
import Data.Message as Message
1614
import Data.World as World
1715
import Url exposing (Url)
1816
import Url.Parser as P exposing ((</>), Parser)

src/Time/ExtraExtra.elm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module Time.ExtraExtra exposing
66

77
import Json.Decode as JD exposing (Decoder)
88
import Json.Encode as JE
9-
import Time.Extra as Time exposing (Interval(..))
9+
import Time.Extra exposing (Interval(..))
1010

1111

1212
encodeInterval : Interval -> JE.Value

src/Types.elm

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ import Data.Fight.Generator exposing (Fight)
1111
import Data.FightStrategy exposing (FightStrategy)
1212
import Data.Item as Item
1313
import Data.Map exposing (TileCoords)
14-
import Data.Message as Message exposing (Message)
14+
import Data.Message as Message
1515
import Data.NewChar as NewChar exposing (NewChar)
1616
import Data.Perk exposing (Perk)
1717
import Data.Player
1818
exposing
1919
( CPlayer
20-
, Player
2120
, SPlayer
2221
)
2322
import Data.Player.PlayerName exposing (PlayerName)
@@ -36,11 +35,7 @@ import Data.WorldData
3635
import Dict exposing (Dict)
3736
import File exposing (File)
3837
import Frontend.HoveredItem exposing (HoveredItem)
39-
import Frontend.Route
40-
exposing
41-
( PlayerRoute
42-
, Route
43-
)
38+
import Frontend.Route exposing (Route)
4439
import Lamdera exposing (ClientId, SessionId)
4540
import Queue exposing (Queue)
4641
import Set exposing (Set)

watch-compile.sh

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
#!/usr/bin/env bash
22

3-
COLOR_OFF="\033[0m";
4-
DIM="\033[2m";
5-
6-
LOCKNAME=$(cat /dev/urandom | LC_ALL=C tr -cd 'a-f0-9' | head -c 16);
7-
LOCKFILE="/tmp/elm-lock-${LOCKNAME}"
3+
COLOR_OFF="\e[0m";
4+
DIM="\e[2m";
85

96
function compile {
10-
find src -name '*.elm' | xargs elm make --output /dev/null
7+
find src -type f -name '*.elm' | xargs lamdera make --output /dev/null
118
}
129

1310
function run {
14-
(
15-
flock 200
16-
1711
clear;
1812
tput reset;
1913
echo -en "\033c\033[3J";
@@ -23,12 +17,10 @@ function run {
2317
echo -en "${COLOR_OFF}";
2418

2519
compile;
26-
27-
) 200>"${LOCKFILE}"
2820
}
2921

3022
run;
3123

32-
chokidar '**/*.elm' | while read WHATEVER; do
24+
find src -type f -name '*.elm' | xargs chokidar 2>/dev/null | while read WHATEVER; do
3325
run;
3426
done;

0 commit comments

Comments
 (0)