Skip to content

Commit

Permalink
Merge pull request #132 from tfd-ed/master
Browse files Browse the repository at this point in the history
Master -> Dev
  • Loading branch information
tfd-ed authored Jan 23, 2024
2 parents 1bc6f2d + e251f72 commit 5901889
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div
v-for="(item, index) in social"
:key="index"
class="flex items-center justify-center"
class="flex items-center justify-center hover:scale-110 transition duration-100 ease-in-out"
>
<a :href="item.link" target="_blank">
<img
Expand Down
30 changes: 19 additions & 11 deletions components/modals/purchase-modal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
{{ $t("pay_via") }}
<img src="https://i.imgur.com/MGe6N9C.png" class="h-14" />
</button>
<button
v-if="getCourse.type === 'PAID'"
class="flex items-center justify-center w-full px-8 py-2 mt-4 capitalize text-white bg-bakong rounded-lg transition hover:scale-90"
@click="openPayment(getCourse.bkPaymentLink)"
>
{{ $t("pay_via") }}
<img src="/bakong_icon.png" class="h-14" />
</button>
<!-- <button-->
<!-- v-if="getCourse.type === 'PAID'"-->
<!-- class="flex items-center justify-center w-full px-8 py-2 mt-4 capitalize text-white bg-bakong rounded-lg transition hover:scale-90"-->
<!-- @click="openPayment(getCourse.bkPaymentLink)"-->
<!-- >-->
<!-- {{ $t("pay_via") }}-->
<!-- <img src="/bakong_icon.png" class="h-14" />-->
<!-- </button>-->
<div class="space-y-2 py-4">
<details class="group">
<summary
Expand Down Expand Up @@ -147,11 +147,19 @@
id="transaction_number"
v-model="transaction_number"
name="transaction_number"
label="transaction_number"
:label="
paymentType === 'ABA'
? 'transaction_number'
: paymentType === 'Bakong'
? 'transaction_number_bakong'
: 'transaction_number_other'
"
:rules="
paymentType === 'ABA'
? 'required|digits:15'
: 'required|alpha_num|max:8'
: paymentType === 'Bakong'
? 'required|alpha_num|max:8'
: 'required'
"
:auto-complete="false"
/>
Expand Down Expand Up @@ -231,7 +239,7 @@ export default {
return {
transaction_number: "",
paymentType: "",
options: ["ABA", "Bakong"],
options: ["ABA", "Bakong", "Other (ACELEDA, Wing, etc.)"],
loading: false,
submitting: false,
submitted: false,
Expand Down
2 changes: 2 additions & 0 deletions content/en/about-us.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ I love expressing my opinion by writing. Writing improves my vocabulary. It can
The only knowledge I can share at that time (2014) was `English`. It wasn't perfect. Why did I have such a stomach to leave my comfort zone? I think it has something to do with `motivation`. I always have curiosity about how things work around me. I started a small blog with Google blogger when I was in grade 10. It wasn't a success, but it was fun. I learned about `html` and how to style my element. By keep doing this over and over, I gained knowledge and perfection along the way. I wasn't even aware of that. I hope this blog can inspire the younger generation to seek positive development in life.

<social-card></social-card>

## A little bit about me

**Chau Dara** is my norm de guerre where I used to present myself on social media
Expand Down
2 changes: 2 additions & 0 deletions content/km/about-us.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ color3: "bg-aba"
ចំណេះដឹងតែមួយគត់ដែលខ្ញុំអាចចែករំលែកនៅពេលនោះ (២០១៤) គឺ **ភាសាអង់គ្លេស** ។ វាមិនល្អឥតខ្ចោះទេ។ ហេតុ​អ្វី​បាន​ជា​ខ្ញុំ​អាច ចាក​ចេញ​ពី​តំបន់​សុខ​ស្រួល( Comfort Zone) មកធ្វេីបែបនេះ? ខ្ញុំគិតថាវាដោយសារតែ**ចំណង់** ។ ខ្ញុំតែងតែមានការចង់ដឹង ថាអ្វីៗនៅជុំវិញខ្លួនខ្ញុំដំណើរការដូចម្តេច។ ខ្ញុំបានចាប់ផ្តើមប្លក់តូចមួយជាមួយ Google Blogger ពេលខ្ញុំរៀនថ្នាក់ទី ១០ ។ វាអត់ជោគជ័យទេ ប៉ុន្តែមានអារម្មណ៍សប្បាយពេលធ្វើវា។ ខ្ញុំរៀនពី `html` របៀបកំណត់ `html element`។ ដោយបន្តធ្វើបែបនេះម្តងហើយម្តងទៀត ខ្ញុំបានទទួលចំណេះដឹង និងភាពល្អឥតខ្ចោះបន្តិចម្តងៗ។ ខ្ញុំ​ក៏​មិន​ចាប់អារម្មណ៍ថាសមត្ថភាពរបស់ខ្ញុំបានរីកចំរើនដែរ។ ខ្ញុំសង្ឃឹមថាគេហទំព័រ នេះអាចបំផុសគំនិតក្មេងៗជំនាន់ក្រោយឱ្យស្វែងរកការអភិវឌ្ឍន៍ជាវិជ្ជមានក្នុងជីវិត។

<social-card></social-card>

## ប្រវត្តិរបស់ខ្ញុំបន្តិចបន្ទួច

**ចៅ ដារ៉ា** ជាឈ្មោះដែលខ្ញុំប្រើសំរាប់វត្តមាននៅលើបណ្តាញសង្គម ចំណែកឈ្មោះពិតរបស់ខ្ញុំគឺ **ឃាង គឹមអាង** ឈ្មោះជាភាសាចិន **强存志**
Expand Down
4 changes: 3 additions & 1 deletion locales/en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ const messages = {
buy: "Buy",
learn: "Learn",
click_here_to_pay: "Click Here To Pay With",
transaction_number: "#Purchase",
transaction_number: "Purchase#",
transaction_number_bakong: "Transaction Hash",
transaction_number_other: "KHQR_**********",
login_to_purchase: "Login To Purchase",
confirming_payment: "Confirming Payment",
confirming_payment_short: "Confirming",
Expand Down
4 changes: 3 additions & 1 deletion locales/kh-KH.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ const messages = {
buy: "ទិញ",
learn: "ចូលរៀន",
click_here_to_pay: "ចុចទីនេះដើម្បីទូទាត់ជាមួយ",
transaction_number: "លេខកូដ(#Purchase)",
transaction_number: "លេខកូដ (Purchase#)",
transaction_number_bakong: "Transaction Hash",
transaction_number_other: "KHQR_**********",
login_to_purchase: "សូមចុះឈ្មោះជាមុនដើម្បីទិញ",
confirming_payment: "យើងកំពុងបញ្ជាក់ការទូទាត់",
confirming_payment_short: "កំពុងបញ្ជាក់",
Expand Down
5 changes: 4 additions & 1 deletion pages/index.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<section class="px-4 py-12 mx-auto max-w-7xl">
<LazyHerosFounder class="box" />
<LazyCardsSocialCard class="box" />
<SocialCard class="box" />
<LazyCardsQuote
class="box"
quote="about_quote"
Expand All @@ -11,6 +11,7 @@
<template #image>
<div class="flex flex-col space-y-2">
<img
alt="random image"
src="https://picsum.photos/800"
class="object-cover w-36 h-full bg-center rounded-md shadow-xl"
/>
Expand All @@ -21,8 +22,10 @@
</template>

<script>
import SocialCard from "@/components/global/social-card";
export default {
name: "IndexPage",
components: { SocialCard },
head() {
return {
title: this.$config.SITE_TITLE + " | " + this.$t("home"),
Expand Down
5 changes: 5 additions & 0 deletions static/js/social.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ export const socialLink = [
alt: "Facebook",
link: "https://www.facebook.com/ChauDaraScienceEngineer/",
},
{
src: "/logo/linkedin.png",
alt: "LinkedIn",
link: "https://www.linkedin.com/in/qiang-cun-zhi/",
},
{
src: "/logo/Instagram_icon.webp",
alt: "Facebook",
Expand Down
Binary file added static/logo/linkedin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4450,10 +4450,10 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"

[email protected]:
version "2.28.0"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
date-fns@^2.28.0:
version "2.29.3"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==

de-indent@^1.0.2:
version "1.0.2"
Expand Down

0 comments on commit 5901889

Please sign in to comment.