Skip to content

Commit 48eba59

Browse files
committed
Merge branch 'master' into rcv-services
2 parents b81670c + 782cacf commit 48eba59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+108
-62
lines changed

apps/common/Web/Embedded.hs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{-# LANGUAGE TemplateHaskell #-}
2+
3+
module Web.Embedded where
4+
5+
import Data.FileEmbed (embedDir, embedFile)
6+
import Simplex.Messaging.Server.Web (EmbeddedContent (..))
7+
8+
embeddedContent :: EmbeddedContent
9+
embeddedContent =
10+
EmbeddedContent
11+
{ indexHtml = $(embedFile "apps/common/Web/static/index.html"),
12+
linkHtml = $(embedFile "apps/common/Web/static/link.html"),
13+
mediaContent = $(embedDir "apps/common/Web/static/media/"),
14+
wellKnown = $(embedDir "apps/common/Web/static/.well-known/")
15+
}

src/Simplex/Messaging/Server/Web/.well-known/apple-app-site-association renamed to apps/common/Web/static/.well-known/apple-app-site-association

File renamed without changes.

src/Simplex/Messaging/Server/Web/.well-known/assetlinks.json renamed to apps/common/Web/static/.well-known/assetlinks.json

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/Simplex/Messaging/Server/Web/media/GilroyRegularItalic.woff2 renamed to apps/common/Web/static/media/GilroyRegularItalic.woff2

File renamed without changes.

0 commit comments

Comments
 (0)