From 6f2586ccadf9faa5588a1636d01592eaddf37e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Jaro=C5=A1?= Date: Sat, 9 Sep 2023 18:18:34 +0200 Subject: [PATCH] Working init app Change-Id: I545c6c2f7182adf28d4ced41ac38613746d2b3d8 --- .gitignore | 2 + .npmignore | 12 +++++ .npmrc | 2 + .prettierrc | 9 ++++ .vscode/settings.json | 3 -- Jenkinsfile | 10 +++++ bin/seedling.js | 3 ++ create.js | 65 +++++++++++++++++++--------- package.json | 16 +++++-- pnpm-lock.yaml | 17 +++++--- sonar-project.properties | 3 ++ source/app/src/app/app.tsx | 43 +++++++++--------- source/app/src/pages/WelcomePage.tsx | 6 --- source/shared/.gitignore | 3 +- source/shared/Jenkinsfile | 1 - 15 files changed, 133 insertions(+), 62 deletions(-) create mode 100644 .npmignore create mode 100644 .npmrc create mode 100644 .prettierrc delete mode 100644 .vscode/settings.json create mode 100644 Jenkinsfile create mode 100644 bin/seedling.js create mode 100644 sonar-project.properties diff --git a/.gitignore b/.gitignore index ce658b9..6d38a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ build/ node_modules/ +.vscode/ + .pnpm/ .pnpm-store/ \ No newline at end of file diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..2166045 --- /dev/null +++ b/.npmignore @@ -0,0 +1,12 @@ +Jenkinsfile +.prettierrc + +build/ +node_modules/ + +.vscode/ + +.pnpm/ +.pnpm-store/ + +tsconfig.json \ No newline at end of file diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..22bb90f --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +always-auth=true +@prokyon:registry=https://npm.romanjaros.dev \ No newline at end of file diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..aaf36c9 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,9 @@ +{ + "useTabs": true, + "tabWidth": 2, + "semi": true, + "singleQuote": true, + "parser": "typescript", + "printWidth": 120, + "bracketSameLine": true +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 9cb550f..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "window.title": "${activeEditorShort}${separator}Seedling" -} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..3f59dc4 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,10 @@ +@Library('jenkins-lib') +import FrontendBuild + +FrontendBuild({ + name = 'seedling' + runLint = false + runUnitTest = false + runE2ETest = false + runDockerRelease = false +}) diff --git a/bin/seedling.js b/bin/seedling.js new file mode 100644 index 0000000..bee9037 --- /dev/null +++ b/bin/seedling.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require("../create"); diff --git a/create.js b/create.js index a82e99d..016b5e6 100644 --- a/create.js +++ b/create.js @@ -1,37 +1,60 @@ -const fs = require('fs') -var readlineSync = require('readline-sync'); +const fs = require('fs'); const replaceInFiles = require('replace-in-file'); +const { execSync } = require('child_process'); const argv = require('minimist')(process.argv.slice(2)); // questions -const appName = readlineSync.question('What is app name? ', { defaultInput: 'many' }); -const appPort = readlineSync.question('Which port use for deployment? ', { defaultInput: '93' }); -const isMonorepo = readlineSync.keyInYN('Apply monorepo?'); +const appName = argv.name ?? 'app'; +const appPort = argv.port ?? '0'; +const isMonorepo = argv.monorepo === 'T'; // context directory -const contextDir = `${argv._[0]}/` ?? './'; +const contextDir = `${argv._[0]}` ?? '.'; // create app folder -const appsDir = `${contextDir}/apps` -const appDir = isMonorepo ? `${contextDir}/apps/${appName}-fe` : `${contextDir}/` -if (!fs.existsSync(appDir)){ - if (isMonorepo) { - fs.mkdirSync(appsDir); - } - fs.mkdirSync(appDir); - fs.mkdirSync(`${appDir}/src`); +const appsDir = `${contextDir}/apps`; +const appDir = isMonorepo ? `${contextDir}/apps/${appName}-fe` : `${contextDir}/`; +if (!fs.existsSync(appDir)) { + fs.mkdirSync(contextDir); + if (isMonorepo) { + fs.mkdirSync(appsDir); + } + fs.mkdirSync(appDir); + fs.mkdirSync(`${appDir}/src`); } // copy folder content try { - fs.cpSync('./source/shared/', contextDir, { overwrite: false, recursive: true }) - fs.cpSync('./source/app/', appDir, { overwrite: true, recursive: true }) + fs.cpSync('./source/shared/', contextDir, { + overwrite: false, + recursive: true, + }); + fs.cpSync('./source/app/', appDir, { overwrite: true, recursive: true }); } catch (err) { - console.error(err) + console.error(err); } // replace in files -replaceInFiles.sync({ files: './build/**/*.{ts,tsx}', from: /\/\/.\@ts\-nocheck\n/gm, to: '' }); -replaceInFiles.sync({ files: './build/**/*', from: /\$\(appName\)/gm, to: appName }); -replaceInFiles.sync({ files: './build/**/*', from: /\$\(AppName\)/gm, to: appName.charAt(0).toUpperCase() + appName.slice(1) }); -replaceInFiles.sync({ files: './build/**/*', from: /\$\(appPort\)/gm, to: appPort }); \ No newline at end of file +replaceInFiles.sync({ + files: `./${contextDir}/**/*.{ts,tsx}`, + from: /\/\/.\@ts\-nocheck\n/gm, + to: '', +}); +replaceInFiles.sync({ + files: `./${contextDir}/**/*`, + from: /\$\(appName\)/gm, + to: appName, +}); +replaceInFiles.sync({ + files: `./${contextDir}/**/*`, + from: /\$\(AppName\)/gm, + to: appName.charAt(0).toUpperCase() + appName.slice(1), +}); +replaceInFiles.sync({ + files: `./${contextDir}/**/*`, + from: /\$\(appPort\)/gm, + to: appPort, +}); + +// install deps +execSync(`cd ${contextDir} && pnpm i`); diff --git a/package.json b/package.json index 4a1ff9e..4aef398 100644 --- a/package.json +++ b/package.json @@ -2,15 +2,25 @@ "name": "seedling", "version": "0.1.0", "description": "", - "main": "index.js", + "main": "create.js", + "bin": { + "seedling": "./create.js" + }, "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "create": "pnpm ci:build", + "ci:build": "node create.js --name many --port 93 --monorepo T ./build", + "release": "pnpm version --no-git-tag-version" }, "dependencies": { "minimist": "1.2.8", - "readline-sync": "1.4.10", "replace-in-file": "7.0.1" }, + "devDependencies": { + "prettier": "3.0.3" + }, + "publishConfig": { + "registry": "https://npm.romanjaros.dev" + }, "keywords": [], "author": "Roman Jaroš", "license": "ISC" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a7e0ac5..38dcf00 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,13 +8,15 @@ dependencies: minimist: specifier: 1.2.8 version: 1.2.8 - readline-sync: - specifier: 1.4.10 - version: 1.4.10 replace-in-file: specifier: 7.0.1 version: 7.0.1 +devDependencies: + prettier: + specifier: 3.0.3 + version: 3.0.3 + packages: /ansi-regex@5.0.1: @@ -134,10 +136,11 @@ packages: wrappy: 1.0.2 dev: false - /readline-sync@1.4.10: - resolution: {integrity: sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==} - engines: {node: '>= 0.8.0'} - dev: false + /prettier@3.0.3: + resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} + engines: {node: '>=14'} + hasBin: true + dev: true /replace-in-file@7.0.1: resolution: {integrity: sha512-KbhgPq04eA+TxXuUxpgWIH9k/TjF+28ofon2PXP7vq6izAILhxOtksCVcLuuQLtyjouBaPdlH6RJYYcSPVxCOA==} diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..3ab18a8 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,3 @@ +sonar.projectKey=seedling +sonar.projectName=seedling +sonar.inclusions=source/** \ No newline at end of file diff --git a/source/app/src/app/app.tsx b/source/app/src/app/app.tsx index 49fb2cb..7c6d543 100644 --- a/source/app/src/app/app.tsx +++ b/source/app/src/app/app.tsx @@ -1,8 +1,9 @@ // @ts-nocheck -import React, { FC, useEffect } from 'react'; -import { Route, Switch, useLocation } from 'wouter'; +import React, { FC } from 'react'; +import { Route, Switch } from 'wouter'; import { useAuth } from '@prokyon/auth/hook/useAuth'; +import Section from '@prokyon/components/Section'; import { Skeleton } from '@prokyon/components/Skeleton'; import { MenuItem } from '@prokyon/components/Skeleton/types'; @@ -15,39 +16,40 @@ const topMenu: MenuItem[][] = [ { label: 'Routa', href: buildRoute('root') }, ], [ + // authenticated ], ]; const userMenu: MenuItem[][] = [ [ - // public + // public ], [ - // authenticated + // authenticated ], ]; -const publicSites: string[] = []; - export const App: FC = () => { const { authenticated } = useAuth(); - const [location] = useLocation(); - - const isPublicView = !!publicSites.find((url) => location.startsWith(url)); - const isWelcomePage = window.location.pathname === '/'; - - if (authenticated === null || authenticated === undefined) { - return null; - } - return ( - $(AppName), - top: authenticated ? topMenu[1] : isWelcomePage ? [] : topMenu[0], - user: authenticated ? userMenu[1] : isPublicView ? [] : userMenu[0], - }}> + logo: <>Many, + top: authenticated ? topMenu[1] : topMenu[0], + user: authenticated ? userMenu[1] : userMenu[0], + }} + components={{ + footer: ( +
+
+ Tento web používá pouze technické cookie. Monitorování návštěvnosti je zcela anonymní a je prováděno na straně + provozovatele webu. +
+
+ ) + }} + > {authenticated ? ( 404! @@ -61,3 +63,4 @@ export const App: FC = () => { ); }; + diff --git a/source/app/src/pages/WelcomePage.tsx b/source/app/src/pages/WelcomePage.tsx index d88d657..bf9f6cd 100644 --- a/source/app/src/pages/WelcomePage.tsx +++ b/source/app/src/pages/WelcomePage.tsx @@ -7,12 +7,6 @@ export const WelcomePage = () => { return (
Seedling app generator. -
-
- Tento web používá pouze technické cookie. Monitorování návštěvnosti je zcela anonymní a je prováděno na straně - provozovatele webu. -
-
); }; diff --git a/source/shared/.gitignore b/source/shared/.gitignore index d163863..16d8d68 100644 --- a/source/shared/.gitignore +++ b/source/shared/.gitignore @@ -1 +1,2 @@ -build/ \ No newline at end of file +build/ +node_modules/ \ No newline at end of file diff --git a/source/shared/Jenkinsfile b/source/shared/Jenkinsfile index 676e963..0a4171f 100644 --- a/source/shared/Jenkinsfile +++ b/source/shared/Jenkinsfile @@ -4,5 +4,4 @@ import FrontendBuild FrontendBuild({ name = '$(appName)' port = '$(appPort):80' - runSonar = true })