Merge branch 'master' into doc/59_write_projcet_setup_instructions

pyladiesbkk · Oct 26, 2019 · 7612611 · 7612611
2 parents 4e97de2 + 8632a58
commit 7612611
Show file tree

Hide file tree

Showing 12 changed files with 266 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 Repo for Hacktoberfest 2019 https://www.eventpop.me/e/7078-pyladiesbkk
 git
 Hello pyladies. nice to mmet you!
+
 ## Design
 https://xd.adobe.com/spec/fa82faaf-c6f1-4ebd-7a2b-25ba6ba04ace-8cb3/
 
@@ -19,3 +20,7 @@ Pan
 Mild-TN (mild20091931)
 Chompoonuch (Tukta)
 Neda P.
+artart788
+Boom
+Chayut-Bangplee
+Kaotu
diff --git a/public/static/assets/organizer/georgi.jpg b/public/static/assets/organizer/georgi.jpg
diff --git a/public/static/assets/organizer/sudarat.jpg b/public/static/assets/organizer/sudarat.jpg
diff --git a/src/banner.html b/src/banner.html
@@ -16,9 +16,9 @@
           </button>
         </div>
         <div class="col p-2" class="img-banner">
-          <img src="/static/assets/design/img-banner.svg" width="551.88px" height="426.43px" alt="Logo" />
+          <img data-aos="zoom-in-down" src="/static/assets/design/img-banner.svg" width="551.88px" height="426.43px" alt="Logo" />
         </div>
       </div>
     </div>
   </div>
-</div>
+</div>
diff --git a/src/code-of-conduct.html b/src/code-of-conduct.html
@@ -1,4 +1,4 @@
-<div class="container-fuild bg-white">
+<div class="container-fuild bg-white" id="code_of_conduct">
     <div class="container">
         <div class="row content-padding">
             <div class="col">
@@ -8,7 +8,7 @@
                     <p class="text-topic">Code Of<br>Conduct</p>
                 </div>
             </div>
-            <div class="col" id="code_of_conduct">
+            <div class="col">
                 <p>Please read <a href=http://www.pyladies.com/CodeOfConduct/ class="text-pink" >http://www.pyladies.com/CodeOfConduct/</a>
                     By signing up for this event you agree to abide by the PyLadies Code of Conduct because we are dedicated to providing a safe, inclusive, welcoming, and harassment-free space and experience for all members and guests, regardless of gender identity and expression, sexual orientation, disability, physical appearance, socioeconomic status, body size, ethnicity, nationality, level of experience, age, or religion (or lack thereof). The Code of Conduct exists because of that dedication. We do not tolerate harassment in any form and we prioritize marginalized people’s safety over privileged people’s comfort.</p>
             </div>

diff --git a/src/gallery.html b/src/gallery.html
@@ -1,6 +1,6 @@
-<div class="container-fuild">
-    <div class="row ">
-        <div class="col text-center gallery">
+<div class="container-fuild" id="gallery">
+    <div class="row gallery">
+        <div class="col text-center">
             <h1>Gallery</h1>
         </div>
     </div>

diff --git a/src/index.html b/src/index.html
@@ -8,6 +8,7 @@
   <link href="https://fonts.googleapis.com/css?family=Poppins:300,300i,600,600i,700,700i&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
     integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+  <link href="https://unpkg.com/[email protected]/dist/aos.css" rel="stylesheet">
   <link rel="manifest" href="/favicon.ico/manifest.json"> <meta name="msapplication-config"
     content="/favicon.ico/browserconfig.xml">
   <link rel="icon" href="/favicon.ico/favicon.ico"> <link rel="icon"  type="image/png"
@@ -23,6 +24,8 @@
   <link rel="shortcut icon" type="image/png" rel="apple-touch-icon" sizes="144x144" href="/favicon.ico/apple-icon-144x144.png">
   <link rel="shortcut icon" type="image/png" rel="apple-touch-icon" sizes="152x152" href="/favicon.ico/apple-icon-152x152.png">
   <link rel="shortcut icon" type="image/png" rel="apple-touch-icon" sizes="180x180" href="/favicon.ico/apple-icon-180x180.png">
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.css">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.carousel.min.css" />
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.theme.default.min.css" />
   <title>Pyladies BKK</title>
@@ -41,6 +44,7 @@
   <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js"></script>
+  <script src="https://unpkg.com/[email protected]/dist/aos.js"></script>
   <a class="top-link">Back to top</a>
 </body>
 </html>
diff --git a/src/index.js b/src/index.js
@@ -1,8 +1,13 @@
 import './styles.css'
 
-$(document).ready(function () {
-    $(".top-link").click(function () {
-        window.scrollTo({ top: 0, behavior: 'smooth' });
+AOS.init({
+    easing: 'ease-out-back',
+    duration: 1000
+});
+
+$(document).ready(function(){
+    $(".top-link").click(function() {
+        window.scrollTo({top: 0, behavior: 'smooth'});
     });
     //gallery slider
     $('.owl-carousel').owlCarousel({

diff --git a/src/location.html b/src/location.html
@@ -1,20 +1,112 @@
-<div class="container-fuild bg-white">
-    <div class="row mt-5">
-        <div class="col text-center ">
-            <h1>Location</h1>
-        </div>
+<div class="container-fuild bg-white" id="location">
+  <div class="row mt-5">
+    <div class="col text-center ">
+      <h1>Location</h1>
+
     </div>
-    <div class="row">
-        <div class="col">
-            <img src="https://via.placeholder.com/154x154" alt='Logo' />
-            <img src="https://via.placeholder.com/154x154" alt='Logo' />
-            <img src="https://via.placeholder.com/154x154" alt='Logo' />
-            <img src="https://via.placeholder.com/154x154" alt='Logo' />
-            <img src="https://via.placeholder.com/154x154" alt='Logo' />
-            <img src="https://via.placeholder.com/154x154" alt='Logo' />
-            <img src="https://via.placeholder.com/154x154" alt='Logo' />
-            <img src="https://via.placeholder.com/154x154" alt='Logo' />
-            <img src="https://via.placeholder.com/154x154" alt='Logo' />
+  </div>
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <div class="row">
+        <div class="col-2 d-flex justify-content-center">
+          <div class="card">
+            <div class="box-location">
+              <div id="circle">
+                <img src="https://via.placeholder.com/154x154" alt="Logo" />
+              </div>
+              <div class="text-center">
+                <div class="name-location">
+                  <p>ARACATI, BRAZIL</p>
+                </div>
+                <i class="fab fa-facebook-f"></i>
+                <i class="fab fa-twitter"></i>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-2 d-flex justify-content-center">
+          <div class="card">
+            <div class="box-location">
+              <div id="circle">
+                <img src="https://via.placeholder.com/154x154" alt="Logo" />
+              </div>
+              <div class="text-center">
+                <div class="name-location">
+                  <p>AREQUIPA, PERU</p>
+                </div>
+                <i class="fab fa-facebook-f"></i>
+                <i class="fab fa-twitter"></i>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-2 d-flex justify-content-center">
+          <div class="card">
+            <div class="box-location">
+              <div id="circle">
+                <img src="https://via.placeholder.com/154x154" alt="Logo" />
+              </div>
+              <div class="text-center">
+                <div class="name-location">
+                  <p>AUSTIN, TX</p>
+                </div>
+                <i class="fab fa-facebook-f"></i>
+                <i class="fab fa-twitter"></i>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-2 d-flex justify-content-center">
+          <div class="card">
+            <div class="box-location">
+              <div id="circle">
+                <img src="https://via.placeholder.com/154x154" alt="Logo" />
+              </div>
+              <div class="text-center">
+                <div class="name-location">
+                  <p>BELEM, BRAZIL</p>
+                </div>
+                <i class="fab fa-facebook-f"></i>
+                <i class="fab fa-twitter"></i>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-2 d-flex justify-content-center">
+          <div class="card">
+            <div class="box-location">
+              <div id="circle">
+                <img src="https://via.placeholder.com/154x154" alt="Logo" />
+              </div>
+              <div class="text-center">
+                <div class="name-location">
+                  <p>BOSTON, MA</p>
+                </div>
+                <i class="fab fa-facebook-f"></i>
+                <i class="fab fa-twitter"></i>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-2 d-flex justify-content-center">
+          <div class="card">
+            <div class="box-location">
+              <div id="circle">
+                <img src="https://via.placeholder.com/154x154" alt="Logo" />
+              </div>
+              <div class="text-center">
+                <div class="name-location">
+                  <p>CHICAGO, IL</p>
+                </div>
+                <i class="fab fa-facebook-f"></i>
+                <i class="fab fa-twitter"></i>
+              </div>
+            </div>
+          </div>
         </div>
+      </div>
     </div>
-</div>
+  </div>
+  </div>
+</div>
diff --git a/src/nav.html b/src/nav.html
@@ -8,19 +8,19 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav ml-auto">
         <li class="nav-item active">
-          <a class="nav-link" href="#">About <span class="sr-only">(current)</span></a>
+          <a class="nav-link" href="#about">About <span class="sr-only">(current)</span></a>
         </li>
         <li class="nav-item">
           <a class="nav-link" href="#code_of_conduct">Code of Conduct</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="#">Gallery</a>
+          <a class="nav-link" href="#gallery">Gallery</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="#">Organizer</a>
+          <a class="nav-link" href="#organizer">Organizer</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="#">Location</a>
+          <a class="nav-link" href="#location">Location</a>
         </li>
       </ul>
     </div>

diff --git a/src/organizer.html b/src/organizer.html
@@ -1,12 +1,41 @@
-<div class="container-fuild bg-white">
+<div class="container-fluid bg-white" id="organizer">
     <div class="row ">
         <div class="col">
             <h1>Organizer</h1>
         </div>
         <div class="col">
-            <img src="https://via.placeholder.com/550x180" alt='Logo' />
-            <img src="https://via.placeholder.com/550x180" alt='Logo' />
-            <img src="https://via.placeholder.com/550x180" alt='Logo' />
+            <div class="row">
+                <div class="col-md-12 organizer-content">
+                    <div class="row">
+                        <div class="col-md-3 avatar-circle">
+                            <img src="/static/assets/organizer/sudarat.jpg" alt='Logo' class="avatar" />
+                        </div>
+                        <div class="col-md-8 content">
+                            <h3>Sudarat Chattanon</h3>
+                            <div>I'm a happiness software engineer who ♡ sciences, techs, mysteries, music and dogs.</div>
+                            <div class="social">
+                                <a href="https://www.facebook.com/gatukgl" target="_blank"><i class="fa fa-facebook"></i></a>
+                                <a href="https://twitter.com/gatukgl" target="_blank"><i class="fa fa-twitter"></i></a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-12 organizer-content">
+                    <div class="row">
+                        <div class="col-md-3 avatar-circle">
+                            <img src="/static/assets/organizer/georgi.jpg" alt='Logo' class="avatar" />
+                        </div>
+                        <div class="col-md-8 content">
+                            <h3>Georgi Ker</h3>
+                            <div>Conference Lead. PyConTH2020, Organizer RubyConfTH, ThaiPy, Bangkok.rb</div>
+                            <div class="social">
+                                <a href="https://www.facebook.com/geonativejar" target="_blank"><i class="fa fa-facebook"></i></a>
+                                <a href="https://twitter.com/georgically1" target="_blank"><i class="fa fa-twitter"></i></a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </div>