Skip to content

Commit f56fe42

Browse files
amodepalliamodepalli
committed
beta verision
1 parent 162bdc4 commit f56fe42

File tree

5 files changed

+48
-67
lines changed

5 files changed

+48
-67
lines changed

‎src/app/app.component.html

+7-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<li><a [routerLink]="['/events']">Events</a></li>
1111
<li><a [routerLink]="['/dbcafe']">db Cafe</a></li>
1212
<li><a [routerLink]="['/officers']">Officers</a></li>
13-
<li><a href="http://goo.gl/forms/1BWevBzmrV">Membership</a></li>
13+
<li><a href="http://goo.gl/forms/1BWevBzmrV">Join</a></li>
1414

1515
</ul>
1616

@@ -36,20 +36,19 @@
3636
<footer class="page-footer blue darken-4">
3737
<div class="container">
3838
<div class="row">
39-
<div class="col l6 s12">
39+
<div class="col l6 m12 s12">
4040
<h5 class="white-text">Contact Us</h5>
4141
<p class="grey-text text-lighten-4">1301 Beal Avenue
4242
<br>2243 EECS Building
4343
<br>Ann Arbor, MI 48109
44-
<br>[email protected]</p>
44+
<br><a href="mailto:[email protected]">[email protected]</a></p>
4545
</div>
46-
<div class="col l4 offset-l2 s12">
46+
<div class="col l4 m12 offset-l2 s12">
4747
<h5 class="white-text">Links</h5>
4848
<ul>
49-
<li><a class="grey-text text-lighten-3" href="#!">Link 1</a></li>
50-
<li><a class="grey-text text-lighten-3" href="#!">Link 2</a></li>
51-
<li><a class="grey-text text-lighten-3" href="#!">Link 3</a></li>
52-
<li><a class="grey-text text-lighten-3" href="#!">Link 4</a></li>
49+
<li><a class="grey-text text-lighten-3" href="https://www.facebook.com/groups/375103399573027/">Facebook</a></li>
50+
<li><a class="grey-text text-lighten-3" href="https://twitter.com/umichieee?lang=en">Twitter</a></li>
51+
<li><a class="grey-text text-lighten-3" href="https://github.com/ieee-umich">Github</a></li>
5352
</ul>
5453
</div>
5554
</div>

‎src/app/home/home.component.html

+7-26
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<div class="row center">
66
<div class="col s12"> <p><br><br><br></p></div>
7-
<div class="col s4"> <div class="right-align">
7+
<div class="col s12 m12 l3 offset-l2">
88
<p><br></p>
99
<img style= "height:105px; bottom:25px; position:relative" src="./assets/images/blockm.png"></div>
10-
</div>
10+
1111

12-
<div class="col s6 left-align"><h2 class="header text-lighten-2">University of Michigan <br> IEEE Student Branch</h2> </div>
12+
<div class="col s12 m12 l6 pull-l1"><h2 class="header text-lighten-2">University of Michigan <br> IEEE Student Branch</h2> </div>
1313
</div>
1414
<div class="row center">
1515
<a href="#aboutus" id="download-button" class="btn-large waves-effect waves-light blue darken-4">Learn More</a>
@@ -56,9 +56,9 @@ <h4>Interested in joining?</h4>
5656

5757
<div class="divider grey darken-1"></div>
5858
<div class="section">
59-
<h4>Interested in working with us? </h4>
59+
<h4>Companies: Interested in working with us? </h4>
6060
<p style="font-size:130%;">If you’re interested in working with us for recruitment purposes or hosting an event on campus, send an e-mail to our IEEE Corporate Chair:
61-
<br>[email protected], and we’ll get back to you promptly with how we can best help you.
61+
<br><a href="mailto:[email protected]">[email protected]</a>, and we’ll get back to you promptly with how we can best help you.
6262
<br>
6363
To learn more about IEEE and its mission, visit <a href="https://www.ieee.org">ieee.org</a>.
6464
</p>
@@ -74,40 +74,21 @@ <h4>Interested in working with us? </h4>
7474
</div>
7575

7676

77-
<div class="slider">
77+
<!-- <div class="slider">
7878
<ul class="slides">
7979
<li>
8080
<img src="https://pixy.org/images/placeholder.png" >
81-
<!-- <div class="caption center-align">
82-
<h3>This is our big Tagline!</h3>
83-
<h5 class="light grey-text text-lighten-3">Here's our small slogan.</h5>
84-
</div> -->
8581
</li>
8682
<li>
8783
<img src="https://pixy.org/images/placeholder.png">
88-
<!-- <div class="caption center-align">
89-
<h3>This is our big Tagline!</h3>
90-
<h5 class="light grey-text text-lighten-3">Here's our small slogan.</h5>
91-
</div> -->
9284
</li>
9385
<li>
9486
<img src="https://pixy.org/images/placeholder.png">
95-
<!-- <div class="caption center-align">
96-
<h3>This is our big Tagline!</h3>
97-
<h5 class="light grey-text text-lighten-3">Here's our small slogan.</h5>
98-
</div> -->
9987
</li>
10088
<li>
10189
<img src="https://pixy.org/images/placeholder.png">
102-
<!-- <div class="caption center-align">
103-
<h3>This is our big Tagline!</h3>
104-
<h5 class="light grey-text text-lighten-3">Here's our small slogan.</h5>
105-
</div> -->
10690
</li>
10791
10892
</ul>
109-
110-
111-
112-
</div>
93+
</div> -->
11394

‎src/app/officers/officers.component.css

-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +0,0 @@
1-
2-
img {
3-
width: auto;
4-
max-height: 100%;
5-
}
6-
7-
.card img {
8-
max-height: 100%;
9-
object-fit: cover;
10-
}
11-
.card img.materialized.active {
12-
max-height: none;
13-
object-fit: none;
14-
}

‎src/app/officers/officers.component.html

+22-9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ <h3>Fall 2017 Officers</h3>
1111
</div>
1212
<div class="card-content">
1313
<p>President: Wil Kacsur</p>
14+
The president liaises with IEEE, and other organizations within the university and makes sure the club runs smoothly.
1415
</div>
1516
<div class="card-action">
1617
<a href="mailto:[email protected]">[email protected]</a>
@@ -20,11 +21,12 @@ <h3>Fall 2017 Officers</h3>
2021
<div class="col s3">
2122
<div class="card large">
2223
<div class="card-image">
23-
<img src="./assets/images/alex.jpg">
24+
<img src="./assets/images/akshay.jpg">
2425
<span class="card-title"></span>
2526
</div>
2627
<div class="card-content">
27-
<p>Vice President: Alex Martin</p>
28+
<p>Vice President: Akshay Chiwhane</p>
29+
The vice president helps plan the end of the year banquet, and helps other officers.
2830
</div>
2931
<div class="card-action">
3032
<a href="mailto:[email protected]">[email protected]</a>
@@ -34,11 +36,12 @@ <h3>Fall 2017 Officers</h3>
3436
<div class="col s3">
3537
<div class="card large">
3638
<div class="card-image">
37-
<img src="./assets/images/akshay.jpg">
39+
<img src="./assets/images/alex.jpg">
3840
<span class="card-title"></span>
3941
</div>
4042
<div class="card-content">
41-
<p>Secretary: Akshay Chiwane</p>
43+
<p>Secretary: Alex Martin</p>
44+
The secretary acts as communication channel between the officers and the general body.
4245
</div>
4346
<div class="card-action">
4447
<a href="mailto:[email protected]">[email protected]</a>
@@ -48,11 +51,12 @@ <h3>Fall 2017 Officers</h3>
4851
<div class="col s3">
4952
<div class="card large">
5053
<div class="card-image">
51-
<img src="https://hlfppt.org/wp-content/uploads/2017/04/placeholder.png">
54+
<img src="http://ewh.ieee.org/sb/prc/turabo/Media/ieee_logo2.jpg">
5255
<span class="card-title"></span>
5356
</div>
5457
<div class="card-content">
5558
<p>Treasurer: Jin Mo Yang</p>
59+
The treasurer manages the money, which helps pay for the social and networking events.
5660
</div>
5761
<div class="card-action">
5862
<a href="mailto:[email protected]">[email protected]</a>
@@ -67,6 +71,7 @@ <h3>Fall 2017 Officers</h3>
6771
</div>
6872
<div class="card-content">
6973
<p>Operations: Kayura Mendonza</p>
74+
The operations chair manages the db Cafe by stocking inventory, and scheduling volunteer shifts.
7075
</div>
7176
<div class="card-action">
7277
<a href="mailto:[email protected]">[email protected]</a>
@@ -81,6 +86,7 @@ <h3>Fall 2017 Officers</h3>
8186
</div>
8287
<div class="card-content">
8388
<p>Corporate Relations: Stefany Escobedo</p>
89+
The corporate relations chair arranges company information sessions.
8490
</div>
8591
<div class="card-action">
8692
<a href="mailto:[email protected]">[email protected]</a>`
@@ -90,11 +96,12 @@ <h3>Fall 2017 Officers</h3>
9096
<div class="col s3">
9197
<div class="card large">
9298
<div class="card-image">
93-
<img src="https://hlfppt.org/wp-content/uploads/2017/04/placeholder.png">
99+
<img src="http://ewh.ieee.org/sb/prc/turabo/Media/ieee_logo2.jpg">
94100
<span class="card-title"></span>
95101
</div>
96102
<div class="card-content">
97103
<p>Publicity: Peifu Mo</p>
104+
The publicity chair spreads awareness about info sessions and events.
98105
</div>
99106
<div class="card-action">
100107
<a href="mailto:[email protected]">[email protected]</a>
@@ -104,11 +111,12 @@ <h3>Fall 2017 Officers</h3>
104111
<div class="col s3">
105112
<div class="card large">
106113
<div class="card-image">
107-
<img src="https://hlfppt.org/wp-content/uploads/2017/04/placeholder.png">
114+
<img src="http://ewh.ieee.org/sb/prc/turabo/Media/ieee_logo2.jpg">
108115
<span class="card-title"></span>
109116
</div>
110117
<div class="card-content">
111118
<p>Activities: Sarah Rose Peterson</p>
119+
The activities chair plans social events such as movie night.
112120
</div>
113121
<div class="card-action">
114122
<a href="mailto:[email protected]">[email protected]</a>
@@ -123,6 +131,7 @@ <h3>Fall 2017 Officers</h3>
123131
</div>
124132
<div class="card-content">
125133
<p>Projects: Andrew Wang</p>
134+
The project chair plans events such as Arduino and Python workshops.
126135
</div>
127136
<div class="card-action">
128137
<a href="mailto:[email protected]">[email protected]</a>
@@ -132,11 +141,12 @@ <h3>Fall 2017 Officers</h3>
132141
<div class="col s3">
133142
<div class="card large">
134143
<div class="card-image">
135-
<img src="https://hlfppt.org/wp-content/uploads/2017/04/placeholder.png">
144+
<img src="http://ewh.ieee.org/sb/prc/turabo/Media/ieee_logo2.jpg">
136145
<span class="card-title"></span>
137146
</div>
138147
<div class="card-content">
139148
<p>Historian: Abhilash Modepalli</p>
149+
The historian maintains the website and compiles all the pictures taken at events.
140150
</div>
141151
<div class="card-action">
142152
<a href="[email protected]">[email protected]</a>
@@ -151,6 +161,7 @@ <h3>Fall 2017 Officers</h3>
151161
</div>
152162
<div class="card-content">
153163
<p>Department: Eilam Morag</p>
164+
The department chair helps run the Professor speaker series.
154165
</div>
155166
<div class="card-action">
156167
<a href="mailto:[email protected]">[email protected]</a>
@@ -165,6 +176,7 @@ <h3>Fall 2017 Officers</h3>
165176
</div>
166177
<div class="card-content">
167178
<p>Recruitment: Shuta Suzuki</p>
179+
The recruitment chair maintains list of who are active members and recruits members to the club.
168180
</div>
169181
<div class="card-action">
170182
<a href="mailto:[email protected]">[email protected]</a>
@@ -174,11 +186,12 @@ <h3>Fall 2017 Officers</h3>
174186
<div class="col s3">
175187
<div class="card large">
176188
<div class="card-image">
177-
<img src="https://hlfppt.org/wp-content/uploads/2017/04/placeholder.png">
189+
<img src="http://ewh.ieee.org/sb/prc/turabo/Media/ieee_logo2.jpg">
178190
<span class="card-title"></span>
179191
</div>
180192
<div class="card-content">
181193
<p>Service: Matthew Cui</p>
194+
The service chair plans service events such as science olympiad coaching.
182195
</div>
183196
<div class="card-action">
184197
<a href="mailto:[email protected]">[email protected]</a>

‎src/index.html

+12-10
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,22 @@
77
<base href="/">
88

99
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
10+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
1011
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
1112
<script type="text/javascript">
12-
$(document).ready(function(){
13-
$('.slider').slider();
14-
});
15-
$(document).ready(function(){
16-
$('.parallax').parallax();
17-
});
18-
$(document).ready(function(){
19-
$('.scrollspy').scrollSpy();
20-
});
13+
14+
2115

2216
$(document).ready(function(){
23-
$('.button-collapse').sideNav();
17+
$('.slider').slider();
18+
$('.parallax').parallax();
19+
$('.scrollspy').scrollSpy();
20+
$('.button-collapse').sideNav({
21+
closeOnClick: true,
22+
draggable: true,
23+
}
24+
);
25+
$('.collapsible').collapsible();
2426
});
2527
</script>
2628
</head>

0 commit comments

Comments
 (0)