Merge branch 'homepage'

yashspr · Mar 23, 2020 · fdda1c7 · fdda1c7
2 parents faabe86 + 8b2249e
commit fdda1c7
Show file tree

Hide file tree

Showing 21 changed files with 715 additions and 300 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,17 +6,19 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "server": "nodemon ./backend/index.js"
+    "server": "nodemon ./backend/index.js",
+    "sass": "sass --watch ./src/assets/sass/main.scss ./public/style.css"
   },
   "dependencies": {
     "axios": "^0.19.2",
     "connect-mongo": "^3.2.0",
-    "core-js": "^2.6.5",
+    "core-js": "^2.6.11",
     "express": "^4.17.1",
     "express-session": "^1.17.0",
     "googleapis": "^48.0.0",
     "mongoose": "^5.9.5",
     "morgan": "^1.9.1",
+    "sass": "^1.26.3",
     "vue": "^2.6.10",
     "vue-router": "^3.0.3",
     "vuex": "^3.0.1"
@@ -46,7 +48,7 @@
     ],
     "rules": {
       "prettier/prettier": [
-        "error",
+        "ignore",
         {
           "tabWidth": 4,
           "useTabs": true

diff --git a/public/index.html b/public/index.html
@@ -1,15 +1,22 @@
 <!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">
+    <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
+      href="https://fonts.googleapis.com/css?family=Raleway:400,500,600,700&display=swap"
+      rel="stylesheet"
+    />
+    <link rel="stylesheet" href="./style.css" />
     <title>notes-application</title>
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but notes-application doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong
+        >We're sorry but notes-application doesn't work properly without
+        JavaScript enabled. Please enable it to continue.</strong
+      >
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->

diff --git a/public/style.css b/public/style.css
diff --git a/public/style.css.map b/public/style.css.map
diff --git a/src/App.vue b/src/App.vue
@@ -1,29 +1,16 @@
 <template>
   <div id="app">
-    <div id="nav">
-      <router-link to="/">Home</router-link> |
-      <router-link to="/about">About</router-link>
-    </div>
+    <NavBar />
     <router-view />
   </div>
 </template>
 
-<style lang="scss">
-#app {
-  font-family: "Avenir", Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-}
-#nav {
-  padding: 30px;
-  a {
-    font-weight: bold;
-    color: #2c3e50;
-    &.router-link-exact-active {
-      color: #42b983;
-    }
+<script>
+import NavBar from "@/components/NavBar.vue";
+
+export default {
+  components: {
+    NavBar
   }
-}
-</style>
+};
+</script>
diff --git a/src/assets/logo.png b/src/assets/logo.png
diff --git a/src/assets/sass/_base.scss b/src/assets/sass/_base.scss
@@ -0,0 +1,21 @@
+:root {
+  --primary-color: #42b983;
+  --secondary-color: #b9b3b3;
+  --text-color: #2c3e50;
+}
+
+*,
+*::before,
+*::after {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+html {
+  font-size: 62.5%;
+}
+
+body {
+  font-family: 'Avenir', Helvetica, Arial, sans-serif;
+  color: var(--text-color);
+}
diff --git a/src/assets/sass/_components.scss b/src/assets/sass/_components.scss
@@ -0,0 +1,78 @@
+#nav {
+  padding: 1.5rem;
+  font-size: 2rem;
+  text-align: center;
+  display: flex;
+  a {
+    text-decoration: none;
+    color: var(--text-color);
+    &.router-link-exact-active {
+      color: var(--primary-color);
+    }
+    margin-right: 2rem;
+  }
+  a:first-child {
+    margin-right: auto;
+  }
+  border-bottom: 0.1rem solid var(--secondary-color);
+}
+
+.note-card {
+  margin-left: 2rem;
+  border-bottom: 0.1rem solid var(--secondary-color);
+  cursor: pointer;
+  &:not(:first-child) {
+    margin-top: 2rem;
+  }
+  &__title {
+    // margin: 2rem 0;
+    font-size: 2rem;
+  }
+  &__description {
+    font-size: 1.5rem;
+    line-height: 4rem;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+
+.form {
+  height: 100%;
+  &__title {
+    width: 100%;
+    height: 5rem;
+    outline: none;
+    border: none;
+    border-bottom: 0.1rem solid var(--secondary-color);
+    margin-bottom: 3rem;
+    padding-left: 2rem;
+    font-size: 3rem;
+  }
+  &__textarea {
+    width: 100%;
+    border: none;
+    padding-left: 2rem;
+    height: 100%;
+    font-size: 2rem;
+    resize: none;
+  }
+}
+
+.toolbar {
+  border-bottom: 0.1rem solid var(--secondary-color);
+  display: flex;
+  justify-content: flex-end;
+  padding-bottom: 1rem;
+
+  &__icon-container {
+    margin-right: 2rem;
+    display: flex;
+    cursor: pointer;
+  }
+  &__icon {
+    height: 2.5rem;
+    width: 2.5rem;
+    fill: var(--primary-color);
+  }
+}
diff --git a/src/assets/sass/_layout.scss b/src/assets/sass/_layout.scss
@@ -0,0 +1,15 @@
+.body__container {
+  display: flex;
+  position: absolute;
+  top: 6rem;
+  bottom: 0;
+  overflow: hidden;
+  .list__container {
+    padding-left: 2rem 0 0 2rem;
+    width: 20vw;
+    border-right: 0.1rem solid var(--secondary-color);
+  }
+  .create__container {
+    width: 80vw;
+  }
+}
diff --git a/src/assets/sass/main.scss b/src/assets/sass/main.scss
@@ -0,0 +1,3 @@
+@import 'base';
+@import 'layout';
+@import 'components';