-_A music player that connects to your cloud/distributed storage,
+_A music player that connects to your cloud/distributed storage,
in the form of a static, serverless, web application._
📍 Available at [diffuse.sh](https://diffuse.sh/) and for [download](https://github.com/icidasset/diffuse/releases).
@@ -60,21 +60,14 @@ In short:
### Building it yourself
-This project uses [Nix](https://nixos.org/features.html) to manage the project's environment. If you'd like to build this project without Nix, check out the dependencies in the `nix/shell.nix` file (most are available through Homebrew as well).
-
+This project can be built with [Node.js](https://nodejs.org/).
```shell
# 🍱
-# 0. Install the Nix package manager
-# https://nixos.org/download.html
-
-# 1. Setup environment
-nix develop
-
-# 2. Install js dependencies
-just install-deps
+# 1. Install dependencies
+npm install
-# 3. Build, start server & watch for changes
-just
+# 2. Build, start server & watch for changes
+npx just
```
diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index 326d5efd..00000000
--- a/flake.lock
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "nodes": {
- "flake-utils": {
- "locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1663850217,
- "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/flake.nix b/flake.nix
deleted file mode 100644
index 96dbd194..00000000
--- a/flake.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- description = "diffuse";
-
-
- # Inputs
- # ======
-
- inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
- flake-utils.url = "github:numtide/flake-utils";
- };
-
-
- # Outputs
- # =======
-
- outputs = { self, nixpkgs, flake-utils }:
- let
- inherit (nixpkgs.lib) attrValues optionalAttrs;
-
- # Make rosetta (x86) packages available on M1 macs
- nixpkgsConfig = {
- overlays = attrValues self.overlays ++ [(
- final: prev:
- (optionalAttrs
- (prev.stdenv.system == "aarch64-darwin")
- { inherit (final.pkgs-x86); }
- )
- )];
- };
-
- overlays = {
- apple-silicon = _: prev:
- optionalAttrs (prev.stdenv.system == "aarch64-darwin") {
- pkgs-x86 = import nixpkgs {
- system = "x86_64-darwin";
- inherit nixpkgsConfig;
- };
- };
- };
-
- in
- flake-utils.lib.simpleFlake {
- inherit self nixpkgs;
- name = "diffuse";
- shell = ./nix/shell.nix;
- preOverlays = [ overlays.apple-silicon ];
- };
-}
\ No newline at end of file
diff --git a/gren.json b/gren.json
new file mode 100644
index 00000000..5f0e6506
--- /dev/null
+++ b/gren.json
@@ -0,0 +1,19 @@
+{
+ "type": "application",
+ "platform": "node",
+ "source-directories": ["src/Static", "system/Build/"],
+ "gren-version": "0.3.0",
+ "dependencies": {
+ "direct": {
+ "gren-lang/core": "4.0.1",
+ "gren-lang/node": "3.0.1",
+ "icidasset/html-gren": "4.1.0",
+ "icidasset/markdown-gren": "3.1.0",
+ "icidasset/shikensu-gren": "5.0.1"
+ },
+ "indirect": {
+ "gren-lang/parser": "3.0.1",
+ "gren-lang/url": "3.0.0"
+ }
+ }
+}
diff --git a/nix/shell.nix b/nix/shell.nix
deleted file mode 100644
index e9ec8b06..00000000
--- a/nix/shell.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs ? import 
- 
- +[About](../) @@ -43,7 +43,7 @@ You can find the CORS configuration editor under the "Permissions" tab, on the S #### BTFS -Add the domain of the app, with the protocol, to the __list of allowed origins__. +Add the domain of the app, with the protocol, to the __list of allowed origins__. ```shell btfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["https://diffuse.sh", "http://diffuse.sh.ipns.localhost:8080", "http://127.0.0.1:44999"]' @@ -83,7 +83,7 @@ _Not necessary._ #### IPFS -Add the domain of the app, with the protocol, to the __list of allowed origins__. +Add the domain of the app, with the protocol, to the __list of allowed origins__. ```shell ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["https://diffuse.sh", "http://diffuse.sh.ipns.localhost:8080", "http://127.0.0.1:44999"]' @@ -111,7 +111,7 @@ You can also make this change in the Web UI, you'll find it under "Settings → #### Microsoft Azure Storage -You can find the CORS configuration under the "Settings -> CORS". +You can find the CORS configuration under the "Settings -> CORS". Then fill in the following in the input boxes (left to right): ``` @@ -126,7 +126,7 @@ MAX AGE 0 #### WebDAV -__Depends on your WebDAV server.__ +__Depends on your WebDAV server.__ Example setup for Henrique Dias's [WebDAV server](https://github.com/hacdias/webdav): ```yaml diff --git a/src/Static/About/Dev.md b/src/Static/About/Dev.md index f781cee9..432d58f3 100644 --- a/src/Static/About/Dev.md +++ b/src/Static/About/Dev.md @@ -1,7 +1,7 @@ -> A music player that connects to your cloud & distributed storage +> A music player that connects to your cloud & distributed storage -[Return to the application](../../) -[About](../) +[Return to the application](../../)
+[About](../) @@ -28,7 +28,7 @@ You can add multiple "source" query parameters, if you want to add multiple sour ```yaml kind: - amazon_s3 + amazon_s3 data: # Required @@ -47,7 +47,7 @@ data: ```yaml kind: - "azure_file" # or "azure_blob" + "azure_file" # or "azure_blob" data: # Required @@ -64,7 +64,7 @@ data: ```yaml kind: - btfs + btfs data: # Required @@ -79,7 +79,7 @@ data: ```yaml kind: - dropbox + dropbox data: # Required @@ -95,7 +95,7 @@ data: ```yaml kind: - google + google data: # Required @@ -112,7 +112,7 @@ data: ```yaml kind: - ipfs + ipfs data: # Required @@ -129,7 +129,7 @@ data: ```yaml kind: - webdav + webdav data: # Required diff --git a/src/Static/About/Index.md b/src/Static/About/Index.md index 7516df17..8b2270eb 100644 --- a/src/Static/About/Index.md +++ b/src/Static/About/Index.md @@ -1,8 +1,8 @@ -> A music player that connects to your cloud & distributed storage +> A music player that connects to your cloud & distributed storage -[Return to the application](../) -[CORS instructions](cors/) -[Developers](dev/) +[Return to the application](../)
+[CORS instructions](cors/)
+[Developers](dev/) @@ -52,7 +52,7 @@ Diffuse locates all the music files on the given services, extracts the metadata - WAV - WEBM -Note, support may vary depending on your browser. +*Note, support may vary depending on your browser.* diff --git a/src/Static/About/Layout.gren b/src/Static/About/Layout.gren new file mode 100644 index 00000000..8c2f1e48 --- /dev/null +++ b/src/Static/About/Layout.gren @@ -0,0 +1,135 @@ +module About.Layout exposing (..) + +import Transmutable.Html as Html exposing ( Html ) +import Transmutable.Html.Attributes as A + + +layout : + { pathToRoot : String + } + -> Array (Html msg) + -> Array (Html msg) +layout { pathToRoot } contents = + [ Html.doctype + , Html.html + [ A.lang "en" + ] + [ Html.head + [] + [ Html.meta + [ A.charset "utf8" + ] + , Html.title + [ Html.text "About | Diffuse" + ] + , Html.meta + [ A.name "description" + , A.content "A music player that connects to your cloud/distributed storage, in the form of a static, serverless, web application." + ] + + , -- Viewport + Html.meta + [ A.name "viewport" + , A.content "width=device-width, initial-scale=1" + ] + + , -- Favicons & Mobile + Html.link + [ A.rel "apple-touch-icon" + , A.href (pathToRoot ++ "apple-touch-icon.png") + , A.attribute "sizes" "180x180" + ] + , Html.link + [ A.rel "icon" + , A.href (pathToRoot ++ "favicon-32x32.png") + , A.attribute "sizes" "32x32" + ] + , Html.link + [ A.rel "icon" + , A.type_ "image/png" + , A.href (pathToRoot ++ "favicon-16x16.png") + , A.attribute "sizes" "16x16" + ] + , Html.link + [ A.rel "manifest" + , A.href (pathToRoot ++ "site.webmanifest") + ] + , Html.link + [ A.rel "mask-icon" + , A.href (pathToRoot ++ "safari-pinned-tab.svg") + , A.attribute "color" "#8a90a9" + ] + , Html.meta + [ A.name "msapplication-TileColor" + , A.content "#8a90a9" + ] + , Html.meta + [ A.name "theme-color" + , A.content "#8a90a9" + ] + + , -- Styles + Html.meta + [ A.name "color-scheme" + , A.content "dark light" + ] + , Html.link + [ A.rel "stylesheet" + , A.href (pathToRoot ++ "about.css") + ] + ] + + , -- + Html.body + [ A.class "font-body text-base01 dark:bg-darkest-hour my-16 bg-white px-4 dark:text-gray-600" + ] + [ Html.main_ + [ A.class "mx-auto max-w-2xl" + ] + [ Html.a + [ A.class "logo inline-block" + , A.href pathToRoot + ] + [ Html.img + [ A.class "block dark:hidden" + , A.src (pathToRoot ++ "images/diffuse-dark.svg") + ] + [] + , Html.img + [ A.class "hidden dark:block" + , A.src (pathToRoot ++ "images/diffuse-light.svg") + ] + [] + , Html.h1 + [] + [ Html.text "Diffuse" + ] + ] + + , -- + Html.article [] contents + ] + + , -- + Html.node + "script" + [ A.src "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.3.2/highlight.min.js" + ] + [] + , Html.node + "script" + [] + [ Html.text "hljs.initHighlightingOnLoad();" + ] + , Html.node + "script" + [] + [ Html.text "if (\"serviceWorker\" in navigator) {\n" + , Html.text " navigator.serviceWorker.register(\"" + , Html.text pathToRoot + , Html.text "service-worker.js\", { type: \"module\" });\n" + , Html.text "}" + ] + ] + ] + ] diff --git a/src/Static/About/Layout.html b/src/Static/About/Layout.html deleted file mode 100644 index 1a154fcd..00000000 --- a/src/Static/About/Layout.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - -
-
- 
-
+