Differences

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

--- projects:projects [2024/08/31 07:20] – [.gitignore] jhagstrand
+++ projects:projects [2025/11/16 02:30] (current) – jhagstrand
@@ Line 2: / Line 2: @@
 ======Projects======
-Each project is a web app, a subdomain of voyc.com, stored in github.
+Each project is a web app, a subdomain of voyc.com, stored in gitlab (previously github).
+=== For Developers ===
+[[projects:layout:layout]] - browser screen splitter
+[[projects:account:account]] - submodule, user management
+[[projects:fx:fx]] - submodule, library of game effects
+[[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
+=== Apps ===
 [[projects:voyc:voyc]] - aka [[projects:geo:geo]], replaced by global and then by geo
@@ Line 11: / Line 27: @@
 [[projects:classy:classy]] - comment classifier
-[[projects:layout:layout]] - browser screen splitter
 [[projects:sandbox:sandbox]] - experiment and demo
@@ Line 33: / Line 47: @@
 [[projects:wordnet:wordnet]] - database only, sql version of Princeton's WordNet
-[[projects:account:account]] - submodule, user management
-[[projects:fx:fx]] - submodule, library of game effects
 [[projects:model:model]] - starter project template
-[[projects:jslib:jslib]] - library of javascript tools
+[[projects:timeline:timeline]] - timeline
 [[https://docs.google.com/spreadsheets/d/19pIRXgSPT8AFUTCPh-eTPc8Ej9RInxtj518fo-t2HVs/edit?usp=sharing | projects checklist]]
@@ Line 46: / Line 56: @@
 =====Developer Guidelines=====
-====Search Engines====
+====.gitignore====
+  robots.txt
+  .well-known/*
+  js.min
+  css.min
+  index.php
+==== Duplicate Content ====
 Most of our projects have a dev and a production version.\\
@@ Line 102: / Line 120: @@
 voycgit has no remotes.\\
 gitlab has no remotes. \\
+All other repositories have remote //origin// pointing to voycgit.\\
+webprod also has remote //gitlab//.\\
-All other repositories have remote origin created by the initial clone from voycgit.
   get remote -v
   $ origin ssh://voyccom@az1-ss8.a2hosting.com:7822/home/voyccom/voycgit/jslib.git
-  $ origin /home/voyccom/voycgit/jslib.git
-webprod also has remote gitlab
-  get remote -v
-  $ origin /home/voyccom/voycgit/jslib.git
   $ gitlab https://gitlab.com/voyc/jslib.git
-====git Workflow====
+Note that use the ssh protocol; never the local protocol.
-=== Develop in webapps or webdev===
+==== voyc git Workflow====
-== recreate or refresh the worktree==
+== refresh the local repo and worktree ==
-  git clone ssh://voyccom@az1-ss8.a2hosting.com:7822/home/voyccom/voycgit/jslib.git
+  git clone ssh://voyccom@az1-ss8.a2hosting.com:7822/home/voyccom/voycgit/vote.git
-    or
-  git clone /home/voyccom/voycgit/jslib.git
-    or
   git branch   # make sure you're in the master branch
   git pull origin master
   git submodule foreach git pull origin master
-== create a feature branch, do your work, commit==
+== start development ==
-  git branch newfeature
+  git branch popup         # create a feature branch
-  git checkout newfeature
+  git checkout popup
+== development ==
   <make changes>
   git status
-  git add *
+  git add .
-  git commit -m 'New feature'
+  git commit -m 'New popup architecture'   # version control
+  git push origin popup      # remote backup
-== merge to master, delete feature branch==
+== pull in simultaneous development from server - ???? ==
+  git switch master
+  git pull origin master
+  git checkout popup
+  git rebase master               # merge modified master into popup branch, resolve conflicts here
+== complete development ==
   git checkout master
-  git merge newfeature
+  git merge popup
-  git diff master..newfeature
+  git diff master..popup
-  git branch -d newfeature
+  git branch -d popup
+  git push origin master      # push to central
+  git push origin -d popup   # delete branch from central
-== push finished master branch up to voycgit ==
+== in webprod ==
-  git push origin master
-=== Publish in webprod ===
   git pull origin master
   git push gitlab master
-=====.gitignore=====
-  robots.txt
-  .well-known/*
-  js.min
-  css.min
-  index.php