Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

frontend: add nginx webserver #812

Merged
merged 2 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 16 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
{
description = "GovTool and utilities monorepo.";
inputs = {
default_nixpkgs.url = "github:nixos/nixpkgs/c9ece0059f42e0ab53ac870104ca4049df41b133";
node_nixpkgs.url = "github:nixos/nixpkgs/9957cd48326fe8dbd52fdc50dd2502307f188b0d";
flake-utils.url = "github:numtide/flake-utils";
nix-inclusive.url = "github:input-output-hk/nix-inclusive";
};

inputs.default_nixpkgs.url = "github:nixos/nixpkgs/c9ece0059f42e0ab53ac870104ca4049df41b133";
inputs.node_nixpkgs.url = "github:nixos/nixpkgs/9957cd48326fe8dbd52fdc50dd2502307f188b0d";
inputs.flake-utils.url = "github:numtide/flake-utils";

outputs = { self, default_nixpkgs, node_nixpkgs, flake-utils, ... }:
outputs = { self, default_nixpkgs, node_nixpkgs, flake-utils, nix-inclusive, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
defaultPkgs = import default_nixpkgs { inherit system; config.allowBroken = true; };
nodePkgs = import node_nixpkgs { inherit system; config.allowUnfree = true; };
frontend = nodePkgs.callPackage ./govtool/frontend { pkgs = nodePkgs; };
frontend = nodePkgs.callPackage ./govtool/frontend { pkgs = nodePkgs; incl = nix-inclusive.lib.inclusive; };
in
{
packages.scripts = defaultPkgs.callPackage ./scripts/govtool { pkgs = nodePkgs; };
packages.infra = defaultPkgs.callPackage ./infra/terraform { pkgs = nodePkgs; };
packages.backend = defaultPkgs.callPackage ./govtool/backend { pkgs = defaultPkgs; };
packages.frontendModules = frontend.nodeModules;
packages.frontend = frontend.staticSite;
packages.backend = defaultPkgs.callPackage ./govtool/backend { pkgs = defaultPkgs; incl = nix-inclusive.lib.inclusive; };
packages.frontend = frontend;
packages.webserver = defaultPkgs.callPackage frontend.webserver {
staticSiteRoot = frontend.staticSite.overrideAttrs (finalAttrs: prevAttrs: {
VITE_BASE_URL = "/api";
});
};

# Example of how to change VITE variables
#packages.frontendOverride = frontend.staticSite.overrideAttrs (finalAttrs: prevAttrs: {
#packages.frontendOverride = frontend.overrideAttrs (finalAttrs: prevAttrs: {
# VITE_BASE_URL = "https://example.com:8443";
#});

Expand Down
10 changes: 8 additions & 2 deletions govtool/backend/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> { } }:
{ pkgs ? import <nixpkgs> { }, incl }:
let
inherit (pkgs.lib.trivial) pipe;
inherit (pkgs) haskell;
Expand All @@ -22,7 +22,13 @@ let
modifier = drv: pipe drv [ appendLibraries appendTools ];

project = ghcPackages.developPackage {
root = ./.;
root = incl ./. [
./vva-be.cabal
./app
./src
./CHANGELOG.md
./sql
];
modifier = modifier;
overrides = self: super: { openapi3 = useBroken super.openapi3; };
};
Expand Down
2 changes: 1 addition & 1 deletion govtool/frontend/.envrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [[ "${CARDANO_NETWORK}" = "mainnet" ]]; then
else
export VITE_NETWORK_FLAG=0
fi
export VITE_BASE_URL=http://localhost
export VITE_BASE_URL=http://localhost:9999
export VITE_IS_DEV=true
export VITE_GTM_ID="${GTM_ID}"
export VITE_SENTRY_DSN="${SENTRY_DSN}"
Expand Down
43 changes: 40 additions & 3 deletions govtool/frontend/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ pkgs ? import <nixpkgs> {}
, incl
, VITE_BASE_URL ? "http://localhost"
, VITE_IS_DEV ? "true"
, VITE_GTM_ID ? ""
Expand All @@ -7,16 +8,26 @@
}:
let
VITE_NETWORK_FLAG = if CARDANO_NETWORK == "mainnet" then "1" else "0";
frontendSrc = incl ./. [
./package.json
./yarn.lock
./src
./public
./patches
./vite.config.ts
./index.html
];

nodeModules = pkgs.mkYarnPackage {
name = "govtool-node-modules";
src = ./.;
src = frontendSrc;
packageJSON = ./package.json;
yarnLock = ./yarn.lock;
nodejs = pkgs.nodejs_18;
};
staticSite = pkgs.stdenv.mkDerivation {
name = "govtool-website";
src = ./.;
src = frontendSrc;
buildInputs = [pkgs.yarn nodeModules];
inherit VITE_BASE_URL VITE_IS_DEV VITE_GTM_ID VITE_SENTRY_DSN VITE_NETWORK_FLAG;
buildPhase = ''
Expand All @@ -27,7 +38,33 @@ let
mv dist $out
'';
};
webserver = { staticSiteRoot ? staticSite, backendUrl ? "http://localhost:9999" }: let
nginxConfig = pkgs.writeText "govtool-nginx.conf" ''
daemon off;
pid /tmp/govtool-nginx.pid;
events {
}
error_log /dev/stdout info;
http {
access_log /dev/stdout combined;
server {
listen 8081;
include ${pkgs.nginx}/conf/mime.types;
root ${staticSiteRoot}/;
index index.html;
try_files $uri $uri /index.html;
location /api/ {
proxy_pass ${backendUrl}/;
}
}
}
'';
in pkgs.writeScriptBin "govtool-webserver" ''
echo "Starting nginx from site root ${staticSiteRoot}... at http://localhost:8081"
${pkgs.nginx}/bin/nginx -c ${nginxConfig} -e /dev/stderr
'';
devShell = pkgs.mkShell {
buildInputs = [pkgs.nodejs_18 pkgs.yarn];
shellHook = ''
function warn() { tput setaf $2; echo "$1"; tput sgr0; }

Expand All @@ -39,4 +76,4 @@ let
ln -s ${nodeModules.out}/libexec/voltaire-voting-app/node_modules ./node_modules
'';
};
in { inherit nodeModules devShell staticSite; }
in staticSite // { inherit nodeModules devShell staticSite webserver; }
Loading