Merge pull request #37 from amanshuraikwar/ui-update

ui update

Author: amanshuraikwar

project-files/Portfolio/markdown/portfolio.md

@@ -1,33 +1,42 @@
 # My Portfolio
-#Date December 25, 2021
+#Date December 27, 2021
 
-This is my portfolio. It is a KMM project which runs on Web, Android, iOS. The business logic is written in Kotlin. The Web app is written in Kotlin, built using Jetpack Compose for Web. The Android app is written in Kotlin, built using Jetpack Compose. The iOS app UI is written in Swift, built using Swift UI and it uses the KMM shared module for business logic.
+This is my portfolio. It is a KMM project which currently supports Web, Android & iOS clients coming soon. The Web app is written in Kotlin, built using Jetpack Compose for Web and it has a KMM shared module for business logic.
 
-### Building the Web App
+### Web App
 
 Just run the kotlin script file buildWebsite.kts, it will spit out the built website in build/ folder.
 
-```
+```shell
 kotlinc -script buildWebsite.kts
 ```
 
-Make sure you have Kotlin 1.6.0 CLI and Java 11 installed. Or, just run the Build Web HTML & JS Files workflow and download the artifacts.
+Make sure you have Kotlin 1.6.0 CLI and Java 11 installed.
 
-### Building the Android App
+Run tests for shared module:
 
-Coming soon...
+```shell
+./gradlew :shared:cleanJsBrowserTest :shared:jsBrowserTest
+```
 
-### Building the iOS App
+### Android App
 
 Run tests for shared module:
-```
+
+```shell
 ./gradlew :shared:cleanTestDebugUnitTest :shared:testDebugUnitTest
 ```
 
+### iOS App
+
+Coming soon...
+
 ### Get the App
 
 !Btn[Go to the Web App](https://amanshuraikwar.github.io)
 
+!Btn[Go to the source code](https://github.com/amanshuraikwar/amanshuraikwar.github.io)
+
 ### Special Thanks :)
 
 Special thanks to John O'Reilly's  People in Space repo, which I found extremely helpful for getting started with KMM.

project-files/Portfolio/shared/src/commonTest/kotlin/io.github.amanshuraikwar.portfolio/ThemeDataTest.kt

@@ -97,6 +97,7 @@ class ThemeDataTest {
     }
     //endregion
 
+    //region theme colors name
     @Test
     @JsName("defaultSelectedThemeColorsNameAndTheThemeExists")
     fun `default selected theme colors name and the theme exists`() {
@@ -249,7 +250,9 @@ class ThemeDataTest {
             )
         }
     }
+    //endregion
 
+    //region theme colors
     @Test
     @JsName("defaultSelectedThemeColorsAndTheThemeExists")
     fun `default selected theme colors and the theme exists`() {
@@ -393,7 +396,9 @@ class ThemeDataTest {
             )
         }
     }
+    //endregion
 
+    //region theme data
     @Test
     @JsName("defaultThemeData")
     fun `default theme data`() {
@@ -640,6 +645,7 @@ class ThemeDataTest {
             )
         }
     }
+    //endregion
 
     companion object {
         private fun String.isAccurateColorString(): Boolean {
@@ -699,91 +705,4 @@ class ThemeDataTest {
         private val MOCK_THEME_DATA_API_RESPONSE =
             Json.encodeToString(ThemeDataResponse.serializer(), DEFAULT_THEME_DATA_RESPONSE)
     }
-
-    /*
-    @Test
-    @JsName("verifyLocalJsonSerializationIsWorking")
-    fun `verify local json serialization is working`() {
-        val mockEngine = MockEngine { request ->
-            if (request.url.toString().endsWith("/theme.json")) {
-                respond(
-                    content = ByteReadChannel(
-                        readBinaryResource("api/theme.json").toString()
-                    ),
-                    status = HttpStatusCode.OK,
-                    headers = headersOf(HttpHeaders.ContentType, "application/json")
-                )
-            } else {
-                respond(content = ByteReadChannel(""))
-            }
-        }
-
-        val portfolioApi = PortfolioApi(
-            PortfolioApi.createHttpClient(
-                engine = mockEngine,
-                enableNetworkLogs = true
-            )
-        )
-
-        runTest {
-            assertEquals(
-                ThemeDataResponse(
-                    listOf(
-                        ThemeColorsDataResponse(
-                            name = "Dark Salmon",
-                            isDark = true,
-                            primaryColor = "#FFFFCDD2",
-                            onPrimaryColor = "#FF4E342E",
-                            surfaceColor = "#FF212121",
-                            onSurfaceColor = "#FFffffff",
-                            errorColor = "#FFE57373",
-                            onErrorColor = "#FF4E342E",
-                        ),
-                        ThemeColorsDataResponse(
-                            name = "Light Blue",
-                            isDark = false,
-                            primaryColor = "#ffEA5C5A",
-                            onPrimaryColor = "#FFffffff",
-                            surfaceColor = "#ffCDECF9",
-                            onSurfaceColor = "#FF030204",
-                            errorColor = "#FFE57373",
-                            onErrorColor = "#FF212121",
-                        ),
-                        ThemeColorsDataResponse(
-                            name = "Matt D'av Ella",
-                            isDark = false,
-                            primaryColor = "#ffE35638",
-                            onPrimaryColor = "#FFFADACA",
-                            surfaceColor = "#ffFBF8EC",
-                            onSurfaceColor = "#FF24242C",
-                            errorColor = "#FFE57373",
-                            onErrorColor = "#FF212121",
-                        ),
-                        ThemeColorsDataResponse(
-                            name = "Google",
-                            isDark = false,
-                            primaryColor = "#ff4285F4",
-                            onPrimaryColor = "#FFffffff",
-                            surfaceColor = "#ffffffff",
-                            onSurfaceColor = "#FF212121",
-                            errorColor = "#FFE57373",
-                            onErrorColor = "#FF212121",
-                        ),
-                        ThemeColorsDataResponse(
-                            name = "Spotify",
-                            isDark = true,
-                            primaryColor = "#ff1FDF64",
-                            onPrimaryColor = "#FF212121",
-                            surfaceColor = "#ff212121",
-                            onSurfaceColor = "#FFFFFFFF",
-                            errorColor = "#FFE57373",
-                            onErrorColor = "#FF212121",
-                        )
-                    )
-                ),
-                portfolioApi.getThemeData()
-            )
-        }
-    }
-     */
 }

project-files/Portfolio/web/src/jsMain/kotlin/com/sample/content/Footer.kt

@@ -59,15 +59,6 @@ fun Footer(
                 classes(WtContainer.wtContainerSm)
             }
         ) {
-            GithubBuildStatus(
-                attrs = {
-                    classes(
-                        WtOffsets.wtTopOffset96,
-                        WtOffsets.wtTopOffsetSm48,
-                    )
-                }
-            )
-
             Div(
                 attrs = {
                     classes(
@@ -83,11 +74,20 @@ fun Footer(
                 Text(madeWith)
             }
 
+            GithubBuildStatus(
+                attrs = {
+                    classes(
+                        WtOffsets.wtTopOffset24,
+                        WtOffsets.wtTopOffsetSm12,
+                    )
+                }
+            )
+
             Div(
                 attrs = {
                     classes(
-                        WtOffsets.wtTopOffset48,
-                        WtOffsets.wtTopOffsetSm24,
+                        WtOffsets.wtTopOffset96,
+                        WtOffsets.wtTopOffsetSm48,
                     )
                     style {
                         display(DisplayStyle.Flex)

project-files/Portfolio/web/src/jsMain/resources/api/portfolio_data.json

@@ -47,7 +47,7 @@
     {
       "id": "portfolio",
       "title": "My Portfolio",
-      "description": "This beautiful webpage you are on right now. Built using KMM.",
+      "description": "This beautiful webpage you are on right now. Built using KMM & Jetpack Compose.",
       "appLinks": [
         {
           "type": "github",
@@ -60,11 +60,15 @@
     {
       "id": "nextbus",
       "title": "Next Bus SG",
-      "description": "A beautiful bus timing app for Singapore built with Jetpack Compose",
+      "description": "A beautiful bus timing app for Singapore built with Jetpack Compose, Swift UI & KMM",
       "appLinks": [
         {
           "type": "playstore",
           "url": "https://play.google.com/store/apps/details?id=io.github.amanshuraikwar.nxtbuz.release"
+        },
+        {
+          "type": "other",
+          "url": "https://amanshuraikwar.github.io/nextbus/"
         }
       ],
       "maintained": true,