Skip to content

Commit

Permalink
Rename the package name, new changes and improvemenets
Browse files Browse the repository at this point in the history
  • Loading branch information
Ellet committed Jan 3, 2024
1 parent bb620ba commit d2902a5
Show file tree
Hide file tree
Showing 117 changed files with 621 additions and 529 deletions.
2 changes: 1 addition & 1 deletion .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion site/.kobweb/site/app.js.map

Large diffs are not rendered by default.

22 changes: 9 additions & 13 deletions site/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
alias(libs.plugins.kobweb.application)
}

group = "net.freshplatform.alrayada_landing_page"
group = "net.freshplatform.alrayada_web"
version = "1.0-SNAPSHOT"

val webDesc =
Expand All @@ -32,10 +32,6 @@ kobweb {
name = "author",
content = "Ahmed Hnewa"
)
// meta {
// httpEquiv = "Content-Security-Policy"
// content = "default-src 'self' cdnjs.cloudflare.com"
// }
meta(
name = "referrer",
content = "no-referrer"
Expand Down Expand Up @@ -74,7 +70,7 @@ kobweb {
)
meta(
name = "copyright",
content = "© 2023 Alrayada"
content = "© 2024 Alrayada"
)
meta(
name = "robots",
Expand Down Expand Up @@ -159,18 +155,18 @@ kotlin {
}
}

// For SEO we will have to use unique urls for each page
// For SEO, we will have to use unique urls for each page
// Here we will use code generator to generate unique pages that redirect to the original pages

val langs = listOf("ar")
val pages = listOf("download_mobile_app", "privacy_policy")
val languages = listOf("ar") // other than English
val pages = listOf("download_mobile_app", "privacy_policy", "delete_account_instructions") // all the pages in the `page` package

val generateLanguaguesPagesTask = tasks.register("generateLanguaguesPages") {
group = "net.freshplatform.alrayada_landing_page"
val generateLanguagesPagesTask = tasks.register("generateLanguagesPages") {
group = "net.freshplatform.alrayada_web"

doLast {
val pagesDirectory = project.file("src/jsMain/kotlin/net/freshplatform/alrayada_landing_page")
langs.forEach { lang ->
val pagesDirectory = project.file("src/jsMain/kotlin/net/freshplatform/alrayada_web")
languages.forEach { lang ->
pages.forEach { page ->

pagesDirectory.resolve("pages/$lang/${page}/Index.kt").apply {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.freshplatform.alrayada_landing_page
package net.freshplatform.alrayada_web

import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
Expand All @@ -15,9 +15,9 @@ import com.varabyte.kobweb.silk.components.style.toModifier
import com.varabyte.kobweb.silk.init.InitSilk
import com.varabyte.kobweb.silk.init.InitSilkContext
import com.varabyte.kobweb.silk.init.registerStyleBase
import net.freshplatform.alrayada_landing_page.core.data.StringRes
import net.freshplatform.alrayada_landing_page.core.services.localization.getStringResource
import net.freshplatform.alrayada_landing_page.utils.updateDocument
import net.freshplatform.alrayada_web.core.data.StringRes
import net.freshplatform.alrayada_web.core.services.localization.getStringResource
import net.freshplatform.alrayada_web.utils.updateDocument
import org.jetbrains.compose.web.css.deg
import org.jetbrains.compose.web.css.px
import org.jetbrains.compose.web.css.rgba
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.freshplatform.alrayada_landing_page.components
package net.freshplatform.alrayada_web.components

import androidx.compose.runtime.Composable
import net.freshplatform.alrayada_landing_page.components.core.MyImage
import net.freshplatform.alrayada_landing_page.core.data.StringRes
import net.freshplatform.alrayada_landing_page.core.services.localization.stringResource
import net.freshplatform.alrayada_landing_page.utils.constants.PublicRes
import net.freshplatform.alrayada_web.components.core.MyImage
import net.freshplatform.alrayada_web.core.data.StringRes
import net.freshplatform.alrayada_web.core.services.localization.stringResource
import net.freshplatform.alrayada_web.utils.constants.PublicRes
import com.varabyte.kobweb.compose.ui.Modifier
import com.varabyte.kobweb.compose.ui.modifiers.maxSize
import org.jetbrains.compose.web.css.px
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package net.freshplatform.alrayada_landing_page.components
package net.freshplatform.alrayada_web.components

import androidx.compose.runtime.*
import net.freshplatform.alrayada_landing_page.components.fa.FaArrowUp
import net.freshplatform.alrayada_landing_page.components.fa.IconSize
import net.freshplatform.alrayada_landing_page.models.ThemeColors
import net.freshplatform.alrayada_web.components.fa.FaArrowUp
import net.freshplatform.alrayada_web.components.fa.IconSize
import net.freshplatform.alrayada_web.models.ThemeColors
import com.varabyte.kobweb.compose.css.CSSTransition
import com.varabyte.kobweb.compose.css.Cursor
import com.varabyte.kobweb.compose.css.FontWeight
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package net.freshplatform.alrayada_landing_page.components
package net.freshplatform.alrayada_web.components

import androidx.compose.runtime.Composable
import net.freshplatform.alrayada_landing_page.components.fa.FaCheck
import net.freshplatform.alrayada_landing_page.components.fa.IconSize
import net.freshplatform.alrayada_landing_page.models.ThemeColors
import net.freshplatform.alrayada_web.components.fa.FaCheck
import net.freshplatform.alrayada_web.components.fa.IconSize
import net.freshplatform.alrayada_web.models.ThemeColors
import com.varabyte.kobweb.compose.css.CSSTransition
import com.varabyte.kobweb.compose.foundation.layout.Box
import com.varabyte.kobweb.compose.ui.Modifier
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.freshplatform.alrayada_landing_page.components
package net.freshplatform.alrayada_web.components

import androidx.compose.runtime.Composable
import net.freshplatform.alrayada_landing_page.models.ThemeColors
import net.freshplatform.alrayada_web.models.ThemeColors
import com.varabyte.kobweb.compose.css.AnimationIterationCount
import com.varabyte.kobweb.compose.css.CSSAnimation
import com.varabyte.kobweb.compose.ui.Modifier
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.freshplatform.alrayada_landing_page.components
package net.freshplatform.alrayada_web.components

import androidx.compose.runtime.Composable
import net.freshplatform.alrayada_landing_page.models.ThemeColors
import net.freshplatform.alrayada_web.models.ThemeColors
import com.varabyte.kobweb.compose.foundation.layout.Box
import com.varabyte.kobweb.compose.ui.Modifier
import com.varabyte.kobweb.compose.ui.modifiers.backgroundColor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.freshplatform.alrayada_landing_page.components
package net.freshplatform.alrayada_web.components

import androidx.compose.runtime.Composable
import net.freshplatform.alrayada_landing_page.components.fa.FaCircle
import net.freshplatform.alrayada_landing_page.components.fa.IconSize
import net.freshplatform.alrayada_landing_page.components.fa.IconStyle
import net.freshplatform.alrayada_landing_page.models.ThemeColors
import net.freshplatform.alrayada_web.components.fa.FaCircle
import net.freshplatform.alrayada_web.components.fa.IconSize
import net.freshplatform.alrayada_web.components.fa.IconStyle
import net.freshplatform.alrayada_web.models.ThemeColors
import com.varabyte.kobweb.compose.css.CSSTransition
import com.varabyte.kobweb.compose.css.Cursor
import com.varabyte.kobweb.compose.ui.Modifier
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package net.freshplatform.alrayada_landing_page.components
package net.freshplatform.alrayada_web.components

import androidx.compose.runtime.*
import com.varabyte.kobweb.compose.css.CSSLengthOrPercentageNumericValue
import net.freshplatform.alrayada_landing_page.core.services.localization.stringResource
import net.freshplatform.alrayada_landing_page.models.HomePageSections
import net.freshplatform.alrayada_landing_page.models.ThemeColors
import net.freshplatform.alrayada_landing_page.utils.ObserveViewportEntered
import net.freshplatform.alrayada_landing_page.utils.constants.Constants
import net.freshplatform.alrayada_web.core.services.localization.stringResource
import net.freshplatform.alrayada_web.models.HomePageSections
import net.freshplatform.alrayada_web.models.ThemeColors
import net.freshplatform.alrayada_web.utils.ObserveViewportEntered
import net.freshplatform.alrayada_web.utils.constants.Constants
import com.varabyte.kobweb.compose.css.CSSTransition
import com.varabyte.kobweb.compose.css.FontWeight
import com.varabyte.kobweb.compose.css.TextAlign
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.freshplatform.alrayada_landing_page.components.core
package net.freshplatform.alrayada_web.components.core

import androidx.compose.runtime.Composable
import net.freshplatform.alrayada_landing_page.styles.MainButtonStyle
import net.freshplatform.alrayada_web.styles.MainButtonStyle
import com.varabyte.kobweb.compose.ui.Modifier
import com.varabyte.kobweb.compose.ui.modifiers.title
import com.varabyte.kobweb.compose.ui.toAttrs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.freshplatform.alrayada_landing_page.components.core
package net.freshplatform.alrayada_web.components.core

import androidx.compose.runtime.Composable
import com.varabyte.kobweb.compose.foundation.layout.Box
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.freshplatform.alrayada_landing_page.components.core
package net.freshplatform.alrayada_web.components.core

import androidx.compose.runtime.Composable
import com.varabyte.kobweb.compose.ui.Modifier
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.freshplatform.alrayada_landing_page.components.fa
package net.freshplatform.alrayada_web.components.fa

import androidx.compose.runtime.Composable
import com.varabyte.kobweb.compose.ui.Modifier
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.freshplatform.alrayada_landing_page.components.fa
package net.freshplatform.alrayada_web.components.fa

import androidx.compose.runtime.Composable
import com.varabyte.kobweb.compose.ui.Modifier
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.freshplatform.alrayada_landing_page.components.stars
package net.freshplatform.alrayada_web.components.stars

import androidx.compose.runtime.Composable
import com.varabyte.kobweb.compose.foundation.layout.Row
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.freshplatform.alrayada_landing_page.components.stars
package net.freshplatform.alrayada_web.components.stars

import androidx.compose.runtime.Composable
import net.freshplatform.alrayada_landing_page.components.fa.FaStar
import net.freshplatform.alrayada_landing_page.components.fa.FaStarHalfStroke
import net.freshplatform.alrayada_landing_page.components.fa.IconSize
import net.freshplatform.alrayada_landing_page.components.fa.IconStyle
import net.freshplatform.alrayada_web.components.fa.FaStar
import net.freshplatform.alrayada_web.components.fa.FaStarHalfStroke
import net.freshplatform.alrayada_web.components.fa.IconSize
import net.freshplatform.alrayada_web.components.fa.IconStyle
import com.varabyte.kobweb.compose.ui.Modifier
import com.varabyte.kobweb.compose.ui.modifiers.color
import org.jetbrains.compose.web.css.Color
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.freshplatform.alrayada_landing_page.core.data
package net.freshplatform.alrayada_web.core.data

enum class StringRes(
val en: String = "",
Expand Down Expand Up @@ -245,8 +245,8 @@ enum class StringRes(
"Alrayada Alarabiah Company for Trading of medical, Laboratory, and Scientific Supplies Ltd., the company was established in Baghdad, Iraq in 2008, to contribute to supporting the comprehensive developments of Iraq in its field of activity. Furthermore, we provide medical solutions for the health care sector with reliable brands and after-sales services. As our company is devoted to the principles of quality and service to ensure that the imported equipment is effective and permanent. Therefore, we do our best to meet the constantly changing requirements of our customers and commercial partners. Moreover, we are proud of being ready to serve our customers, whether on-site or technical support to deal with their multiple needs. Following that, the company invested greatly in recruiting and training the best engineers, specialists, and technicians to meet your continuous technological requirements. We also have a service department fully equipped with highly experienced engineers who provide high-quality repair and maintenance services.",
"شركة الريادة العربية لتجارة المستلزمات الطبية والمخبرية والعلمية المحدودة، تأسست الشركة في بغداد، العراق عام 2008، للمساهمة في دعم التطورات الشاملة للعراق في مجال نشاطها. علاوة على ذلك، نحن نقدم الحلول الطبية لقطاع الرعاية الصحية بعلامات تجارية موثوقة وخدمات ما بعد البيع. حيث أن شركتنا مكرسة لمبادئ الجودة والخدمة لضمان أن المعدات المستوردة فعالة ودائمة. ولذلك، فإننا نبذل قصارى جهدنا لتلبية المتطلبات المتغيرة باستمرار لعملائنا وشركائنا التجاريين. علاوة على ذلك، نحن فخورون بكوننا على استعداد لخدمة عملائنا سواء في الموقع أو الدعم الفني للتعامل مع احتياجاتهم المتعددة. وبعد ذلك، استثمرت الشركة بشكل كبير في توظيف وتدريب أفضل المهندسين والمتخصصين والفنيين لتلبية متطلباتكم التكنولوجية المستمرة. لدينا أيضًا قسم خدمة مجهز بالكامل بمهندسين ذوي خبرة عالية يقدمون خدمات إصلاح وصيانة عالية الجودة."
),
Accountable(
"Accountable",
Responsibility(
"Responsibility",
"المسؤولية"
),
HardWorking(
Expand All @@ -261,10 +261,6 @@ enum class StringRes(
"On-Time Delivery",
"التسليم في الوقت المحدد"
),
Creative(
"Creative",
"الإبداع"
),
CompletedProjects(
"Completed Projects",
"المشاريع المنجزة"
Expand Down Expand Up @@ -455,6 +451,10 @@ enum class StringRes(
"Ensuring Your Confidence. Our dedicated support and maintenance services guarantee the reliability of your lab equipment, fostering trust and seamless operations.",
"ضمان ثقتك. تضمن خدمات الدعم والصيانة المخصصة لدينا موثوقية معدات المختبر الخاصة بك، مما يعزز الثقة والعمليات السلسة."
),
AfterSalesServiceQuality(
"After Sales Service Quality",
"جودة خدمة ما بعد البيع"
),
MinistryOfHigherEducationAndScientificResearch(
"Ministry of Higher Education & Scientific Research",
"وزارة التعليم العالي والبحث العلمي"
Expand Down Expand Up @@ -506,6 +506,14 @@ enum class StringRes(
"Discover the future of medical supply shopping with our innovative mobile app. Your one-stop destination for essential lab supplies—browse, shop, and order directly from us. By downloading the app, you're taking the first step to experience the convenience of quality medical products delivered to your doorstep, effortlessly and securely. Rest assured, your use of the app signifies your agreement with our privacy policy, ensuring your data is protected in the best possible way.",
"اكتشف مستقبل تسوق المستلزمات الطبية من خلال تطبيقنا المبتكر للهاتف المحمول. وجهتك الشاملة للحصول على مستلزمات المختبرات الأساسية - تصفح وتسوق واطلب منا مباشرة. من خلال تنزيل التطبيق، فإنك تتخذ الخطوة الأولى لتجربة راحة المنتجات الطبية عالية الجودة التي يتم توصيلها إلى باب منزلك، دون عناء وأمان. كن مطمئنًا، استخدامك للتطبيق يعني موافقتك على سياسة الخصوصية الخاصة بنا، مما يضمن حماية بياناتك بأفضل طريقة ممكنة.§"
),
DeleteAccountInstructions(
"Delete Account Instructions",
"تعليمات حذف الحساب"
),
DeleteAccountInstructionsDesc(
"Discover step-by-step instructions for deleting your account securely and efficiently.",
"اكتشف التعليمات خطوة بخطوة لحذف حسابك بشكل آمن وفعّال."
),
Whatsapp(
"Whatsapp",
"واتساب"
Expand All @@ -525,5 +533,9 @@ enum class StringRes(
MyMessageIs(
"My message is",
"رسالتي هي"
),
PleaseOpenThisPageOnMobile(
"Please open this page on mobile",
"الرجاء فتح هذه الصفحة على الهاتف المحمول"
)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.freshplatform.alrayada_landing_page.core.router
package net.freshplatform.alrayada_web.core.router

object AppRouter {
// Unfortunately, we can't use those in the pages routeOverride, even though it's a constant in compile time
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package net.freshplatform.alrayada_landing_page.core.services.localization
package net.freshplatform.alrayada_web.core.services.localization

import androidx.compose.runtime.Composable
import net.freshplatform.alrayada_landing_page.core.data.StringRes
import net.freshplatform.alrayada_landing_page.core.services.localization.Local.Arabic
import net.freshplatform.alrayada_landing_page.core.services.localization.Local.English
import net.freshplatform.alrayada_web.core.data.StringRes
import net.freshplatform.alrayada_web.core.services.localization.Local.Arabic
import net.freshplatform.alrayada_web.core.services.localization.Local.English
import kotlinx.browser.document
import kotlinx.browser.window
import org.w3c.dom.HTMLElement
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.freshplatform.alrayada_landing_page.core.services.localization
package net.freshplatform.alrayada_web.core.services.localization

import org.jetbrains.compose.web.attributes.DirType

Expand Down
Loading

0 comments on commit d2902a5

Please sign in to comment.