fixed merge conflicts

csesoc · elizabethzhong · Sep 11, 2019 · Sep 11, 2019 · Oct 9, 2019 · Oct 20, 2019
commit 1d856725f8b3858976572caed3e492bd6deb0c45
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -10,6 +10,8 @@ module.exports = {
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'import/extensions': 'off',
+    'max-len': ['error', { code: 120, ignoreUrls: true }],
   },
   parserOptions: {
     parser: 'babel-eslint',

diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,82 @@
-.DS_Store
-node_modules
-/dist
 
-# local env files
-.env.local
-.env.*.local
-
-# Log files
+# Logs
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-node_modules
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# next.js build output
+.next
+
+### Go
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# vue build
+dist/
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -1,19 +1,23 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>website</title>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but website doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <title>CSESoc</title>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
+</head>
+
+<body>
+  <noscript>
+    <strong>Sorry, this site needs JavaScript to be enabled to be shown.</strong>
+  </noscript>
+  <div id="app"></div>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>
diff --git a/src/App.vue b/src/App.vue
@@ -30,6 +30,7 @@
 </template>
 
 <script>
+
 // import TextPost from './components/TextPost.vue';
 import Sidebar from './components/Sidebar.vue';
 import LoginForm from './components/LoginForm.vue';

diff --git a/src/components/Footer.vue b/src/components/Footer.vue
@@ -1,53 +1,138 @@
 <template>
-  <v-footer
-    dark
-    padless
-  >
-    <v-card
-      class="flex"
-      flat
-      tile
-      color="#3A76F8"
-    >
-  <!--
-      <v-card-title  align="right">
-          <strong>CONTACT US</strong>
-
-        <v-spacer></v-spacer>
-
-<br>
-CSESoc
-<br>
-//  office location //
-<br>
-For enquiries about our society
-<br>
-Please email info(@)csesoc.org.au
-<br>
-For enquiries about sponsorship
-<br>
-Please email sponsorship(@)csesoc.org.au
-<br>
-      </v-card-title>
--->
-
-      <v-card-actions class="grey darken-3 justify-left">
-        © Copyright {{ new Date().getFullYear() }} — <strong>CSESoc</strong>
-      </v-card-actions>
+  <v-footer dark padless id="tiers">
+    <v-card id="tiers__sponsors" width="100vw" class="white--text text-center">
+      <v-card-text class="white--text">
+        <section class="tiers__grid">
+          <a
+            v-for="sponsor in tierOne"
+            class="tiers__box"
+            :href="sponsor.link"
+            :key="sponsor"
+          >
+            <img
+              :src="sponsor.logo"
+              style=" max-width:300px;max-height:105px;"
+            />
+          </a>
+        </section>
+        <section class="tiers__grid">
+          <a
+            v-for="sponsor in tierTwo"
+            class="tiers__box"
+            :href="sponsor.link"
+            :key="sponsor"
+          >
+            <img :src="sponsor.logo" style="max-width:200px;max-height:75px" />
+          </a>
+        </section>
+        <section class="tiers__grid">
+          <a
+            v-for="sponsor in tierThree"
+            class="tiers__box"
+            :href="sponsor.link"
+            :key="sponsor"
+          >
+            <img :src="sponsor.logo" style="max-width:100px;max-height:50px" />
+          </a>
+        </section>
+      </v-card-text>
+
+      <h2>CONTACT US</h2>
+      <v-card-text class="white--text text-center tiers__contact">
+        <a href="https://www.facebook.com/csesoc">Facebook Page</a>
+        | <a href="https://www.facebook.com/groups/csesoc">Facebook Group</a> |
+        <a href="https://www.linkedin.com/company/csesoc/about/">LinkedIn</a>
+        <br />
+        B03 CSE Building K17, UNSW
+        <br />
+        <a id="tiers__link" href="mailto:csesoc@csesoc.org.au"
+          >csesoc@csesoc.org.au</a
+        >
+      </v-card-text>
+
+      <v-divider></v-divider>
+
+      <v-card-text class="white--text text-center">
+        {{ new Date().getFullYear() }} — <strong>CSESoc UNSW</strong>
+      </v-card-text>
     </v-card>
   </v-footer>
 </template>
 
-<script>
+
+<style scoped>
+@import url("https://fonts.googleapis.com/css?family=Quicksand");
+
+#tiers {
+  margin-top: 0px;
+  font-family: "Quicksand", sans-serif;
+}
+
+#tiers__sponsors {
+  background: #4a4a4a;
+  padding-top: 5vw;
+}
+
+.white--text {
+  font-size: 16px;
+  line-height: 28px;
+}
+
+.white--text a {
+  color: white;
+}
+
+.white--text a:hover {
+  color: #427bff;
+}
+
+.tiers__grid {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: center;
+  align-items: center;
+  margin-left: 1vw;
+  margin-right: 1vw;
+}
+
+.tiers__box {
+  margin: 20px;
+}
+
+.tiers__contact {
+  margin-bottom: 1vw;
+}
+</style>
+
+<script type="text/javascript">
 export default {
-  data: () => ({
-    icons: [
-      'fab fa-facebook',
-      'fab fa-twitter',
-      'fab fa-google-plus',
-      'fab fa-linkedin',
-      'fab fa-instagram',
-    ],
-  }),
+  name: 'Footer',
+  data: () => (
+    {
+        // sponsors have name, logo, 'tier' value, and link
+        sponsors: [],
+    }
+  ),
+  computed: {
+    // functions to determine sizing category of sponsor based on their value
+    tierOne() {
+        return this.sponsors.filter(x => x.tier >= 1000);
+    },
+    tierTwo() {
+        return this.sponsors.filter(x => (x.tier >= 100 && x.tier < 1000));
+    },
+    tierThree() {
+        return this.sponsors.filter(x => (x.tier >= 10 && x.tier < 100));
+    },
+  },
+  mounted() {
+    fetch('')
+      .then(r => r.json())
+      .then((responseJson) => {
+        console.log(responseJson);
+        this.sponsors = responseJson;
+      });
+  },
 };
 </script>
diff --git a/src/main.js b/src/main.js
@@ -11,4 +11,4 @@ new Vue({
   vuetify,
   // el: '#app',
   render: h => h(App),
-}).$mount('#app'); // does almost the same thing as el: #app
+}).$mount('#app'); // does almost the same thing as el: #app
diff --git a/src/router.js b/src/router.js
@@ -5,6 +5,7 @@ import Home from './views/Home.vue';
 Vue.use(Router);
 
 export default new Router({
+
   mode: 'history',
   base: process.env.BASE_URL,
   routes: [
@@ -18,5 +19,13 @@ export default new Router({
       name: 'post',
       component: () => import('./views/Post.vue'),
     },
+    {
+      path: '/about',
+      name: 'about',
+      // route level code-splitting
+      // this generates a separate chunk (about.[hash].js) for this route
+      // which is lazy-loaded when the route is visited.
+      component: () => import('./views/About.vue'),
+    },
   ],
 });