PLAT-11769 adding welcome template styles inside the code file (#914)

* PLAT-11769 adding welcome template styles inside the code file * PLAT-11769 bumping version * PLAT-11769 generating manifest * PLAT-11769 deleting unused style files * PLAT-11769 updating index html to handle 100% in all screens * PLAT-11769 fix format documment * PLAT-11769 manual testing and suggestions * PLAT-11769 html file back to how it was, removing bg to login class, updating readme
crowdbotics · Jul 14, 2023 · 6602a5a · 6602a5a
1 parent c377959
commit 6602a5a
Show file tree

Hide file tree

Showing 19 changed files with 911 additions and 307 deletions.
diff --git a/Pipfile b/Pipfile
@@ -5,8 +5,8 @@ name = "pypi"
 
 [packages]
 cookiecutter = "*"
+urllib3 = "*"
 
 [dev-packages]
-
 [requires]
-python_version = "3.8"
+python_version = "3.8"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -36,6 +36,7 @@ The following must be available in your system:
 - [yarn](https://yarnpkg.com/)
 - [python](https://www.python.org/)
 - [pipenv](https://pypi.org/project/pipenv/)
+- [urllib3](https://urllib3.readthedocs.io/en/stable/) without this the project will not run in ```macOS``` environments
 
 Node `v18.16.0` (LTS) recommended.
 
@@ -70,3 +71,7 @@ Create new modules and test/validate your work locally before submitting a PR:
 ```sh
 yarn run parse
 ```
+
+
+### macOS config
+- make sure to have a compatible version of urllib3 with openssl. urllib3 v2.0 or higher is compatible with OpenSSL 1.1.1 or higher
diff --git a/config.js b/config.js
@@ -99,6 +99,18 @@ export default {
           "ios/fastlane/metadata/review_information/review_demo_user.txt"
         ],
         upgradeManifestImport: "./manifest/211-to-220.json"
+      },
+      {
+        text: "Upgrade my scaffold (2.2.0 -> 2.3.0)",
+        previousVersion: "2.2.0",
+        previousVersionSHA: "54ea9645723f5c0f38cabb6f443a3701e5f5ae00",
+        nextVersion: "2.3.0",
+        nextVersionSHA: "PLAT-11769",
+        ignoreTemplatize: [
+          "ios/fastlane/metadata/review_information/review_demo_password.txt",
+          "ios/fastlane/metadata/review_information/review_demo_user.txt"
+        ],
+        upgradeManifestImport: "./manifest/220-to-230.json"
       }
     ],
     manifest: {

diff --git a/dist/cookie/{{cookiecutter.project_slug}}/.crowdbotics.json b/dist/cookie/{{cookiecutter.project_slug}}/.crowdbotics.json
@@ -1,7 +1,7 @@
 {
   "scaffold": {
     "type": "react-native",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "cookiecutter_context": {
       "project_name": "{{cookiecutter.project_name}}",
       "project_slug": "{{cookiecutter.project_slug}}",

diff --git a/dist/cookie/{{cookiecutter.project_slug}}/public/index.html b/dist/cookie/{{cookiecutter.project_slug}}/public/index.html
@@ -4,8 +4,22 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
         <meta name="theme-color" content="#000000">
         <title>React App</title>
+        <style>
+            html, body {
+                height: 100%;
+                margin: 0;
+                padding: 0;
+            }
+
+            #root {
+                height: 100%;
+                display: flex;
+                flex-direction: column;
+            }
+        </style>
     </head>
 
     <body>

diff --git a/dist/cookie/{{cookiecutter.project_slug}}/screens/welcome/index.js b/dist/cookie/{{cookiecutter.project_slug}}/screens/welcome/index.js
@@ -1,6 +1,12 @@
 import React from "react"
-import { View, Image, Text, ScrollView, SafeAreaView } from "react-native"
-import { styles } from "./styles"
+import {
+  View,
+  Image,
+  Text,
+  ScrollView,
+  SafeAreaView,
+  StyleSheet
+} from "react-native"
 
 const WelcomeScreen = () => {
   return (
@@ -19,4 +25,40 @@ const WelcomeScreen = () => {
   )
 }
 
+const styles = StyleSheet.create({
+  container: {
+    backgroundColor: "#F8F8FC",
+    height: "100%"
+  },
+  scrollView: {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "space-between",
+    padding: 20
+  },
+  group: {
+    alignItems: "center"
+  },
+  logo: {
+    height: 180,
+    width: 180,
+    padding: 40,
+    borderRadius: 30,
+    margin: 40
+  },
+  text: {
+    textAlign: "center",
+    fontSize: 28,
+    color: "#828AB0",
+    fontWeight: 700
+  },
+  footer: {
+    textAlign: "center",
+    fontSize: 18,
+    color: "#828AB0",
+    fontWeight: 700,
+    marginBottom: 20
+  }
+})
+
 export default WelcomeScreen
diff --git a/dist/cookie/{{cookiecutter.project_slug}}/screens/welcome/styles.js b/dist/cookie/{{cookiecutter.project_slug}}/screens/welcome/styles.js
diff --git a/dist/cookie/{{cookiecutter.project_slug}}/screens/welcome/styles.web.js b/dist/cookie/{{cookiecutter.project_slug}}/screens/welcome/styles.web.js
diff --git a/docs/commands.md b/docs/commands.md
@@ -171,6 +171,7 @@ Checks if the scaffold [.crowdbotics.json](/scaffold/template/custom/.crowdbotic
 ## Generate a scaffold upgrade manifest
 
 ```
+pipenv shell
 yarn run manifest
 ```
 

diff --git a/docs/scaffold-checklist.md b/docs/scaffold-checklist.md
@@ -22,9 +22,13 @@ Then double check your work with those helper scripts checks:
 - `yarn run template` produces no changes
 - `yarn run semver` check passes
 
-**Important!** Make your new version available in the upgrade tool (npx crowdbotics/modules) by updating [config.js](/config.js) to include a new `config.upgrade.versions` and then run:
+**Important!**
+
+Increase the version of the scaffold in [package.json](/scaffold/package.json) and [.crowdbotics.json](/scaffold/template/custom/.crowdbotics.json).
+Make this new version available in the upgrade tool (npx crowdbotics/modules) by updating [config.js](/config.js) to include a new `config.upgrade.versions` and then finally run:
 
 ```
+pipenv shell
 yarn run manifest
 ```
-Original file line number
+Diff line change
@@ Expand Up @@
     ## Generate a scaffold upgrade manifest
     ```
+    pipenv shell
     yarn run manifest
     ```
@@ Expand Down @@