Skip to content

Commit

Permalink
Merged with main
Browse files Browse the repository at this point in the history
  • Loading branch information
SansCaar committed Jul 19, 2024
2 parents da86173 + cd602f3 commit 9a967a3
Show file tree
Hide file tree
Showing 42 changed files with 3,404 additions and 1,752 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Tests
on:
push:
branches:
- '*'
- "**"

jobs:
test_build:
Expand All @@ -16,17 +16,20 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '20' # Use Node.js 20.x
node-version: "20" # Use Node.js 20.x

- uses: pnpm/action-setup@v4
with:
version: 8

- name: Install dependencies
run: pnpm -C nepalingo-web install

- name: Lint code
run: pnpm -C nepalingo-web run lint
run: pnpm -C nepalingo-web run lint

- name: Check Prettier
run: pnpm -C nepalingo-web run format-check

- name: Test Build
run: pnpm -C nepalingo-web run build
run: pnpm -C nepalingo-web run build
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ The contributors of this project are participants of Incubate Nepal.
</table>

### Peer Mentor

#### Hemanta Bhandari

<table>
<tr>
<td width=150>
Expand All @@ -50,6 +52,7 @@ The contributors of this project are participants of Incubate Nepal.
### Mentees

#### Saphal Upreti

<table>
<tr>
<td width=150>
Expand Down Expand Up @@ -88,6 +91,7 @@ The contributors of this project are participants of Incubate Nepal.
</table>

#### Puja Tajpuriya

<table>
<tr>
<td width=150>
Expand All @@ -99,7 +103,8 @@ The contributors of this project are participants of Incubate Nepal.
</tr>
</table>

#### Aditya Bikram Thakur
#### Aditya Bikram Thakur

<table>
<tr>
<td width=150>
Expand All @@ -119,7 +124,7 @@ The contributors of this project are participants of Incubate Nepal.
<img src="README-photos/devakirawal.jpeg" alt="Image of Devaki Rawal"/>
</td>
<td>
Devaki Rawal is a high school graduate and a tech enthusiast, always eager to spread digital literacy. In her free time, she loves teaching children. She challenges herself every day to become one step better than yesterday. Devaki enjoys traveling, watching Shark Tank, and teaching. She is always open to learning and exploring new things every day.
Devaki Rawal is a high school graduate and a tech enthusiast, always eager to spread digital literacy programs. In her free time, she loves teaching children. She challenges herself every day to become one step better than yesterday. Devaki enjoys traveling, watching Shark Tank, and teaching. She is always open to learning and exploring new things every day.
</td>
</tr>
</table>
2 changes: 2 additions & 0 deletions nepalingo-web/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
VITE_NEPALBHASA_API_URL=https://subhash.net.np
VITE_GOOGLE_ANALYTICS_TRACKING_ID = "G-DR5RGQ8NZ1"
VITE_SUPABASE_URL=https://iupkdpieqxplryytuerr.supabase.co
VITE_SUPABASE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Iml1cGtkcGllcXhwbHJ5eXR1ZXJyIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MTk1NDY4MTEsImV4cCI6MjAzNTEyMjgxMX0.FcvSaML1Z0KLzXWAfXI-xL4b9aGc179uI8Bo2Q_glPI
12 changes: 6 additions & 6 deletions nepalingo-web/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
module.exports = {
parser: '@typescript-eslint/parser',
parser: "@typescript-eslint/parser",
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:@typescript-eslint/recommended',
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
],
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
sourceType: "module",
ecmaFeatures: {
jsx: true,
},
},
settings: {
react: {
version: 'detect',
version: "detect",
},
},
};
1 change: 1 addition & 0 deletions nepalingo-web/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pnpm-lock.yaml
42 changes: 21 additions & 21 deletions nepalingo-web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,20 @@ Ensure you have the following installed on your machine:

1. **Clone the repository:**

```sh
git clone https://github.com/nepalcodes/nepalingo.git
cd nepalingo-web
```
```sh
git clone https://github.com/nepalcodes/nepalingo.git
cd nepalingo-web
```

2. **Install pnpm (if you have not done it already)**
```sh
npm install -g pnpm
```
3. **Install dependencies:**

```sh
pnpm install
```

```sh
pnpm install
```

## Running the Development Server

Expand All @@ -39,22 +38,23 @@ pnpm run dev
```

## Project Structure

my-react-app/
├── public/
├── index.html
└── ...
│ ├── index.html
│ └── ...
├── src/
├── assets/
├── images/
├── components/
├── pages/
├── Home/
│ │ ├── Home.ts
└── ...
├── App.ts
├── index.ts
├── routes.ts
└── ...
│ ├── assets/
├── images/
│ ├── components/
│ ├── pages/
├── Home/
│ │ ├── Home.ts
└── ...
│ ├── App.ts
│ ├── index.ts
│ ├── routes.ts
│ └── ...
├── .env.example
├── .gitignore
├── package.json
Expand Down
1 change: 0 additions & 1 deletion nepalingo-web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Nepalingo</title>

</head>
<body>
<div id="root"></div>
Expand Down
3 changes: 3 additions & 0 deletions nepalingo-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
"dev": "vite",
"build": "tsc -b && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"format-check": "prettier . --check",
"preview": "vite preview"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@supabase/supabase-js": "^2.44.2",
Expand All @@ -35,6 +37,7 @@
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.7",
"postcss": "^8.4.38",
"prettier": "3.3.3",
"tailwindcss": "^3.4.4",
"ts-node": "^10.9.2",
"typescript": "^5.5.2",
Expand Down
Loading

0 comments on commit 9a967a3

Please sign in to comment.