Merge branch 'main' of https://github.com/TeaByte/NakhlahJS

TeaByte · Jan 23, 2024 · 881cde5 · 881cde5
2 parents 43eeecc + f4dc129
commit 881cde5
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 46 deletions.
diff --git a/components/Collapse.tsx b/components/Collapse.tsx
@@ -10,7 +10,7 @@ export default function Collapse(
       <div class="collapse-title text-xl font-medium">
         {title}
       </div>
-      <div class="collapse-content flex flex-col">
+      <div class="collapse-content flex flex-col gap-2">
         {courses.map((course) => (
           <div key={course.slug}>
             <a
@@ -19,7 +19,7 @@ export default function Collapse(
               class="gray-200 hover:opacity-75 list-none"
               style={{ order: course.order }}
             >
-              <h3 class="text-gray-500 font-bold flex gap-1 items-centerrounded-btn mt-2 flex gap-1 items-center">
+              <h3 class="text-gray-500 font-bold flex gap-1 items-centerrounded-btn flex gap-1 items-center">
                 <ProgressCheck slug={course.slug} />
                 {course.title}
               </h3>

diff --git a/components/Courses.tsx b/components/Courses.tsx
@@ -19,7 +19,7 @@ export default function Courses(
           total={total}
         />
       </div>
-      <SW />
+      {/* <SW /> Self-DOS :) */}
       <section class="flex flex-col gap-2 mb-4 mt-6">
         {courses.map((course, index) => {
           // Group of courses

diff --git a/components/Drawer.tsx b/components/Drawer.tsx
@@ -45,7 +45,7 @@ export default function Drawer(
                   <a
                     title={course.title}
                     href={`/${course.slug}`}
-                    class="py-2 gray-200 hover:opacity-75 list-none"
+                    class="gray-200 hover:opacity-75 list-none bg-base-100 rounded-btn py-4"
                     style={{ order: course.order }}
                   >
                     <h3 class="text-gray-500 font-bold flex gap-1 items-center">

diff --git a/components/Footer.tsx b/components/Footer.tsx
@@ -73,7 +73,7 @@ export default function Footer() {
               href="https://t.me/NakhlahChat"
               target="_blank"
             >
-              المجتمع
+              جروب التلغرام
             </a>
           </li>
         </ul>

diff --git a/courses/comments.md b/courses/comments.md
@@ -31,3 +31,7 @@ order: 2
 الهدف من التعليمات البرمجية الخاصة بك، سواء بالنسبة للآخرين أو لنفسك في
 المستقبل.
 </mark>
+
+<div class="quiz">
+قم بكتابه تعليق واضغط على اختبار
+</div>
diff --git a/routes/[...slug].tsx b/routes/[...slug].tsx
@@ -53,7 +53,7 @@ export default function CoursePage(
   return (
     <>
       <Head>
-        <title>نخلة - {course.title}</title>
+        <title>{course.title}</title>
         <meta name="description" content={course.snippet} />
         <meta name="keywords" content={`${course.title}, ${course.snippet}`} />
         <meta property="og:title" content={course.title} />

diff --git a/routes/_layout.tsx b/routes/_layout.tsx
@@ -1,9 +1,10 @@
 import { FreshContext, Handlers, type PageProps } from "$fresh/server.ts";
 import NavBar from "../components/Nav.tsx";
 import Toast from "../islands/Toast.tsx";
-import { populateCache } from "../utils/course-cache.ts";
 
+import { populateCache } from "../utils/course-cache.ts";
 populateCache();
+
 export default async function Layout(req: Request, ctx: FreshContext) {
   return (
     // Don't delete data-theme="dracula", used for defult theme and styles
@@ -22,6 +23,13 @@ export default async function Layout(req: Request, ctx: FreshContext) {
           href="https://fonts.googleapis.com/css2?family=Cairo:wght@300;400;700&display=swap"
           rel="stylesheet"
         />
+
+        <script
+          async
+          src="https://www.googletagmanager.com/gtag/js?id=G-TDHJL7ZT23"
+        >
+        </script>
+
         <link rel="manifest" href="/manifest.json" />
         <script src="/theme-loader.js"></script>
         <script type="module" src="/sw-rg.js"></script>

diff --git a/routes/group/[slug].tsx b/routes/group/[slug].tsx
@@ -5,15 +5,16 @@ import { PageProps } from "$fresh/server.ts";
 import { Course, CourseGroup } from "../../utils/types.ts";
 import { cache } from "../../utils/course-cache.ts";
 
-import CourseCard from "../../components/CourseCard.tsx";
 import Footer from "../../components/Footer.tsx";
 
 import IconChevronDown from "https://deno.land/x/[email protected]/tsx/chevron-down.tsx";
+import ProgressCheck from "@/islands/ProgressCheck.tsx";
+
 interface Props {
   courses: CourseGroup;
 }
 export const handler: Handlers<Props> = {
-  async GET(_req, ctx) {
+  GET(_req, ctx) {
     let foundCourseGroup: CourseGroup | Course | undefined = undefined;
     const toFind = decodeURIComponent(ctx.params.slug);
     foundCourseGroup = cache.courses.find((c) => {
@@ -28,7 +29,7 @@ export const handler: Handlers<Props> = {
 };
 
 export default function CoursePage(props: PageProps<Props>) {
-  const {courses:foundCourseGroup} = props.data;
+  const { courses: foundCourseGroup } = props.data;
   return (
     <>
       <Head>
@@ -44,9 +45,19 @@ export default function CoursePage(props: PageProps<Props>) {
               </h2>
               <IconChevronDown />
             </div>
-            <div class="flex flex-col mt-2 pr-3">
-              {foundCourseGroup.courses.map((innerCourse) => (
-                <CourseCard key={innerCourse.slug} course={innerCourse} />
+            <div class="flex flex-col mt-2 pr-3 gap-3">
+              {foundCourseGroup.courses.map((course) => (
+                <a
+                  title={course.title}
+                  href={`/${course.slug}`}
+                  class="gray-200 hover:opacity-75 list-none"
+                  style={{ order: course.order }}
+                >
+                  <h3 class="text-gray-500 font-bold flex gap-1 items-center rounded-btn">
+                    <ProgressCheck slug={course.slug} />
+                    {course.title}
+                  </h3>
+                </a>
               ))}
             </div>
           </div>

diff --git a/routes/index.tsx b/routes/index.tsx
@@ -2,7 +2,6 @@ import { Head } from "$fresh/runtime.ts";
 import { Handlers } from "$fresh/server.ts";
 import { PageProps } from "$fresh/server.ts";
 
-import { getCourses } from "../utils/course.ts";
 import { Course, CourseGroup } from "../utils/types.ts";
 import { cache } from "../utils/course-cache.ts";
 
@@ -16,19 +15,19 @@ interface Props {
 }
 export const handler: Handlers<Props> = {
   async GET(_req, ctx) {
-    const courses = await getCourses(cache);
+    const courses = cache.courses;
     const total = await getNumberOfCourses();
     return ctx.render({
       total,
-      courses: courses.courses,
+      courses: courses,
     });
   },
 };
 
 export default function BlogIndexPage(
   props: PageProps<Props>,
 ) {
-  const { courses,total } = props.data;
+  const { courses, total } = props.data;
   return (
     <>
       <Head>

diff --git a/static/google29ae9dd15993e53e.html b/static/google29ae9dd15993e53e.html
@@ -0,0 +1 @@
+google-site-verification: google29ae9dd15993e53e.html
diff --git a/static/manifest.json b/static/manifest.json
@@ -1,26 +1,31 @@
 {
-    "theme_color": "#8936FF",
-    "background_color": "#2EC6FE",
-    "icons": [
-        {
-            "purpose": "maskable",
-            "sizes": "512x512",
-            "src": "icon512_maskable.png",
-            "type": "image/png"
-        },
-        {
-            "purpose": "any",
-            "sizes": "512x512",
-            "src": "icon512_rounded.png",
-            "type": "image/png"
-        }
-    ],
-    "orientation": "any",
-    "display": "standalone",
-    "dir": "auto",
-    "lang": "ar",
-    "short_name": "nakhlahjs",
-    "name": "",
-    "start_url": "/",
-    "form_factor": "narrow"
-}
+  "theme_color": "#1f202a",
+  "background_color": "#282a36",
+  "icons": [
+    {
+      "purpose": "maskable",
+      "sizes": "512x512",
+      "src": "icon512_maskable.png",
+      "type": "image/png"
+    },
+    {
+      "purpose": "any",
+      "sizes": "512x512",
+      "src": "icon512_rounded.png",
+      "type": "image/png"
+    }
+  ],
+  "orientation": "any",
+  "display": "standalone",
+  "dir": "auto",
+  "lang": "ar",
+  "short_name": "تطبيق نخلة",
+  "name": "تطبيق نخلة",
+  "start_url": "/",
+  "form_factor": "narrow",
+  "id": "nakhlahjs1.0",
+  "description": "اكتساب مهارات جافاسكربت بسهولة وفعالية",
+  "categories": [
+    "education"
+  ]
+}
diff --git a/static/resizer.js b/static/resizer.js
@@ -50,7 +50,7 @@ document.addEventListener("DOMContentLoaded", function () {
   window.testPassedEffect = function () {
     const duration = 15 * 200,
       animationEnd = Date.now() + duration,
-      defaults = { startVelocity: 30, spread: 360, ticks: 60, zIndex: 0 };
+      defaults = { startVelocity: 30, spread: 360, ticks: 60, zIndex: 999 };
 
     function randomInRange(min, max) {
       return Math.random() * (max - min) + min;

diff --git a/static/theme-loader.js b/static/theme-loader.js
@@ -4,3 +4,8 @@ if (storedTheme) {
 } else {
   localStorage.setItem("selectedTheme", "dracula");
 }
+
+window.dataLayer = window.dataLayer || [];
+function gtag() { dataLayer.push(arguments); }
+gtag('js', new Date());
+gtag('config', 'G-TDHJL7ZT23');
diff --git a/utils/course.ts b/utils/course.ts
@@ -1,7 +1,7 @@
 import { join } from "$std/path/mod.ts";
 import { readJson } from "https://deno.land/[email protected]/fs/read_json.ts";
 import { extract } from "https://deno.land/[email protected]/encoding/front_matter.ts";
-
+import { cache as CourceCache } from "@/utils/course-cache.ts";
 import { Course, CourseAttributes, CourseGroup } from "../utils/types.ts";
 
 export let CoursesCount = 0;
@@ -105,7 +105,7 @@ export async function getCourses(
   cache.courses = merged;
 
   const endTime = performance.now();
-  // console.log(`Caching data took ${(endTime - startTime) / 1000} seconds`);
+  console.log(`Caching data took ${(endTime - startTime) / 1000} seconds`);
   return cache;
 }
 
@@ -114,7 +114,7 @@ export async function getFlatSlugs() {
     // console.log("Using cache");
     return FlatSlugsCache;
   }
-  const { courses } = await getCourses();
+  const courses = CourceCache.courses;
   const slugs = courses.map((c) => {
     if ("courses" in c) {
       c.courses.sort((a, b) => a.order - b.order);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		google-site-verification: google29ae9dd15993e53e.html