Updated org map to new Organization struct, updated templates, added …

…Lake afton PNG file. (#109)

Co-authored-by: James Kupke <[email protected]>

issues.go

@@ -136,7 +136,7 @@ func issueSearch(ctx context.Context, label, token string, ch chan<- Issue) erro
 
 	q := fmt.Sprintf(`is:open type:issue label:"%s"`, label)
 	for k, v := range orgs {
-		if v == true {
+		if v.Visible == true {
 			q += " org:" + k
 		}
 	}

main.go

@@ -16,6 +16,32 @@ import (
 	"github.com/unrolled/render"
 )
 
+type Organization struct {
+	Title     string
+	ImagePath string
+	Visible   bool
+}
+
+// Any project under one of these organizations counts
+var orgs = map[string]Organization{
+	"devict": {
+		Title:       "devICT",
+                ImagePath:    "public/images/logos/devict.svg",
+		Visible:     true,
+	},
+	"makeict": {
+		Title:       "makeICT",
+                ImagePath:    "public/images/logos/makeict.svg",
+		Visible:     true,
+	},
+	"lake-afton-public-observatory": {
+		Title:       "Lake Afton Public Observatory",
+                ImagePath:    "public/images/logos/lake-afton.png",
+		Visible:     true,
+	},
+}
+
+/*
 // Any project under one of these organizations counts
 var orgs = map[string]bool{
 	"devict":                        true,
@@ -26,6 +52,7 @@ var orgs = map[string]bool{
 	"ennovar":                       false,
 	"lake-afton-public-observatory": true,
 }
+*/
 
 type Project struct {
 	Title       string
@@ -166,7 +193,7 @@ func logger(h http.Handler) http.Handler {
 
 func home(w http.ResponseWriter, r *http.Request) {
 	data := struct {
-		Orgs     map[string]bool
+		Orgs     map[string]Organization
 		Projects map[string]Project
 		Year     int
 		Config   HacktoberfestConfiguration

profile.go

@@ -22,7 +22,7 @@ func profile(w http.ResponseWriter, r *http.Request) {
 	}
 
 	info := struct {
-		Orgs     map[string]bool
+		Orgs     map[string]Organization
 		Projects map[string]Project
 		User     goth.User
 		New      bool

prs.go

@@ -124,7 +124,7 @@ func fetchPRs(usernames []string, token string) ([]PR, error) {
 	}
 
 	for i, pr := range prs {
-		prs[i].Valid = orgs[pr.Repo.Owner] || projects[pr.Repo.Owner+"/"+pr.Repo.Name].Visible
+		prs[i].Valid = orgs[pr.Repo.Owner].Visible || projects[pr.Repo.Owner+"/"+pr.Repo.Name].Visible
 	}
 
 	return prs, nil

templates/home.tmpl

@@ -146,11 +146,11 @@
     </div>
     <div class="mt-10">
       <ul data-sr-slide-up class="grid grid-cols-1 gap-6 sm:grid-cols-2">
-        {{ range $p, $i := .Orgs }}
-          {{ if $i }}
+        {{ range $orgName, $org := .Orgs }}
+          {{ if $org.Visible }}
             <li class="col-span-1 bg-white rounded-lg shadow hover:shadow-md">
-              <a class="group block text-center w-full" href="https://github.com/{{ $p }}">
-                <div class="p-6"><img class="block mx-auto max-h-10" src="public/images/logos/{{ $p }}.svg" alt="{{ $p }}"></div>
+              <a class="group block text-center w-full" href="https://github.com/{{ $orgName }}">
+                <div class="p-6"><img class="block mx-auto max-h-10" src="{{ $org.ImagePath }}" alt="{{ $org.Title }}"></div>
                 <div class="border-t border-gray-200">
                   <div class="flex">
                     <div class="w-0 flex-1 flex">

templates/profile.tmpl

@@ -90,11 +90,11 @@
         <div class="bg-gray-100 p-6">
           <h3 class="text-gray-900 text-xs font-medium uppercase tracking-wide">Organizations</h3>
           <ul class="mt-3 grid grid-cols-1 gap-6 sm:grid-cols-2">
-            {{ range $p, $i := .Orgs }}
-              {{ if $i }}
+            {{ range $orgName, $org := .Orgs }}
+              {{ if $org.Visible }}
                 <li class="col-span-1 bg-white rounded-lg shadow hover:shadow-md">
-                  <a class="group block text-center w-full" href="https://github.com/{{ $p }}" target="_blank">
-                    <div class="p-6"><img class="block mx-auto max-h-10" src="public/images/logos/{{ $p }}.svg" alt="{{ $p }}"></div>
+                  <a class="group block text-center w-full" href="https://github.com/{{ $orgName }}" target="_blank">
+                    <div class="p-6"><img class="block mx-auto max-h-10" src="{{ $org.ImagePath }}" alt="{{ $org.Title }}"></div>
                     <div class="border-t border-gray-200">
                       <div class="flex">
                         <div class="w-0 flex-1 flex">