From bca2d17af21b7e7666384b6d61b1b7c9b308a2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=A9=20Cassiop=C3=A9e=20Gauthier?= Date: Mon, 11 Nov 2024 21:07:26 +0000 Subject: [PATCH] Update for deployment to pronoun.fyi --- Dockerfile | 10 ++++++++++ README.md | 22 ++++++++++++---------- compose.yaml | 6 ++++++ project.clj | 4 ++-- src/pronouns/config.clj | 2 +- src/pronouns/pages.clj | 14 +++++++------- src/pronouns/util.clj | 2 +- src/pronouns/web.clj | 2 +- 8 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 Dockerfile create mode 100644 compose.yaml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..910b07e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM eclipse-temurin:11-jre-alpine + +COPY target/pronouns-standalone.jar /pronoun.is/app.jar +COPY resources/ /resources + +ENV PORT 3000 + +EXPOSE 3000 + +CMD ["java", "-XX:-OmitStackTraceInFastThrow", "-cp", "/pronoun.is/app.jar", "clojure.main", "-m", "pronouns.web"] diff --git a/README.md b/README.md index faedb55..f445da8 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ -# pronoun.is +# pronoun.fyi -[pronoun.is](https://pronoun.is) is a website for personal pronoun usage examples +Pronoun Island is a website for personal pronoun usage examples. It is based on [pronoun.is](https://github.com/witch-house/pronoun.is/) + +This code is running at [pronoun.fyi](https://pronoun.fyi) **Table of Contents** -- [pronoun.is](#pronounis) +- [pronoun.fyi](#pronounfyi) - [For users](#for-users) - [For developers](#for-developers) - [The database](#the-database) @@ -15,7 +17,7 @@ - [The git repo](#the-git-repo) - [Philosophy on pronoun inclusion](#philosophy-on-pronoun-inclusion) - [FAQ](#faq) - - [Can we translate pronoun.is into another language?](#can-we-translate-pronounis-into-another-language) + - [Can we translate pronoun.fyi into another language?](#can-we-translate-pronounfyi-into-another-language) - [Can we change the example sentences?](#can-we-change-the-example-sentences) - [Can we add pronunciation guides?](#can-we-add-pronunciation-guides) - [Can we add pluralization support (i.e. themself vs themselves)](#can-we-add-pluralization-support-ie-themself-vs-themselves) @@ -27,10 +29,10 @@ ## For users You can use any pronouns you like simply by filling them into the -url path. For example, https://pronoun.is/ze/zir/zir/zirs/zirself +url path. For example, https://pronoun.fyi/ze/zir/zir/zirs/zirself That's pretty unwieldy! Fortunately you can also give it only the -first pronoun or two: https://pronoun.is/she/her or https://pronoun.is/they +first pronoun or two: https://pronoun.fyi/she/her or https://pronoun.fyi/they Automatically filling in the rest from only one or two forms only works for pronouns in the [database][pronoun-database]. If the @@ -120,22 +122,22 @@ for writing good commit messages :) Pronoun.is aims foremost and exclusively to be a useful resource for people to communicate the personal pronoun they use for themselves. -It is possible to use these example sentences to demonstrate the usage of words that are not personal pronouns, or even cleverly insert an [entire story](https://pronoun.is/she/or%20they,%20those%20ships%20who%20were%20docked%20and%20still%20equipped%20with%20ancillaries,%20arranged%20to%20share%20the%20duty%20of%20monitoring%20our%20guest%20as%20it%20fit%20into%20their%20routines;%20that%20was%20the%20agreement,%20despite%20it%20being%20less%20convenient%20for%20me%20to%20participate%20at%20all,%20on%20the%20grounds%20that%20certain%20visitors%20might%20prefer%20a%20constant%20individual%20companion%20to%20what%20might%20seem,%20depending%20on%20their%20past%20experiences,%20to%20be%20undue%20attention%20from%20every%20soldier%20they%20passed.%20As%20usual,%20then,%20I%20took%20the%20first%20shift/the%20one%20possession%20of%20hers%20that%20Station%20Security%20hadn't%20confiscated,%20a/knowingly%20left%20with%20her.%20What%20a%20Presger%20frisbee%20might%20do%20or%20even%20look%20like%20I%20couldn't%20say.%20She%20hadn't%20seemed%20the%20sort%20to%20have%20alien%20technology,%20but,%20then%20again,%20neither%20had%20I/another%20unremarkable%20stranger,%20quite%20a%20ways%20down%20the%20concourse,%20who%20caught%20it%20with%20a%20degree%20of%20coordination%20that%20most%20would%20have%20overlooked.%20It%20did%20not%20escape%20my%20notice,%20however.%20"Cousin,"%20I%20said,%20enough%20to%20convey%20-%20unless%20our%20visitor%20were%20quite%20ignorant,%20but,%20of%20course,%20at%20this%20point%20I%20was%20certain%20that%20she%20couldn't%20be%20-%20both%20that%20I%20knew%20what%20she%20was%20not%20and%20that%20I%20was%20giving%20her%20the%20benefit%20of%20the%20doubt%20as%20to%20what,%20or%20who,%20she%20was)! However, as a policy we will not include such entries in the database. +It is possible to use these example sentences to demonstrate the usage of words that are not personal pronouns, or even cleverly insert an [entire story](https://pronoun.fyi/she/or%20they,%20those%20ships%20who%20were%20docked%20and%20still%20equipped%20with%20ancillaries,%20arranged%20to%20share%20the%20duty%20of%20monitoring%20our%20guest%20as%20it%20fit%20into%20their%20routines;%20that%20was%20the%20agreement,%20despite%20it%20being%20less%20convenient%20for%20me%20to%20participate%20at%20all,%20on%20the%20grounds%20that%20certain%20visitors%20might%20prefer%20a%20constant%20individual%20companion%20to%20what%20might%20seem,%20depending%20on%20their%20past%20experiences,%20to%20be%20undue%20attention%20from%20every%20soldier%20they%20passed.%20As%20usual,%20then,%20I%20took%20the%20first%20shift/the%20one%20possession%20of%20hers%20that%20Station%20Security%20hadn't%20confiscated,%20a/knowingly%20left%20with%20her.%20What%20a%20Presger%20frisbee%20might%20do%20or%20even%20look%20like%20I%20couldn't%20say.%20She%20hadn't%20seemed%20the%20sort%20to%20have%20alien%20technology,%20but,%20then%20again,%20neither%20had%20I/another%20unremarkable%20stranger,%20quite%20a%20ways%20down%20the%20concourse,%20who%20caught%20it%20with%20a%20degree%20of%20coordination%20that%20most%20would%20have%20overlooked.%20It%20did%20not%20escape%20my%20notice,%20however.%20"Cousin,"%20I%20said,%20enough%20to%20convey%20-%20unless%20our%20visitor%20were%20quite%20ignorant,%20but,%20of%20course,%20at%20this%20point%20I%20was%20certain%20that%20she%20couldn't%20be%20-%20both%20that%20I%20knew%20what%20she%20was%20not%20and%20that%20I%20was%20giving%20her%20the%20benefit%20of%20the%20doubt%20as%20to%20what,%20or%20who,%20she%20was)! However, as a policy we will not include such entries in the database. ## FAQ -### Can we translate pronoun.is into another language? +### Can we translate pronoun.fyi into another language? I'd love to see pronoun.is-like apps exist in the world for other languages. I'll answer any questions you need answered if you decide to fork the code to create a similar site for a different language, and I'll also entertain the -idea of patching the pronoun.is codebase to support rending pages in different +idea of patching the pronoun.fyi codebase to support rending pages in different languages as long as it doesn't make the code substantially more complicated. Even if we add I18N support to the code, other language versions of the site should have their own domains names (ideally with clever TLD puns like -pronoun.is has for english!) +pronoun.fyi has for english!) (This was discussed in issues #13, #14, and #66) diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 0000000..f50a531 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,6 @@ +services: + pronoun.is: + build: ./ + restart: always + ports: + - 3002:3000 diff --git a/project.clj b/project.clj index dcd42d5..a23b14d 100644 --- a/project.clj +++ b/project.clj @@ -1,6 +1,6 @@ -(defproject witch-house/pronouns "1.12.0-SNAPSHOT" +(defproject witch-house/pronouns "1.12.0" :description "Pronoun.is is a website for personal pronoun usage examples" - :url "https://pronoun.is" + :url "https://pronoun.fyi" :license "GNU Affero General Public License 3.0" :dependencies [[compojure "1.6.1"] [environ "1.1.0"] diff --git a/src/pronouns/config.clj b/src/pronouns/config.clj index e35ac7e..35f0700 100644 --- a/src/pronouns/config.clj +++ b/src/pronouns/config.clj @@ -1,4 +1,4 @@ -;; pronoun.is - a website for pronoun usage examples +;; pronoun.fyi - a website for pronoun usage examples ;; Copyright (C) 2014 - 2018 Morgan Astra ;; This program is free software: you can redistribute it and/or modify diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 5b09466..9a9783c 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -1,4 +1,4 @@ -;; pronoun.is - a website for pronoun usage examples +;; pronoun.fyi - a website for pronoun usage examples ;; Copyright (C) 2014 - 2018 Morgan Astra ;; This program is free software: you can redistribute it and/or modify @@ -94,7 +94,7 @@ [:p "Full usage: " ;; FIXME morgan.astra <2018-11-14 Wed> ;; This looks really ugly in the browser - [:tt "https://pronoun.is/subject-pronoun/object-pronoun/possessive-determiner/possessive-pronoun/reflexive"] + [:tt "https://pronoun.fyi/subject-pronoun/object-pronoun/possessive-determiner/possessive-pronoun/reflexive"] " displays examples of your pronouns."] [:p "This is a bit unwieldy. If we have a good guess we'll let you use" " just the first one or two."]]) @@ -106,11 +106,11 @@ [:p "Written by " (twitter-name "morganastra") ", whose " - (href "https://pronoun.is/she" "pronoun.is/she")] - [:p "pronoun.is is free software under the " + (href "https://pronoun.fyi/she" "pronoun.fyi/she")] + [:p "pronoun.fyi is free software under the " (href "https://www.gnu.org/licenses/agpl.html" "AGPLv3") "! visit the project on " - (href "https://github.com/witch-house/pronoun.is" "github")] + (href "https://git.blorp.dev/zo/pronoun.fyi" "git")] [:p "<3"]])) (defn footer-block [] @@ -175,7 +175,7 @@ [:body (header-block title) [:div {:class "section table"} - [:p "pronoun.is is a website for personal pronoun usage examples"] + [:p "pronoun.fyi is a website for personal pronoun usage examples"] [:p "here are some pronouns the site knows about:"] [:ul links] [:p [:small (href "all-pronouns" "see all pronouns in the database")]]]] @@ -220,7 +220,7 @@ [:div "Did you mean: " (href new-path - (str "pronoun.is" + (str "pronoun.fyi" new-path))]))] (footer-block)]]))) diff --git a/src/pronouns/util.clj b/src/pronouns/util.clj index 7469dcf..1ec2d80 100644 --- a/src/pronouns/util.clj +++ b/src/pronouns/util.clj @@ -1,4 +1,4 @@ -;; pronoun.is - a website for pronoun usage examples +;; pronoun.fyi - a website for pronoun usage examples ;; Copyright (C) 2014 - 2018 Morgan Astra ;; This program is free software: you can redistribute it and/or modify diff --git a/src/pronouns/web.clj b/src/pronouns/web.clj index 2c348c0..4313373 100644 --- a/src/pronouns/web.clj +++ b/src/pronouns/web.clj @@ -1,4 +1,4 @@ -;; pronoun.is - a website for pronoun usage examples +;; pronoun.fyi - a website for pronoun usage examples ;; Copyright (C) 2014 - 2018 Morgan Astra ;; This program is free software: you can redistribute it and/or modify