create-digigov-app 0.4.0 → 0.6.1

package/CHANGELOG.json

@@ -1,6 +1,62 @@
 {
   "name": "create-digigov-app",
   "entries": [
+    {
+      "version": "0.6.1",
+      "tag": "create-digigov-app_v0.6.1",
+      "date": "Wed, 02 Feb 2022 15:44:29 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@digigov/cli-lint\" from `0.5.25` to `0.5.26`"
+          },
+          {
+            "comment": "Updating dependency \"@digigov/cli-test\" from `0.5.24` to `0.5.25`"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.6.0",
+      "tag": "create-digigov-app_v0.6.0",
+      "date": "Mon, 31 Jan 2022 13:42:21 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Add and remove css files for ts and js projects and add needed dependencies"
+          }
+        ],
+        "minor": [
+          {
+            "comment": "Refactor templates to use @digigov/react-core"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.5.0",
+      "tag": "create-digigov-app_v0.5.0",
+      "date": "Thu, 30 Dec 2021 12:54:03 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Update scaffolder's templates including @digigov/css configuration"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.4.1",
+      "tag": "create-digigov-app_v0.4.1",
+      "date": "Tue, 02 Nov 2021 13:03:39 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@digigov/cli\" from `0.5.24` to `0.5.25`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.0",
       "tag": "create-digigov-app_v0.4.0",

package/CHANGELOG.md

@@ -1,6 +1,34 @@
 # Change Log - create-digigov-app
 
-This log was last generated on Wed, 22 Sep 2021 10:15:42 GMT and should not be manually modified.
+This log was last generated on Wed, 02 Feb 2022 15:44:29 GMT and should not be manually modified.
+
+## 0.6.1
+Wed, 02 Feb 2022 15:44:29 GMT
+
+_Version update only_
+
+## 0.6.0
+Mon, 31 Jan 2022 13:42:21 GMT
+
+### Minor changes
+
+- Refactor templates to use @digigov/react-core
+
+### Patches
+
+- Add and remove css files for ts and js projects and add needed dependencies
+
+## 0.5.0
+Thu, 30 Dec 2021 12:54:03 GMT
+
+### Minor changes
+
+- Update scaffolder's templates including @digigov/css configuration
+
+## 0.4.1
+Tue, 02 Nov 2021 13:03:39 GMT
+
+_Version update only_
 
 ## 0.4.0
 Wed, 22 Sep 2021 10:15:42 GMT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-digigov-app",
-  "version": "0.4.0",
+  "version": "0.6.1",
   "description": "Create a DigiGOV App with ease",
   "bin": "cli.js",
   "files": [
@@ -25,9 +25,9 @@
     "validate-npm-package-name": "3.0.0"
   },
   "devDependencies": {
-    "@digigov/cli": "0.5.24",
-    "@digigov/cli-lint": "0.5.25",
-    "@digigov/cli-test": "0.5.24",
+    "@digigov/cli": "0.5.25",
+    "@digigov/cli-lint": "0.5.26",
+    "@digigov/cli-test": "0.5.25",
     "typescript": "4.2.3"
   },
   "license": "MIT",

package/saofile.js

@@ -2,17 +2,20 @@ const { relative } = require('path');
 const validate = require('validate-npm-package-name');
 
 const digigovDepsDev = [
-  "@digigov/cli",
-  "@digigov/cli-lint",
-  "@digigov/cli-app",
-  "@digigov/cli-build",
-  "@digigov/cli-test"
-]
+  '@digigov/cli',
+  '@digigov/cli-lint',
+  '@digigov/cli-app',
+  '@digigov/cli-build',
+  '@digigov/cli-test',
+];
 
 const digigovDeps = [
-  "@digigov/ui",
-  "@digigov/nextjs"
-]
+  '@digigov/ui',
+  '@digigov/nextjs',
+  '@digigov/react-core',
+  '@digigov/css',
+  'tailwindcss',
+];
 
 module.exports = {
   prompts: require('./prompts'),
@@ -58,8 +61,10 @@ module.exports = {
         '_package.json': 'package.json',
         '_.prettierrc.js': '.prettierrc.js',
         '_.eslintrc.js': '.eslintrc.js',
+        '_postcss.config.js': 'postcss.config.js',
+        '_tailwind.config.js': 'tailwind.config.js',
         '_tsconfig.json': 'tsconfig.json',
-        '_Dockerfile': 'Dockerfile',
+        _Dockerfile: 'Dockerfile',
       },
     });
 
@@ -74,13 +79,13 @@ module.exports = {
       await this.npmInstall({ npmClient: this.answers.pm });
       await this.npmInstall({
         npmClient: this.answers.pm,
-        packages: digigovDeps
-      })
+        packages: digigovDeps,
+      });
       await this.npmInstall({
         npmClient: this.answers.pm,
         packages: digigovDepsDev,
-        saveDev: true
-      })
+        saveDev: true,
+      });
     }
 
     const chalk = this.chalk;

package/template/_package.json

@@ -31,6 +31,9 @@
     "@types/enzyme-adapter-react-16": "^1.0.5",
     "@types/jest": "^26.0.15",
     "eslint": "^7.27.0",
-    "prettier": "^2.3.0"
+    "prettier": "^2.3.0",
+    "autoprefixer": "10.0.4",
+    "postcss": "8.2.6",
+    "tailwindcss": "2.2.4"
   }
 }

package/template/_postcss.config.js

@@ -0,0 +1,3 @@
+// If you want to use other PostCSS plugins, see the following:
+// https://tailwindcss.com/docs/using-with-preprocessors
+module.exports = require('@digigov/cli-app/postcssrc')();

package/template/_tailwind.config.js

@@ -0,0 +1 @@
+module.exports = require('@digigov/cli-app/tailwindrc')();

package/template/javascript/index.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

package/template/javascript/src/components/CommonLayout.js

@@ -0,0 +1,37 @@
+import React from 'react';
+import Head from 'next/head';
+import { useTranslation } from '@digigov/ui/app/i18n';
+import {
+  Layout,
+  Top,
+  Container,
+  Bottom,
+  Header,
+  GovGRFooter,
+  GovGRLogo,
+} from '@digigov/react-core';
+
+const CommonLayout = ({ children }) => {
+  const { t } = useTranslation();
+  return (
+    <Layout>
+      <Head>
+        <title>{t('app.name')}</title>
+      </Head>
+      <Top>
+        <Header>
+          <GovGRLogo />
+          {/* <HeaderTitle>
+            {t('app.name')}
+          </HeaderTitle> */}
+        </Header>
+      </Top>
+      <Container>{children}</Container>
+      <Bottom>
+        <GovGRFooter />
+      </Bottom>
+    </Layout>
+  );
+};
+
+export default CommonLayout;

package/template/javascript/src/locales/en.js

@@ -5,4 +5,4 @@ export default {
     intro_text: 'Welcome to My Service',
   },
   ...defaultEn,
-};
+};

package/template/javascript/src/pages/404.js

@@ -1,16 +1,16 @@
 import React from 'react';
 import NotFound from '@digigov/ui/app/NotFound';
-import { Main, Side } from '@digigov/ui/layouts/Basic';
-import Layout from '<%= name %>/components/Layout';
+import { Main, ASide } from '@digigov/react-core'
+import CommonLayout from '<%= name %>/components/CommonLayout';
 
 const NotFoundPage = () => {
   return (
-    <Layout>
+    <CommonLayout>
       <Main>
         <NotFound />
       </Main>
-      <Side></Side>
-    </Layout>
+      <ASide></ASide>
+    </CommonLayout>
   );
 };
 

package/template/javascript/src/pages/_app.js

@@ -1,7 +1,9 @@
 import App from '@digigov/nextjs/App';
 import initI18n from '@digigov/nextjs/i18n';
-import el from '../locales/el';
-import en from '../locales/en';
+import el from '<%= name %>/locales/el';
+import en from '<%= name %>/locales/en';
+import 'tailwindcss/tailwind.css';
+import '../../index.css';
 
 initI18n({
   el: {

package/template/javascript/src/pages/index.js

@@ -1,22 +1,28 @@
 import React from 'react';
 import { useTranslation } from '@digigov/ui/app/i18n';
-
-import { Main, Side } from '@digigov/ui/layouts/Basic';
-import PageTitle, { PageTitleHeading } from '@digigov/ui/app/PageTitle';
-import Layout from '<%= name %>/components/Layout';
+import {
+  Main,
+  Aside,
+  PageTitle,
+  PageTitleHeading,
+  CallToAction,
+  Paragraph,
+} from '@digigov/react-core';
+import CommonLayout from '<%= name %>/components/CommonLayout';
 
 const Home = () => {
   const { t } = useTranslation();
   return (
-    <Layout>
+    <CommonLayout>
       <Main>
         <PageTitle>
           <PageTitleHeading>{t('app.name')}</PageTitleHeading>
         </PageTitle>
-        <div>{t('app.intro_text')}</div>
+        <Paragraph>{t('app.intro_text')}</Paragraph>
+        <CallToAction href="/login">{t('button.start')}</CallToAction>
       </Main>
-      <Side></Side>
-    </Layout>
+      <Aside></Aside>
+    </CommonLayout>
   );
 };
 

package/template/typescript/index.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

package/template/typescript/src/components/CommonLayout.tsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import Head from 'next/head';
+import { useTranslation } from '@digigov/ui/app/i18n';
+import {
+  Layout,
+  Top,
+  Container,
+  Bottom,
+  Header,
+  GovGRFooter,
+  GovGRLogo,
+} from '@digigov/react-core';
+
+const CommonLayout: React.FC = ({ children }) => {
+  const { t } = useTranslation();
+  return (
+    <Layout>
+      <Head>
+        <title>{t('app.name')}</title>
+      </Head>
+      <Top>
+        <Header>
+          <GovGRLogo />
+          {/* <HeaderTitle>
+            {t('app.name')} 
+          </HeaderTitle> */}
+        </Header>
+      </Top>
+      <Container>{children}</Container>
+      <Bottom>
+        <GovGRFooter />
+      </Bottom>
+    </Layout>
+  );
+};
+
+export default CommonLayout;

package/template/typescript/src/pages/404.tsx

@@ -1,16 +1,16 @@
 import React from 'react';
 import NotFound from '@digigov/ui/app/NotFound';
-import { Main, Side } from '@digigov/ui/layouts/Basic';
-import Layout from '<%= name %>/components/Layout';
+import { Main, Aside } from '@digigov/react-core'
+import CommonLayout from '<%= name %>/components/CommonLayout';
 
 const NotFoundPage: React.FC = () => {
   return (
-    <Layout>
+    <CommonLayout>
       <Main>
         <NotFound />
       </Main>
-      <Side></Side>
-    </Layout>
+      <Aside></Aside>
+    </CommonLayout>
   );
 };
 

package/template/typescript/src/pages/_app.tsx

@@ -1,7 +1,9 @@
 import App from '@digigov/nextjs/App';
 import initI18n from '@digigov/nextjs/i18n';
-import el from '../locales/el';
-import en from '../locales/en';
+import el from '<%= name %>/locales/el';
+import en from '<%= name %>/locales/en';
+import 'tailwindcss/tailwind.css';
+import '../../index.css';
 
 initI18n({
   el: {

package/template/typescript/src/pages/index.tsx

@@ -1,22 +1,28 @@
 import React from 'react';
 import { useTranslation } from '@digigov/ui/app/i18n';
-
-import { Main, Side } from '@digigov/ui/layouts/Basic';
-import PageTitle, { PageTitleHeading } from '@digigov/ui/app/PageTitle';
-import Layout from '<%= name %>/components/Layout';
+import {
+  Main,
+  Aside,
+  PageTitle,
+  PageTitleHeading,
+  CallToAction,
+  Paragraph,
+} from '@digigov/react-core';
+import CommonLayout from '<%= name %>/components/CommonLayout';
 
 const Home: React.FC = () => {
   const { t } = useTranslation();
   return (
-    <Layout>
+    <CommonLayout>
       <Main>
         <PageTitle>
           <PageTitleHeading>{t('app.name')}</PageTitleHeading>
         </PageTitle>
-        <div>{t('app.intro_text')}</div>
+        <Paragraph>{t('app.intro_text')}</Paragraph>
+        <CallToAction href="/login">{t('button.start')}</CallToAction>
       </Main>
-      <Side></Side>
-    </Layout>
+      <Aside></Aside>
+    </CommonLayout>
   );
 };
 

package/template/javascript/src/components/Layout.js

@@ -1,42 +0,0 @@
-import React from 'react';
-import Head from 'next/head';
-import { useTranslation } from '@digigov/ui/app/i18n';
-
-import BasicLayout, {
-  Top,
-  Content,
-  Bottom,
-} from '@digigov/ui/layouts/Basic';
-import Header /* , { HeaderTitle } */ from '@digigov/ui/app/Header';
-/* import ServiceBadge from '@digigov/ui/core/ServiceBadge'; */
-import GovGRLogo from '@digigov/ui/govgr/Logo';
-import GovGRFooter from '@digigov/ui/govgr/Footer';
-
-const Layout = ({ children }) => {
-  const { t } = useTranslation();
-  return (
-    <BasicLayout>
-      <Head>
-        <title>{t('app.name')}</title>
-      </Head>
-      <Top>
-        <Header>
-          <GovGRLogo />
-          {/* Use the HeaderTitle with a service name if your service is more than 5 pages long - this can help users understand which service they are using. */}
-          {/* <HeaderTitle>
-            {t('app.name')}
-            <ServiceBadge label="ALPHA" />
-          </HeaderTitle> */}
-        </Header>
-      </Top>
-      <Content>
-        {children}
-      </Content>
-      <Bottom>
-        <GovGRFooter />
-      </Bottom>
-    </BasicLayout>
-  );
-};
-
-export default Layout;

package/template/typescript/src/components/Layout.tsx

@@ -1,42 +0,0 @@
-import React from 'react';
-import Head from 'next/head';
-import { useTranslation } from '@digigov/ui/app/i18n';
-
-import BasicLayout, {
-  Top,
-  Content,
-  Bottom,
-} from '@digigov/ui/layouts/Basic';
-import Header /* , { HeaderTitle } */ from '@digigov/ui/app/Header';
-/* import ServiceBadge from '@digigov/ui/core/ServiceBadge'; */
-import GovGRLogo from '@digigov/ui/govgr/Logo';
-import GovGRFooter from '@digigov/ui/govgr/Footer';
-
-const Layout: React.FC = ({ children }) => {
-  const { t } = useTranslation();
-  return (
-    <BasicLayout>
-      <Head>
-        <title>{t('app.name')}</title>
-      </Head>
-      <Top>
-        <Header>
-          <GovGRLogo />
-          {/* Use the HeaderTitle with a service name if your service is more than 5 pages long - this can help users understand which service they are using. */}
-          {/* <HeaderTitle>
-            {t('app.name')}
-            <ServiceBadge label="ALPHA" />
-          </HeaderTitle> */}
-        </Header>
-      </Top>
-      <Content>
-        {children}
-      </Content>
-      <Bottom>
-        <GovGRFooter />
-      </Bottom>
-    </BasicLayout>
-  );
-};
-
-export default Layout;