Skip to content

Commit 924e719

Browse files
gawdngawdn
authored
Merge pull request #27 from csesoc/feat/pages
Feat/pages
2 parents 0c7a7ea + dbdce66 commit 924e719

24 files changed

+1277
-70
lines changed

‎.eslintrc.js

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
module.exports = {
2-
root: true,
3-
env: {
4-
node: true,
5-
},
6-
extends: [
7-
'plugin:vue/essential',
8-
'@vue/airbnb',
9-
],
10-
rules: {
11-
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
12-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
13-
'import/extensions': 'off',
14-
'max-len': ['error', { code: 120, ignoreUrls: true }],
15-
},
16-
parserOptions: {
17-
parser: 'babel-eslint',
18-
},
2+
root: true,
3+
env: {
4+
node: true,
5+
},
6+
extends: [
7+
'plugin:vue/essential',
8+
'@vue/airbnb',
9+
],
10+
rules: {
11+
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
12+
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
13+
'import/extensions': 'off',
14+
'max-len': ['error',
15+
{ code: 120, ignoreUrls: true
16+
}
17+
],
18+
},
19+
parserOptions: {
20+
parser: 'babel-eslint',
21+
},
1922
};

‎package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"name": "27-1hoursite",
3-
"version": "0.1.0",
4-
"private": true,
5-
"scripts": {
6-
"serve": "vue-cli-service serve",
7-
"build": "vue-cli-service build",
8-
"lint": "vue-cli-service lint"
9-
},
10-
"dependencies": {
11-
"core-js": "^2.6.5",
12-
"vue": "^2.6.10",
13-
"vue-router": "^3.0.3",
14-
"vuetify": "^2.0.0"
15-
},
16-
"devDependencies": {
17-
"@vue/cli-plugin-babel": "^3.11.0",
18-
"@vue/cli-plugin-eslint": "^3.11.0",
19-
"@vue/cli-service": "^3.11.0",
20-
"@vue/eslint-config-airbnb": "^4.0.0",
21-
"babel-eslint": "^10.0.1",
22-
"eslint": "^5.16.0",
23-
"eslint-plugin-vue": "^5.0.0",
24-
"sass": "^1.17.4",
25-
"sass-loader": "^7.1.0",
26-
"vue-cli-plugin-vuetify": "^0.6.3",
27-
"vue-template-compiler": "^2.6.10",
28-
"vuetify-loader": "^1.2.2"
29-
}
2+
"name": "csesoc-website",
3+
"version": "0.9.0",
4+
"private": true,
5+
"scripts": {
6+
"serve": "vue-cli-service serve",
7+
"build": "vue-cli-service build",
8+
"lint": "vue-cli-service lint"
9+
},
10+
"dependencies": {
11+
"core-js": "^2.6.5",
12+
"vue": "^2.6.10",
13+
"vue-router": "^3.0.3",
14+
"vuetify": "^2.0.0"
15+
},
16+
"devDependencies": {
17+
"@vue/cli-plugin-babel": "^3.11.0",
18+
"@vue/cli-plugin-eslint": "^3.11.0",
19+
"@vue/cli-service": "^3.11.0",
20+
"@vue/eslint-config-airbnb": "^4.0.0",
21+
"babel-eslint": "^10.0.1",
22+
"eslint": "^5.16.0",
23+
"eslint-plugin-vue": "^5.0.0",
24+
"sass": "^1.17.4",
25+
"sass-loader": "^7.1.0",
26+
"vue-cli-plugin-vuetify": "^0.6.3",
27+
"vue-template-compiler": "^2.6.10",
28+
"vuetify-loader": "^1.2.2"
29+
}
3030
}

‎public/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
</head>
1313

1414
<body>
15+
<div id="fb-root"></div>
16+
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v5.0"></script>
1517
<noscript>
1618
<strong>Sorry, this site needs JavaScript to be enabled to be shown.</strong>
1719
</noscript>

‎src/App.vue

Lines changed: 94 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,109 @@
22
<v-app id="main-app">
33
<!-- Navigation bar/app bar goes here -->
44
<v-content>
5-
<router-view></router-view>
5+
<div>
6+
<Sidebar :drawer="drawer" />
7+
<v-app-bar app dark>
8+
<v-app-bar-nav-icon class="ma-2" @click.stop="drawer = !drawer"> </v-app-bar-nav-icon>
9+
<div class="flex-grow-1"></div>
10+
11+
<router-link to="/"
12+
><v-container
13+
class="fill-height"
14+
fluid
15+
style="max-height: 64px; max-width:100px"
16+
>
17+
<v-img class="ma-8" src="https://github.com/csesoc/csesoc.unsw.edu.au/blob/frontendCombined/src/assets/csesoclogobluewhite.png?raw=true" />
18+
</v-container>
19+
</router-link>
20+
<div class="flex-grow-1"></div>
21+
<LoginForm align="right"/>
22+
</v-app-bar>
23+
24+
<router-view></router-view>
25+
<Footer/>
26+
</div>
627
</v-content>
728
</v-app>
829
</template>
930

1031
<script>
32+
import Footer from '@/components/Footer';
33+
import Sidebar from '@/components/Sidebar.vue';
34+
import LoginForm from '@/components/LoginForm';
1135
1236
export default {
1337
name: 'App',
14-
components: {},
15-
data: () => ({}),
38+
data: () => ({
39+
drawer: false,
40+
gridApiUri: 'https://gistcdn.githack.com/gawdn/464b5ed74404481f7296fb24f9f28243/raw/c9f63e5117a1406db9af5266c8cfd448161bbfec/test_grid.json',
41+
gridItems: [],
42+
listApiUri: 'https://gistcdn.githack.com/gawdn/464b5ed74404481f7296fb24f9f28243/raw/c9f63e5117a1406db9af5266c8cfd448161bbfec/test_grid.json',
43+
listItems: [],
44+
}),
45+
46+
components: {
47+
Footer,
48+
Sidebar,
49+
LoginForm
50+
},
51+
52+
mounted() {
53+
fetch(this.gridApiUri)
54+
.then(r => r.json())
55+
.then((responseJson) => {
56+
this.gridItems = responseJson;
57+
});
58+
},
59+
1660
};
1761
</script>
1862

19-
<style scoped>
63+
<style>
64+
@import url("https://fonts.googleapis.com/css?family=Quicksand&display=swap");
65+
* {
66+
margin: 0;
67+
padding: 0;
68+
}
69+
#showcase {
70+
background-image: url("https://backgroundcheckall.com/wp-content/uploads/2017/12/black-tech-background-12.jpg");
71+
background-size: cover;
72+
background-position: center;
73+
height: 100vh;
74+
display: flex;
75+
flex-direction: column;
76+
justify-content: center;
77+
align-items: center;
78+
text-align: center;
79+
padding: 0 20px;
80+
}
81+
#showcase img {
82+
max-width: 30%;
83+
max-height: 30vh;
84+
}
85+
#showcase h1 {
86+
font-size: 50px;
87+
line-height: 1.2;
88+
}
89+
#showcase p {
90+
font-size: 20px;
91+
}
92+
#showcase .button {
93+
font-family: "Quicksand", sans-serif;
94+
font-size: 18px;
95+
text-decoration: none;
96+
color: #fff;
97+
background: #3a76f8;
98+
padding: 10px 20px;
99+
border-radius: 10px;
100+
margin-top: 20px;
101+
width: 250px;
102+
}
103+
#showcase .button:hover {
104+
background: #3a76f8;
105+
color: #fff;
106+
}
107+
.content {
108+
padding: 2vw 15vw 5vw 15vw;
109+
}
20110
</style>

‎src/components/Events.vue

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<template>
2+
<!-- Insert post here-->
3+
<div class="gridView">
4+
<v-container class="pa-md-10 mx-lg-auto">
5+
<v-row>
6+
<v-col>
7+
<img src="https://res.cloudinary.com/css-tricks/image/upload/f_auto,q_auto/v1570828388/600xDigitalOcean_Agencies_bfkeb2.png" />
8+
</v-col>
9+
<v-col>
10+
<div class="pa-md-6">
11+
<h2 class="eventName">
12+
{{ event.name }}
13+
</h2>
14+
<h3 class="eventTime">{{ event.date }}</h3>
15+
<h3>{{ event.time }}</h3>
16+
<p>
17+
{{ event.info }}
18+
</p>
19+
<div class="text-center">
20+
<router-link to="/post"
21+
><v-btn rounded color="primary" dark style="float: right;"
22+
>More -></v-btn
23+
></router-link
24+
>
25+
</div>
26+
</div>
27+
</v-col>
28+
</v-row>
29+
</v-container>
30+
</div>
31+
</template>
32+
33+
<script>
34+
export default {
35+
name: 'EventsGrid',
36+
data() {
37+
return {
38+
event: {
39+
name: 'Annual Hackathon'.toUpperCase(),
40+
date: '1st January 2020',
41+
time: '0:00 - 23:59',
42+
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. ',
43+
image: 'https://github.com/csesoc/csesoc.unsw.edu.au/blob/frontendCombined/src/assets/csesoclogobluewhite.png?raw=true',
44+
},
45+
};
46+
},
47+
};
48+
</script>
49+
50+
<style scoped>
51+
@import url("https://fonts.googleapis.com/css?family=Quicksand&display=swap");
52+
53+
h1 {
54+
font-size: 48px;
55+
font-weight: normal;
56+
}
57+
58+
body {
59+
font-family: "Quicksand", sans-serif;
60+
text-align: left;
61+
}
62+
63+
p {
64+
font-size: 14px;
65+
font-weight: 300;
66+
-webkit-font-smoothing: subpixel-antialiased;
67+
}
68+
69+
p span {
70+
font-size: 16px;
71+
font-style: italic;
72+
display: inline-block;
73+
}
74+
75+
.underline {
76+
border-bottom: 1px solid grey;
77+
}
78+
79+
img {
80+
max-width: 100%;
81+
max-height: 100%;
82+
}
83+
</style>

‎src/components/Footer.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
<v-card-text class="white--text">
1414

1515
<section class="tiers__grid">
16-
<a v-for="sponsor in tierOne" class="tiers__box" :href="sponsor.link" :key="sponsor">
16+
<a v-for="sponsor in tierOne" class="tiers__box" :href="sponsor.link">
1717
<img :src="sponsor.logo" style=" max-width:300px;max-height:105px;">
1818
</a>
1919
</section>
2020
<section class="tiers__grid">
21-
<a v-for="sponsor in tierTwo" class="tiers__box" :href="sponsor.link" :key="sponsor">
21+
<a v-for="sponsor in tierTwo" class="tiers__box" :href="sponsor.link">
2222
<img :src="sponsor.logo" style="max-width:200px;max-height:75px">
2323
</a>
2424
</section>
2525
<section class="tiers__grid">
26-
<a v-for="sponsor in tierThree" class="tiers__box" :href="sponsor.link" :key="sponsor">
26+
<a v-for="sponsor in tierThree" class="tiers__box" :href="sponsor.link">
2727
<img :src="sponsor.logo" style="max-width:100px;max-height:50px">
2828
</a>
2929
</section>
@@ -120,7 +120,7 @@ export default {
120120
},
121121
},
122122
mounted() {
123-
fetch('')
123+
fetch('https://gistcdn.githack.com/esyw/4e35cd5fe73fa024020e67855ca733fb/raw/e85c9ae58a6323a4214ffa4ad89b0a5ebe404e31/sponsors.json')
124124
.then(r => r.json())
125125
.then((responseJson) => {
126126
console.log(responseJson);

0 commit comments

Comments
 (0)