Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/sakurator/website
Browse files Browse the repository at this point in the history
  • Loading branch information
anafro committed Jul 22, 2024
2 parents d0ec58c + 8c41e1b commit 656d20d
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 4 deletions.
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: 'Bug: '
labels: bug
assignees: anafro

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature Request
about: Suggest an idea for this project
title: 'Feature: '
labels: enhancement
assignees: anafro

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
30 changes: 30 additions & 0 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
on:
push:
branches:
- main

jobs:
run_pull:
name: run pull
runs-on: ubuntu-latest

steps:
- name: install ssh keys
run: |
install -m 600 -D /dev/null ~/.ssh/id_rsa
echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
ssh-keyscan -H ${{ secrets.SSH_HOST }} > ~/.ssh/known_hosts
- name: stop sakurator server
run: ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "pm2 stop sakurator"
- name: connect and pull
run: ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "cd ${{ secrets.WORK_DIR }} && git checkout ${{ secrets.MAIN_BRANCH }} && git pull"
- name: install node packages
run: ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "cd ${{ secrets.WORK_DIR }} && npm i"
- name: create .env file
run: ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "cd ${{ secrets.WORK_DIR }} && rm .env && touch .env && echo DATABASE_URL='mysql://${{ secrets.MYSQL_USER }}:${{ secrets.MYSQL_PASSWORD }}@localhost:3306/sakurator' >> .env && echo 'PORT=${{ secrets.PORT }}' >> .env"
- name: migrate database
run: ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "cd ${{ secrets.WORK_DIR }} && npx prisma db push && node prisma/seed.js"
- name: start sakurator server
run: ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "pm2 start sakurator"
- name: cleanup
run: rm -rf ~/.ssh
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
### **Sakurator • Learn Japanese Alphabets for Free** <a href="https://sakurator.anafro.ru/" align="right"><img src="https://raw.githubusercontent.com/anafro/anafro/main/Buttons/Open-In-Browser-Button.svg" height="28" align="right"></a>
&ensp;

&ensp;

<p align="right"><img src="https://raw.githubusercontent.com/anafro/anafro/main/Icons/Sakurator.svg" height="128"></p>

[*Sakurator*](https://sakurator.anafro.ru) — your personal learning platform for Japanese alphabets, where you can learn both hiragana and katakana. There are 18 sets of cards of 5-6 letters each.
&ensp;

---
# Sakurator <a href="https://sakurator.anafro.ru/" align="right"><img src="https://raw.githubusercontent.com/anafro/anafro/main/Buttons/Open-In-Browser.svg" height="36" align="right"></a> <a href="https://sakurator.anafro.ru/" align="right"><img src="https://raw.githubusercontent.com/anafro/anafro/main/Buttons/Deploy-Via-GitHub.svg" height="36" align="right"></a>

&ensp;

[Sakurator](https://sakurator.anafro.ru) — your personal learning platform for Japanese alphabets, where you can learn both hiragana and katakana. There are 18 sets of cards of 5-6 letters each.

### How to play?

Expand Down Expand Up @@ -42,4 +48,4 @@ It's completely free! Use it and get closer to your Japanese dream! [Open the sa
## Technical information for employers
Sakurator is created in *4 days*, where the first day was spent for designing. I used <img src="https://www.vectorlogo.zone/logos/expressjs/expressjs-icon.svg" width="14"> **Express.js**, <img src="https://www.vectorlogo.zone/logos/pugjs/pugjs-icon.svg" width="20"> **Pug**, <img src="https://cdn.worldvectorlogo.com/logos/prisma-2.svg" width="40"> **Prisma ORM**, <img src="https://upload.wikimedia.org/wikipedia/commons/9/96/Sass_Logo_Color.svg" width="15"> **Sass** and <img src="https://upload.wikimedia.org/wikipedia/commons/9/99/Unofficial_JavaScript_logo_2.svg" width="11"> **Pure JavaScript** to create it. I learned many things about Node.js, deploying and Git CLI.

Sakurator will being got updates until *1st of January '23* and bug fixes until *1st of March '23*.
Sakurator will being got updates until *1st of January '23* and bug fixes until *1st of March '23*.

0 comments on commit 656d20d

Please sign in to comment.