Differences

This shows you the differences between two versions of the page.

--- projects:projects [2026/06/19 21:36] – [List of Projects] jhagstrand
+++ projects:projects [2026/07/19 05:03] (current) – [End Branch] jhagstrand
@@ Line 24: / Line 24: @@
 [[projects:homepage:homepage]] - homepage for voyc.com
+[[projects:library:library]] - library of web development components
 [[projects:pokerface:pokerface]] - facial expressions of artificial feelings
@@ Line 69: / Line 71: @@
 =====Developer Guidelines=====
-==== Tab Indents ====
+==== Coding Style ====
-Always use the tab character to indent.
+Coding style:
+  * use the tab character to indent
+  * use unix line-endings
+javascript
+php
+python
+==== File Organization ====
+  project/                        ← git root
+    .env
+    config.php
+    config-example.php
+        html/                   ← docroot - index.html
+                svc/            ← webservice stubs, php or python
+                js/             ← project-specific javascript code
+                        lib/    ← generic javascript code
+                css/            ← project-specific css styles
+                        lib/    ← generic css styles
+        php/                    ← project-specific php code
+                lib/            ← generic php code
+        python/                 ← project-specific python code
+                lib/            ← generic python code
+        db/
+            schema.sql
+            seed.sql
+            reset.sh
 ====.gitignore====
-  robots.txt
-  .well-known/*
-  js.min
-  css.min
   index.php
+  min.js
+  min.css
   RELEASES.md
+  robots.txt
+  .well-known/*
+  .aider*
+  config.php
 ==== Duplicate Content ====
@@ Line 235: / Line 268: @@
   # save work
   git checkout peaceful
+  git commit -m 'feat: new feature'
   git push origin peaceful     # push feature branch to bare repo
 ==== End Branch ====
   git checkout master
-  git merge --squash peaceful
+  #git merge --squash peaceful
+  git merge --no-ff peaceful
   git commit -m 'squashed hand-written commit message'
   git branch -D peaceful    # after squash the big -D force is required
@@ Line 247: / Line 282: @@
 ==== Deploy ====
-  git tag v0.2.0 -m'...'  # fancy hand-written tag message will become part of release history
+  # in local dev
+  git tag -a v0.2.0  # with -a and not -m the editor opens for multiline message
   git push origin master --tags
-  git push gitlab master --tags
+  git push gitlab master --tags  # need PAT
+  git for-each-ref --sort=-version:refname --format='%(refname:short)  %(contents)%0a%0a' refs/tags >RELEASES.md
   # in production webserver
   git fetch origin
   git reset --hard origin/master
-  git push gitlab master --tags