diff --git a/apis/hadithaApi.js b/apis/hadithaApi.js index 486f782..2ccb33f 100644 --- a/apis/hadithaApi.js +++ b/apis/hadithaApi.js @@ -22,7 +22,9 @@ export default { }, library: { list: "monir/book/volume/@field_collapsed/@offset/@limit/@q", - show: "@appname/book/page/@page_start/@page_end/@vol_id", + show: "@appname/book/page/@page_start/@page_len/@vol_id", prevNextHadith: "monir/nextpage/@index_key/@vol_id/@page_num/@step", + getVolumeInfo: "public/get/byids/dhvolume", + get: "public/get/byid/dhvolume/@vol_id", }, }; diff --git a/assets/haditha/font-icons/about-us.svg b/assets/haditha/images/font-icons/about-us.svg similarity index 100% rename from assets/haditha/font-icons/about-us.svg rename to assets/haditha/images/font-icons/about-us.svg diff --git a/assets/haditha/font-icons/add.svg b/assets/haditha/images/font-icons/add.svg similarity index 100% rename from assets/haditha/font-icons/add.svg rename to assets/haditha/images/font-icons/add.svg diff --git a/assets/haditha/font-icons/bookmark.svg b/assets/haditha/images/font-icons/bookmark.svg similarity index 100% rename from assets/haditha/font-icons/bookmark.svg rename to assets/haditha/images/font-icons/bookmark.svg diff --git a/assets/haditha/font-icons/chat-bot.svg b/assets/haditha/images/font-icons/chat-bot.svg similarity index 100% rename from assets/haditha/font-icons/chat-bot.svg rename to assets/haditha/images/font-icons/chat-bot.svg diff --git a/assets/haditha/font-icons/chevron-down.svg b/assets/haditha/images/font-icons/chevron-down.svg similarity index 100% rename from assets/haditha/font-icons/chevron-down.svg rename to assets/haditha/images/font-icons/chevron-down.svg diff --git a/assets/haditha/font-icons/chevron-left.svg b/assets/haditha/images/font-icons/chevron-left.svg similarity index 100% rename from assets/haditha/font-icons/chevron-left.svg rename to assets/haditha/images/font-icons/chevron-left.svg diff --git a/assets/haditha/font-icons/chevron-right.svg b/assets/haditha/images/font-icons/chevron-right.svg similarity index 100% rename from assets/haditha/font-icons/chevron-right.svg rename to assets/haditha/images/font-icons/chevron-right.svg diff --git a/assets/haditha/font-icons/close-bg-circle.svg b/assets/haditha/images/font-icons/close-bg-circle.svg similarity index 100% rename from assets/haditha/font-icons/close-bg-circle.svg rename to assets/haditha/images/font-icons/close-bg-circle.svg diff --git a/assets/haditha/font-icons/close-circle.svg b/assets/haditha/images/font-icons/close-circle.svg similarity index 100% rename from assets/haditha/font-icons/close-circle.svg rename to assets/haditha/images/font-icons/close-circle.svg diff --git a/assets/haditha/font-icons/close.svg b/assets/haditha/images/font-icons/close.svg similarity index 100% rename from assets/haditha/font-icons/close.svg rename to assets/haditha/images/font-icons/close.svg diff --git a/assets/haditha/font-icons/color-swatch.svg b/assets/haditha/images/font-icons/color-swatch.svg similarity index 100% rename from assets/haditha/font-icons/color-swatch.svg rename to assets/haditha/images/font-icons/color-swatch.svg diff --git a/assets/haditha/font-icons/contact-us.svg b/assets/haditha/images/font-icons/contact-us.svg similarity index 100% rename from assets/haditha/font-icons/contact-us.svg rename to assets/haditha/images/font-icons/contact-us.svg diff --git a/assets/haditha/font-icons/copyright.svg b/assets/haditha/images/font-icons/copyright.svg similarity index 100% rename from assets/haditha/font-icons/copyright.svg rename to assets/haditha/images/font-icons/copyright.svg diff --git a/assets/haditha/font-icons/dropdown-chevron-down.svg b/assets/haditha/images/font-icons/dropdown-chevron-down.svg similarity index 100% rename from assets/haditha/font-icons/dropdown-chevron-down.svg rename to assets/haditha/images/font-icons/dropdown-chevron-down.svg diff --git a/assets/haditha/font-icons/edit-bg-circle.svg b/assets/haditha/images/font-icons/edit-bg-circle.svg similarity index 100% rename from assets/haditha/font-icons/edit-bg-circle.svg rename to assets/haditha/images/font-icons/edit-bg-circle.svg diff --git a/assets/haditha/font-icons/explore.svg b/assets/haditha/images/font-icons/explore.svg similarity index 100% rename from assets/haditha/font-icons/explore.svg rename to assets/haditha/images/font-icons/explore.svg diff --git a/assets/haditha/font-icons/hashtag.svg b/assets/haditha/images/font-icons/hashtag.svg similarity index 100% rename from assets/haditha/font-icons/hashtag.svg rename to assets/haditha/images/font-icons/hashtag.svg diff --git a/assets/haditha/font-icons/home.svg b/assets/haditha/images/font-icons/home.svg similarity index 100% rename from assets/haditha/font-icons/home.svg rename to assets/haditha/images/font-icons/home.svg diff --git a/assets/haditha/font-icons/library.svg b/assets/haditha/images/font-icons/library.svg similarity index 100% rename from assets/haditha/font-icons/library.svg rename to assets/haditha/images/font-icons/library.svg diff --git a/assets/haditha/font-icons/logout.svg b/assets/haditha/images/font-icons/logout.svg similarity index 100% rename from assets/haditha/font-icons/logout.svg rename to assets/haditha/images/font-icons/logout.svg diff --git a/assets/haditha/font-icons/menu.svg b/assets/haditha/images/font-icons/menu.svg similarity index 100% rename from assets/haditha/font-icons/menu.svg rename to assets/haditha/images/font-icons/menu.svg diff --git a/assets/haditha/font-icons/minus.svg b/assets/haditha/images/font-icons/minus.svg similarity index 100% rename from assets/haditha/font-icons/minus.svg rename to assets/haditha/images/font-icons/minus.svg diff --git a/assets/haditha/font-icons/more-2.svg b/assets/haditha/images/font-icons/more-2.svg similarity index 100% rename from assets/haditha/font-icons/more-2.svg rename to assets/haditha/images/font-icons/more-2.svg diff --git a/assets/haditha/font-icons/no-result.svg b/assets/haditha/images/font-icons/no-result.svg similarity index 100% rename from assets/haditha/font-icons/no-result.svg rename to assets/haditha/images/font-icons/no-result.svg diff --git a/assets/haditha/font-icons/note.svg b/assets/haditha/images/font-icons/note.svg similarity index 100% rename from assets/haditha/font-icons/note.svg rename to assets/haditha/images/font-icons/note.svg diff --git a/assets/haditha/font-icons/pencil.svg b/assets/haditha/images/font-icons/pencil.svg similarity index 100% rename from assets/haditha/font-icons/pencil.svg rename to assets/haditha/images/font-icons/pencil.svg diff --git a/assets/haditha/font-icons/robot-indicator.svg b/assets/haditha/images/font-icons/robot-indicator.svg similarity index 100% rename from assets/haditha/font-icons/robot-indicator.svg rename to assets/haditha/images/font-icons/robot-indicator.svg diff --git a/assets/haditha/font-icons/search-2.svg b/assets/haditha/images/font-icons/search-2.svg similarity index 100% rename from assets/haditha/font-icons/search-2.svg rename to assets/haditha/images/font-icons/search-2.svg diff --git a/assets/haditha/font-icons/search-3.svg b/assets/haditha/images/font-icons/search-3.svg similarity index 100% rename from assets/haditha/font-icons/search-3.svg rename to assets/haditha/images/font-icons/search-3.svg diff --git a/assets/haditha/font-icons/search.svg b/assets/haditha/images/font-icons/search.svg similarity index 100% rename from assets/haditha/font-icons/search.svg rename to assets/haditha/images/font-icons/search.svg diff --git a/assets/haditha/font-icons/tag-active.svg b/assets/haditha/images/font-icons/tag-active.svg similarity index 100% rename from assets/haditha/font-icons/tag-active.svg rename to assets/haditha/images/font-icons/tag-active.svg diff --git a/assets/haditha/font-icons/tag.svg b/assets/haditha/images/font-icons/tag.svg similarity index 100% rename from assets/haditha/font-icons/tag.svg rename to assets/haditha/images/font-icons/tag.svg diff --git a/assets/haditha/images/font-icons/user-icon.svg b/assets/haditha/images/font-icons/user-icon.svg new file mode 100644 index 0000000..6e163d7 --- /dev/null +++ b/assets/haditha/images/font-icons/user-icon.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/assets/haditha/images/khosro-panahi.png b/assets/haditha/images/khosro-panahi.png new file mode 100644 index 0000000..8cc738c Binary files /dev/null and b/assets/haditha/images/khosro-panahi.png differ diff --git a/assets/haditha/images/library/cover-four.jpg b/assets/haditha/images/library/cover-four.jpg new file mode 100644 index 0000000..81f6337 Binary files /dev/null and b/assets/haditha/images/library/cover-four.jpg differ diff --git a/assets/haditha/images/library/cover-three.jpg b/assets/haditha/images/library/cover-three.jpg new file mode 100644 index 0000000..1018d7f Binary files /dev/null and b/assets/haditha/images/library/cover-three.jpg differ diff --git a/assets/haditha/images/library/cover-two.jpg b/assets/haditha/images/library/cover-two.jpg new file mode 100644 index 0000000..259f38f Binary files /dev/null and b/assets/haditha/images/library/cover-two.jpg differ diff --git a/assets/haditha/images/library/first-cover.jpg b/assets/haditha/images/library/first-cover.jpg new file mode 100644 index 0000000..73765f7 Binary files /dev/null and b/assets/haditha/images/library/first-cover.jpg differ diff --git a/assets/haditha/images/library/totally.jpg b/assets/haditha/images/library/totally.jpg new file mode 100644 index 0000000..5d5546e Binary files /dev/null and b/assets/haditha/images/library/totally.jpg differ diff --git a/assets/haditha/images/library/totally.webp b/assets/haditha/images/library/totally.webp new file mode 100644 index 0000000..ada124e Binary files /dev/null and b/assets/haditha/images/library/totally.webp differ diff --git a/assets/haditha/images/section-three-bgi.webp b/assets/haditha/images/section-three-bgi.webp index a7ea6cd..a722038 100644 Binary files a/assets/haditha/images/section-three-bgi.webp and b/assets/haditha/images/section-three-bgi.webp differ diff --git a/assets/haditha/images/video/section-three-gif.mp4 b/assets/haditha/images/video/section-three-gif.mp4 new file mode 100644 index 0000000..268146e Binary files /dev/null and b/assets/haditha/images/video/section-three-gif.mp4 differ diff --git a/assets/haditha/scss/haditha.css b/assets/haditha/scss/haditha.css index 99270c9..9198ad1 100644 --- a/assets/haditha/scss/haditha.css +++ b/assets/haditha/scss/haditha.css @@ -16,9 +16,13 @@ /* custom imports */ @import "../../../../../assets/common/scss/_IRANSansX.scss"; @import "../../../../../assets/common/scss/_takrim.scss"; +@import "../../../../../assets/common/scss/_vazir.scss"; +@import "../../../../../assets/common/scss/_estedad.scss"; +@import "../../../../../assets/common/scss/_sahel-single-font-weight.scss"; @theme { - --font-sans: "IRANSansX", "Public Sans", sans-serif; + --font: vazir, sahel, estadad, IRANSansX, "Public Sans", sans-serif; + --ar-font: Takrim; --breakpoint-sm: 360px; --breakpoint-md: 720px; --breakpoint-lg: 992px; @@ -49,18 +53,23 @@ html { height: 100%; direction: rtl; text-align: right; - font-family: IRANSansX; + font-family: var(--font); scroll-behavior: smooth; body { height: 100%; direction: rtl; text-align: right; - font-family: IRANSansX; + font-family: var(--font); scroll-behavior: smooth; + + padding: 0 !important; + margin: 0px !important; + overflow: auto !important; } } -.haditha-system { +.haditha-system, +.hadith-system { height: 100%; display: flex; flex-direction: column; @@ -68,7 +77,18 @@ html { .isolate { flex-grow: 1; } + + .text__orange { + padding: 0 3px; + background-color: rgb(255, 250, 155); + /* background-color: rgb(255, 223, 203); */ + } + /* .iconify { */ + /* width: 1.72em; */ + /* height: 1.72em; */ + /* } */ } + .firefox-scrollbar { scrollbar-width: thin; scrollbar-color: #ccc #eee; diff --git a/components/haditha/AutoComplation.vue b/components/haditha/AutoComplation.vue index d8da47a..a229851 100644 --- a/components/haditha/AutoComplation.vue +++ b/components/haditha/AutoComplation.vue @@ -162,7 +162,7 @@ const state = reactive({ // #region methods const clearSimilar = () => { - console.info("clearSimilar"); + // console.info("clearSimilar"); }; // const onUpdateModel = (newVal: boolean | InputMenuItem | any) => { @@ -418,7 +418,8 @@ onMounted(() => {
- + { > - +
{ padding: 5px 7px; background: #1b213266; - font-family: IRANSansX; + font-family: var(--font); font-weight: 500; font-size: 10px; line-height: 15px; @@ -735,7 +736,7 @@ onMounted(() => { color: #ffffff; } .text { - font-family: Takrim; + font-family: var(--ar-font); font-weight: 400; font-size: 16px; line-height: 32px; @@ -823,7 +824,7 @@ onMounted(() => { border: 0.3px solid #e0e0e0; box-shadow: 0px 1px 4px 0px #0000000d; - font-family: IRANSansX; + font-family: var(--font); font-weight: 300; font-size: 14px; line-height: 21px; @@ -846,7 +847,7 @@ onMounted(() => { border: 0.3px solid #e0e0e0; box-shadow: 0px 1px 4px 0px #0000000d; color: #8a92a8; - font-family: IRANSansX; + font-family: var(--font); font-weight: 400; font-size: 13px; line-height: 20px; @@ -904,7 +905,7 @@ onMounted(() => { .synonymItem { .title { - font-family: IRANSansX; + font-family: var(--font); font-weight: 400; font-size: 14px; line-height: 100%; @@ -928,7 +929,7 @@ onMounted(() => { border: 0.3px solid #d9d9d9; background: #f0f1f4; - font-family: IRANSansX; + font-family: var(--font); font-weight: 400; font-size: 12px; line-height: 100%; diff --git a/components/haditha/CardList.vue b/components/haditha/CardList.vue index b156171..8b36b42 100644 --- a/components/haditha/CardList.vue +++ b/components/haditha/CardList.vue @@ -33,7 +33,7 @@ const goToLibraryShow = (item) => { { fit="auto" quality="80" placeholder - src="/img/haditha/sample-bgi.svg" - /> + src="/img/haditha/library/totally.webp" + /> +

{{ item?._source?.title }}

{{ item?._source?.vol_title + item?._source?.vol_num }} @@ -97,7 +93,7 @@ const goToLibraryShow = (item) => { .title { margin-top: 0.7em; - font-family: IRANSansX; + font-family: var(--font); font-weight: 400; font-size: 13px; line-height: 19.5px; @@ -107,7 +103,7 @@ const goToLibraryShow = (item) => { } .version { - font-family: IRANSansX; + font-family: var(--font); font-weight: 400; font-size: 10px; line-height: 15px; diff --git a/components/haditha/NavigationMenu.vue b/components/haditha/NavigationMenu.vue index e144e05..97f7c75 100644 --- a/components/haditha/NavigationMenu.vue +++ b/components/haditha/NavigationMenu.vue @@ -3,7 +3,7 @@ import { useAuthStore } from "@stores/authStore"; // { // label: "چت بات", -// icon: "i-haditha-chat-bot", +// icon: "haditha:chat-bot", // to: "/haditha/chat-bot", // slot: "chat-bot", // class: "flex flex-col lg:flex-row justify-center items-center", @@ -11,15 +11,15 @@ import { useAuthStore } from "@stores/authStore"; const items = ref([ { - label: "حانه", - icon: "i-haditha-home", + label: "خانه", + icon: "haditha:home", to: "/haditha", descrption: "صفحه اصلی", class: "flex flex-col lg:flex-row justify-center items-center hide-label", }, { label: "جستجو", - icon: "i-haditha-search", + icon: "haditha:search", to: "/haditha/search", slot: "search", class: "flex flex-col lg:flex-row justify-center items-center", @@ -27,7 +27,7 @@ const items = ref([ { label: "کتابخانه", - icon: "i-haditha-library", + icon: "haditha:library", to: "/haditha/library", slot: "library", class: "flex flex-col lg:flex-row justify-center items-center", @@ -35,46 +35,46 @@ const items = ref([ { label: "نشان شده ها", - icon: "i-haditha-bookmark", + icon: "haditha:bookmark", to: "/haditha/favorites", class: "flex flex-col lg:hidden justify-center items-center", }, { label: "دیگر", - icon: "i-haditha-menu", + icon: "haditha:menu", class: - "flex flex-col lg:hidden justify-center items-center hide-chevron other /haditha/other", + "flex flex-col lg:hidden justify-center items-center hide-chevron other haditha:other", children: [ { label: "ورود / ثبت نام", - icon: "i-haditha-user", + icon: "haditha:user-icon", to: "/haditha/login", }, { label: "کتابخانه", - icon: "i-haditha-library", + icon: "haditha:library", to: "/haditha/library", }, { label: "در باره ما", - icon: "i-haditha-about-us", + icon: "haditha:about-us", to: "/haditha/about-us", }, { label: "تماس با ما", - icon: "i-haditha-contact-us", + icon: "haditha:contact-us", to: "/haditha/contact-us", }, { label: "قوانین و مقررات", - icon: "i-haditha-copyright", + icon: "haditha:copyright", to: "/haditha/rules", }, { label: "خروج از حساب", - icon: "i-haditha-logout", + icon: "haditha:logout", type: "button" as const, onSelect(e: Event) { e.preventDefault(); @@ -85,35 +85,41 @@ const items = ref([ }, ]); -const leftItem = computed(() => [ +const desktopLeftMenu = ref([ { label: "نشان شده ها", - icon: "i-haditha-bookmark", + icon: "haditha:bookmark", to: "/haditha/favorites", }, { label: "Guide", - icon: "i-haditha-menu", + icon: "haditha:menu", children: [ + { + label: "ورود / ثبت نام", + icon: "haditha:user-icon", + to: "/haditha/login", + }, + { label: "در باره ما", - icon: "i-haditha-about-us", + icon: "haditha:about-us", to: "/haditha/about-us", }, { label: "تماس با ما", - icon: "i-haditha-contact-us", + icon: "haditha:contact-us", to: "/haditha/contact-us", }, { label: "قوانین و مقررات", - icon: "i-haditha-copyright", + icon: "haditha:copyright", to: "/haditha/rules", }, { label: "خروج از حساب", - icon: "i-haditha-logout", + icon: "haditha:logout", type: "button" as const, onSelect(e: Event) { e.preventDefault(); @@ -128,28 +134,50 @@ const isMobile = ref(false); const rerenderNavigation = ref(1); const { isAuthenticatedGetter, isRealUserGetter } = useAuthStore(); -const setMenu = () => { +const filterLeftItem = () => { + if (isAuthenticatedGetter) { + let otherItemChildren = desktopLeftMenu.value[1].children.filter( + (i) => i.icon != "haditha:user-icon" + ); + desktopLeftMenu.value[1].children = otherItemChildren; + } else { + let otherItemChildren = desktopLeftMenu.value[1].children.filter( + (i) => i.icon != "haditha:logout" + ); + + desktopLeftMenu.value[1].children = otherItemChildren; + rerenderNavigation.value++; + } +}; +const filterRightItem = () => { if (isAuthenticatedGetter) { let otherItem = items.value.find((item) => { - return item.class.includes("/haditha/other"); + return item.class.includes("haditha:other"); }); let otherItemChildren = otherItem.children.filter( - (i) => i.to != "/haditha/login" + (i) => i.icon != "haditha:user-icon" ); otherItem.children = otherItemChildren; } else { - let otherItem = items.value.find((item) => { - return item.class.includes("/haditha/other"); + let otherItemIndex = items.value.findIndex((item) => { + return item.class.includes("haditha:other"); }); - let otherItemChildren = otherItem.children.filter( - (i) => i.icon != "i-haditha-logout" + let otherItemChildren = items.value[otherItemIndex].children.filter( + (i) => i.icon != "haditha:logout" ); - otherItem.children = otherItemChildren; + + items.value[otherItemIndex].children = otherItemChildren; + rerenderNavigation.value++; } }; +const setMenu = () => { + filterRightItem(); + filterLeftItem(); +}; + setMenu(); // if(!(isAuthenticatedGetter && isRealUserGetter)) @@ -185,8 +213,8 @@ onMounted(() => { linkTrailingBadge: 'linkTrailingBadge', }" /> -