Differences

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

--- projects:projects [2024/10/10 05:49] – [Create Bare Central Git] jhagstrand
+++ projects:projects [2026/06/04 21:29] (current) – [List of Projects] jhagstrand
@@ Line 1: / Line 1: @@
 Projects:
 ======Projects======
+=====List of Projects=====
 Each project is a web app, a subdomain of voyc.com, stored in gitlab (previously github).
@@ Line 17: / Line 19: @@
 [[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
+[[projects:homepage:homepage]] - homepage for voyc.com
+[[projects:geo:geo]] - geopolitics map drawing
+[[projects:curriculum:curriculum]] - voycipedia
 [[projects:global:global]] - previously voyc, before geo
@@ Line 52: / Line 59: @@
 [[projects:timeline:timeline]] - timeline
-[[https://docs.google.com/spreadsheets/d/19pIRXgSPT8AFUTCPh-eTPc8Ej9RInxtj518fo-t2HVs/edit?usp=sharing | projects checklist]]
+[[projects:voyc:voyc]] - leftover from when geo/global was voyc.com
+[[https://docs.google.com/spreadsheets/d/19pIRXgSPT8AFUTCPh-eTPc8Ej9RInxtj518fo-t2HVs/edit?usp=sharing | projects checklist sheet]]
+[[https://docs.google.com/spreadsheets/d/1Hs1h9R91J8e3biNyIzN-aX_iER-cJ1zTMMGI4BeC-IA/edit?gid=2023137882#gid=2023137882 | webapps sheet]]
 =====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 121: / Line 142: @@
 Note that use the ssh protocol; never the local protocol.
-====git Workflow====
+==== voyc git Workflow====
-=== Develop in webapps or webdev===
+== refresh the local repo and worktree ==
+  git clone ssh://voyccom@az1-ss8.a2hosting.com:7822/home/voyccom/voycgit/vote.git
-== recreate or refresh the worktree==
-  git clone ssh://voyccom@az1-ss8.a2hosting.com:7822/home/voyccom/voycgit/jslib.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