Skip to content

Commit b1733ee

Browse files
authored
feat!: global rework, road to 2.0 (#433)
* feat!: global rework, road to 2.0 * chore: updates * chore: update * chore: update
1 parent f502c2d commit b1733ee

450 files changed

Lines changed: 11851 additions & 20066 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/docker-compose.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ services:
1111
command: sleep infinity
1212

1313
# Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
14-
network_mode: service:db
14+
# network_mode: service:db
1515

1616
# Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
1717
# (Adding the "ports" property to this file will not forward from a Codespace.)
1818

19-
db:
20-
image: postgres:18
21-
restart: unless-stopped
22-
volumes:
23-
- postgres-data:/var/lib/postgresql/data
24-
environment:
25-
POSTGRES_USER: postgres
26-
POSTGRES_DB: postgres
27-
POSTGRES_PASSWORD: postgres
19+
# db:
20+
# image: postgres:18
21+
# restart: unless-stopped
22+
# volumes:
23+
# - postgres-data:/var/lib/postgresql/data
24+
# environment:
25+
# POSTGRES_USER: postgres
26+
# POSTGRES_DB: postgres
27+
# POSTGRES_PASSWORD: postgres
2828

29-
volumes:
30-
postgres-data:
29+
# volumes:
30+
# postgres-data:

.github/workflows/deploy-demo.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Deploy Demo Web App
22

33
on:
4-
workflow_run:
5-
workflows: ["Docker Nightly", "Docker Release"]
6-
types:
7-
- completed
4+
# workflow_run:
5+
# workflows: ["Docker Nightly", "Docker Release"]
6+
# types:
7+
# - completed
88
workflow_dispatch:
99

1010
jobs:

.github/workflows/docker-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set matrix
2727
id: set-matrix
2828
run: |
29-
APPS=("essence" "web-app")
29+
APPS=("web-app" "web-app-selector" "essence")
3030
CHANGED=()
3131
3232
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then

.github/workflows/docker-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set package in env
3434
id: set-package
3535
run: |
36-
APPS=("essence" "web-app")
36+
APPS=("web-app" "web-app-selector" "essence")
3737
MATCH="${{ steps.regex-match.outputs.match }}"
3838
3939
if [ -z "$MATCH" ]; then

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @hmbanan666

README.md

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Modern e-commerce self-hosted platform: clients will be happy to order delicious
33

44
👉 [Check out demo website](https://demo.nextorders.space/)
55

6-
🎯 [Admin panel](https://demo.nextorders.space/command-center). Use **demo** as login and password. Read only mode 🔒👮‍♂️
7-
86
![main-screen-desktop](https://github.com/nextorders/food/blob/main/.github/media/main-screen-desktop.jpg?raw=true)
97

108
## 🍕 Main idea and architecture of NextOrders
@@ -39,42 +37,21 @@ Let's see what happens. Give the project a star ⭐. Offer your ideas and make c
3937

4038
## 🌎 Locales
4139

42-
The application has [several localizations](https://github.com/nextorders/food/tree/main/apps/web-app/i18n/locales):
40+
The application has [several localizations](https://github.com/nextorders/food/tree/main/packages/ui/i18n/locales):
4341

4442
- en | English
4543
- ru | Russian | Русский
4644
- ka | Georgian | ქართული
4745

4846
## 🥒 Repository structure
4947

50-
- [Web App](https://github.com/nextorders/food/tree/main/apps/web-app): Web storefront and Command Center. Client can order delicious food.
51-
- [Essence](https://github.com/nextorders/food/tree/main/apps/essence): Business data collection and data management software.
48+
- [Web App](https://github.com/nextorders/food/tree/main/apps/web-app): Web storefront. Client can order delicious food.
49+
- [Web App Selector](https://github.com/nextorders/food/tree/main/apps/web-app-selector): Welcome screen with a list of available storefronts.
50+
- [Essence](https://github.com/nextorders/food/tree/main/apps/essence): An example of a service with business logic and data.
5251

5352
## ☕ How to deploy
5453

55-
⚠️ Warn: work in progress. Be careful with updates! Your images and DB data are at risk.
56-
57-
You can deploy @nextorders/web-app on your server (1GB+ RAM) by this:
58-
59-
```shell
60-
# Connect over SSH and use with args: version, locale, your domain, your email
61-
curl -fsSL https://nextorders.space/food/install.sh | bash -s -- "v0.7.0" "en" "test.nextorders.space" "resolve@nextorders.space"
62-
63-
# It will install Docker, Docker Compose and download latest docker-compose.yaml
64-
# After, it will bring up Traefik to serve web requests, create and autoupdate SSL certificate
65-
# Food app, DB, migrations... You are ready to check your domain!
66-
```
67-
68-
Also, you can use single Docker Image to create container:
69-
70-
```shell
71-
# Use the specific version
72-
docker pull ghcr.io/nextorders/food/web-app:v0.7.0
73-
74-
# Warn: you need an external Redis as DB
75-
```
76-
77-
Check [**.env.example**](https://github.com/nextorders/food/tree/main/apps/web-app/.env.example) for more info about required config variables.
54+
⚠️ Warn: work in progress.
7855

7956
## 🍿 How to develop
8057

@@ -87,8 +64,6 @@ Make a fork. Or clone this repo and use standard commands:
8764
```shell
8865
git clone https://github.com/nextorders/food
8966
pnpm i
90-
pnpm dev:web-app:compose
91-
pnpm dev:web-app
9267
```
9368

9469
## 🍰 License

apps/essence/.env.example

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,2 @@
1-
# Session password for Nuxt Auth Utils
2-
NUXT_SESSION_PASSWORD=""
3-
4-
# Main database
5-
DATABASE_URL="postgres://postgres:postgres@localhost:5432/postgres"
6-
7-
# URL to media server (probably s3 bucket with static URL)
8-
NUXT_PUBLIC_MEDIA_URL=""
9-
10-
# S3 file storage
11-
NUXT_S3_BUCKET=""
12-
NUXT_S3_REGION=""
13-
NUXT_S3_ENDPOINT=""
14-
NUXT_S3_ACCESS_KEY_ID=""
15-
NUXT_S3_SECRET_ACCESS_KEY=""
16-
17-
# For external API requests
18-
NUXT_EXTERNAL_API_TOKEN=""
19-
201
# App version
212
VERSION=""

apps/essence/app/app.config.ts

Lines changed: 0 additions & 76 deletions
This file was deleted.

apps/essence/app/app.vue

Lines changed: 0 additions & 40 deletions
This file was deleted.

apps/essence/app/assets/css/styles.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)