diff --git a/.gitignore b/.gitignore index ce17bd6..f00ae81 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ target/ /.nrepl-port config.yaml log/logger1.log* -*.jar \ No newline at end of file +*.jar +resources/*.tar \ No newline at end of file diff --git a/Makefile b/Makefile index 68aeb4e..f354cc1 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,20 @@ .DEFAULT_GOAL := build -build: ## Check style with black +build: make build.templates lein uberjar make rm.statics + echo "Finish!" build.templates: make rm.statics - zip -r resources/themes/dark/static.zip resources/themes/dark/static/ - zip -r resources/themes/sepia/static.zip resources/themes/sepia/static/ - zip -r resources/themes/light/static.zip resources/themes/light/static/ + tar cf resources/themes/light/static.tar --directory=./resources/themes/light/ static + tar cf resources/themes/dark/static.tar --directory=./resources/themes/dark/ static + tar cf resources/themes/sepia/static.tar --directory=./resources/themes/sepia/ static + tar cf resources/themes/clojure/static.tar --directory=./resources/themes/clojure/ static rm.statics: - rm -rf resources/themes/dark/static.zip - rm -rf resources/themes/sepia/static.zip - rm -rf resources/themes/light/static.zip + rm -rf resources/themes/dark/static.tar + rm -rf resources/themes/sepia/static.tar + rm -rf resources/themes/light/static.tar + rm -rf resources/themes/clojure/static.tar diff --git a/README.md b/README.md index b78af62..a7d107d 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Generate a static page with the latest news from your favorite feeds. Is it an R # Change the title, it's for you. Maybe you see "My newspaper"? title: RSSPAPER -# Options: light, sepia or dark +# Options: light, dark, sepia or clojure theme: light # Options: daily, weekly or all @@ -80,4 +80,4 @@ lein run ### Make new theme -You can copy any theme hosted on `resources/themes`. \ No newline at end of file +You can copy any theme hosted on `resources/themes`. diff --git a/project.clj b/project.clj index eae7cd7..c818f2c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject rsspaper "1.1.9" +(defproject rsspaper "1.2.0" :description "RSSpaper" :url "https://github.com/tanrax/RSSpaper" :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0" diff --git a/resources/themes/clojure/index.html b/resources/themes/clojure/index.html new file mode 100644 index 0000000..b6bb381 --- /dev/null +++ b/resources/themes/clojure/index.html @@ -0,0 +1,69 @@ + + + + + {{ title }} + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

{{ title }}

+

~ Meta blog de artículos escritos por la comunidad ~

+
+
+
+ {% for article in articles %} + + {% endfor %} +
+
+ + + diff --git a/resources/themes/clojure/static/css/desktop.css b/resources/themes/clojure/static/css/desktop.css new file mode 100644 index 0000000..57918dc --- /dev/null +++ b/resources/themes/clojure/static/css/desktop.css @@ -0,0 +1,135 @@ +/* Desktop */ +.main { + display: grid; + grid-gap: 1rem; + grid-template-columns: repeat(12, 1fr); +} + +/* First column. */ +.feed__article:nth-child(3n-2){ + grid-column: 9 / 13; +} + +/* Second column */ +.feed__article:nth-child(3n+2){ + grid-column: 1 / 5; +} + +/* Third column */ +.feed__article:nth-child(3n+3) { + grid-column: 5 / 9; +} + +.article__title { + font-size: 1.5rem; +} + +.article__feed { + font-size: 1rem; +} + +.article__date { + font-size: .9rem; + color: var(--color-gray); +} + +.feed__article:nth-child(1) .article__title { + font-size: 2rem; +} + +.feed__article:nth-child(1) .article__feed { + font-size: 1rem; +} + +.feed__article:nth-child(1) { + grid-column: 1 / 9; + grid-row: 1 / 4; + text-align: center; +} + +.feed__article:nth-child(2) { + grid-column: 9 / 13; + grid-row: 1 / 2; + +} + +.feed__article:nth-child(3) { + grid-column: 9 / 13; + grid-row: 2 / 3; + +} + +.feed__article:nth-child(4) { + grid-column: 9 / 13; + grid-row: 3 / 4; +} + +.feed__article:nth-child(2) .article__header, +.feed__article:nth-child(3) .article__header, +.feed__article:nth-child(4) .article__header +{ + display: flex; + justify-content: space-between; + flex-direction: row-reverse; + grid-gap: 1rem; +} + +.article__header > p { + margin: 0; +} + +.article__header-img > img { + height: var(--height-img); +} + +.feed__article:nth-child(1) .article__header-img > img, +.feed__article:nth-child(2) .article__header-img > img, +.feed__article:nth-child(3) .article__header-img > img, +.feed__article:nth-child(4) .article__header-img > img +{ + height: initial; +} + +.feed__article:nth-child(2) .article__titles, +.feed__article:nth-child(3) .article__titles, +.feed__article:nth-child(4) .article__titles, +.feed__article:nth-child(2) .article__header-img, +.feed__article:nth-child(3) .article__header-img, +.feed__article:nth-child(4) .article__header-img +{ + width: 50%; +} + +.feed__article:nth-child(2) .article__title, +.feed__article:nth-child(3) .article__title, +.feed__article:nth-child(4) .article__title +{ + font-size: 1.2rem; +} + +.feed__article:nth-child(2) .article__feed, +.feed__article:nth-child(3) .article__feed, +.feed__article:nth-child(4) .article__feed +{ + font-size: 1rem; +} +.article__main { + position: fixed; + left: -100%; + top: 0; + bottom: 0; + overflow-y: auto; + +} +.feed__article:nth-child(1) .article__header { + display: flex; + flex-direction: column; + height: 100%; +} +.feed__article:nth-child(1) .article__header-img { + height: 100%; +} + +.feed__article:first-child img { + height: 100%; +} \ No newline at end of file diff --git a/resources/themes/clojure/static/css/main.css b/resources/themes/clojure/static/css/main.css new file mode 100644 index 0000000..9e74ce4 --- /dev/null +++ b/resources/themes/clojure/static/css/main.css @@ -0,0 +1,95 @@ +/* Global */ +:root { + --color-black: white; + --color-gray: #5881d8; + --color-background: #83b265; + --height-img: 10rem; + --height-img-mobile: 12rem; +} + +@font-face { + font-family: Newsreader; + src: url("../fonts/Newsreader-VariableFont_opsz,wght.woff2"); + font-display: swap; +} + +body { + margin: 0; + padding: 0; + font-family: Newsreader, serif; + color: var(--color-black); + background-color: var(--color-background); + background-size: 100%; +} +img { + object-fit: cover; + object-position: center; +} +img, video, iframe { + width: 100%; +} +a { + color: var(--color-black); + text-decoration: none; +} +pre { + overflow-x: auto; +} +.container { + max-width: 62rem; + margin: 0 auto; + padding: 1rem; +} + +.header { + margin-bottom: 2rem; +} + +.title { + text-align: center; + font-size: 4rem; + font-weight: normal; + margin-bottom: 0; + margin-top: 1rem; +} +.subtitle { + display: flex; + justify-content: center; + align-items: center; + margin-top: -1rem; + font-weight: normal; + font-size: 1.5rem; +} +.subtitle__separator { + font-size: 3rem; + font-weight: bold; +} +.separator { + border: 0; + background: var(--color-black); + height: 1px; +} +.footer__text { + text-align: center; + padding: 1rem 0; +} +.footer__link { + font-weight: bold; +} +.footer__heard { + display: inline-block; + margin-left: .3rem; +} +.article__title, .article__feed { + font-weight: normal; +} + +.article__header-img > a > img { + height: var(--height-img); + object-position: center; + object-fit: contain; +} +.article__random-background { + height: 100%; + width: 100%; +} diff --git a/resources/themes/clojure/static/css/mobile.css b/resources/themes/clojure/static/css/mobile.css new file mode 100644 index 0000000..b29aedf --- /dev/null +++ b/resources/themes/clojure/static/css/mobile.css @@ -0,0 +1,13 @@ +.title { + font-size: 3rem; +} + +.subtitle { + font-size: 1rem; +} + +.article__header-img > a > img { + height: var(--height-img-mobile); + object-position: top; + object-fit: cover; +} diff --git a/resources/themes/clojure/static/css/normalize.css b/resources/themes/clojure/static/css/normalize.css new file mode 100644 index 0000000..192eb9c --- /dev/null +++ b/resources/themes/clojure/static/css/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/resources/themes/clojure/static/fonts/Newsreader-VariableFont_opsz,wght.woff2 b/resources/themes/clojure/static/fonts/Newsreader-VariableFont_opsz,wght.woff2 new file mode 100644 index 0000000..b9b3b77 Binary files /dev/null and b/resources/themes/clojure/static/fonts/Newsreader-VariableFont_opsz,wght.woff2 differ diff --git a/resources/themes/clojure/static/img/icons/apple-icon-180.png b/resources/themes/clojure/static/img/icons/apple-icon-180.png new file mode 100644 index 0000000..f95caf7 Binary files /dev/null and b/resources/themes/clojure/static/img/icons/apple-icon-180.png differ diff --git a/resources/themes/clojure/static/img/icons/favicon.png b/resources/themes/clojure/static/img/icons/favicon.png new file mode 100644 index 0000000..81b80d2 Binary files /dev/null and b/resources/themes/clojure/static/img/icons/favicon.png differ diff --git a/resources/themes/clojure/static/img/icons/manifest-icon-192.png b/resources/themes/clojure/static/img/icons/manifest-icon-192.png new file mode 100644 index 0000000..88170e2 Binary files /dev/null and b/resources/themes/clojure/static/img/icons/manifest-icon-192.png differ diff --git a/resources/themes/clojure/static/img/icons/manifest-icon-512.png b/resources/themes/clojure/static/img/icons/manifest-icon-512.png new file mode 100644 index 0000000..4c05663 Binary files /dev/null and b/resources/themes/clojure/static/img/icons/manifest-icon-512.png differ diff --git a/resources/themes/clojure/static/img/newsreader-not-cover.png b/resources/themes/clojure/static/img/newsreader-not-cover.png new file mode 100644 index 0000000..98a6710 Binary files /dev/null and b/resources/themes/clojure/static/img/newsreader-not-cover.png differ diff --git a/resources/themes/clojure/static/manifest.json b/resources/themes/clojure/static/manifest.json new file mode 100644 index 0000000..01bc721 --- /dev/null +++ b/resources/themes/clojure/static/manifest.json @@ -0,0 +1,22 @@ +{ + "name": "RSSPAPER", + "short_name": "RSSPAPER", + "theme_color": "#e5d5c2", + "icons": [ + { + "src": "manifest-icon-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable any" + }, + { + "src": "manifest-icon-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable any" + } + ], + "start_url": "..", + "display": "standalone", + "background_color": "#e5d5c2" +} diff --git a/src/rsspaper/html.clj b/src/rsspaper/html.clj index c836d48..5aa184a 100644 --- a/src/rsspaper/html.clj +++ b/src/rsspaper/html.clj @@ -15,12 +15,12 @@ (defn make-html [articles] ;; Render html in dist/index.html - (let [dir-dist "dist/" - path-theme (io/resource (str "themes/" (:theme config) "/")) - file-index "index.html" + (let [dir-dist "dist/" + path-theme (io/resource (str "themes/" (:theme config) "/")) + file-index "index.html" path-dist-index (str dir-dist "index.html") - zip-static "static.zip" - tmp-static (str (fs/tmpdir) "/rsspaper.zip")] + tar-static "static.tar" + tmp-static (str (fs/tmpdir) "/rsspaper.tar")] ;; Remove old index.html (when (.exists (io/file path-dist-index)) (io/delete-file path-dist-index)) ;; Make dir dist @@ -28,8 +28,8 @@ ;; Make dist/index.html (selmer.parser/set-resource-path! path-theme) (with-open [writer (io/writer path-dist-index)] - (.write writer (s/render-file file-index {:title (:title config) + (.write writer (s/render-file file-index {:title (:title config) :articles (get-articles)}))) ;; Make static - (copy-uri-to-file (str path-theme zip-static) tmp-static) - (fsc/unzip tmp-static dir-dist))) + (copy-uri-to-file (str path-theme tar-static) tmp-static) + (fsc/untar tmp-static dir-dist)))