merge dev into main

.github/dependabot.yml

@@ -10,3 +10,4 @@ updates:
    directory: "/"
    schedule:
      interval: weekly
+   target-branch: "dev"

.github/pull_request_template.md

@@ -0,0 +1,19 @@
+## What
+
+_what the PR changes_
+
+## Why
+
+_why these changes were made_
+
+## Test Plan
+
+_how did you verify these changes did what you expected_
+
+## Env Vars
+
+_did you add, remove, or rename any environment variables_
+
+## Checklist
+
+- [ ] Tested all changes locally

README.md

@@ -6,6 +6,24 @@ GLORIOUS REDESIGN of the internal CSH Members Portal. Uses [bootstrap-csh](https
 Contributing
 ------------
 
+### Local development
+Set the env variables in your favorite way (I just put them with `ENV VAR_NAME=VALUE` in dockerfile, there might be a better way but idk; be careful not to commit them though)
+
+Ask an RTP for OIDC creds, setting the cookie domain to localhost is needed because that's the domain it stores the cookies for and it freaks out if the domain isn't the same as the server name.
+```
+ENV SERVER_NAME=localhost:8080
+ENV HTTP_SCHEME=http
+ENV OIDC_CLIENT_ID=
+ENV OIDC_CLIENT_SECRET=
+ENV OIDC_COOKIE_DOMAIN=localhost
+```
+
+Run docker exposing port 8080
+
+```
+docker build . -t members && docker run -it -p 8080:8080 members
+```
+
 ### Pull Requests
 If you have an idea for a feature or have a bug that you'd like to fix, please fork this repo to a private repo of your own. If your contribution is more than some small tweak, create a branch. Do your thing, and then submit a pull request.
 

data/meetings.json

@@ -6,73 +6,93 @@
     "lengthMinutes": 90
   },
   {
-    "name": "OpComm",
+    "name": "History",
     "day": "MON",
-    "time": "8:30"
+    "time": "6:00"
   },
   {
-    "name": "Social",
+    "name": "History Discussion",
     "day": "MON",
-    "time": "8:00"
-  },
-  {
-    "name": "IMPS 1",
-    "day": "TUE",
-    "time": "5:30"
+    "time": "6:30"
   },
   {
     "name": "Evals",
-    "day": "TUE",
-    "time": "6:00"
+    "day": "MON",
+    "time": "7:30"
   },
   {
-    "name": "Financial",
+    "name": "IMPs",
     "day": "TUE",
     "time": "6:30"
   },
   {
-    "name": "History",
-    "day": "WED",
-    "time": "6:30"
+    "name": "R&D",
+    "day": "TUE",
+    "time": "7:30"
   },
   {
-    "name": "History Discussion",
-    "day": "WED",
-    "time": "7:00"
+    "name": "Financial",
+    "day": "TUE",
+    "time": "8:30"
   },
   {
     "name": "Eboard",
     "day": "WED",
-    "time": "8:15"
+    "time": "6:30"
   },
   {
     "name": "PR",
     "day": "THU",
     "time": "5:30"
   },
   {
-    "name": "R&D",
+    "name": "Cleaning Crew",
     "day": "THU",
-    "time": "6:00"
+    "time": "6:30"
+  },
+  {
+    "name": "OpComm",
+    "day": "THU",
+    "time": "8:15"
   },
   {
-    "name": "IMPS 2",
+    "name": "Social",
     "day": "FRI",
-    "time": "7:30"
+    "time": "6:30"
   },
   {
     "name": "Caption Glasses",
     "day": "MON",
+    "time": "8:30"
+  },
+  {
+    "name": "Devcade",
+    "day": "MON",
+    "time": "9:00"
+  },
+  {
+    "name": "Open Sauce",
+    "day": "THU",
     "time": "7:00"
   },
   {
-    "name": "Bits 'n Bytes",
-    "day": "TUE",
+    "name": "Yearbook",
+    "day": "THU",
     "time": "7:30"
   },
   {
-    "name": "Devcade",
-    "day": "TUE",
-    "time": "8:00"
+    "name": "50th",
+    "day": "FRI",
+    "time": "5:00"
+  },
+  {
+    "name": "Kilobyte",
+    "day": "FRI",
+    "time": "7:30"
+  },
+  {
+    "name": "Bits 'n Bytes",
+    "day": "TBD",
+    "time": "TBD"
   }
-]
+]

js/app.js

@@ -37,7 +37,7 @@ app.filter("sortDate", function(){
         relativeDay--;
       }
       if (relativeDay < 0) {
-        relativeDay = relativeDay + 5 + today;
+        relativeDay = relativeDay + 7;
       }
 
       if (relativeDay > 0) {