Merge pull request #28 from manderly/2021-api-update

2021 api update
manderly · Aug 20, 2021 · 9a3f6ec · 9a3f6ec
2 parents 0728d25 + 36fa3b5
commit 9a3f6ec
Show file tree

Hide file tree

Showing 11 changed files with 3,070 additions and 1,732 deletions.
diff --git a/README.md b/README.md
@@ -45,6 +45,10 @@ Run `npm test` to run the unit tests with karma.
 
 # Change log
 
+**August 2021**
+- Updated to latest google-spreadsheets node package to keep up with current Google Spreadsheets API version
+- There are now 1212 course reviews!
+
 **May 2021**
 - Maintenance: Modernized node, updated packages, added a Google ad (sorry, this app costs money to run)
 

diff --git a/client/app/app.scss b/client/app/app.scss
@@ -35,11 +35,135 @@ body {
 
 // Component styles are injected through gulp
 /* inject:scss */
-@import 'main/main';
-@import '../components/footer/footer';
 @import '../components/modal/modal';
 /* endinject */
 
+:root {
+  --osuOrange: #dc4405;
+}
+
+.thing-form {
+  margin: 20px 0;
+}
+
+#banner {
+  border-bottom: none;
+  margin-top: -20px;
+}
+
+#banner h1 {
+  font-size: 52px;
+  line-height: 1;
+  letter-spacing: -1px;
+}
+
+#banner a {
+  color: #fff;
+  text-decoration: underline;
+}
+
+
+.hero-unit {
+  position: relative;
+  padding: 30px 15px;
+  color: #F5F5F5;
+  text-align: center;
+  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
+  background: #4393B9;
+}
+
+.navbar-text {
+  margin-left: 15px;
+}
+
+
+/* OSU orange */
+.orange {
+  background-color: var(--osuOrange);
+}
+
+.light-gray {
+  background-color: #eee;
+}
+
+footer {
+  clear:both;
+  width:100%;
+  margin:auto;
+  display:inline-block;
+  padding:20px 0 20px 0;
+}
+
+.huge-text {
+  font-size:60px;
+}
+
+.span-block {
+  display:block;
+}
+
+.welcome-box {
+  text-align:center;
+  font-size:21px;
+  padding:5%;
+}
+
+.welcome-box-icon {
+  color: var(--osuOrange);
+  padding: 0 5px 5px 5px;
+  font-size:10em;
+}
+
+.pad-top {
+  padding-top: 30px;
+}
+
+.pad-bottom {
+  padding-bottom: 10px;
+}
+
+.margin-bottom {
+  margin-bottom: 30px;
+}
+
+.last-built {
+  color:#999;
+}
+
+.pull-right {
+  float:right;
+}
+
+.test {
+  border: solid red 1px;
+}
+
+.banner {
+  display:block;
+  text-align:center;
+}
+
+.ui-select-match-text {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+@media screen and (max-width: 600px) {
+  .hide-on-mobile {
+    visibility: hidden;
+    display: none;
+  }
+}
+
+footer.footer {
+  text-align: center;
+  padding: 30px 0;
+  margin-top: 70px;
+  border-top: 1px solid #E5E5E5;
+}
+
+
 .donutLegend li {
   list-style: none;
   display: inline-block;

diff --git a/client/app/main/main.component.js b/client/app/main/main.component.js
@@ -51,7 +51,7 @@ export class MainController {
   $onInit() {
     this.$http.get('/api/data')
       .then(response => {
-        this.courses = response.data.courseData.courses;
+        this.courses = response.data.courseData['courses'];
         this.reviewCount = response.data.courseData.reviewCount;
         this.courseNames = response.data.courseData.courseNames.sort();
         //format the timestamp and make it local to the user's timezone, rather than UTC

diff --git a/client/app/main/main.html b/client/app/main/main.html
@@ -130,7 +130,7 @@ <h2>About this project</h2>
     <br/><br/>
     Tips, difficulty scores, and time spent are <a href="https://docs.google.com/spreadsheets/d/1MFBGJbOXVjtThgj5b6K0rv9xdsC1M2GQ0pJVB-8YCeU/edit">scraped from this spreadsheet</a> and are written by real students on the <a href="https://www.reddit.com/r/OSUOnlineCS/">OSUOnlineCS subreddit</a>. Add your own <a href="https://docs.google.com/forms/d/e/1FAIpQLSeAWZa_OWYqwOte5yw4loGgE6hEUqOJOeSpmzStZF_HcufufQ/viewform">course review(s) via the survey here</a>. The course review data in this app is as useful as students like you make it.
     <br/><br/>
-    App developed by <a href="http://tilcode.com">Mandi Burley</a>, OSU CS student and web developer.
+    App developed by <a href="http://tilcode.com">Mandi Burley</a>, OSU CS alum and web developer.
     Explore the <a href="https://github.com/manderly/osu-cs-class-explorer">project code</a> on my <a href="https://github.com/manderly">GitHub</a> and connect with me on <a href="https://www.linkedin.com/in/majoh/">LinkedIn</a>.
     <br/><br/>
     You can help improve this app by <a href="https://github.com/manderly/osu-cs-class-explorer">opening a pull request</a>!

diff --git a/client/app/main/main.scss b/client/app/main/main.scss
@@ -1,117 +1,3 @@
 :root {
   --osuOrange: #dc4405;
 }
-
-.thing-form {
-  margin: 20px 0;
-}
-
-#banner {
-  border-bottom: none;
-  margin-top: -20px;
-}
-
-#banner h1 {
-  font-size: 52px;
-  line-height: 1;
-  letter-spacing: -1px;
-}
-
-#banner a {
-  color: #fff;
-  text-decoration: underline;
-}
-
-
-.hero-unit {
-  position: relative;
-  padding: 30px 15px;
-  color: #F5F5F5;
-  text-align: center;
-  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
-  background: #4393B9;
-}
-
-.navbar-text {
-  margin-left: 15px;
-}
-
-
-/* OSU orange */
-.orange {
-  background-color: var(--osuOrange);
-}
-
-.light-gray {
-  background-color: #eee;
-}
-
-footer {
-  clear:both;
-  width:100%;
-  margin:auto;
-  display:inline-block;
-  padding:20px 0 20px 0;
-}
-
-.huge-text {
-  font-size:60px;
-}
-
-.span-block {
-  display:block;
-}
-
-.welcome-box {
-  text-align:center;
-  font-size:21px;
-  padding:5%;
-}
-
-.welcome-box-icon {
-  color: var(--osuOrange);
-  padding: 0 5px 5px 5px;
-  font-size:10em;
-}
-
-.pad-top {
-  padding-top: 30px;
-}
-
-.pad-bottom {
-  padding-bottom: 10px;
-}
-
-.margin-bottom {
-  margin-bottom: 30px;
-}
-
-.last-built {
-  color:#999;
-}
-
-.pull-right {
-  float:right;
-}
-
-.test {
-  border: solid red 1px;
-}
-
-.banner {
-  display:block;
-  text-align:center;
-}
-
-.ui-select-match-text {
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-@media screen and (max-width: 600px) {
-  .hide-on-mobile {
-    visibility: hidden;
-    display: none;
-  }
-}
diff --git a/client/components/footer/footer.scss b/client/components/footer/footer.scss
@@ -1,6 +1 @@
-footer.footer {
-  text-align: center;
-  padding: 30px 0;
-  margin-top: 70px;
-  border-top: 1px solid #E5E5E5;
-}
+
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -32,7 +32,7 @@ const paths = {
         scripts: [
             `${clientPath}/**/!(*.spec|*.mock).js`
         ],
-        styles: [`${clientPath}/{app,components}/**/*.scss`],
+        styles: [`${clientPath}/{app,components}/**/*.scss`], // client/app/main/main.scss
         mainStyle: `${clientPath}/app/app.scss`,
         views: `${clientPath}/{app,components}/**/*.html`,
         mainView: `${clientPath}/index.html`,
@@ -42,7 +42,7 @@ const paths = {
     server: {
         scripts: [
           `${serverPath}/**/!(*.spec|*.integration).js`,
-          `!${serverPath}/config/local.env.sample.js`
+          `!${serverPath}/config/local.env.js`
         ],
         json: [`${serverPath}/**/*.json`],
         test: {