Skip to content
This repository was archived by the owner on Aug 16, 2024. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
9ac7d46
Start migration to Vue 3 and Express
bperel Mar 25, 2023
deb9ae1
WIP
bperel Mar 26, 2023
0d72051
WIP
bperel Mar 26, 2023
59c84b4
WIP
bperel Mar 26, 2023
df53b63
WIP
bperel Mar 26, 2023
6c44009
WIP
bperel Mar 29, 2023
2a098c3
WIP
bperel Mar 29, 2023
32c4bf4
WIP
bperel Mar 30, 2023
05f071c
WIP
bperel Mar 30, 2023
723515c
WIP
bperel Mar 31, 2023
e465b37
WIP
bperel Apr 1, 2023
a419750
WIP
bperel Apr 2, 2023
8b0d328
WIP
bperel Apr 2, 2023
ab6cbcc
WIP
bperel Apr 2, 2023
4d75db1
WIP
bperel Apr 3, 2023
f9120a5
Convert to Pinia setup stores
bperel Apr 5, 2023
6b071a8
WIP
bperel Apr 6, 2023
4e33c32
WIP
bperel Apr 7, 2023
d6d0863
WIP
bperel Apr 7, 2023
5c342c8
WIP
bperel Apr 7, 2023
96f4293
WIP
bperel Apr 7, 2023
7bdea3b
WIP
bperel Apr 7, 2023
61e48da
WIP
bperel Apr 8, 2023
dccbfdb
WIP
bperel Apr 9, 2023
73ab945
WIP
bperel Apr 10, 2023
de83861
WIP
bperel Apr 10, 2023
2dfc73b
WIP
bperel Apr 11, 2023
83762b4
WIP
bperel Apr 12, 2023
37415fa
WIP
bperel Apr 13, 2023
f1a7b1d
WIP
bperel Apr 14, 2023
d3cb6b8
WIP
bperel Apr 14, 2023
6a4aa6e
WIP
bperel Apr 18, 2023
2726c28
WIP
bperel Apr 25, 2023
7d24c42
WIP
bperel Apr 27, 2023
476aee2
WIP
bperel Apr 29, 2023
8348d6f
WIP
bperel Apr 29, 2023
82c3bc1
WIP
bperel Apr 30, 2023
6eeaaaf
WIP
bperel Apr 30, 2023
9c04836
WIP
bperel Apr 30, 2023
34665f4
WIP
bperel Apr 30, 2023
9bb39b9
WIP
bperel Apr 30, 2023
dd40f0a
WIP
bperel Apr 30, 2023
ff8ff57
Attempt to fix deployment
bperel May 15, 2023
4e285d1
Copy nginx config
bperel May 16, 2023
8872045
Fix edge mount
bperel May 16, 2023
7f24ff7
Upload Sentry config
bperel May 16, 2023
4daddf0
Upload Sentry config
bperel May 16, 2023
4741f02
Fetch all catalog edges at the same time
bperel May 16, 2023
123290a
Remove duplicate env key
bperel May 16, 2023
61ef881
Update dependencies
bperel Jun 4, 2023
3922667
Cleanup
bperel Jun 4, 2023
8ffd40f
Fix route type generation
bperel Jun 4, 2023
b5f66a7
Add debug
bperel Jun 4, 2023
fd7f958
Add debug
bperel Jun 6, 2023
53dab12
Add debug
bperel Jun 6, 2023
3b8ac51
Fix race condition on permission check
bperel Jun 6, 2023
5e00364
Bump dependencies
bperel Jun 27, 2023
ec7fdbd
Update dependencies
bperel Jul 17, 2023
3e29c69
Init edgecreator integration into monorepo
bperel May 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 0 additions & 16 deletions .babelrc

This file was deleted.

8 changes: 6 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
.nuxt
node_modules
**/dist
**/node_modules
.git
.idea
Dockerfile*
api/.env
13 changes: 0 additions & 13 deletions .editorconfig

This file was deleted.

25 changes: 11 additions & 14 deletions .env
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
BACKEND_URL=http://localhost:10002
CLOUDINARY_URL=cloudinary://955445841324817:fqXP5YDdv8n1vwNjzgDRlFHDVto@dl7hskxab

DUCKSMANAGER_PASS=ducksmanagerpass
DUCKSMANAGER_USER=ducksmanager
EDGECREATOR_PASS=edgecreatorpass
EDGECREATOR_USER=edgecreator

EDGES_PATH=../DucksManager/edges
EDGES_URL_PUBLIC=http://localhost:8002/edges
EDGES_URL=http://localhost:8002/edges
VITE_DM_API_URL=http://localhost:3000
VITE_DM_URL=http://localhost:8001
VITE_EDGECREATOR_API_URL=http://localhost:3001
VITE_EDGES_URL=http://localhost:8001/edges
VITE_FONT_SEARCH_URL=https://www.myfonts.com/WhatTheFont/

CLOUDINARY_URL=cloudinary://955445841324817:fqXP5YDdv8n1vwNjzgDRlFHDVto@dl7hskxab
FONT_BASE_URL=https://www.myfonts.com/fonts/
FONT_PRODUCT_BASE_URL=https://www.myfonts.com/products/
FONT_IMAGE_GEN_URL=https://render.myfonts.net/fonts/font_rend.php
FONT_SEARCH_URL=https://www.myfonts.com/WhatTheFont/
FONT_PRODUCT_BASE_URL=https://www.myfonts.com/products/

# Used only in the backend, so with the api directory as basis
EDGES_PATH=../DucksManager/edges

SENTRY_DISABLED=true
TOKEN_SECRET=3543c30fe79047b4f73cfb61aa1eb52cb3173de4b3941e0fc4ec1b127bbeed6019695a1a453a81c33c2eea964ccc577e69c7df994124bd2751e262a311ea23a1
1 change: 1 addition & 0 deletions .eslintcache

Large diffs are not rendered by default.

64 changes: 51 additions & 13 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,56 @@
module.exports = {
root: true,
extends: [
'@nuxtjs/eslint-config-typescript',
'@nuxtjs',
'plugin:prettier/recommended',
'plugin:nuxt/recommended',
// add more generic rulesets here, such as:
// 'eslint:recommended',
"plugin:vue/vue3-recommended",
"plugin:prettier-vue/recommended",
"prettier",
"plugin:@typescript-eslint/recommended"
],
parser: "vue-eslint-parser",
parserOptions: {
parser: "@typescript-eslint/parser",
project: true,
extraFileExtensions: [".vue"]
},
overrides: [
{
files: ["*.ts", "*.vue"]
}
],
plugins: ['prettier'],
// add your custom rules here
root: true,
rules: {
'no-console': 'off',
'import/named': 'off',
'require-await': 'off',
'vue/multi-word-component-names': 'off',
'@typescript-eslint/no-this-alias': 'off',
"@typescript-eslint/no-floating-promises": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"simple-import-sort/exports": "error",
"simple-import-sort/imports": "error",
"unused-imports/no-unused-imports": "error",
"vue/multi-word-component-names": "off",
"vue/no-setup-props-destructure": "off",
"vue/no-v-html": "off",
"vue/no-v-text-v-html-on-component": "off",
"vue/define-emits-declaration": "error",
"vue/define-props-declaration": "error",
"vue/component-name-in-template-casing": [
"error",
"kebab-case",
{
registeredComponentsOnly: true,
ignores: []
}
]
},
}
plugins: [
"simple-import-sort",
"prettier",
"@typescript-eslint",
"unused-imports"
],
ignorePatterns: [
"**/node_modules",
"**/dist",
"*.d.ts",
"vendor",
"vite.config.ts"
]
};
55 changes: 46 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
push:
branches:
- 'master'
- 'nuxt-to-vue3-and-express'
jobs:
deploy:
runs-on: ubuntu-latest
Expand All @@ -21,38 +21,75 @@ jobs:
fingerprint: ${{ secrets.PRODUCTION_SSH_FINGERPRINT }}
username: ${{ secrets.PRODUCTION_SSH_USER }}
key: ${{ secrets.PRODUCTION_SSH_KEY }}
source: /home/bperel/workspace/EdgeCreator/.env.prod
source: /home/bperel/workspace/EdgeCreator2/.env.prod
target: .env.prod

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2.1.0
with:
registry: ghcr.io
username: bperel
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}

- name: Build and push runtime image
uses: docker/build-push-action@v4
- name: Build and push app
uses: docker/build-push-action@v3
with:
context: .
platforms: linux/x86_64
push: true
target: app
cache-from: type=registry,ref=ghcr.io/bperel/edgecreator-app:buildcache
cache-to: type=registry,ref=ghcr.io/bperel/edgecreator-app:buildcache,mode=max
tags: |
ghcr.io/bperel/edgecreator:latest
ghcr.io/bperel/edgecreator-app:latest

- name: Build and push api
uses: docker/build-push-action@v3
with:
context: .
platforms: linux/x86_64
push: true
target: api
cache-from: type=registry,ref=ghcr.io/bperel/edgecreator-api:buildcache
cache-to: type=registry,ref=ghcr.io/bperel/edgecreator-api:buildcache,mode=max
tags: |
ghcr.io/bperel/edgecreator-api:latest

- name: Upload docker-compose.yml config
uses: nicklasfrahm/scp-action@main
uses: nicklasfrahm/scp-action@v1.0.1
with:
direction: upload
host: ${{ secrets.PRODUCTION_SSH_HOST }}
fingerprint: ${{ secrets.PRODUCTION_SSH_FINGERPRINT }}
username: ${{ secrets.PRODUCTION_SSH_USER }}
key: ${{ secrets.PRODUCTION_SSH_KEY }}
source: docker-compose.yml
target: /home/bperel/workspace/EdgeCreator/docker-compose.yml
target: /home/bperel/workspace/EdgeCreator2/docker-compose.yml

- name: Upload Sentry config
uses: nicklasfrahm/scp-action@v1.0.1
with:
direction: upload
host: ${{ secrets.PRODUCTION_SSH_HOST }}
fingerprint: ${{ secrets.PRODUCTION_SSH_FINGERPRINT }}
username: ${{ secrets.PRODUCTION_SSH_USER }}
key: ${{ secrets.PRODUCTION_SSH_KEY }}
source: config/sentry-relay/config.yml
target: /home/bperel/workspace/EdgeCreator2/config/sentry-relay/config.yml

- name: Upload Sentry project config
uses: nicklasfrahm/scp-action@v1.0.1
with:
direction: upload
host: ${{ secrets.PRODUCTION_SSH_HOST }}
fingerprint: ${{ secrets.PRODUCTION_SSH_FINGERPRINT }}
username: ${{ secrets.PRODUCTION_SSH_USER }}
key: ${{ secrets.PRODUCTION_SSH_KEY }}
source: config/sentry-relay/projects/5595460.json
target: /home/bperel/workspace/EdgeCreator2/config/sentry-relay/projects/5595460.json

- name: Recreate container
uses: appleboy/ssh-action@v0.1.7
Expand All @@ -65,6 +102,6 @@ jobs:
command_timeout: 2m
envs: DOCKER_REGISTRY_TOKEN
script: |
cd workspace/EdgeCreator
cd workspace/EdgeCreator2
echo $DOCKER_REGISTRY_TOKEN | docker login ghcr.io -u bperel --password-stdin
docker compose pull && docker compose up -d --force-recreate
94 changes: 15 additions & 79 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,90 +1,26 @@
# Created by .ignore support plugin (hsz.mobi)
### Node template
# Logs
/logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env.*

# parcel-bundler cache (https://parceljs.org/)
.cache

# next.js build output
.next

# nuxt.js build output
.nuxt

# Nuxt generate
node_modules
dist
dist-ssr
*.local

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless

# IDE / Editor
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea

# Service worker
sw.*

# macOS
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

# Vim swap files
*.swp
.env.*
5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

1 change: 1 addition & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = {};
Loading