Skip to content

Commit

Permalink
Updated for WWDC 2018
Browse files Browse the repository at this point in the history
  • Loading branch information
moritzsternemann committed May 16, 2018
1 parent b3332a5 commit e592b9e
Show file tree
Hide file tree
Showing 26 changed files with 448 additions and 226 deletions.
8 changes: 6 additions & 2 deletions Frontend/config/dev.settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ const prod = require('./prod.settings')
// Overwrite production settings here
module.exports = Object.assign(prod, {
cloudKit: {
containerIdentifier: 'iCloud.de.moritzsternemann.WWDCScholars',
apiToken: '34c08356c27f70833a62c044a950d999eceeba5bebf671908850c49289f5a158',
// de.moritzsternemann
// containerIdentifier: 'iCloud.de.moritzsternemann.WWDCScholars',
// apiToken: '34c08356c27f70833a62c044a950d999eceeba5bebf671908850c49289f5a158',
// com.wwdcscholars
containerIdentifier: 'iCloud.com.wwdcscholars.WWDCScholars',
apiToken: '4b05d3b2bf17bb717dfc36da0f7e6f665936d5c85c57b2d7a7483bb3fcbc7ba8',
environment: 'development'
},
twitter: {
Expand Down
2 changes: 1 addition & 1 deletion Frontend/config/prod.settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = {
environment: 'production'
},

wwdcYear: 'WWDC 2017',
wwdcYear: 'WWDC 2018',


// ** temporary **
Expand Down
3 changes: 2 additions & 1 deletion Frontend/src/app/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
#app
page-header(:link="{ name: 'scholars' }")
button(slot="right", @click="mobileMenu = !mobileMenu", :class="{ 'nav-mobile-toggle-on': mobileMenu }").nav-mobile-toggle
span
each _ in [1, 2, 3, 4]
span

.header-links(slot="right", :class="{ 'nav-mobile-show': mobileMenu }")
router-link(:to="{ name: 'scholars' }", :class="routeClass('scholars')").color-purple: span Scholars
Expand Down
2 changes: 1 addition & 1 deletion Frontend/src/app/components/ScholarProfile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export default {
},
async latestProfilePictureURL () {
let infoRecord = await this.loadYearInfo(true)
return infoRecord.profilePicture.downloadURL
return infoRecord.profilePicture_small.downloadURL
},
async loadYearInfo (latest) {
latest = latest || false
Expand Down
2 changes: 1 addition & 1 deletion Frontend/src/app/components/ScholarThumbnail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
async latestProfilePictureURL (scholar) {
let infoRecord = scholar.wwdcYearInfos[scholar.wwdcYearInfos.length - 1]
let info = await new WWDCYearInfo().fetch(infoRecord.recordName)
return info.profilePicture.downloadURL
return info.profilePicture_small.downloadURL
}
},
components: {}
Expand Down
1 change: 1 addition & 0 deletions Frontend/src/app/models/WWDCYearInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const wwdcYearInfoSchema = cloudkit.Record.extend({
appliedAs: { type: String, enum: ['student', 'stem', 'both'] },
githubAppLink: String,
profilePicture: Asset,
profilePicture_small: Asset,
screenshots: [Asset],
videoLink: String,
scholar: Reference,
Expand Down
4 changes: 2 additions & 2 deletions Frontend/src/app/pages/Scholars.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
scholar-profile(slot="body", :year="currentYear", :scholar="currentScholar")

.modal-background(:class="{ 'modal-background-blur': showProfile }")
tab-bar(name="year", :tabs="['2013', '2014', '2015', '2016', '2017']", initial="2017", @change="onTabChange")
tab-bar(name="year", :tabs="['2013', '2014', '2015', '2016', '2017', '2018']", initial="2018", @change="onTabChange")
.container.container-outer.color-black
.scholars-list(v-if="scholars")
scholar-thumbnail(v-for="scholar in scholars", :scholar="scholar", :key="scholar.recordName")
Expand All @@ -23,7 +23,7 @@ export default {
return {
scholars: {},
scholarProfilePictures: [],
currentYear: '2017',
currentYear: '2018',
showProfile: false,
currentScholar: undefined
Expand Down
2 changes: 1 addition & 1 deletion Frontend/src/app/pages/Store.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
h3 Want everyone to know you're a Scholarship winner?
h4.color-red1 T-Shirts will be available again shortly before WWDC 2018
p.
Show support for the project and look good in the process with one of our 2017 T-shirts. We offer various unisex sizes in two different styles, featuring our WWDCScholars logo on front and text around back.
Show support for the project and look good in the process with one of our 2018 T-shirts. We offer various unisex sizes in two different styles, featuring our WWDCScholars logo on front and text around back.

.image-slider
swiper(:options="swiperOptions")
Expand Down
52 changes: 29 additions & 23 deletions Frontend/src/assets/sass/3-modules/_header.sass
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,45 @@ header

.nav-mobile-toggle
display: none
position: relative
width: 30px
height: 23px
padding: 0
border: 0
background: 0
cursor: pointer

span
display: block
width: 30px
position: absolute
width: 100%
height: 3px
background-color: $sch-purple
border-radius: 1px
position: relative
left: 0
transition: 200ms ease-in-out

&:before, &:after
display: block
position: relative
content: ''
width: 30px
height: 3px
background-color: $sch-purple
border-radius: 1px
&:nth-child(1)
top: 0px

&:before
top: -9px
&:nth-child(2), &:nth-child(3)
top: 8px

&:after
top: 6px
&:nth-child(4)
top: 16px

&.nav-mobile-toggle-on span
&:nth-child(1)
top: 8px
left: 50%
width: 0%

&:nth-child(2)
transform: rotate(45deg)

&:nth-child(3)
transform: rotate(-45deg)

&:nth-child(4)
top: 8px
left: 50%
width: 0%

.header-links
height: 100%
Expand Down Expand Up @@ -65,11 +76,6 @@ header

.nav-mobile-toggle
display: block
transform: rotate(0deg)
transition: transform 100ms linear

&.nav-mobile-toggle-on
transform: rotate(-90deg)

.header-links
display: block
Expand Down
4 changes: 2 additions & 2 deletions Frontend/src/assets/sass/3-modules/_scholar-thumbnail.sass
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

.scholar-thumbnail
position: relative
width: 160px
height: 160px
max-width: 160px
max-height: 160px
border-radius: $border-radius-large
overflow: hidden
border: 0
Expand Down
10 changes: 5 additions & 5 deletions Frontend/src/assets/sass/3-modules/_scholars-list.sass
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.scholars-list
display: flex
justify-content: center
align-items: center
flex-wrap: wrap
display: grid
grid-template-columns: repeat(auto-fill, minmax(135px, 1fr))
grid-gap: 15px

.scholar-thumbnail
margin: 0 15px 30px
display: block
margin: 0 auto
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 WWDCScholars
Copyright (c) 2018 WWDCScholars

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
22 changes: 0 additions & 22 deletions LICENSE.md

This file was deleted.

1 change: 1 addition & 0 deletions Public/static/css/app.9291d143735436af99f659cc3c3a4fd9.css

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Public/static/css/app.fd5ce6254473faabd08908b9a0f27744.css

This file was deleted.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Public/static/js/app.127c3cb6013498d4f3e8.js.map

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Public/static/js/app.964ad95b088a0e49b10b.js.map

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e592b9e

Please sign in to comment.