From 3842798968e52482f356dd11fc598d24690db103 Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 21 Oct 2024 00:02:05 -0400 Subject: [PATCH] add salad --- config/config.exs | 2 +- config/dev.exs | 2 +- config/test.exs | 2 +- flake.lock | 166 ------------------------------ flake.nix | 112 -------------------- lib/zoeyscomputer_web/endpoint.ex | 2 +- mix.exs | 1 + 7 files changed, 5 insertions(+), 282 deletions(-) delete mode 100644 flake.lock delete mode 100644 flake.nix diff --git a/config/config.exs b/config/config.exs index ade4386..403ec5b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -20,7 +20,7 @@ config :zoeyscomputer, ZoeyscomputerWeb.Endpoint, layout: false ], pubsub_server: Zoeyscomputer.PubSub, - live_view: [signing_salt: "6jr7gz9p"] + live_view: [signing_salt: "byg+88ZA"] # Configures the mailer # diff --git a/config/dev.exs b/config/dev.exs index 06cdf38..47a5024 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -23,7 +23,7 @@ config :zoeyscomputer, ZoeyscomputerWeb.Endpoint, check_origin: false, code_reloader: true, debug_errors: true, - secret_key_base: "7SmZvGH5cX0JkxP0tAqho+Fx3uyRNffY1TaFV301ctruPttBbYTCE8uTSSHhDmbr", + secret_key_base: "Qe0dIfVihLtZD6q2TbcUJvJZEo4i5SAAAmKfLXfjj8AxZfXgL4+g2ISn9CaOq3ES", watchers: [ esbuild: {Esbuild, :install_and_run, [:zoeyscomputer, ~w(--sourcemap=inline --watch)]}, tailwind: {Tailwind, :install_and_run, [:zoeyscomputer, ~w(--watch)]} diff --git a/config/test.exs b/config/test.exs index 75f74b9..82a6b5b 100644 --- a/config/test.exs +++ b/config/test.exs @@ -17,7 +17,7 @@ config :zoeyscomputer, Zoeyscomputer.Repo, # you can enable the server option below. config :zoeyscomputer, ZoeyscomputerWeb.Endpoint, http: [ip: {127, 0, 0, 1}, port: 4002], - secret_key_base: "+6JoPC71Jl7jrkno3r+w0KH1LMavRD9RUd7vMiLBcJ8vqgkVtam4TFt1HJmV3EtZ", + secret_key_base: "bF1Py67SqufVZ+89ftwi6qMCvOpv01k6Gwm2xKCwOCuGUdDsJ+rYsRtRbS1efk1r", server: false # In test we don't send emails diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 84a69b0..0000000 --- a/flake.lock +++ /dev/null @@ -1,166 +0,0 @@ -{ - "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "lexical": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1727126932, - "narHash": "sha256-JvLiDxwkKD1u/DmTVUpmymQoCfYdoTHAOSs9fYCLfcw=", - "owner": "lexical-lsp", - "repo": "lexical", - "rev": "48fb3fa4f25fc490f297758761c5593eb45a2026", - "type": "github" - }, - "original": { - "owner": "lexical-lsp", - "repo": "lexical", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1719931832, - "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0aeab749216e4c073cece5d34bc01b79e717c3e0", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" - } - }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 0, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", - "path": "/nix/store/riqkpszjqk02bi1wppfg8ip5xvh102qd-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "process-compose-flake": { - "locked": { - "lastModified": 1729388329, - "narHash": "sha256-ziJLH/BuBlcfSdFZH+FbITNzwkIZZwdVzuAYUKoSoWg=", - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "rev": "00f00687efba844f356aca8bfb44105f93756c26", - "type": "github" - }, - "original": { - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-parts": "flake-parts", - "lexical": "lexical", - "nixpkgs": "nixpkgs_2", - "process-compose-flake": "process-compose-flake", - "systems": "systems_2" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 1c360c1..0000000 --- a/flake.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ - inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - systems.url = "github:nix-systems/default"; - flake-parts.url = "github:hercules-ci/flake-parts"; - # Lexical is an alternative LSP server. There are several options for Elixir - # LSP. See https://gist.github.com/Nezteb/dc63f1d5ad9d88907dd103da2ca000b1 - lexical.url = "github:lexical-lsp/lexical"; - # Use process-compose to manage background processes during development - process-compose-flake.url = "github:Platonic-Systems/process-compose-flake"; - }; - - outputs = - { - self, - nixpkgs, - systems, - flake-parts, - ... - }@inputs: - let - # Set the Erlang version - erlangVersion = "erlang_25"; - # Set the Elixir version - elixirVersion = "elixir_1_15"; - in - flake-parts.lib.mkFlake { inherit inputs; } { - systems = import systems; - - imports = [ inputs.process-compose-flake.flakeModule ]; - - perSystem = - { - # self', - config, - system, - pkgs, - lib, - ... - }: - { - # Define a consistent package set for development, testing, and - # production. - _module.args.pkgs = import nixpkgs { - inherit system; - overlays = [ - ( - final: _: - let - erlang = final.beam.interpreters.${erlangVersion}; - beamPackages = final.beam.packages.${erlangVersion}; - elixir = beamPackages.${elixirVersion}; - in - { - inherit erlang elixir; - # Hex is not used in the devShell. - # inherit (beamPackages) hex; - } - ) - ]; - }; - - # You can build your Elixir application using mixRelease. - # packages.default = { }; - - # Add dependencies to develop your application using Mix. - devShells.default = pkgs.mkShell { - buildInputs = - with pkgs; - ( - [ - erlang - elixir - # You are likely to need Node.js if you develop a Phoenix - # application. - nodejs - # Add the language server of your choice. - inputs.lexical.packages.${system}.default - # I once added Hex via a Nix development shell, but now I install - # and upgrade it using Mix. Hex installed using Nix can cause an - # issue if you manage Elixir dependencies using Mix. - ] - # Add a dependency for a file watcher if you develop a Phoenix - # application. - ++ lib.optional stdenv.isLinux inotify-tools - ++ (lib.optionals stdenv.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - CoreServices - ] - )) - ); - }; - - # You can define background processes in Nix using - # process-compose-flake. - process-compose.example = { - settings = { - processes = { - ponysay.command = '' - while true; do - ${lib.getExe pkgs.ponysay} "Enjoy our ponysay demo!" - sleep 2 - done - ''; - }; - }; - }; - }; - }; -} diff --git a/lib/zoeyscomputer_web/endpoint.ex b/lib/zoeyscomputer_web/endpoint.ex index 8f31e24..d1dd92f 100644 --- a/lib/zoeyscomputer_web/endpoint.ex +++ b/lib/zoeyscomputer_web/endpoint.ex @@ -7,7 +7,7 @@ defmodule ZoeyscomputerWeb.Endpoint do @session_options [ store: :cookie, key: "_zoeyscomputer_key", - signing_salt: "GpEsX6Qh", + signing_salt: "G7dIA3Vb", same_site: "Lax" ] diff --git a/mix.exs b/mix.exs index 278ff42..b80498c 100644 --- a/mix.exs +++ b/mix.exs @@ -54,6 +54,7 @@ defmodule Zoeyscomputer.MixProject do {:swoosh, "~> 1.5"}, {:finch, "~> 0.13"}, {:telemetry_metrics, "~> 1.0"}, + {:salad_ui, "~> 0.9.0", only: [:dev]}, {:telemetry_poller, "~> 1.0"}, {:gettext, "~> 0.20"}, {:jason, "~> 1.2"},