Refactor source paths

Author: lowlighter

.github/workflows/image.yml .github/workflows/release.yml.github/workflows/image.yml renamed to .github/workflows/release.yml

@@ -54,7 +54,7 @@ inputs:
     default: 100
 
   # Template to use
-  # See https://github.com/lowlighter/metrics/tree/master/src/templates for supported templates
+  # See https://github.com/lowlighter/metrics/tree/master/source/templates for supported templates
   template:
     description: Template to use
     default: classic

README.md

@@ -4,8 +4,7 @@
   "description": "An image generator with 20+ metrics about your GitHub account such as activity, community, repositories, coding habits, website performances, music played, starred topics, etc. that you can put on your profile or elsewhere !",
   "main": "index.mjs",
   "scripts": {
-    "start": "node index.mjs",
-    "build": "node utils/build.mjs",
+    "start": "node source/app/web/index.mjs",
     "test": "npx jest",
     "upgrade": "npm install @actions/core@latest @actions/github@latest @octokit/graphql@latest @octokit/rest@latest axios@latest colors@latest compression@latest ejs@latest express@latest express-rate-limit@latest image-to-base64@latest memory-cache@latest prismjs@latest puppeteer@latest svgo@latest vue@latest vue-prism-component@latest jest@latest js-yaml@latest libxmljs@latest"
   },

action.yml

@@ -1,10 +1,10 @@
 //Imports
-  import setup from "./../src/setup.mjs"
-  import metrics from "./../src/metrics.mjs"
-  import octokit from "@octokit/graphql"
   import core from "@actions/core"
   import github from "@actions/github"
-  import mocks from "./../src/mocks.mjs"
+  import octokit from "@octokit/graphql"
+  import setup from "../setup.mjs"
+  import mocks from "../mocks.mjs"
+  import metrics from "../metrics.mjs"
 
 ;((async function () {
   //Yaml boolean converter

package.json

@@ -1,15 +1,15 @@
 //Imports
-  import ejs from "ejs"
-  import SVGO from "svgo"
-  import imgb64 from "image-to-base64"
-  import axios from "axios"
-  import puppeteer from "puppeteer"
-  import url from "url"
-  import processes from "child_process"
   import fs from "fs/promises"
   import os from "os"
   import paths from "path"
   import util from "util"
+  import axios from "axios"
+  import url from "url"
+  import puppeteer from "puppeteer"
+  import processes from "child_process"
+  import ejs from "ejs"
+  import imgb64 from "image-to-base64"
+  import SVGO from "svgo"
 
 //Setup
   export default async function metrics({login, q, dflags = []}, {graphql, rest, plugins, conf, die = false, verify = false}, {Plugins, Templates}) {

action/index.mjs source/app/action/index.mjsaction/index.mjs renamed to source/app/action/index.mjs

@@ -10,13 +10,13 @@
   export default async function ({log = true} = {}) {
 
     //Paths
-      const __metrics = path.join(path.dirname(url.fileURLToPath(import.meta.url)), "..")
-      const __templates = path.join(__metrics, "src/templates")
-      const __plugins = path.join(__metrics, "src/plugins")
-      const __queries = path.join(__metrics, "src/queries")
+      const __metrics = path.join(path.dirname(url.fileURLToPath(import.meta.url)), "../..")
+      const __statics = path.join(__metrics, "source/app/web/statics")
+      const __templates = path.join(__metrics, "source/templates")
+      const __plugins = path.join(__metrics, "source/plugins")
+      const __queries = path.join(__metrics, "source/queries")
       const __package = path.join(__metrics, "package.json")
       const __settings = path.join(__metrics, "settings.json")
-      const __statics = path.join(__metrics, "src/web")
       const __modules = path.join(__metrics, "node_modules")
 
     //Init

src/metrics.mjs source/app/metrics.mjssrc/metrics.mjs renamed to source/app/metrics.mjs

@@ -1,5 +1,5 @@
 //Imports
-  import app from "./src/app.mjs"
+  import app from "./instance.mjs"
 
 //Start app
   await app({mock:process.env.USE_MOCKED_DATA})

src/mocks.mjs source/app/mocks.mjssrc/mocks.mjs renamed to source/app/mocks.mjs

@@ -1,14 +1,14 @@
 //Imports
-  import express from "express"
   import octokit from "@octokit/graphql"
   import OctokitRest from "@octokit/rest"
-  import cache from "memory-cache"
+  import express from "express"
   import ratelimit from "express-rate-limit"
   import compression from "compression"
+  import cache from "memory-cache"
   import util from "util"
-  import setup from "./setup.mjs"
-  import metrics from "./metrics.mjs"
-  import mocks from "./mocks.mjs"
+  import setup from "../setup.mjs"
+  import mocks from "../mocks.mjs"
+  import metrics from "../metrics.mjs"
 
 /** App */
   export default async function ({mock = false} = {}) {