Skip to content

Commit 192cda8

Browse files
committed
miso-functora css themes wip
1 parent 9f23d19 commit 192cda8

File tree

5 files changed

+136
-163
lines changed

5 files changed

+136
-163
lines changed

ghcjs/miso-functora/Setup.hs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ import qualified Data.Text as T
2222
import Distribution.Simple hiding (Module (..))
2323
import Distribution.Simple.LocalBuildInfo (LocalBuildInfo (..))
2424
import Distribution.Simple.Utils (writeUTF8File)
25+
import Functora.Prelude hiding (empty)
2526
import GHC (runGhc)
2627
import GHC.Paths (libdir)
2728
import GHC.SourceGen
2829
import qualified System.Directory as Directory
2930
import System.Environment (getProgName)
30-
import qualified System.FilePath as FilePath
3131
import qualified Text.Casing as Casing
32-
import Universum hiding (empty)
3332

3433
#if MIN_VERSION_ghc(9,0,0)
3534
import "ghc" GHC.Driver.Session (getDynFlags)
@@ -72,16 +71,16 @@ codeGenHook :: LocalBuildInfo -> IO ()
7271
codeGenHook _ = do
7372
prog <- getProgName
7473
runGhc (Just libdir) $ do
75-
dflags <-
76-
getDynFlags
77-
cssKebab <-
78-
liftIO $ FilePath.takeBaseName <<$>> Directory.listDirectory "css/"
74+
dflags <- getDynFlags
75+
cssRaw <- liftIO $ Directory.listDirectory "dist/css/"
76+
let cssKebab =
77+
sort . fmap (dropEnd 8) $ filter (isSuffixOf ".min.css") cssRaw
7978
let cssPascal =
8079
fmap Casing.pascal cssKebab
8180
when (cssKebab /= fmap Casing.kebab cssPascal)
8281
. error
8382
$ "Bad kebab <-> pascal isomorphism in "
84-
<> show cssKebab
83+
<> inspect @Text cssKebab
8584
liftIO
8685
. writeFileIfChanged
8786
. showPpr dflags
@@ -95,11 +94,12 @@ generateCode prog css =
9594
module'
9695
(Just "Functora.Miso.Theme")
9796
(Just [thingAll "Theme"])
98-
( fmap (qualified' . import')
99-
$ [ "Prelude",
100-
"Data.Data",
101-
"GHC.Generics"
102-
]
97+
( fmap
98+
import'
99+
[ "Prelude",
100+
"Data.Data",
101+
"GHC.Generics"
102+
]
103103
)
104104
[ data'
105105
"Theme"

ghcjs/miso-functora/miso-functora.cabal

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ custom-setup
1616
, casing
1717
, directory
1818
, filepath
19+
, functora-ghcjs
1920
, ghc
2021
, ghc-paths
2122
, ghc-source-gen ==0.4.2.0
2223
, text
23-
, universum
2424

2525
common pkg
2626
default-language: Haskell2010
@@ -117,7 +117,6 @@ library
117117
ghc-options: -Wno-unused-packages
118118

119119
exposed-modules:
120-
Functora.Miso.Css
121120
Functora.Miso.Jsm
122121
Functora.Miso.Jsm.Generic
123122
Functora.Miso.Jsm.Specific
@@ -153,7 +152,6 @@ test-suite miso-functora-test
153152
if flag(ghcid)
154153
hs-source-dirs: src
155154
other-modules:
156-
Functora.Miso.Css
157155
Functora.Miso.Jsm
158156
Functora.Miso.Jsm.Generic
159157
Functora.Miso.Jsm.Specific

ghcjs/miso-functora/src/Functora/Miso/Css.hs

Lines changed: 0 additions & 9 deletions
This file was deleted.

ghcjs/miso-functora/src/Functora/Miso/Theme.hs

Lines changed: 118 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -2,162 +2,141 @@
22
module Functora.Miso.Theme (
33
Theme(..)
44
) where
5-
import qualified Prelude
6-
import qualified Data.Data
7-
import qualified GHC.Generics
5+
import Prelude
6+
import Data.Data
7+
import GHC.Generics
88
data Theme
9-
= MdRetro |
10-
Simple |
11-
Propeller |
12-
Motherplate |
13-
Hack |
14-
Bullframe |
15-
Scooter |
16-
AttriMidnightGreen |
9+
= A11yana |
10+
AdsTufte |
11+
Almond |
12+
AttriBrightLightGreen |
1713
AttriDarkFairyPink |
18-
AwsmPearllusta |
19-
Sakura |
20-
New |
21-
Codify |
22-
Marx |
23-
Picnic |
24-
Centigram |
25-
SkeletonFramework |
26-
Brutalist |
27-
W3cOldstyle |
28-
Wing |
29-
W3cTraditional |
30-
Milligram |
14+
AttriDarkForestGreen |
15+
AttriLightFairyPink |
16+
AttriMidnightGreen |
3117
AwsmBigstone |
32-
Koochak |
33-
Tui |
34-
Holiday |
18+
AwsmBlack |
19+
AwsmDefault |
20+
AwsmGondola |
21+
AwsmMischka |
22+
AwsmPastelpink |
23+
AwsmPearllusta |
3524
AwsmTasman |
36-
Yorha |
37-
Tent |
38-
Caramel |
39-
W3cUltramarine |
25+
AwsmWhite |
26+
Axist |
27+
Bahunya |
28+
Bamboo |
29+
Bare |
30+
Base |
31+
Basic |
32+
Bolt |
33+
Bonsai |
34+
BootCerulean |
35+
BootCosmo |
4036
BootCyborg |
41-
Neat |
42-
Gutenberg |
43-
Almond |
37+
BootDarkly |
38+
BootFlatly |
39+
BootJournal |
40+
BootLumen |
41+
BootSandstone |
42+
BootSlate |
43+
BootSpacelab |
4444
BootSuperhero |
45-
Yamb |
46-
AwsmPastelpink |
45+
BootYeti |
46+
Brutalist |
47+
Bullframe |
48+
Caiuss |
49+
Caramel |
50+
Cardinal |
51+
Centigram |
52+
Centurion |
53+
Chota |
54+
Cirrus |
55+
Classless |
4756
Clmaterial |
48-
Style |
49-
Water |
57+
Codify |
58+
Comet |
59+
Concise |
60+
Concrete |
5061
Cutestrap |
51-
AwsmBlack |
52-
Ok |
53-
AdsNotebook |
54-
MdModest |
55-
AdsMedium |
56-
MinimalStylesheet |
57-
BootSpacelab |
58-
BootFlatly |
59-
MdAir |
60-
Bahunya |
61-
Latex |
62-
Materialize |
63-
Axist |
64-
SkeletonPlus |
65-
MdSplendor |
66-
AwsmMischka |
67-
MissingStyle |
62+
Fluidity |
6863
Furtive |
69-
Shoelace |
70-
BootSlate |
71-
W3cSwiss |
72-
Caiuss |
73-
AttriBrightLightGreen |
74-
Spectre |
75-
Bamboo |
76-
Superstylin |
77-
Pavilion |
78-
W3cModernist |
79-
Terminal |
8064
Gd |
65+
Generic |
8166
GithubMarkdown |
82-
W3cMidnight |
83-
NoClass |
84-
Concrete |
85-
AwsmGondola |
86-
Roble |
87-
Pico |
88-
Min |
89-
AwsmWhite |
90-
Vanilla |
67+
Gutenberg |
68+
Hack |
69+
Hiq |
70+
Holiday |
71+
HtmlStarterkit |
72+
Hyp |
73+
Kathamo |
74+
Koochak |
75+
Kraken |
76+
Kube |
77+
Lemon |
9178
Lissom |
79+
Lit |
80+
Lotus |
81+
Magick |
82+
Markdown |
83+
Marx |
9284
Material |
93-
Cirrus |
94-
AttriLightFairyPink |
95-
AdsGazette |
96-
Primer |
85+
Materialize |
86+
MdAir |
87+
MdModest |
88+
MdRetro |
89+
MdSplendor |
90+
Mercury |
91+
Milligram |
92+
Min |
93+
Mini |
94+
MinimalStylesheet |
9795
Mobi |
98-
Skeleton |
99-
Vital |
100-
Hello |
101-
Writ |
102-
Hyp |
103-
Pure |
104-
A11yana |
105-
HtmlStarterkit |
106-
Markdown |
107-
BootPaper |
108-
Minimal |
109-
Basic |
110-
BootReadable |
111-
FlatUi |
112-
Sanitize |
113-
Lemon |
96+
Mu |
97+
Mui |
98+
Mvp |
99+
Neat |
100+
New |
101+
NoClass |
102+
Normalize |
103+
OhMyCss |
114104
Paper |
115-
Concise |
116-
Chota |
117-
Spcss |
118-
Mini |
119-
Centurion |
120-
AttriDarkForestGreen |
121-
BootCerulean |
122-
AdsTufte |
123-
Bolt |
124-
Preface |
125-
Mercury |
126-
W3cSteely |
127105
Papier |
128-
OhMyCss |
129-
Magick |
130-
Kraken |
131-
Bonsai |
132-
Kathamo |
133-
AwsmDefault |
134-
Classless |
135-
Base |
136-
PandocScholar |
137-
Bare |
138-
SemanticUi |
139-
Thao |
140-
Normalize |
141-
Lotus |
142-
Siimple |
143-
BootDarkly |
144-
BootJournal |
145-
Mu |
146-
Fluidity |
147-
Generic |
148-
Lit |
106+
Pavilion |
107+
Picnic |
108+
Pico |
109+
Preface |
110+
Pure |
111+
Roble |
112+
Sakura |
113+
Sanitize |
114+
Shoelace |
115+
Simple |
116+
Skeleton |
117+
SkeletonFramework |
118+
SkeletonPlus |
149119
Snack |
150-
BootCosmo |
151-
BootLumen |
152-
Hiq |
120+
Spcss |
121+
Spectre |
122+
Style |
153123
Stylize |
154-
Mui |
155-
Mvp |
156-
Kube |
157-
BootSandstone |
158-
W3cChocolate |
124+
Superstylin |
159125
Tacit |
160-
Cardinal |
161-
BootYeti |
162-
Comet
126+
Tent |
127+
Terminal |
128+
Thao |
129+
Vanilla |
130+
Vital |
131+
W3cChocolate |
132+
W3cMidnight |
133+
W3cModernist |
134+
W3cOldstyle |
135+
W3cSteely |
136+
W3cSwiss |
137+
W3cUltramarine |
138+
Water |
139+
Wing |
140+
Writ |
141+
Yorha
163142
deriving stock (Eq, Ord, Show, Read, Data, Generic, Enum, Bounded)

ghcjs/overlays.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,11 @@
195195
ver = "0.12.7.3";
196196
sha256 = "zQY5xQclPNZk7b14ut6Wzcgaolkx+brOxDO5FrZAzk8=";
197197
} {});
198+
ghc-source-gen = self.callHackageDirect {
199+
pkg = "ghc-source-gen";
200+
ver = "0.4.2.0";
201+
sha256 = "VWWv8jnXiFxClu5PvQjTY/e29GSZ9NYVYd5BK+XaVa8=";
202+
} {};
198203
secp256k1-haskell = self.callHackageDirect {
199204
pkg = "secp256k1-haskell";
200205
ver = "0.6.1";

0 commit comments

Comments
 (0)