Fix project initialization

freenit-framework · Feb 19, 2022 · 7c6b6c9 · 7c6b6c9
1 parent bfea1aa
commit 7c6b6c9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/bin/freenit.sh b/bin/freenit.sh
@@ -387,7 +387,7 @@ echo "========"
 env BACKEND_URL=\${BACKEND_URL} \${PACKAGE_MANAGER} dev -- --host 0.0.0.0
 EOF
   chmod +x devel.sh
-  cd ..
+  cd ../..
 }
 
 project() {
@@ -396,19 +396,6 @@ project() {
   cd "${NAME}"
   echo "# ${NAME}" >README.md
 
-  echo "Creating services"
-  mkdir services
-  cd services
-
-  echo "Creating backend"
-  backend
-  mv "${NAME}" backend
-
-  echo "Creating frontend"
-  frontend
-  mv "${NAME}" frontend
-  cd ..
-
   echo "Creating bin"
   mkdir bin
   cd bin
@@ -528,6 +515,27 @@ vars.mk
 EOF
 
   echo "DEVEL_MODE = YES" >vars.mk
+
+  echo "Creating services"
+  mkdir services
+  cd services
+
+  echo "Creating backend"
+  backend
+  mv "${NAME}" backend
+
+  echo "Creating frontend"
+  FRONTEND_TYPE=${FRONTEND_TYPE:=svelte}
+  if [ "${FRONTEND_TYPE}" = "svelte" ]; then
+    svelte
+  elif [ "${FRONTEND_TYPE}" = "react" ]; then
+    react
+  else
+    help >&2
+    exit 1
+  fi
+  mv "${NAME}" frontend
+  cd ..
 }
 
 

diff --git a/freenit/version.py b/freenit/version.py
@@ -1 +1 @@
-version = "0.2.20"
+version = "0.2.21"