Skip to content

Commit

Permalink
placeholder data properly implemented
Browse files Browse the repository at this point in the history
  • Loading branch information
clr14003 committed May 2, 2020
1 parent 130f428 commit f56c195
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 6 deletions.
7 changes: 5 additions & 2 deletions final/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>



<!-- figure out how to style the router-view thing -->
</div><router-view/>
</div>

Expand Down Expand Up @@ -52,7 +52,8 @@ export default {
justify-content: flex-start;
}
#nav {
padding: 30px;
padding: 23px;
width: 30%;
a {
font-weight: bold;
color: #2c3e50;
Expand All @@ -72,10 +73,12 @@ export default {
width: 100%;
img {
width: 30%;
max-width:200px;
}
div {
padding-left: 5%;
line-height: 200%;
width: 55%;
}
}
Expand Down
Binary file added final/src/assets/junk-tweet-pfp-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added final/src/assets/junk-tweet-pfp-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added final/src/assets/junk-tweet-pfp-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 65 additions & 0 deletions final/src/components/PlaceholderTweets.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<template>
<div id="postLog">
<div class="post">
<img class="postPFP" src="../assets/junk-tweet-pfp-1.png">
<span class="postMSG">lol hope this works</span>
</div>
<div class="post">
<img class="postPFP" src="../assets/junk-tweet-pfp-2.png">
<span class="postMSG">this is a second tweet</span>
</div>
<div class="post">
<img class="postPFP" src="../assets/junk-tweet-pfp-3.png">
<span class="postMSG">third tweet</span>
</div>
<!-- all posts below this are copies of the above -->
<div class="post">
<img class="postPFP" src="../assets/junk-tweet-pfp-1.png">
<span class="postMSG">lol hope this works</span>
</div>
<div class="post">
<img class="postPFP" src="../assets/junk-tweet-pfp-2.png">
<span class="postMSG">this is a second tweet</span>
</div>
<div class="post">
<img class="postPFP" src="../assets/junk-tweet-pfp-3.png">
<span class="postMSG">third tweet</span>
</div>
<div class="post">
<img class="postPFP" src="../assets/junk-tweet-pfp-1.png">
<span class="postMSG">lol hope this works</span>
</div>
<div class="post">
<img class="postPFP" src="../assets/junk-tweet-pfp-2.png">
<span class="postMSG">this is a second tweet</span>
</div>
<div class="post">
<img class="postPFP" src="../assets/junk-tweet-pfp-3.png">
<span class="postMSG">third tweet</span>
</div>
</div>
</template>

<script>
export default {
name: 'PlaceholderTweets',
props: {
msg: String
}
}
</script>

<style>
.postPFP {
height: 70px;
}
#postLog {
text-align: left;
max-height: 500px;
width: 150%;
overflow-y: scroll;
}
</style>
11 changes: 11 additions & 0 deletions final/src/components/TestThis.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<template>
<h1>{{ msg }}</h1>
</template>
<script>
export default {
name: 'TestThis',
props: {
msg: String
}
}
</script>
10 changes: 6 additions & 4 deletions final/src/views/Home.vue
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<template>
<div class="home">
<img alt="Vue logo" src="../assets/logo.png">
<HelloWorld msg="Testing this out"/>

<PlaceholderTweets/>

</div>

</template>

<script>
// @ is an alias to /src
import HelloWorld from '@/components/HelloWorld.vue'
import PlaceholderTweets from '@/components/PlaceholderTweets.vue'
export default {
name: 'home',
components: {
HelloWorld
PlaceholderTweets
},
mounted() {
// console.log(db);
Expand Down

0 comments on commit f56c195

Please sign in to comment.