diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..5169b93 --- /dev/null +++ b/Gemfile @@ -0,0 +1,33 @@ +source "https://rubygems.org" + +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! +gem "jekyll", "~> 3.9" +gem "webrick", "~> 1.7" +gem "kramdown-parser-gfm" + +# This is the default theme for new Jekyll sites. You may change this to anything you like. +gem "minima", "~> 2.0" + +# If you want to use GitHub Pages, remove the "gem "jekyll"" above and +# uncomment the line below. To upgrade, run `bundle update github-pages`. +# gem "github-pages", group: :jekyll_plugins + +gem 'github-pages', group: :jekyll_plugins + +# If you have any plugins, put them here! +#group :jekyll_plugins do +# gem "jekyll-feed", "~> 0.6" +#end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +# Performance-booster for watching directories on Windows +gem "wdm", "~> 0.1.0" if Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..3f67160 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,283 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.2.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + benchmark (0.3.0) + bigdecimal (3.1.8) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + colorator (1.1.0) + commonmarker (0.23.10) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) + csv (3.3.0) + dnsruby (1.72.2) + simpleidn (~> 0.2.1) + drb (2.2.1) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) + eventmachine (1.2.7) + execjs (2.10.0) + faraday (2.12.0) + faraday-net_http (>= 2.0, < 3.4) + json + logger + faraday-net_http (3.3.0) + net-http + ffi (1.17.0) + forwardable-extended (2.6.0) + gemoji (4.1.0) + github-pages (232) + github-pages-health-check (= 1.18.2) + jekyll (= 3.10.0) + jekyll-avatar (= 0.8.0) + jekyll-coffeescript (= 1.2.2) + jekyll-commonmark-ghpages (= 0.5.1) + jekyll-default-layout (= 0.1.5) + jekyll-feed (= 0.17.0) + jekyll-gist (= 1.5.0) + jekyll-github-metadata (= 2.16.1) + jekyll-include-cache (= 0.2.1) + jekyll-mentions (= 1.6.0) + jekyll-optional-front-matter (= 0.3.2) + jekyll-paginate (= 1.1.0) + jekyll-readme-index (= 0.3.0) + jekyll-redirect-from (= 0.16.0) + jekyll-relative-links (= 0.6.1) + jekyll-remote-theme (= 0.4.3) + jekyll-sass-converter (= 1.5.2) + jekyll-seo-tag (= 2.8.0) + jekyll-sitemap (= 1.4.0) + jekyll-swiss (= 1.0.0) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) + jekyll-titles-from-headings (= 0.5.3) + jemoji (= 0.13.0) + kramdown (= 2.4.0) + kramdown-parser-gfm (= 1.1.0) + liquid (= 4.0.4) + mercenary (~> 0.3) + minima (= 2.5.1) + nokogiri (>= 1.16.2, < 2.0) + rouge (= 3.30.0) + terminal-table (~> 1.4) + webrick (~> 1.8) + github-pages-health-check (1.18.2) + addressable (~> 2.3) + dnsruby (~> 1.60) + octokit (>= 4, < 8) + public_suffix (>= 3.0, < 6.0) + typhoeus (~> 1.3) + html-pipeline (2.14.3) + activesupport (>= 2) + nokogiri (>= 1.4) + http_parser.rb (0.8.0) + i18n (1.14.6) + concurrent-ruby (~> 1.0) + jekyll (3.10.0) + addressable (~> 2.4) + colorator (~> 1.0) + csv (~> 3.0) + em-websocket (~> 0.5) + i18n (>= 0.7, < 2) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (>= 1.17, < 3) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + webrick (>= 1.0) + jekyll-avatar (0.8.0) + jekyll (>= 3.0, < 5.0) + jekyll-coffeescript (1.2.2) + coffee-script (~> 2.2) + coffee-script-source (~> 1.12) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.5.1) + commonmarker (>= 0.23.7, < 1.1.0) + jekyll (>= 3.9, < 4.0) + jekyll-commonmark (~> 1.4.0) + rouge (>= 2.0, < 5.0) + jekyll-default-layout (0.1.5) + jekyll (>= 3.0, < 5.0) + jekyll-feed (0.17.0) + jekyll (>= 3.7, < 5.0) + jekyll-gist (1.5.0) + octokit (~> 4.2) + jekyll-github-metadata (2.16.1) + jekyll (>= 3.4, < 5.0) + octokit (>= 4, < 7, != 4.4.0) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) + jekyll-mentions (1.6.0) + html-pipeline (~> 2.3) + jekyll (>= 3.7, < 5.0) + jekyll-optional-front-matter (0.3.2) + jekyll (>= 3.0, < 5.0) + jekyll-paginate (1.1.0) + jekyll-readme-index (0.3.0) + jekyll (>= 3.0, < 5.0) + jekyll-redirect-from (0.16.0) + jekyll (>= 3.3, < 5.0) + jekyll-relative-links (0.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-remote-theme (0.4.3) + addressable (~> 2.0) + jekyll (>= 3.5, < 5.0) + jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) + rubyzip (>= 1.3.0, < 3.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) + jekyll-swiss (1.0.0) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-hacker (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-primer (0.6.0) + jekyll (> 3.5, < 5.0) + jekyll-github-metadata (~> 2.9) + jekyll-seo-tag (~> 2.0) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-titles-from-headings (0.5.3) + jekyll (>= 3.3, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) + html-pipeline (~> 2.2) + jekyll (>= 3.0, < 5.0) + json (2.7.6) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.1) + mercenary (0.3.6) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + minitest (5.25.1) + net-http (0.4.1) + uri + nokogiri (1.16.7-x86_64-linux) + racc (~> 1.4) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (5.1.1) + racc (1.8.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + rexml (3.3.9) + rouge (3.30.0) + rubyzip (2.3.2) + safe_yaml (1.0.5) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + securerandom (0.3.1) + simpleidn (0.2.3) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + typhoeus (1.4.1) + ethon (>= 0.9.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (1.8.0) + uri (0.13.1) + webrick (1.9.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + github-pages + jekyll (~> 3.9) + kramdown-parser-gfm + minima (~> 2.0) + tzinfo-data + webrick (~> 1.7) + +BUNDLED WITH + 2.3.18 diff --git a/api/api.go b/api/api.go index d386a91..e229a26 100644 --- a/api/api.go +++ b/api/api.go @@ -39,6 +39,7 @@ var Endpoints = []*Endpoint{ {Name: "name", Value: "string", Description: "Name of Allah"}, {Name: "hadith", Value: "string", Description: "Hadith from Sahih Bukhari"}, {Name: "verse", Value: "string", Description: "A verse of the Quran"}, + {Name: "links", Value: "map", Description: "Links to relevant content"}, }, }}, }, diff --git a/app/app.go b/app/app.go index 49e4732..9a0f898 100644 --- a/app/app.go +++ b/app/app.go @@ -76,6 +76,14 @@ code { .right { text-align: right; } +.block { + text-decoration: none; + margin-bottom: 10px; + border: 1px solid grey; + border-radius: 5px; + padding: 10px; + display: block; +} @media only screen and (max-width: 600px) { #head a { margin-right: 5px; } } diff --git a/app/file-server.go b/app/file-server.go index 5e3e5df..48accda 100644 --- a/app/file-server.go +++ b/app/file-server.go @@ -45,8 +45,23 @@ func FileServerWith404(root http.FileSystem, handler404 FSHandler404) http.Handl f, err := root.Open(upath) if err != nil { if os.IsNotExist(err) { + // If path ends with a trailing slash, try again without it + if len(upath) > 1 && strings.HasSuffix(upath, "/") { + altPath := strings.TrimSuffix(upath, "/") + f2, err2 := root.Open(altPath) + if err2 == nil { + f2.Close() + // Rewrite the request path and serve + r2 := new(http.Request) + *r2 = *r + urlCopy := *r.URL + urlCopy.Path = altPath + r2.URL = &urlCopy + fs.ServeHTTP(w, r2) + return + } + } log.Printf("Embedded asset not found: %s", upath) - // call handler if handler404 != nil { doDefault := handler404(w, r) diff --git a/hadith/hadith.go b/hadith/hadith.go index 35728e7..49146bb 100644 --- a/hadith/hadith.go +++ b/hadith/hadith.go @@ -4,6 +4,7 @@ import ( "embed" "encoding/json" "fmt" + "strconv" "strings" ) @@ -140,14 +141,16 @@ func Load() *Volumes { Name: d["name"].(string), } - for num, b := range d["books"].([]interface{}) { + for _, b := range d["books"].([]interface{}) { bk := b.(map[string]interface{}) - name := strings.Split(bk["name"].(string), ". ")[1] + parts := strings.Split(bk["name"].(string), ". ") + num, name := parts[0], parts[1] + n, _ := strconv.Atoi(num) book := &Book{ Name: name, - Number: num + 1, + Number: n, } for _, h := range bk["hadiths"].([]interface{}) { diff --git a/main.go b/main.go index b16500e..1861628 100644 --- a/main.go +++ b/main.go @@ -32,6 +32,7 @@ var ( var mtx sync.RWMutex var history = map[string][]string{} var dailyName, dailyVerse, dailyHadith string +var links = map[string]string{} func registerLiteRoutes(q *quran.Quran, n *names.Names, b *hadith.Volumes, a *api.Api) { // generate api doc @@ -50,14 +51,18 @@ func registerLiteRoutes(q *quran.Quran, n *names.Names, b *hadith.Volumes, a *ap http.HandleFunc("/daily", func(w http.ResponseWriter, r *http.Request) { template := `

Verse

-%s +%s

Hadith

-%s +%s

Name

-%s` +%s` mtx.RLock() - data := fmt.Sprintf(template, dailyVerse, dailyHadith, dailyName) + verseLink := links["verse"] + hadithLink := links["hadith"] + nameLink := links["name"] + + data := fmt.Sprintf(template, verseLink, dailyVerse, hadithLink, dailyHadith, nameLink, dailyName) mtx.RUnlock() html := app.RenderHTML("Daily Reminder", "Daily reminder from the quran, hadith and names of Allah", data) w.Write([]byte(html)) @@ -238,7 +243,19 @@ func main() { if *WebFlag { http.Handle("/", app.ServeWeb()) } else { - http.Handle("/", app.ServeLite()) + http.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // Strip trailing slash globally (except for "/") for lite app only + if r.URL.Path != "/" && len(r.URL.Path) > 1 && strings.HasSuffix(r.URL.Path, "/") { + newReq := new(http.Request) + *newReq = *r + urlCopy := *r.URL + urlCopy.Path = strings.TrimSuffix(r.URL.Path, "/") + newReq.URL = &urlCopy + app.ServeLite().ServeHTTP(w, newReq) + return + } + app.ServeLite().ServeHTTP(w, r) + })) registerLiteRoutes(q, n, b, a) } @@ -314,6 +331,14 @@ func main() { dailyName = fmt.Sprintf("%s - %s - %s - %s", nam.English, nam.Arabic, nam.Meaning, nam.Summary) dailyVerse = fmt.Sprintf("%s - %d:%d", ver.Text, ver.Chapter, ver.Number) dailyHadith = fmt.Sprintf("%s - %s - %s", had.Text, had.By, strings.Split(had.Info, ":")[0]) + + num := strings.TrimSpace(strings.Split(strings.Split(had.Info, "Number")[1], ":")[0]) + + links = map[string]string{ + "verse": fmt.Sprintf("/quran/%d#%d", ver.Chapter, ver.Number), + "hadith": fmt.Sprintf("/hadith/%d#%s", book.Number, num), + "name": fmt.Sprintf("/names/%d", nam.Number), + } mtx.Unlock() time.Sleep(time.Hour * 24) @@ -328,6 +353,7 @@ func main() { "name": dailyName, "hadith": dailyHadith, "verse": dailyVerse, + "links": links, } mtx.RUnlock() b, _ := json.Marshal(day) diff --git a/web/app/queries/quran.ts b/web/app/queries/quran.ts index 91aea8f..5896b06 100644 --- a/web/app/queries/quran.ts +++ b/web/app/queries/quran.ts @@ -16,11 +16,18 @@ export const listSurahsOptions = () => ({ }, }); +type WordByWord = { + arabic: string; + english: string; + transliteration: string; +}; + type VerseType = { chapter: number; number: number; text: string; arabic: string; + words?: WordByWord[]; }; type ChapterResponseType = { diff --git a/web/app/routes/_app.daily.tsx b/web/app/routes/_app.daily.tsx index 67c411f..ef455b1 100644 --- a/web/app/routes/_app.daily.tsx +++ b/web/app/routes/_app.daily.tsx @@ -26,19 +26,19 @@ export default function DailyPage() {

Quran Verse

- {data.verse} + {data.verse}

Hadith

- {data.hadith} + {data.hadith}

Name of Allah

- {data.name} + {data.name}
diff --git a/web/app/routes/_app.quran.$chapterNumber._index.tsx b/web/app/routes/_app.quran.$chapterNumber._index.tsx index 591bcb5..15b2b11 100644 --- a/web/app/routes/_app.quran.$chapterNumber._index.tsx +++ b/web/app/routes/_app.quran.$chapterNumber._index.tsx @@ -78,17 +78,29 @@ export default function QuranChapter(props: Route.ComponentProps) { > {data.verses.map((verse) => ( - {verse.arabic.split(' ').map((word, idx, arr) => ( - - {word} - {idx === arr.length - 1 && ( - - {toArabicNumber(verse.number)} + {verse.words && verse.words.length > 0 + ? verse.words.map((word, idx, arr) => ( + + {word.arabic} + {idx === arr.length - 1 && ( + + {toArabicNumber(verse.number)} + + )} +   - )} -   - - ))} + )) + : verse.arabic.split(' ').map((word, idx, arr) => ( + + {word} + {idx === arr.length - 1 && ( + + {toArabicNumber(verse.number)} + + )} +   + + ))} ))} @@ -110,26 +122,34 @@ export default function QuranChapter(props: Route.ComponentProps) { className='border-b border-gray-100 pb-3 sm:pb-8' >
- {verse.arabic.split(' ').map((word, idx, arr) => ( - - {word} - {idx === arr.length - 1 && ( - - {toArabicNumber(verse.number)} + {verse.words && verse.words.length > 0 + ? verse.words.map((word, idx, arr) => ( + + {word.arabic} + {word.english} + {idx === arr.length - 1 && ( + {toArabicNumber(verse.number)} + )} + + )) + : verse.arabic.split(' ').map((word, idx, arr) => ( + + {word} + {idx === arr.length - 1 && ( + {toArabicNumber(verse.number)} + )} - )} -   - - ))} + ))}
{verse.text}
- Verse {verse.number} + {verse.number !== 0 ? `${data.number}:${verse.number}` : ''} ))} diff --git a/web/public/favicon.ico b/web/public/favicon.ico index 5dbdfcd..06acc0d 100644 Binary files a/web/public/favicon.ico and b/web/public/favicon.ico differ