Differences

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

--- projects:projects [2026/06/23 21:32] – [Deploy] jhagstrand
+++ projects:projects [2026/10/11 07:46] (current) – [List of Projects] jhagstrand
@@ Line 2: / Line 2: @@
 ======Projects======
-=====List of Projects=====
-Each project is a web app, a subdomain of voyc.com, stored in gitlab (previously github).
+Each project is a web app, a subdomain of voyc.com, stored in gitlab.
-=== For Developers ===
+=== active ===
-[[projects:layout:layout]] - browser screen splitter
 [[projects:account:account]] - submodule, user management
-[[projects:fx:fx]] - submodule, library of game effects
+[[projects:chat:chat]] - chatbot, supporting all voyc apps and agents
-[[projects:icon:icon]] - submodule, library of icons
+[[projects:curriculum:curriculum]] - voycipedia
-[[projects:jslib:jslib]] - library of javascript tools
+[[projects:emo:emo]] - facial expressions of artificial feelings
-[[projects:minimal:minimal]] - html, css, javascript for a minimal web app
+[[projects:geo:geo]] - geopolitics map drawing
+[[projects:guru:guru]] - random quote
-=== Apps ===
+[[projects:flash:flash]] - flash card memorization
-[[projects:homepage:homepage]] - homepage for voyc.com
+[[projects:vote:vote]] - ranked choice voting
-[[projects:pokerface:pokerface]] - facial expressions of artificial feelings
+[[projects:suite:suite]] - suite
-[[projects:geo:geo]] - geopolitics map drawing
+[[projects:timeline:timeline]] - timeline
-[[projects:curriculum:curriculum]] - voycipedia
+[[projects:voyc:voyc]] - leftover from when geo/global was voyc.com
-[[projects:global:global]] - previously voyc, before geo
+=== lib ===
-[[projects:samantha:samantha]] - AI webchat
+[[projects:fx:fx]] - submodule, library of game effects
-[[projects:classy:classy]] - comment classifier
+[[projects:icon:icon]] - submodule, library of icons
+[[projects:jslib:jslib]] - library of javascript tools
+[[projects:minimal:minimal]] - html, css, javascript for a minimal web app
 [[projects:sandbox:sandbox]] - experiment and demo
-[[projects:bahasa:bahasa]] - language
+=== lab ===
-[[projects:flash:flash]] - flash card memorization
+[[projects:global:global]] - previously voyc, before geo
-[[projects:guru:guru]] - random quote
+[[projects:samantha:samantha]] - AI webchat
+[[projects:classy:classy]] - comment classifier
+[[projects:bahasa:bahasa]] - language
 [[projects:mai:mai]] - language
@@ Line 50: / Line 56: @@
 [[projects:sanskrit:sanskrit]] - language
-[[projects:robots:robots]] - multiple hardware projects
-[[projects:vote:vote]] - ranked choice voting
 [[projects:wordnet:wordnet]] - database only, sql version of Princeton's WordNet
+[[projects:robots:robots]] - multiple hardware projects
 [[projects:model:model]] - starter project template
-[[projects:timeline:timeline]] - timeline
+=== lists ===
-[[projects:voyc:voyc]] - leftover from when geo/global was voyc.com
 [[https://docs.google.com/spreadsheets/d/1Hs1h9R91J8e3biNyIzN-aX_iER-cJ1zTMMGI4BeC-IA/edit?gid=2023137882#gid=2023137882 | My Drive -> sync -> dev -> webapps -> projects checklist sheet]]
@@ Line 104: / Line 106: @@
 ====.gitignore====
-  robots.txt
-  .well-known/*
-  js.min
-  css.min
   index.php
+  min.js
+  min.css
   RELEASES.md
+  robots.txt
+  .well-known/*
   .aider*
   config.php
@@ Line 266: / 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 commit -m 'squashed hand-written commit message'
+  #git merge --squash peaceful
-  git branch -D peaceful    # after squash the big -D force is required
+  #git commit -m 'squashed hand-written commit message'
+  #git branch -D peaceful    # after squash the big -D force is required
+  git merge --no-ff peaceful   # the commit is built-in
+  git branch -d peaceful    # after no-ff little -d id ok
   git push origin master     # push master to bare repo
   git push origin --delete peaceful  # delete feature branch from bare repo