Compare commits

...

34 Commits

Author SHA1 Message Date
c5000d451a Upload files to "/"
Legals
2025-04-26 03:45:42 +00:00
ffcaf12d39 Upload files to "/" 2025-04-24 11:25:10 +00:00
f69724dee0 Upload files to "/"
Colour spectrum for Coffee, Crema and Body
2025-04-23 22:49:40 +00:00
c2967f60f9 Upload files to "/"
Coffee Cupping Tasting Flow
2025-04-23 11:34:03 +00:00
nostrdev-com
c54294573b chore: added meeting notes 2025-04-23 13:23:52 +03:00
572eb71baf Upload files to "/"
Updated Tasting Flow: Visual Assessment, Primary Aromas and Flavours, Texture and Balance, Quality
2025-04-17 12:08:38 +00:00
a6d307235d Add meetings/ 20250416.md 2025-04-16 10:37:53 +00:00
cd61f4653a Update meetings/20250409.md 2025-04-16 10:34:30 +00:00
ed76cf026e Upload files to "/"
Updated Tasting Flow: Visual Assessment, Primary Aromas and Flavours, Texture and Balance, Quality
2025-04-14 02:44:33 +00:00
730d929c0d Delete Tasting Flow V2.xlsx
Updated
2025-04-14 02:43:17 +00:00
6e80eb7039 Upload files to "/"
V2 Tasting Flow: Visual Assessment, Primary Flavours and Aromas, Texture and Balance
2025-04-14 01:50:07 +00:00
0f77c57f81 Upload files to "/" 2025-04-13 08:43:38 +00:00
92cc71f714 Delete Liquor Quality - aggregate scoring with shades.ods 2025-04-13 08:42:41 +00:00
b59d920790 Upload files to "/"
cellar social colour palette
2025-04-13 08:26:08 +00:00
8844bff925 Delete venice_ai colour palette- extended.png
added a green to the palette
2025-04-13 08:25:19 +00:00
5d78d2e049 Upload files to "/" 2025-04-13 08:13:03 +00:00
bcc31130ec Upload files to "/"
Visual Assessment Colour Hues for Type
2025-04-13 01:36:41 +00:00
0d4669e934 Upload files to "/"
List of major grapes. There are thousands, listed most common commercial varieties
Can be combined into one list as white wines can be made from red grapes, however not red from white!
2025-04-11 09:11:01 +00:00
a3d12d7c73 Update meetings/20250409 2025-04-09 18:12:01 +00:00
c36c00d746 Add meetings/20250409 2025-04-09 12:00:47 +00:00
3a2f91c21b Upload files to "/"
use this colour palette for the website and marketing promo

8B0000 Dark Red
4a2e1a Dark Brown
d4a35f Light Tan
f5f5dc Off White
262626 Dark Gray
ffa500 Bright Orange
9370db Medium Purple
2025-04-09 09:16:07 +00:00
adf0168d49 Delete spirit characteristics - v2.xlsx 2025-04-09 07:13:02 +00:00
2ee460cf89 Upload files to "/" 2025-04-09 07:12:32 +00:00
27f0d4702d Upload files to "/" 2025-04-09 05:30:14 +00:00
dbc183512b Upload files to "/" 2025-04-03 09:46:51 +00:00
2c66c580f7 Merge pull request 'docs: added docker configuration' () from staging-server into main
Reviewed-on: 
2025-03-27 10:27:54 +00:00
nostrdev-com
99dae32921 docs: added docker configuration 2025-03-27 13:27:18 +03:00
bc1bc9f618 Merge pull request 'docs(tech-design): replaced cassandra with mongodb' () from tech-design-update into main
Reviewed-on: 
2025-03-26 11:17:47 +00:00
nostrdev-com
a6d998d1d2 docs(tech-design): replaced cassandra with mongodb 2025-03-26 14:15:57 +03:00
257403eac5 Merge pull request 'docs: added 20250326 meeting notes' () from meetings into main
Reviewed-on: 
2025-03-26 10:05:33 +00:00
nostrdev-com
74b1a4df83 docs: added 20250326 meeting notes 2025-03-26 13:04:53 +03:00
108fa23a58 Merge pull request 'docs: added staging configuration guide' () from staging-server into main
Reviewed-on: 
2025-03-25 11:13:04 +00:00
nostrdev-com
ce39155405 docs: added staging configuration guide 2025-03-25 14:12:06 +03:00
bfabd505d9 Merge pull request 'docs: added technical design' () from technical-design into main
Reviewed-on: 
Reviewed-by: b <b@4j.cx>
2025-03-24 07:51:38 +00:00
29 changed files with 269 additions and 6 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Coffee Tasting Flow.xlsx Normal file

Binary file not shown.

Binary file not shown.

BIN
Flavour spectrum - AW.xls Normal file

Binary file not shown.

BIN
Grape Growing Regions.xlsx Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Sake Characteristics.xls Normal file

Binary file not shown.

BIN
Tasting Flow V2.xlsx Normal file

Binary file not shown.

BIN
Tasting Flow V4.xlsx Normal file

Binary file not shown.

BIN
Tasting Menu and Flow.xlsx Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

5
meetings/ 20250416.md Normal file

@ -0,0 +1,5 @@
[design]
- To change up the colors / test it out with black purple white and see how that goes
- On user login, checks if it's a new user or not, if yes, popup appears to to ask user if this npub is a normal user/consumer or producer (this would affect how their profile page works, and a product cannot review any other product / they can just publish product)
- There's two profiles, one user and one producer

3
meetings/20250326.md Normal file

@ -0,0 +1,3 @@
- Use MongoDB instead of Cassandra.
- Add precommit hook checking licenses of the third-party libraries.
- Add CI/CD step to double-check licenses of the third-party libraries.

11
meetings/20250409.md Normal file

@ -0,0 +1,11 @@
[design]
- Edit the design of of initial search in hero section in the landing page (remove search bard, and all selections: product, type, style, characteristic, location (this one specifically has filter checkboxes in its popup) [search button]), popups remain.
- don't change navigation bar
- round corners where seemed appropriate, like buttons and maybe tags
- add / change review submission to include a lengthy selection process, and present it
- - to also have a summary design of total reviews (excluding text reviews of course)
- reply system/style is similar to deg mods (popup depth system)
- remove "Seller Name's Latest Products" section
- Add "Product Details" or "Details" tab (last tab) after reviews/comments
- Publishing a review costs money, replying (normal commenting/replying) to review doesn't (free), and commenting is also free

8
meetings/20250423.md Normal file

@ -0,0 +1,8 @@
# Product
- `Producer` can modify product only during 24 hours after submition.
- `Producer` can delete product at any time.
# Review
- `Reviwer` can modify review only during 24 hours after submition.

@ -0,0 +1,236 @@
# Server configuration of the staging server
Staging server has `51.161.134.20` IP address and `staging.cellar.social` DNS record associated with it.
`otto` user has sudo rights at staging server, all operations that require sudo rights will be performed under this user.
## Fail2ban
Install `fail2ban` to scan the log files for too many failed login attempts and block the IP address which is showing malicious signs.
```bash
sudo apt-get install fail2ban
```
## Nginx
Under `otto` user:
```bash
# Update packages
sudo apt update
# Install Nginx
sudo apt install nginx
# List the application configurations that ufw knows how to work with
sudo ufw app list
# Activate firewall
sudo ufw enable
# Allow ssh connections
sudo ufw allow 'OpenSSH'
# Allow HTTPS traffic
sudo ufw allow 'Nginx HTTPS'
# Allow HTTP traffic (HTTP traffic should be allowed to equire SSL certificate and will be disabled later)
sudo ufw allow 'Nginx HTTP'
# Check ufw status
sudo ufw status
# Check Nginx status
systemctl status nginx
# Create the directory for `api` domain
sudo mkdir -p /var/www/api/html
# Assign ownership of the directory to the `api` user
sudo chown -R api:api /var/www/api/html
# Adjust permissions
sudo chmod -R 755 /var/www/api
# Install certbot
sudo apt install certbot python3-certbot-nginx
# Fetch a certificate from Let's Encrypt and follow the prompts
sudo certbot --nginx -d staging.cellar.social
# Verify that certificate renewal is on
sudo systemctl status certbot.timer
# Create a configuration file for api subdomain
sudo nano /etc/nginx/sites-available/api
```
Paste into `/etc/nginx/sites-available/api`:
```bash
server {
listen 80;
listen [::]:80;
root /var/www/html;
index index.html index.htm index.nginx-debian.html;
# Put your domain name here
server_name staging.cellar.social;
# Needed for Let's Encrypt verification
location ~ /.well-known/acme-challenge {
allow all;
}
# Force HTTP to HTTPS
location / {
return 301 https://$http_host$request_uri;
}
}
server {
listen 443 ssl http2;
ssl on;
# SSL certificate by Let's Encrypt in this Nginx
ssl_certificate /etc/letsencrypt/live/staging.cellar.social/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/staging.cellar.social/privkey.pem;
# root /var/www/html;
# index index.html index.htm index.nginx-debian.html;
# domain name here
server_name staging.cellar.social;
location /api/ {
proxy_pass http://127.0.0.1:3000/;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Upgrade $http_upgrade;
}
# Needed for Let's Encrypt verification
location ~ /.well-known/acme-challenge {
allow all;
}
}
```
Next:
```bash
# Enable the file by creating a link from it to the sites-enabled directory, which Nginx reads from during startup
sudo ln -s /etc/nginx/sites-available/api /etc/nginx/sites-enabled/
# Restart Nginx
sudo systemctl restart nginx
# Check Nginx status
systemctl status nginx
# Check firewall status
sudo ufw status
# Deny HTTP traffic
sudo ufw deny 'Nginx HTTP'
# Check firewall status
sudo ufw status
```
## Install Node and NPM
```bash
# Update packages
sudo apt update
# Install nvm (node version manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
# Install Node v20
nvm install 20.12.2
# Set 20.12.2 as a default version of Node
nvm alias default 20.12.2
# Use default Node version
nvm use default
```
## API user
`api` user doesn't have sudo rights and will be used to run `cellar-api` and all related processes.
Under `otto` user:
```bash
# Create api user
sudo adduser api
# Switch to api user
su api
```
Under `api` user:
```bash
# Generate SSH keys.
# These keys will be used by CI/CD pipeline.
ssh-keygen
# Change to ssh directory
cd .ssh/
# Create authorized_keys file
touch authorized_keys
# Copy public key from `id_ed25519.pub` and paste into `authorized_keys` file
# Private key is stored in SSH_STAGING_PRIVATE_KEY variable of the CI/CD pipeline.
# Install PM2 package globally
npm i -g pm2
# Clone cellar/cs-backend repository
git clone ssh://git@git.nostrdev.com:29418/cellar/cs-backend.git
# Change to cs-backend directory
cd cs-backend
# Install dependencies
npm ci
# Build API app
npm run build
# Start API app
npm run start
# Verify that cellar-api process is running
pm2 list
```
## Docker
Under `otto` user:
```bash
# Install docker
curl -fsSL https://get.docker.com | sudo sh
# Add api user to the docker group so it can run docker without sudo rights
sudo usermod -aG docker api
```
Under `api` user:
```bash
# Log in to docker group to avoid to log out and log in again
newgrp docker
```

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Before

(image error) Size: 3.5 MiB

After

(image error) Size: 3.3 MiB

@ -87,7 +87,7 @@ The backend app will also manage Npub whitelisting that `APP Relay` will use.
#### Database
[Cassandra](https://cassandra.apache.org/_/index.html) will be used as a NoSQL database (`DB`) to persist business data. Only the backend app will have access to the database.
[MongoDB Community Edition](https://www.mongodb.com/products/self-managed/community-edition) will be used as a NoSQL database (`DB`) to persist business data. Only the backend app will have access to the database.
The following tables are planned in the database:

Binary file not shown.

After

(image error) Size: 1.7 KiB

BIN
wine colour hue.xlsx Normal file

Binary file not shown.