adding osmgeoweek link

Gemfile

@@ -13,6 +13,10 @@ gem "jekyll", "~> 3.8.5"
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.0"
 
+gem 'rexml', '~> 3.2'
+gem 'webrick', '~> 1.7'
+
+
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
 # gem "github-pages", group: :jekyll_plugins

Gemfile.lock

@@ -1,20 +1,20 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.2.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.11.1)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.8.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (3.8.7)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -27,47 +27,49 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-feed (0.12.1)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.6.1)
-      jekyll (>= 3.3, < 5.0)
+    jekyll-seo-tag (2.8.0)
+      jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    liquid (4.0.4)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    minima (2.5.0)
-      jekyll (~> 3.5)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    public_suffix (5.0.3)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.3.0)
-    ruby_dep (1.5.0)
+    rexml (3.2.6)
+    rouge (3.30.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    webrick (1.8.1)
 
 PLATFORMS
-  ruby
+  arm64-darwin-21
 
 DEPENDENCIES
   jekyll (~> 3.8.5)
   minima (~> 2.0)
+  rexml (~> 3.2)
   tzinfo-data
+  webrick (~> 1.7)
 
 BUNDLED WITH
-   2.1.4
+   2.3.4

_includes/navbar.html

@@ -67,6 +67,11 @@
         <li class="hidden">
           <a href="#page-top"></a>
         </li>
+        <li>
+          <a href="https://osmgeoweek.org/" class="fl logo-text">
+            <span class="text-green">#</span><span class="text-white">osm</span><span class="text-green">geo</span><span class="text-white">week</span>
+          </a>
+        </li>
         <li>
           <a class="page-scroll" href="{{site.baseurl}}/getting-started">Start</a>
         </li>        

_sass/navbar.scss

@@ -50,6 +50,14 @@
   transition: all ease .35s;
 }
 
+.text-green {
+  color: #2eb05c;
+}
+
+.text-white {
+  color: #fff;
+}
+
 .navbar-default.black-text .nav li a {
   color: #222;
 }
@@ -60,6 +68,17 @@
   color: $primary-color;
 }
 
+.navbar-default .nav li a:hover .text-green,
+.navbar-default .nav li a:focus .text-green {
+  color: $primary-color; /* Or whatever color you want on hover/focus */
+}
+
+.navbar-default .nav li a:hover .text-white,
+.navbar-default .nav li a:focus .text-white {
+  color: $primary-color; /* Or another color if you want a different one from .text-green */
+}
+
+
 .navbar-default .navbar-nav>.active>a {
   border-radius: 0;
   color: #fff;

_site/404.html

@@ -71,7 +71,7 @@
       </button>
       <a href="/" id="logo-link">
         <img class="logo" src="/assets/images/logo.png" />
-        <span id="beta-text">beta</span>
+        <!--<span id="beta-text">beta</span>-->
       </a>
 
 
@@ -84,6 +84,14 @@
         <li class="hidden">
           <a href="#page-top"></a>
         </li>
+        <li>
+          <a href="https://osmgeoweek.org/" class="fl logo-text">
+            <span class="text-green">#</span><span class="text-white">osm</span><span class="text-green">geo</span><span class="text-white">week</span>
+          </a>
+        </li>
+        <li>
+          <a class="page-scroll" href="/getting-started">Start</a>
+        </li>        
         <li>
           <a class="page-scroll" href="/blog">Blog</a>
         </li>
@@ -94,7 +102,7 @@
           <a class="page-scroll" href="/resources">Resources</a>
         </li>
         <li>
-          <a href="https://osmus.civicrm.org/civicrm/contribute/transact?cid=0&reset=1&id=3">Donate</a>
+          <a href="https://openstreetmap.app.neoncrm.com/forms/teachosm">Donate</a>
         </li>
       </ul>
     </div>
@@ -155,7 +163,7 @@ <h1>404</h1>
   <div class="container">
     <div class="row">
       <div class="col-md-4">
-        <span class="copyright">Copyright &copy; TeachOSM 2021</span>
+        <span class="copyright">Copyright &copy; TeachOSM 2023</span>
       </div>
       <div class="col-md-4">
         <ul class="list-inline social-buttons">

_site/README.md

@@ -1,5 +1,7 @@
 # teachosm
-Test site for teachosm
+teachosm site
+
+## The live site is built from the master branch. To make changes to the site, create a new branch from the master branch, make your changes, then make a pull request. When this is done, you should also be able to see a preview using Netlify. If the changes look good, approve the pull request to merge the changes back into the master branch. 
 
 # development
 For steps on running a local instance for development purposes, please see [CONTRIBUTING.md](CONTRIBUTING.md).

_site/assets/css/style.css

@@ -108,6 +108,12 @@ section h3.section-subheading {
   -moz-transition: all ease .35s;
   transition: all ease .35s; }
 
+.text-green {
+  color: #2eb05c; }
+
+.text-white {
+  color: #fff; }
+
 .navbar-default.black-text .nav li a {
   color: #222; }
 
@@ -116,6 +122,16 @@ section h3.section-subheading {
   outline: 0;
   color: #7EBC6F; }
 
+.navbar-default .nav li a:hover .text-green,
+.navbar-default .nav li a:focus .text-green {
+  color: #7EBC6F;
+  /* Or whatever color you want on hover/focus */ }
+
+.navbar-default .nav li a:hover .text-white,
+.navbar-default .nav li a:focus .text-white {
+  color: #7EBC6F;
+  /* Or another color if you want a different one from .text-green */ }
+
 .navbar-default .navbar-nav > .active > a {
   border-radius: 0;
   color: #fff;

_site/assets/js/custom/add-project-form.js

@@ -81,7 +81,7 @@ let subtitle;
 const setSubtitle = value => subtitle = value;
 
 let description;
-const setDescription = value => description = value;
+const setDescription = value => description = value.replace(/[\u2018\u2019]/g, "'");;
 
 let tags;
 const setTags = tagsString => tags = tagsString.split(',');
@@ -269,6 +269,7 @@ const submitForm = async () => {
     }
 
     console.log("let's print the pullRequestData");
+    console.log("smart single quotes should be replaced");
     console.log(pullRequestData);
 
     const pullRequestResponse = await axios.post(