Skip to content

Feat/pages #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Nov 18, 2019
Merged

Feat/pages #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1afe086
putting together
Nov 3, 2019
e0e3e3a
.
Nov 3, 2019
5f45ce4
.
Nov 4, 2019
3ad4108
add components to landing page
Nov 5, 2019
5d505c4
add sidebar
Nov 5, 2019
16a705f
add login form
Nov 5, 2019
273d915
assembling landing page
Nov 6, 2019
87c234b
assemble sample page
Nov 6, 2019
723f4ae
Unique views for pages w/ special layouts
Nov 13, 2019
1a00151
added routing to sidebar
Nov 17, 2019
7f9b0bd
fixed merge conflits
Nov 17, 2019
068646f
fixed merge conflict
Nov 18, 2019
dbdce66
restore deleted
gawdn Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
module.exports = {
root: true,
env: {
node: true,
},
extends: [
'plugin:vue/essential',
'@vue/airbnb',
],
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',
},
root: true,
env: {
node: true,
},
extends: [
'plugin:vue/essential',
'@vue/airbnb',
],
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',
},
};
56 changes: 28 additions & 28 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"name": "27-1hoursite",
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"dependencies": {
"core-js": "^2.6.5",
"vue": "^2.6.10",
"vue-router": "^3.0.3",
"vuetify": "^2.0.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.11.0",
"@vue/cli-plugin-eslint": "^3.11.0",
"@vue/cli-service": "^3.11.0",
"@vue/eslint-config-airbnb": "^4.0.0",
"babel-eslint": "^10.0.1",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.0.0",
"sass": "^1.17.4",
"sass-loader": "^7.1.0",
"vue-cli-plugin-vuetify": "^0.6.3",
"vue-template-compiler": "^2.6.10",
"vuetify-loader": "^1.2.2"
}
"name": "csesoc-website",
"version": "0.9.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"dependencies": {
"core-js": "^2.6.5",
"vue": "^2.6.10",
"vue-router": "^3.0.3",
"vuetify": "^2.0.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.11.0",
"@vue/cli-plugin-eslint": "^3.11.0",
"@vue/cli-service": "^3.11.0",
"@vue/eslint-config-airbnb": "^4.0.0",
"babel-eslint": "^10.0.1",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.0.0",
"sass": "^1.17.4",
"sass-loader": "^7.1.0",
"vue-cli-plugin-vuetify": "^0.6.3",
"vue-template-compiler": "^2.6.10",
"vuetify-loader": "^1.2.2"
}
}
2 changes: 2 additions & 0 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
</head>

<body>
<div id="fb-root"></div>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v5.0"></script>
<noscript>
<strong>Sorry, this site needs JavaScript to be enabled to be shown.</strong>
</noscript>
Expand Down
98 changes: 94 additions & 4 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,109 @@
<v-app id="main-app">
<!-- Navigation bar/app bar goes here -->
<v-content>
<router-view></router-view>
<div>
<Sidebar :drawer="drawer" />
<v-app-bar app dark>
<v-app-bar-nav-icon class="ma-2" @click.stop="drawer = !drawer"> </v-app-bar-nav-icon>
<div class="flex-grow-1"></div>

<router-link to="/"
><v-container
class="fill-height"
fluid
style="max-height: 64px; max-width:100px"
>
<v-img class="ma-8" src="https://github.com/csesoc/csesoc.unsw.edu.au/blob/frontendCombined/src/assets/csesoclogobluewhite.png?raw=true" />
</v-container>
</router-link>
<div class="flex-grow-1"></div>
<LoginForm align="right"/>
</v-app-bar>

<router-view></router-view>
<Footer/>
</div>
</v-content>
</v-app>
</template>

<script>
import Footer from '@/components/Footer';
import Sidebar from '@/components/Sidebar.vue';
import LoginForm from '@/components/LoginForm';

export default {
name: 'App',
components: {},
data: () => ({}),
data: () => ({
drawer: false,
gridApiUri: 'https://gistcdn.githack.com/gawdn/464b5ed74404481f7296fb24f9f28243/raw/c9f63e5117a1406db9af5266c8cfd448161bbfec/test_grid.json',
gridItems: [],
listApiUri: 'https://gistcdn.githack.com/gawdn/464b5ed74404481f7296fb24f9f28243/raw/c9f63e5117a1406db9af5266c8cfd448161bbfec/test_grid.json',
listItems: [],
}),

components: {
Footer,
Sidebar,
LoginForm
},

mounted() {
fetch(this.gridApiUri)
.then(r => r.json())
.then((responseJson) => {
this.gridItems = responseJson;
});
},

};
</script>

<style scoped>
<style>
@import url("https://fonts.googleapis.com/css?family=Quicksand&display=swap");
* {
margin: 0;
padding: 0;
}
#showcase {
background-image: url("https://backgroundcheckall.com/wp-content/uploads/2017/12/black-tech-background-12.jpg");
background-size: cover;
background-position: center;
height: 100vh;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
text-align: center;
padding: 0 20px;
}
#showcase img {
max-width: 30%;
max-height: 30vh;
}
#showcase h1 {
font-size: 50px;
line-height: 1.2;
}
#showcase p {
font-size: 20px;
}
#showcase .button {
font-family: "Quicksand", sans-serif;
font-size: 18px;
text-decoration: none;
color: #fff;
background: #3a76f8;
padding: 10px 20px;
border-radius: 10px;
margin-top: 20px;
width: 250px;
}
#showcase .button:hover {
background: #3a76f8;
color: #fff;
}
.content {
padding: 2vw 15vw 5vw 15vw;
}
</style>
83 changes: 83 additions & 0 deletions src/components/Events.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<template>
<!-- Insert post here-->
<div class="gridView">
<v-container class="pa-md-10 mx-lg-auto">
<v-row>
<v-col>
<img src="https://res.cloudinary.com/css-tricks/image/upload/f_auto,q_auto/v1570828388/600xDigitalOcean_Agencies_bfkeb2.png" />
</v-col>
<v-col>
<div class="pa-md-6">
<h2 class="eventName">
{{ event.name }}
</h2>
<h3 class="eventTime">{{ event.date }}</h3>
<h3>{{ event.time }}</h3>
<p>
{{ event.info }}
</p>
<div class="text-center">
<router-link to="/post"
><v-btn rounded color="primary" dark style="float: right;"
>More -></v-btn
></router-link
>
</div>
</div>
</v-col>
</v-row>
</v-container>
</div>
</template>

<script>
export default {
name: 'EventsGrid',
data() {
return {
event: {
name: 'Annual Hackathon'.toUpperCase(),
date: '1st January 2020',
time: '0:00 - 23:59',
info: 'Do you love solving problems? Want to make a product that can potentially change the world? Here’s your opportunity to do so with your team of up to six people at CSESoc’s annual hackathon! You and your team will be given 24 hours to come up with a solution for the problem presented. ',
image: 'https://github.com/csesoc/csesoc.unsw.edu.au/blob/frontendCombined/src/assets/csesoclogobluewhite.png?raw=true',
},
};
},
};
</script>

<style scoped>
@import url("https://fonts.googleapis.com/css?family=Quicksand&display=swap");

h1 {
font-size: 48px;
font-weight: normal;
}

body {
font-family: "Quicksand", sans-serif;
text-align: left;
}

p {
font-size: 14px;
font-weight: 300;
-webkit-font-smoothing: subpixel-antialiased;
}

p span {
font-size: 16px;
font-style: italic;
display: inline-block;
}

.underline {
border-bottom: 1px solid grey;
}

img {
max-width: 100%;
max-height: 100%;
}
</style>
8 changes: 4 additions & 4 deletions src/components/Footer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
<v-card-text class="white--text">

<section class="tiers__grid">
<a v-for="sponsor in tierOne" class="tiers__box" :href="sponsor.link" :key="sponsor">
<a v-for="sponsor in tierOne" class="tiers__box" :href="sponsor.link">
<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">
<a v-for="sponsor in tierTwo" class="tiers__box" :href="sponsor.link">
<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">
<a v-for="sponsor in tierThree" class="tiers__box" :href="sponsor.link">
<img :src="sponsor.logo" style="max-width:100px;max-height:50px">
</a>
</section>
Expand Down Expand Up @@ -120,7 +120,7 @@ export default {
},
},
mounted() {
fetch('')
fetch('https://gistcdn.githack.com/esyw/4e35cd5fe73fa024020e67855ca733fb/raw/e85c9ae58a6323a4214ffa4ad89b0a5ebe404e31/sponsors.json')
.then(r => r.json())
.then((responseJson) => {
console.log(responseJson);
Expand Down
Loading